diff options
author | sgiehl <stefan@matomo.org> | 2022-11-03 12:39:02 +0300 |
---|---|---|
committer | sgiehl <stefan@matomo.org> | 2022-11-03 12:39:02 +0300 |
commit | 98f9281cf1239d317ff06786e67d9d3b398a4422 (patch) | |
tree | 494ecb67ebcded9be0d452f5f96028bd1a5cd11f /plugins | |
parent | 57b7d1e5d7218e57b87eb9746caa3cc26482d69a (diff) | |
parent | 6b1fca27df7d96c316e60a2c4b45456cb0544809 (diff) |
Merge branch '4.x-dev' into 5.x-dev
Diffstat (limited to 'plugins')
85 files changed, 661 insertions, 566 deletions
diff --git a/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml index 2e6b89c715..36cc431ba1 100644 --- a/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <website>Piwik test</website> - <prettyDate>January 3 – 9, 2010</prettyDate> + <prettyDate>January 3 – 9, 2010</prettyDate> <metadata> <category>Actions</category> <subcategory>Contents</subcategory> diff --git a/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml index 60e5b513c9..b34b33e431 100644 --- a/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <website>Piwik test</website> - <prettyDate>January 3 – 9, 2010</prettyDate> + <prettyDate>January 3 – 9, 2010</prettyDate> <metadata> <category>Actions</category> <subcategory>Contents</subcategory> diff --git a/plugins/CoreHome/templates/_menu.twig b/plugins/CoreHome/templates/_menu.twig index c2298d4627..084629d487 100644 --- a/plugins/CoreHome/templates/_menu.twig +++ b/plugins/CoreHome/templates/_menu.twig @@ -38,6 +38,9 @@ {% if urlParameters._icon is defined and urlParameters._icon %}<span class="icon {{ urlParameters._icon|e('html_attr') }}" style="margin-right: 5px;"></span>{% endif %} {{ name|translate|rawSafeDecoded }} </a> + {% if urlParameters._help %} + <div piwik-show-help-link name="{{ urlParameters._name }}" message="{{ urlParameters._help|e('html_attr') }}"></div> + {% endif %} </li> {% endif %} {% endfor %} diff --git a/plugins/CoreHome/vue/src/ShowHelpLink/ShowHelpLink.adapter.ts b/plugins/CoreHome/vue/src/ShowHelpLink/ShowHelpLink.adapter.ts new file mode 100644 index 0000000000..4fd3d75846 --- /dev/null +++ b/plugins/CoreHome/vue/src/ShowHelpLink/ShowHelpLink.adapter.ts @@ -0,0 +1,22 @@ +/*! + * Matomo - free/libre analytics platform + * + * @link https://matomo.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + */ + +import createAngularJsAdapter from '../createAngularJsAdapter'; +import ShowHelpLink from './ShowHelpLink.vue'; + +export default createAngularJsAdapter({ + component: ShowHelpLink, + scope: { + message: { + angularJsBind: '@', + }, + name: { + angularJsBind: '@', + }, + }, + directiveName: 'piwikShowHelpLink', +}); diff --git a/plugins/CoreHome/vue/src/ShowHelpLink/ShowHelpLink.vue b/plugins/CoreHome/vue/src/ShowHelpLink/ShowHelpLink.vue new file mode 100644 index 0000000000..439adbaf02 --- /dev/null +++ b/plugins/CoreHome/vue/src/ShowHelpLink/ShowHelpLink.vue @@ -0,0 +1,64 @@ +<!-- + Matomo - free/libre analytics platform + @link https://matomo.org + @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later +--> + +<template> + <a + class="item-help-icon" + tabindex="5" + href="javascript:" + @click="showHelp" + > + <span class="icon-help"/> + </a> +</template> +<script lang="ts"> + +import { defineComponent } from 'vue'; +import { NotificationsStore } from '../Notification'; +import MatomoUrl from '../MatomoUrl/MatomoUrl'; + +const REPORTING_HELP_NOTIFICATION_ID = 'reportingMenu-help'; + +export default defineComponent({ + props: { + message: { + type: String, + required: true, + }, + name: { + type: String, + required: true, + }, + }, + data() { + return { + currentName: '', + }; + }, + methods: { + showHelp() { + if (this.currentName !== '') { + NotificationsStore.remove(REPORTING_HELP_NOTIFICATION_ID); + this.currentName = ''; + return; + } + NotificationsStore.show({ + context: 'info', + id: REPORTING_HELP_NOTIFICATION_ID, + type: 'help', + noclear: true, + class: 'help-notification', + message: this.message, + placeat: '#notificationContainer', + prepend: true, + }); + if (this.name !== '') { + this.currentName = this.name; + } + }, + }, +}); +</script> diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts -Subproject b4d3e1bfdb732ed184108dfe39fb6f855b3c3b3 +Subproject 6647bb2ddff1e7bdcb854096a87846dcdd1ff06 diff --git a/plugins/DeviceDetectorCache b/plugins/DeviceDetectorCache -Subproject d76f8fc780a456785bddc8cf730a71d38a790c2 +Subproject 810ae6a77330067a98945e3ce76f0d897821d5e diff --git a/plugins/Ecommerce/Controller.php b/plugins/Ecommerce/Controller.php index dcc600e1b2..7e27aed99d 100644 --- a/plugins/Ecommerce/Controller.php +++ b/plugins/Ecommerce/Controller.php @@ -148,7 +148,7 @@ class Controller extends \Piwik\Plugins\Goals\Controller if (array_key_exists($columnName, $metrics) && array_key_exists($columnName, $return)) { - $pastValue = $previousDataRow->getColumn($columnName); + $pastValue = $previousDataRow ? $previousDataRow->getColumn($columnName) : 0; if (in_array($columnName, ['revenue', 'avg_order_revenue'])) { $numberFormatter = NumberFormatter::getInstance(); diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html index ecf95c3b74..44d01025e7 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html @@ -34,7 +34,7 @@ <p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;'> Please find below your day report for A very long name for a very tiny test site, that also reaches the 90 character limit fully. <br />Mail Test report (previous default) - <br />Date range: week April 4 – 10, 2011 + <br />Date range: week April 4 – 10, 2011 <br />Sent from http://example.com/piwik/tests/PHPUnit/proxy/. </p> @@ -45,7 +45,7 @@ </h2> <img alt="" - src="data:image/png;base64,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" + src="data:image/png;base64,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" height="200" width="700" margin="0 auto"/> diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_overEach__ScheduledReports.generateReport_week.original.html b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_overEach__ScheduledReports.generateReport_week.original.html index 65c60a2f31..80bc34dfa6 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_overEach__ScheduledReports.generateReport_week.original.html +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_overEach__ScheduledReports.generateReport_week.original.html @@ -34,7 +34,7 @@ <p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;'> Please find below your week report for A very long name for a very tiny test site, that also reaches the 90 character limit fully. <br />Mail Test report (each in period) - <br />Date range: week April 4 – 10, 2011 + <br />Date range: week April 4 – 10, 2011 <br />Sent from http://example.com/piwik/tests/PHPUnit/proxy/. </p> diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_prevCustomN__ScheduledReports.generateReport_week.original.html b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_prevCustomN__ScheduledReports.generateReport_week.original.html index ed0e48e553..1374902f29 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_prevCustomN__ScheduledReports.generateReport_week.original.html +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_prevCustomN__ScheduledReports.generateReport_week.original.html @@ -34,7 +34,7 @@ <p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;'> Please find below your day report for A very long name for a very tiny test site, that also reaches the 90 character limit fully. <br />Mail Test report (previous10) - <br />Date range: week April 4 – 10, 2011 + <br />Date range: week April 4 – 10, 2011 <br />Sent from http://example.com/piwik/tests/PHPUnit/proxy/. </p> @@ -45,7 +45,7 @@ </h2> <img alt="" - src="data:image/png;base64,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" + src="data:image/png;base64,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" height="200" width="700" margin="0 auto"/> diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_and_graph__ScheduledReports.generateReport_week.original.html b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_and_graph__ScheduledReports.generateReport_week.original.html index 7d8f8c268f..fac718e406 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_and_graph__ScheduledReports.generateReport_week.original.html +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_and_graph__ScheduledReports.generateReport_week.original.html @@ -34,7 +34,7 @@ <p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;'> Please find below your day report for A very long name for a very tiny test site, that also reaches the 90 character limit fully. <br />Mail Test report - <br />Date range: week April 4 – 10, 2011 + <br />Date range: week April 4 – 10, 2011 <br />Sent from http://example.com/piwik/tests/PHPUnit/proxy/. </p> @@ -550,7 +550,7 @@ </h2> <img alt="" - src="data:image/png;base64,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" + src="data:image/png;base64,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" height="200" width="700" margin="0 auto"/> @@ -3470,7 +3470,7 @@ </h2> <img alt="" - src="data:image/png;base64,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" + src="data:image/png;base64,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" height="200" width="700" margin="0 auto"/> @@ -4759,7 +4759,7 @@ </h2> <img alt="" - src="data:image/png;base64,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" + src="data:image/png;base64,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" height="200" width="700" margin="0 auto"/> @@ -5257,7 +5257,7 @@ </h2> <img alt="" - src="data:image/png;base64,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" + src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAOJElEQVR4nO3d748c50EH8Mfnsy+52L5fe7ZD2tTJVglOWyHShoTSJqCklSpSKY2QeEErJCQkEPRFXhQRiioHUYRURFQhJCr+hzaIRkWAqiilQBv1TaVEkayrQXAJjhM77vnH3dnn48Vc15vdndnZnZn17DOfz4vo2fXMM3N7T26++8w8z7Nvd3c39Gm322tra/3vAwCNNdP/Vrvdnvx5AAA11xsa9DEAAAO9JzRIDABAmtlOKS0xrK+vd788e/bs8ePHM2rc3NycmZk5ePBgWacIFdFWmRbaKhPwh1/7QQjhL37/F48cSm1ps90vup9mGLvXYXt7e3Z2VuOm/rRVpoW2StV2buz2FAa6GRq6I0J3Yrjrrru6d+h52W93d3dubq7Vao10ujB52irTQlulam9fuJIUPvTz92RsNmD0BADQKOcuXM2zmdAAAE335b95OYTw2ceGzLkwODQYQwEATbN05LbsDfQ0AAAhCA0AQE6txduzNxAapoxJvgGoyOrSfPYGs9n/XJ2BF7/mPEvR/eM356cGoIaubF5LCksLQ3oablloCA2+WPZMnGX2bgBuoc4kDQdmh9x/cHti0vojwtrampsOANwqOSdpCLe2pyFD5yLa84184JvdF93kn/q3zLnZ0H2738x5hj0/18B/Surv/u/AY/XXNvRU3QcBINtX//4/Qgi/8an7h255K0ND/7Wwc53ruQqmvdn/sv9ym1YeuFnG9hlHHHqGI8m+edH50PKcqvsgAOS0PGy8ZSglNDz9zLfyb/zN5z/XKQ+8gPVc2Pqvx6Hre/nAetKui0M3yzhKxqU3zxmOJM9lPuepZtQMAN2WFycSGkZy6tSpU6dOTfig+RV5tmDCzyXkOVz/nQ4AGGh1cch4y1BKaPjm8587derUPffsrYt14cKF2dnZw4cPD9z4zJniB6xQkYvrhC/MOQ/X/WSD6ABAmqPLEwkNIYTuzoP19XVLuKZJu21R9dMGA++hAMCFn24mhTvmDw7duHZDLnvGH3a+Ive8WcXFr3/oY9oMVEPPMG3ftC0znsPoP1b+wxnJCUC2t85fzr9xHUdP9I+NTHuzdD0X4zzX8oFnmH2S+bfsP1ZabsgYyZnzQAA00LNffzmE8OuP5vqSuW93d7fcw7s9wbTQVpkW2irVSYZAfv7JDz39+H1DN67d7QkAYMJWckzSEIQGAGB52KLYCaEBAJqutSQ0AADptq/tJIWVYYtiJ4QGAGioznjLgwf259leaACAhno796LYCaEBABrqz77x7yGEPIMtE0IDADTaUr7xlkFoAICGW1kQGgCAHFo51rdMCA0A0GirS0IDAJDup5e2ksKh2w/k3EVoAIAmeuv8laSwf3/eMCA0AEAT/dHzL4UQPv3xE/l3ERoAoLmWc4+3DEIDADTZcr5VJxJCAwA0VyvfotgJoQEAmiv/eMsgNABAA924sZsUVnPP7BSEBgBooFEXxU4IDQDQOGffuTLGXkIDADTOc3/3/RDCk4+1R9pLaACAhlo+PMIkDUFoAIDGai2NMN4yCA0A0FgjDZ0IQgMANNbqotAAAKS7snktKSwcnhtpR6EBAJrlzXOXkkL+RbETQgMANMuX/vqlEMKjH33fqDsKDQDQRCujLFWVEBoAoIlGWt8yITQAQBONtL5lQmgAgCYSGgCALJ1FsY8u3zHqvkIDADTIO+/urW85d3CERbETQgMANMjZ83uhYWZm36j7Cg0A0CBf+dt/CyE8/vDdY+wrNABA44zxFGQQGgCggUZdFDshNABA44wxdCIIDQDQHJ3xlseW3Z4AANJtbe8khZVFoQEASPfW+ctJYYzxlkFoAIDmeOZr3w0hPHjy2Hi7Cw0A0CxjLIqdEBoAoFmOr4wzdCIIDQDQNMdbQgMAkMPRscZbBqEBABpiZ+dGUrhz9dB4NQgNANAIFze2ksL8bQfGq0FoAIBGOPfulYI1CA0A0AjPfv3lEMInH3zf2DUIDQDQIGM/BRmEBgBolPHWt0wIDQDQIHoaAIBcjq0IDQBAuu1re4tiuz0BAGQ5d35vvOV4i2Lv7VvSyQAA9fXFv/zXEMIvffjOIpUIDQDQFGMvip0QGgCgKVaXCoWG2e4X7Xa7U15bWytSLwBQN6tL4w+dCN2hod1udweFnpcAwLQ7tjL+0InQfXtCRACAKHUWxS4ys1PwTAMARO/S1WtJ4cihuSL1zA58t/vexMWLF99z4EuXjhw5klHj9vb27u7uxsZGkdOCCdBWmRbaKgX91/repbxgK+oNDcmzkN23Kt54443uDc6cOdP9vGS/ra2tmZmZy5cvFzktmABtlWmhrVLQc994LYTw0fsXeq7po+odPdH/ZMPJkyczXvZbX1+fm5trtVpFTgsmQFtlWmirFPZaCOHeDxy///77i9Ry85kGwyUAIGKtxUJPQYaMeRqC8RQAEJGCMzuF7tAgIgBAxFqFQ4MhlwAQs1IWxU4IDQAQs3cuXk0KBw/sL1iV0AAAMfuDr/5LWVUJDQAQvycfzZpjKSehAQDit7xY9CnIIDQAQBO0FoQGACCH1WWhAQDIofh4yyA0AEDELl/ZTgpLR24rXpvQAADR+sKXXyyxNqEBACL3xCMnSqlHaACAyC2XcW8iCA0AEL3lRaEBAMhhpYxJGoLQAADRWy28KHZCaACAOF27fiMptJbmS6lQaACAOF342aLY87cdKKVCoQEA4vR7f/7P5VYoNABAzD772AfLqkpoAICYLS3MlVWV0AAAMWstlvMUZBAaACBuZU3SEIQGAIhbWZM0BKEBAKJ0ZfNaUihlUeyE0AAAEfr8s99OCvv3l3atFxoAIFqf+uUTJdYmNABAtBYPlzbeMggNABCxEh9oCEIDAERsZbG0oRNBaACAiB0taX3LhNAAALHZ2fnZoth6GgCADO9ubCWFO+YPllit0AAAsfnd5/6pimqFBgCIU4mLYieEBgCI0+KRMidpCEIDAMSq3EkagtAAALFqlTreMggNABCr1UU9DQBAuqtb15PC0pEyJ2kIQgMAROa3/vgfk8LBA/vLrVloAIAIPfHIidLrFBoAIEILh8qcCzIhNABAhMpd3zIhNABAhEqfpCEIDQAQpXLXt0wIDQAQodWyZ3YKQgMAxOTdjc2kcKjURbETQgMAxON3vvKdpDAzs6/0yoUGAIjNZz5xbxXVCg0AEJvlCoZOBKEBAOKztCA0AAA5rCyUP94yCA0AEJ8qxlsGoQEAonHt+o2k0FrS0wAApPvNL/1DUih9UeyE0AAAUfnVj72/opqFBgCIymI14y2D0AAAkalifcuE0AAAUalifcuE0AAAUREaAIBcji5XMklDEBoAIA4bl7eTQhWLYieEBgCIwW//6YtJYf/+qi7uQgMAxOOJRz5QXeVCAwDEo7rxlkFoAICYVLS+ZUJoAIB4rFazVFVCaACAeLSW76iucqEBAOJxrLJJGoLQAAARePqZbyWFihbFTggNABCJhz9yZ6X1Cw0AEIlKx1sGoQEAotGqcuhEEBoAIBqtxQqfggxCAwBE46ieBgAgw40bu0mhtVRtT8Ns94t2u90pr62tVXpgAKAUV7euJ4WqH4S8GRra7XZ3UOh5CQDU0xf+5NtJobpFsRNuTwBADD7+Cz9X9SGEBgCIQdUPNISeZxpK8cW/+mHpdQIA2VYXqx06EfKEhldeeaX75euvv/7AAw9Udj4AwDgunn/zRz+6WOkhhoeGhx56KONlv8df37yxO3P3Xa0ip/XdH/z3R+5bXVkoFJpe/N7aEw+fKFLDm+c2/vfsxicefH+RSl77ydvb13YePHm8SCX/+eM3Wou3f/DupSKVlPWp/trH7p6Z2Td2Df937tL/vLXxyRp8qi/98Cetxds/fF+hqdp9qj201R7aao/6fKo1aas7Ozvf+f6Zglerza3rR5fnP/0r9x6Yrfapg327u3uDO8saPXHmzJn5+fljx46Vc4JQGW2VaaGtUhM3exrW1tbM0wAApHnP7QlBAQBIY8glAJDLzWcaAAAyzIaUJSeeeuqpgTucPn361Vdfzagx547JQXsevew/jTQDN06roeCxyGPghzz2Z5v/91tpQx2pmQ2koTJJpv+narMZgyZeeOGF/h3S/tR2G7pjcpTuP4gjjd0YuHFaDQWPxeSN9PsNlTXUUU+j4A+ioVan4EeXP+RVF2G7zyEUTpCd2qpOvWlvMr1mb8nvsuBBR9pdY52Y/itiov9PTPdm/bsM/JVN/vdY/IgaagTyh7xEdd+1ymoh+SNUwdSb9iZTrfxppKGbr8vUSs+X7J6rWn/jTGuudWjG2d/4w6CTHOl/wOKptw6fEuXaCw35e6vqxkWoVtI6G9I2G7pxWtfFhH/pnSOOPZ2JhloT/V1c2f1etZX9jX/gNp03O+Vp+WGpj73QMMb/MwN7nMZugmN0YblVVk85c8NQZd0fLdhQe444RseJhlpzeX41dfhalfNinyeyd9c53q0KGmv82xOlN6C0h8YH0oLjVmIHQ8En4Io/caah1sp499fL6oooEmGz+wyqI/XSrXf0RB3k6V6r2znTLU+/UUaHRE1+6SMdsSbnTLaevy2TP4Fy28MEWpc2TI/ZjHu0A5/4PX369NBKh+7YOWJ3hh2pA7B/AFLaD9J/rLFvSzOG8T7tgQPM0kadTaChdo446o+joU67ablqFu8CkXrJo+4zQmq1TAUNtc7SOhj6u7vyPzk4MMJWOk9DnhPLM51D2o+T5/ZH/1GyP5A858N0qXVo8IeYqaCh1pxf0FA+InKq9YJVGjFTQUNlqkkM5FfrngaAIjz5D+USGgCAXGp9ewIAqA+hAQDI5f8BnMKEXXj1954AAAAASUVORK5CYII=" height="200" width="700" margin="0 auto"/> @@ -5643,7 +5643,7 @@ </h2> <img alt="" - src="data:image/png;base64,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" + src="data:image/png;base64,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" height="200" width="700" margin="0 auto"/> @@ -6653,7 +6653,7 @@ </h2> <img alt="" - src="data:image/png;base64,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" + src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAACXBIWXMAAA7EAAAOxAGVKw4bAAANmUlEQVR4nO3d348d10EH8OP1rvdHso7Xe/eXN7Wc3jSqI5BoIUVpSUtDf0CroiR9KKhIPCCBQKqqCFWtKiRWFagIFeUBCZ544Q9oUhWoClVpgUq0UV+QgiysmxXQtes4iXHWjnft9V4exrl7c3/OnR+7c2c+n6dzV2fOzN57dud7z5wzc6zZbIY29Xo9KjQajQAA8JbJ9hf1el1WAAB6mmiVJAYAYIDOkYZWWYAAANq9LTS0B4XWwMPW1lZ7nStXrqyurg5ocWdnZ2Ji4sSJE5keJ2RPX2Vc6KsUxMTwKiO6ffv23t5e5s1C5vRVxoW+SkFMDq2xvr4+4GW3ZrM5PT1dq9VSHRfkT19lXOirFET2Iw0AQCkdjDQ0Gg0TIQGAfvpOhAQAaOfyBAAQi9AAAMQiNAAAsQxfcpm3Ys6+dFNtAOhwxKGh49xcnFN1QQ4DAIrjKC9PdEcEp2oAKKwjG2kYOqjQumzRqhZt0n05o7up9p8MbqfVwoA24x9Jz6YAoByOfk5DTx3n7J7l7pfJ2hnc5khbFfZqCwCkl0FoeObZ5+NX/vpzTw+t03GubT8Z9zwHd5ytW+VR22lVS3wkA5oCgHF32CMNGxsbGxsbh7a79osF/XRcqkgjw6YAoGgyCA1ff+7pjY2Nhx56KHp57dq1ycnJ+fn5npU3N9PvsIfWGED32EDMzcNbCSPl+T7DpgCgULIZaWgfPNja2orzCNfuE/yR6zet8mibAoCCOMollx0LEELbF/T2n8c89fYcZujZfocBlzBGPZI4V0MAYEwd8eqJfgsX23+e5st6nOd9D64z0pF4vDgAJXas2Wxm22LMyxNw5PRVxoW+SkF4YBUAEIvQAADEIjQAALEIDQBALEIDABCL0AAAxCI0AACxCA0AQCxCAwAQnnn2+Weeff76jd0BdYQGAKi6W7t7UWF66viAakIDAFTd5Ve2o8LM9KCHUgkNAFB1l1+9Gaea0AAAVfcXf/tiCOE3fvX84GpCAwAQQghrS/cNriA0AAAhhLBWu39wBaEBAAghhDPLQgMA0N/lqzeiwtzM1OCaQgMAVNpPrrwRs6bQAACV9tW/+WEI4dMfeWRoTaEBAAiri0OWTgShAQAIIazWhAYAoL/9/WZUOLM8P7Sy0AAA1XXtjZ2osHByZmhloQEAqmvrrfWWcQgNAFBdG3/1byGEX//lh+NUFhoAoOpWFufiVBMaAKDqVk4PXzoRhAYAqKzW0om1pSFPnYgIDQBQUTu7e1GhtuDyBADQ39bV7agwNRkrDwgNAFBRX3zu+yGETzzxzpj1hQYAqLTawmzMmkIDAFTacrylE0FoAICKi/N8y4jQAABVdGdvPyrEeb5lRGgAgCr66Ws3o8LczFTMTYQGAKiiz//Zd0bdRGgAgOr6zV87H7+y0AAA1bUU716QEaEBAKor/izIIDQAQAXdvXtv6cSZeI+qiggNAFA517Z3osLJ+6fjbyU0AEDlXHrlRoKthAYAqJyNv/5BCOHTH31kpK2EBgCoqKVTIyydCEIDAFTW6qLQAAD0t7/fjAoro6y3DEIDAFTNmzt3osLpB4w0AAD9XX713qOqpiZHiwFCAwBUyxef+14I4VMfqo+6odAAAFVUG+WpExGhAQCqaPm00AAAxLBWG+GpExGhAQAq5NbuXlRYGfEmDUFoAIBKefX1e0snpk9Mjrqt0AAAFfL5P/9uCOFjj59LsK3QAACVk2DpRBAaAKCClk7NJthKaACAylldGnnpRBAaAKA67uztR4X1ZaEBAOjv9eu3osLczFSCzd+23KJeP7gNdaPRSHNYAEDR/P6f/GNUmJg4lmDzg9BQr9fbg0LHSwCgHJ5+8l3JNjy4PCEiAEAVJHjqRMScBgColrVESydCx5yG0DatoTXwcP369fYKN27cOHny5IAWb9++3Ww2t7e3kx0QHBp9lXGhr5Kt+dljybpTZ2hoZYXWnIZLly61V9jc3GyfL9ltd3d3YmLi5s2bCY4GDpO+yrjQV8nEzVv3HlV168Zrl95MNxGyn/Pnzw942W1ra2t6erpWqyU4GjhM+irjQl8lExdefi2E/wohPHr+3claOJjTMHj8AAAYa1/+y38JIXz8/ecSt3Aw0tBoNNynAQDKbbWWcBZk6Lg8ISgAQLmt1e5LvK0llwBQIYnXWwahAQCq4M2dO1HhjNAAAAxw5bV7S3aPH09+6hcaAKD8/vBr/xxC+MDPradpRGgAgKpYXUo+CzIIDQBQHespJjQEoQEAquPM8nyazYUGACi5u3f3o8K60AAADHD12ptRYXZ6+DOnBhAaAKDk/uBP/ykqTEwkebhli9AAAJXwiSfembIFoQEAKuHBdBMagtAAABVxZjnVessgNABARTy4YqQBAOjv2hs7UeH0A7MpmxIaAKDMfuePv5VVU0IDAJTfxx4/l74RoQEAym813VMnIkIDAJRfykdVRYQGACi/9Ostg9AAACV2a3cvKqzVhAYAoL/PfumbUSHlUyfuNZK+CQCgyD78vrOZtCM0AEDJrdXuy6QdoQEASm5lUWgAAGLIZL1lEBoAoPQyubNTEBoAoKy2XtmOCnMzU5k0KDQAQDl97qvfCSF88OffkVWDQgMAlNny6bmsmhIaAKDMlheFBgAghjNZ3EA6IjQAQAnt7zejwlpGSyeC0AAApfT69VtRYeHkTFZtCg0AUEK/+5VvZ96m0AAApfXUk+/KsDWhAQBKa+nUbIatCQ0AUFqr2S2dCEIDAJRP29KJbJ5vGREaAKBsdnb3osLiqczu7BSEBgAon9/68t9FhanJLE/0QgMAlNMnP1jPtkGhAQDKaWkhy6UTQWgAgLLK8PmWEaEBAMppZTHL9ZZBaACAkrmztx8VVrJ7KHZEaACAUvnMF74RFeZmprJtWWgAgBL6+PvPZd6m0AAAJXT6gYyXTgShAQBKKfOlE0FoAIBSWlnM8qkTEaEBAMqjtXRifXk+88aFBgAoj//b3okK8/edyLxxoQEAyuP3vvLtEMKT7zubR+NCAwCUzemTM3k0KzQAQNksnc5+FmQQGgCgfPJYbxmEBgAojf39ZlRYWzLSAAD0d/PW7aiwcDL720EGoQEASuO3/+gfosLUZC7nd6EBAErlUx96OKeWhQYAKJXaQi7XJoLQAAAls5rP0okgNABAyazUclk6EYQGACiHW7t7USGP51tGhAYAKIPPfumbUWH6xGROuxAaAKA8Pvr4ufwaFxoAoDyWFvKaBRmEBgAok5Xclk4EoQEAyiS/WZBBaACAEriztx8VHly5P7+9CA0AMPY+84VvRIWZ6an89iI0AEBJfOA96xMTx/JrX2gAgJJYXshxQkMQGgCgNFYWc1w6EYQGACiN1TyXToQQ3nanyXq93io3Go1cdwwAZOvM8nyu7R+Ehnq93h4UOl4CAMX0zLPPR4WFk9O57sjlCQAog/e8e/n48XxP60IDAJRBrk+diGT/9MzPfe1HmbcJAAy2WsvxXpCR4aHhxRdfbH954cKFRx99NLfjAQCSeHnzf3784zdy3cXw0PDYY48NeNntVy7s7Dcnzq7X0hzWd3/43z/7yNLiA7NpGvn7f2185BfPpWnh8tXtn1zZ/qX3viNNI//58qu379x97/nVNI38+39cqp2affjsQppGsnpXP/wLZ9PcceynV2/87yvbTxTgXf3ej16unZr9mUfW0jTiXe2gr3bQVzsU510tSF+9e/fut36wmfJstbO7N3//iU8+8fDsTPYXENodazabUSmr1RObm5tzc3MrKyvZHCDkRl9lXOirFMRBJGk0Gu7TAAD087ZxDEEBAOjHkksAIJaDOQ0AAANMhj6PnHjqqad6bnDx4sWXXnppQIsxN4x22jH1svsw+ulZuV8LKfdFHD3f5MTvbfzPN9eOOlI360lH5TC5/T95mxywaOKFF17o3qDfv9p2QzeM9tL+D3GktRs9K/drIeW+OHwjfb4ht4466mGk/EV01PykfOvih7z8Imz7MYTUCbLVWt6pt98PGV+TR/JZptzpSJvrrIem+4wY6f4X016te5OeH9nhf47p96ijlkD8kBfJ77tWVj0kfoRKmXr7/ZCxlu9dIMDXZQql40t2x1mtu3P2665F6MaDv/GHXgc50h9g+tRbhHeJbN0LDfFHq4rGSahQ+g029Ks2tHK/oYtD/tBbe0x8OxMdtSC6h7gGj3sV1uBv/D3rtH7YKo/LL0tx3AsNCf5meo44Je6CCYawXCorppi5Yaisro+m7Kgde0wwcKKjFlycj6YIX6tinuzjRPb2NpNdqqCykl+eyLwD9Zs03pMeXG4ZDjCknAGXfsaZjlooya6vZzUUkSbCDh4zyI/US7vO1RNFEGd4rWjHTLs440YDBiQK8qGPtMeCHDODdfxvOfwDyLY/HELv0ofpMDngGm3PGb8XL14c2ujQDVt7bM+wIw0Adi9A6veLdO8r8WVpEkj2bvdcYNZv1dkhdNTWHkf9dXTUcTcuZ830QyBSL3EU/Y6Qei1jQUctsn4DDN3DXfFnDvaMsLnepyHOgcW5nUO/XyfO5Y/uvQx+Q+IcD+Ol0KHBP2LGgo5acD6gobxFxFToB1bpxIwFHZWxJjEQX6FHGgDSMPMfsiU0AACxFPryBABQHEIDABDL/wNQ5isKNeg4QAAAAABJRU5ErkJggg==" height="200" width="700" margin="0 auto"/> @@ -7078,7 +7078,7 @@ </h2> <img alt="" - src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAOyElEQVR4nO3d748c910H8G/uh+341/3a8zlx68a+UpOEgkgbEpo2ASWphGgfNELiAVRISEgg6IM8KCIUVQ6iCKmIqEJIVPwPrRCNggBVVaDQNqoQSInCg4tp4BIuduy457vs7e3t8WAu583+nN2Zud37zuv16Lvrmc/OzY5n3jsz3/nesbu7G9osLy+vrKy0vw8AlNZE+1vLy8sHvxwAwJhrDQ3OMQAAHb0vNEgMAEA3U/utbolhdXW1+eXa2trZs2d7VKxWqxMTE0eOHMlrEYnMzs5OtVo9ceLEqBeE8bWxsXHs2LHJyclRLwhjqlarNRqNY8eOjXpBovJ7X/1+COFPf+dnT5/segSfan7RfDfD0GcdarXa1NSU0EA3Ozs7tVpNaKCHWq02PT0tNNBNvV6v1+tCQ452GrstjY5uh4bmiNCcGM6dO9c8Q8vLdru7u0ePHq1UKgMtLuWxsbHRaDTuvvvuUS8I46tarS4uLkqWdHPt2rWtrS27kRxdu7GZNO7/yQs9JuvQewIAKJWrN95NM5nQAABl96W/fDGE8NnH+jxzoXNo0IcCAMpm7nSf20ScaQAAQhAaAICUKrN39p5AaAAAQghhce547wmmev/zAWh+OMT43Evh4ZgAlMRmdTtpzM30OdMw4tDQcmwen0P1mCwGABRt/yEN01N9rj+M8vJEe0RwqAaAA5byIQ1hhGca+p5U2L9ssT9ZMkv75Yz2Us3v9K6zX6FHzfRL0rEUAIyzr/zNv4UQfuXJS32nHP09DR21HLM7tttfDlend82B5hrbqy0A0Nt8v/6WIZfQ8NTT30w/8Tee+1zfaVqOtc0H447H4Jaj9X570Dr7kw29JD1KAcA4m589kNAwkMuXL1++fPnAPq75YkE3LZcqssixFAAcpMXZPv0tQy6h4RvPfe7y5csXLuyNi3Xjxo2pqalTp051nPjKlewf2MH+OYD2cwMpZw/vJYyMx/scSwHAgTkzfyChIYTQfPJgdXU1zdDY7Qf4ket2W+VoSwFAcW78uJo0Thw/0nfiUXa5bOmAEJp+oDe/n/LQ2/E0Q8f6LXpcwhh0SdJcDQGA8fHW9Y30E4+490S3jovN72f5sd6tfvppBlqSNB8HAOPjma+9GEL45UdT/egdfZfLbkfW9vf7vtMtE2R8Z6DpBQUADp2+41smDFgFAGW3IDQAAGnM9xsUOyE0AEDZVeaEBgCgu9r2TtJY6DcodkJoAICS2u9veWR6Ms30QgMAlNS11INiJ4QGACipP/76v4YQnnr8IymnFxoAoNRSPqQhCA0AUHILM0IDAJBCJcX4lgmhAQBKbXFOaAAAuvvxra2kcfLO6ZSzCA0AUEZvXd9MGpOTacOA0AAAZfT7z30nhPDpT9yTfhahAQDKaz51f8sgNABAmc2nG3UiITQAQHlV0g2KnRAaAKC80ve3DEIDAJRQo7GbNBZTP9kpCA0AUEKDDoqdEBoAoHTW3t4cYi6hAQBK59m//m4I4TOPLQ80l9AAACU1f2qAhzQEoQEASqsyN0B/yyA0AEBpDdR1IggNAFBai7NCAwDQ3WZ1O2nMnDo60IxCAwCUy5tXbyWN9INiJ4QGACiXL/7Fd0IIj37sA4POKDQAQBktDDJUVUJoAIAyGmh8y4TQAABlNND4lgmhAQDKSGgAAHrZHxT7zPyJQecVGgCgRN5+Z298y6NHBhgUOyE0AECJrF3fCw0TE3cMOq/QAAAl8uW/+pcQwuMPnR9iXqEBAEpniLsgg9AAACU06KDYCaEBAEpniK4TQWgAgPLY72+5NO/yBADQ3VZtJ2kszAoNAEB3b13fSBpD9LcMQgMAlMfTX/12COGBe5eGm11oAIByGWJQ7ITQAADlcnZhmK4TQWgAgLI5WxEaAIAUzgzV3zIIDQBQEjs7jaRx1+LJ4SoIDQBQCjfXt5LG8WPTw1UQGgCgFK6+s5mxgtAAAKXwzNdeDCF86oEPDF1BaACAEhn6LsggNABAqQw3vmVCaACAEnGmAQBIZWlBaAAAuqtt7w2K7fIEANDL1et7/S2HGxR7b96cFgYAGF9f+LN/CiH83E/dlaWI0AAAZTH0oNgJoQEAymJxLlNomGp+sby8vN9eWVnJUhcAGDeLc8N3nQjNoWF5ebk5KLS8BAAOu6WF4btOhObLEyICAERpf1DsLE92Cu5pAIDo3Xp3O2mcPnk0S52pju82X5u4efPm+z741q3Tp0/3qFir1XZ3d9fX17MsFhGrVqv1et0WQg/1en1zc7PRaIx6QRhT1Wp1e3vbbiS9/17dO5RnXGmtoSG5F7L5UsUbb7zRPMGVK1ea75dst7W1NTExsbGxkWWxiFi9Xq/X6y3bFTRLDglTU51/1cD29naj0ajVaqNekEPj2a+/EkL42KWZjPve1t4T7Xc23HvvvT1etltdXT169GilUsmyWERsY2NjbW3t4sWLo14Qxtdrr722tLR04kSmO7aI2LVr17a2ts6dOzfqBTlEXgkhXPzQ2UuXLmWpcvueBt0lACBildlMd0GGHs9pCPpTAEBEMj7ZKTSHBhEBACJWyRwadLkEgJjlMih2QmgAgJi9ffPdpHFkejJjKaEBAGL2u1/5x7xKCQ0AEL/PPNrrGUspCQ0AEL/52ax3QQahAQDKoDIjNAAAKSzOCw0AQArZ+1sGoQEAIraxuTes19zpY9mrCQ0AEK3Pf+n5HKsJDQAQuScevieXOkIDAERuPo9rE0FoAIDozc8KDQBACgt5PKQhCA0AEL3FzINiJ4QGAIjTdr2RNCpzx3MpKDQAQJxuvDco9vFj07kUFBoAIE6//Sf/kG9BoQEAYvbZxz6cVymhAQBiNjdzNK9SQgMAxKwym89dkEFoAIC45fWQhiA0AEDc8npIQxAaACBKm9XtpJHLoNgJoQEAIvTrz3wraUxO5nasFxoAIFpP/vw9OVYTGgAgWrOncutvGYQGAIhYjjc0BKEBACK2MJtb14kgNABAxM7kNL5lQmgAgNjs7Lw3KLYzDQBAD++sbyWNE8eP5FhWaACA2PzWs39fRFmhAQDilOOg2AmhAQDiNHs6z4c0BKEBAGKV70MagtAAALGq5NrfMggNABCrxVlnGgCA7t7dqieNudN5PqQhCA0AEJlf+4O/SxpHpifzrSw0AECEnnj4ntxrCg0AEKGZk3k+CzIhNABAhPId3zIhNABAhHJ/SEMQGgAgSvmOb5kQGgAgQot5P9kpCA0AEJN31qtJ42Sug2InhAYAiMdvfvmFpDExcUfuxYUGAIjNL33yYhFlhQYAiM18AV0ngtAAAPGZmxEaAIAUFmby728ZhAYAiE8R/S2D0AAA0diuN5JGZc6ZBgCgu1/94t8mjdwHxU4IDQAQlV/4+AcLqiw0AEBUZovpbxmEBgCITBHjWyaEBgCIShHjWyaEBgCIitAAAKRyZr6QhzQEoQEA4rC+UUsaRQyKnRAaACAGv/FHzyeNycmiDu5CAwDE44mHP1RccaEBAOJRXH/LIDQAQEwKGt8yITQAQDwWixmqKiE0AEA8KvMniisuNABAPJYKe0hDEBoAIAJPPf3NpFHQoNgJoQEAIvHQR+8qtL7QAACRKLS/ZRAaACAalSK7TgShAQCiUZkt8C7IIDQAQDTOONMAAPTQaOwmjcpcsWcapppfLC8v77dXVlYK/WAAIBfvbtWTRtE3Qt4ODcvLy81BoeUlADCePv+H30oaxQ2KnXB5AgBi8ImfubvojxAaACAGRd/QEFruacjFF/78B7nXJEb/MeoFAIjK4myxXSdCmtDw0ksvNb989dVX77vvvsKWBwAYxs3rb/7whzcL/Yj+oeHBBx/s8bLd469WG7sT589VsizWt7//o49+ZHFhJlNoev6fV5546J4sFd68uv6/a+uffOCDWYq88tq12vbOA/eezVLke//5RmX2zg+fn8tSJK+1+osfPz8xccfQFV5/850frd548pGfyLIY1mqL/7t663/eWv9ULNvqCy/+109fWrprcSZLEWu1RUzb6r+/slqtbT/ywIUsRcZkre7s7Lzw3SsZj1bVrfqZ+eOffuTi9FSxdx3csbu717kzr94TV65cOX78+NLSUj4LSHTW19dff/31+++/f9QLwvh6+eWXz58/f+rUqVEvCGNqbW1tc3PzwoVMoYEh3D7TsLKy4jkNAEA377s8ISgAAN3ocgkApHL7ngYAgB7e9xjp8P4rFLnc4pCxbMeJu1Uo6E847DquloxfaCLHrWKgZbNVHIyMz5LPvp4Pcl/R7U2aGV6AvdCQbArN/8Fy6UyRsWzHibtVKOhPoFlBW0XzPw23DLaKcZN9PR/kvqLbm+XR8ofnHhYzJshu0X/oUmnmFUM72gsN7X9VLn9nxiIDzR7ZF5Ov9h1oov0/QPNkBR1Qu9VMude2VYxEy6625csqaAeSXvatwqaSyxoYKL0dvPQfLYZ2k/9jpDksxud/8sg/nb7ao+QB5EtGq/ev6nCwYbH5mN1yPO6WaNt/96dfPDG0mz6hIf2ZnKLZK2XU7WRDt8k6TrxSzMM8hv5ybRUjlGbNj2QHYqvIRe9f1R2nGZXeibaZ+5my6xMaemwcHc+6pDwmDbKEcV4WGomUuaGHvicnhtsqWmZMfy+kreLADHeWNcsOxL7igKU8oKZfvftfekE/Nnro9hHDnVsdk2w0Joa/PDH0Sux4mqsb39bhMtyXNej/ZFvFAWv5cZlLzTTfoH3FQep9z9NAWtJbXj829sNHmtlzIYa26xoaDuB/YN/TXPYCuUt5p+GYrHlbxeGV79dkXzESB3bRMK/Tn/mmBxtVR7e7XDY3VlZWcjmh1F62+c1Bz1r3XrCC/oSIDbF+itsqhquwvxi2ikINcaUg302l6H1FtzfZl/IIWvSBtojiYuhAxuWJkL4h2tkqRms81/94LtVh1+3Aud9uiVbNb3abpduMw/1O6HFcbyneYwvpFiIz/iEdV0vfdXVIjUVosBegna1i5MbwKxjDReKws1ENZCxCAzBWnKKnJCSGQQkNAEAqhsYGAFIRGgCAVIQGACCV/werDc4tHkr6DgAAAABJRU5ErkJggg==" + src="data:image/png;base64,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" height="200" width="700" margin="0 auto"/> @@ -7416,7 +7416,7 @@ </h2> <img alt="" - src="data:image/png;base64,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" + src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAACXBIWXMAAA7EAAAOxAGVKw4bAAANKUlEQVR4nO3d74tl50EH8GdnZmeTye7OvTN3djemXTedEm3aIsamibVNLEkLxRTSIPjCFkEQFO2LvGgxVspUrAiVhiKC4v/QRmyoqJQQrdqGvilEAst0EV3jZpPdpJvszs7szPjimd7c3J/nnh8zZ57z+bx67nDOc87c+8yc733OeZ7nyO7ubuixuroaQlhfXw8AAD1mel+srq6KCwDAUO8IDRIDADDKzORNAABCmJu4xcWLF3tfXrp06cyZM2O239jYmJmZmZ+fL3pqUDFtlcNCW2Uf/MHXvh9C+LPf+8WTx0e2tPJ7GjY3N2/dulV6tVA6bZXDQlulats7u32FoSb3NNx1111jXg7a3d09duxYp9OZWDMcLG2Vw0JbpWqvXr0eC+//+bvHbOaZBgBoustXb2TZ7B09DXGShmC2BgBoki/95fMhhE8/vDp+s3eEBikBABqrffK28Ru4PQEAhCA0AAAZdVq3j99AaAAAQghhpb0wfoPJQy6r1n36MtTpoQrLcADQENc3tmKhvTihp+GAQ0Pftbk+l+qanAYAVK07ScPRuQn3Hw7y9sRgRHCpBoB9lnGShnCAPQ0TOxW6ty26m8VdBm9nDFbV+5Px9XRrGFNn9jMZWhUA1NlX//bfQwi//omfm7jlwT/TMFTfNXtoefBlvnrG1znVXrW92wIA4y1NGm8ZSgkNTzz5rewbf/Ppz0zcpu9a23sxHnoN7rtad8vT1tPdLPeZjKkKAOpsqbUvoWEqa2tra2tr+3a43psFo/TdqiiixKoAYD+ttCaMtwylhIZvPv2ZtbW1u+/eWxfr6tWrc3NzJ06cGLrxhQvFDzhEtw9gsG8g4+6hpBU3SqwKAPbNqaV9CQ0hhN7Og4sXL2ZZwnXwAn/gRj1WebBVAUB1rv5kIxbuWJifuPFBDrnsG4AQer6g9/4846V3aDfD0Pr7jLmFMe2ZZLkbAgD18cqVt7JvfMCjJ0YNXOz9eZEv66Pqz77NVGeS5XAAUB9PfeP5EMKvPZTpS++R3d3dcg+f8fYEHDhtlcNCW6U6cQjkZx97/xOP3DNxYwtWAUDTLWeYpCEIDQDA0qRFsSOhAQCartMWGgCA0Ta3tmNhedKi2JHQAAAN1R1vOX90Nsv2QgMANNSrmRfFjoQGAGioP/mbfwshZBlsGQkNANBo7WzjLYPQAAANt7woNAAAGXQyrG8ZCQ0A0GgrbaEBABjtJ2/ejIXjtx/NuIvQAABN9MqV67EwO5s1DAgNANBEX3z6uRDCJz9yLvsuQgMANNdS5vGWQWgAgCZbyrbqRCQ0AEBzdbItih0JDQDQXNnHWwahAQAaaGdnNxZWMs/sFIQGAGigaRfFjoQGAGicS69dz7GX0AAAjfOVv/5eCOGxh1en2ktoAICGWjoxxSQNQWgAgMbqtKcYbxmEBgBorKmGTgShAQAaa6UlNAAAo13f2IqFxRPHptpRaACAZnn58puxkH1R7EhoAIBm+cLXnwshPPRL75p2R6EBAJpoeZqlqiKhAQCaaKr1LSOhAQCaaKr1LSOhAQCaSGgAAMbpLop9aumOafcVGgCgQV57fW99y2PzUyyKHQkNANAgl67shYaZmSPT7is0AECDfPmv/jWE8MgDZ3PsKzQAQOPkeAoyCA0A0EDTLoodCQ0A0Dg5hk4EoQEAmqM73vL0ktsTAMBoNze3Y2G5JTQAAKO9cuWtWMgx3jIIDQDQHE9+7bshhPvedzrf7kIDADRLjkWxI6EBAJrlzHKeoRNBaACApjnTERoAgAxO5RpvGYQGAGiI7e2dWLhz5Xi+GoQGAGiEN67djIWF247mq0FoAIBGuPz69YI1CA0A0AhPfeP5EMLH7ntX7hqEBgBokNxPQQahAQAaJd/6lpHQAAANoqcBAMjk9LLQAACMtrm1tyi22xMAwDiXr+yNt8y3KPbeviWdDABQX5//838OIXz4A3cWqURoAICmyL0odiQ0AEBTrLSFBgAgg5V2/qETQWgAgOY4vZx/6EQQGgAged1FsYvM7BSEBgBI3ps3tmLh5PFjReoRGgAgcZevFl0UOxIaACBxX/z6cyGEj3/4bMF6hAYAaIROsUkagtAAAA3RaRV6CjIIDQDQEAVndgpCAwA0REdoAADGKGVR7EhoAICUvfbGjViYPzpbsCqhAQBS9vtf/aeyqhIaACB9jz20WrwSoQEA0rdUeJKGIDQAQBN0FoUGACCDlSWhAQDIoPh4yyA0AEDC3rq+GQvtk7cVr01oAIBkfe5Lz5ZYm9AAAIl79MFzpdQjNABA4pbKuDcRhAYASN5SS2gAADJYLmOShiA0AEDyVgovih0JDQCQpq1bO7HQaS+UUqHQAABpuvrTRbEXbjtaSoVCAwCk6Xf/9B/LrVBoAICUffrh95ZVldAAAClrLx4rqyqhAQBS1mmV8xRkEBoAIG1lTdIQhAYASFtZkzQEoQEAknR9YysWSlkUOxIaACBBn33q27EwO1vatV5oAIBkfeKXz5VYm9AAAMlqnShtvGUQGgAgYSU+0BCEBgBI2HKrtKETQWgAgISdKml9y0hoAIDUbG//dFFsPQ0AwBivX7sZC3cszJdYrdAAAKn5na/8QxXVCg0AkKYSF8WOhAYASFPrZJmTNAShAQBSVe4kDUFoAIBUdUodbxmEBgBI1UpLTwMAMNqNm7dioX2yzEkagtAAAIn5zT/8+1iYPzpbbs1CAwAk6NEHz5Vep9AAAAlaPF7mXJCR0AAACSp3fctIaACABJU+SUMQGgAgSeWubxkJDQCQoJWyZ3YKQgMApOT1axuxcLzURbEjoQEA0vHbX/5OLMzMHCm9cqEBAFLzqY++p4pqhQYASM1SBUMngtAAAOlpLwoNAEAGy4vlj7cMQgMApKeK8ZZBaACAZGzd2omFTltPAwAw2m984e9iofRFsSOhAQCS8qsfendFNQsNAJCUVjXjLYPQAACJqWJ9y0hoAICkVLG+ZSQ0AEBShAYAIJNTS5VM0hCEBgBIw7W3NmOhikWxI6EBAFLwW3/8bCzMzlZ1cRcaACAdjz74s9VVLjQAQDqqG28ZhAYASElF61tGQgMApGOlmqWqIqEBANLRWbqjusqFBgBIx+nKJmkIQgMAJOCJJ78VCxUtih0JDQCQiAc+eGel9QsNAJCISsdbBqEBAJLRqXLoRBAaACAZnVaFT0EGoQEAknFKTwMAMMbOzm4sdNrV9jTM9b5YXV3tltfX1ys9MABQihs3b8VC1Q9Cvh0aVldXe4NC30sAoJ4+90ffjoXqFsWO3J4AgBR85Bd+pupDCA0AkIKqH2gIfc80lOLzf/GD0usEAMZbaVU7dCJkCQ0vvPBC78uXXnrp3nvvrex8AIA83rjy8g9/+Ealh5gcGu6///4xLwc98tLGzu7M2bs6RU7ru9//rw/es7K8WCg0Pfsv648+cK5IDS9fvvY/l6599L53F6nkP3/86ubW9n3vO1Okkv/40f92Wre/92y7SCVlvasf/9DZmZkjuWv4v8tv/vcr1z5Wg3f1uR/8uNO6/QP3FJqq3bvaR1vto632qc+7WpO2ur29/Z3vXSh4tdq4eevU0sInf+U9R+eqfergyO7u3uDOskZPXLhwYWFh4fTp0+WcIFRGW+Ww0Fapibd7GtbX183TAACM8o7bE4ICADCKIZcAQCZvP9MAADDGXBix5MTjjz8+dIfz58+/+OKLY2rMuGM8aN+jl4OnMcrQjUfVUPBYZDH0Tc793mb/fCttqFM1s6E0VPaT6f+p2tyYQRPPPPPM4A6j/tX2mrhjPErvP8Spxm4M3XhUDQWPxf6b6vMNlTXUaU+j4C+ioVan4FuXPeRVF2F7zyEUTpDd2qpOvaN+yOE1dyCfZcGDTrW7xrpvBq+I0eC/mN7NBncZ+pHt/+dY/IgaagKyh7youu9aZbWQ7BGqYOod9UMOtfKnkYZevi5TK31fsvuuaoONc1RzrUMzHv+NPww7yan+AIun3jq8S5RrLzRk762qGxehWhnV2TBqs4kbj+q62OcPvXvE3NOZaKg1MdjFNb7fq7bGf+Mfuk33h93yYfllqY+90JDjb2Zoj1PuJpijC8utsnrKmBsmKuv+aMGG2nfEHB0nGmrNZflo6vC1KuPFPktk760z360KGiv/7YnSG9Coh8aH0oLTVmIHQ8En4Io/caah1kq+++tldUUUibDj+wyqI/XSq3/0RB1k6V6r2znTK0u/0ZgOiZp86FMdsSbnzHh9/1v2/wTKbQ/70Lq0YfrMjblHO/SJ3/Pnz0+sdOKO3SP2ZtipOgAHByCN+kUGj5X7tjQ55Hu3hw4wGzXqbB8aaveI0/46Guphd1iumsW7QKResqj7jJBaLYeChlpnozoYBru7sj85ODTCVjpPQ5YTyzKdw6hfJ8vtj8GjjH9DspwPh0utQ4N/xBwKGmrN+YAm8haRUa0XrNKIORQ0VA41iYHsat3TAFCEJ/+hXEIDAJBJrW9PAAD1ITQAAJn8P6CVxce3t50SAAAAAElFTkSuQmCC" height="200" width="700" margin="0 auto"/> diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_only__ScheduledReports.generateReport_week.original.html b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_only__ScheduledReports.generateReport_week.original.html index eaf1102da5..fc774cea8a 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_only__ScheduledReports.generateReport_week.original.html +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_only__ScheduledReports.generateReport_week.original.html @@ -34,7 +34,7 @@ <p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;'> Please find below your day report for A very long name for a very tiny test site, that also reaches the 90 character limit fully. <br />Mail Test report with <long> déscription and some 🚀 $peciäl characters $%&-~°^'"@#*ߧ²³ - <br />Date range: week April 4 – 10, 2011 + <br />Date range: week April 4 – 10, 2011 <br />Sent from http://example.com/piwik/tests/PHPUnit/proxy/. </p> diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf Binary files differindex 32eec900e3..5838ac648a 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_via_sms_all_sites__ScheduledReports.generateReport_week.original.sms.txt b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_via_sms_all_sites__ScheduledReports.generateReport_week.original.sms.txt index 46d968fbe2..b4ed253ff0 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_via_sms_all_sites__ScheduledReports.generateReport_week.original.sms.txt +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_via_sms_all_sites__ScheduledReports.generateReport_week.original.sms.txt @@ -1 +1 @@ -week April 4 – 10, 2011. A very long name for a very tiny test site, that also reaches the 90 character limit fully: 5 Visits (+100%), 16 Actions (+100%), Revenue: $130 (+100%), 5 Goal conversions (+100%), Product Revenue: $130 (+100%), 4 Ecommerce Orders (+100%). Piwik test: 2 Visits (+100%), 1 Actions (+100%)
\ No newline at end of file +week April 4 – 10, 2011. A very long name for a very tiny test site, that also reaches the 90 character limit fully: 5 Visits (+100%), 16 Actions (+100%), Revenue: $130 (+100%), 5 Goal conversions (+100%), Product Revenue: $130 (+100%), 4 Ecommerce Orders (+100%). Piwik test: 2 Visits (+100%), 1 Actions (+100%)
\ No newline at end of file diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_via_sms_one_site__ScheduledReports.generateReport_week.original.sms.txt b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_via_sms_one_site__ScheduledReports.generateReport_week.original.sms.txt index f5c8810054..d94f0eb0ca 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_via_sms_one_site__ScheduledReports.generateReport_week.original.sms.txt +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_via_sms_one_site__ScheduledReports.generateReport_week.original.sms.txt @@ -1 +1 @@ -week April 4 – 10, 2011. 5 Visits (+100%), 16 Actions (+100%), Revenue: $130 (+100%), 5 Goal conversions (+100%), Product Revenue: $130 (+100%), 4 Ecommerce Orders (+100%)
\ No newline at end of file +week April 4 – 10, 2011. 5 Visits (+100%), 16 Actions (+100%), Revenue: $130 (+100%), 5 Goal conversions (+100%), Product Revenue: $130 (+100%), 4 Ecommerce Orders (+100%)
\ No newline at end of file diff --git a/plugins/Goals/Reports/Get.php b/plugins/Goals/Reports/Get.php index 247e4c1de0..9e73143cea 100644 --- a/plugins/Goals/Reports/Get.php +++ b/plugins/Goals/Reports/Get.php @@ -194,7 +194,7 @@ class Get extends Base $value = reset($columns); $columnName = key($columns); - $pastValue = $previousDataRow->getColumn($columnName); + $pastValue = $previousDataRow ? $previousDataRow->getColumn($columnName) : 0; if (!is_numeric($value)) { return; diff --git a/plugins/Intl/lang/ar.json b/plugins/Intl/lang/ar.json index 8f135fffd1..26bc403e95 100644 --- a/plugins/Intl/lang/ar.json +++ b/plugins/Intl/lang/ar.json @@ -871,7 +871,7 @@ "NMinutesShort": "%s د", "NSeconds": "%s ثانية", "NSecondsShort": "%s ث", - "NumberFormatCurrency": "#,##0.00 ¤", + "NumberFormatCurrency": "#,##0.00 ¤", "NumberFormatNumber": "#,##0.###", "NumberFormatPercent": "#,##0%", "NumberSymbolDecimal": "٫", diff --git a/plugins/Intl/lang/be.json b/plugins/Intl/lang/be.json index 3bf991398e..b839af04d2 100644 --- a/plugins/Intl/lang/be.json +++ b/plugins/Intl/lang/be.json @@ -612,12 +612,12 @@ "Day_Short_StandAlone_6": "сб", "Day_Short_StandAlone_7": "нд", "EnglishLanguageName": "Belarusian", - "Format_DateTime_Long": "EEEE, d MMMM y 'г'. {time}", - "Format_DateTime_Short": "d MMM y 'г'. {time}", + "Format_DateTime_Long": "EEEE, d MMMM y 'г'. {time}", + "Format_DateTime_Short": "d MMM y 'г'. {time}", "Format_Date_Day_Month": "E, d MMM", - "Format_Date_Long": "EEEE, d MMMM y 'г'.", - "Format_Date_Short": "d MMM y 'г'.", - "Format_Hour_12": "hh a", + "Format_Date_Long": "EEEE, d MMMM y 'г'.", + "Format_Date_Short": "d MMM y 'г'.", + "Format_Hour_12": "hh a", "Format_Hour_24": "HH", "Format_Interval_Long_D": "d–d MMMM y", "Format_Interval_Long_M": "d MMMM – d MMMM y", @@ -628,7 +628,7 @@ "Format_Month_Long": "LLLL y", "Format_Month_Short": "LLL y", "Format_Time": "{time}", - "Format_Time_12": "h:mm:ss a", + "Format_Time_12": "h:mm:ss a", "Format_Time_24": "HH:mm:ss", "Format_Year": "y", "Hours": "гадзіны", @@ -748,7 +748,7 @@ "Language_nv": "Наваха", "Language_ny": "Ньянджа", "Language_oc": "Аксітанская", - "Language_oj": "Аджыбва", + "Language_oj": "Аджыбвэ", "Language_om": "Арома", "Language_or": "Орыя", "Language_os": "Асецінская", @@ -1090,7 +1090,7 @@ "Timezone_Pacific_Gambier": "Астравы Гамб’е", "Timezone_Pacific_Honolulu": "Ганалулу", "Timezone_Pacific_Johnston": "Джонстан", - "Timezone_Pacific_Kanton": "Kanton", + "Timezone_Pacific_Kanton": "Кантон", "Timezone_Pacific_Kiritimati": "Кірыцімаці", "Timezone_Pacific_Kosrae": "Кусаіе", "Timezone_Pacific_Kwajalein": "Кваджалейн", diff --git a/plugins/Intl/lang/bg.json b/plugins/Intl/lang/bg.json index a6281e883f..22d236390a 100644 --- a/plugins/Intl/lang/bg.json +++ b/plugins/Intl/lang/bg.json @@ -612,25 +612,25 @@ "Day_Short_StandAlone_6": "сб", "Day_Short_StandAlone_7": "нд", "EnglishLanguageName": "Bulgarian", - "Format_DateTime_Long": "EEEE, d MMMM y 'г'. {time}", - "Format_DateTime_Short": "d.MM.y 'г'. {time}", + "Format_DateTime_Long": "EEEE, d MMMM y 'г'. {time}", + "Format_DateTime_Short": "d.MM.y 'г'. {time}", "Format_Date_Day_Month": "E, d.MM", - "Format_Date_Long": "EEEE, d MMMM y 'г'.", - "Format_Date_Short": "d.MM.y 'г'.", + "Format_Date_Long": "EEEE, d MMMM y 'г'.", + "Format_Date_Short": "d.MM.y 'г'.", "Format_Hour_12": "h 'ч'. a", "Format_Hour_24": "HH 'ч'.", - "Format_Interval_Long_D": "d – d MMMM y 'г'.", - "Format_Interval_Long_M": "d MMMM – d MMMM y 'г'.", - "Format_Interval_Long_Y": "d MMMM y 'г'. – d MMMM y 'г'.", - "Format_Interval_Short_D": "d.MM – d.MM.y 'г'.", - "Format_Interval_Short_M": "d.MM – d.MM.y 'г'.", - "Format_Interval_Short_Y": "d.MM.y 'г'. – d.MM.y 'г'.", - "Format_Month_Long": "MMMM y 'г'.", - "Format_Month_Short": "MM.y 'г'.", + "Format_Interval_Long_D": "d – d MMMM y 'г'.", + "Format_Interval_Long_M": "d MMMM – d MMMM y 'г'.", + "Format_Interval_Long_Y": "d MMMM y 'г'. – d MMMM y 'г'.", + "Format_Interval_Short_D": "d.MM – d.MM.y 'г'.", + "Format_Interval_Short_M": "d.MM – d.MM.y 'г'.", + "Format_Interval_Short_Y": "d.MM.y 'г'. – d.MM.y 'г'.", + "Format_Month_Long": "MMMM y 'г'.", + "Format_Month_Short": "MM.y 'г'.", "Format_Time": "{time}", "Format_Time_12": "h:mm:ss 'ч'. a", "Format_Time_24": "HH:mm:ss 'ч'.", - "Format_Year": "y 'г'.", + "Format_Year": "y 'г'.", "Hours": "часове", "Language_aa": "Афарски", "Language_ab": "Абхазки", @@ -871,7 +871,7 @@ "NMinutesShort": "%s мин", "NSeconds": "%s секунди", "NSecondsShort": "%s с", - "NumberFormatCurrency": "0.00 ¤", + "NumberFormatCurrency": "#,##0.00 ¤", "NumberFormatNumber": "#,##0.###", "NumberFormatPercent": "#,##0%", "NumberSymbolDecimal": ",", @@ -921,7 +921,7 @@ "Timezone_America_Catamarca": "Катамарка", "Timezone_America_Chicago": "Чикаго", "Timezone_America_Chihuahua": "Чиуауа", - "Timezone_America_CoralHarbour": "Корал Харбър", + "Timezone_America_CoralHarbour": "Атикокан", "Timezone_America_Cordoba": "Кордоба", "Timezone_America_Creston": "Крестън", "Timezone_America_Cuiaba": "Чуяба", @@ -1099,7 +1099,7 @@ "Timezone_Pacific_Gambier": "Гамбие", "Timezone_Pacific_Honolulu": "Хонолулу", "Timezone_Pacific_Johnston": "Джонстън", - "Timezone_Pacific_Kanton": "Kanton", + "Timezone_Pacific_Kanton": "Кантон", "Timezone_Pacific_Kiritimati": "Киритимати", "Timezone_Pacific_Kosrae": "Кошрай", "Timezone_Pacific_Kwajalein": "Куаджалин", diff --git a/plugins/Intl/lang/bn.json b/plugins/Intl/lang/bn.json index 44b82e4aef..7d408e9f34 100644 --- a/plugins/Intl/lang/bn.json +++ b/plugins/Intl/lang/bn.json @@ -12,7 +12,7 @@ "Country_AE": "সংযুক্ত আরব আমিরাত", "Country_AF": "আফগানিস্তান", "Country_AG": "অ্যান্টিগুয়া ও বারবুডা", - "Country_AI": "এ্যাঙ্গুইলা", + "Country_AI": "অ্যাঙ্গুইলা", "Country_AL": "আলবেনিয়া", "Country_AM": "আর্মেনিয়া", "Country_AO": "অ্যাঙ্গোলা", @@ -22,18 +22,18 @@ "Country_AT": "অস্ট্রিয়া", "Country_AU": "অস্ট্রেলিয়া", "Country_AW": "আরুবা", - "Country_AX": "আলান্ড দ্বীপপুঞ্জ", + "Country_AX": "অলান্ড দ্বীপপুঞ্জ", "Country_AZ": "আজারবাইজান", "Country_BA": "বসনিয়া ও হার্জেগোভিনা", - "Country_BB": "বারবাদোস", + "Country_BB": "বার্বাডোজ", "Country_BD": "বাংলাদেশ", "Country_BE": "বেলজিয়াম", "Country_BF": "বুরকিনা ফাসো", "Country_BG": "বুলগেরিয়া", - "Country_BH": "বাহরাইন", + "Country_BH": "বাহারিন", "Country_BI": "বুরুন্ডি", "Country_BJ": "বেনিন", - "Country_BL": "সেন্ট বারথেলিমি", + "Country_BL": "সেন্ট বার্থেলেমি", "Country_BM": "বারমুডা", "Country_BN": "ব্রুনেই", "Country_BO": "বলিভিয়া", @@ -51,7 +51,7 @@ "Country_CF": "মধ্য আফ্রিকার প্রজাতন্ত্র", "Country_CG": "কঙ্গো - ব্রাজাভিল", "Country_CH": "সুইজারল্যান্ড", - "Country_CI": "কোত দিভোয়ার", + "Country_CI": "কোট ডি‘আইভোর", "Country_CK": "কুক দ্বীপপুঞ্জ", "Country_CL": "চিলি", "Country_CM": "ক্যামেরুন", @@ -59,11 +59,11 @@ "Country_CO": "কলম্বিয়া", "Country_CR": "কোস্টারিকা", "Country_CU": "কিউবা", - "Country_CV": "কেপভার্দে", + "Country_CV": "কেপ ভার্দে", "Country_CW": "কুরাসাও", "Country_CX": "ক্রিসমাস দ্বীপ", "Country_CY": "সাইপ্রাস", - "Country_CZ": "চেচিয়া", + "Country_CZ": "চেকিয়া", "Country_DE": "জার্মানি", "Country_DJ": "জিবুতি", "Country_DK": "ডেনমার্ক", @@ -81,14 +81,14 @@ "Country_FJ": "ফিজি", "Country_FK": "ফকল্যান্ড দ্বীপপুঞ্জ", "Country_FM": "মাইক্রোনেশিয়া", - "Country_FO": "ফ্যারও দ্বীপপুঞ্জ", + "Country_FO": "ফ্যারো দ্বীপপুঞ্জ", "Country_FR": "ফ্রান্স", "Country_GA": "গ্যাবন", "Country_GB": "যুক্তরাজ্য", "Country_GD": "গ্রেনাডা", "Country_GE": "জর্জিয়া", "Country_GF": "ফরাসী গায়ানা", - "Country_GG": "গুয়ার্নসি", + "Country_GG": "গার্নসি", "Country_GH": "ঘানা", "Country_GI": "জিব্রাল্টার", "Country_GL": "গ্রীনল্যান্ড", @@ -142,7 +142,7 @@ "Country_LS": "লেসোথো", "Country_LT": "লিথুয়ানিয়া", "Country_LU": "লাক্সেমবার্গ", - "Country_LV": "লাত্ভিয়া", + "Country_LV": "লাটভিয়া", "Country_LY": "লিবিয়া", "Country_MA": "মোরক্কো", "Country_MC": "মোনাকো", @@ -155,7 +155,7 @@ "Country_ML": "মালি", "Country_MM": "মায়ানমার (বার্মা)", "Country_MN": "মঙ্গোলিয়া", - "Country_MO": "ম্যাকাও এসএআর চীনা চীনা (ম্যাকাও এসএআর চীনা) চীনা (ঐতিহ্যবাহী, ম্যাকাও এসএআর চীনা) অঞ্চল: ম্যাকাও এসএআর চীন", + "Country_MO": "ম্যাকাও এসএআর চীন", "Country_MP": "উত্তরাঞ্চলীয় মারিয়ানা দ্বীপপুঞ্জ", "Country_MQ": "মার্টিনিক", "Country_MR": "মরিতানিয়া", @@ -190,7 +190,7 @@ "Country_PM": "সেন্ট পিয়ের ও মিকুয়েলন", "Country_PN": "পিটকেয়ার্ন দ্বীপপুঞ্জ", "Country_PR": "পুয়ের্তো রিকো", - "Country_PS": "প্যালেস্টাইনের অঞ্চলসমূহ", + "Country_PS": "প্যালেস্টাইন ভূখণ্ড", "Country_PT": "পর্তুগাল", "Country_PW": "পালাউ", "Country_PY": "প্যারাগুয়ে", @@ -247,7 +247,7 @@ "Country_VC": "সেন্ট ভিনসেন্ট ও গ্রেনাডিনস", "Country_VE": "ভেনেজুয়েলা", "Country_VG": "ব্রিটিশ ভার্জিন দ্বীপপুঞ্জ", - "Country_VI": "মার্কিন যুক্তরাষ্ট্রের ভার্জিন দ্বীপপুঞ্জ", + "Country_VI": "মার্কিন যুক্তরাষ্ট্রীয় ভার্জিন দ্বীপপুঞ্জ", "Country_VN": "ভিয়েতনাম", "Country_VU": "ভানুয়াটু", "Country_WF": "ওয়ালিস ও ফুটুনা", @@ -421,7 +421,7 @@ "Currency_AOA": "এ্যাঙ্গোলান কওয়ানজা", "Currency_ARS": "আর্জেন্টিনা পেসো", "Currency_AUD": "অস্ট্রেলিয়ান ডলার", - "Currency_AWG": "আরুবা গিল্ডার", + "Currency_AWG": "আরুবা ফ্লোরিন", "Currency_AZN": "আজারবাইজান মানাত", "Currency_BAM": "বসনিয়া এবং হার্জেগোভিনা বিনিমেয় মার্ক", "Currency_BBD": "বার্বেডোজ ডলার", @@ -431,7 +431,7 @@ "Currency_BIF": "বুরুন্ডি ফ্রাঙ্ক", "Currency_BMD": "বারমিউডান ডলার", "Currency_BND": "ব্রুনেই ডলার", - "Currency_BOB": "বলিভিয়ানো", + "Currency_BOB": "বলিভিয়ান বলিভিয়ানো", "Currency_BRL": "ব্রাজিলিয়ান রিয়েল", "Currency_BSD": "বাহামিয়ান ডলার", "Currency_BTC": "Bitcoin", @@ -467,14 +467,14 @@ "Currency_GMD": "গাম্বিয়া ডালাসি", "Currency_GNF": "গিনি ফ্রাঙ্ক", "Currency_GTQ": "গুয়াতেমালা কুয়েৎজাল", - "Currency_GYD": "গাইয়েনা ডলার", + "Currency_GYD": "গায়ানিজ ডলার", "Currency_HKD": "হংকং ডলার", "Currency_HNL": "হন্ডুরাস লেম্পিরা", "Currency_HRK": "ক্রোয়েশিয়ান কুনা", "Currency_HTG": "হাইতি গৌর্দে", "Currency_HUF": "হাঙ্গেরিয়ান ফোরিন্ট", "Currency_IDR": "ইন্দোনেশিয়ান রুপিয়াহ", - "Currency_ILS": "ইস্রাইলি নতুন শেকেল", + "Currency_ILS": "ইসরায়েলি নতুন শেকেল", "Currency_INR": "ভারতীয় রুপি", "Currency_IQD": "ইরাকি দিনার", "Currency_IRR": "ইরানিয়ান রিয়াল", @@ -485,7 +485,7 @@ "Currency_KES": "কেনিয়ান শিলিং", "Currency_KGS": "কিরগিজস্তান সোম", "Currency_KHR": "কম্বোডিয়ান রিয়েল", - "Currency_KMF": "কম্বোরো ফ্রাঙ্ক", + "Currency_KMF": "কমোরিয়ান ফ্রাঙ্ক", "Currency_KPW": "উত্তর কোরিয়ার ওন", "Currency_KRW": "দক্ষিণ কোরিয়ান ওন", "Currency_KWD": "কুয়েতি দিনার", @@ -507,7 +507,7 @@ "Currency_MRU": "মৌরিতানিয়ান ওউগুইয়া", "Currency_MUR": "মৌরিতানিয়ান রুপি", "Currency_MVR": "মালদিভিয়ান রুফিয়া", - "Currency_MWK": "মালাউইয়ান কওয়াচ", + "Currency_MWK": "মালাউইয়ান কোয়াচা", "Currency_MXN": "ম্যাক্সিকান পেসো", "Currency_MYR": "মালয়েশিয়ান রিঙ্গিৎ", "Currency_MZN": "মোজাম্বিক মেটিকেল", @@ -518,7 +518,7 @@ "Currency_NPR": "নেপালি রুপি", "Currency_NZD": "নিউজিল্যান্ড ডলার", "Currency_OMR": "ওমানি রিয়াল", - "Currency_PAB": "পানামা বেলবোয়া", + "Currency_PAB": "পানামানিয়ান বালবোয়া", "Currency_PEN": "পেরুভিয়ান সোল", "Currency_PGK": "পাপুয়া নিউ গিনিয়ান কিনা", "Currency_PHP": "ফিলিপাইন পেসো", @@ -539,7 +539,7 @@ "Currency_SHP": "সেন্ট হেলেনা পাউন্ড", "Currency_SLL": "সিয়েরালিয়ন লিয়ন", "Currency_SOS": "সোমালি শিলিং", - "Currency_SRD": "সুরিনাম ডলার", + "Currency_SRD": "সুরিনামিজ ডলার", "Currency_SSP": "দক্ষিণ সুদানি পাউন্ড", "Currency_STN": "সাও টোমে এবং প্রিন্সিপে ডোবরা", "Currency_SYP": "সিরিয়ান পাউন্ড", @@ -652,7 +652,7 @@ "Language_bn": "বাংলা", "Language_bo": "তিব্বতি", "Language_br": "ব্রেটন", - "Language_bs": "বসনীয়ান", + "Language_bs": "বসনীয়", "Language_ca": "কাতালান", "Language_ce": "চেচেন", "Language_ch": "চামোরো", @@ -665,7 +665,7 @@ "Language_da": "ডেনিশ", "Language_de": "জার্মান", "Language_dv": "দিবেহি", - "Language_dz": "জোঙ্গা", + "Language_dz": "জোংখা", "Language_ee": "ইউয়ি", "Language_el": "গ্রিক", "Language_en": "ইংরেজি", @@ -676,12 +676,12 @@ "Language_fa": "ফার্সি", "Language_ff": "ফুলাহ্", "Language_fi": "ফিনিশ", - "Language_fj": "ফিজিআন", - "Language_fo": "ফারোস", + "Language_fj": "ফিজিয়ান", + "Language_fo": "ফেরোইস", "Language_fr": "ফরাসি", "Language_fy": "পশ্চিম ফ্রিসিয়ান", "Language_ga": "আইরিশ", - "Language_gd": "স্কটস-গ্যেলিক", + "Language_gd": "স্কটিশ-গ্যেলিক", "Language_gl": "গ্যালিশিয়", "Language_gn": "গুয়ারানি", "Language_gu": "গুজরাটি", @@ -712,7 +712,7 @@ "Language_ki": "কিকুয়ু", "Language_kj": "কোয়ানিয়ামা", "Language_kk": "কাজাখ", - "Language_kl": "ক্যালাল্লিসুট", + "Language_kl": "কালাল্লিসুট", "Language_km": "খমের", "Language_kn": "কন্নড়", "Language_ko": "কোরিয়ান", @@ -743,7 +743,7 @@ "Language_my": "বর্মি", "Language_na": "নাউরু", "Language_nb": "নরওয়েজিয়ান বোকমাল", - "Language_nd": "উত্তর এন্দেবিলি", + "Language_nd": "উত্তর এন্দেবেলে", "Language_ne": "নেপালী", "Language_ng": "এন্দোঙ্গা", "Language_nl": "ওলন্দাজ", @@ -760,7 +760,7 @@ "Language_pa": "পাঞ্জাবী", "Language_pi": "পালি", "Language_pl": "পোলিশ", - "Language_ps": "পুশতু", + "Language_ps": "পাশতু", "Language_pt": "পর্তুগীজ", "Language_qu": "কেচুয়া", "Language_rm": "রোমান্স", @@ -803,14 +803,14 @@ "Language_ug": "উইঘুর", "Language_uk": "ইউক্রেনীয়", "Language_ur": "উর্দু", - "Language_uz": "উজবেকীয়", + "Language_uz": "উজবেক", "Language_ve": "ভেন্ডা", "Language_vi": "ভিয়েতনামী", "Language_vo": "ভোলাপুক", "Language_wa": "ওয়ালুন", - "Language_wo": "উওলোফ", + "Language_wo": "ওলোফ", "Language_xh": "জোসা", - "Language_yi": "ইয়েদ্দিশ", + "Language_yi": "ইদ্দিশ", "Language_yo": "ইওরুবা", "Language_za": "ঝু্য়াঙ", "Language_zh": "চীনা", @@ -842,22 +842,22 @@ "Month_Long_StandAlone_8": "আগস্ট", "Month_Long_StandAlone_9": "সেপ্টেম্বর", "Month_Short_1": "জানু", - "Month_Short_10": "অক্টোবর", - "Month_Short_11": "নভেম্বর", - "Month_Short_12": "ডিসেম্বর", + "Month_Short_10": "অক্টো", + "Month_Short_11": "নভে", + "Month_Short_12": "ডিসে", "Month_Short_2": "ফেব", "Month_Short_3": "মার্চ", - "Month_Short_4": "এপ্রিল", + "Month_Short_4": "এপ্রি", "Month_Short_5": "মে", "Month_Short_6": "জুন", - "Month_Short_7": "জুলাই", - "Month_Short_8": "আগস্ট", - "Month_Short_9": "সেপ্টেম্বর", - "Month_Short_StandAlone_1": "জানুয়ারী", + "Month_Short_7": "জুল", + "Month_Short_8": "আগ", + "Month_Short_9": "সেপ", + "Month_Short_StandAlone_1": "জানু", "Month_Short_StandAlone_10": "অক্টোবর", "Month_Short_StandAlone_11": "নভেম্বর", "Month_Short_StandAlone_12": "ডিসেম্বর", - "Month_Short_StandAlone_2": "ফেব্রুয়ারী", + "Month_Short_StandAlone_2": "ফেব", "Month_Short_StandAlone_3": "মার্চ", "Month_Short_StandAlone_4": "এপ্রিল", "Month_Short_StandAlone_5": "মে", @@ -898,7 +898,7 @@ "Timezone_Africa_Ceuta": "সেউটা", "Timezone_Africa_Kinshasa": "কিনশাসা", "Timezone_Africa_Lubumbashi": "লুবুম্বাশি", - "Timezone_America_Adak": "আডাক", + "Timezone_America_Adak": "আডক", "Timezone_America_Anchorage": "এনকোরেজ", "Timezone_America_Araguaina": "আরাগুয়াইনা", "Timezone_America_Argentina_LaRioja": "লা রিওহা", @@ -909,7 +909,7 @@ "Timezone_America_Argentina_Tucuman": "টুকুমান", "Timezone_America_Argentina_Ushuaia": "উশুয়াইয়া", "Timezone_America_Bahia": "বাহিয়া", - "Timezone_America_BahiaBanderas": "বাহিয়া বানড্রাস", + "Timezone_America_BahiaBanderas": "বাহিয়া বান্দেরাস", "Timezone_America_Belem": "বেলেম", "Timezone_America_Blanc-Sablon": "ব্লাঙ্ক-সাব্লোন", "Timezone_America_BoaVista": "বোয়া ভিস্তা", @@ -979,7 +979,7 @@ "Timezone_America_PortoVelho": "পোর্তো ভেল্হো", "Timezone_America_PuntaArenas": "পুন্টা আরেনাস", "Timezone_America_RainyRiver": "রেইনি রিভার", - "Timezone_America_RankinInlet": "র্যাঙ্কিন ইনলেট", + "Timezone_America_RankinInlet": "র্যাঙ্কিন ইনলেট", "Timezone_America_Recife": "রেসিফে", "Timezone_America_Regina": "রেজিনা", "Timezone_America_Resolute": "রেসোলুট", @@ -988,7 +988,7 @@ "Timezone_America_Santarem": "সেনটুরেম", "Timezone_America_Santiago": "সান্টিয়াগো", "Timezone_America_SaoPaulo": "সাও পাউলো", - "Timezone_America_Scoresbysund": "ইটকুয়োরটুরমিট", + "Timezone_America_Scoresbysund": "ইট্টকুয়োরটুরমিট", "Timezone_America_Sitka": "শিটকা", "Timezone_America_StJohns": "সেন্ট জন্স", "Timezone_America_SwiftCurrent": "সুইফ্ট কারেন্ট", @@ -1099,7 +1099,7 @@ "Timezone_Pacific_Gambier": "গাম্বিয়ের", "Timezone_Pacific_Honolulu": "হনোলুলু", "Timezone_Pacific_Johnston": "জনস্টন", - "Timezone_Pacific_Kanton": "Kanton", + "Timezone_Pacific_Kanton": "ক্যান্টন", "Timezone_Pacific_Kiritimati": "কিরিতিমাতি", "Timezone_Pacific_Kosrae": "কোসরায়", "Timezone_Pacific_Kwajalein": "কোয়াজালেইন", diff --git a/plugins/Intl/lang/bs.json b/plugins/Intl/lang/bs.json index 8b89bfc6ff..6eacdf685b 100644 --- a/plugins/Intl/lang/bs.json +++ b/plugins/Intl/lang/bs.json @@ -617,18 +617,18 @@ "Format_Date_Day_Month": "E, d. MMM", "Format_Date_Long": "EEEE, d. MMMM y.", "Format_Date_Short": "d. MMM y.", - "Format_Hour_12": "h a", + "Format_Hour_12": "h a", "Format_Hour_24": "HH", "Format_Interval_Long_D": "d. – d. MMMM y.", - "Format_Interval_Long_M": "d. MMMM – d. MMMM y.", + "Format_Interval_Long_M": "d. MMMM – d. MMMM y.", "Format_Interval_Long_Y": "d. MMMM y. – d. MMMM y.", "Format_Interval_Short_D": "d. – d. MMM y.", - "Format_Interval_Short_M": "d. MMM – d. MMM y.", + "Format_Interval_Short_M": "d. MMM – d. MMM y.", "Format_Interval_Short_Y": "d. MMM y. – d. MMM y.", "Format_Month_Long": "LLLL y.", "Format_Month_Short": "MMM y.", "Format_Time": "{time}", - "Format_Time_12": "hh:mm:ss a", + "Format_Time_12": "hh:mm:ss a", "Format_Time_24": "HH:mm:ss", "Format_Year": "y.", "Hours": "sati", diff --git a/plugins/Intl/lang/ca.json b/plugins/Intl/lang/ca.json index 0783517c20..45576d7866 100644 --- a/plugins/Intl/lang/ca.json +++ b/plugins/Intl/lang/ca.json @@ -22,7 +22,7 @@ "Country_AT": "Àustria", "Country_AU": "Austràlia", "Country_AW": "Aruba", - "Country_AX": "Illes Aland", + "Country_AX": "Illes Åland", "Country_AZ": "Azerbaidjan", "Country_BA": "Bòsnia i Hercegovina", "Country_BB": "Barbados", @@ -37,7 +37,7 @@ "Country_BM": "Bermudes", "Country_BN": "Brunei", "Country_BO": "Bolívia", - "Country_BQ": "Antilles Neerlandeses", + "Country_BQ": "Carib Neerlandès", "Country_BR": "Brasil", "Country_BS": "Bahames", "Country_BT": "Bhutan", @@ -123,7 +123,7 @@ "Country_JO": "Jordània", "Country_JP": "Japó", "Country_KE": "Kenya", - "Country_KG": "Kirguizistan", + "Country_KG": "Kirguizstan", "Country_KH": "Cambodja", "Country_KI": "Kiribati", "Country_KM": "Comores", @@ -156,7 +156,7 @@ "Country_MM": "Myanmar (Birmània)", "Country_MN": "Mongòlia", "Country_MO": "Macau (RAE Xina)", - "Country_MP": "Illes Mariannes del Nord", + "Country_MP": "Illes Mariannes Septentrionals", "Country_MQ": "Martinica", "Country_MR": "Mauritània", "Country_MS": "Montserrat", @@ -220,7 +220,7 @@ "Country_SV": "El Salvador", "Country_SX": "Sint Maarten", "Country_SY": "Síria", - "Country_SZ": "ESwatini", + "Country_SZ": "Eswatini", "Country_TC": "Illes Turks i Caicos", "Country_TD": "Txad", "Country_TF": "Territoris Australs Francesos", @@ -228,7 +228,7 @@ "Country_TH": "Tailàndia", "Country_TJ": "Tadjikistan", "Country_TK": "Tokelau", - "Country_TL": "Timor Oriental", + "Country_TL": "Timor-Leste", "Country_TM": "Turkmenistan", "Country_TN": "Tunísia", "Country_TO": "Tonga", @@ -617,18 +617,18 @@ "Format_Date_Day_Month": "E, d MMM", "Format_Date_Long": "EEEE, d MMMM 'de' y", "Format_Date_Short": "d MMM y", - "Format_Hour_12": "h a", + "Format_Hour_12": "h a", "Format_Hour_24": "H", "Format_Interval_Long_D": "d–d MMMM 'de' y", - "Format_Interval_Long_M": "d MMMM – d MMMM 'de' y", - "Format_Interval_Long_Y": "d MMMM 'de' y – d MMMM 'de' y", + "Format_Interval_Long_M": "d MMMM – d MMMM 'de' y", + "Format_Interval_Long_Y": "d MMMM 'de' y – d MMMM 'de' y", "Format_Interval_Short_D": "d–d MMM y", - "Format_Interval_Short_M": "d MMM – d MMM y", - "Format_Interval_Short_Y": "d MMM y – d MMM y", + "Format_Interval_Short_M": "d MMM – d MMM y", + "Format_Interval_Short_Y": "d MMM y – d MMM y", "Format_Month_Long": "LLLL 'de' y", "Format_Month_Short": "LLL 'de' y", "Format_Time": "{time}", - "Format_Time_12": "h:mm:ss a", + "Format_Time_12": "h:mm:ss a", "Format_Time_24": "H:mm:ss", "Format_Year": "y", "Hours": "hores", @@ -873,7 +873,7 @@ "NSecondsShort": "%s s", "NumberFormatCurrency": "#,##0.00 ¤", "NumberFormatNumber": "#,##0.###", - "NumberFormatPercent": "#,##0%", + "NumberFormatPercent": "#,##0 %", "NumberSymbolDecimal": ",", "NumberSymbolGroup": ".", "NumberSymbolMinus": "-", @@ -1078,7 +1078,7 @@ "Timezone_Europe_Berlin": "Berlín", "Timezone_Europe_Busingen": "Busingen", "Timezone_Europe_Kaliningrad": "Kaliningrad", - "Timezone_Europe_Kiev": "Kíev", + "Timezone_Europe_Kiev": "Kíiv", "Timezone_Europe_Kirov": "Kirov", "Timezone_Europe_Lisbon": "Lisboa", "Timezone_Europe_Madrid": "Madrid", @@ -1099,7 +1099,7 @@ "Timezone_Pacific_Gambier": "Gambier", "Timezone_Pacific_Honolulu": "Honolulu", "Timezone_Pacific_Johnston": "Johnston", - "Timezone_Pacific_Kanton": "Kanton", + "Timezone_Pacific_Kanton": "Canton", "Timezone_Pacific_Kiritimati": "Kiritimati", "Timezone_Pacific_Kosrae": "Kosrae", "Timezone_Pacific_Kwajalein": "Kwajalein", diff --git a/plugins/Intl/lang/cs.json b/plugins/Intl/lang/cs.json index f11da32688..9fef65014c 100644 --- a/plugins/Intl/lang/cs.json +++ b/plugins/Intl/lang/cs.json @@ -617,18 +617,18 @@ "Format_Date_Day_Month": "E d. M.", "Format_Date_Long": "EEEE d. MMMM y", "Format_Date_Short": "d. M. y", - "Format_Hour_12": "h a", + "Format_Hour_12": "h a", "Format_Hour_24": "H", "Format_Interval_Long_D": "d.–d. M. y", "Format_Interval_Long_M": "d. M. – d. M. y", - "Format_Interval_Long_Y": "d. M. y – d. M. y", + "Format_Interval_Long_Y": "d. M. y – d. M. y", "Format_Interval_Short_D": "d.–d. M. y", "Format_Interval_Short_M": "d. M. – d. M. y", - "Format_Interval_Short_Y": "d. M. y – d. M. y", + "Format_Interval_Short_Y": "d. M. y – d. M. y", "Format_Month_Long": "LLLL y", "Format_Month_Short": "LLLL y", "Format_Time": "{time}", - "Format_Time_12": "h:mm:ss a", + "Format_Time_12": "h:mm:ss a", "Format_Time_24": "H:mm:ss", "Format_Year": "y", "Hours": "hodiny", diff --git a/plugins/Intl/lang/cy.json b/plugins/Intl/lang/cy.json index 09f68f404c..13f5530cde 100644 --- a/plugins/Intl/lang/cy.json +++ b/plugins/Intl/lang/cy.json @@ -617,18 +617,18 @@ "Format_Date_Day_Month": "E, d MMM", "Format_Date_Long": "EEEE, d MMMM y", "Format_Date_Short": "d MMM y", - "Format_Hour_12": "h a", + "Format_Hour_12": "h a", "Format_Hour_24": "HH", "Format_Interval_Long_D": "d–d MMMM y", - "Format_Interval_Long_M": "d MMMM – d MMMM y", - "Format_Interval_Long_Y": "d MMMM, y – d MMMM y", + "Format_Interval_Long_M": "d MMMM – d MMMM y", + "Format_Interval_Long_Y": "d MMMM, y – d MMMM y", "Format_Interval_Short_D": "d–d MMM y", - "Format_Interval_Short_M": "d MMM – d MMM y", - "Format_Interval_Short_Y": "d MMM, y – d MMM y", + "Format_Interval_Short_M": "d MMM – d MMM y", + "Format_Interval_Short_Y": "d MMM, y – d MMM y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "{time}", - "Format_Time_12": "h:mm:ss a", + "Format_Time_12": "h:mm:ss a", "Format_Time_24": "HH:mm:ss", "Format_Year": "y", "Hours": "oriau", diff --git a/plugins/Intl/lang/da.json b/plugins/Intl/lang/da.json index b78f46ec1c..b8d0ecfa0b 100644 --- a/plugins/Intl/lang/da.json +++ b/plugins/Intl/lang/da.json @@ -43,7 +43,7 @@ "Country_BT": "Bhutan", "Country_BV": "Bouvetøen", "Country_BW": "Botswana", - "Country_BY": "Hviderusland", + "Country_BY": "Belarus", "Country_BZ": "Belize", "Country_CA": "Canada", "Country_CC": "Cocosøerne", @@ -173,7 +173,7 @@ "Country_NF": "Norfolk Island", "Country_NG": "Nigeria", "Country_NI": "Nicaragua", - "Country_NL": "Holland", + "Country_NL": "Nederlandene", "Country_NO": "Norge", "Country_NP": "Nepal", "Country_NR": "Nauru", @@ -583,41 +583,41 @@ "Day_Long_StandAlone_5": "fredag", "Day_Long_StandAlone_6": "lørdag", "Day_Long_StandAlone_7": "søndag", - "Day_Min_1": "ma", - "Day_Min_2": "ti", - "Day_Min_3": "on", - "Day_Min_4": "to", - "Day_Min_5": "fr", - "Day_Min_6": "lø", - "Day_Min_7": "sø", - "Day_Min_StandAlone_1": "ma", - "Day_Min_StandAlone_2": "ti", - "Day_Min_StandAlone_3": "on", - "Day_Min_StandAlone_4": "to", - "Day_Min_StandAlone_5": "fr", - "Day_Min_StandAlone_6": "lø", - "Day_Min_StandAlone_7": "sø", + "Day_Min_1": "ma.", + "Day_Min_2": "ti.", + "Day_Min_3": "on.", + "Day_Min_4": "to.", + "Day_Min_5": "fr.", + "Day_Min_6": "lø.", + "Day_Min_7": "sø.", + "Day_Min_StandAlone_1": "ma.", + "Day_Min_StandAlone_2": "ti.", + "Day_Min_StandAlone_3": "on.", + "Day_Min_StandAlone_4": "to.", + "Day_Min_StandAlone_5": "fr.", + "Day_Min_StandAlone_6": "lø.", + "Day_Min_StandAlone_7": "sø.", "Day_Short_1": "man.", - "Day_Short_2": "tir.", + "Day_Short_2": "tirs.", "Day_Short_3": "ons.", - "Day_Short_4": "tor.", + "Day_Short_4": "tors.", "Day_Short_5": "fre.", "Day_Short_6": "lør.", "Day_Short_7": "søn.", - "Day_Short_StandAlone_1": "man", - "Day_Short_StandAlone_2": "tir", - "Day_Short_StandAlone_3": "ons", - "Day_Short_StandAlone_4": "tor", - "Day_Short_StandAlone_5": "fre", - "Day_Short_StandAlone_6": "lør", - "Day_Short_StandAlone_7": "søn", + "Day_Short_StandAlone_1": "man.", + "Day_Short_StandAlone_2": "tirs.", + "Day_Short_StandAlone_3": "ons.", + "Day_Short_StandAlone_4": "tors.", + "Day_Short_StandAlone_5": "fre.", + "Day_Short_StandAlone_6": "lør.", + "Day_Short_StandAlone_7": "søn.", "EnglishLanguageName": "Danish", "Format_DateTime_Long": "EEEE 'den' d. MMMM y {time}", "Format_DateTime_Short": "d. MMM y {time}", "Format_Date_Day_Month": "E d. MMM", "Format_Date_Long": "EEEE 'den' d. MMMM y", "Format_Date_Short": "d. MMM y", - "Format_Hour_12": "h a", + "Format_Hour_12": "h a", "Format_Hour_24": "HH", "Format_Interval_Long_D": "d.–d. MMMM y", "Format_Interval_Long_M": "d. MMMM–d. MMMM y", @@ -628,7 +628,7 @@ "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "{time}", - "Format_Time_12": "h.mm.ss a", + "Format_Time_12": "h.mm.ss a", "Format_Time_24": "HH.mm.ss", "Format_Year": "y", "Hours": "timer", @@ -645,7 +645,7 @@ "Language_ay": "Aymara", "Language_az": "Aserbajdsjansk", "Language_ba": "Bashkir", - "Language_be": "Hviderussisk", + "Language_be": "Belarusisk", "Language_bg": "Bulgarsk", "Language_bi": "Bislama", "Language_bm": "Bambara", @@ -746,7 +746,7 @@ "Language_nd": "Nordndebele", "Language_ne": "Nepalesisk", "Language_ng": "Ndonga", - "Language_nl": "Hollandsk", + "Language_nl": "Nederlandsk", "Language_nn": "Nynorsk", "Language_no": "Norsk", "Language_nr": "Sydndebele", diff --git a/plugins/Intl/lang/de.json b/plugins/Intl/lang/de.json index 4a934853e0..ead598e47a 100644 --- a/plugins/Intl/lang/de.json +++ b/plugins/Intl/lang/de.json @@ -620,15 +620,15 @@ "Format_Hour_12": "h 'Uhr' a", "Format_Hour_24": "HH 'Uhr'", "Format_Interval_Long_D": "d.–d. MMMM y", - "Format_Interval_Long_M": "d. MMMM – d. MMMM y", - "Format_Interval_Long_Y": "d. MMMM y – d. MMMM y", + "Format_Interval_Long_M": "d. MMMM – d. MMMM y", + "Format_Interval_Long_Y": "d. MMMM y – d. MMMM y", "Format_Interval_Short_D": "d.–d. MMM y", - "Format_Interval_Short_M": "d. MMM – d. MMM y", - "Format_Interval_Short_Y": "d. MMM y – d. MMM y", + "Format_Interval_Short_M": "d. MMM – d. MMM y", + "Format_Interval_Short_Y": "d. MMM y – d. MMM y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "{time}", - "Format_Time_12": "h:mm:ss a", + "Format_Time_12": "h:mm:ss a", "Format_Time_24": "HH:mm:ss", "Format_Year": "y", "Hours": "Stunden", @@ -1089,7 +1089,7 @@ "Timezone_Europe_Ulyanovsk": "Uljanowsk", "Timezone_Europe_Uzhgorod": "Uschgorod", "Timezone_Europe_Volgograd": "Wolgograd", - "Timezone_Europe_Zaporozhye": "Saporischja", + "Timezone_Europe_Zaporozhye": "Saporischschja", "Timezone_Pacific_Auckland": "Auckland", "Timezone_Pacific_Bougainville": "Bougainville", "Timezone_Pacific_Chatham": "Chatham", diff --git a/plugins/Intl/lang/el.json b/plugins/Intl/lang/el.json index 6a856f32a0..b22a092057 100644 --- a/plugins/Intl/lang/el.json +++ b/plugins/Intl/lang/el.json @@ -173,7 +173,7 @@ "Country_NF": "Νήσος Νόρφολκ", "Country_NG": "Νιγηρία", "Country_NI": "Νικαράγουα", - "Country_NL": "Ολλανδία", + "Country_NL": "Κάτω Χώρες", "Country_NO": "Νορβηγία", "Country_NP": "Νεπάλ", "Country_NR": "Ναουρού", @@ -617,7 +617,7 @@ "Format_Date_Day_Month": "E d MMM", "Format_Date_Long": "EEEE d MMMM y", "Format_Date_Short": "d MMM y", - "Format_Hour_12": "h a", + "Format_Hour_12": "h a", "Format_Hour_24": "HH", "Format_Interval_Long_D": "d–d MMMM y", "Format_Interval_Long_M": "d MMMM – d MMMM y", @@ -628,7 +628,7 @@ "Format_Month_Long": "LLLL y", "Format_Month_Short": "MMM y", "Format_Time": "{time}", - "Format_Time_12": "h:mm:ss a", + "Format_Time_12": "h:mm:ss a", "Format_Time_24": "HH:mm:ss", "Format_Year": "y", "Hours": "ώρες", diff --git a/plugins/Intl/lang/en.json b/plugins/Intl/lang/en.json index f2862fc231..ffbeda573e 100644 --- a/plugins/Intl/lang/en.json +++ b/plugins/Intl/lang/en.json @@ -525,7 +525,7 @@ "Currency_PKR": "Pakistani Rupee", "Currency_PLN": "Polish Zloty", "Currency_PYG": "Paraguayan Guarani", - "Currency_QAR": "Qatari Rial", + "Currency_QAR": "Qatari Riyal", "Currency_RON": "Romanian Leu", "Currency_RSD": "Serbian Dinar", "Currency_RUB": "Russian Ruble", @@ -537,7 +537,7 @@ "Currency_SEK": "Swedish Krona", "Currency_SGD": "Singapore Dollar", "Currency_SHP": "St. Helena Pound", - "Currency_SLL": "Sierra Leonean Leone", + "Currency_SLL": "Sierra Leonean Leone (1964—2022)", "Currency_SOS": "Somali Shilling", "Currency_SRD": "Surinamese Dollar", "Currency_SSP": "South Sudanese Pound", @@ -617,18 +617,18 @@ "Format_Date_Day_Month": "E, MMM d", "Format_Date_Long": "EEEE, MMMM d, y", "Format_Date_Short": "MMM d, y", - "Format_Hour_12": "h a", + "Format_Hour_12": "h a", "Format_Hour_24": "HH", - "Format_Interval_Long_D": "MMMM d – d, y", - "Format_Interval_Long_M": "MMMM d – MMMM d, y", - "Format_Interval_Long_Y": "MMMM d, y – MMMM d, y", - "Format_Interval_Short_D": "MMM d – d, y", - "Format_Interval_Short_M": "MMM d – MMM d, y", - "Format_Interval_Short_Y": "MMM d, y – MMM d, y", + "Format_Interval_Long_D": "MMMM d – d, y", + "Format_Interval_Long_M": "MMMM d – MMMM d, y", + "Format_Interval_Long_Y": "MMMM d, y – MMMM d, y", + "Format_Interval_Short_D": "MMM d – d, y", + "Format_Interval_Short_M": "MMM d – MMM d, y", + "Format_Interval_Short_Y": "MMM d, y – MMM d, y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "{time}", - "Format_Time_12": "h:mm:ss a", + "Format_Time_12": "h:mm:ss a", "Format_Time_24": "HH:mm:ss", "Format_Year": "y", "Hours": "hours", @@ -674,7 +674,7 @@ "Language_et": "Estonian", "Language_eu": "Basque", "Language_fa": "Persian", - "Language_ff": "Fulah", + "Language_ff": "Fula", "Language_fi": "Finnish", "Language_fj": "Fijian", "Language_fo": "Faroese", @@ -1109,7 +1109,7 @@ "Timezone_Pacific_Truk": "Chuuk", "Timezone_Pacific_Wake": "Wake", "Today": "Today", - "Year_Short": "yr.", + "Year_Short": "yr", "Yesterday": "Yesterday" } }
\ No newline at end of file diff --git a/plugins/Intl/lang/es-ar.json b/plugins/Intl/lang/es-ar.json index 753b74813e..627162296c 100644 --- a/plugins/Intl/lang/es-ar.json +++ b/plugins/Intl/lang/es-ar.json @@ -617,12 +617,12 @@ "Format_Date_Day_Month": "E, d MMM", "Format_Date_Long": "EEEE, d 'de' MMMM 'de' y", "Format_Date_Short": "d MMM y", - "Format_Hour_12": "h a", + "Format_Hour_12": "h a", "Format_Hour_24": "HH", "Format_Interval_Long_D": "d–d 'de' MMMM 'de' y", - "Format_Interval_Long_M": "d 'de' MMMM – d 'de' MMMM 'de' y", - "Format_Interval_Long_Y": "d 'de' MMMM 'de' y – d 'de' MMMM 'de' y", - "Format_Interval_Short_D": "d – d 'de' MMM 'de' y", + "Format_Interval_Long_M": "d 'de' MMMM – d 'de' MMMM 'de' y", + "Format_Interval_Long_Y": "d 'de' MMMM 'de' y – d 'de' MMMM 'de' y", + "Format_Interval_Short_D": "d – d 'de' MMM 'de' y", "Format_Interval_Short_M": "d 'de' MMM 'al' d 'de' MMM 'de' y", "Format_Interval_Short_Y": "d 'de' MMM 'de' y 'al' d 'de' MMM 'de' y", "Format_Month_Long": "MMMM 'de' y", diff --git a/plugins/Intl/lang/es.json b/plugins/Intl/lang/es.json index d36bbc1d4c..33977aa572 100644 --- a/plugins/Intl/lang/es.json +++ b/plugins/Intl/lang/es.json @@ -617,18 +617,18 @@ "Format_Date_Day_Month": "E, d MMM", "Format_Date_Long": "EEEE, d 'de' MMMM 'de' y", "Format_Date_Short": "d MMM y", - "Format_Hour_12": "h a", + "Format_Hour_12": "h a", "Format_Hour_24": "H", "Format_Interval_Long_D": "d–d 'de' MMMM 'de' y", - "Format_Interval_Long_M": "d 'de' MMMM – d 'de' MMMM 'de' y", - "Format_Interval_Long_Y": "d 'de' MMMM 'de' y – d 'de' MMMM 'de' y", + "Format_Interval_Long_M": "d 'de' MMMM – d 'de' MMMM 'de' y", + "Format_Interval_Long_Y": "d 'de' MMMM 'de' y – d 'de' MMMM 'de' y", "Format_Interval_Short_D": "d–d MMM y", - "Format_Interval_Short_M": "d MMM – d MMM y", - "Format_Interval_Short_Y": "d MMM y – d MMM y", + "Format_Interval_Short_M": "d MMM – d MMM y", + "Format_Interval_Short_Y": "d MMM y – d MMM y", "Format_Month_Long": "MMMM 'de' y", "Format_Month_Short": "MMM y", "Format_Time": "{time}", - "Format_Time_12": "h:mm:ss a", + "Format_Time_12": "h:mm:ss a", "Format_Time_24": "H:mm:ss", "Format_Year": "y", "Hours": "horas", @@ -770,7 +770,7 @@ "Language_rw": "Kinyarwanda", "Language_sa": "Sánscrito", "Language_sc": "Sardo", - "Language_sd": "Sindhi", + "Language_sd": "Sindi", "Language_se": "Sami septentrional", "Language_sg": "Sango", "Language_si": "Cingalés", @@ -1030,7 +1030,7 @@ "Timezone_Asia_Jayapura": "Jayapura", "Timezone_Asia_Kamchatka": "Kamchatka", "Timezone_Asia_Katmandu": "Katmandú", - "Timezone_Asia_Khandyga": "Khandyga", + "Timezone_Asia_Khandyga": "Khandiga", "Timezone_Asia_Krasnoyarsk": "Krasnoyarsk", "Timezone_Asia_KualaLumpur": "Kuala Lumpur", "Timezone_Asia_Kuching": "Kuching", diff --git a/plugins/Intl/lang/et.json b/plugins/Intl/lang/et.json index 31da987ce1..7ad4edc350 100644 --- a/plugins/Intl/lang/et.json +++ b/plugins/Intl/lang/et.json @@ -569,20 +569,20 @@ "Currency_YER": "Jeemeni riaal", "Currency_ZAR": "Lõuna-Aafrika rand", "Currency_ZMW": "Sambia kvatša", - "Day_Long_1": "Esmaspäev", - "Day_Long_2": "Teisipäev", - "Day_Long_3": "Kolmapäev", - "Day_Long_4": "Neljapäev", - "Day_Long_5": "Reede", - "Day_Long_6": "Laupäev", - "Day_Long_7": "Pühapäev", - "Day_Long_StandAlone_1": "Esmaspäev", - "Day_Long_StandAlone_2": "Teisipäev", - "Day_Long_StandAlone_3": "Kolmapäev", - "Day_Long_StandAlone_4": "Neljapäev", - "Day_Long_StandAlone_5": "Reede", - "Day_Long_StandAlone_6": "Laupäev", - "Day_Long_StandAlone_7": "Pühapäev", + "Day_Long_1": "esmaspäev", + "Day_Long_2": "teisipäev", + "Day_Long_3": "kolmapäev", + "Day_Long_4": "neljapäev", + "Day_Long_5": "reede", + "Day_Long_6": "laupäev", + "Day_Long_7": "pühapäev", + "Day_Long_StandAlone_1": "esmaspäev", + "Day_Long_StandAlone_2": "teisipäev", + "Day_Long_StandAlone_3": "kolmapäev", + "Day_Long_StandAlone_4": "neljapäev", + "Day_Long_StandAlone_5": "reede", + "Day_Long_StandAlone_6": "laupäev", + "Day_Long_StandAlone_7": "pühapäev", "Day_Min_1": "E", "Day_Min_2": "T", "Day_Min_3": "K", @@ -617,18 +617,18 @@ "Format_Date_Day_Month": "E, d. MMM", "Format_Date_Long": "EEEE, d. MMMM y", "Format_Date_Short": "d. MMM y", - "Format_Hour_12": "h a", + "Format_Hour_12": "h a", "Format_Hour_24": "HH", "Format_Interval_Long_D": "d.–d. MMMM y", - "Format_Interval_Long_M": "d. MMMM – d. MMMM y", - "Format_Interval_Long_Y": "d. MMMM y – d. MMMM y", + "Format_Interval_Long_M": "d. MMMM – d. MMMM y", + "Format_Interval_Long_Y": "d. MMMM y – d. MMMM y", "Format_Interval_Short_D": "d.–d. MMM y", - "Format_Interval_Short_M": "d. MMM – d. MMM y", - "Format_Interval_Short_Y": "d. MMM y – d. MMM y", + "Format_Interval_Short_M": "d. MMM – d. MMM y", + "Format_Interval_Short_Y": "d. MMM y – d. MMM y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "{time}", - "Format_Time_12": "h:mm:ss a", + "Format_Time_12": "h:mm:ss a", "Format_Time_24": "HH:mm:ss", "Format_Year": "y", "Hours": "tunnid", diff --git a/plugins/Intl/lang/eu.json b/plugins/Intl/lang/eu.json index 4f70674486..ccc2c8a624 100644 --- a/plugins/Intl/lang/eu.json +++ b/plugins/Intl/lang/eu.json @@ -614,27 +614,27 @@ "EnglishLanguageName": "Basque", "Format_DateTime_Long": "y('e')'ko' MMMM'ren' d('a'), EEEE {time}", "Format_DateTime_Short": "y('e')'ko' MMM d('a') {time}", - "Format_Date_Day_Month": "MMM d, E", + "Format_Date_Day_Month": "MMM d('a'), E", "Format_Date_Long": "y('e')'ko' MMMM'ren' d('a'), EEEE", "Format_Date_Short": "y('e')'ko' MMM d('a')", - "Format_Hour_12": "h a", + "Format_Hour_12": "h a", "Format_Hour_24": "HH", "Format_Interval_Long_D": "y('e')'ko' MMMM d–d", - "Format_Interval_Long_M": "y('e')'ko' MMMM d – MMMM d", - "Format_Interval_Long_Y": "y('e')'ko' MMMM d – y('e')'ko' MMMM d", + "Format_Interval_Long_M": "y('e')'ko' MMMM d('a') – MMMM d('a')", + "Format_Interval_Long_Y": "y('e')'ko' MMMM d('a') – y('e')'ko' MMMM d('a')", "Format_Interval_Short_D": "y('e')'ko' MMM d–d", - "Format_Interval_Short_M": "y('e')'ko' MMM d – MMM d", - "Format_Interval_Short_Y": "y('e')'ko' MMM d – y('e')'ko' MMM d", + "Format_Interval_Short_M": "y('e')'ko' MMM d('a') – MMM d('a')", + "Format_Interval_Short_Y": "y('e')'ko' MMM d('a') – y('e')'ko' MMM d('a')", "Format_Month_Long": "y('e')'ko' MMMM", "Format_Month_Short": "y MMM", "Format_Time": "{time}", - "Format_Time_12": "h:mm:ss a", + "Format_Time_12": "h:mm:ss a", "Format_Time_24": "HH:mm:ss", "Format_Year": "y", "Hours": "orduak", "Language_aa": "Afarera", "Language_ab": "Abkhaziera", - "Language_af": "Afrikaans", + "Language_af": "Afrikaansa", "Language_ak": "Akanera", "Language_am": "Amharera", "Language_an": "Aragoiera", @@ -652,22 +652,22 @@ "Language_bo": "Tibetera", "Language_br": "Bretoiera", "Language_bs": "Bosniera", - "Language_ca": "Katalan", + "Language_ca": "Katalana", "Language_ce": "Txetxenera", - "Language_ch": "Chamorrera", + "Language_ch": "Txamorroera", "Language_co": "Korsikera", "Language_cs": "Txekiera", "Language_cu": "Elizako eslaviera", "Language_cv": "Txuvaxera", - "Language_cy": "Gales", + "Language_cy": "Galesa", "Language_da": "Daniera", - "Language_de": "Aleman", - "Language_dv": "Divehiera", + "Language_de": "Alemana", + "Language_dv": "Dhivehia", "Language_dz": "Dzongkha", "Language_ee": "Eweera", "Language_el": "Greziera", - "Language_en": "Ingeles", - "Language_eo": "Esperanto", + "Language_en": "Ingelesa", + "Language_eo": "Esperantoa", "Language_es": "Espainiera", "Language_et": "Estoniera", "Language_eu": "Euskara", @@ -676,17 +676,17 @@ "Language_fi": "Finlandiera", "Language_fj": "Fijiera", "Language_fo": "Faroera", - "Language_fr": "Frantses", + "Language_fr": "Frantsesa", "Language_fy": "Frisiera", "Language_ga": "Irlandera", - "Language_gd": "Eskoziako gaeliko", + "Language_gd": "Eskoziako gaelikoa", "Language_gl": "Galiziera", "Language_gn": "Guaraniera", "Language_gu": "Gujaratera", "Language_gv": "Manxera", "Language_ha": "Hausa", "Language_he": "Hebreera", - "Language_hi": "Hindi", + "Language_hi": "Hindia", "Language_hr": "Kroaziera", "Language_ht": "Haitiko kreolera", "Language_hu": "Hungariera", @@ -697,10 +697,10 @@ "Language_ie": "Interlingue", "Language_ig": "Igboera", "Language_ii": "Sichuango yiera", - "Language_io": "Ido", + "Language_io": "Idoa", "Language_is": "Islandiera", "Language_it": "Italiera", - "Language_iu": "Inuktitut", + "Language_iu": "Inuitera", "Language_ja": "Japoniera", "Language_jv": "Javera", "Language_ka": "Georgiera", @@ -718,7 +718,7 @@ "Language_kv": "Komiera", "Language_kw": "Kornubiera", "Language_ky": "Kirgizera", - "Language_la": "Latin", + "Language_la": "Latina", "Language_lb": "Luxenburgera", "Language_lg": "Luganda", "Language_li": "Limburgera", @@ -727,7 +727,7 @@ "Language_lt": "Lituaniera", "Language_lu": "Katangako lubera", "Language_lv": "Letoniera", - "Language_mg": "Malgaxe", + "Language_mg": "Malgaxea", "Language_mh": "Marshallera", "Language_mi": "Maoriera", "Language_mk": "Mazedoniera", @@ -741,7 +741,7 @@ "Language_nb": "Bokmål (norvegiera)", "Language_nd": "Iparraldeko ndebeleera", "Language_ne": "Nepalera", - "Language_ng": "Ndongera", + "Language_ng": "Ndonga", "Language_nl": "Nederlandera", "Language_nn": "Nynorsk (norvegiera)", "Language_no": "Norvegiera", @@ -754,19 +754,19 @@ "Language_os": "Osetiera", "Language_pa": "Punjabera", "Language_pl": "Poloniera", - "Language_ps": "Paxtuera", - "Language_pt": "Portuges", + "Language_ps": "Paxtunera", + "Language_pt": "Portugesa", "Language_qu": "Kitxua", "Language_rm": "Erretorromaniera", "Language_rn": "Rundiera", "Language_ro": "Errumaniera", "Language_ru": "Errusiera", "Language_rw": "Kinyaruanda", - "Language_sa": "Sanskrito", + "Language_sa": "Sanskritoa", "Language_sc": "Sardiniera", - "Language_sd": "Sindhi", + "Language_sd": "Sindhia", "Language_se": "Iparraldeko samiera", - "Language_sg": "Sango", + "Language_sg": "Sangoa", "Language_si": "Sinhala", "Language_sk": "Eslovakiera", "Language_sl": "Esloveniera", @@ -781,7 +781,7 @@ "Language_sv": "Suediera", "Language_sw": "Swahilia", "Language_ta": "Tamilera", - "Language_te": "Telugu", + "Language_te": "Telugua", "Language_tg": "Tajikera", "Language_th": "Thailandiera", "Language_ti": "Tigrinyera", @@ -796,7 +796,7 @@ "Language_ty": "Tahitiera", "Language_ug": "Uigurrera", "Language_uk": "Ukrainera", - "Language_ur": "Urdu", + "Language_ur": "Urdua", "Language_uz": "Uzbekera", "Language_ve": "Vendera", "Language_vi": "Vietnamera", @@ -804,24 +804,24 @@ "Language_wa": "Waloiera", "Language_wo": "Wolofera", "Language_xh": "Xhosera", - "Language_yi": "Yiddish", + "Language_yi": "Yiddisha", "Language_yo": "Jorubera", "Language_zh": "Txinera", "Language_zu": "Zuluera", "LayoutDirection": "ltr", "Minutes": "minutuak", - "Month_Long_1": "urtarrilak", - "Month_Long_10": "urriak", - "Month_Long_11": "azaroak", - "Month_Long_12": "abenduak", - "Month_Long_2": "otsailak", - "Month_Long_3": "martxoak", - "Month_Long_4": "apirilak", - "Month_Long_5": "maiatzak", - "Month_Long_6": "ekainak", - "Month_Long_7": "uztailak", - "Month_Long_8": "abuztuak", - "Month_Long_9": "irailak", + "Month_Long_1": "urtarrila", + "Month_Long_10": "urria", + "Month_Long_11": "azaroa", + "Month_Long_12": "abendua", + "Month_Long_2": "otsaila", + "Month_Long_3": "martxoa", + "Month_Long_4": "apirila", + "Month_Long_5": "maiatza", + "Month_Long_6": "ekaina", + "Month_Long_7": "uztaila", + "Month_Long_8": "abuztua", + "Month_Long_9": "iraila", "Month_Long_StandAlone_1": "urtarrila", "Month_Long_StandAlone_10": "urria", "Month_Long_StandAlone_11": "azaroa", diff --git a/plugins/Intl/lang/fa.json b/plugins/Intl/lang/fa.json index 0fc2468ff1..54a06ec7a9 100644 --- a/plugins/Intl/lang/fa.json +++ b/plugins/Intl/lang/fa.json @@ -1099,7 +1099,7 @@ "Timezone_Pacific_Gambier": "گامبیر", "Timezone_Pacific_Honolulu": "هونولولو", "Timezone_Pacific_Johnston": "جانستون", - "Timezone_Pacific_Kanton": "Kanton", + "Timezone_Pacific_Kanton": "کانتون", "Timezone_Pacific_Kiritimati": "کریتیماتی", "Timezone_Pacific_Kosrae": "کوسرای", "Timezone_Pacific_Kwajalein": "کواجیلین", diff --git a/plugins/Intl/lang/fi.json b/plugins/Intl/lang/fi.json index 8d2d8d4583..f14eb94e70 100644 --- a/plugins/Intl/lang/fi.json +++ b/plugins/Intl/lang/fi.json @@ -617,18 +617,18 @@ "Format_Date_Day_Month": "ccc d. MMM", "Format_Date_Long": "cccc d. MMMM y", "Format_Date_Short": "d.M.y", - "Format_Hour_12": "h a", + "Format_Hour_12": "h a", "Format_Hour_24": "H", "Format_Interval_Long_D": "d.–d. MMMM y", - "Format_Interval_Long_M": "d. MMMM – d. MMMM y", - "Format_Interval_Long_Y": "d. MMMM y – d. MMMM y", + "Format_Interval_Long_M": "d. MMMM – d. MMMM y", + "Format_Interval_Long_Y": "d. MMMM y – d. MMMM y", "Format_Interval_Short_D": "d.–d. MMMM y", - "Format_Interval_Short_M": "d. MMMM – d. MMMM y", - "Format_Interval_Short_Y": "d. MMMM y – d. MMMM y", + "Format_Interval_Short_M": "d. MMMM – d. MMMM y", + "Format_Interval_Short_Y": "d. MMMM y – d. MMMM y", "Format_Month_Long": "LLLL y", "Format_Month_Short": "LLL y", "Format_Time": "{time}", - "Format_Time_12": "h.mm.ss a", + "Format_Time_12": "h.mm.ss a", "Format_Time_24": "H.mm.ss", "Format_Year": "y", "Hours": "tunnit", diff --git a/plugins/Intl/lang/fr.json b/plugins/Intl/lang/fr.json index 3d02b1884f..bd2b6d3ae4 100644 --- a/plugins/Intl/lang/fr.json +++ b/plugins/Intl/lang/fr.json @@ -617,18 +617,18 @@ "Format_Date_Day_Month": "E d MMM", "Format_Date_Long": "EEEE d MMMM y", "Format_Date_Short": "d MMM y", - "Format_Hour_12": "h a", + "Format_Hour_12": "h a", "Format_Hour_24": "HH 'h'", "Format_Interval_Long_D": "d–d MMMM y", - "Format_Interval_Long_M": "d MMMM – d MMMM y", - "Format_Interval_Long_Y": "d MMMM y – d MMMM y", + "Format_Interval_Long_M": "d MMMM – d MMMM y", + "Format_Interval_Long_Y": "d MMMM y – d MMMM y", "Format_Interval_Short_D": "d–d MMM y", - "Format_Interval_Short_M": "d MMM – d MMM y", - "Format_Interval_Short_Y": "d MMM y – d MMM y", + "Format_Interval_Short_M": "d MMM – d MMM y", + "Format_Interval_Short_Y": "d MMM y – d MMM y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "{time}", - "Format_Time_12": "h:mm:ss a", + "Format_Time_12": "h:mm:ss a", "Format_Time_24": "HH:mm:ss", "Format_Year": "y", "Hours": "heures", @@ -1003,7 +1003,7 @@ "Timezone_America_Yellowknife": "Yellowknife", "Timezone_Antarctica_Casey": "Casey", "Timezone_Antarctica_Davis": "Davis", - "Timezone_Antarctica_DumontDUrville": "Dumont d’Urville", + "Timezone_Antarctica_DumontDUrville": "Dumont-d’Urville", "Timezone_Antarctica_Macquarie": "Macquarie", "Timezone_Antarctica_Mawson": "Mawson", "Timezone_Antarctica_McMurdo": "McMurdo", diff --git a/plugins/Intl/lang/gl.json b/plugins/Intl/lang/gl.json index 71bdd8a9d8..c0ac75a283 100644 --- a/plugins/Intl/lang/gl.json +++ b/plugins/Intl/lang/gl.json @@ -617,18 +617,18 @@ "Format_Date_Day_Month": "E, d 'de' MMM", "Format_Date_Long": "EEEE, d 'de' MMMM 'de' y", "Format_Date_Short": "d 'de' MMM 'de' y", - "Format_Hour_12": "h a", + "Format_Hour_12": "h a", "Format_Hour_24": "HH", "Format_Interval_Long_D": "d–d 'de' MMMM 'de' y", - "Format_Interval_Long_M": "d 'de' MMMM – d 'de' MMMM 'de' y", - "Format_Interval_Long_Y": "d 'de' MMMM 'de' y – d 'de' MMMM 'de' y", - "Format_Interval_Short_D": "d–d 'de' MMMM 'de' y", - "Format_Interval_Short_M": "d 'de' MMM – d 'de' MMM 'de' y", - "Format_Interval_Short_Y": "d 'de' MMM 'de' y – d 'de' MMM 'de' y", + "Format_Interval_Long_M": "d 'de' MMMM – d 'de' MMMM 'de' y", + "Format_Interval_Long_Y": "d 'de' MMMM 'de' y – d 'de' MMMM 'de' y", + "Format_Interval_Short_D": "d–d 'de' MMM 'de' y", + "Format_Interval_Short_M": "d 'de' MMM – d 'de' MMM 'de' y", + "Format_Interval_Short_Y": "d 'de' MMM 'de' y – d 'de' MMM 'de' y", "Format_Month_Long": "MMMM 'de' y", "Format_Month_Short": "MMM 'de' y", "Format_Time": "{time}", - "Format_Time_12": "h:mm:ss a", + "Format_Time_12": "h:mm:ss a", "Format_Time_24": "HH:mm:ss", "Format_Year": "y", "Hours": "horas", diff --git a/plugins/Intl/lang/he.json b/plugins/Intl/lang/he.json index 93149711f4..e2dcb801f9 100644 --- a/plugins/Intl/lang/he.json +++ b/plugins/Intl/lang/he.json @@ -42,7 +42,7 @@ "Country_BS": "איי בהאמה", "Country_BT": "בהוטן", "Country_BV": "האי בובה", - "Country_BW": "בוצוואנה", + "Country_BW": "בוטסואנה", "Country_BY": "בלארוס", "Country_BZ": "בליז", "Country_CA": "קנדה", @@ -210,7 +210,7 @@ "Country_SI": "סלובניה", "Country_SJ": "סבאלברד ויאן מאיין", "Country_SK": "סלובקיה", - "Country_SL": "סיירה לאונה", + "Country_SL": "סיירה לאון", "Country_SM": "סן מרינו", "Country_SN": "סנגל", "Country_SO": "סומליה", @@ -521,7 +521,7 @@ "Currency_PAB": "בלבואה פנמי", "Currency_PEN": "סול פרואני", "Currency_PGK": "קינה של פפואה גינאה החדשה", - "Currency_PHP": "פזו פיליפיני", + "Currency_PHP": "פסו פיליפיני", "Currency_PKR": "רופי פקיסטני", "Currency_PLN": "זלוטי פולני", "Currency_PYG": "גוארני פרגוואי", @@ -737,7 +737,7 @@ "Language_mk": "מקדונית", "Language_ml": "מליאלאם", "Language_mn": "מונגולית", - "Language_mr": "מראטהי", + "Language_mr": "מראטהית", "Language_ms": "מלאית", "Language_mt": "מלטית", "Language_my": "בורמזית", @@ -871,7 +871,7 @@ "NMinutesShort": "%s דק׳", "NSeconds": "%s שניות", "NSecondsShort": "%s שנ׳", - "NumberFormatCurrency": "#,##0.00 ¤;-#,##0.00 ¤", + "NumberFormatCurrency": "#,##0.00 ¤;-#,##0.00 ¤", "NumberFormatNumber": "#,##0.###", "NumberFormatPercent": "#,##0%", "NumberSymbolDecimal": ".", @@ -970,9 +970,9 @@ "Timezone_America_Nipigon": "ניפיגון", "Timezone_America_Nome": "נום", "Timezone_America_Noronha": "נורוניה", - "Timezone_America_NorthDakota_Beulah": "ביולה, צפון דקוטה", - "Timezone_America_NorthDakota_Center": "סנטר, צפון דקוטה", - "Timezone_America_NorthDakota_NewSalem": "ניו סיילם, צפון דקוטה", + "Timezone_America_NorthDakota_Beulah": "ביולה, דקוטה הצפונית", + "Timezone_America_NorthDakota_Center": "סנטר, דקוטה הצפונית", + "Timezone_America_NorthDakota_NewSalem": "ניו סיילם, דקוטה הצפונית", "Timezone_America_Ojinaga": "אוג׳ינאגה", "Timezone_America_Pangnirtung": "פנגנירטונג", "Timezone_America_Phoenix": "פיניקס", @@ -1001,7 +1001,7 @@ "Timezone_America_Winnipeg": "וויניפג", "Timezone_America_Yakutat": "יקוטאט", "Timezone_America_Yellowknife": "ילונייף", - "Timezone_Antarctica_Casey": "קאסיי", + "Timezone_Antarctica_Casey": "קייסי", "Timezone_Antarctica_Davis": "דיוויס", "Timezone_Antarctica_DumontDUrville": "דומון ד׳אורוויל", "Timezone_Antarctica_Macquarie": "מקווארי", diff --git a/plugins/Intl/lang/hi.json b/plugins/Intl/lang/hi.json index eafa420d4a..c14edad017 100644 --- a/plugins/Intl/lang/hi.json +++ b/plugins/Intl/lang/hi.json @@ -51,7 +51,7 @@ "Country_CF": "मध्य अफ़्रीकी गणराज्य", "Country_CG": "कांगो – ब्राज़ाविल", "Country_CH": "स्विट्ज़रलैंड", - "Country_CI": "कोट डी आइवर", + "Country_CI": "कोत दिवुआर", "Country_CK": "कुक द्वीपसमूह", "Country_CL": "चिली", "Country_CM": "कैमरून", @@ -60,7 +60,7 @@ "Country_CR": "कोस्टारिका", "Country_CU": "क्यूबा", "Country_CV": "केप वर्ड", - "Country_CW": "क्यूरासाओ", + "Country_CW": "कुरासाओ", "Country_CX": "क्रिसमस द्वीप", "Country_CY": "साइप्रस", "Country_CZ": "चेकिया", @@ -226,7 +226,7 @@ "Country_TF": "फ़्रांसीसी दक्षिणी क्षेत्र", "Country_TG": "टोगो", "Country_TH": "थाईलैंड", - "Country_TJ": "ताज़िकिस्तान", + "Country_TJ": "ताजिकिस्तान", "Country_TK": "तोकेलाउ", "Country_TL": "तिमोर-लेस्त", "Country_TM": "तुर्कमेनिस्तान", @@ -670,7 +670,7 @@ "Language_el": "यूनानी", "Language_en": "अंग्रेज़ी", "Language_eo": "एस्पेरेंतो", - "Language_es": "स्पेनी", + "Language_es": "स्पेनिश", "Language_et": "एस्टोनियाई", "Language_eu": "बास्क", "Language_fa": "फ़ारसी", @@ -704,7 +704,7 @@ "Language_io": "इडौ", "Language_is": "आइसलैंडिक", "Language_it": "इतालवी", - "Language_iu": "इनूकीटूत्", + "Language_iu": "इनुक्टिटुट", "Language_ja": "जापानी", "Language_jv": "जावानीज़", "Language_ka": "जॉर्जियाई", @@ -755,7 +755,7 @@ "Language_oc": "ओसीटान", "Language_oj": "ओजिब्वा", "Language_om": "ओरोमो", - "Language_or": "उड़िया", + "Language_or": "ओड़िया", "Language_os": "ओस्सेटिक", "Language_pa": "पंजाबी", "Language_pi": "पाली", @@ -866,11 +866,11 @@ "Month_Short_StandAlone_8": "अग॰", "Month_Short_StandAlone_9": "सित॰", "NDays": "%s दिन", - "NHoursShort": "%sघं॰", + "NHoursShort": "%s घं", "NMinutes": "%s मिनट", "NMinutesShort": "%s मि॰", "NSeconds": "%s सेकंड", - "NSecondsShort": "%sसे॰", + "NSecondsShort": "%s से", "NumberFormatCurrency": "¤#,##,##0.00", "NumberFormatNumber": "#,##,##0.###", "NumberFormatPercent": "#,##,##0%", diff --git a/plugins/Intl/lang/hr.json b/plugins/Intl/lang/hr.json index 9b541aa726..a39caa6615 100644 --- a/plugins/Intl/lang/hr.json +++ b/plugins/Intl/lang/hr.json @@ -52,7 +52,7 @@ "Country_CG": "Kongo - Brazzaville", "Country_CH": "Švicarska", "Country_CI": "Obala Bjelokosti", - "Country_CK": "Cookovi Otoci", + "Country_CK": "Cookovi otoci", "Country_CL": "Čile", "Country_CM": "Kamerun", "Country_CN": "Kina", @@ -157,7 +157,7 @@ "Country_MN": "Mongolija", "Country_MO": "PUP Makao Kina", "Country_MP": "Sjevernomarijanski otoci", - "Country_MQ": "Martinique", + "Country_MQ": "Martinik", "Country_MR": "Mauretanija", "Country_MS": "Montserrat", "Country_MT": "Malta", @@ -301,7 +301,7 @@ "CurrencySymbol_EGP": "EGP", "CurrencySymbol_ERN": "ERN", "CurrencySymbol_ETB": "ETB", - "CurrencySymbol_EUR": "EUR", + "CurrencySymbol_EUR": "€", "CurrencySymbol_FJD": "FJD", "CurrencySymbol_FKP": "FKP", "CurrencySymbol_GBP": "GBP", @@ -617,18 +617,18 @@ "Format_Date_Day_Month": "E, d. MMM", "Format_Date_Long": "EEEE, d. MMMM y.", "Format_Date_Short": "d. MMM y.", - "Format_Hour_12": "h a", + "Format_Hour_12": "h a", "Format_Hour_24": "HH", "Format_Interval_Long_D": "dd. – dd. MMMM y.", - "Format_Interval_Long_M": "dd. MMMM – dd. MMMM y.", + "Format_Interval_Long_M": "dd. MMMM – dd. MMMM y.", "Format_Interval_Long_Y": "dd. MMMM y. – dd. MMMM y.", "Format_Interval_Short_D": "dd. – dd. MMM y.", - "Format_Interval_Short_M": "dd. MMM – dd. MMM y.", + "Format_Interval_Short_M": "dd. MMM – dd. MMM y.", "Format_Interval_Short_Y": "dd. MMM y. – dd. MMM y.", "Format_Month_Long": "LLLL y.", "Format_Month_Short": "LLL y.", "Format_Time": "{time}", - "Format_Time_12": "hh:mm:ss a", + "Format_Time_12": "hh:mm:ss a", "Format_Time_24": "HH:mm:ss", "Format_Year": "y.", "Hours": "sati", diff --git a/plugins/Intl/lang/hu.json b/plugins/Intl/lang/hu.json index 5f7a0c9c9e..fa2a3ec48f 100644 --- a/plugins/Intl/lang/hu.json +++ b/plugins/Intl/lang/hu.json @@ -617,7 +617,7 @@ "Format_Date_Day_Month": "MMM d., E", "Format_Date_Long": "y. MMMM d., EEEE", "Format_Date_Short": "y. MMM d.", - "Format_Hour_12": "a h", + "Format_Hour_12": "a h", "Format_Hour_24": "H", "Format_Interval_Long_D": "y. MMMM d–d.", "Format_Interval_Long_M": "y. MMMM d. – MMMM d.", @@ -628,7 +628,7 @@ "Format_Month_Long": "y. MMMM", "Format_Month_Short": "y. MMM", "Format_Time": "{time}", - "Format_Time_12": "a h:mm:ss", + "Format_Time_12": "a h:mm:ss", "Format_Time_24": "H:mm:ss", "Format_Year": "y.", "Hours": "óra", diff --git a/plugins/Intl/lang/id.json b/plugins/Intl/lang/id.json index 657802290f..1ddac57ee7 100644 --- a/plugins/Intl/lang/id.json +++ b/plugins/Intl/lang/id.json @@ -617,18 +617,18 @@ "Format_Date_Day_Month": "E, d MMM", "Format_Date_Long": "EEEE, dd MMMM y", "Format_Date_Short": "d MMM y", - "Format_Hour_12": "h a", + "Format_Hour_12": "h a", "Format_Hour_24": "HH", "Format_Interval_Long_D": "d–d MMMM y", - "Format_Interval_Long_M": "d MMMM – d MMMM y", - "Format_Interval_Long_Y": "d MMMM y – d MMMM y", + "Format_Interval_Long_M": "d MMMM – d MMMM y", + "Format_Interval_Long_Y": "d MMMM y – d MMMM y", "Format_Interval_Short_D": "d–d MMM y", - "Format_Interval_Short_M": "d MMM – d MMM y", - "Format_Interval_Short_Y": "d MMM y – d MMM y", + "Format_Interval_Short_M": "d MMM – d MMM y", + "Format_Interval_Short_Y": "d MMM y – d MMM y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "{time}", - "Format_Time_12": "h.mm.ss a", + "Format_Time_12": "h.mm.ss a", "Format_Time_24": "HH.mm.ss", "Format_Year": "y", "Hours": "jam", diff --git a/plugins/Intl/lang/is.json b/plugins/Intl/lang/is.json index c65f83ba20..71546dc944 100644 --- a/plugins/Intl/lang/is.json +++ b/plugins/Intl/lang/is.json @@ -322,7 +322,7 @@ "CurrencySymbol_INR": "INR", "CurrencySymbol_IQD": "IQD", "CurrencySymbol_IRR": "IRR", - "CurrencySymbol_ISK": "ISK", + "CurrencySymbol_ISK": "kr.", "CurrencySymbol_JMD": "JMD", "CurrencySymbol_JOD": "JOD", "CurrencySymbol_JPY": "JP¥", @@ -458,7 +458,7 @@ "Currency_ERN": "Erítresk nakfa", "Currency_ETB": "Eþíópískt birr", "Currency_EUR": "Evra", - "Currency_FJD": "Fidjeyskur dalur", + "Currency_FJD": "Fídjískur dalur", "Currency_FKP": "Falklenskt pund", "Currency_GBP": "Sterlingspund", "Currency_GEL": "Georgískur lari", @@ -547,7 +547,7 @@ "Currency_THB": "Taílenskt bat", "Currency_TJS": "Tadsjikskur sómóni", "Currency_TMT": "Túrkmenskt manat", - "Currency_TND": "Túnískur denari", + "Currency_TND": "Túniskur denari", "Currency_TOP": "Tongapanga", "Currency_TRY": "Tyrknesk líra", "Currency_TTD": "Trínidad og Tóbagó-dalur", @@ -617,18 +617,18 @@ "Format_Date_Day_Month": "E, d. MMM", "Format_Date_Long": "EEEE, d. MMMM y", "Format_Date_Short": "d. MMM y", - "Format_Hour_12": "h a", + "Format_Hour_12": "h a", "Format_Hour_24": "HH", "Format_Interval_Long_D": "d.–d. MMMM y", - "Format_Interval_Long_M": "d. MMMM – d. MMMM y", - "Format_Interval_Long_Y": "d. MMMM y – d. MMMM y", + "Format_Interval_Long_M": "d. MMMM – d. MMMM y", + "Format_Interval_Long_Y": "d. MMMM y – d. MMMM y", "Format_Interval_Short_D": "d.–d. MMM y", - "Format_Interval_Short_M": "d. MMM – d. MMM y", - "Format_Interval_Short_Y": "d. MMM y – d. MMM y", + "Format_Interval_Short_M": "d. MMM – d. MMM y", + "Format_Interval_Short_Y": "d. MMM y – d. MMM y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "{time}", - "Format_Time_12": "h:mm:ss a", + "Format_Time_12": "h:mm:ss a", "Format_Time_24": "HH:mm:ss", "Format_Year": "y", "Hours": "klukkustundir", diff --git a/plugins/Intl/lang/it.json b/plugins/Intl/lang/it.json index 52dca78f9c..3aedc8386a 100644 --- a/plugins/Intl/lang/it.json +++ b/plugins/Intl/lang/it.json @@ -87,7 +87,7 @@ "Country_GB": "Regno Unito", "Country_GD": "Grenada", "Country_GE": "Georgia", - "Country_GF": "Guyana francese", + "Country_GF": "Guyana Francese", "Country_GG": "Guernsey", "Country_GH": "Ghana", "Country_GI": "Gibilterra", @@ -97,7 +97,7 @@ "Country_GP": "Guadalupa", "Country_GQ": "Guinea Equatoriale", "Country_GR": "Grecia", - "Country_GS": "Georgia del Sud e Sandwich australi", + "Country_GS": "Georgia del Sud e Sandwich Australi", "Country_GT": "Guatemala", "Country_GU": "Guam", "Country_GW": "Guinea-Bissau", @@ -180,7 +180,7 @@ "Country_NU": "Niue", "Country_NZ": "Nuova Zelanda", "Country_OM": "Oman", - "Country_PA": "Panamá", + "Country_PA": "Panama", "Country_PE": "Perù", "Country_PF": "Polinesia francese", "Country_PG": "Papua Nuova Guinea", @@ -220,7 +220,7 @@ "Country_SV": "El Salvador", "Country_SX": "Sint Maarten", "Country_SY": "Siria", - "Country_SZ": "Swaziland", + "Country_SZ": "ESwatini", "Country_TC": "Isole Turks e Caicos", "Country_TD": "Ciad", "Country_TF": "Terre australi francesi", @@ -239,7 +239,7 @@ "Country_TZ": "Tanzania", "Country_UA": "Ucraina", "Country_UG": "Uganda", - "Country_UM": "Altre isole americane del Pacifico", + "Country_UM": "Isole Minori Esterne degli Stati Uniti", "Country_US": "Stati Uniti", "Country_UY": "Uruguay", "Country_UZ": "Uzbekistan", @@ -523,7 +523,7 @@ "Currency_PGK": "Kina papuana", "Currency_PHP": "Peso filippino", "Currency_PKR": "Rupia pakistana", - "Currency_PLN": "Złoty polacco", + "Currency_PLN": "Zloty polacco", "Currency_PYG": "Guaraní paraguayano", "Currency_QAR": "Rial qatariano", "Currency_RON": "Leu rumeno", @@ -617,18 +617,18 @@ "Format_Date_Day_Month": "E d MMM", "Format_Date_Long": "EEEE d MMMM y", "Format_Date_Short": "d MMM y", - "Format_Hour_12": "h a", + "Format_Hour_12": "h a", "Format_Hour_24": "HH", "Format_Interval_Long_D": "dd–dd MMMM y", - "Format_Interval_Long_M": "dd MMMM – dd MMMM y", - "Format_Interval_Long_Y": "dd MMMM y – dd MMMM y", + "Format_Interval_Long_M": "dd MMMM – dd MMMM y", + "Format_Interval_Long_Y": "dd MMMM y – dd MMMM y", "Format_Interval_Short_D": "dd–dd MMM y", - "Format_Interval_Short_M": "dd MMM – dd MMM y", - "Format_Interval_Short_Y": "dd MMM y – dd MMM y", + "Format_Interval_Short_M": "dd MMM – dd MMM y", + "Format_Interval_Short_Y": "dd MMM y – dd MMM y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "{time}", - "Format_Time_12": "h:mm:ss a", + "Format_Time_12": "h:mm:ss a", "Format_Time_24": "HH:mm:ss", "Format_Year": "y", "Hours": "ore", @@ -789,7 +789,7 @@ "Language_ta": "Tamil", "Language_te": "Telugu", "Language_tg": "Tagico", - "Language_th": "Thai", + "Language_th": "Thailandese", "Language_ti": "Tigrino", "Language_tk": "Turcomanno", "Language_tl": "Tagalog", @@ -1052,7 +1052,7 @@ "Timezone_Asia_Srednekolymsk": "Srednekolymsk", "Timezone_Asia_Tashkent": "Tashkent", "Timezone_Asia_Tomsk": "Tomsk", - "Timezone_Asia_Ulaanbaatar": "Ulaanbaatar", + "Timezone_Asia_Ulaanbaatar": "Ulan Bator", "Timezone_Asia_Urumqi": "Urumqi", "Timezone_Asia_Ust-Nera": "Ust’-Nera", "Timezone_Asia_Vladivostok": "Vladivostok", @@ -1099,7 +1099,7 @@ "Timezone_Pacific_Gambier": "Gambier", "Timezone_Pacific_Honolulu": "Honolulu", "Timezone_Pacific_Johnston": "Johnston", - "Timezone_Pacific_Kanton": "Kanton", + "Timezone_Pacific_Kanton": "Canton", "Timezone_Pacific_Kiritimati": "Kiritimati", "Timezone_Pacific_Kosrae": "Kosrae", "Timezone_Pacific_Kwajalein": "Kwajalein", diff --git a/plugins/Intl/lang/ja.json b/plugins/Intl/lang/ja.json index 36498f1232..2edc5104ae 100644 --- a/plugins/Intl/lang/ja.json +++ b/plugins/Intl/lang/ja.json @@ -1078,7 +1078,7 @@ "Timezone_Europe_Berlin": "ベルリン", "Timezone_Europe_Busingen": "ビュージンゲン", "Timezone_Europe_Kaliningrad": "カリーニングラード", - "Timezone_Europe_Kiev": "キエフ", + "Timezone_Europe_Kiev": "キーウ", "Timezone_Europe_Kirov": "キーロフ", "Timezone_Europe_Lisbon": "リスボン", "Timezone_Europe_Madrid": "マドリード", @@ -1099,7 +1099,7 @@ "Timezone_Pacific_Gambier": "ガンビエ諸島", "Timezone_Pacific_Honolulu": "ホノルル", "Timezone_Pacific_Johnston": "ジョンストン島", - "Timezone_Pacific_Kanton": "Kanton", + "Timezone_Pacific_Kanton": "カントン島", "Timezone_Pacific_Kiritimati": "キリスィマスィ島", "Timezone_Pacific_Kosrae": "コスラエ", "Timezone_Pacific_Kwajalein": "クェゼリン", diff --git a/plugins/Intl/lang/ka.json b/plugins/Intl/lang/ka.json index 5b39832470..7aea51d5b7 100644 --- a/plugins/Intl/lang/ka.json +++ b/plugins/Intl/lang/ka.json @@ -787,7 +787,7 @@ "Language_ta": "Ტამილური", "Language_te": "Ტელუგუ", "Language_tg": "Ტაჯიკური", - "Language_th": "Ტაი", + "Language_th": "Ტაილანდური", "Language_ti": "Ტიგრინია", "Language_tk": "Თურქმენული", "Language_tn": "Ტსვანა", @@ -1095,7 +1095,7 @@ "Timezone_Pacific_Gambier": "გამბიერი", "Timezone_Pacific_Honolulu": "ჰონოლულუ", "Timezone_Pacific_Johnston": "ჯონსტონი", - "Timezone_Pacific_Kanton": "Kanton", + "Timezone_Pacific_Kanton": "კანტონი", "Timezone_Pacific_Kiritimati": "კირიტიმატი", "Timezone_Pacific_Kosrae": "კოსრაე", "Timezone_Pacific_Kwajalein": "კვაჯალეინი", diff --git a/plugins/Intl/lang/ko.json b/plugins/Intl/lang/ko.json index ae6db3ffbe..8b27ec6c24 100644 --- a/plugins/Intl/lang/ko.json +++ b/plugins/Intl/lang/ko.json @@ -223,7 +223,7 @@ "Country_SZ": "에스와티니", "Country_TC": "터크스 케이커스 제도", "Country_TD": "차드", - "Country_TF": "프랑스 남부 지방", + "Country_TF": "프랑스령 남방 지역", "Country_TG": "토고", "Country_TH": "태국", "Country_TJ": "타지키스탄", @@ -431,16 +431,16 @@ "Currency_BIF": "부룬디 프랑", "Currency_BMD": "버뮤다 달러", "Currency_BND": "부루나이 달러", - "Currency_BOB": "볼리비아노", + "Currency_BOB": "볼리비아 볼리비아노", "Currency_BRL": "브라질 레알", "Currency_BSD": "바하마 달러", "Currency_BTC": "Bitcoin", "Currency_BTN": "부탄 눌투눔", - "Currency_BWP": "보츠와나 폴라", + "Currency_BWP": "보츠와나 풀라", "Currency_BYN": "벨라루스 루블", "Currency_BZD": "벨리즈 달러", "Currency_CAD": "캐나다 달러", - "Currency_CDF": "콩고 프랑 콩골라스", + "Currency_CDF": "콩고 프랑", "Currency_CHF": "스위스 프랑", "Currency_CLP": "칠레 페소", "Currency_CNY": "중국 위안화", @@ -449,7 +449,7 @@ "Currency_CUC": "쿠바 태환 페소", "Currency_CUP": "쿠바 페소", "Currency_CVE": "카보베르데 에스쿠도", - "Currency_CZK": "체코 공화국 코루나", + "Currency_CZK": "체코 코루나", "Currency_DJF": "지부티 프랑", "Currency_DKK": "덴마크 크로네", "Currency_DOP": "도미니카 페소", @@ -462,7 +462,7 @@ "Currency_FKP": "포클랜드제도 파운드", "Currency_GBP": "영국 파운드", "Currency_GEL": "조지아 라리", - "Currency_GHS": "가나 시디", + "Currency_GHS": "가나 세디", "Currency_GIP": "지브롤터 파운드", "Currency_GMD": "감비아 달라시", "Currency_GNF": "기니 프랑", @@ -471,7 +471,7 @@ "Currency_HKD": "홍콩 달러", "Currency_HNL": "온두라스 렘피라", "Currency_HRK": "크로아티아 쿠나", - "Currency_HTG": "하이티 구르드", + "Currency_HTG": "아이티 구르드", "Currency_HUF": "헝가리 포린트", "Currency_IDR": "인도네시아 루피아", "Currency_ILS": "이스라엘 신권 세켈", @@ -484,20 +484,20 @@ "Currency_JPY": "일본 엔화", "Currency_KES": "케냐 실링", "Currency_KGS": "키르기스스탄 솜", - "Currency_KHR": "캄보디아 리얄", + "Currency_KHR": "캄보디아 리엘", "Currency_KMF": "코모르 프랑", "Currency_KPW": "조선 민주주의 인민 공화국 원", "Currency_KRW": "대한민국 원", "Currency_KWD": "쿠웨이트 디나르", "Currency_KYD": "케이맨 제도 달러", - "Currency_KZT": "카자흐스탄 텐게", + "Currency_KZT": "카자흐스탄 텡게", "Currency_LAK": "라오스 키프", "Currency_LBP": "레바논 파운드", "Currency_LKR": "스리랑카 루피", "Currency_LRD": "라이베리아 달러", "Currency_LSL": "레소토 로티", "Currency_LYD": "리비아 디나르", - "Currency_MAD": "모로코 디렘", + "Currency_MAD": "모로코 디르함", "Currency_MDL": "몰도바 레이", "Currency_MGA": "마다가스카르 아리아리", "Currency_MKD": "마케도니아 디나르", @@ -507,23 +507,23 @@ "Currency_MRU": "모리타니 우기야", "Currency_MUR": "모리셔스 루피", "Currency_MVR": "몰디브 제도 루피아", - "Currency_MWK": "말라위 콰쳐", + "Currency_MWK": "말라위 콰차", "Currency_MXN": "멕시코 페소", "Currency_MYR": "말레이시아 링깃", "Currency_MZN": "모잠비크 메티칼", "Currency_NAD": "나미비아 달러", - "Currency_NGN": "니제르 나이라", - "Currency_NIO": "니카라과 코르도바 오로", + "Currency_NGN": "나이지리아 나이라", + "Currency_NIO": "니카라과 코르도바", "Currency_NOK": "노르웨이 크로네", "Currency_NPR": "네팔 루피", "Currency_NZD": "뉴질랜드 달러", - "Currency_OMR": "오만 리얄", + "Currency_OMR": "오만 리알", "Currency_PAB": "파나마 발보아", "Currency_PEN": "페루 솔", "Currency_PGK": "파푸아뉴기니 키나", "Currency_PHP": "필리핀 페소", "Currency_PKR": "파키스탄 루피", - "Currency_PLN": "폴란드 즐로티", + "Currency_PLN": "폴란드 즈워티", "Currency_PYG": "파라과이 과라니", "Currency_QAR": "카타르 리얄", "Currency_RON": "루마니아 레우", @@ -535,7 +535,7 @@ "Currency_SCR": "세이셸 루피", "Currency_SDG": "수단 파운드", "Currency_SEK": "스웨덴 크로나", - "Currency_SGD": "싱가폴 달러", + "Currency_SGD": "싱가포르 달러", "Currency_SHP": "세인트헬레나 파운드", "Currency_SLL": "시에라리온 리온", "Currency_SOS": "소말리아 실링", @@ -549,14 +549,14 @@ "Currency_TMT": "투르크메니스탄 마나트", "Currency_TND": "튀니지 디나르", "Currency_TOP": "통가 파앙가", - "Currency_TRY": "신 터키 리라", + "Currency_TRY": "터키 리라", "Currency_TTD": "트리니다드 토바고 달러", "Currency_TWD": "신 타이완 달러", "Currency_TZS": "탄자니아 실링", "Currency_UAH": "우크라이나 그리브나", "Currency_UGX": "우간다 실링", "Currency_USD": "미국 달러", - "Currency_UYU": "우루과이 페소 우루과요", + "Currency_UYU": "우루과이 페소", "Currency_UZS": "우즈베키스탄 숨", "Currency_VES": "베네수엘라 볼리바르", "Currency_VND": "베트남 동", @@ -568,7 +568,7 @@ "Currency_XPF": "CFP 프랑", "Currency_YER": "예멘 리알", "Currency_ZAR": "남아프리카 랜드", - "Currency_ZMW": "잠비아 콰쳐", + "Currency_ZMW": "잠비아 콰차", "Day_Long_1": "월요일", "Day_Long_2": "화요일", "Day_Long_3": "수요일", @@ -1099,7 +1099,7 @@ "Timezone_Pacific_Gambier": "감비어", "Timezone_Pacific_Honolulu": "호놀룰루", "Timezone_Pacific_Johnston": "존스톤", - "Timezone_Pacific_Kanton": "Kanton", + "Timezone_Pacific_Kanton": "칸톤", "Timezone_Pacific_Kiritimati": "키리티마티", "Timezone_Pacific_Kosrae": "코스레", "Timezone_Pacific_Kwajalein": "콰잘렌", diff --git a/plugins/Intl/lang/lt.json b/plugins/Intl/lang/lt.json index 47b7ec097e..0642006f4d 100644 --- a/plugins/Intl/lang/lt.json +++ b/plugins/Intl/lang/lt.json @@ -617,18 +617,18 @@ "Format_Date_Day_Month": "MM-dd, E", "Format_Date_Long": "y 'm'. MMMM d 'd'., EEEE", "Format_Date_Short": "y-MM-dd", - "Format_Hour_12": "hh a", + "Format_Hour_12": "hh a", "Format_Hour_24": "HH", "Format_Interval_Long_D": "y MMMM d–d", - "Format_Interval_Long_M": "y MMMM d – MMMM d", - "Format_Interval_Long_Y": "y MMMM d – y MMMM d", + "Format_Interval_Long_M": "y MMMM d – MMMM d", + "Format_Interval_Long_Y": "y MMMM d – y MMMM d", "Format_Interval_Short_D": "y MMM d–d", - "Format_Interval_Short_M": "y MMM d – MMM d", - "Format_Interval_Short_Y": "y MMM d – y MMM d", + "Format_Interval_Short_M": "y MMM d – MMM d", + "Format_Interval_Short_Y": "y MMM d – y MMM d", "Format_Month_Long": "y 'm'. LLLL", "Format_Month_Short": "y-MM", "Format_Time": "{time}", - "Format_Time_12": "hh:mm:ss a", + "Format_Time_12": "hh:mm:ss a", "Format_Time_24": "HH:mm:ss", "Format_Year": "y", "Hours": "valandos", diff --git a/plugins/Intl/lang/lv.json b/plugins/Intl/lang/lv.json index b275a5f370..c716434e48 100644 --- a/plugins/Intl/lang/lv.json +++ b/plugins/Intl/lang/lv.json @@ -617,18 +617,18 @@ "Format_Date_Day_Month": "E, d. MMM", "Format_Date_Long": "EEEE, y. 'gada' d. MMMM", "Format_Date_Short": "y. 'gada' d. MMM", - "Format_Hour_12": "h a", + "Format_Hour_12": "h a", "Format_Hour_24": "HH", "Format_Interval_Long_D": "y. 'gada' d.–d. MMMM", - "Format_Interval_Long_M": "y. 'gada' d. MMMM – d. MMMM", - "Format_Interval_Long_Y": "y. 'gada' d. MMMM – y. 'gada' d. MMMM", + "Format_Interval_Long_M": "y. 'gada' d. MMMM – d. MMMM", + "Format_Interval_Long_Y": "y. 'gada' d. MMMM – y. 'gada' d. MMMM", "Format_Interval_Short_D": "y. 'gada' d.–d. MMM", - "Format_Interval_Short_M": "y. 'gada' d. MMM – d. MMM", - "Format_Interval_Short_Y": "y. 'gada' d. MMM – y. 'gada' d. MMM", + "Format_Interval_Short_M": "y. 'gada' d. MMM – d. MMM", + "Format_Interval_Short_Y": "y. 'gada' d. MMM – y. 'gada' d. MMM", "Format_Month_Long": "y. 'g'. MMMM", "Format_Month_Short": "y. 'g'. MMM", "Format_Time": "{time}", - "Format_Time_12": "h:mm:ss a", + "Format_Time_12": "h:mm:ss a", "Format_Time_24": "HH:mm:ss", "Format_Year": "y. 'g'.", "Hours": "stundas", diff --git a/plugins/Intl/lang/nb.json b/plugins/Intl/lang/nb.json index e4e7cb0289..09fe919899 100644 --- a/plugins/Intl/lang/nb.json +++ b/plugins/Intl/lang/nb.json @@ -617,7 +617,7 @@ "Format_Date_Day_Month": "E d. MMM", "Format_Date_Long": "EEEE d. MMMM y", "Format_Date_Short": "d. MMM y", - "Format_Hour_12": "h a", + "Format_Hour_12": "h a", "Format_Hour_24": "HH", "Format_Interval_Long_D": "d.–d. MMMM y", "Format_Interval_Long_M": "d. MMMM–d. MMMM y", @@ -628,7 +628,7 @@ "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "{time}", - "Format_Time_12": "h:mm:ss a", + "Format_Time_12": "h:mm:ss a", "Format_Time_24": "HH:mm:ss", "Format_Year": "y", "Hours": "timer", @@ -1078,7 +1078,7 @@ "Timezone_Europe_Berlin": "Berlin", "Timezone_Europe_Busingen": "Büsingen", "Timezone_Europe_Kaliningrad": "Kaliningrad", - "Timezone_Europe_Kiev": "Kiev", + "Timezone_Europe_Kiev": "Kyiv", "Timezone_Europe_Kirov": "Kirov", "Timezone_Europe_Lisbon": "Lisboa", "Timezone_Europe_Madrid": "Madrid", diff --git a/plugins/Intl/lang/nl.json b/plugins/Intl/lang/nl.json index 31e38c45a9..08614288d5 100644 --- a/plugins/Intl/lang/nl.json +++ b/plugins/Intl/lang/nl.json @@ -460,7 +460,7 @@ "Currency_EUR": "Euro", "Currency_FJD": "Fiji-dollar", "Currency_FKP": "Falklandeilands pond", - "Currency_GBP": "Brits pond", + "Currency_GBP": "Britse pond", "Currency_GEL": "Georgische lari", "Currency_GHS": "Ghanese cedi", "Currency_GIP": "Gibraltarees pond", @@ -620,11 +620,11 @@ "Format_Hour_12": "h a", "Format_Hour_24": "HH", "Format_Interval_Long_D": "d–d MMMM y", - "Format_Interval_Long_M": "d MMMM – d MMMM y", - "Format_Interval_Long_Y": "d MMMM y – d MMMM y", + "Format_Interval_Long_M": "d MMMM – d MMMM y", + "Format_Interval_Long_Y": "d MMMM y – d MMMM y", "Format_Interval_Short_D": "d–d MMM y", - "Format_Interval_Short_M": "d MMM – d MMM y", - "Format_Interval_Short_Y": "d MMM y – d MMM y", + "Format_Interval_Short_M": "d MMM – d MMM y", + "Format_Interval_Short_Y": "d MMM y – d MMM y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "{time}", @@ -841,30 +841,30 @@ "Month_Long_StandAlone_7": "juli", "Month_Long_StandAlone_8": "augustus", "Month_Long_StandAlone_9": "september", - "Month_Short_1": "jan.", - "Month_Short_10": "okt.", - "Month_Short_11": "nov.", - "Month_Short_12": "dec.", - "Month_Short_2": "feb.", - "Month_Short_3": "mrt.", - "Month_Short_4": "apr.", + "Month_Short_1": "jan", + "Month_Short_10": "okt", + "Month_Short_11": "nov", + "Month_Short_12": "dec", + "Month_Short_2": "feb", + "Month_Short_3": "mrt", + "Month_Short_4": "apr", "Month_Short_5": "mei", - "Month_Short_6": "jun.", - "Month_Short_7": "jul.", - "Month_Short_8": "aug.", - "Month_Short_9": "sep.", - "Month_Short_StandAlone_1": "jan.", - "Month_Short_StandAlone_10": "okt.", - "Month_Short_StandAlone_11": "nov.", - "Month_Short_StandAlone_12": "dec.", - "Month_Short_StandAlone_2": "feb.", - "Month_Short_StandAlone_3": "mrt.", - "Month_Short_StandAlone_4": "apr.", + "Month_Short_6": "jun", + "Month_Short_7": "jul", + "Month_Short_8": "aug", + "Month_Short_9": "sep", + "Month_Short_StandAlone_1": "jan", + "Month_Short_StandAlone_10": "okt", + "Month_Short_StandAlone_11": "nov", + "Month_Short_StandAlone_12": "dec", + "Month_Short_StandAlone_2": "feb", + "Month_Short_StandAlone_3": "mrt", + "Month_Short_StandAlone_4": "apr", "Month_Short_StandAlone_5": "mei", - "Month_Short_StandAlone_6": "jun.", - "Month_Short_StandAlone_7": "jul.", - "Month_Short_StandAlone_8": "aug.", - "Month_Short_StandAlone_9": "sep.", + "Month_Short_StandAlone_6": "jun", + "Month_Short_StandAlone_7": "jul", + "Month_Short_StandAlone_8": "aug", + "Month_Short_StandAlone_9": "sep", "NDays": "%s dagen", "NHoursShort": "%s u", "NMinutes": "%s minuten", diff --git a/plugins/Intl/lang/nn.json b/plugins/Intl/lang/nn.json index 248fe1823e..35b2ceb168 100644 --- a/plugins/Intl/lang/nn.json +++ b/plugins/Intl/lang/nn.json @@ -33,7 +33,7 @@ "Country_BH": "Bahrain", "Country_BI": "Burundi", "Country_BJ": "Benin", - "Country_BL": "Saint Barthélemy", + "Country_BL": "Saint-Barthélemy", "Country_BM": "Bermuda", "Country_BN": "Brunei", "Country_BO": "Bolivia", @@ -617,7 +617,7 @@ "Format_Date_Day_Month": "E d. MMM", "Format_Date_Long": "EEEE d. MMMM y", "Format_Date_Short": "d. MMM y", - "Format_Hour_12": "h a", + "Format_Hour_12": "h a", "Format_Hour_24": "HH", "Format_Interval_Long_D": "d.–d. MMMM y", "Format_Interval_Long_M": "d. MMMM–d. MMMM y", @@ -628,7 +628,7 @@ "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "{time}", - "Format_Time_12": "h:mm:ss a", + "Format_Time_12": "h:mm:ss a", "Format_Time_24": "HH:mm:ss", "Format_Year": "y", "Hours": "timar", @@ -1078,7 +1078,7 @@ "Timezone_Europe_Berlin": "Berlin", "Timezone_Europe_Busingen": "Büsingen", "Timezone_Europe_Kaliningrad": "Kaliningrad", - "Timezone_Europe_Kiev": "Kiev", + "Timezone_Europe_Kiev": "Kyiv", "Timezone_Europe_Kirov": "Kirov", "Timezone_Europe_Lisbon": "Lisboa", "Timezone_Europe_Madrid": "Madrid", diff --git a/plugins/Intl/lang/pl.json b/plugins/Intl/lang/pl.json index 121c0fc6c6..a0cb6eb751 100644 --- a/plugins/Intl/lang/pl.json +++ b/plugins/Intl/lang/pl.json @@ -617,18 +617,18 @@ "Format_Date_Day_Month": "E, d MMM", "Format_Date_Long": "EEEE, d MMMM y", "Format_Date_Short": "d MMM y", - "Format_Hour_12": "h a", + "Format_Hour_12": "h a", "Format_Hour_24": "HH", "Format_Interval_Long_D": "d–d MMMM y", - "Format_Interval_Long_M": "d MMMM – d MMMM y", - "Format_Interval_Long_Y": "d MMMM y – d MMMM y", + "Format_Interval_Long_M": "d MMMM – d MMMM y", + "Format_Interval_Long_Y": "d MMMM y – d MMMM y", "Format_Interval_Short_D": "d–d MMM y", "Format_Interval_Short_M": "d MMM–d MMM y", "Format_Interval_Short_Y": "d MMM y–d MMM y", "Format_Month_Long": "LLLL y", "Format_Month_Short": "LLL y", "Format_Time": "{time}", - "Format_Time_12": "h:mm:ss a", + "Format_Time_12": "h:mm:ss a", "Format_Time_24": "HH:mm:ss", "Format_Year": "y", "Hours": "godziny", diff --git a/plugins/Intl/lang/pt-br.json b/plugins/Intl/lang/pt-br.json index 9b161cf484..f10d3b4d47 100644 --- a/plugins/Intl/lang/pt-br.json +++ b/plugins/Intl/lang/pt-br.json @@ -617,18 +617,18 @@ "Format_Date_Day_Month": "E, d 'de' MMM", "Format_Date_Long": "EEEE, d 'de' MMMM 'de' y", "Format_Date_Short": "d 'de' MMM 'de' y", - "Format_Hour_12": "h a", + "Format_Hour_12": "h a", "Format_Hour_24": "HH", - "Format_Interval_Long_D": "d – d 'de' MMMM 'de' y", - "Format_Interval_Long_M": "d 'de' MMMM – d 'de' MMMM 'de' y", - "Format_Interval_Long_Y": "d 'de' MMMM 'de' y – d 'de' MMMM 'de' y", - "Format_Interval_Short_D": "d – d 'de' MMM 'de' y", - "Format_Interval_Short_M": "d 'de' MMM – d 'de' MMM 'de' y", - "Format_Interval_Short_Y": "d 'de' MMM 'de' y – d 'de' MMM 'de' y", + "Format_Interval_Long_D": "d – d 'de' MMMM 'de' y", + "Format_Interval_Long_M": "d 'de' MMMM – d 'de' MMMM 'de' y", + "Format_Interval_Long_Y": "d 'de' MMMM 'de' y – d 'de' MMMM 'de' y", + "Format_Interval_Short_D": "d – d 'de' MMM 'de' y", + "Format_Interval_Short_M": "d 'de' MMM – d 'de' MMM 'de' y", + "Format_Interval_Short_Y": "d 'de' MMM 'de' y – d 'de' MMM 'de' y", "Format_Month_Long": "MMMM 'de' y", "Format_Month_Short": "MMM 'de' y", "Format_Time": "{time}", - "Format_Time_12": "h:mm:ss a", + "Format_Time_12": "h:mm:ss a", "Format_Time_24": "HH:mm:ss", "Format_Year": "y", "Hours": "horas", diff --git a/plugins/Intl/lang/pt.json b/plugins/Intl/lang/pt.json index d0b2c9de25..fba2c9e99d 100644 --- a/plugins/Intl/lang/pt.json +++ b/plugins/Intl/lang/pt.json @@ -148,7 +148,7 @@ "Country_MC": "Mónaco", "Country_MD": "Moldávia", "Country_ME": "Montenegro", - "Country_MF": "São Martinho", + "Country_MF": "São Martinho (Saint-Martin)", "Country_MG": "Madagáscar", "Country_MH": "Ilhas Marshall", "Country_MK": "Macedónia do Norte", @@ -617,18 +617,18 @@ "Format_Date_Day_Month": "E, d\/MM", "Format_Date_Long": "EEEE, d 'de' MMMM 'de' y", "Format_Date_Short": "dd\/MM\/y", - "Format_Hour_12": "h a", + "Format_Hour_12": "h a", "Format_Hour_24": "HH", "Format_Interval_Long_D": "d–d 'de' MMMM 'de' y", - "Format_Interval_Long_M": "d 'de' MMMM – d 'de' MMMM 'de' y", - "Format_Interval_Long_Y": "d 'de' MMMM 'de' y – d 'de' MMMM 'de' y", + "Format_Interval_Long_M": "d 'de' MMMM – d 'de' MMMM 'de' y", + "Format_Interval_Long_Y": "d 'de' MMMM 'de' y – d 'de' MMMM 'de' y", "Format_Interval_Short_D": "d–d 'de' MMM 'de' y", - "Format_Interval_Short_M": "d 'de' MMM – d 'de' MMM 'de' y", - "Format_Interval_Short_Y": "d 'de' MMM 'de' y – d 'de' MMM 'de' y", + "Format_Interval_Short_M": "d 'de' MMM – d 'de' MMM 'de' y", + "Format_Interval_Short_Y": "d 'de' MMM 'de' y – d 'de' MMM 'de' y", "Format_Month_Long": "MMMM 'de' y", "Format_Month_Short": "MM\/y", "Format_Time": "{time}", - "Format_Time_12": "h:mm:ss a", + "Format_Time_12": "h:mm:ss a", "Format_Time_24": "HH:mm:ss", "Format_Year": "y", "Hours": "horas", @@ -641,7 +641,7 @@ "Language_an": "Aragonês", "Language_ar": "Árabe", "Language_as": "Assamês", - "Language_av": "Avaric", + "Language_av": "Avar", "Language_ay": "Aimará", "Language_az": "Azerbaijano", "Language_ba": "Bashkir", diff --git a/plugins/Intl/lang/ro.json b/plugins/Intl/lang/ro.json index 21204b6ab8..1909e6f8ad 100644 --- a/plugins/Intl/lang/ro.json +++ b/plugins/Intl/lang/ro.json @@ -448,7 +448,7 @@ "Currency_CRC": "Colón costarican", "Currency_CUC": "Peso cubanez convertibil", "Currency_CUP": "Peso cubanez", - "Currency_CVE": "Escudo din Capul Verde", + "Currency_CVE": "Escudo caboverdian", "Currency_CZK": "Coroană cehă", "Currency_DJF": "Franc djiboutian", "Currency_DKK": "Coroană daneză", @@ -474,7 +474,7 @@ "Currency_HTG": "Gourde din Haiti", "Currency_HUF": "Forint", "Currency_IDR": "Rupie indoneziană", - "Currency_ILS": "Șechel israelian nou", + "Currency_ILS": "Shekel israelian nou", "Currency_INR": "Rupie indiană", "Currency_IQD": "Dinar irakian", "Currency_IRR": "Rial iranian", @@ -532,16 +532,16 @@ "Currency_RWF": "Franc rwandez", "Currency_SAR": "Rial saudit", "Currency_SBD": "Dolar din Insulele Solomon", - "Currency_SCR": "Rupie din Seychelles", + "Currency_SCR": "Rupie seychelleză", "Currency_SDG": "Liră sudaneză", "Currency_SEK": "Coroană suedeză", "Currency_SGD": "Dolar singaporez", - "Currency_SHP": "Liră Insula Sf. Elena", + "Currency_SHP": "Liră din Sfânta Elena (Sfânta Elena și Ascension)", "Currency_SLL": "Leone din Sierra Leone", "Currency_SOS": "Șiling somalez", "Currency_SRD": "Dolar surinamez", "Currency_SSP": "Liră din Sudanul de Sud", - "Currency_STN": "Dobra Sao Tome și Principe", + "Currency_STN": "Dobra din São Tomé și Príncipe", "Currency_SYP": "Liră siriană", "Currency_SZL": "Lilangeni din Swaziland", "Currency_THB": "Baht thailandez", @@ -617,18 +617,18 @@ "Format_Date_Day_Month": "E, d MMM", "Format_Date_Long": "EEEE, d MMMM y", "Format_Date_Short": "d MMM y", - "Format_Hour_12": "h a", + "Format_Hour_12": "h a", "Format_Hour_24": "HH", "Format_Interval_Long_D": "d–d MMMM y", - "Format_Interval_Long_M": "d MMMM – d MMMM y", - "Format_Interval_Long_Y": "d MMMM y – d MMMM y", + "Format_Interval_Long_M": "d MMMM – d MMMM y", + "Format_Interval_Long_Y": "d MMMM y – d MMMM y", "Format_Interval_Short_D": "d–d MMM y", - "Format_Interval_Short_M": "d MMM – d MMM y", - "Format_Interval_Short_Y": "d MMM y – d MMM y", + "Format_Interval_Short_M": "d MMM – d MMM y", + "Format_Interval_Short_Y": "d MMM y – d MMM y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "{time}", - "Format_Time_12": "h:mm:ss a", + "Format_Time_12": "h:mm:ss a", "Format_Time_24": "HH:mm:ss", "Format_Year": "y", "Hours": "ore", diff --git a/plugins/Intl/lang/ru.json b/plugins/Intl/lang/ru.json index 3c933879f1..98a2fe3490 100644 --- a/plugins/Intl/lang/ru.json +++ b/plugins/Intl/lang/ru.json @@ -35,7 +35,7 @@ "Country_BJ": "Бенин", "Country_BL": "Сен-Бартелеми", "Country_BM": "Бермудские о-ва", - "Country_BN": "Бруней-Даруссалам", + "Country_BN": "Бруней", "Country_BO": "Боливия", "Country_BQ": "Бонэйр, Синт-Эстатиус и Саба", "Country_BR": "Бразилия", @@ -52,7 +52,7 @@ "Country_CG": "Конго - Браззавиль", "Country_CH": "Швейцария", "Country_CI": "Кот-д’Ивуар", - "Country_CK": "Острова Кука", + "Country_CK": "О-ва Кука", "Country_CL": "Чили", "Country_CM": "Камерун", "Country_CN": "Китай", @@ -131,7 +131,7 @@ "Country_KP": "КНДР", "Country_KR": "Республика Корея", "Country_KW": "Кувейт", - "Country_KY": "Острова Кайман", + "Country_KY": "О-ва Кайман", "Country_KZ": "Казахстан", "Country_LA": "Лаос", "Country_LB": "Ливан", @@ -150,7 +150,7 @@ "Country_ME": "Черногория", "Country_MF": "Сен-Мартен", "Country_MG": "Мадагаскар", - "Country_MH": "Маршалловы Острова", + "Country_MH": "Маршалловы о-ва", "Country_MK": "Северная Македония", "Country_ML": "Мали", "Country_MM": "Мьянма (Бирма)", @@ -201,8 +201,8 @@ "Country_RU": "Россия", "Country_RW": "Руанда", "Country_SA": "Саудовская Аравия", - "Country_SB": "Соломоновы Острова", - "Country_SC": "Сейшельские Острова", + "Country_SB": "Соломоновы о-ва", + "Country_SC": "Сейшельские о-ва", "Country_SD": "Судан", "Country_SE": "Швеция", "Country_SG": "Сингапур", @@ -221,7 +221,7 @@ "Country_SX": "Синт-Мартен", "Country_SY": "Сирия", "Country_SZ": "Эсватини", - "Country_TC": "О-ва Тёркс и Кайкос", + "Country_TC": "Тёркс и Кайкос", "Country_TD": "Чад", "Country_TF": "Французские Южные территории", "Country_TG": "Того", @@ -612,23 +612,23 @@ "Day_Short_StandAlone_6": "сб", "Day_Short_StandAlone_7": "вс", "EnglishLanguageName": "Russian", - "Format_DateTime_Long": "EEEE, d MMMM y 'г'. {time}", - "Format_DateTime_Short": "d MMM y 'г'. {time}", + "Format_DateTime_Long": "EEEE, d MMMM y 'г'. {time}", + "Format_DateTime_Short": "d MMM y 'г'. {time}", "Format_Date_Day_Month": "ccc, d MMM", - "Format_Date_Long": "EEEE, d MMMM y 'г'.", - "Format_Date_Short": "d MMM y 'г'.", - "Format_Hour_12": "h a", + "Format_Date_Long": "EEEE, d MMMM y 'г'.", + "Format_Date_Short": "d MMM y 'г'.", + "Format_Hour_12": "h a", "Format_Hour_24": "HH", - "Format_Interval_Long_D": "d–d MMMM y 'г'.", - "Format_Interval_Long_M": "d MMMM – d MMMM y 'г'.", - "Format_Interval_Long_Y": "d MMMM y 'г'. – d MMMM y 'г'.", - "Format_Interval_Short_D": "d–d MMM y 'г'.", - "Format_Interval_Short_M": "d MMM – d MMM y 'г'.", - "Format_Interval_Short_Y": "d MMM y 'г'. – d MMM y 'г'.", - "Format_Month_Long": "LLLL y 'г'.", - "Format_Month_Short": "LLL y 'г'.", + "Format_Interval_Long_D": "d–d MMMM y 'г'.", + "Format_Interval_Long_M": "d MMMM – d MMMM y 'г'.", + "Format_Interval_Long_Y": "d MMMM y 'г'. – d MMMM y 'г'.", + "Format_Interval_Short_D": "d–d MMM y 'г'.", + "Format_Interval_Short_M": "d MMM – d MMM y 'г'.", + "Format_Interval_Short_Y": "d MMM y 'г'. – d MMM y 'г'.", + "Format_Month_Long": "LLLL y 'г'.", + "Format_Month_Short": "LLL y 'г'.", "Format_Time": "{time}", - "Format_Time_12": "h:mm:ss a", + "Format_Time_12": "h:mm:ss a", "Format_Time_24": "HH:mm:ss", "Format_Year": "y", "Hours": "часы", diff --git a/plugins/Intl/lang/sk.json b/plugins/Intl/lang/sk.json index f0324f8496..4636a82b3a 100644 --- a/plugins/Intl/lang/sk.json +++ b/plugins/Intl/lang/sk.json @@ -504,7 +504,7 @@ "Currency_MMK": "Mjanmarský kyat", "Currency_MNT": "Mongolský tugrik", "Currency_MOP": "Macajská pataca", - "Currency_MRU": "Mauritánska ukija", + "Currency_MRU": "Mauritánska ouguiya", "Currency_MUR": "Maurícijská rupia", "Currency_MVR": "Maldivská rupia", "Currency_MWK": "Malawijská kwacha", @@ -543,7 +543,7 @@ "Currency_SSP": "Juhosudánska libra", "Currency_STN": "Svätotomášska dobra", "Currency_SYP": "Sýrska libra", - "Currency_SZL": "Svazijské lilangeni", + "Currency_SZL": "Svazijský lilangeni", "Currency_THB": "Thajský baht", "Currency_TJS": "Tadžické somoni", "Currency_TMT": "Turkménsky manat", @@ -617,18 +617,18 @@ "Format_Date_Day_Month": "E d. M.", "Format_Date_Long": "EEEE d. MMMM y", "Format_Date_Short": "d. M. y", - "Format_Hour_12": "h a", + "Format_Hour_12": "h a", "Format_Hour_24": "H", "Format_Interval_Long_D": "d. – d. M. y", "Format_Interval_Long_M": "d. M. – d. M. y", - "Format_Interval_Long_Y": "d. M. y – d. M. y", + "Format_Interval_Long_Y": "d. M. y – d. M. y", "Format_Interval_Short_D": "d. – d. M. y", "Format_Interval_Short_M": "d. M. – d. M. y", - "Format_Interval_Short_Y": "d. M. y – d. M. y", + "Format_Interval_Short_Y": "d. M. y – d. M. y", "Format_Month_Long": "LLLL y", "Format_Month_Short": "M\/y", "Format_Time": "{time}", - "Format_Time_12": "h:mm:ss a", + "Format_Time_12": "h:mm:ss a", "Format_Time_24": "H:mm:ss", "Format_Year": "y", "Hours": "hodiny", diff --git a/plugins/Intl/lang/sl.json b/plugins/Intl/lang/sl.json index bbc3ef2e7c..8e64a62a92 100644 --- a/plugins/Intl/lang/sl.json +++ b/plugins/Intl/lang/sl.json @@ -617,7 +617,7 @@ "Format_Date_Day_Month": "E, d. MMM", "Format_Date_Long": "EEEE, d. MMMM y", "Format_Date_Short": "d. MMM y", - "Format_Hour_12": "h a", + "Format_Hour_12": "h a", "Format_Hour_24": "HH'h'", "Format_Interval_Long_D": "d.–d. MMMM y", "Format_Interval_Long_M": "d. MMMM–d. MMMM y", @@ -628,7 +628,7 @@ "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "{time}", - "Format_Time_12": "h:mm:ss a", + "Format_Time_12": "h:mm:ss a", "Format_Time_24": "HH:mm:ss", "Format_Year": "y", "Hours": "ure", @@ -969,7 +969,7 @@ "Timezone_America_Nipigon": "Nipigon", "Timezone_America_Nome": "Nome", "Timezone_America_Noronha": "Noronha", - "Timezone_America_NorthDakota_Beulah": "Beulah, North Dakota", + "Timezone_America_NorthDakota_Beulah": "Beulah, Severna Dakota", "Timezone_America_NorthDakota_Center": "Center, Severna Dakota", "Timezone_America_NorthDakota_NewSalem": "New Salem, Severna Dakota", "Timezone_America_Ojinaga": "Ojinaga", diff --git a/plugins/Intl/lang/sq.json b/plugins/Intl/lang/sq.json index 6374501c0f..935578c434 100644 --- a/plugins/Intl/lang/sq.json +++ b/plugins/Intl/lang/sq.json @@ -617,18 +617,18 @@ "Format_Date_Day_Month": "E, d MMM", "Format_Date_Long": "EEEE, d MMMM y", "Format_Date_Short": "d MMM y", - "Format_Hour_12": "h a", + "Format_Hour_12": "h a", "Format_Hour_24": "HH", - "Format_Interval_Long_D": "d – d MMMM y", - "Format_Interval_Long_M": "d MMMM – d MMMM y", - "Format_Interval_Long_Y": "d MMMM y – d MMMM y", - "Format_Interval_Short_D": "d – d MMM y", - "Format_Interval_Short_M": "d MMM – d MMM y", - "Format_Interval_Short_Y": "d MMM y – d MMM y", + "Format_Interval_Long_D": "d – d MMMM y", + "Format_Interval_Long_M": "d MMMM – d MMMM y", + "Format_Interval_Long_Y": "d MMMM y – d MMMM y", + "Format_Interval_Short_D": "d – d MMM y", + "Format_Interval_Short_M": "d MMM – d MMM y", + "Format_Interval_Short_Y": "d MMM y – d MMM y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "{time}", - "Format_Time_12": "h:mm:ss a", + "Format_Time_12": "h:mm:ss a", "Format_Time_24": "HH:mm:ss", "Format_Year": "y", "Hours": "orë", diff --git a/plugins/Intl/lang/sr.json b/plugins/Intl/lang/sr.json index 38eb24bc83..dbf9ae674c 100644 --- a/plugins/Intl/lang/sr.json +++ b/plugins/Intl/lang/sr.json @@ -617,7 +617,7 @@ "Format_Date_Day_Month": "E d. MMM", "Format_Date_Long": "EEEE, d. MMMM y.", "Format_Date_Short": "d. M. y.", - "Format_Hour_12": "h a", + "Format_Hour_12": "h a", "Format_Hour_24": "HH", "Format_Interval_Long_D": "dd.–dd. MMMM y.", "Format_Interval_Long_M": "dd. MMMM – dd. MMMM y.", @@ -628,7 +628,7 @@ "Format_Month_Long": "MMMM y.", "Format_Month_Short": "MMM y.", "Format_Time": "{time}", - "Format_Time_12": "h:mm:ss a", + "Format_Time_12": "h:mm:ss a", "Format_Time_24": "HH:mm:ss", "Format_Year": "y.", "Hours": "сати", diff --git a/plugins/Intl/lang/sv.json b/plugins/Intl/lang/sv.json index cad54c1e1a..d96e338fca 100644 --- a/plugins/Intl/lang/sv.json +++ b/plugins/Intl/lang/sv.json @@ -220,7 +220,7 @@ "Country_SV": "El Salvador", "Country_SX": "Sint Maarten", "Country_SY": "Syrien", - "Country_SZ": "Swaziland", + "Country_SZ": "Eswatini", "Country_TC": "Turks- och Caicosöarna", "Country_TD": "Tchad", "Country_TF": "Franska sydterritorierna", @@ -617,7 +617,7 @@ "Format_Date_Day_Month": "E d MMM", "Format_Date_Long": "EEEE d MMMM y", "Format_Date_Short": "d MMM y", - "Format_Hour_12": "h a", + "Format_Hour_12": "h a", "Format_Hour_24": "HH", "Format_Interval_Long_D": "d–d MMMM y", "Format_Interval_Long_M": "d MMMM–d MMMM y", @@ -628,7 +628,7 @@ "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "{time}", - "Format_Time_12": "h:mm:ss a", + "Format_Time_12": "h:mm:ss a", "Format_Time_24": "HH:mm:ss", "Format_Year": "y", "Hours": "timmar", diff --git a/plugins/Intl/lang/ta.json b/plugins/Intl/lang/ta.json index 80f44a411e..f4b0e465af 100644 --- a/plugins/Intl/lang/ta.json +++ b/plugins/Intl/lang/ta.json @@ -1,6 +1,6 @@ { "Intl": { - "Continent_afr": "ஆப்ரிக்கா", + "Continent_afr": "ஆப்பிரிக்கா", "Continent_amc": "மத்திய அமெரிக்கா", "Continent_amn": "வட அமெரிக்கா", "Continent_ams": "தென் அமெரிக்கா", @@ -200,7 +200,7 @@ "Country_RS": "செர்பியா", "Country_RU": "ரஷ்யா", "Country_RW": "ருவாண்டா", - "Country_SA": "சவூதி அரேபியா", + "Country_SA": "சவுதி அரேபியா", "Country_SB": "சாலமன் தீவுகள்", "Country_SC": "சீஷெல்ஸ்", "Country_SD": "சூடான்", @@ -761,7 +761,7 @@ "Language_pi": "பாலி", "Language_pl": "போலிஷ்", "Language_ps": "பஷ்தோ", - "Language_pt": "போர்ச்சுக்கீஸ்", + "Language_pt": "போர்ச்சுகீஸ்", "Language_qu": "க்வெச்சுவா", "Language_rm": "ரோமான்ஷ்", "Language_rn": "ருண்டி", @@ -871,7 +871,7 @@ "NMinutesShort": "%s நிமிட", "NSeconds": "%s விநாடிகள்", "NSecondsShort": "%s வி.", - "NumberFormatCurrency": "¤ #,##,##0.00", + "NumberFormatCurrency": "¤#,##,##0.00", "NumberFormatNumber": "#,##,##0.###", "NumberFormatPercent": "#,##,##0%", "NumberSymbolDecimal": ".", diff --git a/plugins/Intl/lang/th.json b/plugins/Intl/lang/th.json index 5d70451b74..416b5305bf 100644 --- a/plugins/Intl/lang/th.json +++ b/plugins/Intl/lang/th.json @@ -619,13 +619,13 @@ "Format_Date_Short": "d MMM y", "Format_Hour_12": "h a", "Format_Hour_24": "HH", - "Format_Interval_Long_D": "d–d MMMM G y", - "Format_Interval_Long_M": "d MMMM – d MMMM G y", - "Format_Interval_Long_Y": "d MMMM G y – d MMMM G y", + "Format_Interval_Long_D": "d–d MMMM y", + "Format_Interval_Long_M": "d MMMM – d MMMM y", + "Format_Interval_Long_Y": "d MMMM y – d MMMM y", "Format_Interval_Short_D": "d–d MMM y", "Format_Interval_Short_M": "d MMM – d MMM y", "Format_Interval_Short_Y": "d MMM y – d MMM y", - "Format_Month_Long": "MMMM G y", + "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "{time}", "Format_Time_12": "h:mm:ss a", @@ -732,7 +732,7 @@ "Language_lu": "ลูบา-กาตองกา", "Language_lv": "ลัตเวีย", "Language_mg": "มาลากาซี", - "Language_mh": "มาร์แชลลิส", + "Language_mh": "มาร์แชลล์", "Language_mi": "เมารี", "Language_mk": "มาซิโดเนีย", "Language_ml": "มาลายาลัม", @@ -793,10 +793,10 @@ "Language_ti": "ติกริญญา", "Language_tk": "เติร์กเมน", "Language_tl": "ตากาล็อก", - "Language_tn": "บอตสวานา", + "Language_tn": "สวานา", "Language_to": "ตองกา", "Language_tr": "ตุรกี", - "Language_ts": "ซิตซองกา", + "Language_ts": "ซองกา", "Language_tt": "ตาตาร์", "Language_tw": "ทวิ", "Language_ty": "ตาฮิตี", @@ -807,7 +807,7 @@ "Language_ve": "เวนดา", "Language_vi": "เวียดนาม", "Language_vo": "โวลาพึค", - "Language_wa": "วาโลนี", + "Language_wa": "วอลลูน", "Language_wo": "โวลอฟ", "Language_xh": "คะห์โอซา", "Language_yi": "ยิดดิช", @@ -1058,7 +1058,7 @@ "Timezone_Asia_Vladivostok": "วลาดิโวสต็อก", "Timezone_Asia_Yakutsk": "ยาคุตสค์", "Timezone_Asia_Yekaterinburg": "ยีคาเตอรินเบิร์ก", - "Timezone_Atlantic_Azores": "อาซอเรส", + "Timezone_Atlantic_Azores": "อะโซร์ส", "Timezone_Atlantic_Canary": "คะเนรี", "Timezone_Atlantic_Faeroe": "แฟโร", "Timezone_Atlantic_Madeira": "มาเดรา", @@ -1099,7 +1099,7 @@ "Timezone_Pacific_Gambier": "แกมเบียร์", "Timezone_Pacific_Honolulu": "โฮโนลูลู", "Timezone_Pacific_Johnston": "จอห์นสตัน", - "Timezone_Pacific_Kanton": "Kanton", + "Timezone_Pacific_Kanton": "แคนทอน", "Timezone_Pacific_Kiritimati": "คิริทิมาตี", "Timezone_Pacific_Kosrae": "คอสไร", "Timezone_Pacific_Kwajalein": "ควาจาเลน", diff --git a/plugins/Intl/lang/tl.json b/plugins/Intl/lang/tl.json index 0d8c3127dd..0b8f31dd56 100644 --- a/plugins/Intl/lang/tl.json +++ b/plugins/Intl/lang/tl.json @@ -415,7 +415,7 @@ "CurrencySymbol_ZMW": "ZMW", "Currency_AED": "United Arab Emirates Dirham", "Currency_AFN": "Afghan Afghani", - "Currency_ALL": "Albanian Lek", + "Currency_ALL": "Lek ng Albania", "Currency_AMD": "Armenian Dram", "Currency_ANG": "Antillean Guilder ng Netherlands", "Currency_AOA": "Angolan Kwanza", @@ -437,7 +437,7 @@ "Currency_BTC": "Bitcoin", "Currency_BTN": "Bhutanese Ngultrum", "Currency_BWP": "Botswanan Pula", - "Currency_BYN": "Belarusian Ruble", + "Currency_BYN": "Ruble ng Belarus", "Currency_BZD": "Dolyar ng Belize", "Currency_CAD": "Dolyar ng Canada", "Currency_CDF": "Congolese Franc", @@ -449,12 +449,12 @@ "Currency_CUC": "Convertible na Piso ng Cuba", "Currency_CUP": "Piso ng Cuba", "Currency_CVE": "Cape Verdean Escudo", - "Currency_CZK": "Czech Republic Koruna", + "Currency_CZK": "Koruna ng Czech Republic", "Currency_DJF": "Djiboutian Franc", "Currency_DKK": "Danish Krone", "Currency_DOP": "Piso ng Dominican", "Currency_DZD": "Algerian Dinar", - "Currency_EGP": "Egyptian Pound", + "Currency_EGP": "Pound ng Egypt", "Currency_ERN": "Eritrean Nakfa", "Currency_ETB": "Ethiopian Birr", "Currency_EUR": "Euro", @@ -463,18 +463,18 @@ "Currency_GBP": "British Pound", "Currency_GEL": "Georgian Lari", "Currency_GHS": "Ghanaian Cedi", - "Currency_GIP": "Gibraltar Pound", + "Currency_GIP": "Pound ng Gibraltar", "Currency_GMD": "Gambian Dalasi", "Currency_GNF": "Guinean Franc", "Currency_GTQ": "Quetzal ng Guatemala", "Currency_GYD": "Dolyar ng Guyanese", "Currency_HKD": "Dolyar ng Hong Kong", "Currency_HNL": "Lempira ng Honduras", - "Currency_HRK": "Croatian Kuna", + "Currency_HRK": "Kuna ng Croatia", "Currency_HTG": "Gourde ng Haiti", - "Currency_HUF": "Hungarian Forint", + "Currency_HUF": "Forint ng Hungary", "Currency_IDR": "Indonesian Rupiah", - "Currency_ILS": "Israeli New Sheqel", + "Currency_ILS": "New Shekel ng Israel", "Currency_INR": "Indian Rupee", "Currency_IQD": "Iraqi Dinar", "Currency_IRR": "Iranian Rial", @@ -496,11 +496,11 @@ "Currency_LKR": "Sri Lankan Rupee", "Currency_LRD": "Dolyar ng Liberia", "Currency_LSL": "Lesotho Loti", - "Currency_LYD": "Libyan Dinar", + "Currency_LYD": "Dinar ng Libya", "Currency_MAD": "Moroccan Dirham", - "Currency_MDL": "Moldovan Leu", + "Currency_MDL": "Leu ng Moldova", "Currency_MGA": "Malagasy Ariary", - "Currency_MKD": "Macedonian Denar", + "Currency_MKD": "Denar ng Macedonia", "Currency_MMK": "Myanmar Kyat", "Currency_MNT": "Mongolian Tugrik", "Currency_MOP": "Macanese Pataca", @@ -523,12 +523,12 @@ "Currency_PGK": "Papua New Guinean Kina", "Currency_PHP": "Piso ng Pilipinas", "Currency_PKR": "Pakistani Rupee", - "Currency_PLN": "Polish Zloty", + "Currency_PLN": "Zloty ng Poland", "Currency_PYG": "Paraguayan Guarani", "Currency_QAR": "Qatari Rial", - "Currency_RON": "Romanian Leu", - "Currency_RSD": "Serbian Dinar", - "Currency_RUB": "Russian Ruble", + "Currency_RON": "Leu ng Romania", + "Currency_RSD": "Dinar ng Serbia", + "Currency_RUB": "Ruble ng Russia", "Currency_RWF": "Rwandan Franc", "Currency_SAR": "Saudi Riyal", "Currency_SBD": "Dolyar ng Solomon Islands", @@ -553,7 +553,7 @@ "Currency_TTD": "Dolyar ng Trinidad and Tobago", "Currency_TWD": "Dolyar ng New Taiwan", "Currency_TZS": "Tanzanian Shilling", - "Currency_UAH": "Ukrainian Hryvnia", + "Currency_UAH": "Hryvnia ng Ukraine", "Currency_UGX": "Ugandan Shilling", "Currency_USD": "Dolyar ng US", "Currency_UYU": "Piso ng Uruguay", @@ -617,18 +617,18 @@ "Format_Date_Day_Month": "E, MMM d", "Format_Date_Long": "EEEE, MMMM d, y", "Format_Date_Short": "MMM d, y", - "Format_Hour_12": "h a", + "Format_Hour_12": "h a", "Format_Hour_24": "HH", "Format_Interval_Long_D": "MMMM d–d, y", - "Format_Interval_Long_M": "MMMM d – MMMM d, y", - "Format_Interval_Long_Y": "MMMM d, y – MMMM d, y", + "Format_Interval_Long_M": "MMMM d – MMMM d, y", + "Format_Interval_Long_Y": "MMMM d, y – MMMM d, y", "Format_Interval_Short_D": "MMM d–d, y", - "Format_Interval_Short_M": "MMM d – MMM d, y", - "Format_Interval_Short_Y": "MMM d, y – MMM d, y", + "Format_Interval_Short_M": "MMM d – MMM d, y", + "Format_Interval_Short_Y": "MMM d, y – MMM d, y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "{time}", - "Format_Time_12": "h:mm:ss a", + "Format_Time_12": "h:mm:ss a", "Format_Time_24": "HH:mm:ss", "Format_Year": "y", "Hours": "mga oras", diff --git a/plugins/Intl/lang/tr.json b/plugins/Intl/lang/tr.json index 0f73e02b8f..266622dfab 100644 --- a/plugins/Intl/lang/tr.json +++ b/plugins/Intl/lang/tr.json @@ -617,18 +617,18 @@ "Format_Date_Day_Month": "d MMMM E", "Format_Date_Long": "d MMMM y EEEE", "Format_Date_Short": "d MMM y", - "Format_Hour_12": "a h", + "Format_Hour_12": "a h", "Format_Hour_24": "HH", "Format_Interval_Long_D": "d–d MMMM y", - "Format_Interval_Long_M": "d MMMM – d MMMM y", - "Format_Interval_Long_Y": "d MMMM y – d MMMM y", + "Format_Interval_Long_M": "d MMMM – d MMMM y", + "Format_Interval_Long_Y": "d MMMM y – d MMMM y", "Format_Interval_Short_D": "d–d MMM y", - "Format_Interval_Short_M": "d MMM – d MMM y", - "Format_Interval_Short_Y": "d MMM y – d MMM y", + "Format_Interval_Short_M": "d MMM – d MMM y", + "Format_Interval_Short_Y": "d MMM y – d MMM y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "{time}", - "Format_Time_12": "a h:mm:ss", + "Format_Time_12": "a h:mm:ss", "Format_Time_24": "HH:mm:ss", "Format_Year": "y", "Hours": "saat", @@ -641,7 +641,7 @@ "Language_an": "Aragonca", "Language_ar": "Arapça", "Language_as": "Assamca", - "Language_av": "Avar Dili", + "Language_av": "Avar dili", "Language_ay": "Aymara", "Language_az": "Azerbaycan dili", "Language_ba": "Başkırtça", diff --git a/plugins/Intl/lang/uk.json b/plugins/Intl/lang/uk.json index b95a7ca17f..c44e456694 100644 --- a/plugins/Intl/lang/uk.json +++ b/plugins/Intl/lang/uk.json @@ -228,7 +228,7 @@ "Country_TH": "Таїланд", "Country_TJ": "Таджикистан", "Country_TK": "Токелау", - "Country_TL": "Тімор-Лешті", + "Country_TL": "Тимор-Лешті", "Country_TM": "Туркменістан", "Country_TN": "Туніс", "Country_TO": "Тонга", @@ -612,23 +612,23 @@ "Day_Short_StandAlone_6": "сб", "Day_Short_StandAlone_7": "нд", "EnglishLanguageName": "Ukrainian", - "Format_DateTime_Long": "EEEE, d MMMM y 'р'. {time}", - "Format_DateTime_Short": "d MMM y 'р'. {time}", + "Format_DateTime_Long": "EEEE, d MMMM y 'р'. {time}", + "Format_DateTime_Short": "d MMM y 'р'. {time}", "Format_Date_Day_Month": "E, d MMM", - "Format_Date_Long": "EEEE, d MMMM y 'р'.", - "Format_Date_Short": "d MMM y 'р'.", - "Format_Hour_12": "h a", + "Format_Date_Long": "EEEE, d MMMM y 'р'.", + "Format_Date_Short": "d MMM y 'р'.", + "Format_Hour_12": "h a", "Format_Hour_24": "HH", - "Format_Interval_Long_D": "d–d MMMM y 'р'.", - "Format_Interval_Long_M": "d MMMM – d MMMM y 'р'.", - "Format_Interval_Long_Y": "d MMMM y – d MMMM y 'рр'.", - "Format_Interval_Short_D": "d–d MMM y 'р'.", - "Format_Interval_Short_M": "d MMM – d MMM y 'р'.", - "Format_Interval_Short_Y": "d MMM y – d MMM y 'рр'.", - "Format_Month_Long": "LLLL y 'р'.", - "Format_Month_Short": "LLL y 'р'.", + "Format_Interval_Long_D": "d–d MMMM y 'р'.", + "Format_Interval_Long_M": "d MMMM – d MMMM y 'р'.", + "Format_Interval_Long_Y": "d MMMM y – d MMMM y 'рр'.", + "Format_Interval_Short_D": "d–d MMM y 'р'.", + "Format_Interval_Short_M": "d MMM – d MMM y 'р'.", + "Format_Interval_Short_Y": "d MMM y – d MMM y 'рр'.", + "Format_Month_Long": "LLLL y 'р'.", + "Format_Month_Short": "LLL y 'р'.", "Format_Time": "{time}", - "Format_Time_12": "h:mm:ss a", + "Format_Time_12": "h:mm:ss a", "Format_Time_24": "HH:mm:ss", "Format_Year": "y", "Hours": "години", @@ -664,7 +664,7 @@ "Language_cy": "Валлійська", "Language_da": "Данська", "Language_de": "Німецька", - "Language_dv": "Дівехі", + "Language_dv": "Дивехі", "Language_dz": "Дзонг-ке", "Language_ee": "Еве", "Language_el": "Грецька", @@ -704,7 +704,7 @@ "Language_io": "Ідо", "Language_is": "Ісландська", "Language_it": "Італійська", - "Language_iu": "Інуктітут", + "Language_iu": "Інуктитут", "Language_ja": "Японська", "Language_jv": "Яванська", "Language_ka": "Грузинська", @@ -781,7 +781,7 @@ "Language_so": "Сомалі", "Language_sq": "Албанська", "Language_sr": "Сербська", - "Language_ss": "Сісваті", + "Language_ss": "Сисваті", "Language_st": "Південна сото", "Language_su": "Сунданська", "Language_sv": "Шведська", diff --git a/plugins/Intl/lang/vi.json b/plugins/Intl/lang/vi.json index 3240dbf979..aa4e32b356 100644 --- a/plugins/Intl/lang/vi.json +++ b/plugins/Intl/lang/vi.json @@ -617,18 +617,18 @@ "Format_Date_Day_Month": "E, d MMM", "Format_Date_Long": "EEEE, d MMMM, y", "Format_Date_Short": "d MMM, y", - "Format_Hour_12": "h a", + "Format_Hour_12": "h a", "Format_Hour_24": "HH", - "Format_Interval_Long_D": "d – d MMMM, y", - "Format_Interval_Long_M": "d MMMM – d MMMM, y", + "Format_Interval_Long_D": "d – d MMMM, y", + "Format_Interval_Long_M": "d MMMM – d MMMM, y", "Format_Interval_Long_Y": "'Ngày' dd 'tháng' M 'năm' y - 'Ngày' dd 'tháng' M 'năm' y", - "Format_Interval_Short_D": "d – d MMM, y", - "Format_Interval_Short_M": "d MMM – d MMM, y", + "Format_Interval_Short_D": "d – d MMM, y", + "Format_Interval_Short_M": "d MMM – d MMM, y", "Format_Interval_Short_Y": "'Ngày' dd 'tháng' M 'năm' y - 'Ngày' dd 'tháng' M 'năm' y", "Format_Month_Long": "MMMM 'năm' y", "Format_Month_Short": "MMM y", "Format_Time": "{time}", - "Format_Time_12": "h:mm:ss a", + "Format_Time_12": "h:mm:ss a", "Format_Time_24": "HH:mm:ss", "Format_Year": "y", "Hours": "giờ", diff --git a/plugins/Intl/lang/zh-cn.json b/plugins/Intl/lang/zh-cn.json index db58823d7c..95fd22a88e 100644 --- a/plugins/Intl/lang/zh-cn.json +++ b/plugins/Intl/lang/zh-cn.json @@ -657,7 +657,7 @@ "Language_ce": "车臣语", "Language_ch": "查莫罗语", "Language_co": "科西嘉语", - "Language_cr": "克里族语", + "Language_cr": "克里语", "Language_cs": "捷克语", "Language_cu": "教会斯拉夫语", "Language_cv": "楚瓦什语", @@ -1003,11 +1003,11 @@ "Timezone_America_Yellowknife": "耶洛奈夫", "Timezone_Antarctica_Casey": "卡塞", "Timezone_Antarctica_Davis": "戴维斯", - "Timezone_Antarctica_DumontDUrville": "迪蒙迪尔维尔", + "Timezone_Antarctica_DumontDUrville": "迪蒙·迪维尔", "Timezone_Antarctica_Macquarie": "麦格理", "Timezone_Antarctica_Mawson": "莫森", "Timezone_Antarctica_McMurdo": "麦克默多", - "Timezone_Antarctica_Palmer": "帕默尔", + "Timezone_Antarctica_Palmer": "帕尔默", "Timezone_Antarctica_Rothera": "罗瑟拉", "Timezone_Antarctica_Syowa": "昭和", "Timezone_Antarctica_Troll": "特罗尔", @@ -1099,7 +1099,7 @@ "Timezone_Pacific_Gambier": "甘比尔", "Timezone_Pacific_Honolulu": "檀香山", "Timezone_Pacific_Johnston": "约翰斯顿", - "Timezone_Pacific_Kanton": "Kanton", + "Timezone_Pacific_Kanton": "坎顿岛", "Timezone_Pacific_Kiritimati": "基里地马地岛", "Timezone_Pacific_Kosrae": "库赛埃", "Timezone_Pacific_Kwajalein": "夸贾林", diff --git a/plugins/Intl/lang/zh-tw.json b/plugins/Intl/lang/zh-tw.json index a2dc29c7d4..085972b592 100644 --- a/plugins/Intl/lang/zh-tw.json +++ b/plugins/Intl/lang/zh-tw.json @@ -432,7 +432,7 @@ "Currency_BMD": "百慕達幣", "Currency_BND": "汶萊元", "Currency_BOB": "玻利維亞諾", - "Currency_BRL": "巴西里拉", + "Currency_BRL": "巴西雷亞爾", "Currency_BSD": "巴哈馬元", "Currency_BTC": "Bitcoin", "Currency_BTN": "不丹那特倫", @@ -750,7 +750,7 @@ "Language_nn": "耐諾斯克挪威文", "Language_no": "挪威文", "Language_nr": "南地畢列文", - "Language_nv": "納瓦霍文", + "Language_nv": "納瓦荷文", "Language_ny": "尼揚賈文", "Language_oc": "奧克西坦文", "Language_oj": "奧杰布瓦文", @@ -1099,7 +1099,7 @@ "Timezone_Pacific_Gambier": "甘比爾群島", "Timezone_Pacific_Honolulu": "檀香山", "Timezone_Pacific_Johnston": "強斯頓", - "Timezone_Pacific_Kanton": "Kanton", + "Timezone_Pacific_Kanton": "坎頓島", "Timezone_Pacific_Kiritimati": "基里地馬地島", "Timezone_Pacific_Kosrae": "科斯瑞", "Timezone_Pacific_Kwajalein": "瓜加林島", diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php index 0c2084a98a..81789ca40c 100644 --- a/plugins/Login/Controller.php +++ b/plugins/Login/Controller.php @@ -334,6 +334,12 @@ class Controller extends \Piwik\Plugin\ControllerAdmin $parsedUrl = parse_url($urlToRedirect); + if (!empty($urlToRedirect) && false === $parsedUrl) { + $e = new \Piwik\Exception\Exception('The redirect URL is not valid.'); + $e->setIsHtmlMessage(); + throw $e; + } + // only use redirect url if host is trusted if (!empty($parsedUrl['host']) && !Url::isValidHost($parsedUrl['host'])) { $e = new \Piwik\Exception\Exception('The redirect URL host is not valid, it is not a trusted host. If this URL is trusted, you can allow this in your config.ini.php file by adding the line <i>trusted_hosts[] = "' . Common::sanitizeInputValue($parsedUrl['host']) . '"</i> under <i>[General]</i>'); diff --git a/plugins/PrivacyManager/vue/dist/PrivacyManager.umd.js b/plugins/PrivacyManager/vue/dist/PrivacyManager.umd.js index a01557b5cb..862760998a 100644 --- a/plugins/PrivacyManager/vue/dist/PrivacyManager.umd.js +++ b/plugins/PrivacyManager/vue/dist/PrivacyManager.umd.js @@ -1855,41 +1855,41 @@ var ReportDeletionSettings_store_ReportDeletionSettingsStore = /*#__PURE__*/func }(); /* harmony default export */ var ReportDeletionSettings_store = (new ReportDeletionSettings_store_ReportDeletionSettingsStore()); -// CONCATENATED MODULE: ./node_modules/@vue/cli-plugin-babel/node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/@vue/cli-plugin-babel/node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist/templateLoader.js??ref--6!./node_modules/@vue/cli-service/node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist??ref--0-1!./plugins/PrivacyManager/vue/src/DeleteOldLogs/DeleteOldLogs.vue?vue&type=template&id=66ffe894 +// CONCATENATED MODULE: ./node_modules/@vue/cli-plugin-babel/node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/@vue/cli-plugin-babel/node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist/templateLoader.js??ref--6!./node_modules/@vue/cli-service/node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist??ref--0-1!./plugins/PrivacyManager/vue/src/DeleteOldLogs/DeleteOldLogs.vue?vue&type=template&id=56e5fdb4 -var DeleteOldLogsvue_type_template_id_66ffe894_hoisted_1 = { +var DeleteOldLogsvue_type_template_id_56e5fdb4_hoisted_1 = { id: "formDeleteSettings" }; -var DeleteOldLogsvue_type_template_id_66ffe894_hoisted_2 = { +var DeleteOldLogsvue_type_template_id_56e5fdb4_hoisted_2 = { id: "deleteLogSettingEnabled" }; -var DeleteOldLogsvue_type_template_id_66ffe894_hoisted_3 = { +var DeleteOldLogsvue_type_template_id_56e5fdb4_hoisted_3 = { class: "alert alert-warning deleteOldLogsWarning", style: { "width": "50%" } }; -var DeleteOldLogsvue_type_template_id_66ffe894_hoisted_4 = { +var DeleteOldLogsvue_type_template_id_56e5fdb4_hoisted_4 = { href: "https://matomo.org/faq/general/faq_125", rel: "noreferrer noopener", target: "_blank" }; -var DeleteOldLogsvue_type_template_id_66ffe894_hoisted_5 = { +var DeleteOldLogsvue_type_template_id_56e5fdb4_hoisted_5 = { id: "deleteLogSettings" }; -var DeleteOldLogsvue_type_template_id_66ffe894_hoisted_6 = { +var DeleteOldLogsvue_type_template_id_56e5fdb4_hoisted_6 = { key: 0 }; -var DeleteOldLogsvue_type_template_id_66ffe894_hoisted_7 = { +var DeleteOldLogsvue_type_template_id_56e5fdb4_hoisted_7 = { key: 1 }; -var DeleteOldLogsvue_type_template_id_66ffe894_hoisted_8 = { +var DeleteOldLogsvue_type_template_id_56e5fdb4_hoisted_8 = { key: 2 }; -var DeleteOldLogsvue_type_template_id_66ffe894_hoisted_9 = { +var DeleteOldLogsvue_type_template_id_56e5fdb4_hoisted_9 = { key: 3 }; -function DeleteOldLogsvue_type_template_id_66ffe894_render(_ctx, _cache, $props, $setup, $data, $options) { +function DeleteOldLogsvue_type_template_id_56e5fdb4_render(_ctx, _cache, $props, $setup, $data, $options) { var _this = this; var _component_Field = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("Field"); @@ -1900,7 +1900,7 @@ function DeleteOldLogsvue_type_template_id_66ffe894_render(_ctx, _cache, $props, var _directive_form = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveDirective"])("form"); - return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withDirectives"])((Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("div", DeleteOldLogsvue_type_template_id_66ffe894_hoisted_1, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", DeleteOldLogsvue_type_template_id_66ffe894_hoisted_2, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", null, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_Field, { + return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withDirectives"])((Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("div", DeleteOldLogsvue_type_template_id_56e5fdb4_hoisted_1, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", DeleteOldLogsvue_type_template_id_56e5fdb4_hoisted_2, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", null, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_Field, { uicontrol: "checkbox", name: "deleteEnable", "model-value": _ctx.enabled, @@ -1911,7 +1911,7 @@ function DeleteOldLogsvue_type_template_id_66ffe894_render(_ctx, _cache, $props, }), title: _ctx.translate('PrivacyManager_UseDeleteLog'), "inline-help": _ctx.translate('PrivacyManager_DeleteRawDataInfo') - }, null, 8, ["model-value", "title", "inline-help"])]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withDirectives"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", DeleteOldLogsvue_type_template_id_66ffe894_hoisted_3, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("a", DeleteOldLogsvue_type_template_id_66ffe894_hoisted_4, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('General_ClickHere')), 1)], 512), [[external_commonjs_vue_commonjs2_vue_root_Vue_["vShow"], _ctx.enabled]])]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withDirectives"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", DeleteOldLogsvue_type_template_id_66ffe894_hoisted_5, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", null, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_Field, { + }, null, 8, ["model-value", "title", "inline-help"])]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withDirectives"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", DeleteOldLogsvue_type_template_id_56e5fdb4_hoisted_3, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("a", DeleteOldLogsvue_type_template_id_56e5fdb4_hoisted_4, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('General_ClickHere')), 1)], 512), [[external_commonjs_vue_commonjs2_vue_root_Vue_["vShow"], _ctx.enabled]])]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withDirectives"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", DeleteOldLogsvue_type_template_id_56e5fdb4_hoisted_5, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", null, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_Field, { uicontrol: "text", name: "deleteOlderThan", "model-value": _ctx.deleteOlderThan, @@ -1935,12 +1935,12 @@ function DeleteOldLogsvue_type_template_id_66ffe894_render(_ctx, _cache, $props, onConfirmed: _ctx.saveSettings }, { default: Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withCtx"])(function () { - return [_ctx.enabled && !_ctx.enableDeleteReports ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("h2", DeleteOldLogsvue_type_template_id_66ffe894_hoisted_6, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('PrivacyManager_DeleteLogsConfirm')), 1)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), _ctx.enabled && _ctx.enableDeleteReports ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("h2", DeleteOldLogsvue_type_template_id_66ffe894_hoisted_7, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('PrivacyManager_DeleteBothConfirm')), 1)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), _ctx.enabled ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("div", DeleteOldLogsvue_type_template_id_66ffe894_hoisted_8, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('UsersManager_ConfirmWithPassword')), 1)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), !_ctx.enabled ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("h2", DeleteOldLogsvue_type_template_id_66ffe894_hoisted_9, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('UsersManager_ConfirmWithPassword')), 1)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true)]; + return [_ctx.enabled && !_ctx.enableDeleteReports ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("h2", DeleteOldLogsvue_type_template_id_56e5fdb4_hoisted_6, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('PrivacyManager_DeleteLogsConfirm')), 1)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), _ctx.enabled && _ctx.enableDeleteReports ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("h2", DeleteOldLogsvue_type_template_id_56e5fdb4_hoisted_7, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('PrivacyManager_DeleteBothConfirm')), 1)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), _ctx.enabled ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("div", DeleteOldLogsvue_type_template_id_56e5fdb4_hoisted_8, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('UsersManager_ConfirmWithPassword')), 1)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), !_ctx.enabled ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("h2", DeleteOldLogsvue_type_template_id_56e5fdb4_hoisted_9, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('UsersManager_ConfirmWithPassword')), 1)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true)]; }), _: 1 }, 8, ["modelValue", "onConfirmed"])], 512)), [[_directive_form]]); } -// CONCATENATED MODULE: ./plugins/PrivacyManager/vue/src/DeleteOldLogs/DeleteOldLogs.vue?vue&type=template&id=66ffe894 +// CONCATENATED MODULE: ./plugins/PrivacyManager/vue/src/DeleteOldLogs/DeleteOldLogs.vue?vue&type=template&id=56e5fdb4 // CONCATENATED MODULE: ./node_modules/@vue/cli-plugin-typescript/node_modules/cache-loader/dist/cjs.js??ref--14-0!./node_modules/babel-loader/lib!./node_modules/@vue/cli-plugin-typescript/node_modules/ts-loader??ref--14-2!./node_modules/@vue/cli-service/node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist??ref--0-1!./plugins/PrivacyManager/vue/src/DeleteOldLogs/DeleteOldLogs.vue?vue&type=script&lang=ts @@ -1970,7 +1970,7 @@ function DeleteOldLogsvue_type_template_id_66ffe894_render(_ctx, _cache, $props, data: function data() { return { isLoading: false, - enabled: this.deleteData.config.delete_logs_enable === '1', + enabled: parseInt(this.deleteData.config.delete_logs_enable, 10) === 1, deleteOlderThan: this.deleteData.config.delete_logs_older_than, showPasswordConfirmModal: false }; @@ -2017,7 +2017,7 @@ function DeleteOldLogsvue_type_template_id_66ffe894_render(_ctx, _cache, $props, -DeleteOldLogsvue_type_script_lang_ts.render = DeleteOldLogsvue_type_template_id_66ffe894_render +DeleteOldLogsvue_type_script_lang_ts.render = DeleteOldLogsvue_type_template_id_56e5fdb4_render /* harmony default export */ var DeleteOldLogs = (DeleteOldLogsvue_type_script_lang_ts); // CONCATENATED MODULE: ./node_modules/@vue/cli-plugin-babel/node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/@vue/cli-plugin-babel/node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist/templateLoader.js??ref--6!./node_modules/@vue/cli-service/node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist??ref--0-1!./plugins/PrivacyManager/vue/src/DeleteOldReports/DeleteOldReports.vue?vue&type=template&id=55144633 diff --git a/plugins/PrivacyManager/vue/dist/PrivacyManager.umd.min.js b/plugins/PrivacyManager/vue/dist/PrivacyManager.umd.min.js index cc8a3990cc..e5d8443ee2 100644 --- a/plugins/PrivacyManager/vue/dist/PrivacyManager.umd.min.js +++ b/plugins/PrivacyManager/vue/dist/PrivacyManager.umd.min.js @@ -4,7 +4,7 @@ * * @link https://matomo.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - */var Tt=function(){function e(){var t=this;Pt(this,e),zt(this,"privateState",Object(r["reactive"])({settings:{},showEstimate:!1,loadingEstimation:!1,estimation:"",isModified:!1})),zt(this,"state",Object(r["computed"])((function(){return Object(r["readonly"])(t.privateState)}))),zt(this,"enableDeleteReports",Object(r["computed"])((function(){return t.state.value.settings.enableDeleteReports}))),zt(this,"enableDeleteLogs",Object(r["computed"])((function(){return t.state.value.settings.enableDeleteLogs}))),zt(this,"currentRequest",void 0)}return Mt(e,[{key:"updateSettings",value:function(e){this.initSettings(e),this.privateState.isModified=!0}},{key:"initSettings",value:function(e){this.privateState.settings=Object.assign(Object.assign({},this.privateState.settings),e),this.reloadDbStats()}},{key:"savePurgeDataSettings",value:function(e,t,n){return this.privateState.isModified=!1,X["AjaxHelper"].post({module:"API",method:e},Object.assign(Object.assign({},t),{},{enableDeleteLogs:t.enableDeleteLogs?"1":"0",enableDeleteReports:t.enableDeleteReports?"1":"0",passwordConfirmation:n})).then((function(){var e=X["NotificationsStore"].show({message:Object(X["translate"])("CoreAdminHome_SettingsSaveSuccess"),context:"success",id:"privacyManagerSettings",type:"toast"});X["NotificationsStore"].scrollToNotification(e)}))}},{key:"isEitherDeleteSectionEnabled",value:function(){return this.state.value.settings.enableDeleteLogs||this.state.value.settings.enableDeleteReports}},{key:"isManualEstimationLinkShowing",value:function(){return window.$("#getPurgeEstimateLink").length>0}},{key:"reloadDbStats",value:function(e){var t=this;if(this.currentRequest&&(this.currentRequest.abort(),this.currentRequest=void 0),e||this.isEitherDeleteSectionEnabled()&&!this.isManualEstimationLinkShowing()){this.privateState.loadingEstimation=!0,this.privateState.estimation="",this.privateState.showEstimate=!1;var n=this.privateState.settings,a=Object.assign(Object.assign({},n),{},{enableDeleteLogs:n.enableDeleteLogs?"1":"0",enableDeleteReports:n.enableDeleteReports?"1":"0"});!0===e&&(a.forceEstimate=1),this.currentRequest=new AbortController,X["AjaxHelper"].post({module:"PrivacyManager",action:"getDatabaseSize",format:"html"},a,{abortController:this.currentRequest,format:"html"}).then((function(e){t.privateState.estimation=e,t.privateState.showEstimate=!0,t.privateState.loadingEstimation=!1})).finally((function(){t.currentRequest=void 0,t.privateState.loadingEstimation=!1}))}}}]),e}(),At=new Tt,It={id:"formDeleteSettings"},Bt={id:"deleteLogSettingEnabled"},Lt={class:"alert alert-warning deleteOldLogsWarning",style:{width:"50%"}},Ft={href:"https://matomo.org/faq/general/faq_125",rel:"noreferrer noopener",target:"_blank"},xt={id:"deleteLogSettings"},Rt={key:0},Ut={key:1},Ht={key:2},Gt={key:3};function qt(e,t,n,a,o,i){var l=this,c=Object(r["resolveComponent"])("Field"),s=Object(r["resolveComponent"])("SaveButton"),d=Object(r["resolveComponent"])("PasswordConfirmation"),u=Object(r["resolveDirective"])("form");return Object(r["withDirectives"])((Object(r["openBlock"])(),Object(r["createElementBlock"])("div",It,[Object(r["createElementVNode"])("div",Bt,[Object(r["createElementVNode"])("div",null,[Object(r["createVNode"])(c,{uicontrol:"checkbox",name:"deleteEnable","model-value":e.enabled,"onUpdate:modelValue":t[0]||(t[0]=function(t){e.enabled=t,e.reloadDbStats()}),title:e.translate("PrivacyManager_UseDeleteLog"),"inline-help":e.translate("PrivacyManager_DeleteRawDataInfo")},null,8,["model-value","title","inline-help"])]),Object(r["withDirectives"])(Object(r["createElementVNode"])("div",Lt,[Object(r["createElementVNode"])("a",Ft,Object(r["toDisplayString"])(e.translate("General_ClickHere")),1)],512),[[r["vShow"],e.enabled]])]),Object(r["withDirectives"])(Object(r["createElementVNode"])("div",xt,[Object(r["createElementVNode"])("div",null,[Object(r["createVNode"])(c,{uicontrol:"text",name:"deleteOlderThan","model-value":e.deleteOlderThan,"onUpdate:modelValue":t[1]||(t[1]=function(t){e.deleteOlderThan=t,e.reloadDbStats()}),title:e.deleteOlderThanTitle,"inline-help":e.translate("PrivacyManager_LeastDaysInput","1")},null,8,["model-value","title","inline-help"])])],512),[[r["vShow"],e.enabled]]),Object(r["createVNode"])(s,{onConfirm:t[2]||(t[2]=function(e){return l.showPasswordConfirmModal=!0}),saving:e.isLoading},null,8,["saving"]),Object(r["createVNode"])(d,{modelValue:e.showPasswordConfirmModal,"onUpdate:modelValue":t[3]||(t[3]=function(t){return e.showPasswordConfirmModal=t}),onConfirmed:e.saveSettings},{default:Object(r["withCtx"])((function(){return[e.enabled&&!e.enableDeleteReports?(Object(r["openBlock"])(),Object(r["createElementBlock"])("h2",Rt,Object(r["toDisplayString"])(e.translate("PrivacyManager_DeleteLogsConfirm")),1)):Object(r["createCommentVNode"])("",!0),e.enabled&&e.enableDeleteReports?(Object(r["openBlock"])(),Object(r["createElementBlock"])("h2",Ut,Object(r["toDisplayString"])(e.translate("PrivacyManager_DeleteBothConfirm")),1)):Object(r["createCommentVNode"])("",!0),e.enabled?(Object(r["openBlock"])(),Object(r["createElementBlock"])("div",Ht,Object(r["toDisplayString"])(e.translate("UsersManager_ConfirmWithPassword")),1)):Object(r["createCommentVNode"])("",!0),e.enabled?Object(r["createCommentVNode"])("",!0):(Object(r["openBlock"])(),Object(r["createElementBlock"])("h2",Gt,Object(r["toDisplayString"])(e.translate("UsersManager_ConfirmWithPassword")),1))]})),_:1},8,["modelValue","onConfirmed"])],512)),[[u]])}var $t=Object(r["defineComponent"])({props:{isDataPurgeSettingsEnabled:Boolean,deleteData:{type:Object,required:!0},scheduleDeletionOptions:{type:Object,required:!0}},components:{PasswordConfirmation:ee["PasswordConfirmation"],Field:ee["Field"],SaveButton:ee["SaveButton"]},directives:{Form:ee["Form"]},data:function(){return{isLoading:!1,enabled:"1"===this.deleteData.config.delete_logs_enable,deleteOlderThan:this.deleteData.config.delete_logs_older_than,showPasswordConfirmModal:!1}},created:function(){var e=this;setTimeout((function(){At.initSettings(e.settings)}))},methods:{saveSettings:function(e){var t=this,n="PrivacyManager.setDeleteLogsSettings";this.isLoading=!0,At.savePurgeDataSettings(n,this.settings,e).finally((function(){t.isLoading=!1}))},reloadDbStats:function(){At.updateSettings(this.settings)}},computed:{settings:function(){return{enableDeleteLogs:!!this.enabled,deleteLogsOlderThan:this.deleteOlderThan}},deleteOlderThanTitle:function(){return"".concat(Object(X["translate"])("PrivacyManager_DeleteLogsOlderThan")," (").concat(Object(X["translate"])("Intl_PeriodDays"),")")},enableDeleteReports:function(){return!!At.enableDeleteReports.value}}});$t.render=qt;var Kt=$t,Wt={id:"formDeleteSettings"},Yt={id:"deleteReportsSettingEnabled"},Jt={class:"alert alert-warning",style:{width:"50%"}},Qt=Object(r["createElementVNode"])("br",null,null,-1),Xt=Object(r["createElementVNode"])("br",null,null,-1),Zt={id:"deleteReportsSettings"},en={key:0},tn={key:1},nn={key:2},an={key:3};function on(e,t,n,a,o,i){var l=this,c=Object(r["resolveComponent"])("Field"),s=Object(r["resolveComponent"])("SaveButton"),d=Object(r["resolveComponent"])("PasswordConfirmation"),u=Object(r["resolveDirective"])("form");return Object(r["withDirectives"])((Object(r["openBlock"])(),Object(r["createElementBlock"])("div",Wt,[Object(r["createElementVNode"])("div",Yt,[Object(r["createElementVNode"])("div",null,[Object(r["createVNode"])(c,{uicontrol:"checkbox",name:"deleteReportsEnable","model-value":e.enabled,"onUpdate:modelValue":t[0]||(t[0]=function(t){e.enabled=t,e.reloadDbStats()}),title:e.translate("PrivacyManager_UseDeleteReports"),"inline-help":e.translate("PrivacyManager_DeleteAggregateReportsDetailedInfo")},null,8,["model-value","title","inline-help"])]),Object(r["withDirectives"])(Object(r["createElementVNode"])("div",Jt,[Object(r["createElementVNode"])("span",null,[Object(r["createTextVNode"])(Object(r["toDisplayString"])(e.translate("PrivacyManager_DeleteReportsInfo2",e.deleteOldLogsText)),1),Qt,Xt,Object(r["createTextVNode"])(" "+Object(r["toDisplayString"])(e.translate("PrivacyManager_DeleteReportsInfo3",e.deleteOldLogsText)),1)])],512),[[r["vShow"],e.enabled]])]),Object(r["withDirectives"])(Object(r["createElementVNode"])("div",Zt,[Object(r["createElementVNode"])("div",null,[Object(r["createVNode"])(c,{uicontrol:"text",name:"deleteReportsOlderThan","model-value":e.deleteOlderThan,"onUpdate:modelValue":t[1]||(t[1]=function(t){e.deleteOlderThan=t,e.reloadDbStats()}),title:e.deleteReportsOlderThanTitle,"inline-help":e.translate("PrivacyManager_LeastMonthsInput","1")},null,8,["model-value","title","inline-help"])]),Object(r["createElementVNode"])("div",null,[Object(r["createVNode"])(c,{uicontrol:"checkbox",name:"deleteReportsKeepBasic","model-value":e.keepBasic,"onUpdate:modelValue":t[2]||(t[2]=function(t){e.keepBasic=t,e.reloadDbStats()}),title:e.deleteReportsKeepBasicTitle,"inline-help":e.translate("PrivacyManager_KeepBasicMetricsReportsDetailedInfo")},null,8,["model-value","title","inline-help"])]),Object(r["createElementVNode"])("h3",null,Object(r["toDisplayString"])(e.translate("PrivacyManager_KeepDataFor")),1),Object(r["createElementVNode"])("div",null,[Object(r["createElementVNode"])("div",null,[Object(r["createVNode"])(c,{uicontrol:"checkbox",name:"deleteReportsKeepDay","model-value":e.keepDataForDay,"onUpdate:modelValue":t[3]||(t[3]=function(t){e.keepDataForDay=t,e.reloadDbStats()}),title:e.translate("General_DailyReports")},null,8,["model-value","title"])]),Object(r["createElementVNode"])("div",null,[Object(r["createVNode"])(c,{uicontrol:"checkbox",name:"deleteReportsKeepWeek","model-value":e.keepDataForWeek,"onUpdate:modelValue":t[4]||(t[4]=function(t){e.keepDataForWeek=t,e.reloadDbStats()}),title:e.translate("General_WeeklyReports")},null,8,["model-value","title"])]),Object(r["createElementVNode"])("div",null,[Object(r["createVNode"])(c,{uicontrol:"checkbox",name:"deleteReportsKeepMonth","model-value":e.keepDataForMonth,"onUpdate:modelValue":t[5]||(t[5]=function(t){e.keepDataForMonth=t,e.reloadDbStats()}),title:"".concat(e.translate("General_MonthlyReports")," (").concat(e.translate("General_Recommended"),")")},null,8,["model-value","title"])]),Object(r["createElementVNode"])("div",null,[Object(r["createVNode"])(c,{uicontrol:"checkbox",name:"deleteReportsKeepYear","model-value":e.keepDataForYear,"onUpdate:modelValue":t[6]||(t[6]=function(t){e.keepDataForYear=t,e.reloadDbStats()}),title:"".concat(e.translate("General_YearlyReports")," (").concat(e.translate("General_Recommended"),")")},null,8,["model-value","title"])]),Object(r["createElementVNode"])("div",null,[Object(r["createVNode"])(c,{uicontrol:"checkbox",name:"deleteReportsKeepRange","model-value":e.keepDataForRange,"onUpdate:modelValue":t[7]||(t[7]=function(t){e.keepDataForRange=t,e.reloadDbStats()}),title:e.translate("General_RangeReports")},null,8,["model-value","title"])]),Object(r["createElementVNode"])("div",null,[Object(r["createVNode"])(c,{uicontrol:"checkbox",name:"deleteReportsKeepSegments","model-value":e.keepDataForSegments,"onUpdate:modelValue":t[8]||(t[8]=function(t){e.keepDataForSegments=t,e.reloadDbStats()}),title:e.translate("PrivacyManager_KeepReportSegments")},null,8,["model-value","title"])])])],512),[[r["vShow"],e.enabled]]),Object(r["createVNode"])(s,{onConfirm:t[9]||(t[9]=function(e){return l.showPasswordConfirmModal=!0}),saving:e.isLoading},null,8,["saving"]),Object(r["createVNode"])(d,{modelValue:e.showPasswordConfirmModal,"onUpdate:modelValue":t[10]||(t[10]=function(t){return e.showPasswordConfirmModal=t}),onConfirmed:e.saveSettings},{default:Object(r["withCtx"])((function(){return[e.enabled&&!e.enableDeleteLogs?(Object(r["openBlock"])(),Object(r["createElementBlock"])("h2",en,Object(r["toDisplayString"])(e.translate("PrivacyManager_DeleteReportsConfirm")),1)):Object(r["createCommentVNode"])("",!0),e.enabled&&e.enableDeleteLogs?(Object(r["openBlock"])(),Object(r["createElementBlock"])("h2",tn,Object(r["toDisplayString"])(e.translate("PrivacyManager_DeleteBothConfirm")),1)):Object(r["createCommentVNode"])("",!0),e.enabled?(Object(r["openBlock"])(),Object(r["createElementBlock"])("div",nn,Object(r["toDisplayString"])(e.translate("UsersManager_ConfirmWithPassword")),1)):Object(r["createCommentVNode"])("",!0),e.enabled?Object(r["createCommentVNode"])("",!0):(Object(r["openBlock"])(),Object(r["createElementBlock"])("h2",an,Object(r["toDisplayString"])(e.translate("UsersManager_ConfirmWithPassword")),1))]})),_:1},8,["modelValue","onConfirmed"])],512)),[[u]])}function rn(e){return e?"1":"0"}var ln=Object(r["defineComponent"])({props:{isDataPurgeSettingsEnabled:Boolean,deleteData:{type:Object,required:!0},scheduleDeletionOptions:{type:Object,required:!0}},components:{Field:ee["Field"],SaveButton:ee["SaveButton"],PasswordConfirmation:ee["PasswordConfirmation"]},directives:{Form:ee["Form"]},data:function(){return{isLoading:!1,enabled:1===parseInt(this.deleteData.config.delete_reports_enable,10),deleteOlderThan:this.deleteData.config.delete_reports_older_than,keepBasic:1===parseInt(this.deleteData.config.delete_reports_keep_basic_metrics,10),keepDataForDay:1===parseInt(this.deleteData.config.delete_reports_keep_day_reports,10),keepDataForWeek:1===parseInt(this.deleteData.config.delete_reports_keep_week_reports,10),keepDataForMonth:1===parseInt(this.deleteData.config.delete_reports_keep_month_reports,10),keepDataForYear:1===parseInt(this.deleteData.config.delete_reports_keep_year_reports,10),keepDataForRange:1===parseInt(this.deleteData.config.delete_reports_keep_range_reports,10),keepDataForSegments:1===parseInt(this.deleteData.config.delete_reports_keep_segment_reports,10),showPasswordConfirmModal:!1}},created:function(){var e=this;setTimeout((function(){At.initSettings(e.settings)}))},methods:{saveSettings:function(e){var t=this,n="PrivacyManager.setDeleteReportsSettings";this.isLoading=!0,At.savePurgeDataSettings(n,this.settings,e).finally((function(){t.isLoading=!1}))},reloadDbStats:function(){At.updateSettings(this.settings)}},computed:{settings:function(){return{enableDeleteReports:this.enabled,deleteReportsOlderThan:this.deleteOlderThan,keepBasic:rn(this.keepBasic),keepDay:rn(this.keepDataForDay),keepWeek:rn(this.keepDataForWeek),keepMonth:rn(this.keepDataForMonth),keepYear:rn(this.keepDataForYear),keepRange:rn(this.keepDataForRange),keepSegments:rn(this.keepDataForSegments)}},deleteOldLogsText:function(){return Object(X["translate"])("PrivacyManager_UseDeleteLog")},deleteReportsOlderThanTitle:function(){var e=Object(X["translate"])("PrivacyManager_DeleteReportsOlderThan");return"".concat(e," (").concat(Object(X["translate"])("Intl_PeriodMonths"),")")},deleteReportsKeepBasicTitle:function(){var e=Object(X["translate"])("PrivacyManager_KeepBasicMetrics");return"".concat(e," (").concat(Object(X["translate"])("General_Recommended"),")")},enableDeleteLogs:function(){return!!At.enableDeleteLogs.value}}});ln.render=on;var cn=ln,sn={id:"formDeleteSettings"},dn={id:"deleteSchedulingSettings"},un={id:"deleteSchedulingSettingsInlineHelp",class:"inline-help-node"},mn={key:0},bn=Object(r["createElementVNode"])("br",null,null,-1),pn=Object(r["createElementVNode"])("br",null,null,-1),On=Object(r["createElementVNode"])("br",null,null,-1),gn=Object(r["createElementVNode"])("br",null,null,-1),jn={key:0,id:"deleteDataEstimateSect",class:"form-group row"},vn={class:"col s12",id:"databaseSizeHeadline"},hn={class:"col s12 m6"},yn=["innerHTML"],fn=Object(r["createTextVNode"])(" "),Vn={class:"col s12 m6"},Dn={key:0,class:"form-help"},Nn={class:"ui-confirm",id:"saveSettingsBeforePurge"},En=Object(r["createElementVNode"])("input",{role:"yes",type:"button",value:"{{ translate('General_Ok') }}"},null,-1);function Sn(e,t,n,a,o,i){var l=Object(r["resolveComponent"])("ActivityIndicator"),c=Object(r["resolveComponent"])("Field"),s=Object(r["resolveComponent"])("SaveButton"),d=Object(r["resolveComponent"])("PasswordConfirmation"),u=Object(r["resolveComponent"])("ContentBlock"),m=Object(r["resolveDirective"])("form");return Object(r["openBlock"])(),Object(r["createElementBlock"])(r["Fragment"],null,[Object(r["withDirectives"])(Object(r["createElementVNode"])("div",sn,[Object(r["withDirectives"])(Object(r["createVNode"])(u,{id:"scheduleSettingsHeadline","content-title":e.translate("PrivacyManager_DeleteSchedulingSettings")},{default:Object(r["withCtx"])((function(){return[Object(r["createElementVNode"])("div",dn,[Object(r["createElementVNode"])("div",null,[Object(r["createVNode"])(c,{uicontrol:"select",name:"deleteLowestInterval",title:e.translate("PrivacyManager_DeleteDataInterval"),modelValue:e.deleteLowestInterval,"onUpdate:modelValue":t[1]||(t[1]=function(t){return e.deleteLowestInterval=t}),options:e.scheduleDeletionOptions},{"inline-help":Object(r["withCtx"])((function(){return[Object(r["createElementVNode"])("div",un,[e.deleteData.lastRun?(Object(r["openBlock"])(),Object(r["createElementBlock"])("span",mn,[Object(r["createElementVNode"])("strong",null,Object(r["toDisplayString"])(e.translate("PrivacyManager_LastDelete"))+":",1),Object(r["createTextVNode"])(" "+Object(r["toDisplayString"])(e.deleteData.lastRunPretty)+" ",1),bn,pn])):Object(r["createCommentVNode"])("",!0),Object(r["createElementVNode"])("strong",null,Object(r["toDisplayString"])(e.translate("PrivacyManager_NextDelete"))+":",1),Object(r["createTextVNode"])(" "+Object(r["toDisplayString"])(e.deleteData.nextRunPretty)+" ",1),On,gn,Object(r["withDirectives"])(Object(r["createElementVNode"])("a",{id:"purgeDataNowLink",href:"#",onClick:t[0]||(t[0]=Object(r["withModifiers"])((function(t){return e.executeDataPurge()}),["prevent"]))},Object(r["toDisplayString"])(e.translate("PrivacyManager_PurgeNow")),513),[[r["vShow"],e.showPurgeNowLink]]),Object(r["createVNode"])(l,{"loading-message":e.translate("PrivacyManager_PurgingData"),loading:e.loadingDataPurge},null,8,["loading-message","loading"]),Object(r["withDirectives"])(Object(r["createElementVNode"])("span",{id:"db-purged-message"},Object(r["toDisplayString"])(e.translate("PrivacyManager_DBPurged")),513),[[r["vShow"],e.dataWasPurged]])])]})),_:1},8,["title","modelValue","options"])])]),"1"===e.deleteData.config.enable_database_size_estimate||1===e.deleteData.config.enable_database_size_estimate?(Object(r["openBlock"])(),Object(r["createElementBlock"])("div",jn,[Object(r["createElementVNode"])("h3",vn,Object(r["toDisplayString"])(e.translate("PrivacyManager_ReportsDataSavedEstimate")),1),Object(r["createElementVNode"])("div",hn,[Object(r["withDirectives"])(Object(r["createElementVNode"])("div",{id:"deleteDataEstimate",innerHTML:e.$sanitize(e.estimation)},null,8,yn),[[r["vShow"],e.showEstimate]]),fn,Object(r["createVNode"])(l,{loading:e.loadingEstimation},null,8,["loading"])]),Object(r["createElementVNode"])("div",Vn,["1"!==e.deleteData.config.enable_auto_database_size_estimate&&1!==e.deleteData.config.enable_auto_database_size_estimate?(Object(r["openBlock"])(),Object(r["createElementBlock"])("div",Dn,[Object(r["createElementVNode"])("a",{id:"getPurgeEstimateLink",href:"#",onClick:t[2]||(t[2]=Object(r["withModifiers"])((function(t){return e.getPurgeEstimate()}),["prevent"]))},Object(r["toDisplayString"])(e.translate("PrivacyManager_GetPurgeEstimate")),1)])):Object(r["createCommentVNode"])("",!0)])])):Object(r["createCommentVNode"])("",!0),Object(r["createVNode"])(s,{onConfirm:t[3]||(t[3]=function(t){return e.showPasswordConfirmModal=!0}),saving:e.isLoading},null,8,["saving"]),Object(r["createVNode"])(d,{modelValue:e.showPasswordConfirmModal,"onUpdate:modelValue":t[4]||(t[4]=function(t){return e.showPasswordConfirmModal=t}),onConfirmed:e.save},{default:Object(r["withCtx"])((function(){return[Object(r["createElementVNode"])("h2",null,Object(r["toDisplayString"])(e.translate("UsersManager_ConfirmWithPassword")),1)]})),_:1},8,["modelValue","onConfirmed"]),Object(r["createVNode"])(d,{modelValue:e.showPasswordConfirmModalForPurge,"onUpdate:modelValue":t[5]||(t[5]=function(t){return e.showPasswordConfirmModalForPurge=t}),onConfirmed:e.executePurgeNow},{default:Object(r["withCtx"])((function(){return[Object(r["createElementVNode"])("h2",null,Object(r["toDisplayString"])(e.translate("PrivacyManager_PurgeNowConfirm")),1),Object(r["createElementVNode"])("div",null,Object(r["toDisplayString"])(e.translate("UsersManager_ConfirmWithPassword")),1)]})),_:1},8,["modelValue","onConfirmed"])]})),_:1},8,["content-title"]),[[r["vShow"],e.isEitherDeleteSectionEnabled]])],512),[[m]]),Object(r["createElementVNode"])("div",Nn,[Object(r["createElementVNode"])("h2",null,Object(r["toDisplayString"])(e.translate("PrivacyManager_SaveSettingsBeforePurge")),1),En])],64)}var Cn=Object(r["defineComponent"])({props:{isDataPurgeSettingsEnabled:Boolean,deleteData:{type:Object,required:!0},scheduleDeletionOptions:{type:Object,required:!0}},components:{ContentBlock:X["ContentBlock"],ActivityIndicator:X["ActivityIndicator"],Field:ee["Field"],SaveButton:ee["SaveButton"],PasswordConfirmation:ee["PasswordConfirmation"]},directives:{Form:ee["Form"]},data:function(){return{isLoading:!1,loadingDataPurge:!1,dataWasPurged:!1,showPurgeNowLink:!0,deleteLowestInterval:this.deleteData.config.delete_logs_schedule_lowest_interval,showPasswordConfirmModal:!1,showPasswordConfirmModalForPurge:!1}},methods:{save:function(e){var t="PrivacyManager.setScheduleReportDeletionSettings";At.savePurgeDataSettings(t,{deleteLowestInterval:this.deleteLowestInterval},e)},executeDataPurge:function(){At.state.value.isModified?X["Matomo"].helper.modalConfirm("#saveSettingsBeforePurge",{yes:function(){return null}}):this.showPasswordConfirmModalForPurge=!0},getPurgeEstimate:function(){return At.reloadDbStats(!0)},executePurgeNow:function(e){var t=this;return this.loadingDataPurge=!0,this.showPurgeNowLink=!1,X["AjaxHelper"].post({module:"API",method:"PrivacyManager.executeDataPurge"},{passwordConfirmation:e}).then((function(){At.reloadDbStats(),t.dataWasPurged=!0,setTimeout((function(){t.dataWasPurged=!1,t.showPurgeNowLink=!0}),2e3)})).catch((function(){t.showPurgeNowLink=!0})).finally((function(){t.loadingDataPurge=!1}))}},computed:{showEstimate:function(){return At.state.value.showEstimate},isEitherDeleteSectionEnabled:function(){return At.isEitherDeleteSectionEnabled()},estimation:function(){return At.state.value.estimation},loadingEstimation:function(){return At.state.value.loadingEstimation}}});Cn.render=Sn;var kn=Cn,_n=["innerHTML"],Pn=Object(r["createElementVNode"])("br",null,null,-1),wn=Object(r["createElementVNode"])("br",null,null,-1),Mn=["innerHTML"],zn=["innerHTML"];function Tn(e,t,n,a,o,i){var l=Object(r["resolveComponent"])("ContentBlock"),c=Object(r["resolveDirective"])("content-intro");return Object(r["openBlock"])(),Object(r["createElementBlock"])("div",null,[Object(r["withDirectives"])(Object(r["createElementVNode"])("div",null,[Object(r["createElementVNode"])("h2",null,Object(r["toDisplayString"])(e.translate("PrivacyManager_AskingForConsent")),1),Object(r["createElementVNode"])("p",null,Object(r["toDisplayString"])(e.translate("PrivacyManager_ConsentExplanation")),1)],512),[[c]]),Object(r["createVNode"])(l,{"content-title":e.translate("PrivacyManager_WhenDoINeedConsent"),class:"privacyAskingForConsent"},{default:Object(r["withCtx"])((function(){return[Object(r["createElementVNode"])("p",null,[Object(r["createElementVNode"])("span",{innerHTML:e.$sanitize(e.whenConsentIsNeeded1)},null,8,_n),Pn,wn,Object(r["createElementVNode"])("span",{innerHTML:e.$sanitize(e.whenConsentIsNeeded2)},null,8,Mn)])]})),_:1},8,["content-title"]),Object(r["createVNode"])(l,{"content-title":e.translate("PrivacyManager_HowDoIAskForConsent"),class:"privacyAskingForConsent"},{default:Object(r["withCtx"])((function(){return[Object(r["createElementVNode"])("p",{innerHTML:e.$sanitize(e.howDoIAskForConsentIntroduction)},null,8,zn)]})),_:1},8,["content-title"])])}var An=Object(r["defineComponent"])({components:{ContentBlock:X["ContentBlock"]},directives:{ContentIntro:X["ContentIntro"]},computed:{whenConsentIsNeeded1:function(){var e="https://matomo.org/blog/2018/04/lawful-basis-for-processing-personal-data-under-gdpr-with-matomo/";return Object(X["translate"])("PrivacyManager_WhenConsentIsNeeded1",'<a href="https://matomo.org/docs/gdpr/" target="_blank" rel="noreferrer noopener">',"</a>",'<a href="'.concat(e,'" target="_blank" rel="noreferrer noopener">'),"</a>")},whenConsentIsNeeded2:function(){var e="?".concat(X["MatomoUrl"].stringify({module:"PrivacyManager",action:"privacySettings"}));return Object(X["translate"])("PrivacyManager_WhenConsentIsNeeded2",'<a href="'.concat(e,'">'),"</a>.")},howDoIAskForConsentIntroduction:function(){var e="https://developer.matomo.org/guides/tracking-consent";return Object(X["translate"])("PrivacyManager_HowDoIAskForConsentIntroduction",'<a href="'.concat(e,'" target="_blank" rel="noreferrer noopener">'),"</a>")}}});An.render=Tn;var In=An,Bn={class:"gdprOverview"},Ln=Object(r["createElementVNode"])("br",null,null,-1),Fn=Object(r["createElementVNode"])("br",null,null,-1),xn=Object(r["createElementVNode"])("br",null,null,-1),Rn=Object(r["createElementVNode"])("br",null,null,-1),Un=["innerHTML"],Hn=["innerHTML"],Gn=["innerHTML"],qn=["innerHTML"],$n=["innerHTML"],Kn=["innerHTML"],Wn=["innerHTML"],Yn=["innerHTML"],Jn=["innerHTML"],Qn=["innerHTML"],Xn=["innerHTML"],Zn=["innerHTML"],ea=["innerHTML"],ta=["innerHTML"],na=["innerHTML"],aa=["innerHTML"],oa=Object(r["createElementVNode"])("br",null,null,-1);function ra(e,t,n,a,o,i){var l=Object(r["resolveComponent"])("VueEntryContainer"),c=Object(r["resolveComponent"])("ContentBlock"),s=Object(r["resolveDirective"])("content-intro");return Object(r["openBlock"])(),Object(r["createElementBlock"])("div",Bn,[Object(r["withDirectives"])(Object(r["createElementVNode"])("div",null,[Object(r["createElementVNode"])("h2",null,Object(r["toDisplayString"])(e.translate("PrivacyManager_GdprOverview")),1),Object(r["createElementVNode"])("p",null,[Object(r["createTextVNode"])(Object(r["toDisplayString"])(e.translate("PrivacyManager_GdprOverviewIntro1"))+" ",1),Ln,Fn,Object(r["createTextVNode"])(" "+Object(r["toDisplayString"])(e.translate("PrivacyManager_GdprOverviewIntro2")),1)])],512),[[s]]),Object(r["createVNode"])(l,{html:e.afterGDPROverviewIntroContent},null,8,["html"]),Object(r["createVNode"])(c,{"content-title":e.translate("PrivacyManager_GdprChecklists")},{default:Object(r["withCtx"])((function(){return[Object(r["createElementVNode"])("p",null,[Object(r["createTextVNode"])(Object(r["toDisplayString"])(e.translate("PrivacyManager_GdprChecklistDesc1"))+" ",1),xn,Rn,Object(r["createElementVNode"])("span",{innerHTML:e.$sanitize(e.gdprChecklistDesc2)},null,8,Un)])]})),_:1},8,["content-title"]),Object(r["createVNode"])(c,{"content-title":e.translate("PrivacyManager_IndividualsRights")},{default:Object(r["withCtx"])((function(){return[Object(r["createElementVNode"])("p",null,Object(r["toDisplayString"])(e.translate("PrivacyManager_IndividualsRightsIntro")),1),Object(r["createElementVNode"])("ol",null,[Object(r["createElementVNode"])("li",null,Object(r["toDisplayString"])(e.translate("PrivacyManager_IndividualsRightsInform")),1),Object(r["createElementVNode"])("li",{innerHTML:e.$sanitize(e.rightsLinkText("IndividualsRightsAccess"))},null,8,Hn),Object(r["createElementVNode"])("li",{innerHTML:e.$sanitize(e.rightsLinkText("IndividualsRightsErasure"))},null,8,Gn),Object(r["createElementVNode"])("li",{innerHTML:e.$sanitize(e.rightsLinkText("IndividualsRightsRectification"))},null,8,qn),Object(r["createElementVNode"])("li",{innerHTML:e.$sanitize(e.rightsLinkText("IndividualsRightsPortability"))},null,8,$n),Object(r["createElementVNode"])("li",{innerHTML:e.$sanitize(e.rightsLinkText("IndividualsRightsObject","usersOptOut"))},null,8,Kn),Object(r["createElementVNode"])("li",null,Object(r["toDisplayString"])(e.translate("PrivacyManager_IndividualsRightsChildren")),1)])]})),_:1},8,["content-title"]),Object(r["createVNode"])(c,{"content-title":e.translate("PrivacyManager_AwarenessDocumentation")},{default:Object(r["withCtx"])((function(){return[Object(r["createElementVNode"])("p",null,Object(r["toDisplayString"])(e.translate("PrivacyManager_AwarenessDocumentationIntro")),1),Object(r["createElementVNode"])("ol",null,[Object(r["createElementVNode"])("li",null,Object(r["toDisplayString"])(e.translate("PrivacyManager_AwarenessDocumentationDesc1")),1),Object(r["createElementVNode"])("li",null,Object(r["toDisplayString"])(e.translate("PrivacyManager_AwarenessDocumentationDesc2")),1),Object(r["createElementVNode"])("li",{innerHTML:e.$sanitize(e.awarenessDocumentationDesc3)},null,8,Wn),Object(r["createElementVNode"])("li",{innerHTML:e.$sanitize(e.awarenessDocumentationDesc4)},null,8,Yn)])]})),_:1},8,["content-title"]),Object(r["createVNode"])(c,{"content-title":e.translate("PrivacyManager_SecurityProcedures")},{default:Object(r["withCtx"])((function(){return[Object(r["createElementVNode"])("p",null,Object(r["toDisplayString"])(e.translate("PrivacyManager_SecurityProceduresIntro")),1),Object(r["createElementVNode"])("ol",null,[Object(r["createElementVNode"])("li",{innerHTML:e.$sanitize(e.securityProceduresDesc1)},null,8,Jn),Object(r["createElementVNode"])("li",{innerHTML:e.$sanitize(e.securityProceduresDesc2)},null,8,Qn),Object(r["createElementVNode"])("li",{innerHTML:e.$sanitize(e.securityProceduresDesc3)},null,8,Xn),Object(r["createElementVNode"])("li",{innerHTML:e.$sanitize(e.securityProceduresDesc4)},null,8,Zn)])]})),_:1},8,["content-title"]),Object(r["createVNode"])(c,{"content-title":e.translate("PrivacyManager_DataRetention")},{default:Object(r["withCtx"])((function(){return[Object(r["createElementVNode"])("p",null,Object(r["toDisplayString"])(e.translate("PrivacyManager_DataRetentionInMatomo")),1),Object(r["createElementVNode"])("ul",null,[e.deleteLogsEnable?(Object(r["openBlock"])(),Object(r["createElementBlock"])("li",{key:0,innerHTML:e.$sanitize(e.translate("PrivacyManager_RawDataRemovedAfter","<strong>".concat(e.rawDataRetention,"</strong>")))},null,8,ea)):(Object(r["openBlock"])(),Object(r["createElementBlock"])("li",{key:1,innerHTML:e.$sanitize(e.translate("PrivacyManager_RawDataNeverRemoved"))},null,8,ta)),e.deleteReportsEnable?(Object(r["openBlock"])(),Object(r["createElementBlock"])("li",{key:2,innerHTML:e.$sanitize(e.translate("PrivacyManager_ReportsRemovedAfter","<strong>".concat(e.reportRetention,"</strong>")))},null,8,na)):(Object(r["openBlock"])(),Object(r["createElementBlock"])("li",{key:3,innerHTML:e.$sanitize(e.translate("PrivacyManager_ReportsNeverRemoved"))},null,8,aa))]),Object(r["createElementVNode"])("p",null,[oa,Object(r["createTextVNode"])(" "+Object(r["toDisplayString"])(e.translate("PrivacyManager_DataRetentionOverall")),1)])]})),_:1},8,["content-title"])])}function ia(e,t){return Object(X["translate"])("PrivacyManager_".concat(e),'<a rel="noreferrer noopener" target="_blank" href="'.concat(t,'">'),"</a>")}var la=Object(r["defineComponent"])({props:{afterGDPROverviewIntroContent:String,deleteLogsEnable:Boolean,deleteReportsEnable:Boolean,rawDataRetention:null,reportRetention:null},components:{ContentBlock:X["ContentBlock"],VueEntryContainer:X["VueEntryContainer"]},directives:{ContentIntro:X["ContentIntro"]},methods:{rightsLinkText:function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"gdprTools",n="?".concat(X["MatomoUrl"].stringify({module:"PrivacyManager",action:t}));return Object(X["translate"])("PrivacyManager_".concat(e),'<a target="_blank" rel="noreferrer noopener" href="'.concat(n,'">'),"</a>")}},computed:{gdprChecklistDesc2:function(){return ia("GdprChecklistDesc2","https://matomo.org/docs/gdpr")},awarenessDocumentationDesc3:function(){return ia("AwarenessDocumentationDesc3","https://matomo.org/faq/general/faq_18254/")},awarenessDocumentationDesc4:function(){return ia("AwarenessDocumentationDesc4","https://matomo.org/blog/2018/04/gdpr-how-to-fill-in-the-information-asset-register-when-using-matomo/")},securityProceduresDesc1:function(){return ia("SecurityProceduresDesc1","https://matomo.org/docs/security/")},securityProceduresDesc2:function(){return ia("SecurityProceduresDesc2","https://ico.org.uk/for-organisations/guide-to-the-general-data-protection-regulation-gdpr/international-transfers/")},securityProceduresDesc3:function(){return ia("SecurityProceduresDesc3","https://ico.org.uk/for-organisations/guide-to-the-general-data-protection-regulation-gdpr/personal-data-breaches/")},securityProceduresDesc4:function(){return ia("SecurityProceduresDesc4","https://www.cnil.fr/en/guidelines-dpia")}}});la.render=ra;var ca=la,sa=Object(r["createElementVNode"])("h3",null,"Previous raw data anonymizations",-1),da=Object(r["createElementVNode"])("thead",null,[Object(r["createElementVNode"])("tr",null,[Object(r["createElementVNode"])("th",null,"Requester"),Object(r["createElementVNode"])("th",null,"Affected ID Sites"),Object(r["createElementVNode"])("th",null,"Affected date"),Object(r["createElementVNode"])("th",null,"Anonymize"),Object(r["createElementVNode"])("th",null,"Visit Columns"),Object(r["createElementVNode"])("th",null,"Link Visit Action Columns"),Object(r["createElementVNode"])("th",null,"Status")])],-1),ua={key:0},ma=Object(r["createTextVNode"])("IP address"),ba=Object(r["createElementVNode"])("br",null,null,-1),pa=[ma,ba],Oa={key:1},ga=Object(r["createTextVNode"])("Location"),ja=Object(r["createElementVNode"])("br",null,null,-1),va=[ga,ja],ha={key:2},ya={key:3},fa={key:0},Va=["title"],Da=Object(r["createTextVNode"])(" Scheduled "),Na={key:1},Ea=["title"],Sa=Object(r["createTextVNode"])(" In progress "),Ca={key:2},ka=["title"],_a=Object(r["createTextVNode"])(" Done ");function Pa(e,t,n,a,o,i){var l=Object(r["resolveDirective"])("content-table");return Object(r["openBlock"])(),Object(r["createElementBlock"])("div",null,[sa,Object(r["withDirectives"])(Object(r["createElementVNode"])("table",null,[da,Object(r["createElementVNode"])("tbody",null,[(Object(r["openBlock"])(!0),Object(r["createElementBlock"])(r["Fragment"],null,Object(r["renderList"])(e.anonymizations,(function(e,t){return Object(r["openBlock"])(),Object(r["createElementBlock"])("tr",{key:t},[Object(r["createElementVNode"])("td",null,Object(r["toDisplayString"])(e.requester),1),Object(r["createElementVNode"])("td",null,Object(r["toDisplayString"])(e.sites.join(", ")),1),Object(r["createElementVNode"])("td",null,Object(r["toDisplayString"])(e.date_start)+" - "+Object(r["toDisplayString"])(e.date_end),1),Object(r["createElementVNode"])("td",null,[e.anonymize_ip?(Object(r["openBlock"])(),Object(r["createElementBlock"])("span",ua,pa)):Object(r["createCommentVNode"])("",!0),e.anonymize_location?(Object(r["openBlock"])(),Object(r["createElementBlock"])("span",Oa,va)):Object(r["createCommentVNode"])("",!0),e.anonymize_userid?(Object(r["openBlock"])(),Object(r["createElementBlock"])("span",ha,"User ID")):Object(r["createCommentVNode"])("",!0),e.anonymize_ip||e.anonymize_location||e.anonymize_userid?Object(r["createCommentVNode"])("",!0):(Object(r["openBlock"])(),Object(r["createElementBlock"])("span",ya,"-"))]),Object(r["createElementVNode"])("td",null,Object(r["toDisplayString"])(e.unset_visit_columns.join(", ")),1),Object(r["createElementVNode"])("td",null,Object(r["toDisplayString"])(e.unset_link_visit_action_columns.join(", ")),1),Object(r["createElementVNode"])("td",null,[e.job_start_date?e.job_start_date&&!e.job_finish_date?(Object(r["openBlock"])(),Object(r["createElementBlock"])("span",Na,[Object(r["createElementVNode"])("span",{class:"icon-info",style:{cursor:"help"},title:"Scheduled date: ".concat(e.scheduled_date||"",". Job Start Date:")+" ".concat(e.job_start_date,". Current Output: ").concat(e.output)},null,8,Ea),Sa])):(Object(r["openBlock"])(),Object(r["createElementBlock"])("span",Ca,[Object(r["createElementVNode"])("span",{class:"icon-info",style:{cursor:"help"},title:"Scheduled date: ".concat(e.scheduled_date||"",". Job Start Date:")+" ".concat(e.job_start_date,". Job Finish Date: ").concat(e.job_finish_date,". ")+"Output: ".concat(e.output)},null,8,ka),_a])):(Object(r["openBlock"])(),Object(r["createElementBlock"])("span",fa,[Object(r["createElementVNode"])("span",{class:"icon-info",style:{cursor:"help"},title:"Scheduled date: ".concat(e.scheduled_date||"",".")},null,8,Va),Da]))])])})),128))])],512),[[l]])])}var wa=Object(r["defineComponent"])({props:{anonymizations:{type:Array,required:!0}},directives:{ContentTable:X["ContentTable"]}});wa.render=Pa;var Ma=wa,za=["innerHTML"],Ta=["innerHTML"],Aa={key:0},Ia=Object(r["createElementVNode"])("a",{name:"anonymizeHistoricalData",id:"anonymizeHistoricalData"},null,-1),Ba=Object(r["createElementVNode"])("p",null," If you have tracked personal data such as the full visitor IP, you may want to anonymize this data now in case you do not have consent for this data or no longer a legitimate interest. ",-1),La={key:1},Fa=Object(r["createElementVNode"])("br",null,null,-1);function xa(e,t,n,a,o,i){var l=Object(r["resolveComponent"])("EnrichedHeadline"),c=Object(r["resolveComponent"])("AnonymizeIp"),s=Object(r["resolveComponent"])("ContentBlock"),d=Object(r["resolveComponent"])("DeleteOldLogs"),u=Object(r["resolveComponent"])("DeleteOldReports"),m=Object(r["resolveComponent"])("ScheduleReportDeletion"),b=Object(r["resolveComponent"])("AnonymizeLogData"),p=Object(r["resolveComponent"])("PreviousAnonymizations"),O=Object(r["resolveDirective"])("content-intro");return Object(r["openBlock"])(),Object(r["createElementBlock"])("div",null,[Object(r["withDirectives"])(Object(r["createElementVNode"])("div",null,[Object(r["createElementVNode"])("h2",null,[Object(r["createVNode"])(l,{"help-url":"https://matomo.org/docs/privacy/"},{default:Object(r["withCtx"])((function(){return[Object(r["createTextVNode"])(Object(r["toDisplayString"])(e.translate("PrivacyManager_AnonymizeData")),1)]})),_:1})]),Object(r["createElementVNode"])("p",null,[Object(r["createElementVNode"])("span",{innerHTML:e.$sanitize(e.teaserHeader),style:{"margin-right":"3.5px"}},null,8,za),Object(r["createElementVNode"])("span",{innerHTML:e.$sanitize(e.seeAlsoOurOfficialGuide)},null,8,Ta)])],512),[[O]]),Object(r["createVNode"])(s,{id:"anonymizeIPAnchor","content-title":e.translate("PrivacyManager_UseAnonymizeTrackingData")},{default:Object(r["withCtx"])((function(){return[Object(r["createVNode"])(c,{"anonymize-ip-enabled":e.anonymizeIpEnabled,"anonymize-user-id":e.anonymizeUserId,"mask-length":e.maskLength,"use-anonymized-ip-for-visit-enrichment":e.useAnonymizedIpForVisitEnrichment,"anonymize-order-id":e.anonymizeOrderId,"force-cookieless-tracking":e.forceCookielessTracking,"anonymize-referrer":e.anonymizeReferrer,"mask-length-options":e.maskLengthOptions,"use-anonymized-ip-for-visit-enrichment-options":e.useAnonymizedIpForVisitEnrichmentOptions,"tracker-file-name":e.trackerFileName,"tracker-writable":e.trackerWritable,"referrer-anonymization-options":e.referrerAnonymizationOptions},null,8,["anonymize-ip-enabled","anonymize-user-id","mask-length","use-anonymized-ip-for-visit-enrichment","anonymize-order-id","force-cookieless-tracking","anonymize-referrer","mask-length-options","use-anonymized-ip-for-visit-enrichment-options","tracker-file-name","tracker-writable","referrer-anonymization-options"])]})),_:1},8,["content-title"]),e.isDataPurgeSettingsEnabled?(Object(r["openBlock"])(),Object(r["createElementBlock"])("div",Aa,[Object(r["createVNode"])(s,{id:"deleteLogsAnchor","content-title":e.translate("PrivacyManager_DeleteOldRawData")},{default:Object(r["withCtx"])((function(){return[Object(r["createElementVNode"])("p",null,Object(r["toDisplayString"])(e.translate("PrivacyManager_DeleteDataDescription")),1),Object(r["createVNode"])(d,{"is-data-purge-settings-enabled":e.isDataPurgeSettingsEnabled,"delete-data":e.deleteData,"schedule-deletion-options":e.scheduleDeletionOptions},null,8,["is-data-purge-settings-enabled","delete-data","schedule-deletion-options"])]})),_:1},8,["content-title"]),Object(r["createVNode"])(s,{id:"deleteReportsAnchor","content-title":e.translate("PrivacyManager_DeleteOldAggregatedReports")},{default:Object(r["withCtx"])((function(){return[Object(r["createVNode"])(u,{"is-data-purge-settings-enabled":e.isDataPurgeSettingsEnabled,"delete-data":e.deleteData,"schedule-deletion-options":e.scheduleDeletionOptions},null,8,["is-data-purge-settings-enabled","delete-data","schedule-deletion-options"])]})),_:1},8,["content-title"]),Object(r["createVNode"])(m,{"is-data-purge-settings-enabled":e.isDataPurgeSettingsEnabled,"delete-data":e.deleteData,"schedule-deletion-options":e.scheduleDeletionOptions},null,8,["is-data-purge-settings-enabled","delete-data","schedule-deletion-options"])])):Object(r["createCommentVNode"])("",!0),Ia,Object(r["createVNode"])(s,{"content-title":"Anonymize previously tracked raw data",class:"logDataAnonymizer"},{default:Object(r["withCtx"])((function(){return[Ba,e.isSuperUser?(Object(r["openBlock"])(),Object(r["createBlock"])(b,{key:0})):(Object(r["openBlock"])(),Object(r["createElementBlock"])("p",La,"Only a user with Super User access can anonymize previously tracked raw data.")),Fa,Object(r["createVNode"])(p,{anonymizations:e.anonymizations},null,8,["anonymizations"])]})),_:1})])}var Ra=Object(r["defineComponent"])({props:{anonymizeIpEnabled:Boolean,anonymizeUserId:Boolean,maskLength:{type:Number,required:!0},useAnonymizedIpForVisitEnrichment:[Boolean,String,Number],anonymizeOrderId:Boolean,forceCookielessTracking:Boolean,anonymizeReferrer:String,maskLengthOptions:{type:Array,required:!0},useAnonymizedIpForVisitEnrichmentOptions:{type:Array,required:!0},trackerFileName:{type:String,required:!0},trackerWritable:{type:Boolean,required:!0},referrerAnonymizationOptions:{type:Object,required:!0},isDataPurgeSettingsEnabled:Boolean,deleteData:{type:Object,required:!0},scheduleDeletionOptions:{type:Object,required:!0},anonymizations:{type:Array,required:!0},isSuperUser:Boolean},components:{AnonymizeIp:pe,EnrichedHeadline:X["EnrichedHeadline"],ContentBlock:X["ContentBlock"],DeleteOldLogs:Kt,DeleteOldReports:cn,ScheduleReportDeletion:kn,AnonymizeLogData:St,PreviousAnonymizations:Ma},directives:{ContentIntro:X["ContentIntro"]},computed:{teaserHeader:function(){return Object(X["translate"])("PrivacyManager_TeaserHeader",'<a href="#anonymizeIPAnchor">',"</a>",'<a href="#deleteLogsAnchor">',"</a>",'<a href="#anonymizeHistoricalData">',"</a>")},seeAlsoOurOfficialGuide:function(){return Object(X["translate"])("PrivacyManager_SeeAlsoOurOfficialGuidePrivacy",'<a href="https://matomo.org/docs/privacy/" rel="noreferrer noopener" target="_blank">',"</a>")}}});Ra.render=xa;var Ua=Ra,Ha={key:0},Ga=Object(r["createElementVNode"])("br",null,null,-1),qa={key:1};function $a(e,t,n,a,o,i){var l=Object(r["resolveComponent"])("OptOutCustomizer"),c=Object(r["resolveComponent"])("ContentBlock"),s=Object(r["resolveComponent"])("DoNotTrackPreference");return Object(r["openBlock"])(),Object(r["createElementBlock"])("div",null,[Object(r["createVNode"])(c,{"content-title":e.translate("PrivacyManager_TrackingOptOut")},{default:Object(r["withCtx"])((function(){return[Object(r["createVNode"])(l,{"matomo-url":e.matomoUrl,language:e.language,"language-options":e.languageOptions},null,8,["matomo-url","language","language-options"])]})),_:1},8,["content-title"]),e.isSuperUser?(Object(r["openBlock"])(),Object(r["createBlock"])(c,{key:0,id:"DNT","content-title":e.translate("PrivacyManager_DoNotTrack_SupportDNTPreference")},{default:Object(r["withCtx"])((function(){return[Object(r["createElementVNode"])("p",null,[e.dntSupport?(Object(r["openBlock"])(),Object(r["createElementBlock"])("span",Ha,[Object(r["createElementVNode"])("strong",null,Object(r["toDisplayString"])(e.translate("PrivacyManager_DoNotTrack_Enabled")),1),Ga,Object(r["createTextVNode"])(" "+Object(r["toDisplayString"])(e.translate("PrivacyManager_DoNotTrack_EnabledMoreInfo")),1)])):(Object(r["openBlock"])(),Object(r["createElementBlock"])("span",qa,Object(r["toDisplayString"])(e.translate("PrivacyManager_DoNotTrack_Disabled"))+" "+Object(r["toDisplayString"])(e.translate("PrivacyManager_DoNotTrack_DisabledMoreInfo")),1))]),Object(r["createVNode"])(s,{"dnt-support":e.dntSupport,"do-not-track-options":e.doNotTrackOptions},null,8,["dnt-support","do-not-track-options"])]})),_:1},8,["content-title"])):Object(r["createCommentVNode"])("",!0)])}var Ka=Object(r["defineComponent"])({props:{language:{type:String,required:!0},matomoUrl:String,isSuperUser:Boolean,dntSupport:Boolean,doNotTrackOptions:{type:Array,required:!0},languageOptions:{type:Object,required:!0}},components:{ContentBlock:X["ContentBlock"],DoNotTrackPreference:_t,OptOutCustomizer:Ue}});Ka.render=$a;var Wa=Ka; + */var Tt=function(){function e(){var t=this;Pt(this,e),zt(this,"privateState",Object(r["reactive"])({settings:{},showEstimate:!1,loadingEstimation:!1,estimation:"",isModified:!1})),zt(this,"state",Object(r["computed"])((function(){return Object(r["readonly"])(t.privateState)}))),zt(this,"enableDeleteReports",Object(r["computed"])((function(){return t.state.value.settings.enableDeleteReports}))),zt(this,"enableDeleteLogs",Object(r["computed"])((function(){return t.state.value.settings.enableDeleteLogs}))),zt(this,"currentRequest",void 0)}return Mt(e,[{key:"updateSettings",value:function(e){this.initSettings(e),this.privateState.isModified=!0}},{key:"initSettings",value:function(e){this.privateState.settings=Object.assign(Object.assign({},this.privateState.settings),e),this.reloadDbStats()}},{key:"savePurgeDataSettings",value:function(e,t,n){return this.privateState.isModified=!1,X["AjaxHelper"].post({module:"API",method:e},Object.assign(Object.assign({},t),{},{enableDeleteLogs:t.enableDeleteLogs?"1":"0",enableDeleteReports:t.enableDeleteReports?"1":"0",passwordConfirmation:n})).then((function(){var e=X["NotificationsStore"].show({message:Object(X["translate"])("CoreAdminHome_SettingsSaveSuccess"),context:"success",id:"privacyManagerSettings",type:"toast"});X["NotificationsStore"].scrollToNotification(e)}))}},{key:"isEitherDeleteSectionEnabled",value:function(){return this.state.value.settings.enableDeleteLogs||this.state.value.settings.enableDeleteReports}},{key:"isManualEstimationLinkShowing",value:function(){return window.$("#getPurgeEstimateLink").length>0}},{key:"reloadDbStats",value:function(e){var t=this;if(this.currentRequest&&(this.currentRequest.abort(),this.currentRequest=void 0),e||this.isEitherDeleteSectionEnabled()&&!this.isManualEstimationLinkShowing()){this.privateState.loadingEstimation=!0,this.privateState.estimation="",this.privateState.showEstimate=!1;var n=this.privateState.settings,a=Object.assign(Object.assign({},n),{},{enableDeleteLogs:n.enableDeleteLogs?"1":"0",enableDeleteReports:n.enableDeleteReports?"1":"0"});!0===e&&(a.forceEstimate=1),this.currentRequest=new AbortController,X["AjaxHelper"].post({module:"PrivacyManager",action:"getDatabaseSize",format:"html"},a,{abortController:this.currentRequest,format:"html"}).then((function(e){t.privateState.estimation=e,t.privateState.showEstimate=!0,t.privateState.loadingEstimation=!1})).finally((function(){t.currentRequest=void 0,t.privateState.loadingEstimation=!1}))}}}]),e}(),At=new Tt,It={id:"formDeleteSettings"},Bt={id:"deleteLogSettingEnabled"},Lt={class:"alert alert-warning deleteOldLogsWarning",style:{width:"50%"}},Ft={href:"https://matomo.org/faq/general/faq_125",rel:"noreferrer noopener",target:"_blank"},xt={id:"deleteLogSettings"},Rt={key:0},Ut={key:1},Ht={key:2},Gt={key:3};function qt(e,t,n,a,o,i){var l=this,c=Object(r["resolveComponent"])("Field"),s=Object(r["resolveComponent"])("SaveButton"),d=Object(r["resolveComponent"])("PasswordConfirmation"),u=Object(r["resolveDirective"])("form");return Object(r["withDirectives"])((Object(r["openBlock"])(),Object(r["createElementBlock"])("div",It,[Object(r["createElementVNode"])("div",Bt,[Object(r["createElementVNode"])("div",null,[Object(r["createVNode"])(c,{uicontrol:"checkbox",name:"deleteEnable","model-value":e.enabled,"onUpdate:modelValue":t[0]||(t[0]=function(t){e.enabled=t,e.reloadDbStats()}),title:e.translate("PrivacyManager_UseDeleteLog"),"inline-help":e.translate("PrivacyManager_DeleteRawDataInfo")},null,8,["model-value","title","inline-help"])]),Object(r["withDirectives"])(Object(r["createElementVNode"])("div",Lt,[Object(r["createElementVNode"])("a",Ft,Object(r["toDisplayString"])(e.translate("General_ClickHere")),1)],512),[[r["vShow"],e.enabled]])]),Object(r["withDirectives"])(Object(r["createElementVNode"])("div",xt,[Object(r["createElementVNode"])("div",null,[Object(r["createVNode"])(c,{uicontrol:"text",name:"deleteOlderThan","model-value":e.deleteOlderThan,"onUpdate:modelValue":t[1]||(t[1]=function(t){e.deleteOlderThan=t,e.reloadDbStats()}),title:e.deleteOlderThanTitle,"inline-help":e.translate("PrivacyManager_LeastDaysInput","1")},null,8,["model-value","title","inline-help"])])],512),[[r["vShow"],e.enabled]]),Object(r["createVNode"])(s,{onConfirm:t[2]||(t[2]=function(e){return l.showPasswordConfirmModal=!0}),saving:e.isLoading},null,8,["saving"]),Object(r["createVNode"])(d,{modelValue:e.showPasswordConfirmModal,"onUpdate:modelValue":t[3]||(t[3]=function(t){return e.showPasswordConfirmModal=t}),onConfirmed:e.saveSettings},{default:Object(r["withCtx"])((function(){return[e.enabled&&!e.enableDeleteReports?(Object(r["openBlock"])(),Object(r["createElementBlock"])("h2",Rt,Object(r["toDisplayString"])(e.translate("PrivacyManager_DeleteLogsConfirm")),1)):Object(r["createCommentVNode"])("",!0),e.enabled&&e.enableDeleteReports?(Object(r["openBlock"])(),Object(r["createElementBlock"])("h2",Ut,Object(r["toDisplayString"])(e.translate("PrivacyManager_DeleteBothConfirm")),1)):Object(r["createCommentVNode"])("",!0),e.enabled?(Object(r["openBlock"])(),Object(r["createElementBlock"])("div",Ht,Object(r["toDisplayString"])(e.translate("UsersManager_ConfirmWithPassword")),1)):Object(r["createCommentVNode"])("",!0),e.enabled?Object(r["createCommentVNode"])("",!0):(Object(r["openBlock"])(),Object(r["createElementBlock"])("h2",Gt,Object(r["toDisplayString"])(e.translate("UsersManager_ConfirmWithPassword")),1))]})),_:1},8,["modelValue","onConfirmed"])],512)),[[u]])}var $t=Object(r["defineComponent"])({props:{isDataPurgeSettingsEnabled:Boolean,deleteData:{type:Object,required:!0},scheduleDeletionOptions:{type:Object,required:!0}},components:{PasswordConfirmation:ee["PasswordConfirmation"],Field:ee["Field"],SaveButton:ee["SaveButton"]},directives:{Form:ee["Form"]},data:function(){return{isLoading:!1,enabled:1===parseInt(this.deleteData.config.delete_logs_enable,10),deleteOlderThan:this.deleteData.config.delete_logs_older_than,showPasswordConfirmModal:!1}},created:function(){var e=this;setTimeout((function(){At.initSettings(e.settings)}))},methods:{saveSettings:function(e){var t=this,n="PrivacyManager.setDeleteLogsSettings";this.isLoading=!0,At.savePurgeDataSettings(n,this.settings,e).finally((function(){t.isLoading=!1}))},reloadDbStats:function(){At.updateSettings(this.settings)}},computed:{settings:function(){return{enableDeleteLogs:!!this.enabled,deleteLogsOlderThan:this.deleteOlderThan}},deleteOlderThanTitle:function(){return"".concat(Object(X["translate"])("PrivacyManager_DeleteLogsOlderThan")," (").concat(Object(X["translate"])("Intl_PeriodDays"),")")},enableDeleteReports:function(){return!!At.enableDeleteReports.value}}});$t.render=qt;var Kt=$t,Wt={id:"formDeleteSettings"},Yt={id:"deleteReportsSettingEnabled"},Jt={class:"alert alert-warning",style:{width:"50%"}},Qt=Object(r["createElementVNode"])("br",null,null,-1),Xt=Object(r["createElementVNode"])("br",null,null,-1),Zt={id:"deleteReportsSettings"},en={key:0},tn={key:1},nn={key:2},an={key:3};function on(e,t,n,a,o,i){var l=this,c=Object(r["resolveComponent"])("Field"),s=Object(r["resolveComponent"])("SaveButton"),d=Object(r["resolveComponent"])("PasswordConfirmation"),u=Object(r["resolveDirective"])("form");return Object(r["withDirectives"])((Object(r["openBlock"])(),Object(r["createElementBlock"])("div",Wt,[Object(r["createElementVNode"])("div",Yt,[Object(r["createElementVNode"])("div",null,[Object(r["createVNode"])(c,{uicontrol:"checkbox",name:"deleteReportsEnable","model-value":e.enabled,"onUpdate:modelValue":t[0]||(t[0]=function(t){e.enabled=t,e.reloadDbStats()}),title:e.translate("PrivacyManager_UseDeleteReports"),"inline-help":e.translate("PrivacyManager_DeleteAggregateReportsDetailedInfo")},null,8,["model-value","title","inline-help"])]),Object(r["withDirectives"])(Object(r["createElementVNode"])("div",Jt,[Object(r["createElementVNode"])("span",null,[Object(r["createTextVNode"])(Object(r["toDisplayString"])(e.translate("PrivacyManager_DeleteReportsInfo2",e.deleteOldLogsText)),1),Qt,Xt,Object(r["createTextVNode"])(" "+Object(r["toDisplayString"])(e.translate("PrivacyManager_DeleteReportsInfo3",e.deleteOldLogsText)),1)])],512),[[r["vShow"],e.enabled]])]),Object(r["withDirectives"])(Object(r["createElementVNode"])("div",Zt,[Object(r["createElementVNode"])("div",null,[Object(r["createVNode"])(c,{uicontrol:"text",name:"deleteReportsOlderThan","model-value":e.deleteOlderThan,"onUpdate:modelValue":t[1]||(t[1]=function(t){e.deleteOlderThan=t,e.reloadDbStats()}),title:e.deleteReportsOlderThanTitle,"inline-help":e.translate("PrivacyManager_LeastMonthsInput","1")},null,8,["model-value","title","inline-help"])]),Object(r["createElementVNode"])("div",null,[Object(r["createVNode"])(c,{uicontrol:"checkbox",name:"deleteReportsKeepBasic","model-value":e.keepBasic,"onUpdate:modelValue":t[2]||(t[2]=function(t){e.keepBasic=t,e.reloadDbStats()}),title:e.deleteReportsKeepBasicTitle,"inline-help":e.translate("PrivacyManager_KeepBasicMetricsReportsDetailedInfo")},null,8,["model-value","title","inline-help"])]),Object(r["createElementVNode"])("h3",null,Object(r["toDisplayString"])(e.translate("PrivacyManager_KeepDataFor")),1),Object(r["createElementVNode"])("div",null,[Object(r["createElementVNode"])("div",null,[Object(r["createVNode"])(c,{uicontrol:"checkbox",name:"deleteReportsKeepDay","model-value":e.keepDataForDay,"onUpdate:modelValue":t[3]||(t[3]=function(t){e.keepDataForDay=t,e.reloadDbStats()}),title:e.translate("General_DailyReports")},null,8,["model-value","title"])]),Object(r["createElementVNode"])("div",null,[Object(r["createVNode"])(c,{uicontrol:"checkbox",name:"deleteReportsKeepWeek","model-value":e.keepDataForWeek,"onUpdate:modelValue":t[4]||(t[4]=function(t){e.keepDataForWeek=t,e.reloadDbStats()}),title:e.translate("General_WeeklyReports")},null,8,["model-value","title"])]),Object(r["createElementVNode"])("div",null,[Object(r["createVNode"])(c,{uicontrol:"checkbox",name:"deleteReportsKeepMonth","model-value":e.keepDataForMonth,"onUpdate:modelValue":t[5]||(t[5]=function(t){e.keepDataForMonth=t,e.reloadDbStats()}),title:"".concat(e.translate("General_MonthlyReports")," (").concat(e.translate("General_Recommended"),")")},null,8,["model-value","title"])]),Object(r["createElementVNode"])("div",null,[Object(r["createVNode"])(c,{uicontrol:"checkbox",name:"deleteReportsKeepYear","model-value":e.keepDataForYear,"onUpdate:modelValue":t[6]||(t[6]=function(t){e.keepDataForYear=t,e.reloadDbStats()}),title:"".concat(e.translate("General_YearlyReports")," (").concat(e.translate("General_Recommended"),")")},null,8,["model-value","title"])]),Object(r["createElementVNode"])("div",null,[Object(r["createVNode"])(c,{uicontrol:"checkbox",name:"deleteReportsKeepRange","model-value":e.keepDataForRange,"onUpdate:modelValue":t[7]||(t[7]=function(t){e.keepDataForRange=t,e.reloadDbStats()}),title:e.translate("General_RangeReports")},null,8,["model-value","title"])]),Object(r["createElementVNode"])("div",null,[Object(r["createVNode"])(c,{uicontrol:"checkbox",name:"deleteReportsKeepSegments","model-value":e.keepDataForSegments,"onUpdate:modelValue":t[8]||(t[8]=function(t){e.keepDataForSegments=t,e.reloadDbStats()}),title:e.translate("PrivacyManager_KeepReportSegments")},null,8,["model-value","title"])])])],512),[[r["vShow"],e.enabled]]),Object(r["createVNode"])(s,{onConfirm:t[9]||(t[9]=function(e){return l.showPasswordConfirmModal=!0}),saving:e.isLoading},null,8,["saving"]),Object(r["createVNode"])(d,{modelValue:e.showPasswordConfirmModal,"onUpdate:modelValue":t[10]||(t[10]=function(t){return e.showPasswordConfirmModal=t}),onConfirmed:e.saveSettings},{default:Object(r["withCtx"])((function(){return[e.enabled&&!e.enableDeleteLogs?(Object(r["openBlock"])(),Object(r["createElementBlock"])("h2",en,Object(r["toDisplayString"])(e.translate("PrivacyManager_DeleteReportsConfirm")),1)):Object(r["createCommentVNode"])("",!0),e.enabled&&e.enableDeleteLogs?(Object(r["openBlock"])(),Object(r["createElementBlock"])("h2",tn,Object(r["toDisplayString"])(e.translate("PrivacyManager_DeleteBothConfirm")),1)):Object(r["createCommentVNode"])("",!0),e.enabled?(Object(r["openBlock"])(),Object(r["createElementBlock"])("div",nn,Object(r["toDisplayString"])(e.translate("UsersManager_ConfirmWithPassword")),1)):Object(r["createCommentVNode"])("",!0),e.enabled?Object(r["createCommentVNode"])("",!0):(Object(r["openBlock"])(),Object(r["createElementBlock"])("h2",an,Object(r["toDisplayString"])(e.translate("UsersManager_ConfirmWithPassword")),1))]})),_:1},8,["modelValue","onConfirmed"])],512)),[[u]])}function rn(e){return e?"1":"0"}var ln=Object(r["defineComponent"])({props:{isDataPurgeSettingsEnabled:Boolean,deleteData:{type:Object,required:!0},scheduleDeletionOptions:{type:Object,required:!0}},components:{Field:ee["Field"],SaveButton:ee["SaveButton"],PasswordConfirmation:ee["PasswordConfirmation"]},directives:{Form:ee["Form"]},data:function(){return{isLoading:!1,enabled:1===parseInt(this.deleteData.config.delete_reports_enable,10),deleteOlderThan:this.deleteData.config.delete_reports_older_than,keepBasic:1===parseInt(this.deleteData.config.delete_reports_keep_basic_metrics,10),keepDataForDay:1===parseInt(this.deleteData.config.delete_reports_keep_day_reports,10),keepDataForWeek:1===parseInt(this.deleteData.config.delete_reports_keep_week_reports,10),keepDataForMonth:1===parseInt(this.deleteData.config.delete_reports_keep_month_reports,10),keepDataForYear:1===parseInt(this.deleteData.config.delete_reports_keep_year_reports,10),keepDataForRange:1===parseInt(this.deleteData.config.delete_reports_keep_range_reports,10),keepDataForSegments:1===parseInt(this.deleteData.config.delete_reports_keep_segment_reports,10),showPasswordConfirmModal:!1}},created:function(){var e=this;setTimeout((function(){At.initSettings(e.settings)}))},methods:{saveSettings:function(e){var t=this,n="PrivacyManager.setDeleteReportsSettings";this.isLoading=!0,At.savePurgeDataSettings(n,this.settings,e).finally((function(){t.isLoading=!1}))},reloadDbStats:function(){At.updateSettings(this.settings)}},computed:{settings:function(){return{enableDeleteReports:this.enabled,deleteReportsOlderThan:this.deleteOlderThan,keepBasic:rn(this.keepBasic),keepDay:rn(this.keepDataForDay),keepWeek:rn(this.keepDataForWeek),keepMonth:rn(this.keepDataForMonth),keepYear:rn(this.keepDataForYear),keepRange:rn(this.keepDataForRange),keepSegments:rn(this.keepDataForSegments)}},deleteOldLogsText:function(){return Object(X["translate"])("PrivacyManager_UseDeleteLog")},deleteReportsOlderThanTitle:function(){var e=Object(X["translate"])("PrivacyManager_DeleteReportsOlderThan");return"".concat(e," (").concat(Object(X["translate"])("Intl_PeriodMonths"),")")},deleteReportsKeepBasicTitle:function(){var e=Object(X["translate"])("PrivacyManager_KeepBasicMetrics");return"".concat(e," (").concat(Object(X["translate"])("General_Recommended"),")")},enableDeleteLogs:function(){return!!At.enableDeleteLogs.value}}});ln.render=on;var cn=ln,sn={id:"formDeleteSettings"},dn={id:"deleteSchedulingSettings"},un={id:"deleteSchedulingSettingsInlineHelp",class:"inline-help-node"},mn={key:0},bn=Object(r["createElementVNode"])("br",null,null,-1),pn=Object(r["createElementVNode"])("br",null,null,-1),On=Object(r["createElementVNode"])("br",null,null,-1),gn=Object(r["createElementVNode"])("br",null,null,-1),jn={key:0,id:"deleteDataEstimateSect",class:"form-group row"},vn={class:"col s12",id:"databaseSizeHeadline"},hn={class:"col s12 m6"},yn=["innerHTML"],fn=Object(r["createTextVNode"])(" "),Vn={class:"col s12 m6"},Dn={key:0,class:"form-help"},Nn={class:"ui-confirm",id:"saveSettingsBeforePurge"},En=Object(r["createElementVNode"])("input",{role:"yes",type:"button",value:"{{ translate('General_Ok') }}"},null,-1);function Sn(e,t,n,a,o,i){var l=Object(r["resolveComponent"])("ActivityIndicator"),c=Object(r["resolveComponent"])("Field"),s=Object(r["resolveComponent"])("SaveButton"),d=Object(r["resolveComponent"])("PasswordConfirmation"),u=Object(r["resolveComponent"])("ContentBlock"),m=Object(r["resolveDirective"])("form");return Object(r["openBlock"])(),Object(r["createElementBlock"])(r["Fragment"],null,[Object(r["withDirectives"])(Object(r["createElementVNode"])("div",sn,[Object(r["withDirectives"])(Object(r["createVNode"])(u,{id:"scheduleSettingsHeadline","content-title":e.translate("PrivacyManager_DeleteSchedulingSettings")},{default:Object(r["withCtx"])((function(){return[Object(r["createElementVNode"])("div",dn,[Object(r["createElementVNode"])("div",null,[Object(r["createVNode"])(c,{uicontrol:"select",name:"deleteLowestInterval",title:e.translate("PrivacyManager_DeleteDataInterval"),modelValue:e.deleteLowestInterval,"onUpdate:modelValue":t[1]||(t[1]=function(t){return e.deleteLowestInterval=t}),options:e.scheduleDeletionOptions},{"inline-help":Object(r["withCtx"])((function(){return[Object(r["createElementVNode"])("div",un,[e.deleteData.lastRun?(Object(r["openBlock"])(),Object(r["createElementBlock"])("span",mn,[Object(r["createElementVNode"])("strong",null,Object(r["toDisplayString"])(e.translate("PrivacyManager_LastDelete"))+":",1),Object(r["createTextVNode"])(" "+Object(r["toDisplayString"])(e.deleteData.lastRunPretty)+" ",1),bn,pn])):Object(r["createCommentVNode"])("",!0),Object(r["createElementVNode"])("strong",null,Object(r["toDisplayString"])(e.translate("PrivacyManager_NextDelete"))+":",1),Object(r["createTextVNode"])(" "+Object(r["toDisplayString"])(e.deleteData.nextRunPretty)+" ",1),On,gn,Object(r["withDirectives"])(Object(r["createElementVNode"])("a",{id:"purgeDataNowLink",href:"#",onClick:t[0]||(t[0]=Object(r["withModifiers"])((function(t){return e.executeDataPurge()}),["prevent"]))},Object(r["toDisplayString"])(e.translate("PrivacyManager_PurgeNow")),513),[[r["vShow"],e.showPurgeNowLink]]),Object(r["createVNode"])(l,{"loading-message":e.translate("PrivacyManager_PurgingData"),loading:e.loadingDataPurge},null,8,["loading-message","loading"]),Object(r["withDirectives"])(Object(r["createElementVNode"])("span",{id:"db-purged-message"},Object(r["toDisplayString"])(e.translate("PrivacyManager_DBPurged")),513),[[r["vShow"],e.dataWasPurged]])])]})),_:1},8,["title","modelValue","options"])])]),"1"===e.deleteData.config.enable_database_size_estimate||1===e.deleteData.config.enable_database_size_estimate?(Object(r["openBlock"])(),Object(r["createElementBlock"])("div",jn,[Object(r["createElementVNode"])("h3",vn,Object(r["toDisplayString"])(e.translate("PrivacyManager_ReportsDataSavedEstimate")),1),Object(r["createElementVNode"])("div",hn,[Object(r["withDirectives"])(Object(r["createElementVNode"])("div",{id:"deleteDataEstimate",innerHTML:e.$sanitize(e.estimation)},null,8,yn),[[r["vShow"],e.showEstimate]]),fn,Object(r["createVNode"])(l,{loading:e.loadingEstimation},null,8,["loading"])]),Object(r["createElementVNode"])("div",Vn,["1"!==e.deleteData.config.enable_auto_database_size_estimate&&1!==e.deleteData.config.enable_auto_database_size_estimate?(Object(r["openBlock"])(),Object(r["createElementBlock"])("div",Dn,[Object(r["createElementVNode"])("a",{id:"getPurgeEstimateLink",href:"#",onClick:t[2]||(t[2]=Object(r["withModifiers"])((function(t){return e.getPurgeEstimate()}),["prevent"]))},Object(r["toDisplayString"])(e.translate("PrivacyManager_GetPurgeEstimate")),1)])):Object(r["createCommentVNode"])("",!0)])])):Object(r["createCommentVNode"])("",!0),Object(r["createVNode"])(s,{onConfirm:t[3]||(t[3]=function(t){return e.showPasswordConfirmModal=!0}),saving:e.isLoading},null,8,["saving"]),Object(r["createVNode"])(d,{modelValue:e.showPasswordConfirmModal,"onUpdate:modelValue":t[4]||(t[4]=function(t){return e.showPasswordConfirmModal=t}),onConfirmed:e.save},{default:Object(r["withCtx"])((function(){return[Object(r["createElementVNode"])("h2",null,Object(r["toDisplayString"])(e.translate("UsersManager_ConfirmWithPassword")),1)]})),_:1},8,["modelValue","onConfirmed"]),Object(r["createVNode"])(d,{modelValue:e.showPasswordConfirmModalForPurge,"onUpdate:modelValue":t[5]||(t[5]=function(t){return e.showPasswordConfirmModalForPurge=t}),onConfirmed:e.executePurgeNow},{default:Object(r["withCtx"])((function(){return[Object(r["createElementVNode"])("h2",null,Object(r["toDisplayString"])(e.translate("PrivacyManager_PurgeNowConfirm")),1),Object(r["createElementVNode"])("div",null,Object(r["toDisplayString"])(e.translate("UsersManager_ConfirmWithPassword")),1)]})),_:1},8,["modelValue","onConfirmed"])]})),_:1},8,["content-title"]),[[r["vShow"],e.isEitherDeleteSectionEnabled]])],512),[[m]]),Object(r["createElementVNode"])("div",Nn,[Object(r["createElementVNode"])("h2",null,Object(r["toDisplayString"])(e.translate("PrivacyManager_SaveSettingsBeforePurge")),1),En])],64)}var Cn=Object(r["defineComponent"])({props:{isDataPurgeSettingsEnabled:Boolean,deleteData:{type:Object,required:!0},scheduleDeletionOptions:{type:Object,required:!0}},components:{ContentBlock:X["ContentBlock"],ActivityIndicator:X["ActivityIndicator"],Field:ee["Field"],SaveButton:ee["SaveButton"],PasswordConfirmation:ee["PasswordConfirmation"]},directives:{Form:ee["Form"]},data:function(){return{isLoading:!1,loadingDataPurge:!1,dataWasPurged:!1,showPurgeNowLink:!0,deleteLowestInterval:this.deleteData.config.delete_logs_schedule_lowest_interval,showPasswordConfirmModal:!1,showPasswordConfirmModalForPurge:!1}},methods:{save:function(e){var t="PrivacyManager.setScheduleReportDeletionSettings";At.savePurgeDataSettings(t,{deleteLowestInterval:this.deleteLowestInterval},e)},executeDataPurge:function(){At.state.value.isModified?X["Matomo"].helper.modalConfirm("#saveSettingsBeforePurge",{yes:function(){return null}}):this.showPasswordConfirmModalForPurge=!0},getPurgeEstimate:function(){return At.reloadDbStats(!0)},executePurgeNow:function(e){var t=this;return this.loadingDataPurge=!0,this.showPurgeNowLink=!1,X["AjaxHelper"].post({module:"API",method:"PrivacyManager.executeDataPurge"},{passwordConfirmation:e}).then((function(){At.reloadDbStats(),t.dataWasPurged=!0,setTimeout((function(){t.dataWasPurged=!1,t.showPurgeNowLink=!0}),2e3)})).catch((function(){t.showPurgeNowLink=!0})).finally((function(){t.loadingDataPurge=!1}))}},computed:{showEstimate:function(){return At.state.value.showEstimate},isEitherDeleteSectionEnabled:function(){return At.isEitherDeleteSectionEnabled()},estimation:function(){return At.state.value.estimation},loadingEstimation:function(){return At.state.value.loadingEstimation}}});Cn.render=Sn;var kn=Cn,_n=["innerHTML"],Pn=Object(r["createElementVNode"])("br",null,null,-1),wn=Object(r["createElementVNode"])("br",null,null,-1),Mn=["innerHTML"],zn=["innerHTML"];function Tn(e,t,n,a,o,i){var l=Object(r["resolveComponent"])("ContentBlock"),c=Object(r["resolveDirective"])("content-intro");return Object(r["openBlock"])(),Object(r["createElementBlock"])("div",null,[Object(r["withDirectives"])(Object(r["createElementVNode"])("div",null,[Object(r["createElementVNode"])("h2",null,Object(r["toDisplayString"])(e.translate("PrivacyManager_AskingForConsent")),1),Object(r["createElementVNode"])("p",null,Object(r["toDisplayString"])(e.translate("PrivacyManager_ConsentExplanation")),1)],512),[[c]]),Object(r["createVNode"])(l,{"content-title":e.translate("PrivacyManager_WhenDoINeedConsent"),class:"privacyAskingForConsent"},{default:Object(r["withCtx"])((function(){return[Object(r["createElementVNode"])("p",null,[Object(r["createElementVNode"])("span",{innerHTML:e.$sanitize(e.whenConsentIsNeeded1)},null,8,_n),Pn,wn,Object(r["createElementVNode"])("span",{innerHTML:e.$sanitize(e.whenConsentIsNeeded2)},null,8,Mn)])]})),_:1},8,["content-title"]),Object(r["createVNode"])(l,{"content-title":e.translate("PrivacyManager_HowDoIAskForConsent"),class:"privacyAskingForConsent"},{default:Object(r["withCtx"])((function(){return[Object(r["createElementVNode"])("p",{innerHTML:e.$sanitize(e.howDoIAskForConsentIntroduction)},null,8,zn)]})),_:1},8,["content-title"])])}var An=Object(r["defineComponent"])({components:{ContentBlock:X["ContentBlock"]},directives:{ContentIntro:X["ContentIntro"]},computed:{whenConsentIsNeeded1:function(){var e="https://matomo.org/blog/2018/04/lawful-basis-for-processing-personal-data-under-gdpr-with-matomo/";return Object(X["translate"])("PrivacyManager_WhenConsentIsNeeded1",'<a href="https://matomo.org/docs/gdpr/" target="_blank" rel="noreferrer noopener">',"</a>",'<a href="'.concat(e,'" target="_blank" rel="noreferrer noopener">'),"</a>")},whenConsentIsNeeded2:function(){var e="?".concat(X["MatomoUrl"].stringify({module:"PrivacyManager",action:"privacySettings"}));return Object(X["translate"])("PrivacyManager_WhenConsentIsNeeded2",'<a href="'.concat(e,'">'),"</a>.")},howDoIAskForConsentIntroduction:function(){var e="https://developer.matomo.org/guides/tracking-consent";return Object(X["translate"])("PrivacyManager_HowDoIAskForConsentIntroduction",'<a href="'.concat(e,'" target="_blank" rel="noreferrer noopener">'),"</a>")}}});An.render=Tn;var In=An,Bn={class:"gdprOverview"},Ln=Object(r["createElementVNode"])("br",null,null,-1),Fn=Object(r["createElementVNode"])("br",null,null,-1),xn=Object(r["createElementVNode"])("br",null,null,-1),Rn=Object(r["createElementVNode"])("br",null,null,-1),Un=["innerHTML"],Hn=["innerHTML"],Gn=["innerHTML"],qn=["innerHTML"],$n=["innerHTML"],Kn=["innerHTML"],Wn=["innerHTML"],Yn=["innerHTML"],Jn=["innerHTML"],Qn=["innerHTML"],Xn=["innerHTML"],Zn=["innerHTML"],ea=["innerHTML"],ta=["innerHTML"],na=["innerHTML"],aa=["innerHTML"],oa=Object(r["createElementVNode"])("br",null,null,-1);function ra(e,t,n,a,o,i){var l=Object(r["resolveComponent"])("VueEntryContainer"),c=Object(r["resolveComponent"])("ContentBlock"),s=Object(r["resolveDirective"])("content-intro");return Object(r["openBlock"])(),Object(r["createElementBlock"])("div",Bn,[Object(r["withDirectives"])(Object(r["createElementVNode"])("div",null,[Object(r["createElementVNode"])("h2",null,Object(r["toDisplayString"])(e.translate("PrivacyManager_GdprOverview")),1),Object(r["createElementVNode"])("p",null,[Object(r["createTextVNode"])(Object(r["toDisplayString"])(e.translate("PrivacyManager_GdprOverviewIntro1"))+" ",1),Ln,Fn,Object(r["createTextVNode"])(" "+Object(r["toDisplayString"])(e.translate("PrivacyManager_GdprOverviewIntro2")),1)])],512),[[s]]),Object(r["createVNode"])(l,{html:e.afterGDPROverviewIntroContent},null,8,["html"]),Object(r["createVNode"])(c,{"content-title":e.translate("PrivacyManager_GdprChecklists")},{default:Object(r["withCtx"])((function(){return[Object(r["createElementVNode"])("p",null,[Object(r["createTextVNode"])(Object(r["toDisplayString"])(e.translate("PrivacyManager_GdprChecklistDesc1"))+" ",1),xn,Rn,Object(r["createElementVNode"])("span",{innerHTML:e.$sanitize(e.gdprChecklistDesc2)},null,8,Un)])]})),_:1},8,["content-title"]),Object(r["createVNode"])(c,{"content-title":e.translate("PrivacyManager_IndividualsRights")},{default:Object(r["withCtx"])((function(){return[Object(r["createElementVNode"])("p",null,Object(r["toDisplayString"])(e.translate("PrivacyManager_IndividualsRightsIntro")),1),Object(r["createElementVNode"])("ol",null,[Object(r["createElementVNode"])("li",null,Object(r["toDisplayString"])(e.translate("PrivacyManager_IndividualsRightsInform")),1),Object(r["createElementVNode"])("li",{innerHTML:e.$sanitize(e.rightsLinkText("IndividualsRightsAccess"))},null,8,Hn),Object(r["createElementVNode"])("li",{innerHTML:e.$sanitize(e.rightsLinkText("IndividualsRightsErasure"))},null,8,Gn),Object(r["createElementVNode"])("li",{innerHTML:e.$sanitize(e.rightsLinkText("IndividualsRightsRectification"))},null,8,qn),Object(r["createElementVNode"])("li",{innerHTML:e.$sanitize(e.rightsLinkText("IndividualsRightsPortability"))},null,8,$n),Object(r["createElementVNode"])("li",{innerHTML:e.$sanitize(e.rightsLinkText("IndividualsRightsObject","usersOptOut"))},null,8,Kn),Object(r["createElementVNode"])("li",null,Object(r["toDisplayString"])(e.translate("PrivacyManager_IndividualsRightsChildren")),1)])]})),_:1},8,["content-title"]),Object(r["createVNode"])(c,{"content-title":e.translate("PrivacyManager_AwarenessDocumentation")},{default:Object(r["withCtx"])((function(){return[Object(r["createElementVNode"])("p",null,Object(r["toDisplayString"])(e.translate("PrivacyManager_AwarenessDocumentationIntro")),1),Object(r["createElementVNode"])("ol",null,[Object(r["createElementVNode"])("li",null,Object(r["toDisplayString"])(e.translate("PrivacyManager_AwarenessDocumentationDesc1")),1),Object(r["createElementVNode"])("li",null,Object(r["toDisplayString"])(e.translate("PrivacyManager_AwarenessDocumentationDesc2")),1),Object(r["createElementVNode"])("li",{innerHTML:e.$sanitize(e.awarenessDocumentationDesc3)},null,8,Wn),Object(r["createElementVNode"])("li",{innerHTML:e.$sanitize(e.awarenessDocumentationDesc4)},null,8,Yn)])]})),_:1},8,["content-title"]),Object(r["createVNode"])(c,{"content-title":e.translate("PrivacyManager_SecurityProcedures")},{default:Object(r["withCtx"])((function(){return[Object(r["createElementVNode"])("p",null,Object(r["toDisplayString"])(e.translate("PrivacyManager_SecurityProceduresIntro")),1),Object(r["createElementVNode"])("ol",null,[Object(r["createElementVNode"])("li",{innerHTML:e.$sanitize(e.securityProceduresDesc1)},null,8,Jn),Object(r["createElementVNode"])("li",{innerHTML:e.$sanitize(e.securityProceduresDesc2)},null,8,Qn),Object(r["createElementVNode"])("li",{innerHTML:e.$sanitize(e.securityProceduresDesc3)},null,8,Xn),Object(r["createElementVNode"])("li",{innerHTML:e.$sanitize(e.securityProceduresDesc4)},null,8,Zn)])]})),_:1},8,["content-title"]),Object(r["createVNode"])(c,{"content-title":e.translate("PrivacyManager_DataRetention")},{default:Object(r["withCtx"])((function(){return[Object(r["createElementVNode"])("p",null,Object(r["toDisplayString"])(e.translate("PrivacyManager_DataRetentionInMatomo")),1),Object(r["createElementVNode"])("ul",null,[e.deleteLogsEnable?(Object(r["openBlock"])(),Object(r["createElementBlock"])("li",{key:0,innerHTML:e.$sanitize(e.translate("PrivacyManager_RawDataRemovedAfter","<strong>".concat(e.rawDataRetention,"</strong>")))},null,8,ea)):(Object(r["openBlock"])(),Object(r["createElementBlock"])("li",{key:1,innerHTML:e.$sanitize(e.translate("PrivacyManager_RawDataNeverRemoved"))},null,8,ta)),e.deleteReportsEnable?(Object(r["openBlock"])(),Object(r["createElementBlock"])("li",{key:2,innerHTML:e.$sanitize(e.translate("PrivacyManager_ReportsRemovedAfter","<strong>".concat(e.reportRetention,"</strong>")))},null,8,na)):(Object(r["openBlock"])(),Object(r["createElementBlock"])("li",{key:3,innerHTML:e.$sanitize(e.translate("PrivacyManager_ReportsNeverRemoved"))},null,8,aa))]),Object(r["createElementVNode"])("p",null,[oa,Object(r["createTextVNode"])(" "+Object(r["toDisplayString"])(e.translate("PrivacyManager_DataRetentionOverall")),1)])]})),_:1},8,["content-title"])])}function ia(e,t){return Object(X["translate"])("PrivacyManager_".concat(e),'<a rel="noreferrer noopener" target="_blank" href="'.concat(t,'">'),"</a>")}var la=Object(r["defineComponent"])({props:{afterGDPROverviewIntroContent:String,deleteLogsEnable:Boolean,deleteReportsEnable:Boolean,rawDataRetention:null,reportRetention:null},components:{ContentBlock:X["ContentBlock"],VueEntryContainer:X["VueEntryContainer"]},directives:{ContentIntro:X["ContentIntro"]},methods:{rightsLinkText:function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"gdprTools",n="?".concat(X["MatomoUrl"].stringify({module:"PrivacyManager",action:t}));return Object(X["translate"])("PrivacyManager_".concat(e),'<a target="_blank" rel="noreferrer noopener" href="'.concat(n,'">'),"</a>")}},computed:{gdprChecklistDesc2:function(){return ia("GdprChecklistDesc2","https://matomo.org/docs/gdpr")},awarenessDocumentationDesc3:function(){return ia("AwarenessDocumentationDesc3","https://matomo.org/faq/general/faq_18254/")},awarenessDocumentationDesc4:function(){return ia("AwarenessDocumentationDesc4","https://matomo.org/blog/2018/04/gdpr-how-to-fill-in-the-information-asset-register-when-using-matomo/")},securityProceduresDesc1:function(){return ia("SecurityProceduresDesc1","https://matomo.org/docs/security/")},securityProceduresDesc2:function(){return ia("SecurityProceduresDesc2","https://ico.org.uk/for-organisations/guide-to-the-general-data-protection-regulation-gdpr/international-transfers/")},securityProceduresDesc3:function(){return ia("SecurityProceduresDesc3","https://ico.org.uk/for-organisations/guide-to-the-general-data-protection-regulation-gdpr/personal-data-breaches/")},securityProceduresDesc4:function(){return ia("SecurityProceduresDesc4","https://www.cnil.fr/en/guidelines-dpia")}}});la.render=ra;var ca=la,sa=Object(r["createElementVNode"])("h3",null,"Previous raw data anonymizations",-1),da=Object(r["createElementVNode"])("thead",null,[Object(r["createElementVNode"])("tr",null,[Object(r["createElementVNode"])("th",null,"Requester"),Object(r["createElementVNode"])("th",null,"Affected ID Sites"),Object(r["createElementVNode"])("th",null,"Affected date"),Object(r["createElementVNode"])("th",null,"Anonymize"),Object(r["createElementVNode"])("th",null,"Visit Columns"),Object(r["createElementVNode"])("th",null,"Link Visit Action Columns"),Object(r["createElementVNode"])("th",null,"Status")])],-1),ua={key:0},ma=Object(r["createTextVNode"])("IP address"),ba=Object(r["createElementVNode"])("br",null,null,-1),pa=[ma,ba],Oa={key:1},ga=Object(r["createTextVNode"])("Location"),ja=Object(r["createElementVNode"])("br",null,null,-1),va=[ga,ja],ha={key:2},ya={key:3},fa={key:0},Va=["title"],Da=Object(r["createTextVNode"])(" Scheduled "),Na={key:1},Ea=["title"],Sa=Object(r["createTextVNode"])(" In progress "),Ca={key:2},ka=["title"],_a=Object(r["createTextVNode"])(" Done ");function Pa(e,t,n,a,o,i){var l=Object(r["resolveDirective"])("content-table");return Object(r["openBlock"])(),Object(r["createElementBlock"])("div",null,[sa,Object(r["withDirectives"])(Object(r["createElementVNode"])("table",null,[da,Object(r["createElementVNode"])("tbody",null,[(Object(r["openBlock"])(!0),Object(r["createElementBlock"])(r["Fragment"],null,Object(r["renderList"])(e.anonymizations,(function(e,t){return Object(r["openBlock"])(),Object(r["createElementBlock"])("tr",{key:t},[Object(r["createElementVNode"])("td",null,Object(r["toDisplayString"])(e.requester),1),Object(r["createElementVNode"])("td",null,Object(r["toDisplayString"])(e.sites.join(", ")),1),Object(r["createElementVNode"])("td",null,Object(r["toDisplayString"])(e.date_start)+" - "+Object(r["toDisplayString"])(e.date_end),1),Object(r["createElementVNode"])("td",null,[e.anonymize_ip?(Object(r["openBlock"])(),Object(r["createElementBlock"])("span",ua,pa)):Object(r["createCommentVNode"])("",!0),e.anonymize_location?(Object(r["openBlock"])(),Object(r["createElementBlock"])("span",Oa,va)):Object(r["createCommentVNode"])("",!0),e.anonymize_userid?(Object(r["openBlock"])(),Object(r["createElementBlock"])("span",ha,"User ID")):Object(r["createCommentVNode"])("",!0),e.anonymize_ip||e.anonymize_location||e.anonymize_userid?Object(r["createCommentVNode"])("",!0):(Object(r["openBlock"])(),Object(r["createElementBlock"])("span",ya,"-"))]),Object(r["createElementVNode"])("td",null,Object(r["toDisplayString"])(e.unset_visit_columns.join(", ")),1),Object(r["createElementVNode"])("td",null,Object(r["toDisplayString"])(e.unset_link_visit_action_columns.join(", ")),1),Object(r["createElementVNode"])("td",null,[e.job_start_date?e.job_start_date&&!e.job_finish_date?(Object(r["openBlock"])(),Object(r["createElementBlock"])("span",Na,[Object(r["createElementVNode"])("span",{class:"icon-info",style:{cursor:"help"},title:"Scheduled date: ".concat(e.scheduled_date||"",". Job Start Date:")+" ".concat(e.job_start_date,". Current Output: ").concat(e.output)},null,8,Ea),Sa])):(Object(r["openBlock"])(),Object(r["createElementBlock"])("span",Ca,[Object(r["createElementVNode"])("span",{class:"icon-info",style:{cursor:"help"},title:"Scheduled date: ".concat(e.scheduled_date||"",". Job Start Date:")+" ".concat(e.job_start_date,". Job Finish Date: ").concat(e.job_finish_date,". ")+"Output: ".concat(e.output)},null,8,ka),_a])):(Object(r["openBlock"])(),Object(r["createElementBlock"])("span",fa,[Object(r["createElementVNode"])("span",{class:"icon-info",style:{cursor:"help"},title:"Scheduled date: ".concat(e.scheduled_date||"",".")},null,8,Va),Da]))])])})),128))])],512),[[l]])])}var wa=Object(r["defineComponent"])({props:{anonymizations:{type:Array,required:!0}},directives:{ContentTable:X["ContentTable"]}});wa.render=Pa;var Ma=wa,za=["innerHTML"],Ta=["innerHTML"],Aa={key:0},Ia=Object(r["createElementVNode"])("a",{name:"anonymizeHistoricalData",id:"anonymizeHistoricalData"},null,-1),Ba=Object(r["createElementVNode"])("p",null," If you have tracked personal data such as the full visitor IP, you may want to anonymize this data now in case you do not have consent for this data or no longer a legitimate interest. ",-1),La={key:1},Fa=Object(r["createElementVNode"])("br",null,null,-1);function xa(e,t,n,a,o,i){var l=Object(r["resolveComponent"])("EnrichedHeadline"),c=Object(r["resolveComponent"])("AnonymizeIp"),s=Object(r["resolveComponent"])("ContentBlock"),d=Object(r["resolveComponent"])("DeleteOldLogs"),u=Object(r["resolveComponent"])("DeleteOldReports"),m=Object(r["resolveComponent"])("ScheduleReportDeletion"),b=Object(r["resolveComponent"])("AnonymizeLogData"),p=Object(r["resolveComponent"])("PreviousAnonymizations"),O=Object(r["resolveDirective"])("content-intro");return Object(r["openBlock"])(),Object(r["createElementBlock"])("div",null,[Object(r["withDirectives"])(Object(r["createElementVNode"])("div",null,[Object(r["createElementVNode"])("h2",null,[Object(r["createVNode"])(l,{"help-url":"https://matomo.org/docs/privacy/"},{default:Object(r["withCtx"])((function(){return[Object(r["createTextVNode"])(Object(r["toDisplayString"])(e.translate("PrivacyManager_AnonymizeData")),1)]})),_:1})]),Object(r["createElementVNode"])("p",null,[Object(r["createElementVNode"])("span",{innerHTML:e.$sanitize(e.teaserHeader),style:{"margin-right":"3.5px"}},null,8,za),Object(r["createElementVNode"])("span",{innerHTML:e.$sanitize(e.seeAlsoOurOfficialGuide)},null,8,Ta)])],512),[[O]]),Object(r["createVNode"])(s,{id:"anonymizeIPAnchor","content-title":e.translate("PrivacyManager_UseAnonymizeTrackingData")},{default:Object(r["withCtx"])((function(){return[Object(r["createVNode"])(c,{"anonymize-ip-enabled":e.anonymizeIpEnabled,"anonymize-user-id":e.anonymizeUserId,"mask-length":e.maskLength,"use-anonymized-ip-for-visit-enrichment":e.useAnonymizedIpForVisitEnrichment,"anonymize-order-id":e.anonymizeOrderId,"force-cookieless-tracking":e.forceCookielessTracking,"anonymize-referrer":e.anonymizeReferrer,"mask-length-options":e.maskLengthOptions,"use-anonymized-ip-for-visit-enrichment-options":e.useAnonymizedIpForVisitEnrichmentOptions,"tracker-file-name":e.trackerFileName,"tracker-writable":e.trackerWritable,"referrer-anonymization-options":e.referrerAnonymizationOptions},null,8,["anonymize-ip-enabled","anonymize-user-id","mask-length","use-anonymized-ip-for-visit-enrichment","anonymize-order-id","force-cookieless-tracking","anonymize-referrer","mask-length-options","use-anonymized-ip-for-visit-enrichment-options","tracker-file-name","tracker-writable","referrer-anonymization-options"])]})),_:1},8,["content-title"]),e.isDataPurgeSettingsEnabled?(Object(r["openBlock"])(),Object(r["createElementBlock"])("div",Aa,[Object(r["createVNode"])(s,{id:"deleteLogsAnchor","content-title":e.translate("PrivacyManager_DeleteOldRawData")},{default:Object(r["withCtx"])((function(){return[Object(r["createElementVNode"])("p",null,Object(r["toDisplayString"])(e.translate("PrivacyManager_DeleteDataDescription")),1),Object(r["createVNode"])(d,{"is-data-purge-settings-enabled":e.isDataPurgeSettingsEnabled,"delete-data":e.deleteData,"schedule-deletion-options":e.scheduleDeletionOptions},null,8,["is-data-purge-settings-enabled","delete-data","schedule-deletion-options"])]})),_:1},8,["content-title"]),Object(r["createVNode"])(s,{id:"deleteReportsAnchor","content-title":e.translate("PrivacyManager_DeleteOldAggregatedReports")},{default:Object(r["withCtx"])((function(){return[Object(r["createVNode"])(u,{"is-data-purge-settings-enabled":e.isDataPurgeSettingsEnabled,"delete-data":e.deleteData,"schedule-deletion-options":e.scheduleDeletionOptions},null,8,["is-data-purge-settings-enabled","delete-data","schedule-deletion-options"])]})),_:1},8,["content-title"]),Object(r["createVNode"])(m,{"is-data-purge-settings-enabled":e.isDataPurgeSettingsEnabled,"delete-data":e.deleteData,"schedule-deletion-options":e.scheduleDeletionOptions},null,8,["is-data-purge-settings-enabled","delete-data","schedule-deletion-options"])])):Object(r["createCommentVNode"])("",!0),Ia,Object(r["createVNode"])(s,{"content-title":"Anonymize previously tracked raw data",class:"logDataAnonymizer"},{default:Object(r["withCtx"])((function(){return[Ba,e.isSuperUser?(Object(r["openBlock"])(),Object(r["createBlock"])(b,{key:0})):(Object(r["openBlock"])(),Object(r["createElementBlock"])("p",La,"Only a user with Super User access can anonymize previously tracked raw data.")),Fa,Object(r["createVNode"])(p,{anonymizations:e.anonymizations},null,8,["anonymizations"])]})),_:1})])}var Ra=Object(r["defineComponent"])({props:{anonymizeIpEnabled:Boolean,anonymizeUserId:Boolean,maskLength:{type:Number,required:!0},useAnonymizedIpForVisitEnrichment:[Boolean,String,Number],anonymizeOrderId:Boolean,forceCookielessTracking:Boolean,anonymizeReferrer:String,maskLengthOptions:{type:Array,required:!0},useAnonymizedIpForVisitEnrichmentOptions:{type:Array,required:!0},trackerFileName:{type:String,required:!0},trackerWritable:{type:Boolean,required:!0},referrerAnonymizationOptions:{type:Object,required:!0},isDataPurgeSettingsEnabled:Boolean,deleteData:{type:Object,required:!0},scheduleDeletionOptions:{type:Object,required:!0},anonymizations:{type:Array,required:!0},isSuperUser:Boolean},components:{AnonymizeIp:pe,EnrichedHeadline:X["EnrichedHeadline"],ContentBlock:X["ContentBlock"],DeleteOldLogs:Kt,DeleteOldReports:cn,ScheduleReportDeletion:kn,AnonymizeLogData:St,PreviousAnonymizations:Ma},directives:{ContentIntro:X["ContentIntro"]},computed:{teaserHeader:function(){return Object(X["translate"])("PrivacyManager_TeaserHeader",'<a href="#anonymizeIPAnchor">',"</a>",'<a href="#deleteLogsAnchor">',"</a>",'<a href="#anonymizeHistoricalData">',"</a>")},seeAlsoOurOfficialGuide:function(){return Object(X["translate"])("PrivacyManager_SeeAlsoOurOfficialGuidePrivacy",'<a href="https://matomo.org/docs/privacy/" rel="noreferrer noopener" target="_blank">',"</a>")}}});Ra.render=xa;var Ua=Ra,Ha={key:0},Ga=Object(r["createElementVNode"])("br",null,null,-1),qa={key:1};function $a(e,t,n,a,o,i){var l=Object(r["resolveComponent"])("OptOutCustomizer"),c=Object(r["resolveComponent"])("ContentBlock"),s=Object(r["resolveComponent"])("DoNotTrackPreference");return Object(r["openBlock"])(),Object(r["createElementBlock"])("div",null,[Object(r["createVNode"])(c,{"content-title":e.translate("PrivacyManager_TrackingOptOut")},{default:Object(r["withCtx"])((function(){return[Object(r["createVNode"])(l,{"matomo-url":e.matomoUrl,language:e.language,"language-options":e.languageOptions},null,8,["matomo-url","language","language-options"])]})),_:1},8,["content-title"]),e.isSuperUser?(Object(r["openBlock"])(),Object(r["createBlock"])(c,{key:0,id:"DNT","content-title":e.translate("PrivacyManager_DoNotTrack_SupportDNTPreference")},{default:Object(r["withCtx"])((function(){return[Object(r["createElementVNode"])("p",null,[e.dntSupport?(Object(r["openBlock"])(),Object(r["createElementBlock"])("span",Ha,[Object(r["createElementVNode"])("strong",null,Object(r["toDisplayString"])(e.translate("PrivacyManager_DoNotTrack_Enabled")),1),Ga,Object(r["createTextVNode"])(" "+Object(r["toDisplayString"])(e.translate("PrivacyManager_DoNotTrack_EnabledMoreInfo")),1)])):(Object(r["openBlock"])(),Object(r["createElementBlock"])("span",qa,Object(r["toDisplayString"])(e.translate("PrivacyManager_DoNotTrack_Disabled"))+" "+Object(r["toDisplayString"])(e.translate("PrivacyManager_DoNotTrack_DisabledMoreInfo")),1))]),Object(r["createVNode"])(s,{"dnt-support":e.dntSupport,"do-not-track-options":e.doNotTrackOptions},null,8,["dnt-support","do-not-track-options"])]})),_:1},8,["content-title"])):Object(r["createCommentVNode"])("",!0)])}var Ka=Object(r["defineComponent"])({props:{language:{type:String,required:!0},matomoUrl:String,isSuperUser:Boolean,dntSupport:Boolean,doNotTrackOptions:{type:Array,required:!0},languageOptions:{type:Object,required:!0}},components:{ContentBlock:X["ContentBlock"],DoNotTrackPreference:_t,OptOutCustomizer:Ue}});Ka.render=$a;var Wa=Ka; /*! * Matomo - free/libre analytics platform * diff --git a/plugins/PrivacyManager/vue/dist/umd.metadata.json b/plugins/PrivacyManager/vue/dist/umd.metadata.json index 3abfd129f0..66244dc900 100644 --- a/plugins/PrivacyManager/vue/dist/umd.metadata.json +++ b/plugins/PrivacyManager/vue/dist/umd.metadata.json @@ -1,7 +1,7 @@ { "dependsOn": [ "CoreHome", - "CorePluginsAdmin", - "SegmentEditor" + "SegmentEditor", + "CorePluginsAdmin" ] }
\ No newline at end of file diff --git a/plugins/PrivacyManager/vue/src/DeleteOldLogs/DeleteOldLogs.vue b/plugins/PrivacyManager/vue/src/DeleteOldLogs/DeleteOldLogs.vue index 0f9ebbbc18..a5c9ca74a4 100644 --- a/plugins/PrivacyManager/vue/src/DeleteOldLogs/DeleteOldLogs.vue +++ b/plugins/PrivacyManager/vue/src/DeleteOldLogs/DeleteOldLogs.vue @@ -114,7 +114,7 @@ export default defineComponent({ data(): DeleteOldLogsState { return { isLoading: false, - enabled: this.deleteData.config.delete_logs_enable === '1', + enabled: parseInt(this.deleteData.config.delete_logs_enable, 10) === 1, deleteOlderThan: this.deleteData.config.delete_logs_older_than, showPasswordConfirmModal: false, }; diff --git a/plugins/Provider b/plugins/Provider -Subproject 6514e4a7aff9541fd4693b31e9e2f91710c908b +Subproject d197aa559c68a4d2f80ddab2337af6fbb584e00 diff --git a/plugins/QueuedTracking b/plugins/QueuedTracking -Subproject 0b4c442c25f0cf7bdde2cdd2aec6993e58cc8c4 +Subproject 797e83d8be4acb6f16bfa5acf57312d76ec4bda diff --git a/plugins/Referrers/Reports/Get.php b/plugins/Referrers/Reports/Get.php index 0078102a21..52a5106481 100644 --- a/plugins/Referrers/Reports/Get.php +++ b/plugins/Referrers/Reports/Get.php @@ -90,7 +90,7 @@ class Get extends Base return; } - $pastValue = $previousDataRow->getColumn($columnName); + $pastValue = $previousDataRow ? $previousDataRow->getColumn($columnName) : 0; $currentValueFormatted = NumberFormatter::getInstance()->format($value); $pastValueFormatted = NumberFormatter::getInstance()->format($pastValue); diff --git a/plugins/Referrers/tests/System/expected/test_Referrers_getReferrerType__API.getProcessedReport_day.xml b/plugins/Referrers/tests/System/expected/test_Referrers_getReferrerType__API.getProcessedReport_day.xml index 6671bf1bce..e3e4ca835a 100644 --- a/plugins/Referrers/tests/System/expected/test_Referrers_getReferrerType__API.getProcessedReport_day.xml +++ b/plugins/Referrers/tests/System/expected/test_Referrers_getReferrerType__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <website>Piwik test</website> - <prettyDate>January 1 – March 10, 2010</prettyDate> + <prettyDate>January 1 – March 10, 2010</prettyDate> <metadata> <category>Referrers</category> <subcategory>All Channels</subcategory> diff --git a/plugins/SecurityInfo b/plugins/SecurityInfo -Subproject 6d35b2581fb3ae3c087227e9683efc3be39dffb +Subproject c9e8d6ea44832fe4c9f78dc8be7608a853a10e0 diff --git a/plugins/TagManager b/plugins/TagManager -Subproject 485dc7c15f761d44e4ae35127502f4ea5791b3f +Subproject 331e53bca611b4dd55145fd9e6f423c8f3d8ede diff --git a/plugins/TrackingSpamPrevention b/plugins/TrackingSpamPrevention -Subproject b8b9077b5bd020001852a9af6501efdf11a1bd8 +Subproject 2dea2021e23ee4ca5cb14b9b13b35cf270bb537 diff --git a/plugins/TreemapVisualization b/plugins/TreemapVisualization -Subproject 089cb8729e82201f2b47dccda9e1a3eef266e4c +Subproject f12daf64e0ffd8b7e94a62d4c0de7cb76e9d6bc diff --git a/plugins/VisitorGenerator b/plugins/VisitorGenerator -Subproject 7144e2fb213649d1bddbbdadb66df16474685ba +Subproject f6be6585d615d43e4a6b67984c607206a4301f3 diff --git a/plugins/VisitsSummary/Reports/Get.php b/plugins/VisitsSummary/Reports/Get.php index 7b482cac12..f9eded77b3 100644 --- a/plugins/VisitsSummary/Reports/Get.php +++ b/plugins/VisitsSummary/Reports/Get.php @@ -132,7 +132,7 @@ class Get extends \Piwik\Plugin\Report $view->config->compute_evolution = function ($columns, $metrics) use ($currentPrettyDate, $lastPrettyDate, $previousDataRow) { $value = reset($columns); $columnName = key($columns); - $pastValue = $previousDataRow->getColumn($columnName); + $pastValue = $previousDataRow ? $previousDataRow->getColumn($columnName) : 0; // Format $formatter = new MetricFormatter(); |