From c083f09df972a214e1cf27ee2e392007d78cb45d Mon Sep 17 00:00:00 2001 From: SimplestStudio Date: Wed, 18 May 2022 15:38:15 +0300 Subject: [PATCH 01/23] Fixed bug with --system-title-bar argument --- win-linux/res/styles/{tabbar.qss => tabbar@1x.qss} | 0 win-linux/resources.qrc | 2 +- win-linux/src/cmainpanel.cpp | 13 +------------ 3 files changed, 2 insertions(+), 13 deletions(-) rename win-linux/res/styles/{tabbar.qss => tabbar@1x.qss} (100%) diff --git a/win-linux/res/styles/tabbar.qss b/win-linux/res/styles/tabbar@1x.qss similarity index 100% rename from win-linux/res/styles/tabbar.qss rename to win-linux/res/styles/tabbar@1x.qss diff --git a/win-linux/resources.qrc b/win-linux/resources.qrc index 9a9b5f91e..4f2c833ad 100644 --- a/win-linux/resources.qrc +++ b/win-linux/resources.qrc @@ -208,7 +208,7 @@ langs/qtbase_ru.qm - res/styles/tabbar.qss + res/styles/tabbar@1x.qss res/styles/tabbar_nix.qss res/styles/tabbar@1.25x.qss res/styles/tabbar@1.5x.qss diff --git a/win-linux/src/cmainpanel.cpp b/win-linux/src/cmainpanel.cpp index 992862046..61543b199 100644 --- a/win-linux/src/cmainpanel.cpp +++ b/win-linux/src/cmainpanel.cpp @@ -1232,18 +1232,7 @@ void CMainPanel::updateScaling(double dpiratio) //m_pButtonMain->setGeometry(0, 0, int(BUTTON_MAIN_WIDTH * dpiratio), int(TITLE_HEIGHT * dpiratio)); m_pButtonMain->setFixedSize(int(BUTTON_MAIN_WIDTH * dpiratio), int(TITLE_HEIGHT * dpiratio)); - QString _tabs_stylesheets = dpiratio > 1.75 ? ":/sep-styles/tabbar@2x" : - dpiratio > 1.5 ? ":/sep-styles/tabbar@1.75x" : - dpiratio > 1.25 ? ":/sep-styles/tabbar@1.5x" : - dpiratio > 1 ? ":/sep-styles/tabbar@1.25x" : ":/sep-styles/tabbar"; - if ( m_isCustomWindow ) { - _tabs_stylesheets += ".qss"; - } else { -#ifdef __linux__ - _tabs_stylesheets += ".nix.qss"; -#endif - } - + const QString _tabs_stylesheets = ":/sep-styles/tabbar@" + QString::number(dpiratio) + "x.qss"; QFile styleFile(_tabs_stylesheets); styleFile.open( QFile::ReadOnly ); const QString _style = QString(styleFile.readAll()); From fb0dc60a962f5f5835888972fd00cc068636331e Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Sat, 4 Jun 2022 00:43:40 +0300 Subject: [PATCH 02/23] [start page] refresh dependencies --- common/loginpage/build/package-lock.json | 206 ++++++++++++++--------- common/loginpage/build/package.json | 6 +- 2 files changed, 132 insertions(+), 80 deletions(-) diff --git a/common/loginpage/build/package-lock.json b/common/loginpage/build/package-lock.json index 709f5740f..edc717fb3 100644 --- a/common/loginpage/build/package-lock.json +++ b/common/loginpage/build/package-lock.json @@ -8,8 +8,8 @@ "name": "common", "version": "0.2.8", "dependencies": { - "grunt": "^1.5.2", - "grunt-contrib-clean": "^2.0.0", + "grunt": "^1.5.3", + "grunt-contrib-clean": "^2.0.1", "grunt-contrib-concat": "^2.1.0", "grunt-contrib-copy": "^1.0.0", "grunt-contrib-htmlmin": "^3.1.0", @@ -18,7 +18,59 @@ "grunt-terser": "^2.0.0", "grunt-text-replace": "0.4.0", "lodash": "^4.17.20", - "terser": "^5.12.1" + "terser": "^5.14.0" + } + }, + "node_modules/@jridgewell/gen-mapping": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz", + "integrity": "sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg==", + "dependencies": { + "@jridgewell/set-array": "^1.0.0", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz", + "integrity": "sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/set-array": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.1.tgz", + "integrity": "sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ==", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/source-map": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", + "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.0", + "@jridgewell/trace-mapping": "^0.3.9" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.4.13", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz", + "integrity": "sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==" + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.13", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz", + "integrity": "sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==", + "dependencies": { + "@jridgewell/resolve-uri": "^3.0.3", + "@jridgewell/sourcemap-codec": "^1.4.10" } }, "node_modules/abbrev": { @@ -92,12 +144,9 @@ } }, "node_modules/async": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", - "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", - "dependencies": { - "lodash": "^4.17.14" - } + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz", + "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==" }, "node_modules/balanced-match": { "version": "1.0.2", @@ -156,7 +205,7 @@ "node_modules/clean-css": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-1.1.7.tgz", - "integrity": "sha1-YB75z3ZCuYLLM+/JSIpkRMmGaG4=", + "integrity": "sha512-eIhTPpuWxQpiKPvZdF92jx0/6l4awOtf4zCawFE8f4Gboka/eXBofEFkXf1KtbLj5wjjHWDg6gtHQB538qEt9w==", "dependencies": { "commander": "2.0.x" }, @@ -484,9 +533,9 @@ "optional": true }, "node_modules/grunt": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.5.2.tgz", - "integrity": "sha512-XCtfaIu72OyDqK24MjWiGC9SwlkuhkS1mrULr1xzuJ2XqAFhP3ZAchZGHJeSCY6mkaOXU4F7SbmmCF7xIVoC9w==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.5.3.tgz", + "integrity": "sha512-mKwmo4X2d8/4c/BmcOETHek675uOqw0RuA/zy12jaspWqvTp4+ZeQF1W+OTpcbncnaBsfbQJ6l0l4j+Sn/GmaQ==", "dependencies": { "dateformat": "~3.0.3", "eventemitter2": "~0.4.13", @@ -542,15 +591,15 @@ } }, "node_modules/grunt-contrib-clean": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/grunt-contrib-clean/-/grunt-contrib-clean-2.0.0.tgz", - "integrity": "sha512-g5ZD3ORk6gMa5ugZosLDQl3dZO7cI3R14U75hTM+dVLVxdMNJCPVmwf9OUt4v4eWgpKKWWoVK9DZc1amJp4nQw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/grunt-contrib-clean/-/grunt-contrib-clean-2.0.1.tgz", + "integrity": "sha512-uRvnXfhiZt8akb/ZRDHJpQQtkkVkqc/opWO4Po/9ehC2hPxgptB9S6JHDC/Nxswo4CJSM0iFPT/Iym3cEMWzKA==", "dependencies": { - "async": "^2.6.1", + "async": "^3.2.3", "rimraf": "^2.6.2" }, "engines": { - "node": ">=6" + "node": ">=12" }, "peerDependencies": { "grunt": ">=0.4.5" @@ -708,11 +757,6 @@ "node": ">=10" } }, - "node_modules/grunt-contrib-less/node_modules/async": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz", - "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==" - }, "node_modules/grunt-inline": { "version": "0.3.7", "resolved": "https://registry.npmjs.org/grunt-inline/-/grunt-inline-0.3.7.tgz", @@ -777,11 +821,6 @@ "node": ">=10" } }, - "node_modules/grunt-legacy-util/node_modules/async": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz", - "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==" - }, "node_modules/grunt-terser": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/grunt-terser/-/grunt-terser-2.0.0.tgz", @@ -1634,13 +1673,13 @@ "integrity": "sha1-RwbfYlvGrs2Gt8n2sPtUi5XN92k=" }, "node_modules/terser": { - "version": "5.12.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.12.1.tgz", - "integrity": "sha512-NXbs+7nisos5E+yXwAD+y7zrcTkMqb0dEJxIGtSKPdCBzopf7ni4odPul2aechpV7EXNvOudYOX2bb5tln1jbQ==", + "version": "5.14.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.0.tgz", + "integrity": "sha512-JC6qfIEkPBd9j1SMO3Pfn+A6w2kQV54tv+ABQLgZr7dA3k/DL/OBoYSWxzVpZev3J+bUHXfr55L8Mox7AaNo6g==", "dependencies": { + "@jridgewell/source-map": "^0.3.2", "acorn": "^8.5.0", "commander": "^2.20.0", - "source-map": "~0.7.2", "source-map-support": "~0.5.20" }, "bin": { @@ -1655,14 +1694,6 @@ "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" }, - "node_modules/terser/node_modules/source-map": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", - "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", - "engines": { - "node": ">= 8" - } - }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -1792,6 +1823,49 @@ } }, "dependencies": { + "@jridgewell/gen-mapping": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz", + "integrity": "sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg==", + "requires": { + "@jridgewell/set-array": "^1.0.0", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" + } + }, + "@jridgewell/resolve-uri": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz", + "integrity": "sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==" + }, + "@jridgewell/set-array": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.1.tgz", + "integrity": "sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ==" + }, + "@jridgewell/source-map": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", + "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", + "requires": { + "@jridgewell/gen-mapping": "^0.3.0", + "@jridgewell/trace-mapping": "^0.3.9" + } + }, + "@jridgewell/sourcemap-codec": { + "version": "1.4.13", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz", + "integrity": "sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==" + }, + "@jridgewell/trace-mapping": { + "version": "0.3.13", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz", + "integrity": "sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==", + "requires": { + "@jridgewell/resolve-uri": "^3.0.3", + "@jridgewell/sourcemap-codec": "^1.4.10" + } + }, "abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", @@ -1839,12 +1913,9 @@ "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==" }, "async": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", - "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", - "requires": { - "lodash": "^4.17.14" - } + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz", + "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==" }, "balanced-match": { "version": "1.0.2", @@ -1894,7 +1965,7 @@ "clean-css": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-1.1.7.tgz", - "integrity": "sha1-YB75z3ZCuYLLM+/JSIpkRMmGaG4=", + "integrity": "sha512-eIhTPpuWxQpiKPvZdF92jx0/6l4awOtf4zCawFE8f4Gboka/eXBofEFkXf1KtbLj5wjjHWDg6gtHQB538qEt9w==", "requires": { "commander": "2.0.x" } @@ -2137,9 +2208,9 @@ "optional": true }, "grunt": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.5.2.tgz", - "integrity": "sha512-XCtfaIu72OyDqK24MjWiGC9SwlkuhkS1mrULr1xzuJ2XqAFhP3ZAchZGHJeSCY6mkaOXU4F7SbmmCF7xIVoC9w==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.5.3.tgz", + "integrity": "sha512-mKwmo4X2d8/4c/BmcOETHek675uOqw0RuA/zy12jaspWqvTp4+ZeQF1W+OTpcbncnaBsfbQJ6l0l4j+Sn/GmaQ==", "requires": { "dateformat": "~3.0.3", "eventemitter2": "~0.4.13", @@ -2182,11 +2253,11 @@ } }, "grunt-contrib-clean": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/grunt-contrib-clean/-/grunt-contrib-clean-2.0.0.tgz", - "integrity": "sha512-g5ZD3ORk6gMa5ugZosLDQl3dZO7cI3R14U75hTM+dVLVxdMNJCPVmwf9OUt4v4eWgpKKWWoVK9DZc1amJp4nQw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/grunt-contrib-clean/-/grunt-contrib-clean-2.0.1.tgz", + "integrity": "sha512-uRvnXfhiZt8akb/ZRDHJpQQtkkVkqc/opWO4Po/9ehC2hPxgptB9S6JHDC/Nxswo4CJSM0iFPT/Iym3cEMWzKA==", "requires": { - "async": "^2.6.1", + "async": "^3.2.3", "rimraf": "^2.6.2" }, "dependencies": { @@ -2307,13 +2378,6 @@ "chalk": "^4.1.0", "less": "^4.1.1", "lodash": "^4.17.21" - }, - "dependencies": { - "async": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz", - "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==" - } } }, "grunt-inline": { @@ -2363,13 +2427,6 @@ "lodash": "~4.17.21", "underscore.string": "~3.3.5", "which": "~2.0.2" - }, - "dependencies": { - "async": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz", - "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==" - } } }, "grunt-terser": { @@ -2992,13 +3049,13 @@ "integrity": "sha1-RwbfYlvGrs2Gt8n2sPtUi5XN92k=" }, "terser": { - "version": "5.12.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.12.1.tgz", - "integrity": "sha512-NXbs+7nisos5E+yXwAD+y7zrcTkMqb0dEJxIGtSKPdCBzopf7ni4odPul2aechpV7EXNvOudYOX2bb5tln1jbQ==", + "version": "5.14.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.0.tgz", + "integrity": "sha512-JC6qfIEkPBd9j1SMO3Pfn+A6w2kQV54tv+ABQLgZr7dA3k/DL/OBoYSWxzVpZev3J+bUHXfr55L8Mox7AaNo6g==", "requires": { + "@jridgewell/source-map": "^0.3.2", "acorn": "^8.5.0", "commander": "^2.20.0", - "source-map": "~0.7.2", "source-map-support": "~0.5.20" }, "dependencies": { @@ -3006,11 +3063,6 @@ "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" - }, - "source-map": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", - "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==" } } }, diff --git a/common/loginpage/build/package.json b/common/loginpage/build/package.json index 430eeeb4f..37f41f6a0 100644 --- a/common/loginpage/build/package.json +++ b/common/loginpage/build/package.json @@ -5,15 +5,15 @@ "private": true, "dependencies": { "lodash": "^4.17.20", - "grunt": "^1.5.2", "grunt-text-replace": "0.4.0", "grunt-contrib-less": "^3.0.0", - "grunt-contrib-clean": "^2.0.0", "grunt-contrib-copy": "^1.0.0", + "grunt": "^1.5.3", + "grunt-contrib-clean": "^2.0.1", "grunt-contrib-concat": "^2.1.0", "grunt-contrib-htmlmin": "^3.1.0", "grunt-inline": "0.3.7", "grunt-terser": "^2.0.0", - "terser": "^5.12.1" + "terser": "^5.14.0" } } From 784ef413efb420215b16dad2f314c000e5d2217f Mon Sep 17 00:00:00 2001 From: Maria-Sukhova Date: Mon, 6 Jun 2022 14:30:40 +0300 Subject: [PATCH 03/23] edit translations --- macos/Localization/bg.xliff | 4 ++-- macos/Localization/da.xliff | 4 ++-- macos/Localization/el.xliff | 4 ++-- macos/Localization/fi.xliff | 6 +++--- macos/Localization/ga.xliff | 2 +- macos/Localization/gl.xliff | 4 ++-- macos/Localization/hr.xliff | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/macos/Localization/bg.xliff b/macos/Localization/bg.xliff index 0f610bd6d..a719eb9ed 100644 --- a/macos/Localization/bg.xliff +++ b/macos/Localization/bg.xliff @@ -247,11 +247,11 @@ No comment provided by engineer. PDF FilePDF File - Дигитален документ (*.pdf) + Преносим документ (*.pdf) No comment provided by engineer. - PDF/A FilePDF/A FilePDF/A файлДигитален документ / A (*.pdf) + PDF/A FilePDF/A FilePDF/A файлПреносим документ / A (*.pdf) No comment provided by engineer. diff --git a/macos/Localization/da.xliff b/macos/Localization/da.xliff index 71790cfaf..a39a70e86 100644 --- a/macos/Localization/da.xliff +++ b/macos/Localization/da.xliff @@ -159,7 +159,7 @@ Excel 2007 Spreadsheet - Office Open XML-regneark (*.docx) + Office Open XML-regneark (*.xlsx) No comment provided by engineer. @@ -239,7 +239,7 @@ OpenOffice Document - OpenDocument Tekstfil (*.odt) + OpenDocument Tekstfil (*.odt) No comment provided by engineer. diff --git a/macos/Localization/el.xliff b/macos/Localization/el.xliff index 73da7bd29..595ee578c 100644 --- a/macos/Localization/el.xliff +++ b/macos/Localization/el.xliff @@ -159,7 +159,7 @@ Excel 2007 Spreadsheet - Υπολογιστικό φύλλο Office με ανοιχτή μορφή XML (*.xlsx) + Υπολογιστικό φύλλο Office με ανοιχτή μορφή XML (*.xlsx) No comment provided by engineer. @@ -269,7 +269,7 @@ Plain Text - Απλό κείμενο (*.txt) + Αρχείο απλού κειμένου (*.txt) No comment provided by engineer. diff --git a/macos/Localization/fi.xliff b/macos/Localization/fi.xliff index 923dd9bcb..d73d27b7b 100644 --- a/macos/Localization/fi.xliff +++ b/macos/Localization/fi.xliff @@ -149,7 +149,7 @@ Document template - Word Open XML asiakirjamalli (*.dotx) + Word Open XML-asiakirjamalli (*.dotx) No comment provided by engineer. @@ -299,7 +299,7 @@ Presentation template - PowerPoint Open XML esityksen malli (*.potx) + PowerPoint Open XML-esityksenmalli (*.potx) No comment provided by engineer. @@ -334,7 +334,7 @@ Spreadsheet template - Excel Open XML laskentataulukkomalli (*.xltx) + Excel Open XML-laskentataulukkomalli (*.xltx) No comment provided by engineer. diff --git a/macos/Localization/ga.xliff b/macos/Localization/ga.xliff index 12dca29c3..3eee943e4 100644 --- a/macos/Localization/ga.xliff +++ b/macos/Localization/ga.xliff @@ -234,7 +234,7 @@ OpenDocument Spreadsheet Template - Teimpléad scarbhileog OpenDocument *.(ots) + Teimpléad scarbhileog OpenDocument (*.ots) No comment provided by engineer. diff --git a/macos/Localization/gl.xliff b/macos/Localization/gl.xliff index 6de2e78cc..dbc4f9462 100644 --- a/macos/Localization/gl.xliff +++ b/macos/Localization/gl.xliff @@ -259,7 +259,7 @@ OpenOffice Presentation - Presentación de OpenDocument (*.odp) + Presentación de OpenDocument (*.odp) No comment provided by engineer. @@ -279,7 +279,7 @@ PDF/A File - Documento portátil / A (*.pdf) + Documento portátil / A (*.pdf) No comment provided by engineer. diff --git a/macos/Localization/hr.xliff b/macos/Localization/hr.xliff index 2a9c49192..dda123ced 100644 --- a/macos/Localization/hr.xliff +++ b/macos/Localization/hr.xliff @@ -154,7 +154,7 @@ Excel 97-2003 Spreadsheet - Excel 97-2003 Proračunska tablica (*.xls) + Excel 97-2003 Proračunska tablica (*.xls) No comment provided by engineer. From 6a20b5cf48a779fd8872ca488de0d260875f0b2f Mon Sep 17 00:00:00 2001 From: Maria-Sukhova Date: Mon, 6 Jun 2022 14:33:09 +0300 Subject: [PATCH 04/23] edit formats descriptions --- win-linux/langs/bg.ts | 66 ++++++++++++++++++------------------ win-linux/langs/ca.ts | 56 +++++++++++++++---------------- win-linux/langs/cs.ts | 4 +-- win-linux/langs/da.ts | 50 ++++++++++++++-------------- win-linux/langs/el_GR.ts | 64 +++++++++++++++++------------------ win-linux/langs/et.ts | 54 +++++++++++++++--------------- win-linux/langs/fi.ts | 72 ++++++++++++++++++++-------------------- win-linux/langs/ga.ts | 46 ++++++++++++------------- win-linux/langs/gl.ts | 56 +++++++++++++++---------------- win-linux/langs/hi.ts | 40 +++++++++++----------- win-linux/langs/hr.ts | 54 +++++++++++++++--------------- 11 files changed, 281 insertions(+), 281 deletions(-) diff --git a/win-linux/langs/bg.ts b/win-linux/langs/bg.ts index 2eb517491..6bd082765 100644 --- a/win-linux/langs/bg.ts +++ b/win-linux/langs/bg.ts @@ -177,22 +177,22 @@ DOCX Document (*.docx) - DOCX Документ (*.docx) + Office Open XML Документ (*.docx) Document template (*.dotx) - Шаблон за документ (*.dotx) + Word Open XML Шаблон за документ (*.dotx) DOC Document (*.doc) - DOC Документ (*.doc) + Word 97-2003 Документ (*.doc) ODT Document (*.odt) - ODT Документ (*.odt) + OpenDocument Текстов файл (*.odt) @@ -202,67 +202,67 @@ RTF File (*.rtf) - RTF Файл (*.rtf) + Документ с богат текст (*.rtf) TXT File (*.txt) - TXT Файл (*.txt) + Обикновен текстов файл (*.txt) HTML File (*.html) - HTML Файл (*.html) + Езиков файл за маркиране на HyperText (*.html) MHT File (*.mht) - MHT Файл (*.mht) + Архивен файл на уеб страница (*.mht) EPUB File (*.epub) - EPUB Файл (*.epub) + Файл с електронна публикация (*.epub) FB2 File (*.fb2) - FB2 Файл (*.fb2) + Файл FictionBook 2 (*.fb2) MOBI File (*.mobi) - MOBI Файл (*.mobi) + Mobipocket Файл (*.mobi) OFORM Document (*.oform) - + ONLYOFFICE Онлайн формуляр за попълване (*.oform) DOCXF Document (*.docxf) - + ONLYOFFICE шаблон на формуляр (*.docxf) PPTX File (*.pptx) - PPTX Файл (*.pptx) + Office Open XML Презентация (*.pptx) PPT File (*.ppt) - PPT Файл (*.ppt) + PowerPoint 97-2003 Презентация (*.ppt) Presentation template (*.potx) - Шаблон за презентация (*.potx) + PowerPoint Open XML Шаблон за презентация (*.potx) ODP File (*.odp) - ODP Файл (*.odp) + OpenDocument Презентация (*.odp) @@ -272,27 +272,27 @@ PPSX File (*.ppsx) - PPSX Файл (*.ppsx) + Office Open XML слайдшоу (*.ppsx) XLSX File (*.xlsx) - XLSX Файл (*.xlsx) + Office Open XML Таблица (*.xlsx) Spreadsheet template (*.xltx) - Шаблон за таблица (*.xltx) + Excel Open XML Шаблон за таблица (*.xltx) XLS File (*.xls) - XLS Файл (*.xls) + Excel 97-2003 Таблица (*.xls) ODS File (*.ods) - ODS Файл (*.ods) + OpenDocument Електронна таблица (*.ods) @@ -302,42 +302,42 @@ CSV File (*.csv) - CSV Файл (*.csv) + Стойности, разделени със запетая (*.csv) PDF File (*.pdf) - PDF Файл (*.pdf) + Преносим документ (*.pdf) PDFA File (*.pdf) - PDFA Файл (*.pdf) + Преносим документ (*.pdf) DJVU File (*.djvu) - DJVU Файл (*.djvu) + Дигитален документ (*.djvu) XPS File (*.xps) - XPS Файл (*.xps) + OpenXPS Документ (*.xps) Zip Archive (*.zip) - + Zip архив (*.zip) JPG Image (*.jpg, *.jpeg) - + JPG изображение (*.jpg *.jpeg) PNG Image (*.png) - + PNG изображение (*.png) @@ -557,17 +557,17 @@ File %1 cannot be opened or doesn't exists. - + Файл %1 не може да се отвори или не съществува. All supported files (*.txt *.csv) - + Всички поддържани файлове (*.txt *.csv) All files (*.*) - Всички файлове (*.*) + Всички файлове (*.*) diff --git a/win-linux/langs/ca.ts b/win-linux/langs/ca.ts index d84cca485..8bfaa42e8 100644 --- a/win-linux/langs/ca.ts +++ b/win-linux/langs/ca.ts @@ -177,22 +177,22 @@ DOCX Document (*.docx) - Document DOCX (*.docx) + Document Office Open XML (*.docx) Document template (*.dotx) - Plantilla de document (*.dotx) + Plantilla de document Word Open XML (*.dotx) DOC Document (*.doc) - Document DOC (*.doc) + Document Word 97-2003 (*.doc) ODT Document (*.odt) - Document ODT (*.odt) + Fitxer de text OpenDocument (*.odt) @@ -202,67 +202,67 @@ RTF File (*.rtf) - Arxiu RTF (*.rtf) + Document de text enriquit (*.rtf) TXT File (*.txt) - Arxiu TXT (*.txt) + Text pla (*.txt) HTML File (*.html) - Arxiu HTML (*.html) + Fitxer HTML (*.html) MHT File (*.mht) - Arxiu MHT (*.mht) + Fitxer MHT (*.mht) EPUB File (*.epub) - Arxiu EPUB (*.epub) + Publicació electronica (*.epub) FB2 File (*.fb2) - Arxiu FB2 (* + Fitxer FictionBook (*.fb2) MOBI File (*.mobi) - Arxiu MOBI (*.mobi) + Llibre electrònic de butxaca (*.mobi) OFORM Document (*.oform) - + Formulari d’emplenament en línia d’ONLYOFFICE (*.oform) DOCXF Document (*.docxf) - + Plantilla de formulari ONLYOFFICE (*.docxf) PPTX File (*.pptx) - Arxiu PPTX (*.pptx) + Presentació Office Open XML (*.pptx) PPT File (*.ppt) - Arxiu PPT (*.ppt) + Presentació de diapositives PowerPoint 97-2003 (*.ppt) Presentation template (*.potx) - Plantilla de presentació (*.potx) + Plantilla de presentació PowerPoint Open XML (*.potx) ODP File (*.odp) - Arxiu ODP (*.odp) + Presentació OpenDocument (*.odp) @@ -272,27 +272,27 @@ PPSX File (*.ppsx) - Arxiu PPSX (*.ppsx) + Presentació de diapositives Office Open XML (*.ppsx) XLSX File (*.xlsx) - Arxiu XLSX (*.xlsx) + Full de càlcul Office Open XML (*.xlsx) Spreadsheet template (*.xltx) - Plantilla de full de càlcul (*.xltx) + Plantilla de full de càlcul Excel Open XML (*.xltx) XLS File (*.xls) - Arxiu XLS (*.xls) + Full de càlcul Excel 97-2003 (*.xls) ODS File (*.ods) - Arxiu ODS (*.ods) + Full de càlcul OpenDocument (*.ods) @@ -302,27 +302,27 @@ CSV File (*.csv) - Arxiu CSV (*.csv) + Valors separats per comes (*.csv) PDF File (*.pdf) - Arxiu PDF (*.pdf) + Document portàtil (*.pdf) PDFA File (*.pdf) - Arxiu PDFA (*.pdf) + Document portàtil / A (*.pdf) DJVU File (*.djvu) - Arxiu DJVU (*.djvu) + Document digital (*.djvu) XPS File (*.xps) - Arxiu XPS (*.xps) + Document OpenXPS (*.xps) @@ -571,7 +571,7 @@ All files (*.*) - Tots els arxius (*.*) + Tots els arxius (*.*) diff --git a/win-linux/langs/cs.ts b/win-linux/langs/cs.ts index 9b8c64fe9..1c4c7d02c 100644 --- a/win-linux/langs/cs.ts +++ b/win-linux/langs/cs.ts @@ -561,12 +561,12 @@ File %1 cannot be opened or doesn't exists. - + Soubor %1 nelze otevřít nebo neexistuje. All supported files (*.txt *.csv) - + Všechny podporované soubory (*.txt *.csv) diff --git a/win-linux/langs/da.ts b/win-linux/langs/da.ts index eb6d4e3b5..80f5f2f77 100644 --- a/win-linux/langs/da.ts +++ b/win-linux/langs/da.ts @@ -177,37 +177,37 @@ DOCX Document (*.docx) - DOCX Dokument (*.docx) + Office Open XML-dokument (*.docx) Document template (*.dotx) - Dokumentskabelon (*.dotx) + Word Open XML Dokumentskabelon (*.dotx) DOC Document (*.doc) - DOK Dokument (*.doc) + Word 97-2003-dokument (*.doc) ODT Document (*.odt) - ODT Dokument (*.odt) + OpenDocument Tekstfil (*.odt) OpenDocument Document template (*.ott) - ÅbenDokument Dokumentskabelon (*.ott) + OpenDocument Dokumentskabelon (*.ott) RTF File (*.rtf) - RTF Fil (*.rtf) + Rich Text Format-fil (*.rtf) TXT File (*.txt) - TXT Fil (*.txt) + Almindelig tekst (*.txt) @@ -232,77 +232,77 @@ MOBI File (*.mobi) - MOBI Fil (*.mobi) + Mobipocket e-bog (*.mobi) OFORM Document (*.oform) - + ONLYOFFICE udfyldbar onlineformular (*.oform) DOCXF Document (*.docxf) - + ONLYOFFICE formularskabelon (*.docxf) PPTX File (*.pptx) - PPTX Fil (*.pptx) + Office Open XML-præsentation (*.pptx) PPT File (*.ppt) - PPT Fil (*.ppt) + PowerPoint 97-2003-præsentation (*.ppt) Presentation template (*.potx) - Præsentationsskabelon (*.potx) + PowerPoint Open XML Præsentationsskabelon (*.potx) ODP File (*.odp) - ODP Fil (*.odp) + OpenDocument Præsentation (*.odp) OpenDocument Presentation Template (*.otp) - ÅbenDokument Præsentationsskabelon (*.otp) + OpenDocument Præsentationsskabelon (*.otp) PPSX File (*.ppsx) - PPSX Fil (*.ppsx) + Office Open XML-diasshow (*.ppsx) XLSX File (*.xlsx) - XLSX Fil (*.xlsx) + Office Open XML-regneark (*.xlsx) Spreadsheet template (*.xltx) - Regnearkskabelon (*.xltx) + Excel Open XML Regnearksskabelon (*.xltx) XLS File (*.xls) - XLS Fil (*.xls) + Excel 97-2003-regneark (*.xls) ODS File (*.ods) - ODS Fil (*.ods) + OpenDocument Regneark (*.ods) OpenDocument Spreadsheet Template (*.ots) - ÅbenDokument Regnearkskabelon (*.ots) + OpenDocument Regnearksskabelon (*.ots) CSV File (*.csv) - CSV Fil (*.csv) + Kommaseparerede værdier (*.csv) @@ -317,12 +317,12 @@ DJVU File (*.djvu) - DJVU Fil (*.djvu) + Digitalt dokument (*.djvu) XPS File (*.xps) - XPS Fil (*.xps) + OpenXPS-dokument (*.xps) @@ -567,7 +567,7 @@ All files (*.*) - Alle filer (*.*) + Alle filer (*.*) diff --git a/win-linux/langs/el_GR.ts b/win-linux/langs/el_GR.ts index bcae92a37..0b9858771 100644 --- a/win-linux/langs/el_GR.ts +++ b/win-linux/langs/el_GR.ts @@ -177,22 +177,22 @@ DOCX Document (*.docx) - Έγγραφο DOCX (*.docx) + Έγγραφο Office με ανοιχτή μορφή XML (*.docx) Document template (*.dotx) - Πρότυπο εγγράφου (*.dotx) + Πρότυπο εγγράφου Word με ανοιχτή μορφή XML (*.dotx) DOC Document (*.doc) - Έγγραφο DOC (*.doc) + Έγγραφο Word 97-2003 (*.doc) ODT Document (*.odt) - Έγγραφο ODT (*.odt) + Αρχείο κειμένου OpenDocument (*.odt) @@ -202,22 +202,22 @@ RTF File (*.rtf) - Αρχείο RTF (*.rtf) + Αρχείο μορφής εμπλουτισμένου κειμένου (*.rtf) TXT File (*.txt) - Αρχείο TXT (*.txt) + Αρχείο απλού κειμένου (*.txt) HTML File (*.html) - Αρχείο HTML (*.html) + Αρχείο γλώσσας σήμανσης υπερκειμένου (*.html) MHT File (*.mht) - Αρχείο MHT (*.mht) + Αρχείο αρχειοθήκης ιστοσελίδας (*.mht) @@ -227,42 +227,42 @@ FB2 File (*.fb2) - Αρχείο FB2 (*.fb2) + Αρχείο FictionBook 2 (*.fb2) MOBI File (*.mobi) - Αρχείο MOBI (*.mobi) + Ηλεκτρονικό βιβλίο Mobipocket (*.mobi) OFORM Document (*.oform) - + Διαδικτυακή Φόρμα ONLYOFFICE με δυνατότητα συμπλήρωσης (*.oform) DOCXF Document (*.docxf) - + Πρότυπο φόρμας εγγράφου ONLYOFFICE (*.docxf) PPTX File (*.pptx) - Αρχείο PPTX (*.pptx) + Παρουσίαση Office με ανοιχτή μορφή XML (*.pptx) PPT File (*.ppt) - Αρχείο PPT (*.ppt) + Παρουσίαση PowerPoint 97-2003 (*.ppt) Presentation template (*.potx) - Πρότυπο παρουσίασης (*.potx) + Πρότυπο παρουσίασης PowerPoint με ανοιχτή μορφή XML (*.potx) ODP File (*.odp) - Αρχείο ODP (*.odp) + Παρουσίαση OpenDocument (*.odp) @@ -272,27 +272,27 @@ PPSX File (*.ppsx) - Αρχείο PPSX (*.ppsx) + Προβολή παρουσίασης Office με ανοιχτή μορφή XML (*.ppsx) XLSX File (*.xlsx) - Αρχείο XLSX (*.xlsx) + Υπολογιστικό φύλλο Office με ανοιχτή μορφή XML (*.xlsx) Spreadsheet template (*.xltx) - Πρότυπο υπολογιστικού φύλλου (*.xltx) + Πρότυπο υπολογιστικού φύλλου Excel με ανοιχτή μορφή XML (*.xltx) XLS File (*.xls) - Αρχείο XLS (*.xls) + Υπολογιστικό φύλλο Excel 97-2003 (*.xls) ODS File (*.ods) - Αρχείο ODS (*.ods) + Υπολογιστικό φύλλο OpenDocument (*.ods) @@ -302,42 +302,42 @@ CSV File (*.csv) - Αρχείο CSV (*.csv) + Τιμές διαχωρισμένες με κόμμα (*.csv) PDF File (*.pdf) - Αρχείο PDF (*.pdf) + Φορητό έγγραφο (*.pdf) PDFA File (*.pdf) - Αρχείο PDFA (*.pdf) + Φορητό έγγραφο / A (*.pdf) DJVU File (*.djvu) - Αρχείο DJVU (*.djvu) + Ψηφιακό έγγραφο (*.djvu) XPS File (*.xps) - Αρχείο XPS (*.xps) + Έγγραφο OpenXPS (*.xps) Zip Archive (*.zip) - + Αρχείο Zip (*.zip) JPG Image (*.jpg, *.jpeg) - + Εικόνα JPG (*.jpg *.jpeg) PNG Image (*.png) - + Εικόνα PNG (*.png) @@ -561,17 +561,17 @@ File %1 cannot be opened or doesn't exists. - + Το αρχείο %1 δεν μπορεί να ανοιχτεί ή δεν υπάρχει. All supported files (*.txt *.csv) - + Όλα τα υποστηριζόμενα αρχεία (*.txt *.csv) All files (*.*) - Όλα τα αρχεία (*.*) + Όλα τα αρχεία (*.*) diff --git a/win-linux/langs/et.ts b/win-linux/langs/et.ts index 74cac2728..9ecf72918 100644 --- a/win-linux/langs/et.ts +++ b/win-linux/langs/et.ts @@ -177,37 +177,37 @@ DOCX Document (*.docx) - DOCX Dokument (*.docx) + Office avatud XML dokument (*.docx) Document template (*.dotx) - Dokument šabloon (*.dotx) + Word Open XML dokument šabloon (*.dotx) DOC Document (*.doc) - DOC Dokument (*.doc) + Word 97-2003 document (*.doc) ODT Document (*.odt) - ODT Dokument (*.odt) + OpenDocument teksti fail (*.odt) OpenDocument Document template (*.ott) - OpenDocument Dokumendi šabloon (*.ott) + OpenDocument dokumendi šabloon (*.ott) RTF File (*.rtf) - RTF Fail (*.rtf) + Rikkaliku Teksti Dokument (*.rtf) TXT File (*.txt) - TXT Fail (*.txt) + Tavaline Tekst (*.txt) @@ -232,97 +232,97 @@ MOBI File (*.mobi) - MOBI Fail (*.mobi) + Mobipocket e-raamat (*.mobi) OFORM Document (*.oform) - + ONLYOFFICE täidetav veebivorm (*.oform) DOCXF Document (*.docxf) - + ONLYOFFICE dokumendi vormi mall (*.docxf) PPTX File (*.pptx) - PPTX Fail (*.pptx) + Office avatud XML esitlus (*.pptx) PPT File (*.ppt) - PPT Fail (*.ppt) + PowerPoint 97-2003 esitlus (*.ppt) Presentation template (*.potx) - Esitluse šabloon (*.potx) + PowerPoint Open XML esitluse šabloon (*.potx) ODP File (*.odp) - ODP Fail (*.odp) + OpenDocument esitlus (*.odp) OpenDocument Presentation Template (*.otp) - OpenDocument Esitluse šabloon(*.otp) + OpenDocument esitluse šabloon(*.otp) PPSX File (*.ppsx) - PPSX Fail (*.ppsx) + Office Open XML pildiesitlus (*.ppsx) XLSX File (*.xlsx) - XLSX Fail (*.xlsx) + Office avatud XML arvutustabel (*.xlsx) Spreadsheet template (*.xltx) - Arvutustabeli šabloon (*.xltx) + Excel Open XML arvutustabeli šabloon (*.xltx) XLS File (*.xls) - XLS Fail (*.xls) + Excel 97-2003 arvutustabel (*.xls) ODS File (*.ods) - ODS Fail (*.ods) + OpenDocument arvutustabel (*.ods) OpenDocument Spreadsheet Template (*.ots) - OpenDocument Arvutustabeli šabloon (*.ots) + OpenDocument arvutustabeli šabloon (*.ots) CSV File (*.csv) - CSV Fail (*.csv) + Komaga eraldatud väärtused (*.csv) PDF File (*.pdf) - PDF Fail (*.pdf) + Porditav document (*.pdf) PDFA File (*.pdf) - PDFA Fail (*.pdf) + Porditav document / A (*.pdf) DJVU File (*.djvu) - DJVU Fail (*.djvu) + Digitaalne dokument (*.djvu) XPS File (*.xps) - XPS Fail (*.xps) + OpenXPS dokument (*.xps) @@ -567,7 +567,7 @@ All files (*.*) - Kõik failid (*.*) + Kõik failid (*.*) diff --git a/win-linux/langs/fi.ts b/win-linux/langs/fi.ts index 4f8cdab5d..6585861b8 100644 --- a/win-linux/langs/fi.ts +++ b/win-linux/langs/fi.ts @@ -177,167 +177,167 @@ DOCX Document (*.docx) - DOCX Dokumentti (*.docx) + Officen avoin XML-asiakirja (*.docx) Document template (*.dotx) - Dokumentti malli (*.dotx) + Word Open XML-asiakirjamalli (*.dotx) DOC Document (*.doc) - DOC Dokumentti (*.doc) + Word 97–2003 -asiakirja (*.doc) ODT Document (*.odt) - ODT Dokumentti (*.odt) + OpenDocument dokumentti (*.odt) OpenDocument Document template (*.ott) - OpenDocument Dokumentti Malli (*.ott) + OpenDocument-asiakirjamalli (*.ott) RTF File (*.rtf) - RTF Tiedosto (*.rtf) + RTF-muotoinen tiedosto (*.rtf) TXT File (*.txt) - TXT Tiedosto(*.txt) + Pelkkä Teksti (*.txt) HTML File (*.html) - HTML Tiedosto (*.html) + HyperText-merkintäkielitiedosto (*.html) MHT File (*.mht) - MHT Tiedosto (*.mht) + Verkkosivun arkistotiedosto (*.mht) EPUB File (*.epub) - EPUB Tiedosto (*.epub) + Sähköinen julkaisutiedosto (*.epub) FB2 File (*.fb2) - FB2 Tiedosto (*.fb2) + FictionBook 2 tiedosto (*.fb2) MOBI File (*.mobi) - MOBI Tiedosto (*.mobi) + Mobipocket e-book (*.mobi) OFORM Document (*.oform) - + ONLYOFFICE täytettävä online-lomake (*.oform) DOCXF Document (*.docxf) - + ONLYOFFICE-asiakirjalomakemalli (*.docxf) PPTX File (*.pptx) - PPTX Tiedosto (*.pptx) + Officen avoin XML-esitys (*.pptx) PPT File (*.ppt) - PPT Tiedosto (*.ppt) + PowerPoint 97–2003 -esitys (*.ppt) Presentation template (*.potx) - Esityksen Malli(*.potx) + PowerPoint Open XML-esityksenmalli (*.potx) ODP File (*.odp) - ODP Tiedosto (*.odp) + OpenDocument esitys (*.odp) OpenDocument Presentation Template (*.otp) - OpenDocument Esityksen Malli (*.otp) + OpenDocument-esitysmalli (*.otp) PPSX File (*.ppsx) - PPSX Tiedosto (*.ppsx) + Officen avoin XML-diaesitys (*.ppsx) XLSX File (*.xlsx) - XLSX Tiedosto (*.xlsx) + Officen avoin XML-asiakirja (*.xlsx) Spreadsheet template (*.xltx) - Las Malli (*.xltx) + Excel Open XML-laskentataulukkomalli (*.xltx) XLS File (*.xls) - XLS Tiedosto (*.xls) + Excel 97–2003 -laskentataulukko (*.xls) ODS File (*.ods) - ODS Tiedosto (*.ods) + OpenDocument laskentataulukko (*.ods) OpenDocument Spreadsheet Template (*.ots) - OpenDocument Laskentataulukon Malli (*.ots) + OpenDocument-laskentataulukkomalli (*.ots) CSV File (*.csv) - CSV Tiedosto (*.csv) + Pilkulla erotetut arvot (*.csv) PDF File (*.pdf) - PDF Tiedosto (*.pdf) + Kannettava asiakirja (*.pdf) PDFA File (*.pdf) - PDFA Tiedosto (*.pdf) + Kannettava asiakirja / A (*.pdf) DJVU File (*.djvu) - DJVU Tiedosto (*.djvu) + Digitaalinen asiakirja (*.djvu) XPS File (*.xps) - XPS Tiedosto (*.xps) + OpenXPS-asiakirja(*.xps) Zip Archive (*.zip) - + Zip-arkisto (*.zip) JPG Image (*.jpg, *.jpeg) - + JPG-kuva (*.jpg *.jpeg) PNG Image (*.png) - + PNG-kuva (*.png) @@ -561,17 +561,17 @@ File %1 cannot be opened or doesn't exists. - + Tiedostoa %1 ei voi avata, tai sitä ei ole. All supported files (*.txt *.csv) - + Kaikki tuetut tiedostot (*.txt *.csv) All files (*.*) - Kaikki tiedostot (*.*) + Kaikki tiedostot (*.*) diff --git a/win-linux/langs/ga.ts b/win-linux/langs/ga.ts index 00dc8d17c..e8d89aad3 100644 --- a/win-linux/langs/ga.ts +++ b/win-linux/langs/ga.ts @@ -177,22 +177,22 @@ DOCX Document (*.docx) - Doiciméad DOCX (*.docx) + Doiciméad Office Open XML (*.docx) Document template (*.dotx) - Teimpléad doiciméad(*.dotx) + Teimpléad doiciméad Word Open XML (*.dotx) DOC Document (*.doc) - Doiciméad DOC Document (*.doc) + Doiciméad Word 97-2003 (*.doc) ODT Document (*.odt) - Doiciméad ODT Document (*.odt) + Comhad Téacs OpenDocument (*.odt) @@ -202,12 +202,12 @@ RTF File (*.rtf) - Comhad RTF (*.rtf) + Doiciméad méith-théacs (*.rtf) TXT File (*.txt) - Comhad TXT (*.txt) + Téacs Plain (*.txt) @@ -232,7 +232,7 @@ MOBI File (*.mobi) - Comhad MOBI (*.mobi) + Mobipocket e-book (*.mobi) @@ -247,22 +247,22 @@ PPTX File (*.pptx) - Comhad PPTX (*.pptx) + Cur i láthair PowerPoint Open XML (*.pptx) PPT File (*.ppt) - Comhad PPT (*.ppt) + Cur i láthair PowerPoint 97-2003 (*.ppt) Presentation template (*.potx) - Teimpléad cur i láthair (*.potx) + Teimpléad cur i láthair PowerPoint Open XML (*.potx) ODP File (*.odp) - Comhad ODP (*.odp) + Láithreoireacht OpenDocument (*.odp) @@ -272,57 +272,57 @@ PPSX File (*.ppsx) - Comhad PPSX (*.ppsx) + Taispeántas sleamhnán Office Open XML (*.ppsx) XLSX File (*.xlsx) - Comhad XLSX (*.xlsx) + Scarbhileog Office Open XML (*.xlsx) Spreadsheet template (*.xltx) - Teimpléad scarbhileog (*.xltx) + Teimpléad scarbhileog Excel Open XML (*.xltx) XLS File (*.xls) - Comhad XLS (*.xls) + Scarbhileog Excel 97-2003 (*.xls) ODS File (*.ods) - Comhad ODS (*.ods) + Scarbhileog OpenDocument (*.ods) OpenDocument Spreadsheet Template (*.ots) - Teimpléad scarbhileog OpenDocument *.(ots) + Teimpléad scarbhileog OpenDocument (*.ots) CSV File (*.csv) - Comhad CSV (*.csv) + Luachanna Scartha le Coma (*.csv) PDF File (*.pdf) - Comhad PDF (*.pdf) + Comhad PDF (*.pdf) PDFA File (*.pdf) - Comhad PDFA (*.pdf) + Comhad PDFA (*.pdf) DJVU File (*.djvu) - Comhad DJVU (*.djvu) + Comhad DjVu (*.djvu) XPS File (*.xps) - Comhad XPS (*.xps) + OpenXPS Cáipéis (*.xps) @@ -571,7 +571,7 @@ All files (*.*) - Gach comhad (*.*) + Gach comhad (*.*) diff --git a/win-linux/langs/gl.ts b/win-linux/langs/gl.ts index b130b0990..8cb6fba6b 100644 --- a/win-linux/langs/gl.ts +++ b/win-linux/langs/gl.ts @@ -177,22 +177,22 @@ DOCX Document (*.docx) - Documento DOCX (*.docx) + Documento Office Open XML (*.docx) Document template (*.dotx) - Modelo de documento (*.dotx) + Modelo do documento Word Open XML (*.dotx) DOC Document (*.doc) - Documento DOC (*.doc) + Documento Word 97-2003 (*.doc) ODT Document (*.odt) - Documento ODT (*.odt) + Ficheiro de texto OpenDocument (*.odt) @@ -202,67 +202,67 @@ RTF File (*.rtf) - Ficheiro RTF (*.rtf) + Ficheiro con formato de texto enriquecido (*.rtf) TXT File (*.txt) - Ficheiro TXT (*.txt) + Texto plano (*.txt) HTML File (*.html) - Ficheiro HTML (*.html) + Ficheiro HTML (*.html) MHT File (*.mht) - Ficheiro MHT (*.mht) + Ficheiro MHT (*.mht) EPUB File (*.epub) - Ficheiro EPUB (*.epub) + Publicación electronica (*.epub) FB2 File (*.fb2) - Ficheiro FB2 (*.fb2) + Ficheiro de libros de ficción (*.fb2) MOBI File (*.mobi) - Ficheiro MOBI (*.mobi) + Libro electrónico Mobipocket (*.mobi) OFORM Document (*.oform) - + Formulario en liña encheble ONLYOFFICE (*.oform) DOCXF Document (*.docxf) - + ONLYOFFICE Modelo de Formulario (*.docxf) PPTX File (*.pptx) - Ficheiro PPTX (*.pptx) + Presentación do Office Open XML (*.pptx) PPT File (*.ppt) - Ficheiro PPT (*.ppt) + Presentación de Powerpoint 97-2003 (*.ppt) Presentation template (*.potx) - Modelo de presentación (*.potx) + Modelo de presentación PowerPoint Open XML (*.potx) ODP File (*.odp) - Ficheiro ODP (*.odp) + Presentación de OpenDocument (*.odp) @@ -272,27 +272,27 @@ PPSX File (*.ppsx) - Ficheiro PPSX (*.ppsx) + Presentación de diapositivas de Office Open XML (*.ppsx) XLSX File (*.xlsx) - Ficheiro XLSX (*.xlsx) + Folla de cálcula Office Open XML (*.xlsx) Spreadsheet template (*.xltx) - Modelo de folla de cálculo (*.xltx) + Modelo de folla de cálculo Excel Open XML (*.xltx) XLS File (*.xls) - Ficheiro XLS (*.xls) + Folla de cálculo Excel 97-2003 (*.xls) ODS File (*.ods) - Ficheiro ODS (*.ods) + Folla de cálculo de OpenDocument (*.ods) @@ -302,27 +302,27 @@ CSV File (*.csv) - Ficheiro CSV (*.csv) + Valores separados por comas (*.csv) PDF File (*.pdf) - Ficheiro PDF (*.pdf) + Documento portátil (*.pdf) PDFA File (*.pdf) - Ficheiro PDFA (*.pdf) + Documento portátil / A (*.pdf) DJVU File (*.djvu) - Ficheiro DJVU (*.djvu) + Documento dixital (*.djvu) XPS File (*.xps) - Ficheiro XPS (*.xps) + Documento OpenXPS (*.xps) @@ -567,7 +567,7 @@ All files (*.*) - Todos os ficheiros (*.*) + Todos os ficheiros (*.*) diff --git a/win-linux/langs/hi.ts b/win-linux/langs/hi.ts index 95e77d86f..ee1e6e415 100644 --- a/win-linux/langs/hi.ts +++ b/win-linux/langs/hi.ts @@ -177,7 +177,7 @@ DOCX Document (*.docx) - डॉक्स दस्तावेज़ (*.docx) + ऑफिस ओपन एक्सएमएल दस्तावेज़ (*.docx) @@ -187,12 +187,12 @@ DOC Document (*.doc) - डॉक दस्तावेज़ (*.doc) + वर्ड 97-2003 दस्तावेज़ (*.doc) ODT Document (*.odt) - ओडीटी दस्तावेज़ (*.odt) + ओपनदस्तावेज़ टेक्स्ट दस्तावेज़ (*.odt) @@ -202,12 +202,12 @@ RTF File (*.rtf) - आरटीएफ फ़ाइल (*.rtf) + रिच टेक्स्ट फॉर्मेट फ़ाइल (*.rtf) TXT File (*.txt) - टीएक्सटी फ़ाइल (*.txt) + सादा टेक्स्ट (*.txt) @@ -232,27 +232,27 @@ MOBI File (*.mobi) - मोबी फ़ाइल (*.mobi) + मोबीपॉकेट ई-बुक (*.mobi) OFORM Document (*.oform) - + ओनलीऑफिस भरने योग्य ऑनलाइन फॉर्म (*.oform) DOCXF Document (*.docxf) - + ओनलीऑफिस दस्तावेज़ फॉर्म टेम्पलेट (*.docxf) PPTX File (*.pptx) - पीपीटीएक्स फ़ाइल (*.pptx) + ऑफिस ओपन एक्सएमएल प्रस्तुति (*.pptx) PPT File (*.ppt) - पीपीटी फ़ाइल (*.ppt) + पावरपॉइंट 97-2003 प्रस्तुति (*.ppt) @@ -262,7 +262,7 @@ ODP File (*.odp) - ओडीपी फ़ाइल (*.odp) + ओपनदस्तावेज़ प्रस्तुति (*.odp) @@ -272,12 +272,12 @@ PPSX File (*.ppsx) - पीपीएसएक्स फ़ाइल (*.ppsx) + ऑफिस ओपन एक्सएमएल स्लाइड शो (*.ppsx) XLSX File (*.xlsx) - एक्सएलएसएक्स फ़ाइल (*.xlsx) + ऑफिस ओपन एक्सएमएल स्प्रेडशीट (*.xlsx) @@ -287,12 +287,12 @@ XLS File (*.xls) - एक्सएलएस फ़ाइल (*.xls) + एक्सेल 97-2003 स्प्रेडशीट (*.xls) ODS File (*.ods) - ओडीएस फ़ाइल (*.ods) + ओपनदस्तावेज़ स्प्रेडशीट (*.ods) @@ -302,7 +302,7 @@ CSV File (*.csv) - सीएसवी फ़ाइल (*.csv) + अल्पविराम से विभाजित मान (*.csv) @@ -312,17 +312,17 @@ PDFA File (*.pdf) - पीडीएफए फ़ाइल (*.pdf) + पीडीएफ/ए फ़ाइल (*.pdf) DJVU File (*.djvu) - डीजेवू फ़ाइल (*.djvu) + डिजिटल दस्तावेज़ (*.djvu) XPS File (*.xps) - एक्सपीएस फ़ाइल (*.xps) + OpenXPS दस्तावेज़(*.xps) @@ -571,7 +571,7 @@ All files (*.*) - सभी फ़ाइलें (*.*) + सभी फ़ाइलें (*.*) diff --git a/win-linux/langs/hr.ts b/win-linux/langs/hr.ts index 06732098c..a5ccf2f54 100644 --- a/win-linux/langs/hr.ts +++ b/win-linux/langs/hr.ts @@ -177,37 +177,37 @@ DOCX Document (*.docx) - DOCX dokument (*.docx) + Office Open XML Dokument (*.docx) Document template (*.dotx) - Predložak dokumenta (*.dotx) + Word Open XML Predložak dokumenta (*.dotx) DOC Document (*.doc) - DOC dokument (*.doc) + Word 97-2003 Dokument (*.doc) ODT Document (*.odt) - ODT dokument (*.odt) + OpenDocument Tekstni file (*.odt) OpenDocument Document template (*.ott) - OpenDocument predložak dokumenta (*.ott) + OpenDocument Predložak dokumenta (*.ott) RTF File (*.rtf) - RTF datoteka (*.rtf) + Format obogaćenog teksta (*.rtf) TXT File (*.txt) - TXT datoteka (*.txt) + Običan tekst (*.txt) @@ -232,97 +232,97 @@ MOBI File (*.mobi) - MOBI datoteka (*.mobi) + Mobipocket e-knjiga (*.mobi) OFORM Document (*.oform) - + ONLYOFFICE Ispunjivi online obrazac (*.oform) DOCXF Document (*.docxf) - + ONLYOFFICE Predložak obrasca (*.docxf) PPTX File (*.pptx) - PPTX datoteka (*.pptx) + Office Open XML Prezentacija (*.pptx) PPT File (*.ppt) - PPT datoteka (*.ppt) + PowerPoint 97-2003 Prezentacija (*.ppt) Presentation template (*.potx) - Predložak prezentacije (*.potx) + PowerPoint Open XML Predložak prezentacije (*.potx) ODP File (*.odp) - ODP datoteka (*.odp) + OpenDocument Prezentacija (*.odp) OpenDocument Presentation Template (*.otp) - OpenDocument predložak prezentacije (*.otp) + OpenDocument Predložak prezentacije (*.otp) PPSX File (*.ppsx) - PPSX datoteka (*.ppsx) + Office Open XML Projekcija (*.ppsx) XLSX File (*.xlsx) - XLSX datoteka (*.xlsx) + Office Open XML Proračunska tablica (*.xlsx) Spreadsheet template (*.xltx) - Predložak tablice (*.xltx) + Excel Open XML Predložak tablice (*.xltx) XLS File (*.xls) - XLS datoteka (*.xls) + Excel 97-2003 Proračunska tablica (*.xls) ODS File (*.ods) - ODS datoteka (*.ods) + OpenDocument Proračunska tablica (*.ods) OpenDocument Spreadsheet Template (*.ots) - OpenDocument predložak tablice (*.ots) + OpenDocument Predložak tablice (*.ots) CSV File (*.csv) - CSV datoteka (*.csv) + Vrijednosti odvojene zarezima (*.csv) PDF File (*.pdf) - PDF datoteka (*.pdf) + Prijenosni format dokumenta (*.pdf) PDFA File (*.pdf) - PDFA datoteka (*.pdf) + Prijenosni format dokumenta / A (*.pdf) DJVU File (*.djvu) - DJVU datoteka (*.djvu) + Digitalni document (*.djvu) XPS File (*.xps) - XPS datoteka (*.xps) + OpenXPS Dokument (*.xps) @@ -567,7 +567,7 @@ All files (*.*) - Sve datoteke (*.*) + Sve datoteke (*.*) From 7879918c5a60d7942b9ffcdf3ab4ce4f37e00b5d Mon Sep 17 00:00:00 2001 From: Maria-Sukhova Date: Mon, 6 Jun 2022 18:09:00 +0300 Subject: [PATCH 05/23] edit formats descriptions --- win-linux/langs/hu.ts | 48 ++++++++++++++-------------- win-linux/langs/hy.ts | 48 ++++++++++++++-------------- win-linux/langs/id.ts | 40 +++++++++++------------ win-linux/langs/ko.ts | 68 ++++++++++++++++++++-------------------- win-linux/langs/lo.ts | 42 ++++++++++++------------- win-linux/langs/lt.ts | 48 ++++++++++++++-------------- win-linux/langs/lv.ts | 66 +++++++++++++++++++------------------- win-linux/langs/nl.ts | 10 +++--- win-linux/langs/no.ts | 48 ++++++++++++++-------------- win-linux/langs/pl.ts | 66 +++++++++++++++++++------------------- win-linux/langs/pt_BR.ts | 4 +-- win-linux/langs/pt_PT.ts | 66 +++++++++++++++++++------------------- win-linux/langs/ro.ts | 48 ++++++++++++++-------------- 13 files changed, 301 insertions(+), 301 deletions(-) diff --git a/win-linux/langs/hu.ts b/win-linux/langs/hu.ts index 8e7357a60..e7cafe787 100644 --- a/win-linux/langs/hu.ts +++ b/win-linux/langs/hu.ts @@ -177,22 +177,22 @@ DOCX Document (*.docx) - DOCX dokumentum (*.docx) + Office nyílt XML formátumú dokumentum (*.docx) Document template (*.dotx) - Dokumentumsablon (*.dotx) + Word Open XML Dokumentumsablon (*.dotx) DOC Document (*.doc) - DOC dokumentum (*.doc) + Word 97-2003-as dokumentum (*.doc) ODT Document (*.odt) - ODT dokumentum (*.odt) + OpenDocument szöveges fájl (*.odt) @@ -202,12 +202,12 @@ RTF File (*.rtf) - RTF fájl (*.rtf) + Rich Text formátumú fájl (*.rtf) TXT File (*.txt) - TXT fájl (*.txt) + Egyszerű szöveg (*.txt) @@ -232,37 +232,37 @@ MOBI File (*.mobi) - MOBI fájl (*.mobi) + Mobipocket e-könyv (*.mobi) OFORM Document (*.oform) - + ONLYOFFICE kitölthető online sablon (*.oform) DOCXF Document (*.docxf) - + ONLYOFFICE formátum-sablon (*.docxf) PPTX File (*.pptx) - PPTX fájl (*.pptx) + Office Open XML prezentáció (*.pptx) PPT File (*.ppt) - PPT fájl (*.ppt) + PowerPoint 97-2003-as prezentáció (*.ppt) Presentation template (*.potx) - Bemutatósablon (*.potx) + PowerPoint Open XML prezentáció sablon (*.potx) ODP File (*.odp) - ODP fájl (*.odp) + OpenDocument prezentáció (*.odp) @@ -272,27 +272,27 @@ PPSX File (*.ppsx) - PPSX fájl (*.ppsx) + Office Open XML diavetítés (*.ppsx) XLSX File (*.xlsx) - XLSX fájl (*.xlsx) + Office Open XML számolótábla (*.xlsx) Spreadsheet template (*.xltx) - Számolótábla-sablon (*.xltx) + Excel Open XML számolótábla-sablon (*.xltx) XLS File (*.xls) - XLS fájl (*.xls) + Excel 97-2003 számolótábla (*.xls) ODS File (*.ods) - ODS fájl (*.ods) + OpenDocument számolótábla (*.ods) @@ -302,27 +302,27 @@ CSV File (*.csv) - CSV fájl (*.csv) + Vesszővel elválasztott értékek (*.csv) PDF File (*.pdf) - PDF fájl (*.pdf) + PDF-fájlformátum (*.pdf) PDFA File (*.pdf) - PDFA fájl (*.pdf) + PDF-fájlformátum / A (*.pdf) DJVU File (*.djvu) - DJVU fájl (*.djvu) + Digitális dokumentum (*.djvu) XPS File (*.xps) - XPS fájl (*.xps) + Open XPS-dokumentumformátum (*.xps) @@ -567,7 +567,7 @@ All files (*.*) - Minden fájltípus (*.*) + Minden fájltípus (*.*) diff --git a/win-linux/langs/hy.ts b/win-linux/langs/hy.ts index 20c32eb0a..78ef94b4d 100644 --- a/win-linux/langs/hy.ts +++ b/win-linux/langs/hy.ts @@ -177,22 +177,22 @@ DOCX Document (*.docx) - DOCX փաստաթուղթ (*.docx) + Office Open XML փաստաթուղթ (*.docx) Document template (*.dotx) - Փաստաթղթի ձևանմուշ (*.dotx) + Word Open XML Փաստաթղթի ձևանմուշ (*.dotx) DOC Document (*.doc) - DOC փաստաթուղթ (*.doc) + Word 97-2003 փաստաթուղթ (*.doc) ODT Document (*.odt) - ODT փաստաթուղթ (*.odt) + OpenDocument տեսքստային փաստաթուղթ (*.odt) @@ -202,12 +202,12 @@ RTF File (*.rtf) - RTF ֆայլ (*.rtf) + Rich Text Format ֆայլ (*.rtf) TXT File (*.txt) - TXT ֆայլ (*.txt) + Սովորական տեքստ (*.txt) @@ -232,37 +232,37 @@ MOBI File (*.mobi) - MOBI ֆայլ (*.mobi) + Mobipocket էլեկտրոնային գիրք (*.mobi) OFORM Document (*.oform) - + ONLYOFFICE լրացվող առցանց ձև (*.oform) DOCXF Document (*.docxf) - + ONLYOFFICE փաստաթղթի ձևանմուշ (*.docxf) PPTX File (*.pptx) - PPTX ֆայլ (*.pptx) + Office Open XML ներկայացում (*.pptx) PPT File (*.ppt) - PPT ֆայլ (*.ppt) + PowerPoint 97-2003 ներկայացում (*.ppt) Presentation template (*.potx) - PPTX ֆայլ (*.pptx) + PowerPoint Open XML Ներկայացման ձևանմուշ (*.potx) ODP File (*.odp) - ODP ֆայլ (*.odp) + OpenDocument ներկայացնում (*.odp) @@ -272,27 +272,27 @@ PPSX File (*.ppsx) - PPSX ֆայլ (*.ppsx) + Office Open XML սահիկաշար (*.ppsx) XLSX File (*.xlsx) - XLSX ֆայլ (*.xlsx) + Office Open XML աղյուսակ (*.xlsx) Spreadsheet template (*.xltx) - Աղյուսայի ձևանմուշ (*.xltx) + Excel Open XML Աղյուսակի ձևանմուշ (*.xltx) XLS File (*.xls) - XLS ֆայլ (*.xls) + Excel 97-2003 աղյուսակ (*.xls) ODS File (*.ods) - ODS ֆայլ (*.ods) + OpenDocument աղյուսակ (*.ods) @@ -302,27 +302,27 @@ CSV File (*.csv) - CSV ֆայլ (*.csv) + Ստորակետերով առանձնացված արժեքներ (*.csv) PDF File (*.pdf) - PDF ֆայլ (*.pdf) + Դյուրակիր փաստաթղթի ձևաչափ (*.pdf) PDFA File (*.pdf) - PDFA Ֆայլ (*.pdf) + Դյուրակիր փաստաթղթի ձևաչափ / A (*.pdf) DJVU File (*.djvu) - DJVU ֆայլ (*.djvu) + Թվային փաստաթուղթ (*.djvu) XPS File (*.xps) - XPS ֆայլ (*.xps) + OpenXPS փաստաթուղթ (*.xps) @@ -571,7 +571,7 @@ All files (*.*) - Բոլոր ֆայլերը (*.*) + Բոլոր ֆայլերը (*.*) diff --git a/win-linux/langs/id.ts b/win-linux/langs/id.ts index aef6d2acd..5ea07f561 100644 --- a/win-linux/langs/id.ts +++ b/win-linux/langs/id.ts @@ -177,22 +177,22 @@ DOCX Document (*.docx) - Dokumen DOCX (*.docx) + Dokumen Office Open XML (*.docx) Document template (*.dotx) - Dokumen templat (*.dotx) + Dokumen templat Word Open XML (*.dotx) DOC Document (*.doc) - Dokumen DOC (*.doc) + Dokumen Word 97-2003 (*.doc) ODT Document (*.odt) - Dokumen ODT (*.odt) + File Teks OpenDocument (*.odt) @@ -202,12 +202,12 @@ RTF File (*.rtf) - File RTF (*.rtf) + Dokumen Rich Text (*.rtf) TXT File (*.txt) - File TXT (*.txt) + Teks Biasa (*.txt) @@ -232,7 +232,7 @@ MOBI File (*.mobi) - File MOBI (*.mobi) + E-book mobipocket (*.mobi) @@ -247,22 +247,22 @@ PPTX File (*.pptx) - File PPTX (*.pptx) + Presentasi Office Open XML (*.pptx) PPT File (*.ppt) - File PPT (*.ppt) + Presentasi PowerPoint 97-2003 (*.ppt) Presentation template (*.potx) - Templat Presentasi (*.potx) + Templat Presentasi PowerPoint Open XML (*.potx) ODP File (*.odp) - File ODP (*.odp) + Presentasi OpenDocument (*.odp) @@ -272,27 +272,27 @@ PPSX File (*.ppsx) - File PPSX (*.ppsx) + Peragaan Slide Office Open XML (*.ppsx) XLSX File (*.xlsx) - File XLSX (*.xlsx) + Lembar bentang Office Open XML (*.xlsx) Spreadsheet template (*.xltx) - Templat lembar bentang (*.xltx) + Templat lembar bentang Excel Open XML (*.xltx) XLS File (*.xls) - File XLS (*.xls) + Lembar bentang Excel 97-2003 (*.xls) ODS File (*.ods) - File ODS (*.ods) + Lembar Bentang OpenDocument (*.ods) @@ -302,7 +302,7 @@ CSV File (*.csv) - File CSV (*.csv) + Nilai Koma Terpisah (*.csv) @@ -317,12 +317,12 @@ DJVU File (*.djvu) - File DJVU (*.djvu) + File DjVu (*.djvu) XPS File (*.xps) - File XPS (*.xps) + Dokumen OpenXPS (*.xps) @@ -571,7 +571,7 @@ All files (*.*) - Semua file (*.*) + Semua file (*.*) diff --git a/win-linux/langs/ko.ts b/win-linux/langs/ko.ts index 7802d2628..ffd5abcfe 100644 --- a/win-linux/langs/ko.ts +++ b/win-linux/langs/ko.ts @@ -173,92 +173,92 @@ DOCX Document (*.docx) - DOCX 문서 (*.docx) + Office Open XML 문서(*.docx) Document template (*.dotx) - 문서 템플릿 (*.dotx) + Word Open XML 문서 템플릿(*.dotx) DOC Document (*.doc) - DOC 문서 (*.doc) + Word 97-2003 문서(*.doc) ODT Document (*.odt) - ODT 문서 (*.odt) + 오픈도큐먼트 텍스트 문서(*.odt) OpenDocument Document template (*.ott) - OpenDocument 문서 템플릿 (*.ott) + OpenDocument 문서 템플릿(*.ott) RTF File (*.rtf) - RTF 파일 (*.rtf) + 서식이 있는 텍스트 형식 파일(*.rtf) TXT File (*.txt) - TXT 파일 (*.txt) + 일반 텍스트 파일(*.txt) HTML File (*.html) - HTML 파일 (*.html) + 하이퍼텍스트 마크업 언어 파일(*.html) MHT File (*.mht) - MHT 파일 (*.mht) + 웹 페이지 아카이브 파일(*.mht) EPUB File (*.epub) - EPUB 파일 (*.epub) + 전자 출판물 파일(*.epub) FB2 File (*.fb2) - FB2 파일 (*.fb2) + 픽션북 2 파일(*.fb2) MOBI File (*.mobi) - MOBI 파일 (*.mobi) + 모비포켓 전자책(*.mobi) OFORM Document (*.oform) - + ONLYOFFICE 작성 가능한 온라인 양식(*.oform) DOCXF Document (*.docxf) - + ONLYOFFICE 문서 양식 템플릿(*.docxf) PPTX File (*.pptx) - PPTX 파일 (*.pptx) + Office Open XML 프레젠테이션(*.pptx) PPT File (*.ppt) - PPT 파일 (*.ppt) + PowerPoint 97-2003 프레젠테이션(*.ppt) Presentation template (*.potx) - 프레젠테이션 템플릿 (*.potx) + PowerPoint Open XML 프레젠테이션 템플릿(*.potx) ODP File (*.odp) - ODP 파일 (*.odp) + 오픈도큐먼트 프레젠테이션(*.odp) @@ -268,27 +268,27 @@ PPSX File (*.ppsx) - PPSX 파일 (*.ppsx) + Office Open XML 슬라이드 쇼(*.ppsx) XLSX File (*.xlsx) - XLSX 파일 (*.xlsx) + Office Open XML 스프레드시트(*.xlsx) Spreadsheet template (*.xltx) - 스프레드시트 템플릿 (*.xltx) + Excel Open XML 스프레드시트 템플릿(*.xltx) XLS File (*.xls) - XLS 파일 (*.xls) + Excel 97-2003 스프레드시트(*.xls) ODS File (*.ods) - ODS 파일 (*.ods) + 오픈도큐먼트 스프레드시트(*.ods) @@ -298,42 +298,42 @@ CSV File (*.csv) - CSV 파일 (*.csv) + 쉼표로 구분된 데이터 파일(*.csv) PDF File (*.pdf) - PDF 파일 (*.pdf) + 휴대용 문서(*.pdf) PDFA File (*.pdf) - PDFA 파일 (*.pdf) + 휴대용 문서 / A(*.pdf) DJVU File (*.djvu) - DJVU 파일 (*.djvu) + 디지털 문서(*.djvu) XPS File (*.xps) - XPS 파일 (*.xps) + OpenXPS 문서(*.xps) Zip Archive (*.zip) - + Zip 아카이브(*.zip) JPG Image (*.jpg, *.jpeg) - + JPG 이미지(*.jpg *.jpeg) PNG Image (*.png) - + PNG 이미지(*.png) @@ -549,17 +549,17 @@ File %1 cannot be opened or doesn't exists. - + %1 파일이 열리지 않거나 존재하지 않습니다. All supported files (*.txt *.csv) - + 모든 지원 파일(*.txt *.csv) All files (*.*) - 모든 파일 (*.*) + 모든 파일 (*.*) diff --git a/win-linux/langs/lo.ts b/win-linux/langs/lo.ts index 0d063392c..148905523 100644 --- a/win-linux/langs/lo.ts +++ b/win-linux/langs/lo.ts @@ -177,7 +177,7 @@ DOCX Document (*.docx) - ເອກະສານ DOCX (*.docx) + ເປີດເອກະສານ XML (*.docx) @@ -187,7 +187,7 @@ DOC Document (*.doc) - ເອກະສານ DOC (*.doc) + ເອກະສານ Word 97-2003 (*.doc) @@ -202,12 +202,12 @@ RTF File (*.rtf) - ເອກະສານ RTF (*.rtf) + ຮູບແບບໄຟລ໌ສົມບູນ (*.rtf) TXT File (*.txt) - ໄຟລ໌ Text ທຳມະດາ (*.txt) + ໄຟລ໌ຂໍ້ຄວາມທຳມະດາ (*.txt) @@ -217,12 +217,12 @@ MHT File (*.mht) - ໄຟລ໌ບັນທືກ Web Page (*.mht) + ແຟ້ມຈັດເກັບໜ້າເວັບ (*. mht) EPUB File (*.epub) - ໄຟລ໌ Electronic Publication (*.epub) + ເອກະສານສິ່ງພິມເອເລັກໂທຣນິກ (*. epub) @@ -232,7 +232,7 @@ MOBI File (*.mobi) - ໄຟລ໌ Mobipocket (*.mobi) + ໄຟລ໌ Mobipocket e-book (*. mobi) @@ -247,12 +247,12 @@ PPTX File (*.pptx) - ເອກະສານ PPTX (*.pptx) + ການນຳສະເໜີ XML (*.pptx) PPT File (*.ppt) - ເອກະສານ PPT (*.ppt) + ນຳສະເໜີ PowerPoint 97-2003 (*.ppt) @@ -262,7 +262,7 @@ ODP File (*.odp) - ເອກະສານ ODP (*.odp) + ເປິດເອກະສານນຳສະເໜີ (*.odp) @@ -272,12 +272,12 @@ PPSX File (*.ppsx) - ແຟ້ມເອກະສານ PPSX (*.ppsx) + ເປີດສະແດງສະໄລ XML (*.ppsx) XLSX File (*.xlsx) - ເອກະສານ XLSX (*.xlsx) + ເປີດຕາຕະລາງ XML (*.xlsx) @@ -287,7 +287,7 @@ XLS File (*.xls) - ເອກະສານ XLS (*.xls) + ຕາຕະລາງ Excel 97-2003 (*.xls) @@ -302,7 +302,7 @@ CSV File (*.csv) - ເອກະສານ CSV (*.csv) + ຄ່າທີ່ຂັ້ນດ້ວຍເຄື່ອງໝາຍຈຸດ (*.csv) @@ -317,27 +317,27 @@ DJVU File (*.djvu) - ເອກະສານດິຈິຕອລ (*.djvu) + ເອກະສານດິຈິຕອນ (*.djvu) XPS File (*.xps) - ເປີດເອກະສານປະເພດ XPS (*.xps) + ເອກະສານ OpenXPS (*.xps) Zip Archive (*.zip) - ປະເພດ Zip Archive (*.zip) + ໄຟລ໌ບີບ(*.zip) JPG Image (*.jpg, *.jpeg) - ປະເພດ JPG Image (*.jpg, *.jpeg) + ຮູບພາບແບບJPG (*.jpg *.jpeg) PNG Image (*.png) - ປະເພດ PNG Image (*.png) + ຮູບພາບແບບ PNG (*. png ) @@ -561,12 +561,12 @@ File %1 cannot be opened or doesn't exists. - + ໄຟລ໌ %1 ບໍ່ສາມາດເປີດໄດ້ ຫຼືບໍ່ມີຢູ່. All supported files (*.txt *.csv) - + ໄຟລ໌ທີ່ຮອງຮັບທັງໝົດ (*.txt *.csv) diff --git a/win-linux/langs/lt.ts b/win-linux/langs/lt.ts index 869b6e518..7a8310c24 100644 --- a/win-linux/langs/lt.ts +++ b/win-linux/langs/lt.ts @@ -177,22 +177,22 @@ DOCX Document (*.docx) - DOCX Dokumentas (*.docx) + Office Atidaryti XML Dokumentą (*.docx) Document template (*.dotx) - Dokumento šablonas (*.dotx) + Word Open XML Dokumento šablonas (*.dotx) DOC Document (*.doc) - DOC Dokumentas (*.doc) + Word 97-2003 Dokumentas (*.doc) ODT Document (*.odt) - ODT Dokumentas (*.odt) + OpenDocument Tekstinis failas (*.odt) @@ -202,12 +202,12 @@ RTF File (*.rtf) - RTF Failas (*.rtf) + Raiškiojo Teksto Formato Failas (*.rtf) TXT File (*.txt) - TXT Failas (*.txt) + Paprastas Tekstas (*.txt) @@ -232,37 +232,37 @@ MOBI File (*.mobi) - MOBI Failas (*.mobi) + Mobipocket el. knyga (*.mobi) OFORM Document (*.oform) - + ONLYOFFICE Užpildoma Internetinė Anketa (*.oform) DOCXF Document (*.docxf) - + ONLYOFFICE Anketos Šablonas (*.docxf) PPTX File (*.pptx) - PPTX Failas (*.pptx) + Office Atidaryti XML Prezentacija (*.pptx) PPT File (*.ppt) - PPT Failas (*.ppt) + PowerPoint 97-2003 Prezentacija (*.ppt) Presentation template (*.potx) - Prezentacijos šablonas (*.potx) + PowerPoint Open XML Prezentacijos šablonas (*.potx) ODP File (*.odp) - ODP Failas (*.odp) + OpenDocument Prezentacija (*.odp) @@ -272,27 +272,27 @@ PPSX File (*.ppsx) - PPSX Failas (*.ppsx) + Office Atidaryti XML Skaidrių Demonstraciją (*.ppsx) XLSX File (*.xlsx) - XLSX Failas (*.xlsx) + Office Atidaryti XML Skaičiuoklę (*.xlsx) Spreadsheet template (*.xltx) - Skaičiuoklės šablonas (*.xltx) + Excel Open XML Skaičiuoklės šablonas (*.xltx) XLS File (*.xls) - XLS Failas (*.xls) + Excel 97-2003 Skaičiuoklė (*.xls) ODS File (*.ods) - ODS Failas (*.ods) + OpenDocument Skaičiuoklė (*.ods) @@ -302,27 +302,27 @@ CSV File (*.csv) - CSV Failas (*.csv) + Kableliais atskirtos reikšmės (*.csv) PDF File (*.pdf) - PDF Failas (*.pdf) + Kilnojamas Dokumentas (*.pdf) PDFA File (*.pdf) - PDFA Failas (*.pdf) + Kilnojamas Dokumentas / A (*.pdf) DJVU File (*.djvu) - DJVU Failas (*.djvu) + Skaitmeninis dokumentas (*.djvu) XPS File (*.xps) - XPS Failas (*.xps) + Dokumentas OpenXPS (*.xps) @@ -571,7 +571,7 @@ All files (*.*) - Visi failai (*.*) + Visi failai (*.*) diff --git a/win-linux/langs/lv.ts b/win-linux/langs/lv.ts index bfcb55eaf..859c490a3 100644 --- a/win-linux/langs/lv.ts +++ b/win-linux/langs/lv.ts @@ -177,22 +177,22 @@ DOCX Document (*.docx) - DOCX Dokuments (*.docx) + Office Open XML dokuments (*.docx) Document template (*.dotx) - Dokumenta veidne (*.dotx) + Word Open XML Dokumenta veidne (*.dotx) DOC Document (*.doc) - DOC Dokuments (*.doc) + Word 97-2003 dokuments (*.doc) ODT Document (*.odt) - ODT Dokuments (*.odt) + OpenDocument Teksta fails (*.odt) @@ -202,67 +202,67 @@ RTF File (*.rtf) - RTF Fails (*.rtf) + Bagātināta teksta formāta fails (*.rtf) TXT File (*.txt) - TXT Fails (*.txt) + Parasts Teksts (*.txt) HTML File (*.html) - HTML Fails (*.html) + Hiperteksta atzīmes valodas fails (*.html) MHT File (*.mht) - MHT Fails (*.mht) + Tīmekļa lapas arhīva fails (*.mht) EPUB File (*.epub) - EPUB Fails (*.epub) + Elektronisko publikāciju fails (*.epub) FB2 File (*.fb2) - FB2 Fails (*.fb2) + FictionBook 2 fails (*.fb2) MOBI File (*.mobi) - MOBI Fails (*.mobi) + Mobipocket e-grāmata (*.mobi) OFORM Document (*.oform) - + ONLYOFFICE aizpildāmā tiešsaistes veidlapa (*.oform) DOCXF Document (*.docxf) - + ONLYOFFICE veidlapas veidne (*.docxf) PPTX File (*.pptx) - PPTX Fails (*.pptx) + Office Open XML prezentācija (*.pptx) PPT File (*.ppt) - PPT Fails (*.ppt) + PowerPoint 97-2003 prezentācija (*.ppt) Presentation template (*.potx) - Prezentācijas veidne (*.potx) + PowerPoint Open XML Prezentācijas veidne (*.potx) ODP File (*.odp) - ODP Fails (*.odp) + OpenDocument Prezentācija (*.odp) @@ -272,27 +272,27 @@ PPSX File (*.ppsx) - PPSX Fails (*.ppsx) + Office Open XML slaidrāde (*.ppsx) XLSX File (*.xlsx) - XLSX Fails (*.xlsx) + Office Open XML izklājlapa (*.xlsx) Spreadsheet template (*.xltx) - Izklājlapas veidne (*.xltx) + Excel Open XML Izklājlapas veidne (*.xltx) XLS File (*.xls) - XLS Fails (*.xls) + Excel 97-2003 izklājlapa (*.xls) ODS File (*.ods) - ODS Fails (*.ods) + OpenDocument Izklājlapa (*.ods) @@ -302,42 +302,42 @@ CSV File (*.csv) - CSV Fails (*.csv) + Ar Komatiem Atdalītas Vērtības (*.csv) PDF File (*.pdf) - PDF Fails (*.pdf) + Portatīvs dokuments (*.pdf) PDFA File (*.pdf) - PDFA Fails (*.pdf) + Portatīvs dokuments / A (*.pdf) DJVU File (*.djvu) - DJVU Fails (*.djvu) + Digitālais dokuments (*.djvu) XPS File (*.xps) - XPS Fails (*.xps) + OpenXPS dokuments (*.xps) Zip Archive (*.zip) - + Zip arhīvs (*.zip) JPG Image (*.jpg, *.jpeg) - + JPG attēls (*.jpg *.jpeg) PNG Image (*.png) - + PNG attēls (*.png) @@ -561,17 +561,17 @@ File %1 cannot be opened or doesn't exists. - + Failu %1 nevar atvērt vai tas neeksistē. All supported files (*.txt *.csv) - + Visi atbalstītie faili (*.txt *.csv) All files (*.*) - Visi faili (*.*) + Visi faili (*.*) diff --git a/win-linux/langs/nl.ts b/win-linux/langs/nl.ts index 7392aca6c..a399d506c 100644 --- a/win-linux/langs/nl.ts +++ b/win-linux/langs/nl.ts @@ -232,7 +232,7 @@ MOBI File (*.mobi) - Mobipocket Bestand (*.mobi) + Mobipocket e-book (*.mobi) @@ -302,12 +302,12 @@ CSV File (*.csv) - Kommagescheiden bestand (*.csv) + Komma-Gescheiden Waarden (*.csv) PDF File (*.pdf) - Portable Document (*.pdf) + Portable Document (*pdf) @@ -557,12 +557,12 @@ File %1 cannot be opened or doesn't exists. - + Bestand %1 kan niet worden geopend of bestaat niet. All supported files (*.txt *.csv) - + Alle ondersteunde bestanden (*.txt *.csv) diff --git a/win-linux/langs/no.ts b/win-linux/langs/no.ts index 7ea9d8348..ca6e6a917 100644 --- a/win-linux/langs/no.ts +++ b/win-linux/langs/no.ts @@ -177,22 +177,22 @@ DOCX Document (*.docx) - DOCX-dokument (*.docx) + Office Open XML-dokument (*.docx) Document template (*.dotx) - Dokumentmal (*.dotx) + Word Open XML-dokumentmal (*.dotx) DOC Document (*.doc) - DOC-dokument (*.doc) + Word 97-2003-dokument (*.doc) ODT Document (*.odt) - ODT-dokument (*.odt) + OpenDocument-tekstfil (*.odt) @@ -202,12 +202,12 @@ RTF File (*.rtf) - RTF-fil (*.rtf) + Rikt tekstformat-fil (*.rtf) TXT File (*.txt) - TXT-fil (*.txt) + Ren tekst (*.txt) @@ -232,37 +232,37 @@ MOBI File (*.mobi) - MOBI-fil (*.mobi) + Mobipocket e-bok (*.mobi) OFORM Document (*.oform) - + ONLYOFFICE utfyllbart elektronisk skjema (*.oform) DOCXF Document (*.docxf) - + ONLYOFFICE-dokumentskjemamal (*.docxf) PPTX File (*.pptx) - PPTX-fil (*.pptx) + Office Open XML-presentasjon (*.pptx) PPT File (*.ppt) - PPT-fil (*.ppt) + PowerPoint 97-2003-presentasjon (*.ppt) Presentation template (*.potx) - Presentasjonsmal (*.potx) + PowerPoint Open XML-presentasjonsmal (*.potx) ODP File (*.odp) - ODP-fil (*.odp) + OpenDocument-presentasjon (*.odp) @@ -272,27 +272,27 @@ PPSX File (*.ppsx) - PPSX-fil (*.ppsx) + Office Open XML-lysbildefremvisning (*.ppsx) XLSX File (*.xlsx) - XLSX-fil (*.xlsx) + Office Open XML-regneark (*.xlsx) Spreadsheet template (*.xltx) - Regneark-mal (*.xltx) + Excel Open XML-regnearkmal (*.xltx) XLS File (*.xls) - XLS-fil (*.xls) + Microsoft Excel 97-2003-regneark (*.xls) ODS File (*.ods) - ODS-fil (*.ods) + OpenDocument-regneark (*.ods) @@ -302,27 +302,27 @@ CSV File (*.csv) - CSV-fil (*.csv) + Kommadelte verdier (*.csv) PDF File (*.pdf) - PDF-fil (*.pdf) + Portable Document (*.pdf) PDFA File (*.pdf) - PDFA-fil (*.pdf) + Portable Document /A (*.pdf) DJVU File (*.djvu) - DJVU-fil (*.djvu) + Digitalt document (*.djvu) XPS File (*.xps) - XPS-fil (*.xps) + OpenXPS-dokument (*.xps) @@ -571,7 +571,7 @@ All files (*.*) - Alle filer (*.*) + Alle filer (*.*) diff --git a/win-linux/langs/pl.ts b/win-linux/langs/pl.ts index abd15a284..f147950e5 100644 --- a/win-linux/langs/pl.ts +++ b/win-linux/langs/pl.ts @@ -177,22 +177,22 @@ DOCX Document (*.docx) - Dokument DOCX (*.docx) + Dokument Open Office XML (*.docx) Document template (*.dotx) - Szablon dokumentu (*.dotx) + Szablon dokumentu Word Open XML (*.dotx) DOC Document (*.doc) - Dokument DOC (*.doc) + Dokument Word 97-2003 (*.doc) ODT Document (*.odt) - Dokument ODT (*.odt) + Plik tekstowy OpenDocument (*.odt) @@ -202,67 +202,67 @@ RTF File (*.rtf) - Plik RTF (*.rtf) + Plik w formacie Rich Text (*.rtf) TXT File (*.txt) - Plik TXT (*.txt) + Zwykły Tekst (*.txt) HTML File (*.html) - Plik HTML (*.html) + Plik HyperText Markup Language (*.html) MHT File (*.mht) - Plik MHT (*.mht) + Plik Web Page Archive (*.mht) EPUB File (*.epub) - Plik EPUB (*.epub) + Plik Electronic Publication (*.epub) FB2 File (*.fb2) - Plik FB2 (*.fb2) + Plik FictionBook 2 (*.fb2) MOBI File (*.mobi) - Plik MOBI (*.mobi) + E-Book Mobipocket (*.mobi) OFORM Document (*.oform) - + Formularz ONLYOFFICE do wypełnienia online (*.oform) DOCXF Document (*.docxf) - + Szablon formularza ONLYOFFICE (*.docxf) PPTX File (*.pptx) - Plik PPTX (*.pptx) + Prezentacja Open Office XML (*.pptx) PPT File (*.ppt) - Plik PPT (*.ppt) + Prezentacja PowerPoint 97-2003 (*.ppt) Presentation template (*.potx) - Szablon prezentacji (*.potx) + Szablon prezentacji PowerPoint Open XML (*.potx) ODP File (*.odp) - Plik ODP (*.odp) + Prezentacja OpenDocument (*.odp) @@ -272,27 +272,27 @@ PPSX File (*.ppsx) - Plik PPSX (*.ppsx) + Pokaz slajdów Open Office XML (*.ppsx) XLSX File (*.xlsx) - Plik XLSX (*.xlsx) + Arkusz kalkulacyjny Open Office XML (*.xlsx) Spreadsheet template (*.xltx) - Szablon arkusza kalkulacyjnego (*.xltx) + Szablon arkusza kalkulacyjnego Excel Open XML (*.xltx) XLS File (*.xls) - Plik XLS (*.xls) + Arkusz kalkulacyjny Excel 97-2003 (*.xls) ODS File (*.ods) - Plik ODS (*.ods) + Arkusz Kalkulacyjny OpenDocument (*.ods) @@ -302,42 +302,42 @@ CSV File (*.csv) - Plik CSV (*.csv) + Wartości rozdzielone przecinkiem (*.csv) PDF File (*.pdf) - Plik PDF (*.pdf) + Przenośny document (*.pdf) PDFA File (*.pdf) - Plik PDFA (*.pdf) + Przenośny document / A (*.pdf) DJVU File (*.djvu) - PlikDJVU (*.djvu) + Dokument cyfrowy (*.djvu) XPS File (*.xps) - Plik XPS (*.xps) + Dokument OpenXPS (*.xps) Zip Archive (*.zip) - + Plik Zip Archive (*.zip) JPG Image (*.jpg, *.jpeg) - + Obraz JPG (*.jpg *.jpeg) PNG Image (*.png) - + Obraz PNG (*.png) @@ -561,17 +561,17 @@ File %1 cannot be opened or doesn't exists. - + Plik %1 nie może zostać otworzony lub nie istnieje. All supported files (*.txt *.csv) - + Wszystkie obsługiwane pliki (*.txt *.csv) All files (*.*) - Wszystkie pliki (*.*) + Wszystkie pliki (*.*) diff --git a/win-linux/langs/pt_BR.ts b/win-linux/langs/pt_BR.ts index e5181a793..03a21e001 100644 --- a/win-linux/langs/pt_BR.ts +++ b/win-linux/langs/pt_BR.ts @@ -569,12 +569,12 @@ File %1 cannot be opened or doesn't exists. - + O arquivo %1 não pode ser aberto ou não existe. All supported files (*.txt *.csv) - + Todos os arquivos suportados (*.txt *.csv) diff --git a/win-linux/langs/pt_PT.ts b/win-linux/langs/pt_PT.ts index 0cc7e2b7e..b044588ee 100644 --- a/win-linux/langs/pt_PT.ts +++ b/win-linux/langs/pt_PT.ts @@ -177,52 +177,52 @@ DOCX Document (*.docx) - Documento DOCX (*.docx) + Documento Office Open XML (*.docx) Document template (*.dotx) - Modelo de Documento (*.dotx) + Modelo de documento Word Open XML (*.dotx) DOC Document (*.doc) - Documento DOC (*.doc) + Documento Word 97-2003 (*.doc) ODT Document (*.odt) - Documento ODT (*.odt) + Ficheiro de texto OpenDocument (*.odt) OpenDocument Document template (*.ott) - OpenDocument Modelo de documento (*.ott) + Modelo de documento OpenDocument (*.ott) RTF File (*.rtf) - Ficheiro RTF (*.rtf) + Ficheiro de Rich Text Format (*.rtf) TXT File (*.txt) - Ficheiro TXT (*.txt) + Documento de Texto Simples (*.txt) HTML File (*.html) - Ficheiro HTML (*.html) + Ficheiro na Linguagem HTML (*.html) MHT File (*.mht) - Ficheiro MHT (*.mht) + Ficheiro de arquivo de página Web (*.mht) EPUB File (*.epub) - Ficheiro EPUB (*.epub) + Ficheiro de Publicação Eletrônica (*.epub) @@ -232,17 +232,17 @@ MOBI File (*.mobi) - Ficheiro MOBI (*.mobi) + Mobipocket e-book (*.mobi) OFORM Document (*.oform) - + Formulário Online Preenchível ONLYOFFICE (*.oform) DOCXF Document (*.docxf) - + Modelo de formulário ONLYOFFICE (*.docxf) @@ -257,87 +257,87 @@ Presentation template (*.potx) - Modelo de Apresentação (*.potx) + Modelo de Apresentação PowerPoint Open XML (*.potx) ODP File (*.odp) - Ficheiro ODP (*.odp) + Apresentação OpenDocument (*.odp) OpenDocument Presentation Template (*.otp) - OpenDocument Modelo de Apresentação (*.otp) + Modelo de Apresentação OpenDocument (*.otp) PPSX File (*.ppsx) - Ficheiro PPSX (*.ppsx) + Apresentação de diapositivos XML Open Office (*.ppsx) XLSX File (*.xlsx) - Ficheiro XLSX (*.xlsx) + Folha de cálculo XML Open Office (*.xlsx) Spreadsheet template (*.xltx) - Modelo de Folha de Cálculo (*.xltx) + Modelo de planilha Excel Open XML (*.xltx) XLS File (*.xls) - Ficheiro XLS (*.xls) + Folha de cálculo do Excel 97-2003 (*.xls) ODS File (*.ods) - Ficheiro ODS (*.ods) + Folha de Cálculo OpenDocument (*.ods) OpenDocument Spreadsheet Template (*.ots) - OpenDocument Modelo de Folha de Cálculo (*.ots) + Modelo de Folha de Cálculo OpenDocument (*.ots) CSV File (*.csv) - Ficheiro CSV (*.csv) + Ficheiro de valores separados por vírgulas (*.csv) PDF File (*.pdf) - Ficheiro PDF (*.pdf) + Documento portátil (*.pdf) PDFA File (*.pdf) - Ficheiro PDFA (*.pdf) + Documento portátil / A (*.pdf) DJVU File (*.djvu) - Ficheiro DJVU (*.djvu) + Documento Digital (*.djvu) XPS File (*.xps) - Ficheiro XPS (*.xps) + Documento OpenXPS (*.xps) Zip Archive (*.zip) - + Arquivo de Zip (*.zip) JPG Image (*.jpg, *.jpeg) - + Imagem JPG (*.jpg *.jpeg) PNG Image (*.png) - + Imagem PNG (*.png) @@ -561,17 +561,17 @@ File %1 cannot be opened or doesn't exists. - + O ficheiro %1 não pode ser aberto ou não existe. All supported files (*.txt *.csv) - + Todos os ficheiros suportados (*.txt *.csv) All files (*.*) - Todos os Ficheiros (*.*) + Todos os Ficheiros (*.*) diff --git a/win-linux/langs/ro.ts b/win-linux/langs/ro.ts index ce8a156c9..82ff72fce 100644 --- a/win-linux/langs/ro.ts +++ b/win-linux/langs/ro.ts @@ -177,22 +177,22 @@ DOCX Document (*.docx) - Document DOCX (*.docx) + Document Office Open XML (*.docx) Document template (*.dotx) - Șablon document (*.dotx) + Șablon document Word Open XML (*.dotx) DOC Document (*.doc) - Document DOC (*.doc) + Document Word 97-2003 (*.doc) ODT Document (*.odt) - Document ODT (*.odt) + Fișierul text OpenDocument (*.odt) @@ -202,12 +202,12 @@ RTF File (*.rtf) - Fișier RTF (*.rtf) + Fișier Format text îmbogățit (*.rtf) TXT File (*.txt) - Fișier TXT (*.txt) + Fișier text simplu (*.txt) @@ -232,37 +232,37 @@ MOBI File (*.mobi) - Fișier MOBI (*.mobi) + Mobipocket e-book (*.mobi) OFORM Document (*.oform) - + Forma ONLYOFFICE spre completare online (*.oform) DOCXF Document (*.docxf) - + Șablon Formă ONLYOFFICE Document (*.docxf) PPTX File (*.pptx) - Fișier PPTX (*.pptx) + Prezentare Office Open XML (*.pptx) PPT File (*.ppt) - Fișier PPT (*.ppt) + Prezentare PowerPoint 97-2003 (*.ppt) Presentation template (*.potx) - Șablon prezentare (*.potx) + Șablon de prezentare PowerPoint Open XML (*.potx) ODP File (*.odp) - Fișier ODP (*.odp) + Prezentare OpenDocument (*.odp) @@ -272,27 +272,27 @@ PPSX File (*.ppsx) - Fișier PPSX (*.ppsx) + Expunere diapozitive Office Open XML (*.ppsx) XLSX File (*.xlsx) - Fișier XLSX (*.xlsx) + Foaia de calcul Office Open XML (*.xlsx) Spreadsheet template (*.xltx) - Șablon foaie de calcul (*.xltx) + Șablon de foaie de calcul Excel Open XML (*.xltx) XLS File (*.xls) - Fișier XLS (*.xls) + Foaia de calcul Excel 97-2003 (*.xls) ODS File (*.ods) - Fișier ODS (*.ods) + Foaie de calcul OpenDocument (*.ods) @@ -302,27 +302,27 @@ CSV File (*.csv) - Fișier CSV (*.csv) + Valori separate prin virgulă (*.csv) PDF File (*.pdf) - Fișier PDF (*.pdf) + Formatul de Document Portabil (*.pdf) PDFA File (*.pdf) - Fișier PDFA (*.pdf) + Formatul de Document Portabil / A (*.pdf) DJVU File (*.djvu) - Fișier DJVU (*.djvu) + Document Digital (*.djvu) XPS File (*.xps) - Fișier XPS (*.xps) + Document OpenXPS (*.xps) @@ -567,7 +567,7 @@ All files (*.*) - Toate fișierele (*.*) + Toate fișierele (*.*) From cce1cfa5bb6159e28d7c9f323b0ae57f42b64bac Mon Sep 17 00:00:00 2001 From: Maria-Sukhova Date: Mon, 6 Jun 2022 18:13:04 +0300 Subject: [PATCH 06/23] edit translations --- macos/Localization/hu.xliff | 4 ++-- macos/Localization/ko.xliff | 44 +++++++++++++++++----------------- macos/Localization/lo.xliff | 14 +++++------ macos/Localization/lt.xliff | 6 ++--- macos/Localization/pl.xliff | 10 ++++---- macos/Localization/pt-PT.xliff | 8 +++---- 6 files changed, 44 insertions(+), 42 deletions(-) diff --git a/macos/Localization/hu.xliff b/macos/Localization/hu.xliff index 7f86c6811..c0ec8f358 100644 --- a/macos/Localization/hu.xliff +++ b/macos/Localization/hu.xliff @@ -284,7 +284,7 @@ PowerPoint Slide Show - Open XPS-dokumentumformátum (*.xps) + Office Open XML diavetítés (*.ppsx) No comment provided by engineer. @@ -384,7 +384,7 @@ XML Paper Specification - OpenXPS dokumentum (*.xps) + Open XPS-dokumentumformátum (*.xps) No comment provided by engineer. diff --git a/macos/Localization/ko.xliff b/macos/Localization/ko.xliff index 02e770279..24ba92f19 100644 --- a/macos/Localization/ko.xliff +++ b/macos/Localization/ko.xliff @@ -119,7 +119,7 @@ Comma-Separated Values - 쉼표로 구분된 데이터 파일 (*.csv) + 쉼표로 구분된 데이터 파일(*.csv) No comment provided by engineer. @@ -134,7 +134,7 @@ DjVu File - 디지털 문서 (*.djvu) + 디지털 문서(*.djvu) No comment provided by engineer. @@ -154,12 +154,12 @@ Excel 97-2003 Spreadsheet - Excel 97-2003 스프레드시트 (*.xls) + Excel 97-2003 스프레드시트(*.xls) No comment provided by engineer. Excel 2007 Spreadsheet - Office Open XML 스프레드시트 (*.xlsx) + Office Open XML 스프레드시트(*.xlsx) No comment provided by engineer. @@ -199,7 +199,7 @@ Mobipocket e-book - MOBI 파일 (*.mobi) + 모비포켓 전자책(*.mobi) No comment provided by engineer. @@ -224,32 +224,32 @@ OpenDocument Document Template - OpenDocument 문서 템플릿 (*.ott) + OpenDocument 문서 템플릿(*.ott) No comment provided by engineer. OpenDocument Presentation Template - OpenDocument프레젠테이션 템플릿 (*.otp) + OpenDocument프레젠테이션 템플릿(*.otp) No comment provided by engineer. OpenDocument Spreadsheet Template - OpenDocument 스프레드시트 템플릿 (*.ots) + OpenDocument 스프레드시트 템플릿(*.ots) No comment provided by engineer. OpenOffice Document - 오픈도큐먼트 텍스트 문서 (*.odt) + 오픈도큐먼트 텍스트 문서(*.odt) No comment provided by engineer. OpenOffice Presentation - 오픈도큐먼트 프레젠테이션 (*.odp) + 오픈도큐먼트 프레젠테이션(*.odp) No comment provided by engineer. OpenOffice Spreadsheet - 오픈도큐먼트 스프레드시트 (*.ods) + 오픈도큐먼트 스프레드시트(*.ods) No comment provided by engineer. @@ -259,32 +259,32 @@ PDF File - 휴대용 문서 (*.pdf) + 휴대용 문서(*.pdf) No comment provided by engineer. PDF/A File - 휴대용 문서 / A (*.pdf) + 휴대용 문서 / A(*.pdf) No comment provided by engineer. Plain Text - 일반 텍스트 (*.txt) + 일반 텍스트 파일(*.txt) No comment provided by engineer. PowerPoint 97-2003 Presentation - PowerPoint 97-2003 프레젠테이션 (*.ppt) + PowerPoint 97-2003 프레젠테이션(*.ppt) No comment provided by engineer. PowerPoint 2007 Presentation - Office Open XML 프레젠테이션 (*.pptx) + Office Open XML 프레젠테이션(*.pptx) No comment provided by engineer. PowerPoint Slide Show - Office Open XML 슬라이드 쇼 (*.ppsx) + Office Open XML 슬라이드 쇼(*.ppsx) No comment provided by engineer. @@ -314,7 +314,7 @@ Rich Text Document - 서식이 있는 텍스트 형식 파일 (*.rtf) + 서식이 있는 텍스트 형식 파일(*.rtf) No comment provided by engineer. @@ -334,7 +334,7 @@ Spreadsheet template - Excel Open XML 스프레드시트 템플릿 (*.xltx) + Excel Open XML 스프레드시트 템플릿(*.xltx) No comment provided by engineer. @@ -374,17 +374,17 @@ Word 97-2003 Document - Word 97-2003 문서 (*.doc) + Word 97-2003 문서(*.doc) No comment provided by engineer. Word 2007 Document - Office Open XML 문서 (*.docx) + Office Open XML 문서(*.docx) No comment provided by engineer. XML Paper Specification - OpenXPS 문서 (*.xps) + OpenXPS 문서(*.xps) No comment provided by engineer. diff --git a/macos/Localization/lo.xliff b/macos/Localization/lo.xliff index fe6d7f9cb..9a27c2b9e 100644 --- a/macos/Localization/lo.xliff +++ b/macos/Localization/lo.xliff @@ -32,7 +32,7 @@ Class = "NSButtonCell"; title = "Cancel"; ObjectID = "GOU-av-TC1"; Load a Private Key - Load a Private Key + ໂຫຼດລະຫັດສ່ວນຕົວ Class = "NSButtonCell"; title = "Load a Private Key"; ObjectID = "P3k-kI-w22"; @@ -199,7 +199,7 @@ No comment provided by engineer. Mobipocket e-book - ປຶ້ມອີເລັກໂຕຮນິກແບບພົກພາ (*.mobi) + ໄຟລ໌ Mobipocket e-book (*. mobi) No comment provided by engineer. @@ -239,7 +239,7 @@ No comment provided by engineer. OpenOffice Document - ຄວາມເອກະສານ (*.odt) + ເປີດເອກະສານໄຟລ໌ Text (*.odt) No comment provided by engineer. @@ -249,7 +249,7 @@ No comment provided by engineer. OpenOffice Spreadsheet - ເປິດຕາຕະລາງເອກະສານ (*.ods) + ເປີດເອກະສານໃນຮູບແບບຕາຕະລາງ (*.ods) No comment provided by engineer. @@ -259,17 +259,17 @@ No comment provided by engineer. PDF File - ເອກະສານພົກພາ (*.pdf) + ເອກະສານແບບພົກພາ (*.pdf) No comment provided by engineer. PDF/A File - ເອກະສານພົກພາ /A (*.pdf) + ເອກະສານແບບພົກພາ /A (*.pdf) No comment provided by engineer. Plain Text - ໄຟລ໌ Text ທຳມະດາ (*.txt) + ໄຟລ໌ຂໍ້ຄວາມທຳມະດາ (*.txt) No comment provided by engineer. diff --git a/macos/Localization/lt.xliff b/macos/Localization/lt.xliff index 60ccb7cfd..46dcde38f 100644 --- a/macos/Localization/lt.xliff +++ b/macos/Localization/lt.xliff @@ -112,7 +112,7 @@ Document template - OpenDocument Dokumento šablonas (*.ott) + Word Open XML Dokumento šablonas (*.dotx) Excel 97-2003 Spreadsheet @@ -208,11 +208,11 @@ Plain Text - Paprastas Tekstas (*.rtf) + Paprastas Tekstas (*.txt) PowerPoint 97-2003 Presentation - PowerPoint 97-2003 Prezentacija (*.ppt) + PowerPoint 97-2003 Prezentacija (*.ppt) PowerPoint 2007 Presentation diff --git a/macos/Localization/pl.xliff b/macos/Localization/pl.xliff index e4f2e2465..d0cd04186 100644 --- a/macos/Localization/pl.xliff +++ b/macos/Localization/pl.xliff @@ -154,11 +154,12 @@ Don't Save + Nie zapisuj No comment provided by engineer. Electronic Publication - Plik EPUB (*.epub) + Plik Electronic Publication (*.epub) No comment provided by engineer. @@ -173,7 +174,7 @@ FictionBook File - Plik FB2 (*.fb2) + Plik FictionBook 2 (*.fb2) No comment provided by engineer. @@ -193,7 +194,7 @@ HTML File - Plik HTML (*.html) + Plik HyperText Markup Language (*.html) No comment provided by engineer. @@ -218,7 +219,7 @@ MHT File - Plik MHT (*.mht) + Plik Web Page Archive (*.mht) No comment provided by engineer. @@ -408,6 +409,7 @@ With access to pro features + Z dostępem do funkcji pro No comment provided by engineer. diff --git a/macos/Localization/pt-PT.xliff b/macos/Localization/pt-PT.xliff index 39b9dbdd2..ea31c9860 100644 --- a/macos/Localization/pt-PT.xliff +++ b/macos/Localization/pt-PT.xliff @@ -142,7 +142,7 @@ No comment provided by engineer. - Document templateModelo de documento Excel Open XML (*.xltx) + Document templateModelo de documento Word Open XML (*.dotx) No comment provided by engineer. @@ -256,17 +256,17 @@ No comment provided by engineer. Plain Text - Texto Simples (*.txt) + Documento de Texto Simples (*.txt) No comment provided by engineer. PowerPoint 97-2003 Presentation - Apresentação em PowerPoint 97-2003 (*.doc) + Apresentação em PowerPoint 97-2003 (*.ppt) No comment provided by engineer. PowerPoint 2007 Presentation - Apresentação em XML Open Office (*.docx) + Apresentação em XML Open Office (*.pptx) No comment provided by engineer. From b0721bb1e4ef17aaccb7c26e5f83f804fa494f46 Mon Sep 17 00:00:00 2001 From: Roman Demidov Date: Tue, 7 Jun 2022 16:37:32 +0300 Subject: [PATCH 07/23] Fix bug #57072 : r7-office scheme doesn't works from browser (#461) --- win-linux/package/linux/Makefile | 6 ++++++ .../common/usr/share/applications/desktopeditors.desktop.m4 | 2 +- win-linux/package/linux/deb/template/postinst.m4 | 4 ++-- win-linux/package/linux/rpm/common.spec | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/win-linux/package/linux/Makefile b/win-linux/package/linux/Makefile index 30289d80d..c0f7a25c7 100644 --- a/win-linux/package/linux/Makefile +++ b/win-linux/package/linux/Makefile @@ -156,6 +156,9 @@ ifneq ($(COMPANY_NAME), ONLYOFFICE) M4_PARAMS += -D M4_MEDIAVIEWER_PREFIX='$(MEDIAVIEWER_PREFIX)' M4_PARAMS += -D M4_IMAGEVIEWER_EXEC='$(IMAGEVIEWER_EXEC)' M4_PARAMS += -D M4_VIDEOPLAYER_EXEC='$(VIDEOPLAYER_EXEC)' + M4_PARAMS += -D M4_SCHEME_HANDLER='$(COMPANY_NAME_LOW)' +else + M4_PARAMS += -D M4_SCHEME_HANDLER='oo-office' endif M4_PARAMS += -D M4_DEB_ARCH='$(DEB_ARCH)' ifdef ASTRALINUX_KEYS_DIR @@ -180,6 +183,9 @@ ifneq ($(COMPANY_NAME), ONLYOFFICE) RPM_PARAMS += --define '_mediaviewer_prefix $(MEDIAVIEWER_PREFIX)' RPM_PARAMS += --define '_imageviewer_exec $(IMAGEVIEWER_EXEC)' RPM_PARAMS += --define '_videoplayer_exec $(VIDEOPLAYER_EXEC)' + RPM_PARAMS += --define '_scheme_handler $(COMPANY_NAME_LOW)' +else + RPM_PARAMS += --define '_scheme_handler oo-office' endif RPM_PARAMS += --define '_binary_payload w7.xzdio' diff --git a/win-linux/package/linux/common/usr/share/applications/desktopeditors.desktop.m4 b/win-linux/package/linux/common/usr/share/applications/desktopeditors.desktop.m4 index a88e9e3ce..346187c64 100644 --- a/win-linux/package/linux/common/usr/share/applications/desktopeditors.desktop.m4 +++ b/win-linux/package/linux/common/usr/share/applications/desktopeditors.desktop.m4 @@ -24,7 +24,7 @@ Terminal=false Icon=M4_PACKAGE_NAME Keywords=Text;Document;OpenDocument Text;Microsoft Word;Microsoft Works;odt;doc;docx;rtf; Categories=Office;WordProcessor;Spreadsheet;Presentation; -MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/msword;application/vnd.ms-word;application/x-doc;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;text/spreadsheet;application/csv;application/excel;application/x-excel;application/x-msexcel;application/x-ms-excel;text/comma-separated-values;text/tab-separated-values;text/x-comma-separated-values;text/x-csv;application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.slide;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;x-scheme-handler/oo-office;text/docxf;text/oform; +MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/msword;application/vnd.ms-word;application/x-doc;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;text/spreadsheet;application/csv;application/excel;application/x-excel;application/x-msexcel;application/x-ms-excel;text/comma-separated-values;text/tab-separated-values;text/x-comma-separated-values;text/x-csv;application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.slide;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;x-scheme-handler/M4_SCHEME_HANDLER;text/docxf;text/oform; Actions=NewDocument;NewSpreadsheet;NewPresentation; [Desktop Action NewDocument] diff --git a/win-linux/package/linux/deb/template/postinst.m4 b/win-linux/package/linux/deb/template/postinst.m4 index 0bc5ca625..340624f4d 100644 --- a/win-linux/package/linux/deb/template/postinst.m4 +++ b/win-linux/package/linux/deb/template/postinst.m4 @@ -24,8 +24,8 @@ MIMEAPPS_LIST="/usr/share/applications/mimeapps.list" if [ ! -f "$MIMEAPPS_LIST" ]; then echo "[Default Applications]" >"$MIMEAPPS_LIST" fi -if [ $(cat "$MIMEAPPS_LIST" | grep x-scheme-handler/oo-office | wc -l) -eq "0" ]; then - echo "x-scheme-handler/oo-office=M4_DESKTOPEDITORS_EXEC.desktop" >>"$MIMEAPPS_LIST" +if [ $(cat "$MIMEAPPS_LIST" | grep x-scheme-handler/M4_SCHEME_HANDLER | wc -l) -eq "0" ]; then + echo "x-scheme-handler/M4_SCHEME_HANDLER=M4_DESKTOPEDITORS_EXEC.desktop" >>"$MIMEAPPS_LIST" fi if [ $(cat "$MIMEAPPS_LIST" | grep text/docxf | wc -l) -eq "0" ]; then echo "text/docxf=M4_DESKTOPEDITORS_EXEC.desktop" >>"$MIMEAPPS_LIST" diff --git a/win-linux/package/linux/rpm/common.spec b/win-linux/package/linux/rpm/common.spec index 053264bca..cf2bb09ab 100644 --- a/win-linux/package/linux/rpm/common.spec +++ b/win-linux/package/linux/rpm/common.spec @@ -96,8 +96,8 @@ MIMEAPPS_LIST="/usr/share/applications/mimeapps.list" if [ ! -f "$MIMEAPPS_LIST" ]; then echo "[Default Applications]" >"$MIMEAPPS_LIST" fi -if [ $(cat "$MIMEAPPS_LIST" | grep x-scheme-handler/oo-office | wc -l) -eq "0" ]; then - echo "x-scheme-handler/oo-office=%{_desktopeditors_exec}.desktop" >>"$MIMEAPPS_LIST" +if [ $(cat "$MIMEAPPS_LIST" | grep x-scheme-handler/%{_scheme_handler} | wc -l) -eq "0" ]; then + echo "x-scheme-handler/%{_scheme_handler}=%{_desktopeditors_exec}.desktop" >>"$MIMEAPPS_LIST" fi if [ $(cat "$MIMEAPPS_LIST" | grep text/docxf | wc -l) -eq "0" ]; then echo "text/docxf=%{_desktopeditors_exec}.desktop" >>"$MIMEAPPS_LIST" From 260c4dfe11713bdac6c22442b3ba4631bc7155b9 Mon Sep 17 00:00:00 2001 From: Maria-Sukhova Date: Tue, 7 Jun 2022 19:07:44 +0300 Subject: [PATCH 08/23] edit formats descriptions --- win-linux/langs/be.ts | 58 ++++++++++++++++----------------- win-linux/langs/bg.ts | 4 +-- win-linux/langs/ca.ts | 10 +++--- win-linux/langs/cs.ts | 4 +-- win-linux/langs/da.ts | 10 +++--- win-linux/langs/de.ts | 12 +++---- win-linux/langs/el_GR.ts | 2 +- win-linux/langs/en.ts | 2 +- win-linux/langs/es.ts | 2 +- win-linux/langs/et.ts | 10 +++--- win-linux/langs/fi.ts | 10 +++--- win-linux/langs/fr.ts | 4 +-- win-linux/langs/ga.ts | 10 +++--- win-linux/langs/ro.ts | 20 ++++++------ win-linux/langs/ru.ts | 2 +- win-linux/langs/sk.ts | 66 ++++++++++++++++++------------------- win-linux/langs/sl.ts | 70 ++++++++++++++++++++-------------------- win-linux/langs/sv.ts | 54 +++++++++++++++---------------- win-linux/langs/tr.ts | 66 ++++++++++++++++++------------------- win-linux/langs/uk.ts | 66 ++++++++++++++++++------------------- win-linux/langs/vi.ts | 66 ++++++++++++++++++------------------- win-linux/langs/zh_CN.ts | 36 ++++++++++----------- win-linux/langs/zh_HK.ts | 60 +++++++++++++++++----------------- 23 files changed, 322 insertions(+), 322 deletions(-) diff --git a/win-linux/langs/be.ts b/win-linux/langs/be.ts index ac7b51175..dab9c71d8 100644 --- a/win-linux/langs/be.ts +++ b/win-linux/langs/be.ts @@ -177,22 +177,22 @@ DOCX Document (*.docx) - Дакумент DOCX (*.docx) + Дакумент Office Open XML (*.docx) Document template (*.dotx) - Шаблон дакумента (*.dotx) + Шаблон дакумента Word Open XML (*.dotx) DOC Document (*.doc) - Дакумент DOC (*.doc) + Дакумент Word 97-2003 (*.doc) ODT Document (*.odt) - Дакумент ODT (*.odt) + Тэкставы файл OpenDocument (*.odt) @@ -202,12 +202,12 @@ RTF File (*.rtf) - Файл RTF (* .rtf) + Багаты тэкставы дакумент (*.rtf) TXT File (*.txt) - Файл TXT (*.txt) + Просты тэкст (*.txt) @@ -222,47 +222,47 @@ EPUB File (*.epub) - Файл EPUB (*.epub) + Электронная публікацыя (*.epub) FB2 File (*.fb2) - FB2 файл (*.fb2) + Файл FictionBook (*.fb2) MOBI File (*.mobi) - Файл MOBI (*.mobi) + Электронная кніга mobipocket (*.mobi) OFORM Document (*.oform) - + Запаўняльная анлайн-форма ONLYOFFICE (*.oform) DOCXF Document (*.docxf) - + Шаблон формы ONLYOFFICE (*.docxf) PPTX File (*.pptx) - Файл PPTX (*.pptx) + Прэзентацыя Office Open XML (*.pptx) PPT File (*.ppt) - Файл PPT (*.ppt) + Прэзентацыя PowerPoint 97-2003 (*.ppt) Presentation template (*.potx) - Шаблон прэзентацыі (*.potx) + Шаблон прэзентацыі PowerPoint Open XML (*.potx) ODP File (*.odp) - Файл ODP (*.odp) + Прэзентацыя OpenDocument (*.odp) @@ -272,27 +272,27 @@ PPSX File (*.ppsx) - Файл PPSX (*.ppsx) + Слайд-шоў Office Open XML (*.ppsx) XLSX File (*.xlsx) - Файл XLSX (*.xlsx) + Электронная табліца Office Open XML (*.xlsx) Spreadsheet template (*.xltx) - Шаблон табліцы (*.xltx) + Шаблон табліцы Excel Open XML (*.xltx) XLS File (*.xls) - Файл XLS (*.xls) + Электронная табліца Excel 97-2003 (*.xls) ODS File (*.ods) - Файл ODS (*.ods) + Электронная табліца OpenDocument (*.ods) @@ -302,42 +302,42 @@ CSV File (*.csv) - Файл CSV (*.csv) + Значэнні, падзеленыя коскамі (*.csv) PDF File (*.pdf) - Файл PDF (*.pdf) + Пераносны дакумент (*.pdf) PDFA File (*.pdf) - Файл PDFA (*.pdf) + Пераносны дакумент /A (*.pdf) DJVU File (*.djvu) - Файл DJVU (*.djvu) + Лічбавы дакумент (*.djvu) XPS File (*.xps) - Файл XPS (*.xps) + Дакумент OpenXPS (*.xps) Zip Archive (*.zip) - + Zip-архіў (*.zip) JPG Image (*.jpg, *.jpeg) - + Выява JPG (*.jpg *.jpeg) PNG Image (*.png) - + Выява PNG (*.png) @@ -567,7 +567,7 @@ All files (*.*) - Усе файлы (*.*) + Усе файлы (*.*) diff --git a/win-linux/langs/bg.ts b/win-linux/langs/bg.ts index 6bd082765..9c21a145b 100644 --- a/win-linux/langs/bg.ts +++ b/win-linux/langs/bg.ts @@ -242,7 +242,7 @@ DOCXF Document (*.docxf) - ONLYOFFICE шаблон на формуляр (*.docxf) + ONLYOFFICE Шаблон на формуляр (*.docxf) @@ -312,7 +312,7 @@ PDFA File (*.pdf) - Преносим документ (*.pdf) + Преносим документ /A (*.pdf) diff --git a/win-linux/langs/ca.ts b/win-linux/langs/ca.ts index 8bfaa42e8..62990c1cb 100644 --- a/win-linux/langs/ca.ts +++ b/win-linux/langs/ca.ts @@ -252,7 +252,7 @@ PPT File (*.ppt) - Presentació de diapositives PowerPoint 97-2003 (*.ppt) + Presentació PowerPoint 97-2003 (*.ppt) @@ -312,7 +312,7 @@ PDFA File (*.pdf) - Document portàtil / A (*.pdf) + Document portàtil /A (*.pdf) @@ -327,17 +327,17 @@ Zip Archive (*.zip) - + Arxiu Zip (*.zip) JPG Image (*.jpg, *.jpeg) - + Imatge JPG (*.jpg *.jpeg) PNG Image (*.png) - + Imatge PNG (*.png) diff --git a/win-linux/langs/cs.ts b/win-linux/langs/cs.ts index 1c4c7d02c..508d06bb6 100644 --- a/win-linux/langs/cs.ts +++ b/win-linux/langs/cs.ts @@ -282,7 +282,7 @@ Spreadsheet template (*.xltx) - Otevřená šablona tabulky XML aplikace Excel (*.xltx) + Šablona sešitu Excel Open XML (*.xltx) @@ -312,7 +312,7 @@ PDFA File (*.pdf) - Přenosný dokument / A (*.pdf) + Přenosný dokument /A (*.pdf) diff --git a/win-linux/langs/da.ts b/win-linux/langs/da.ts index 80f5f2f77..a38fb1714 100644 --- a/win-linux/langs/da.ts +++ b/win-linux/langs/da.ts @@ -307,12 +307,12 @@ PDF File (*.pdf) - PDF Fil (*.pdf) + Portable Document (*.pdf) PDFA File (*.pdf) - PDFA Fil (*.pdf) + Portable Document /A (*.pdf) @@ -327,17 +327,17 @@ Zip Archive (*.zip) - + Zip-arkiv (*.zip) JPG Image (*.jpg, *.jpeg) - + JPG-billede (*.jpg *.jpeg) PNG Image (*.png) - + PNG-billede (*.png) diff --git a/win-linux/langs/de.ts b/win-linux/langs/de.ts index 4ec3cb7dc..4f6a94f68 100644 --- a/win-linux/langs/de.ts +++ b/win-linux/langs/de.ts @@ -212,7 +212,7 @@ HTML File (*.html) - HTML-Datei (*.html) + HyperText Markup Language-Datei (*.html) @@ -222,17 +222,17 @@ EPUB File (*.epub) - EPUB-Datei (*.epub) + Elektronische Publikation (*.epub) FB2 File (*.fb2) - FB2-Datei (*.fb2) + FictionBook-Datei (*.fb2) MOBI File (*.mobi) - MOBI-Datei (*.mobi) + Mobipocket-Datei (*.mobi) @@ -312,7 +312,7 @@ PDFA File (*.pdf) - Portables Dokumentenformat / A (*.pdf) + Portables Dokumentenformat /A (*.pdf) @@ -337,7 +337,7 @@ PNG Image (*.png) - PNG- Bild (*.png) + PNG-Bild (*.png) diff --git a/win-linux/langs/el_GR.ts b/win-linux/langs/el_GR.ts index 0b9858771..d1ea66a34 100644 --- a/win-linux/langs/el_GR.ts +++ b/win-linux/langs/el_GR.ts @@ -312,7 +312,7 @@ PDFA File (*.pdf) - Φορητό έγγραφο / A (*.pdf) + Φορητό έγγραφο /A (*.pdf) diff --git a/win-linux/langs/en.ts b/win-linux/langs/en.ts index 5fb627e42..714bef9a7 100644 --- a/win-linux/langs/en.ts +++ b/win-linux/langs/en.ts @@ -308,7 +308,7 @@ PDFA File (*.pdf) - Portable Document / A (*.pdf) + Portable Document /A (*.pdf) diff --git a/win-linux/langs/es.ts b/win-linux/langs/es.ts index b3e84ec6e..457fea8b9 100644 --- a/win-linux/langs/es.ts +++ b/win-linux/langs/es.ts @@ -312,7 +312,7 @@ PDFA File (*.pdf) - Documento portátil / A (*.pdf) + Documento portátil /A (*.pdf) diff --git a/win-linux/langs/et.ts b/win-linux/langs/et.ts index 9ecf72918..04794a4f3 100644 --- a/win-linux/langs/et.ts +++ b/win-linux/langs/et.ts @@ -187,7 +187,7 @@ DOC Document (*.doc) - Word 97-2003 document (*.doc) + Word 97-2003 dokument (*.doc) @@ -312,7 +312,7 @@ PDFA File (*.pdf) - Porditav document / A (*.pdf) + Porditav document /A (*.pdf) @@ -327,17 +327,17 @@ Zip Archive (*.zip) - + Zip-arhiiv (*.zip) JPG Image (*.jpg, *.jpeg) - + JPG-pilt (*.jpg *.jpeg) PNG Image (*.png) - + PNG-pilt (*.png) diff --git a/win-linux/langs/fi.ts b/win-linux/langs/fi.ts index 6585861b8..f52409387 100644 --- a/win-linux/langs/fi.ts +++ b/win-linux/langs/fi.ts @@ -187,7 +187,7 @@ DOC Document (*.doc) - Word 97–2003 -asiakirja (*.doc) + Word 97–2003-asiakirja (*.doc) @@ -252,7 +252,7 @@ PPT File (*.ppt) - PowerPoint 97–2003 -esitys (*.ppt) + PowerPoint 97–2003-esitys (*.ppt) @@ -287,7 +287,7 @@ XLS File (*.xls) - Excel 97–2003 -laskentataulukko (*.xls) + Excel 97–2003-laskentataulukko (*.xls) @@ -312,7 +312,7 @@ PDFA File (*.pdf) - Kannettava asiakirja / A (*.pdf) + Kannettava asiakirja /A (*.pdf) @@ -322,7 +322,7 @@ XPS File (*.xps) - OpenXPS-asiakirja(*.xps) + OpenXPS-asiakirja (*.xps) diff --git a/win-linux/langs/fr.ts b/win-linux/langs/fr.ts index 5941bf631..e6102bbb6 100644 --- a/win-linux/langs/fr.ts +++ b/win-linux/langs/fr.ts @@ -232,7 +232,7 @@ MOBI File (*.mobi) - Fichier Mobipocket (*.mobi) + Livre électronique Mobipocket (*.mobi) @@ -312,7 +312,7 @@ PDFA File (*.pdf) - Document portable / A (*.pdf) + Document portable /A (*.pdf) diff --git a/win-linux/langs/ga.ts b/win-linux/langs/ga.ts index e8d89aad3..063910792 100644 --- a/win-linux/langs/ga.ts +++ b/win-linux/langs/ga.ts @@ -307,17 +307,17 @@ PDF File (*.pdf) - Comhad PDF (*.pdf) + Comhad PDF (*.pdf) PDFA File (*.pdf) - Comhad PDFA (*.pdf) + Comhad PDFA (*.pdf) DJVU File (*.djvu) - Comhad DjVu (*.djvu) + Comhad DjVu (*.djvu) @@ -332,12 +332,12 @@ JPG Image (*.jpg, *.jpeg) - + Íomha JPG (*.jpg *.jpeg) PNG Image (*.png) - + Íomha PNG (*.png) diff --git a/win-linux/langs/ro.ts b/win-linux/langs/ro.ts index 82ff72fce..8bfa5c3ba 100644 --- a/win-linux/langs/ro.ts +++ b/win-linux/langs/ro.ts @@ -212,22 +212,22 @@ HTML File (*.html) - Fișier HTML (*.html) + Fișier în format hipertext (*.html) MHT File (*.mht) - Fișier MHT (*.mht) + Fișier de arhivă MHTML Web Archive (*.mht) EPUB File (*.epub) - Fișier EPUB (*.epub) + Fișier în format publicare electronică (*.epub) FB2 File (*.fb2) - Fișier FB2 (*.fb2) + Fișier FictionBook 2 (*.fb2) @@ -312,7 +312,7 @@ PDFA File (*.pdf) - Formatul de Document Portabil / A (*.pdf) + Formatul de Document Portabil /A (*.pdf) @@ -327,17 +327,17 @@ Zip Archive (*.zip) - + Arhivă Zip (*.zip) JPG Image (*.jpg, *.jpeg) - + Imagine JPG (*.jpg *.jpeg) PNG Image (*.png) - + Imagine PNG (*.png) @@ -557,12 +557,12 @@ File %1 cannot be opened or doesn't exists. - + Fișierul %1 nu se deschide sau nu există. All supported files (*.txt *.csv) - + Toate fișierele acceptate (*.txt *.csv) diff --git a/win-linux/langs/ru.ts b/win-linux/langs/ru.ts index f0987e2e1..c1bad6aef 100644 --- a/win-linux/langs/ru.ts +++ b/win-linux/langs/ru.ts @@ -312,7 +312,7 @@ PDFA File (*.pdf) - Переносимый документ / A (*.pdf) + Переносимый документ /A (*.pdf) diff --git a/win-linux/langs/sk.ts b/win-linux/langs/sk.ts index ea655758b..e41291445 100644 --- a/win-linux/langs/sk.ts +++ b/win-linux/langs/sk.ts @@ -177,22 +177,22 @@ DOCX Document (*.docx) - DOCX Dokument (*.docx) + Dokument Office Open XML (*.docx) Document template (*.dotx) - Šablóna dokumentu (*.dotx) + Šablóna dokumentu Word Open XML (*.dotx) DOC Document (*.doc) - DOC Dokument (*.doc) + Dokument Word 97-2003 (*.doc) ODT Document (*.odt) - ODT Dokument (*.odt) + Textový súbor OpenDocument (*.odt) @@ -202,67 +202,67 @@ RTF File (*.rtf) - RTF Súbor (*.rtf) + Súbor vo formáte RTF (*.rtf) TXT File (*.txt) - TXT Súbor (*.txt) + Súbor obyčajného textu (*.txt) HTML File (*.html) - HTML Súbor (*.html) + Súbor hypertextového značkovacieho jazyka (*.html) MHT File (*.mht) - MHT Súbor (*.mht) + Archívny súbor webovej stránky (*.mht) EPUB File (*.epub) - EPUB Súbor (*.epub) + Elektronický publikačný súbor (*.epub) FB2 File (*.fb2) - FB2 Súbor (*.fb2) + Súbor FictionBook 2 (*.fb2) MOBI File (*.mobi) - MOBI Súbor (*.mobi) + E-kniha Mobipocket (*.mobi) OFORM Document (*.oform) - + ONLYOFFICE vyplniteľný online formulár (*.oform) DOCXF Document (*.docxf) - + Šablóna formulára ONLYOFFICE (*.docxf) PPTX File (*.pptx) - PPTX Súbor (*.pptx) + Prezentácia Office Open XML (*.pptx) PPT File (*.ppt) - PPT Súbor (*.ppt) + Prezentácia PowerPoint 97-2003 (*.ppt) Presentation template (*.potx) - Šablóna prezentácie (*.potx) + Šablóna prezentácie PowerPoint Open XML (*.potx) ODP File (*.odp) - ODP Súbor (*.odp) + Prezentácia OpenDocument (*.odp) @@ -272,27 +272,27 @@ PPSX File (*.ppsx) - PPSX Súbor (*.ppsx) + Premietanie slajdov Office Open XML (*.ppsx) XLSX File (*.xlsx) - XLSX Súbor (*.xlsx) + Tabuľka Office Open XML (*.xlsx) Spreadsheet template (*.xltx) - Šablóna zošitu (*.xltx) + Šablóna zošitu Excel Open XML (*.xltx) XLS File (*.xls) - XLS Súbor (*.xls) + Tabuľka Excel 97-2003 (*.xls) ODS File (*.ods) - ODS Súbor (*.ods) + Tabuľka OpenDocument (*.ods) @@ -302,42 +302,42 @@ CSV File (*.csv) - CSV Súbor (*.csv) + Hodnoty oddelené čiarkami (*.csv) PDF File (*.pdf) - PDF Súbor (*.pdf) + Prenosný document (*.pdf) PDFA File (*.pdf) - PDFA Súbor (*.pdf) + Prenosný document /A (*.pdf) DJVU File (*.djvu) - DJVU Súbor (*.djvu) + Digitálny document (*.djvu) XPS File (*.xps) - XPS Súbor (*.xps) + Dokument OpenXPS (*.xps) Zip Archive (*.zip) - + Archív zip (*.zip) JPG Image (*.jpg, *.jpeg) - + Obrázok JPG (*.jpg *.jpeg) PNG Image (*.png) - + Obrázok PNG (*.png) @@ -561,17 +561,17 @@ File %1 cannot be opened or doesn't exists. - + Súbor %1 sa nedá otvoriť alebo neexistuje. All supported files (*.txt *.csv) - + Všetky podporované súbory (*.txt *.csv) All files (*.*) - Všetky súbory (*.*) + Všetky súbory (*.*) diff --git a/win-linux/langs/sl.ts b/win-linux/langs/sl.ts index add7fb1c0..9db7c7416 100644 --- a/win-linux/langs/sl.ts +++ b/win-linux/langs/sl.ts @@ -177,22 +177,22 @@ DOCX Document (*.docx) - DOCX dokument (*.docx) + Office Open XML dokument (*.docx) Document template (*.dotx) - Predloga dokumenta (*.dotx) + Word Open XML predloga dokumenta (*.dotx) DOC Document (*.doc) - DOC dokument (*.doc) + Word 97-2003 dokument (*.doc) ODT Document (*.odt) - ODT dokument (*.odt) + OpenDocument besedilna datoteka (*.odt) @@ -202,142 +202,142 @@ RTF File (*.rtf) - RTF datoteka (*.rtf) + Rich Text Format datoteka (*.rtf) TXT File (*.txt) - TXT datoteka (*.txt) + Plain Text datoteka (*.txt) HTML File (*.html) - HTML datoteka (*.html) + HyperText Markup Language datoteka (*.html) MHT File (*.mht) - MHT datoteka (*.mht) + Web Page Archive datoteka (*.mht) EPUB File (*.epub) - EPUB datoteka (*.epub) + Electronic Publication datoteka (*.epub) FB2 File (*.fb2) - FB2 datoteka (*.fb2) + FictionBook 2 datoteka (*.fb2) MOBI File (*.mobi) - MOBI datoteka (*.mobi) + Mobipocket e-knjiga (*.mobi) OFORM Document (*.oform) - + ONLYOFFICE spletni obrazec z izpolnjevanjem (*.oform) DOCXF Document (*.docxf) - + ONLYOFFICE predloga obrazca (*.docxf) PPTX File (*.pptx) - PPTX datoteka (*.pptx) + Office Open XML predstavitev (*.pptx) PPT File (*.ppt) - PPT datoteka (*.ppt) + PowerPoint 97-2003 predstavitev (*.ppt) Presentation template (*.potx) - Predloga predstavitve (*.potx) + PowerPoint Open XML predloga predstavitve (*.potx) ODP File (*.odp) - ODP datoteka (*.odp) + OpenDocument predstavitev (*.odp) OpenDocument Presentation Template (*.otp) - OpenDocument Predloga predstavitve (*.otp) + OpenDocument predloga predstavitve (*.otp) PPSX File (*.ppsx) - PPSX datoteka (*.ppsx) + Office Open XML predstavitev (*.ppsx) XLSX File (*.xlsx) - XLSX datoteka (*.xlsx) + Office Open XML preglednica (*.xlsx) Spreadsheet template (*.xltx) - Predloga preglednice (*.xltx) + Excel Open XML predloga preglednice (*.xltx) XLS File (*.xls) - XLS datoteka (*.xls) + Excel 97-2003 preglednica (*.xls) ODS File (*.ods) - ODS datoteka (*.ods) + OpenDocument preglednica (*.ods) OpenDocument Spreadsheet Template (*.ots) - OpenDocument Predloga preglednice (*.ots) + OpenDocument predloga preglednice (*.ots) CSV File (*.csv) - CSV datoteka (*.csv) + Vrednosti, ločene z vejico (*.csv) PDF File (*.pdf) - PDF datoteka (*.pdf) + Prenosni document (*.pdf) PDFA File (*.pdf) - PDFA datoteka (*.pdf) + Prenosni document /A (*.pdf) DJVU File (*.djvu) - DJVU datoteka (*.djvu) + Digitalni document (*.djvu) XPS File (*.xps) - XPS datoteka (*.xps) + OpenXPS dokument (*.xps) Zip Archive (*.zip) - + Zip arhiv (*.zip) JPG Image (*.jpg, *.jpeg) - + JPG slika (*.jpg *.jpeg) PNG Image (*.png) - + PNG slika (*.png) @@ -561,17 +561,17 @@ File %1 cannot be opened or doesn't exists. - + Datoteka %1 ne more biti odprta ali ne obstaja. All supported files (*.txt *.csv) - + Vse podprte datoteke (*.txt *.csv) All files (*.*) - Vse datoteke (*.*) + Vse datoteke (*.*) diff --git a/win-linux/langs/sv.ts b/win-linux/langs/sv.ts index 1a40c050a..6c93ad8b0 100644 --- a/win-linux/langs/sv.ts +++ b/win-linux/langs/sv.ts @@ -177,22 +177,22 @@ DOCX Document (*.docx) - DOCX-dokument (*.docx) + Office Open XML-document (*.docx) Document template (*.dotx) - Dokumentmall (*.dotx) + Word Open XML-dokumentmall (*.dotx) DOC Document (*.doc) - DOC-dokument (*.doc) + Word 97-2003-dokument (*.doc) ODT Document (*.odt) - ODT-dokument (*.odt) + OpenDocument-textfil (*.odt) @@ -202,12 +202,12 @@ RTF File (*.rtf) - RTF-fil (*.rtf) + Rich Text Format-fil (*.rtf) TXT File (*.txt) - TXT-fil (*.txt) + Oformaterad text (*.txt) @@ -232,37 +232,37 @@ MOBI File (*.mobi) - MOBI-fil (*.mobi) + Mobipocket e-bokl (*.mobi) OFORM Document (*.oform) - + ONLYOFFICE ifyllbart onlineformulär (*.oform) DOCXF Document (*.docxf) - + ONLYOFFICE formulärmall (*.docxf) PPTX File (*.pptx) - PPTX-fil (*.pptx) + Office Open XML-presentation (*.pptx) PPT File (*.ppt) - PPT-fil (*.ppt) + PowerPoint 97-2003-presentation (*.ppt) Presentation template (*.potx) - Presentationsmall (*.potx) + PowerPoint Open XML-presentationsmall (*.potx) ODP File (*.odp) - ODP-fil (*.odp) + OpenDocument-presentation (*.odp) @@ -272,27 +272,27 @@ PPSX File (*.ppsx) - PPSX-fil (*.ppsx) + Office Open XML-bildspel (*.ppsx) XLSX File (*.xlsx) - XLSX-fil (*.xlsx) + Office Open XML-kalkylblad (*.xlsx) Spreadsheet template (*.xltx) - Kalkylbladsmall (*.xltx) + Excel Open XML-kalkylbladsmall (*.xltx) XLS File (*.xls) - XLS-fil (*.xls) + Excel 97-2003-kalkylblad (*.xls) ODS File (*.ods) - ODS-fil (*.ods) + OpenDocument-kalkylblad (*.ods) @@ -302,42 +302,42 @@ CSV File (*.csv) - CSV-fil (*.csv) + Kommaavgränsade värden (*.csv) PDF File (*.pdf) - PDF-fil (*.pdf) + Portabelt dokumentformat (*.pdf) PDFA File (*.pdf) - PDFA-fil (*.pdf) + Portabelt dokumentformat /A-fil (*.pdf) DJVU File (*.djvu) - DJVU-fil (*.djvu) + Digitalt document (*.djvu) XPS File (*.xps) - XPS-fil (*.xps) + OpenXPS-dokument (*.xps) Zip Archive (*.zip) - + Zip-arkiv (*.zip) JPG Image (*.jpg, *.jpeg) - + JPG-bild (*.jpg *.jpeg) PNG Image (*.png) - + PNG-bild (*.png) @@ -567,7 +567,7 @@ All files (*.*) - Alla filer (*.*) + Alla filer (*.*) diff --git a/win-linux/langs/tr.ts b/win-linux/langs/tr.ts index 592380346..f3b2c2672 100644 --- a/win-linux/langs/tr.ts +++ b/win-linux/langs/tr.ts @@ -177,22 +177,22 @@ DOCX Document (*.docx) - DOCX Belgesi (*.docx) + Office Open XML Belgesi (*.docx) Document template (*.dotx) - Belge şablonu (*.dotx) + Word Open XML Belge şablonu (*.dotx) DOC Document (*.doc) - DOC Belgesi (*.doc) + Word 97-2003 Belgesi (*.doc) ODT Document (*.odt) - ODT Belgesi (*.odt) + OpenDocument Metin dosyası (*.odt) @@ -202,67 +202,67 @@ RTF File (*.rtf) - RTF Dosyası (*.rtf) + Zengin Metin Format Dosyası (*.rtf) TXT File (*.txt) - TXT Dosyası (*.txt) + Düz Metin Dosyası (*.txt) HTML File (*.html) - HTML Dosyası (*.html) + Köprü Metni İşaretleme Dili Dosyası (*.html) MHT File (*.mht) - MHT Dosyası (*.mht) + Web Sayfası Arşiv Dosyası (*.mht) EPUB File (*.epub) - EPUB Dosyası (*.epub) + Elektronik Yayın Dosyası (*.epub) FB2 File (*.fb2) - FB2 Dosyası (*.fb2) + FictionBook 2 Dosyası (*.fb2) MOBI File (*.mobi) - MOBI Dosyası (*.mobi) + Mobipocket e-kitap (*.mobi) OFORM Document (*.oform) - + ONLYOFFICE Doldurulabilir Çevrimiçi Form (*.oform) DOCXF Document (*.docxf) - + ONLYOFFICE Belgesi Form Şablonu (*.docxf) PPTX File (*.pptx) - PPTX Dosyası (*.pptx) + Office Open XML Sunumu (*.pptx) PPT File (*.ppt) - PPT Dosyası (*.ppt) + PowerPoint 97-2003 Sunumu (*.ppt) Presentation template (*.potx) - Sunum Şablonu (*.potx) + PowerPoint Open XML Sunum Şablonu (*.potx) ODP File (*.odp) - ODP Dosyası (*.odp) + OpenDocument Sunumu (*.odp) @@ -272,27 +272,27 @@ PPSX File (*.ppsx) - PPSX Dosyası (*.ppsx) + Office Open XML Slayt Gösterisi (*.ppsx) XLSX File (*.xlsx) - XLSX Dosyası (*.xlsx) + Office Open XML Elektronik Tablosu (*.xlsx) Spreadsheet template (*.xltx) - Tablo Şablonu (*.xltx) + Excel Open XML Tablo Şablonu (*.xltx) XLS File (*.xls) - XLS Dosyası (*.xls) + Excel 97-2003 Elektronik Tablosu (*.xls) ODS File (*.ods) - ODS Dosyası (*.ods) + OpenDocument Tablosu (*.ods) @@ -302,42 +302,42 @@ CSV File (*.csv) - CSV Dosyası (*.csv) + Virgülle Ayrılmış Değerler (*.csv) PDF File (*.pdf) - PDF Dosyası (*.pdf) + Taşınabilir Belge (*.pdf) PDFA File (*.pdf) - PDFA Dosyası (*.pdf) + Taşınabilir Belge /A (*.pdf) DJVU File (*.djvu) - DJVU Dosyası (*.djvu) + Dijital Belge (*.djvu) XPS File (*.xps) - XPS Dosyası (*.xps) + OpenXPS Belgesi (*.xps) Zip Archive (*.zip) - + Zip Arşivi (*.zip) JPG Image (*.jpg, *.jpeg) - + JPG Resmi (*.jpg *.jpeg) PNG Image (*.png) - + PNG Resmi (*.png) @@ -561,17 +561,17 @@ File %1 cannot be opened or doesn't exists. - + %1 dosyası açılamıyor veya mevcut değil. All supported files (*.txt *.csv) - + Tüm desteklenen dosyalar (*.txt *.csv) All files (*.*) - Tüm dosyalar (*.*) + Tüm dosyalar (*.*) diff --git a/win-linux/langs/uk.ts b/win-linux/langs/uk.ts index c35c20a1c..cf4e86fb3 100644 --- a/win-linux/langs/uk.ts +++ b/win-linux/langs/uk.ts @@ -177,22 +177,22 @@ DOCX Document (*.docx) - Документ DOCX (*.docx) + Документ Office Open XML (*.docx) Document template (*.dotx) - Шаблон документа (*.dotx) + Шаблон документа Word Open XML (*.dotx) DOC Document (*.doc) - Документ DOC (*.doc) + Документ Word 97-2003 (*.doc) ODT Document (*.odt) - Документ ODT (*.odt) + Текстовий файл OpenDocument (*.odt) @@ -202,67 +202,67 @@ RTF File (*.rtf) - Файл RTF (*.rtf) + Файл вдосконаленого текстового формату (*.rtf) TXT File (*.txt) - Файл TXT (*.txt) + Звичайний текстовий файл (*.txt) HTML File (*.html) - Файл HTML (*.html) + Файл мови гіпертекстової розмітки (*.html) MHT File (*.mht) - Файл MHT (*.mht) + Файл архіву веб-сторінки (*.mht) EPUB File (*.epub) - Файл EPUB (*.epub) + Файл електронної публікації (*.epub) FB2 File (*.fb2) - Файл FB2 (*.fb2) + Файл FictionBook 2 (*.fb2) MOBI File (*.mobi) - Файл MOBI (*.mobi) + Електронна книга Mobipocket (*.mobi) OFORM Document (*.oform) - + Онлайн-форма для заповнення ONLYOFFICE (*.oform) DOCXF Document (*.docxf) - + Шаблон форми ONLYOFFICE (*.docxf) PPTX File (*.pptx) - Файл PPTX (*.pptx) + Презентація Office Open XML (*.pptx) PPT File (*.ppt) - Файл PPT (*.ppt) + Презентація PowerPoint 97-2003 (*.ppt) Presentation template (*.potx) - Шаблон презентації (*.potx) + Шаблон презентації PowerPoint Open XML (*.potx) ODP File (*.odp) - Файл ODP (*.odp) + Презентація OpenDocument (*.odp) @@ -272,27 +272,27 @@ PPSX File (*.ppsx) - Файл PPSX (*.ppsx) + Показ слайдів Office Open XML (*.ppsx) XLSX File (*.xlsx) - Файл XLSX (*.xlsx) + Електронна таблиця Office Open XML (*.xlsx) Spreadsheet template (*.xltx) - Шаблон електронної таблиці (*.xltx) + Шаблон електронної таблиці Excel Open XML (*.xltx) XLS File (*.xls) - Файл XLS (*.xls) + Електронна таблиця Excel 97-2003 (*.xls) ODS File (*.ods) - Файл ODS (*.ods) + Електронна таблиця OpenDocument (*.ods) @@ -302,42 +302,42 @@ CSV File (*.csv) - Файл CSV (*.csv) + Значення, розділені комами (*.csv) PDF File (*.pdf) - Файл PDF (*.pdf) + Портативний документ (*.pdf) PDFA File (*.pdf) - Файл PDFA (*.pdf) + Портативний документ /A (*.pdf) DJVU File (*.djvu) - Файл DJVU (*.djvu) + Цифровий документ (*.djvu) XPS File (*.xps) - Файл XPS (*.xps) + Документ OpenXPS (*.xps) Zip Archive (*.zip) - + Zip-архів (*.zip) JPG Image (*.jpg, *.jpeg) - + Зображення JPG (*.jpg *.jpeg) PNG Image (*.png) - + Зображення PNG (*.png) @@ -561,17 +561,17 @@ File %1 cannot be opened or doesn't exists. - + Файл %1 не може бути відкритий або не існує. All supported files (*.txt *.csv) - + Усі підтримувані файли (*.txt *.csv) All files (*.*) - Усі файли (*.*) + Усі файли (*.*) diff --git a/win-linux/langs/vi.ts b/win-linux/langs/vi.ts index 17cb1b5b6..307802102 100644 --- a/win-linux/langs/vi.ts +++ b/win-linux/langs/vi.ts @@ -177,22 +177,22 @@ DOCX Document (*.docx) - Tập tin DOCX (*.docx) + Tài liệu Office Open XML (*.docx) Document template (*.dotx) - Mẫu văn bản (*.dotx) + Word Open XML Mẫu văn bản (*.dotx) DOC Document (*.doc) - Tập tin DOC (*.doc) + Tài liệu Word 97-2003 (*.doc) ODT Document (*.odt) - Tập tin ODT (*.odt) + OpenDocument File văn bản (*.odt) @@ -202,67 +202,67 @@ RTF File (*.rtf) - Tập tin RTF (*.rtf) + Tệp định dạng văn bản đa dạng thức (*.rtf) TXT File (*.txt) - Tập tin TXT (*.txt) + Tập tin văn bản thuần (*.txt) HTML File (*.html) - Tập tin HTML (*.html) + Tập tin HyperText Markup Language (*.html) MHT File (*.mht) - Tập tin MHT (*.mht) + Tập tin kho lưu trữ trang web (*.mht) EPUB File (*.epub) - Tập tin EPUB (*.epub) + Tập tin Electronic Publication (*.epub) FB2 File (*.fb2) - Tập tin FB2 (*.fb2) + Tập tin FictionBook 2 (*.fb2) MOBI File (*.mobi) - Tập tin MOBI (*.mobi) + Sách điện tử Mobipocket (*.mobi) OFORM Document (*.oform) - + Biểu mẫu trực tuyến có thể điền ONLYOFFICE (*.oform) DOCXF Document (*.docxf) - + Mẫu biểu mẫu tài liệu ONLYOFFICE (*.docxf) PPTX File (*.pptx) - Tập tin PPTX (*.pptx) + Bản trình bày Office Open XML (*.pptx) PPT File (*.ppt) - Tập tin PPT (*.ppt) + Bản trình bày PowerPoint 97-2003 (*.ppt) Presentation template (*.potx) - Mẫu trình chiếu (*.potx) + PowerPoint Open XML Mẫu trình chiếu (*.potx) ODP File (*.odp) - Tập tin ODP (*.odp) + OpenDocument Trình chiếu (*.odp) @@ -272,27 +272,27 @@ PPSX File (*.ppsx) - Tập tin PPSX (*.ppsx) + Trình chiếu Office Open XML (*.ppsx) XLSX File (*.xlsx) - Tập tin XLSX (*.xlsx) + Bảng tính Office Open XML (*.xlsx) Spreadsheet template (*.xltx) - Mẫu bảng tính (*.xltx) + Excel Open XML Mẫu bảng tính (*.xltx) XLS File (*.xls) - Tập tin XLS (*.xls) + Bảng tính Excel 97-2003 (*.xls) ODS File (*.ods) - Tập tin ODS (*.ods) + OpenDocument Bảng tính (*.ods) @@ -302,42 +302,42 @@ CSV File (*.csv) - Tập tin CSV (*.csv) + Các giá trị được ngăn cách với nhau bằng dấu phẩy (*.csv) PDF File (*.pdf) - Tập tin PDF (*.pdf) + Tài liệu di động (*.pdf) PDFA File (*.pdf) - Tập tin PDFA (*.pdf) + Tài liệu di động /A (*.pdf) DJVU File (*.djvu) - Tập tin DJVU (*.djvu) + Tài liệu kỹ thuật số (*.djvu) XPS File (*.xps) - Tập tin XPS (*.xps) + Tài liệu OpenXPS (*.xps) Zip Archive (*.zip) - + Lưu trữ Zip (*.zip) JPG Image (*.jpg, *.jpeg) - + Ảnh JPG (*.jpg *.jpeg) PNG Image (*.png) - + Hình ảnh PNG (*.png) @@ -561,17 +561,17 @@ File %1 cannot be opened or doesn't exists. - + Không thê ̉ mở tập tin %1 hoặc tập tin không tồn tại. All supported files (*.txt *.csv) - + Tất cả các tập tin được hỗ trợ̣ (*.txt *.csv) All files (*.*) - Tất cả tập tin (*.*) + Tất cả tập tin (*.*) diff --git a/win-linux/langs/zh_CN.ts b/win-linux/langs/zh_CN.ts index 24416d498..c5c064feb 100644 --- a/win-linux/langs/zh_CN.ts +++ b/win-linux/langs/zh_CN.ts @@ -182,7 +182,7 @@ Document template (*.dotx) - Word开放式XML文档模板 (*.dotx) + Word开放式XML文档模板(*.dotx) @@ -192,12 +192,12 @@ ODT Document (*.odt) - OpenDocument文本文件 (*.odt) + OpenDocument文本文件(*.odt) OpenDocument Document template (*.ott) - OpenDocument文档模板 (*.ott) + OpenDocument文档模板(*.ott) @@ -207,32 +207,32 @@ TXT File (*.txt) - 纯文本文件 (*.txt) + 纯文本文件(*.txt) HTML File (*.html) - 超文本标记语言文件 (*.html) + 超文本标记语言文件(*.html) MHT File (*.mht) - 网页存档文件 (*.mht) + 网页存档文件(*.mht) EPUB File (*.epub) - 电子出版物文件（*.epub） + 电子出版物文件(*.epub) FB2 File (*.fb2) - 小说书2文件 (*.fb2) + 小说书2文件(*.fb2) MOBI File (*.mobi) - Mobipocket文件 (*.mobi) + Mobipocket文件(*.mobi) @@ -242,7 +242,7 @@ DOCXF Document (*.docxf) - ONLYOFFICE表单模板 (*.docxf) + ONLYOFFICE表单模板(*.docxf) @@ -257,7 +257,7 @@ Presentation template (*.potx) - PowerPoint开放式XML演示模板（*.potx） + PowerPoint开放式XML演示模板(*.potx) @@ -267,7 +267,7 @@ OpenDocument Presentation Template (*.otp) - OpenDocument演示模板 (*.otp) + OpenDocument演示模板(*.otp) @@ -297,7 +297,7 @@ OpenDocument Spreadsheet Template (*.ots) - OpenDocument电子表格模板 (*.ots) + OpenDocument电子表格模板(*.ots) @@ -317,27 +317,27 @@ DJVU File (*.djvu) - DJVU文件 (*.djvu) + 数字文件(*.djvu) XPS File (*.xps) - OpenXPS文件（*.xps） + OpenXPS文件(*.xps) Zip Archive (*.zip) - Zip档案（*.zip） + Zip档案(*.zip) JPG Image (*.jpg, *.jpeg) - JPG图像（*.jpg，*.jpeg） + JPG图像(*.jpg，*.jpeg) PNG Image (*.png) - PNG图像 (*.png) + PNG图像(*.png) diff --git a/win-linux/langs/zh_HK.ts b/win-linux/langs/zh_HK.ts index b064b5312..bb5ae028f 100644 --- a/win-linux/langs/zh_HK.ts +++ b/win-linux/langs/zh_HK.ts @@ -177,42 +177,42 @@ DOCX Document (*.docx) - DOCX 文件 (*.docx) + Office Open XML 文件(*.docx) Document template (*.dotx) - 文件範本 (*.dotx) + Word Open XML 文件範本(*.dotx) DOC Document (*.doc) - DOC 文件 (*.doc) + Word 97-2003 文件(*.doc) ODT Document (*.odt) - ODT 文件 (*.odt) + OpenDocument文件(*.odt) OpenDocument Document template (*.ott) - OpenDocument 文件範本 (*.ott) + OpenDocument文件範本(*.ott) RTF File (*.rtf) - RTF 檔案 (*.rtf) + RTF 檔案(*.rtf) TXT File (*.txt) - TXT 檔案 (*.txt) + 純文字(*.txt) HTML File (*.html) - HTML 檔案 (*.html) + HTML 檔案(*.html) @@ -222,107 +222,107 @@ EPUB File (*.epub) - EPUB 檔案 (*.epub) + EPUB 檔案(*.epub) FB2 File (*.fb2) - FB2 檔案 (*.fb2) + FB2 檔案(*.fb2) MOBI File (*.mobi) - MOBI 檔案 (*.mobi) + Mobipocket 電子書(*.mobi) OFORM Document (*.oform) - + ONLYOFFICE可填写的在线表格(*.oform) DOCXF Document (*.docxf) - + ONLYOFFICE 文档表单模板(*.docxf) PPTX File (*.pptx) - PPTX 檔案 (*.pptx) + Office Open XML 簡報(*.pptx) PPT File (*.ppt) - PPT 檔案 (*.ppt) + PowerPoint 97-2003 簡報(*.ppt) Presentation template (*.potx) - 簡報範本 (*.potx) + PowerPoint Open XML 簡報範本(*.potx) ODP File (*.odp) - ODP 檔案 (*.odp) + OpenDocument簡報(*.odp) OpenDocument Presentation Template (*.otp) - OpenDocument 簡報範本 (*.otp) + OpenDocument簡報範本(*.otp) PPSX File (*.ppsx) - PPSX 檔案 (*.ppsx) + Office Open XML 投影片(*.ppsx) XLSX File (*.xlsx) - XLSX 檔案 (*.xlsx) + Office Open XML 試算表(*.xlsx) Spreadsheet template (*.xltx) - 試算表範本 (*.xltx) + Excel Open XML 試算表範本(*.xltx) XLS File (*.xls) - XLS 檔案 (*.xls) + Excel 97-2003 試算表(*.xls) ODS File (*.ods) - ODS 檔案 (*.ods) + OpenDocument 試算表(*.ods) OpenDocument Spreadsheet Template (*.ots) - OpenDocument 試算表範本 (*.ots) + OpenDocument試算表範本(*.ots) CSV File (*.csv) - CSV 檔案 (*.csv) + 逗點分隔值(*.csv) PDF File (*.pdf) - PDF 檔案 (*.pdf) + PDF 檔案(*.pdf) PDFA File (*.pdf) - PDFA 檔案 (*.pdf) + PDF/單一檔案(*.pdf) DJVU File (*.djvu) - DJVU 檔案 (*.djvu) + DjVu 檔案(*.djvu) XPS File (*.xps) - XPS 檔案 (*.xps) + OpenXPS 檔案(*.xps) @@ -571,7 +571,7 @@ All files (*.*) - 所有檔案 (*.*) + 所有檔案 (*.*) From 0065aa7c4c47874f55bd9a1332c85bcd20f283f5 Mon Sep 17 00:00:00 2001 From: Maria-Sukhova Date: Tue, 7 Jun 2022 19:09:59 +0300 Subject: [PATCH 09/23] edit translations --- macos/Localization/be.xliff | 2 +- macos/Localization/bg.xliff | 2 +- macos/Localization/ca.xliff | 4 +-- macos/Localization/cs.xliff | 2 +- macos/Localization/da.xliff | 2 +- macos/Localization/de.xliff | 4 +-- macos/Localization/el.xliff | 2 +- macos/Localization/en.xliff | 2 +- macos/Localization/es.xliff | 6 ++-- macos/Localization/et.xliff | 4 +-- macos/Localization/fi.xliff | 10 +++--- macos/Localization/fr.xliff | 2 +- macos/Localization/ro.xliff | 2 +- macos/Localization/ru.xliff | 4 +-- macos/Localization/sk.xliff | 4 +-- macos/Localization/sl.xliff | 4 +-- macos/Localization/sv.xliff | 2 +- macos/Localization/tr.xliff | 4 +-- macos/Localization/uk.xliff | 4 +-- macos/Localization/vi.xliff | 28 ++++++++--------- macos/Localization/zh-Hans-CN.xliff | 40 ++++++++++++------------ macos/Localization/zh-Hant.xliff | 48 ++++++++++++++--------------- 22 files changed, 91 insertions(+), 91 deletions(-) diff --git a/macos/Localization/be.xliff b/macos/Localization/be.xliff index cb0f4a8a7..8db2bd892 100644 --- a/macos/Localization/be.xliff +++ b/macos/Localization/be.xliff @@ -254,7 +254,7 @@ OpenOffice Document - Тэкставы файл OpenDocument (*.odt) + Тэкставы файл OpenDocument (*.odt) No comment provided by engineer. diff --git a/macos/Localization/bg.xliff b/macos/Localization/bg.xliff index a719eb9ed..bdfa5b3ee 100644 --- a/macos/Localization/bg.xliff +++ b/macos/Localization/bg.xliff @@ -251,7 +251,7 @@ No comment provided by engineer. - PDF/A FilePDF/A FilePDF/A файлПреносим документ / A (*.pdf) + PDF/A FilePDF/A FilePDF/A файлПреносим документ /A (*.pdf) No comment provided by engineer. diff --git a/macos/Localization/ca.xliff b/macos/Localization/ca.xliff index 11f9b61fb..881b9505e 100644 --- a/macos/Localization/ca.xliff +++ b/macos/Localization/ca.xliff @@ -279,7 +279,7 @@ PDF/A File - Document portàtil / A (*.pdf) + Document portàtil /A (*.pdf) No comment provided by engineer. @@ -289,7 +289,7 @@ PowerPoint 97-2003 Presentation - Presentació de diapositives PowerPoint 97-2003 (*.ppt) + Presentació PowerPoint 97-2003 (*.ppt) No comment provided by engineer. diff --git a/macos/Localization/cs.xliff b/macos/Localization/cs.xliff index 0978494ce..6590f51c6 100644 --- a/macos/Localization/cs.xliff +++ b/macos/Localization/cs.xliff @@ -251,7 +251,7 @@ No comment provided by engineer. - PDF/A FilePDF/A FilePřenosný dokument / A (*.pdf) + PDF/A FilePDF/A FilePřenosný dokument /A (*.pdf) No comment provided by engineer. diff --git a/macos/Localization/da.xliff b/macos/Localization/da.xliff index a39a70e86..98c618a96 100644 --- a/macos/Localization/da.xliff +++ b/macos/Localization/da.xliff @@ -264,7 +264,7 @@ PDF/A Fil - Portable Document / A (*.pdf) + Portable Document /A (*.pdf) No comment provided by engineer. diff --git a/macos/Localization/de.xliff b/macos/Localization/de.xliff index 40ad98d5c..e94dbd2fb 100644 --- a/macos/Localization/de.xliff +++ b/macos/Localization/de.xliff @@ -194,7 +194,7 @@ HTML File - Fichier HyperText Markup Language-Datei (*.html) + HyperText Markup Language-Datei (*.html) No comment provided by engineer. @@ -289,7 +289,7 @@ PDF/A File - Portables Dokumentenformat / A (*.pdf) + Portables Dokumentenformat /A (*.pdf) No comment provided by engineer. diff --git a/macos/Localization/el.xliff b/macos/Localization/el.xliff index 595ee578c..1ad986f01 100644 --- a/macos/Localization/el.xliff +++ b/macos/Localization/el.xliff @@ -264,7 +264,7 @@ PDF/A File - Φορητό έγγραφο / A (*.pdf) + Φορητό έγγραφο /A (*.pdf) No comment provided by engineer. diff --git a/macos/Localization/en.xliff b/macos/Localization/en.xliff index 31a6c57b5..d2413ee7b 100644 --- a/macos/Localization/en.xliff +++ b/macos/Localization/en.xliff @@ -289,7 +289,7 @@ PDF/A File - Portable Document / A (*.pdf) + Portable Document /A (*.pdf) No comment provided by engineer. diff --git a/macos/Localization/es.xliff b/macos/Localization/es.xliff index 20e644640..167fdc38f 100644 --- a/macos/Localization/es.xliff +++ b/macos/Localization/es.xliff @@ -289,7 +289,7 @@ PDF/A File - Documento portátil / A (*.pdf) + Documento portátil /A (*.pdf) No comment provided by engineer. @@ -299,12 +299,12 @@ PowerPoint 97-2003 Presentation - Hoja de cálculo Excel 97-2003 (*.xls) + Presentación PowerPoint 97-2003 (*.ppt) No comment provided by engineer. PowerPoint 2007 Presentation - Hoja de cálculo Office Open XML (*.xlsx) + Presentación Office Open XML (*.pptx) No comment provided by engineer. diff --git a/macos/Localization/et.xliff b/macos/Localization/et.xliff index 6dcb39031..dd9d3b9d7 100644 --- a/macos/Localization/et.xliff +++ b/macos/Localization/et.xliff @@ -251,7 +251,7 @@ No comment provided by engineer. - PDF/A FilePDF/A FilePDF/A FailPorditav document / A (*.pdf) + PDF/A FilePDF/A FilePDF/A FailPorditav document /A (*.pdf) No comment provided by engineer. @@ -354,7 +354,7 @@ No comment provided by engineer. Word 97-2003 DocumentWord 97-2003 Document - Word 97-2003 document (*.doc) + Word 97-2003 dokument (*.doc) No comment provided by engineer. diff --git a/macos/Localization/fi.xliff b/macos/Localization/fi.xliff index d73d27b7b..3948c247b 100644 --- a/macos/Localization/fi.xliff +++ b/macos/Localization/fi.xliff @@ -154,7 +154,7 @@ Excel 97-2003 Spreadsheet - Excel 97–2003 -laskentataulukko (*.xls) + Excel 97–2003-laskentataulukko (*.xls) No comment provided by engineer. @@ -264,7 +264,7 @@ PDF/A File - Kannettava asiakirja / A (*.pdf) + Kannettava asiakirja /A (*.pdf) No comment provided by engineer. @@ -274,7 +274,7 @@ PowerPoint 97-2003 Presentation - PowerPoint 97–2003 -esitys (*.ppt) + PowerPoint 97–2003-esitys (*.ppt) No comment provided by engineer. @@ -374,7 +374,7 @@ Word 97-2003 Document - Word 97–2003 -asiakirja (*.doc) + Word 97–2003-asiakirja (*.doc) No comment provided by engineer. @@ -384,7 +384,7 @@ XML Paper Specification - OpenXPS-asiakirja(*.xps) + OpenXPS-asiakirja (*.xps) No comment provided by engineer. diff --git a/macos/Localization/fr.xliff b/macos/Localization/fr.xliff index 037f3076f..eb267098b 100644 --- a/macos/Localization/fr.xliff +++ b/macos/Localization/fr.xliff @@ -289,7 +289,7 @@ PDF/A File - Document portable / A (*.pdf) + Document portable /A (*.pdf) No comment provided by engineer. diff --git a/macos/Localization/ro.xliff b/macos/Localization/ro.xliff index 3d93809e3..b606cc857 100644 --- a/macos/Localization/ro.xliff +++ b/macos/Localization/ro.xliff @@ -264,7 +264,7 @@ No comment provided by engineer. PDF/A File -Formatul de Document Portabil / A (*.pdf) +Formatul de Document Portabil /A (*.pdf) No comment provided by engineer. diff --git a/macos/Localization/ru.xliff b/macos/Localization/ru.xliff index 85daa3bc3..671f1390b 100644 --- a/macos/Localization/ru.xliff +++ b/macos/Localization/ru.xliff @@ -224,7 +224,7 @@ Mobipocket e-book - Электронная книга (*.epub) + Файл Mobipocket (*.mobi) No comment provided by engineer. @@ -289,7 +289,7 @@ PDF/A File - Переносимый документ / A (*.pdf) + Переносимый документ /A (*.pdf) No comment provided by engineer. diff --git a/macos/Localization/sk.xliff b/macos/Localization/sk.xliff index 85f5e3e78..7694cc3b0 100644 --- a/macos/Localization/sk.xliff +++ b/macos/Localization/sk.xliff @@ -251,12 +251,12 @@ No comment provided by engineer. - PDF/A FilePrenosný document / A (*.pdf) + PDF/A FilePrenosný document /A (*.pdf) No comment provided by engineer. Plain Text - Obyčajný text (*.txt) + Súbor obyčajného textu (*.txt) No comment provided by engineer. diff --git a/macos/Localization/sl.xliff b/macos/Localization/sl.xliff index 2a1a41fee..d14d7762d 100644 --- a/macos/Localization/sl.xliff +++ b/macos/Localization/sl.xliff @@ -264,12 +264,12 @@ PDF/A File - Prenosni document / A (*.pdf) + Prenosni document /A (*.pdf) No comment provided by engineer. Plain Text - Navadno besedilo (*.txt) + Plain Text datoteka (*.txt) No comment provided by engineer. diff --git a/macos/Localization/sv.xliff b/macos/Localization/sv.xliff index fec9bd26b..969cb37ee 100644 --- a/macos/Localization/sv.xliff +++ b/macos/Localization/sv.xliff @@ -251,7 +251,7 @@ No comment provided by engineer. - PDF/A FilePortabelt dokumentformat / A-fil (*.pdf)PDF/A-fil + PDF/A FilePortabelt dokumentformat /A-fil (*.pdf)PDF/A-fil No comment provided by engineer. diff --git a/macos/Localization/tr.xliff b/macos/Localization/tr.xliff index 0e1e67ccf..8a831df5c 100644 --- a/macos/Localization/tr.xliff +++ b/macos/Localization/tr.xliff @@ -251,12 +251,12 @@ No comment provided by engineer. - PDF/A FileTaşınabilir Belge / A (*.pdf) + PDF/A FileTaşınabilir Belge /A (*.pdf) No comment provided by engineer. Plain Text - Düz Metin (*.txt) + Düz Metin Dosyası (*.txt) No comment provided by engineer. diff --git a/macos/Localization/uk.xliff b/macos/Localization/uk.xliff index 67aa155aa..f42f39ad6 100644 --- a/macos/Localization/uk.xliff +++ b/macos/Localization/uk.xliff @@ -264,12 +264,12 @@ PDF/A File - Портативний документ / A (*.pdf) + Портативний документ /A (*.pdf) No comment provided by engineer. Plain Text - Звичайний текст (*.txt) + Звичайний текстовий файл (*.txt) No comment provided by engineer. diff --git a/macos/Localization/vi.xliff b/macos/Localization/vi.xliff index a089df4e6..fc0346d8d 100644 --- a/macos/Localization/vi.xliff +++ b/macos/Localization/vi.xliff @@ -67,7 +67,7 @@ Window - + Window Class = "NSWindow"; title = "Window"; ObjectID = "uKp-p4-6uB"; @@ -139,11 +139,11 @@ Don't Save - + Không lưu Electronic Publication - Tập tin EPUB (*.epub) + Tập tin Electronic Publication (*.epub) Excel 97-2003 Spreadsheet @@ -155,7 +155,7 @@ FictionBook File - Tập tin FB2 (*.fb2) + Tập tin FictionBook 2 (*.fb2) File "%@" can not be open or not exist. @@ -171,7 +171,7 @@ HTML File - Tập tin HTML (*.html) + Tập tin HyperText Markup Language (*.html) Hide %@ @@ -191,7 +191,7 @@ MHT File - Tập tin MHT (*.mht) + Tập tin kho lưu trữ trang web (*.mht) Mobipocket e-book @@ -247,11 +247,11 @@ PDF/A File - Tài liệu di động / A (*.pdf) + Tài liệu di động /A (*.pdf) Plain Text - Văn bản thuần (*.txt) + Tập tin văn bản thuần (*.txt) PowerPoint 97-2003 Presentation @@ -279,7 +279,7 @@ Presenter View - + Xem Trình chiếu Quit %@ @@ -303,7 +303,7 @@ Signature Details - + Chi tiết chữ ký Spreadsheet %ld.xlsx @@ -331,7 +331,7 @@ Untitled - + Untitled Version %1$@ (%2$@) @@ -343,7 +343,7 @@ With access to pro features - + Có quyền truy cập vào các tính năng pro Word 97-2003 Document @@ -838,7 +838,7 @@ The trial period will end in %d days, after that you will not be able to create Window - + Window Class = "NSMenu"; title = "Window"; ObjectID = "Td7-aD-5lo"; @@ -923,7 +923,7 @@ The trial period will end in %d days, after that you will not be able to create Window - + Window Class = "NSMenuItem"; title = "Window"; ObjectID = "aUF-d1-5bR"; diff --git a/macos/Localization/zh-Hans-CN.xliff b/macos/Localization/zh-Hans-CN.xliff index e91423f99..47e50d7e5 100644 --- a/macos/Localization/zh-Hans-CN.xliff +++ b/macos/Localization/zh-Hans-CN.xliff @@ -119,7 +119,7 @@ Comma-Separated Values - 逗号分隔值(*.csv) + 逗号分隔值（*.csv) No comment provided by engineer. @@ -134,7 +134,7 @@ DjVu File - 数字文件(*.djvu) + 数字文件（*.djvu) No comment provided by engineer. @@ -164,17 +164,17 @@ Excel 97-2003 Spreadsheet - Excel 97-2003 电子表格(*.xls) + Excel 97-2003 电子表格（*.xls) No comment provided by engineer. Excel 2007 Spreadsheet - Office Open XML 电子表格(*.xlsx) + Office Open XML 电子表格（*.xlsx) No comment provided by engineer. FictionBook File - 小说书2文件 (*.fb2) + 小说书2文件（*.fb2) No comment provided by engineer. @@ -194,7 +194,7 @@ HTML File - 超文本标记语言文件 (*.html) + 超文本标记语言文件 （*.html) No comment provided by engineer. @@ -219,12 +219,12 @@ MHT File - 网页存档文件 (*.mht) + 网页存档文件 （*.mht) No comment provided by engineer. Mobipocket e-book - Mobipocket文件 (*.mobi) + Mobipocket文件 （*.mobi) No comment provided by engineer. @@ -269,12 +269,12 @@ OpenOffice Presentation - OpenDocument演示文稿(*.odp) + OpenDocument演示文稿（*.odp) No comment provided by engineer. OpenOffice Spreadsheet - OpenDocument电子表格(*.ods) + OpenDocument电子表格（*.ods) No comment provided by engineer. @@ -284,32 +284,32 @@ PDF File - 便携式文件(*.pdf) + 便携式文件（*.pdf) No comment provided by engineer. PDF/A File - 便携式文件/A (*.pdf) + 便携式文件/A（*.pdf) No comment provided by engineer. Plain Text - 纯文本文件 (*.txt) + 纯文本文件（*.txt) No comment provided by engineer. PowerPoint 97-2003 Presentation - PowerPoint 97-2003 演示文稿(*.ppt) + PowerPoint 97-2003 演示文稿（*.ppt) No comment provided by engineer. PowerPoint 2007 Presentation - Office Open XML 演示文稿(*.pptx) + Office Open XML 演示文稿（*.pptx) No comment provided by engineer. PowerPoint Slide Show - Office Open XML 幻灯片(*.ppsx) + Office Open XML 幻灯片（*.ppsx) No comment provided by engineer. @@ -344,7 +344,7 @@ Rich Text Document - 富文本格式(*.rtf) + 富文本格式（*.rtf) No comment provided by engineer. @@ -369,7 +369,7 @@ Spreadsheet template - Excel开放式XML电子表格模板(*.xltx) + Excel开放式XML电子表格模板（*.xltx) No comment provided by engineer. @@ -414,12 +414,12 @@ Word 97-2003 Document - Word 97-2003 文档(*.doc) + Word 97-2003 文档（*.doc) No comment provided by engineer. Word 2007 Document - Office Open XML 文档(*.docx) + Office Open XML 文档（*.docx) No comment provided by engineer. diff --git a/macos/Localization/zh-Hant.xliff b/macos/Localization/zh-Hant.xliff index 8c1a5e5a9..5932b26b4 100644 --- a/macos/Localization/zh-Hant.xliff +++ b/macos/Localization/zh-Hant.xliff @@ -119,7 +119,7 @@ Comma-Separated Values - 逗點分隔值 (*.csv) + 逗點分隔值(*.csv) No comment provided by engineer. @@ -134,7 +134,7 @@ DjVu File - DjVu 檔案 (*.djvu) + DjVu 檔案(*.djvu) No comment provided by engineer. @@ -149,17 +149,17 @@ Document template - 文件範本 (*.dotx) + Word Open XML 文件範本(*.dotx) No comment provided by engineer. Excel 97-2003 Spreadsheet - Excel 97-2003 試算表 (*.xls) + Excel 97-2003 試算表(*.xls) No comment provided by engineer. Excel 2007 Spreadsheet - Excel 2007 試算表 (*.docx) + Office Open XML 試算表(*.xlsx) No comment provided by engineer. @@ -199,7 +199,7 @@ Mobipocket e-book - Mobipocket 電子書 (*.mobi) + Mobipocket 電子書(*.mobi) No comment provided by engineer. @@ -224,32 +224,32 @@ OpenDocument Document Template - OpenDocument文件範本 (*.ott) + OpenDocument 文件範本(*.ott) No comment provided by engineer. OpenDocument Presentation Template - OpenDocument簡報範本 (*.otp) + OpenDocument簡報範本(*.otp) No comment provided by engineer. OpenDocument Spreadsheet Template - OpenDocument試算表範本 (*.ots) + OpenDocument試算表範本(*.ots) No comment provided by engineer. OpenOffice Document - OpenOffice 文件 (*.odt) + OpenDocument文件(*.odt) No comment provided by engineer. OpenOffice Presentation - OpenOffice 簡報 (*.odp) + OpenDocument簡報(*.odp) No comment provided by engineer. OpenOffice Spreadsheet - OpenOffice 試算表 (*.ods) + OpenDocument試算表(*.ods) No comment provided by engineer. @@ -259,32 +259,32 @@ PDF File - PDF 文件 (*.pdf) + PDF 文件(*.pdf) No comment provided by engineer. PDF/A File - PDF/單一檔案 (*.pdf) + PDF/單一檔案(*.pdf) No comment provided by engineer. Plain Text - 純文字 (*.txt) + 純文字(*.txt) No comment provided by engineer. PowerPoint 97-2003 Presentation - PowerPoint 97-2003 簡報 (*.ppt) + PowerPoint 97-2003 簡報(*.ppt) No comment provided by engineer. PowerPoint 2007 Presentation - PowerPoint 2007 簡報 (*.pptx) + Office Open XML 簡報(*.pptx) No comment provided by engineer. PowerPoint Slide Show - PowerPoint 投影片 (*.ppsx) + Office Open XML 投影片(*.ppsx) No comment provided by engineer. @@ -299,7 +299,7 @@ Presentation template - 簡報範本 (*.potx) + PowerPoint Open XML 簡報範本(*.potx) No comment provided by engineer. @@ -314,7 +314,7 @@ Rich Text Document - RTF 文字文件 (*.rtf) + RTF 文字文件(*.rtf) No comment provided by engineer. @@ -334,7 +334,7 @@ Spreadsheet template - 試算表範本 (*.xltx) + Excel Open XML 試算表範本(*.xltx) No comment provided by engineer. @@ -374,17 +374,17 @@ Word 97-2003 Document - Word 97-2003 文件 (*.doc) + Word 97-2003 文件(*.doc) No comment provided by engineer. Word 2007 Document - Word 2007 文件 (*.docx) + Office Open XML 文件(*.docx) No comment provided by engineer. XML Paper Specification - XML 文件規格 (*.xps) + OpenXPS 檔案(*.xps) No comment provided by engineer. From 8d7f87c17bd4eaf2806246d7c19ed05dd13765f0 Mon Sep 17 00:00:00 2001 From: Maria-Sukhova Date: Wed, 8 Jun 2022 14:25:43 +0300 Subject: [PATCH 10/23] edit formats descriptions --- win-linux/langs/gl.ts | 12 ++++++------ win-linux/langs/hr.ts | 8 ++++---- win-linux/langs/hu.ts | 8 ++++---- win-linux/langs/hy.ts | 2 +- win-linux/langs/id.ts | 4 ++-- win-linux/langs/it_IT.ts | 4 ++-- win-linux/langs/ja.ts | 6 +++--- win-linux/langs/ko.ts | 2 +- win-linux/langs/lo.ts | 8 ++++---- win-linux/langs/lt.ts | 8 ++++---- win-linux/langs/lv.ts | 2 +- win-linux/langs/nl.ts | 2 +- win-linux/langs/no.ts | 8 ++++---- win-linux/langs/pl.ts | 2 +- win-linux/langs/pt_BR.ts | 8 ++++---- win-linux/langs/pt_PT.ts | 8 ++++---- 16 files changed, 46 insertions(+), 46 deletions(-) diff --git a/win-linux/langs/gl.ts b/win-linux/langs/gl.ts index 8cb6fba6b..b679967fd 100644 --- a/win-linux/langs/gl.ts +++ b/win-linux/langs/gl.ts @@ -212,12 +212,12 @@ HTML File (*.html) - Ficheiro HTML (*.html) + Ficheiro HTML (*.html) MHT File (*.mht) - Ficheiro MHT (*.mht) + Ficheiro MHT (*.mht) @@ -312,7 +312,7 @@ PDFA File (*.pdf) - Documento portátil / A (*.pdf) + Documento portátil /A (*.pdf) @@ -327,17 +327,17 @@ Zip Archive (*.zip) - + Arquivo Zip (*.zip) JPG Image (*.jpg, *.jpeg) - + Imaxe JPG (*.jpg *.jpeg) PNG Image (*.png) - + Imaxe PNG (*.png) diff --git a/win-linux/langs/hr.ts b/win-linux/langs/hr.ts index a5ccf2f54..c32c29cf2 100644 --- a/win-linux/langs/hr.ts +++ b/win-linux/langs/hr.ts @@ -312,7 +312,7 @@ PDFA File (*.pdf) - Prijenosni format dokumenta / A (*.pdf) + Prijenosni format dokumenta /A (*.pdf) @@ -327,17 +327,17 @@ Zip Archive (*.zip) - + Zip arhiva JPG Image (*.jpg, *.jpeg) - + JPG slika (*.jpg *.jpeg) PNG Image (*.png) - + PNG slika (*.png) diff --git a/win-linux/langs/hu.ts b/win-linux/langs/hu.ts index e7cafe787..076555264 100644 --- a/win-linux/langs/hu.ts +++ b/win-linux/langs/hu.ts @@ -312,7 +312,7 @@ PDFA File (*.pdf) - PDF-fájlformátum / A (*.pdf) + PDF-fájlformátum /A (*.pdf) @@ -327,17 +327,17 @@ Zip Archive (*.zip) - + Zip archívum (*.zip) JPG Image (*.jpg, *.jpeg) - + JPG kép (*.jpg *.jpeg) PNG Image (*.png) - + PNG kép (*.png) diff --git a/win-linux/langs/hy.ts b/win-linux/langs/hy.ts index 78ef94b4d..a8bc25d1f 100644 --- a/win-linux/langs/hy.ts +++ b/win-linux/langs/hy.ts @@ -312,7 +312,7 @@ PDFA File (*.pdf) - Դյուրակիր փաստաթղթի ձևաչափ / A (*.pdf) + Դյուրակիր փաստաթղթի ձևաչափ /A (*.pdf) diff --git a/win-linux/langs/id.ts b/win-linux/langs/id.ts index 5ea07f561..a6238cd4b 100644 --- a/win-linux/langs/id.ts +++ b/win-linux/langs/id.ts @@ -332,12 +332,12 @@ JPG Image (*.jpg, *.jpeg) - + Gambar JPG (*.jpg *.jpeg) PNG Image (*.png) - + Gambar PNG (*.png) diff --git a/win-linux/langs/it_IT.ts b/win-linux/langs/it_IT.ts index 52a239d1f..fdc093d9a 100644 --- a/win-linux/langs/it_IT.ts +++ b/win-linux/langs/it_IT.ts @@ -212,7 +212,7 @@ HTML File (*.html) - File del linguaggio di markup HyperText(*.html) + File del linguaggio di markup HyperText (*.html) @@ -312,7 +312,7 @@ PDFA File (*.pdf) - Documento portatile / A (*.pdf) + Documento portatile /A (*.pdf) diff --git a/win-linux/langs/ja.ts b/win-linux/langs/ja.ts index 09e526a22..5d9ca46a1 100644 --- a/win-linux/langs/ja.ts +++ b/win-linux/langs/ja.ts @@ -262,7 +262,7 @@ ODP File (*.odp) - プレゼンテーションを開く(*.odp) + OpenDocumentプレゼンテーションく(*.odp) @@ -292,7 +292,7 @@ ODS File (*.ods) - スプレッドシートを開く(*.ods) + OpenDocumentスプレッドシート(*.ods) @@ -312,7 +312,7 @@ PDFA File (*.pdf) - ポータブルドキュメント / A (*.pdf) + ポータブルドキュメント /A (*.pdf) diff --git a/win-linux/langs/ko.ts b/win-linux/langs/ko.ts index ffd5abcfe..10c6bf59e 100644 --- a/win-linux/langs/ko.ts +++ b/win-linux/langs/ko.ts @@ -308,7 +308,7 @@ PDFA File (*.pdf) - 휴대용 문서 / A(*.pdf) + 휴대용 문서 /A(*.pdf) diff --git a/win-linux/langs/lo.ts b/win-linux/langs/lo.ts index 148905523..fe471cddf 100644 --- a/win-linux/langs/lo.ts +++ b/win-linux/langs/lo.ts @@ -232,7 +232,7 @@ MOBI File (*.mobi) - ໄຟລ໌ Mobipocket e-book (*. mobi) + ໄຟລ໌ Mobipocket e-book (*.mobi) @@ -287,7 +287,7 @@ XLS File (*.xls) - ຕາຕະລາງ Excel 97-2003 (*.xls) + ຕາຕະລາງ Excel 97-2003 (*.xls) @@ -312,7 +312,7 @@ PDFA File (*.pdf) - ເອກະສານ(*.pdf) + ເອກະສານພົກພາ /A (*.pdf) @@ -337,7 +337,7 @@ PNG Image (*.png) - ຮູບພາບແບບ PNG (*. png ) + ຮູບພາບແບບPNG (*. png ) diff --git a/win-linux/langs/lt.ts b/win-linux/langs/lt.ts index 7a8310c24..122ea5c95 100644 --- a/win-linux/langs/lt.ts +++ b/win-linux/langs/lt.ts @@ -312,7 +312,7 @@ PDFA File (*.pdf) - Kilnojamas Dokumentas / A (*.pdf) + Kilnojamas Dokumentas /A (*.pdf) @@ -327,17 +327,17 @@ Zip Archive (*.zip) - + Zip archyvą (*.zip) JPG Image (*.jpg, *.jpeg) - + JPG Nuotrauka (*.jpg, *.jpeg) PNG Image (*.png) - + PNG Nuotrauka (*.png) diff --git a/win-linux/langs/lv.ts b/win-linux/langs/lv.ts index 859c490a3..40fa43cae 100644 --- a/win-linux/langs/lv.ts +++ b/win-linux/langs/lv.ts @@ -312,7 +312,7 @@ PDFA File (*.pdf) - Portatīvs dokuments / A (*.pdf) + Portatīvs dokuments /A (*.pdf) diff --git a/win-linux/langs/nl.ts b/win-linux/langs/nl.ts index a399d506c..4151ef1c8 100644 --- a/win-linux/langs/nl.ts +++ b/win-linux/langs/nl.ts @@ -312,7 +312,7 @@ PDFA File (*.pdf) - Portable Document / A (*.pdf) + Portable Document /A (*.pdf) diff --git a/win-linux/langs/no.ts b/win-linux/langs/no.ts index ca6e6a917..6e45f44ba 100644 --- a/win-linux/langs/no.ts +++ b/win-linux/langs/no.ts @@ -287,7 +287,7 @@ XLS File (*.xls) - Microsoft Excel 97-2003-regneark (*.xls) + Excel 97-2003-regneark (*.xls) @@ -327,17 +327,17 @@ Zip Archive (*.zip) - + Zip-arkiv (*.zip) JPG Image (*.jpg, *.jpeg) - + JPG-bilde (*.jpg *.jpeg) PNG Image (*.png) - + PNG-bilde (*.png) diff --git a/win-linux/langs/pl.ts b/win-linux/langs/pl.ts index f147950e5..24dc7d526 100644 --- a/win-linux/langs/pl.ts +++ b/win-linux/langs/pl.ts @@ -312,7 +312,7 @@ PDFA File (*.pdf) - Przenośny document / A (*.pdf) + Przenośny document /A (*.pdf) diff --git a/win-linux/langs/pt_BR.ts b/win-linux/langs/pt_BR.ts index 03a21e001..d3bebb9fe 100644 --- a/win-linux/langs/pt_BR.ts +++ b/win-linux/langs/pt_BR.ts @@ -202,7 +202,7 @@ RTF File (*.rtf) - Ficheiro de Rich Text Format (*.rtf) + Arquivo de Rich Text Format (*.rtf) @@ -287,7 +287,7 @@ XLS File (*.xls) - Folha de cálculo do Microsoft Excel 97-2003 (*.xls) + Folha de cálculo do Excel 97-2003 (*.xls) @@ -302,7 +302,7 @@ CSV File (*.csv) - Ficheiro de valores separados por vírgulas (*.csv) + Valores separados por vírgulas (*.csv) @@ -312,7 +312,7 @@ PDFA File (*.pdf) - Documento portátil / A (*.pdf) + Documento portátil /A (*.pdf) diff --git a/win-linux/langs/pt_PT.ts b/win-linux/langs/pt_PT.ts index b044588ee..47272f35a 100644 --- a/win-linux/langs/pt_PT.ts +++ b/win-linux/langs/pt_PT.ts @@ -227,7 +227,7 @@ FB2 File (*.fb2) - Ficheiro FB2 (*.fb2) + Ficheiro FictionBook 2 (*.fb2) @@ -247,12 +247,12 @@ PPTX File (*.pptx) - Ficheiro PPTX (*.pptx) + Apresentação em XML Open Office (*.pptx) PPT File (*.ppt) - Ficheiro PPT (*.ppt) + Apresentação em PowerPoint 97-2003 (*.ppt) @@ -312,7 +312,7 @@ PDFA File (*.pdf) - Documento portátil / A (*.pdf) + Documento portátil /A (*.pdf) From b4417084e8736e7d38cf098b0b1e9c1372829e98 Mon Sep 17 00:00:00 2001 From: Maria-Sukhova Date: Wed, 8 Jun 2022 14:30:06 +0300 Subject: [PATCH 11/23] edit formats descriptions --- macos/Localization/gl.xliff | 2 +- macos/Localization/hr.xliff | 2 +- macos/Localization/hu.xliff | 6 ++--- macos/Localization/hy.xliff | 2 +- macos/Localization/it.xliff | 4 +-- macos/Localization/ja.xliff | 2 +- macos/Localization/ko.xliff | 48 +++++++++++++++++----------------- macos/Localization/lo.xliff | 12 ++++----- macos/Localization/lt.xliff | 6 ++--- macos/Localization/lv.xliff | 2 +- macos/Localization/nl.xliff | 2 +- macos/Localization/nn.xliff | 4 +-- macos/Localization/pl.xliff | 10 +++---- macos/Localization/pt-BR.xliff | 4 +-- macos/Localization/pt-PT.xliff | 10 +++---- 15 files changed, 58 insertions(+), 58 deletions(-) diff --git a/macos/Localization/gl.xliff b/macos/Localization/gl.xliff index dbc4f9462..5606b46a5 100644 --- a/macos/Localization/gl.xliff +++ b/macos/Localization/gl.xliff @@ -279,7 +279,7 @@ PDF/A File - Documento portátil / A (*.pdf) + Documento portátil /A (*.pdf) No comment provided by engineer. diff --git a/macos/Localization/hr.xliff b/macos/Localization/hr.xliff index dda123ced..cca48e725 100644 --- a/macos/Localization/hr.xliff +++ b/macos/Localization/hr.xliff @@ -264,7 +264,7 @@ PDF/A File - Prijenosni format dokumenta / A (*.pdf) + Prijenosni format dokumenta /A (*.pdf) No comment provided by engineer. diff --git a/macos/Localization/hu.xliff b/macos/Localization/hu.xliff index 7f86c6811..51e9afa49 100644 --- a/macos/Localization/hu.xliff +++ b/macos/Localization/hu.xliff @@ -264,7 +264,7 @@ PDF/A File - PDF-fájlformátum / A (*.pdf) + PDF-fájlformátum /A (*.pdf) No comment provided by engineer. @@ -284,7 +284,7 @@ PowerPoint Slide Show - Open XPS-dokumentumformátum (*.xps) + Office Open XML diavetítés (*.ppsx) No comment provided by engineer. @@ -384,7 +384,7 @@ XML Paper Specification - OpenXPS dokumentum (*.xps) + Open XPS-dokumentumformátum (*.xps) No comment provided by engineer. diff --git a/macos/Localization/hy.xliff b/macos/Localization/hy.xliff index 484524e3f..6ce7141a9 100644 --- a/macos/Localization/hy.xliff +++ b/macos/Localization/hy.xliff @@ -264,7 +264,7 @@ PDF/A File - Դյուրակիր փաստաթղթի ձևաչափ / A (*.pdf) + Դյուրակիր փաստաթղթի ձևաչափ /A (*.pdf) No comment provided by engineer. diff --git a/macos/Localization/it.xliff b/macos/Localization/it.xliff index d9c9c5b2f..b873a5b87 100644 --- a/macos/Localization/it.xliff +++ b/macos/Localization/it.xliff @@ -194,7 +194,7 @@ HTML File - File del linguaggio di markup HyperText(*.html) + File del linguaggio di markup HyperText (*.html) No comment provided by engineer. @@ -289,7 +289,7 @@ PDF/A File - Documento portatile / A (*.pdf) + Documento portatile /A (*.pdf) No comment provided by engineer. diff --git a/macos/Localization/ja.xliff b/macos/Localization/ja.xliff index 4cf290693..2f2b92f91 100644 --- a/macos/Localization/ja.xliff +++ b/macos/Localization/ja.xliff @@ -279,7 +279,7 @@ PDF/A File - ポータブルドキュメント / A (*.pdf) + ポータブルドキュメント /A (*.pdf) No comment provided by engineer. diff --git a/macos/Localization/ko.xliff b/macos/Localization/ko.xliff index 02e770279..3e500b3bf 100644 --- a/macos/Localization/ko.xliff +++ b/macos/Localization/ko.xliff @@ -119,7 +119,7 @@ Comma-Separated Values - 쉼표로 구분된 데이터 파일 (*.csv) + 쉼표로 구분된 데이터 파일(*.csv) No comment provided by engineer. @@ -134,7 +134,7 @@ DjVu File - 디지털 문서 (*.djvu) + 디지털 문서(*.djvu) No comment provided by engineer. @@ -149,17 +149,17 @@ Document template - Word Open XML 문서 템플릿 (*.dotx) + Word Open XML 문서 템플릿(*.dotx) No comment provided by engineer. Excel 97-2003 Spreadsheet - Excel 97-2003 스프레드시트 (*.xls) + Excel 97-2003 스프레드시트(*.xls) No comment provided by engineer. Excel 2007 Spreadsheet - Office Open XML 스프레드시트 (*.xlsx) + Office Open XML 스프레드시트(*.xlsx) No comment provided by engineer. @@ -199,7 +199,7 @@ Mobipocket e-book - MOBI 파일 (*.mobi) + 모비포켓 전자책(*.mobi) No comment provided by engineer. @@ -224,32 +224,32 @@ OpenDocument Document Template - OpenDocument 문서 템플릿 (*.ott) + OpenDocument 문서 템플릿(*.ott) No comment provided by engineer. OpenDocument Presentation Template - OpenDocument프레젠테이션 템플릿 (*.otp) + OpenDocument프레젠테이션 템플릿(*.otp) No comment provided by engineer. OpenDocument Spreadsheet Template - OpenDocument 스프레드시트 템플릿 (*.ots) + OpenDocument 스프레드시트 템플릿(*.ots) No comment provided by engineer. OpenOffice Document - 오픈도큐먼트 텍스트 문서 (*.odt) + 오픈도큐먼트 텍스트 문서(*.odt) No comment provided by engineer. OpenOffice Presentation - 오픈도큐먼트 프레젠테이션 (*.odp) + 오픈도큐먼트 프레젠테이션(*.odp) No comment provided by engineer. OpenOffice Spreadsheet - 오픈도큐먼트 스프레드시트 (*.ods) + 오픈도큐먼트 스프레드시트(*.ods) No comment provided by engineer. @@ -259,32 +259,32 @@ PDF File - 휴대용 문서 (*.pdf) + 휴대용 문서(*.pdf) No comment provided by engineer. PDF/A File - 휴대용 문서 / A (*.pdf) + 휴대용 문서 /A(*.pdf) No comment provided by engineer. Plain Text - 일반 텍스트 (*.txt) + 일반 텍스트 파일(*.txt) No comment provided by engineer. PowerPoint 97-2003 Presentation - PowerPoint 97-2003 프레젠테이션 (*.ppt) + PowerPoint 97-2003 프레젠테이션(*.ppt) No comment provided by engineer. PowerPoint 2007 Presentation - Office Open XML 프레젠테이션 (*.pptx) + Office Open XML 프레젠테이션(*.pptx) No comment provided by engineer. PowerPoint Slide Show - Office Open XML 슬라이드 쇼 (*.ppsx) + Office Open XML 슬라이드 쇼(*.ppsx) No comment provided by engineer. @@ -299,7 +299,7 @@ Presentation template - PowerPoint Open XML 프레젠테이션 템플릿 (*.potx) + PowerPoint Open XML 프레젠테이션 템플릿(*.potx) No comment provided by engineer. @@ -314,7 +314,7 @@ Rich Text Document - 서식이 있는 텍스트 형식 파일 (*.rtf) + 서식이 있는 텍스트 형식 파일(*.rtf) No comment provided by engineer. @@ -334,7 +334,7 @@ Spreadsheet template - Excel Open XML 스프레드시트 템플릿 (*.xltx) + Excel Open XML 스프레드시트 템플릿(*.xltx) No comment provided by engineer. @@ -374,17 +374,17 @@ Word 97-2003 Document - Word 97-2003 문서 (*.doc) + Word 97-2003 문서(*.doc) No comment provided by engineer. Word 2007 Document - Office Open XML 문서 (*.docx) + Office Open XML 문서(*.docx) No comment provided by engineer. XML Paper Specification - OpenXPS 문서 (*.xps) + OpenXPS 문서(*.xps) No comment provided by engineer. diff --git a/macos/Localization/lo.xliff b/macos/Localization/lo.xliff index fe6d7f9cb..74763f85d 100644 --- a/macos/Localization/lo.xliff +++ b/macos/Localization/lo.xliff @@ -32,7 +32,7 @@ Class = "NSButtonCell"; title = "Cancel"; ObjectID = "GOU-av-TC1"; Load a Private Key - Load a Private Key + ໂຫຼດລະຫັດສ່ວນຕົວ Class = "NSButtonCell"; title = "Load a Private Key"; ObjectID = "P3k-kI-w22"; @@ -154,7 +154,7 @@ No comment provided by engineer. Excel 97-2003 Spreadsheet - ຕາຕະລາງ Excel 97-2003 (*.xls) + ຕາຕະລາງ Excel 97-2003 (*.xls) No comment provided by engineer. @@ -199,7 +199,7 @@ No comment provided by engineer. Mobipocket e-book - ປຶ້ມອີເລັກໂຕຮນິກແບບພົກພາ (*.mobi) + ໄຟລ໌ Mobipocket e-book (*.mobi) No comment provided by engineer. @@ -239,7 +239,7 @@ No comment provided by engineer. OpenOffice Document - ຄວາມເອກະສານ (*.odt) + ເປີດເອກະສານໄຟລ໌ Text (*.odt) No comment provided by engineer. @@ -249,7 +249,7 @@ No comment provided by engineer. OpenOffice Spreadsheet - ເປິດຕາຕະລາງເອກະສານ (*.ods) + ເປີດເອກະສານໃນຮູບແບບຕາຕະລາງ (*.ods) No comment provided by engineer. @@ -269,7 +269,7 @@ No comment provided by engineer. Plain Text - ໄຟລ໌ Text ທຳມະດາ (*.txt) + ໄຟລ໌ຂໍ້ຄວາມທຳມະດາ (*.txt) No comment provided by engineer. diff --git a/macos/Localization/lt.xliff b/macos/Localization/lt.xliff index 60ccb7cfd..9506b989b 100644 --- a/macos/Localization/lt.xliff +++ b/macos/Localization/lt.xliff @@ -112,7 +112,7 @@ Document template - OpenDocument Dokumento šablonas (*.ott) + Word Open XML Dokumento šablonas (*.dotx) Excel 97-2003 Spreadsheet @@ -204,11 +204,11 @@ PDF/A File - Kilnojamas Dokumentas / A (*.pdf) + Kilnojamas Dokumentas /A (*.pdf) Plain Text - Paprastas Tekstas (*.rtf) + Paprastas Tekstas (*.txt) PowerPoint 97-2003 Presentation diff --git a/macos/Localization/lv.xliff b/macos/Localization/lv.xliff index e9a218159..2fe31c760 100644 --- a/macos/Localization/lv.xliff +++ b/macos/Localization/lv.xliff @@ -264,7 +264,7 @@ PDF/A File - Portatīvs dokuments / A (*.pdf) + Portatīvs dokuments /A (*.pdf) No comment provided by engineer. diff --git a/macos/Localization/nl.xliff b/macos/Localization/nl.xliff index dfbcaa84f..f930750ef 100644 --- a/macos/Localization/nl.xliff +++ b/macos/Localization/nl.xliff @@ -264,7 +264,7 @@ PDF/A File - Portable Document / A (*.pdf) + Portable Document /A (*.pdf) No comment provided by engineer. diff --git a/macos/Localization/nn.xliff b/macos/Localization/nn.xliff index 4f691447c..45627af23 100644 --- a/macos/Localization/nn.xliff +++ b/macos/Localization/nn.xliff @@ -154,7 +154,7 @@ Excel 97-2003 Spreadsheet - Microsoft Excel 97-2003-regneark (*.xls) + Excel 97-2003-regneark (*.xls) No comment provided by engineer. @@ -264,7 +264,7 @@ PDF/A File - Portable Document / A (*.pdf) + Portable Document /A (*.pdf) No comment provided by engineer. diff --git a/macos/Localization/pl.xliff b/macos/Localization/pl.xliff index e4f2e2465..fd80f9145 100644 --- a/macos/Localization/pl.xliff +++ b/macos/Localization/pl.xliff @@ -158,7 +158,7 @@ Electronic Publication - Plik EPUB (*.epub) + Plik Electronic Publication (*.epub) No comment provided by engineer. @@ -173,7 +173,7 @@ FictionBook File - Plik FB2 (*.fb2) + Plik FictionBook 2 (*.fb2) No comment provided by engineer. @@ -193,7 +193,7 @@ HTML File - Plik HTML (*.html) + Plik HyperText Markup Language (*.html) No comment provided by engineer. @@ -218,7 +218,7 @@ MHT File - Plik MHT (*.mht) + Plik Web Page Archive (*.mht) No comment provided by engineer. @@ -288,7 +288,7 @@ PDF/A File - Przenośny document / A (*.pdf) + Przenośny document /A (*.pdf) No comment provided by engineer. diff --git a/macos/Localization/pt-BR.xliff b/macos/Localization/pt-BR.xliff index bd157df6a..9daf9bf06 100644 --- a/macos/Localization/pt-BR.xliff +++ b/macos/Localization/pt-BR.xliff @@ -289,7 +289,7 @@ PDF/A File - Documento portátil / A (*.pdf) + Documento portátil /A (*.pdf) No comment provided by engineer. @@ -344,7 +344,7 @@ Rich Text Document - Ficheiro de Rich Text Format (*.rtf) + Arquivo de Rich Text Format (*.rtf) No comment provided by engineer. diff --git a/macos/Localization/pt-PT.xliff b/macos/Localization/pt-PT.xliff index 39b9dbdd2..a316fe576 100644 --- a/macos/Localization/pt-PT.xliff +++ b/macos/Localization/pt-PT.xliff @@ -142,7 +142,7 @@ No comment provided by engineer. - Document templateModelo de documento Excel Open XML (*.xltx) + Document templateModelo de documento Word Open XML (*.dotx) No comment provided by engineer. @@ -251,22 +251,22 @@ No comment provided by engineer. - PDF/A FileDocumento portátil / A (*.pdf) + PDF/A FileDocumento portátil /A (*.pdf) No comment provided by engineer. Plain Text - Texto Simples (*.txt) + Documento de Texto Simples (*.txt) No comment provided by engineer. PowerPoint 97-2003 Presentation - Apresentação em PowerPoint 97-2003 (*.doc) + Apresentação em PowerPoint 97-2003 (*.ppt) No comment provided by engineer. PowerPoint 2007 Presentation - Apresentação em XML Open Office (*.docx) + Apresentação em XML Open Office (*.pptx) No comment provided by engineer. From aef5c03ddcf51ea861db330aa6861f1e7f1df8a4 Mon Sep 17 00:00:00 2001 From: Oleg Korshul Date: Thu, 9 Jun 2022 16:45:50 +0300 Subject: [PATCH 12/23] Refactoring ooxmlsignature library --- .../DocumentSignature/ASCDocumentSignatureStepController.mm | 2 +- win-linux/src/linux/cdialogopenssl.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/macos/ONLYOFFICE/Code/Controllers/DocumentSignature/ASCDocumentSignatureStepController.mm b/macos/ONLYOFFICE/Code/Controllers/DocumentSignature/ASCDocumentSignatureStepController.mm index 52ca95b11..27e1fd3ad 100644 --- a/macos/ONLYOFFICE/Code/Controllers/DocumentSignature/ASCDocumentSignatureStepController.mm +++ b/macos/ONLYOFFICE/Code/Controllers/DocumentSignature/ASCDocumentSignatureStepController.mm @@ -40,7 +40,7 @@ #import "ASCDocumentSignatureStepController.h" #include "mac_application.h" -#include "XmlCertificate.h" +#include "CertificateCommon.h" #import "NSView+Extensions.h" #import "NSString+Extensions.h" #import "NSAlert+SynchronousSheet.h" diff --git a/win-linux/src/linux/cdialogopenssl.cpp b/win-linux/src/linux/cdialogopenssl.cpp index cd9e90681..f350823a4 100644 --- a/win-linux/src/linux/cdialogopenssl.cpp +++ b/win-linux/src/linux/cdialogopenssl.cpp @@ -10,7 +10,7 @@ #include #include -#include "../../../core/DesktopEditor/xmlsec/src/include/XmlCertificate.h" +#include "../../../core/DesktopEditor/xmlsec/src/include/CertificateCommon.h" class CSslDialog_Private { From 4b69dd70d9819688da7c3e577dbde3f7da16f113 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Thu, 9 Jun 2022 19:04:51 +0300 Subject: [PATCH 13/23] [win-nix] set url to help for web-apps --- win-linux/src/cascapplicationmanagerwrapper.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/win-linux/src/cascapplicationmanagerwrapper.cpp b/win-linux/src/cascapplicationmanagerwrapper.cpp index 698e81e9f..ffa606392 100644 --- a/win-linux/src/cascapplicationmanagerwrapper.cpp +++ b/win-linux/src/cascapplicationmanagerwrapper.cpp @@ -1069,6 +1069,10 @@ void CAscApplicationManagerWrapper::initializeApp() #else QJsonObject _json_obj{{"theme", jtheme}}; #endif + + if ( InputArgs::contains(L"--help-url") ) + _json_obj["helpUrl"] = QUrl(QString::fromStdWString(InputArgs::argument_value(L"--help-url"))).isValid(); + AscAppManager::getInstance().SetRendererProcessVariable(Utils::stringifyJson(_json_obj).toStdWString()); } From 2e7f997572f11629142980ddaa1050dedd76dd6a Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Thu, 9 Jun 2022 19:05:41 +0300 Subject: [PATCH 14/23] [win-nix] for bug 51346 --- win-linux/src/prop/cmainpanelimpl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win-linux/src/prop/cmainpanelimpl.cpp b/win-linux/src/prop/cmainpanelimpl.cpp index 66ea53e9c..4f75ce448 100644 --- a/win-linux/src/prop/cmainpanelimpl.cpp +++ b/win-linux/src/prop/cmainpanelimpl.cpp @@ -68,7 +68,7 @@ void CMainPanelImpl::refreshAboutVersion() _json_obj["link"] = URL_SITE; _json_obj["changelog"] = "https://github.com/ONLYOFFICE/DesktopEditors/blob/master/CHANGELOG.md"; - QString _package = QSettings("./converter/package.config", QSettings::IniFormat).value("package").toString(); + QString _package = QSettings(qApp->applicationDirPath() + "/converter/package.config", QSettings::IniFormat).value("package").toString(); if ( !_package.isEmpty() ) _json_obj["pkg"] = _package; From a49d72fcf16b2a655d5ad5f7631f20bd8b419d20 Mon Sep 17 00:00:00 2001 From: Maria-Sukhova Date: Fri, 10 Jun 2022 09:38:57 +0300 Subject: [PATCH 15/23] edit translations --- macos/Localization/ko.xliff | 2 +- macos/Localization/lo.xliff | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/macos/Localization/ko.xliff b/macos/Localization/ko.xliff index 3e500b3bf..cfc91a9ba 100644 --- a/macos/Localization/ko.xliff +++ b/macos/Localization/ko.xliff @@ -264,7 +264,7 @@ PDF/A File - 휴대용 문서 /A(*.pdf) + 휴대용 문서/A(*.pdf) No comment provided by engineer. diff --git a/macos/Localization/lo.xliff b/macos/Localization/lo.xliff index 74763f85d..1af733453 100644 --- a/macos/Localization/lo.xliff +++ b/macos/Localization/lo.xliff @@ -119,7 +119,7 @@ No comment provided by engineer. Comma-Separated Values - ຄ່າທີ່ຂັ້ນດ້ວຍເຄື່ອງໝາຍຈຸດ (*.csv) + ຄ່າທີ່ຂັ້ນດ້ວຍເຄື່ອງໝາຍຈຸດ (*.csv) No comment provided by engineer. @@ -259,7 +259,7 @@ No comment provided by engineer. PDF File - ເອກະສານພົກພາ (*.pdf) + ເອກະສານພົກພາ (*.pdf) No comment provided by engineer. From a30e61172e6cd0412d5d026f060cb286d7a426e5 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Sat, 11 Jun 2022 13:06:47 +0300 Subject: [PATCH 16/23] [win-nix] set url to help before build --- win-linux/ASCDocumentEditor.pro | 1 + win-linux/src/cascapplicationmanagerwrapper.cpp | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/win-linux/ASCDocumentEditor.pro b/win-linux/ASCDocumentEditor.pro index 743285cbc..d9aa29abd 100644 --- a/win-linux/ASCDocumentEditor.pro +++ b/win-linux/ASCDocumentEditor.pro @@ -28,6 +28,7 @@ win32 { updmodule { DEFINES += _UPDMODULE DEFINES += URL_APPCAST_UPDATES=$$join(LINK,,\\\",\\\") + DEFINES += URL_WEBAPPS_HELP=$$join(HELPURL,,\\\",\\\") LIBS += -L$$PWD/3dparty/WinSparkle/$$PLATFORM_BUILD -lWinSparkle message(updates is turned on) diff --git a/win-linux/src/cascapplicationmanagerwrapper.cpp b/win-linux/src/cascapplicationmanagerwrapper.cpp index ffa606392..e0d02ea14 100644 --- a/win-linux/src/cascapplicationmanagerwrapper.cpp +++ b/win-linux/src/cascapplicationmanagerwrapper.cpp @@ -1072,6 +1072,10 @@ void CAscApplicationManagerWrapper::initializeApp() if ( InputArgs::contains(L"--help-url") ) _json_obj["helpUrl"] = QUrl(QString::fromStdWString(InputArgs::argument_value(L"--help-url"))).isValid(); +#ifdef URL_WEBAPPS_HELP + else if ( "" != URL_WEBAPPS_HELP ) + _json_obj["helpUrl"] = URL_WEBAPPS_HELP; +#endif AscAppManager::getInstance().SetRendererProcessVariable(Utils::stringifyJson(_json_obj).toStdWString()); } From 0ee7065995b9d2b0c754a1d5a50ae900d4f8fa1f Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Sat, 11 Jun 2022 13:08:04 +0300 Subject: [PATCH 17/23] [win-nix] read packate type from enviroment varaibles --- win-linux/src/prop/cmainpanelimpl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win-linux/src/prop/cmainpanelimpl.cpp b/win-linux/src/prop/cmainpanelimpl.cpp index 4f75ce448..a81a4885d 100644 --- a/win-linux/src/prop/cmainpanelimpl.cpp +++ b/win-linux/src/prop/cmainpanelimpl.cpp @@ -68,7 +68,7 @@ void CMainPanelImpl::refreshAboutVersion() _json_obj["link"] = URL_SITE; _json_obj["changelog"] = "https://github.com/ONLYOFFICE/DesktopEditors/blob/master/CHANGELOG.md"; - QString _package = QSettings(qApp->applicationDirPath() + "/converter/package.config", QSettings::IniFormat).value("package").toString(); + QString _package = qgetenv("ASC_PACK_TYPE"); if ( !_package.isEmpty() ) _json_obj["pkg"] = _package; From ad02c1b629231ed514a155d3ebab5be1efec7291 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 14 Jun 2022 10:31:33 +0300 Subject: [PATCH 18/23] [win] fix build --- win-linux/ASCDocumentEditor.pro | 3 +++ win-linux/src/cascapplicationmanagerwrapper.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/win-linux/ASCDocumentEditor.pro b/win-linux/ASCDocumentEditor.pro index d9aa29abd..707fd846a 100644 --- a/win-linux/ASCDocumentEditor.pro +++ b/win-linux/ASCDocumentEditor.pro @@ -34,6 +34,9 @@ win32 { message(updates is turned on) message(url: $$join(LINK,,\\\",\\\")) } + + DEFINES += URL_WEBAPPS_HELP=$$join(HELPURL,,\\\",\\\") + message(url: $$join(URL_WEBAPPS_HELP,,\\\",\\\")) } HEADERS += \ diff --git a/win-linux/src/cascapplicationmanagerwrapper.cpp b/win-linux/src/cascapplicationmanagerwrapper.cpp index e0d02ea14..762e608c1 100644 --- a/win-linux/src/cascapplicationmanagerwrapper.cpp +++ b/win-linux/src/cascapplicationmanagerwrapper.cpp @@ -1073,7 +1073,7 @@ void CAscApplicationManagerWrapper::initializeApp() if ( InputArgs::contains(L"--help-url") ) _json_obj["helpUrl"] = QUrl(QString::fromStdWString(InputArgs::argument_value(L"--help-url"))).isValid(); #ifdef URL_WEBAPPS_HELP - else if ( "" != URL_WEBAPPS_HELP ) + else if ( !QString(URL_WEBAPPS_HELP).isEmpty() ) _json_obj["helpUrl"] = URL_WEBAPPS_HELP; #endif From 18460b78cb4304a771ff98cdb6e1284af0848499 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 14 Jun 2022 11:04:52 +0300 Subject: [PATCH 19/23] [win-nix] fix build --- win-linux/ASCDocumentEditor.pro | 4 ---- win-linux/defaults.pri | 6 ++++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/win-linux/ASCDocumentEditor.pro b/win-linux/ASCDocumentEditor.pro index 707fd846a..743285cbc 100644 --- a/win-linux/ASCDocumentEditor.pro +++ b/win-linux/ASCDocumentEditor.pro @@ -28,15 +28,11 @@ win32 { updmodule { DEFINES += _UPDMODULE DEFINES += URL_APPCAST_UPDATES=$$join(LINK,,\\\",\\\") - DEFINES += URL_WEBAPPS_HELP=$$join(HELPURL,,\\\",\\\") LIBS += -L$$PWD/3dparty/WinSparkle/$$PLATFORM_BUILD -lWinSparkle message(updates is turned on) message(url: $$join(LINK,,\\\",\\\")) } - - DEFINES += URL_WEBAPPS_HELP=$$join(HELPURL,,\\\",\\\") - message(url: $$join(URL_WEBAPPS_HELP,,\\\",\\\")) } HEADERS += \ diff --git a/win-linux/defaults.pri b/win-linux/defaults.pri index 07637b2d3..a76a90bf0 100644 --- a/win-linux/defaults.pri +++ b/win-linux/defaults.pri @@ -162,6 +162,12 @@ ENV_PRODUCT_VERSION = $$(PRODUCT_VERSION) VER_PRODUCT_VERSION_COMMAS=$$replace(FULL_PRODUCT_VERSION, \., ",") } +CMD_IN_HELP_URL = $$join(HELPURL,,\\\",\\\") +!isEmpty(CMD_IN_HELP_URL) { + DEFINES += URL_WEBAPPS_HELP=CMD_IN_HELP_URL + message(webapps help url: $$CMD_IN_HELP_URL) +} + PLATFORM_BUILD=$$CORE_BUILDS_PLATFORM_PREFIX # cef From c270e0e0f34a6245edf7aef38ff3f4f56e3f6715 Mon Sep 17 00:00:00 2001 From: maxkadushkin Date: Thu, 16 Jun 2022 17:14:31 +0300 Subject: [PATCH 20/23] [macos] support for xlsm files --- macos/ONLYOFFICE.xcodeproj/project.pbxproj | 8 ++++++++ .../Resources/ONLYOFFICE-arm/Info.plist | 16 ++++++++++++---- .../Resources/ONLYOFFICE-v8/Info.plist | 12 ++++++++++++ .../Resources/ONLYOFFICE-x86_64/Info.plist | 12 ++++++++++++ .../Resources/file-formats/file-xlsm.icns | Bin 0 -> 83968 bytes 5 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 macos/ONLYOFFICE/Resources/file-formats/file-xlsm.icns diff --git a/macos/ONLYOFFICE.xcodeproj/project.pbxproj b/macos/ONLYOFFICE.xcodeproj/project.pbxproj index 2435c770a..4c73d5938 100644 --- a/macos/ONLYOFFICE.xcodeproj/project.pbxproj +++ b/macos/ONLYOFFICE.xcodeproj/project.pbxproj @@ -22,6 +22,9 @@ /* Begin PBXBuildFile section */ 5A452E4B257688C700C58E01 /* providers in Resources */ = {isa = PBXBuildFile; fileRef = 5A452E4A257688C700C58E01 /* providers */; }; + 5A9F8D392848AA07007CA93F /* file-xlsm.icns in Resources */ = {isa = PBXBuildFile; fileRef = 5A9F8D382848AA06007CA93F /* file-xlsm.icns */; }; + 5A9F8D3A2848AA07007CA93F /* file-xlsm.icns in Resources */ = {isa = PBXBuildFile; fileRef = 5A9F8D382848AA06007CA93F /* file-xlsm.icns */; }; + 5A9F8D3B2848AA07007CA93F /* file-xlsm.icns in Resources */ = {isa = PBXBuildFile; fileRef = 5A9F8D382848AA06007CA93F /* file-xlsm.icns */; }; 5AA06CBD27AC3BA000D67BEE /* ASCLinguist.m in Sources */ = {isa = PBXBuildFile; fileRef = 5AA06CBC27AC3BA000D67BEE /* ASCLinguist.m */; }; 5AA06CC027B1267200D67BEE /* ASCLinguist.m in Sources */ = {isa = PBXBuildFile; fileRef = 5AA06CBC27AC3BA000D67BEE /* ASCLinguist.m */; }; 5AA06CC127B1267600D67BEE /* ASCLinguist.m in Sources */ = {isa = PBXBuildFile; fileRef = 5AA06CBC27AC3BA000D67BEE /* ASCLinguist.m */; }; @@ -763,6 +766,7 @@ 5A87ABEB283286DB0084198A /* ga-IE */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "ga-IE"; path = "ga-IE.lproj/MoveApplication.strings"; sourceTree = ""; }; 5A87ABEC283286DB0084198A /* ga-IE */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "ga-IE"; path = "ga-IE.lproj/Presentation-Reporter.strings"; sourceTree = ""; }; 5A87ABEE2832964F0084198A /* ga-IE */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "ga-IE"; path = "ga-IE.lproj/Localizable.strings"; sourceTree = ""; }; + 5A9F8D382848AA06007CA93F /* file-xlsm.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "file-xlsm.icns"; sourceTree = ""; }; 5AA06CBB27AC3BA000D67BEE /* ASCLinguist.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ASCLinguist.h; sourceTree = ""; }; 5AA06CBC27AC3BA000D67BEE /* ASCLinguist.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ASCLinguist.m; sourceTree = ""; }; 5AB20F5D274D35F2003732A0 /* file-docxf.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "file-docxf.icns"; sourceTree = ""; }; @@ -1146,6 +1150,7 @@ FC081EBC1C325E8400F9881C /* file-formats */ = { isa = PBXGroup; children = ( + 5A9F8D382848AA06007CA93F /* file-xlsm.icns */, 5AB20F61274D360A003732A0 /* file-oform.icns */, 5AB20F5D274D35F2003732A0 /* file-docxf.icns */, FCA3F3062570EC9500DCAB12 /* file-epub.icns */, @@ -1940,6 +1945,7 @@ 5AFA1CF3277A6DA600619952 /* file-oform.icns in Resources */, FC0BD6C9258B63F700C47F95 /* file-otp.icns in Resources */, FCB4C78026DD02960012C20D /* InfoPlist.strings in Resources */, + 5A9F8D3B2848AA07007CA93F /* file-xlsm.icns in Resources */, FCB4C77F26DD02960012C20D /* EULA.html in Resources */, FC0BD6CA258B63F700C47F95 /* file-fb2.icns in Resources */, FC0BD6CB258B63F700C47F95 /* file-epub.icns in Resources */, @@ -1991,6 +1997,7 @@ 5AFA1CF4277A6DF100619952 /* file-docxf.icns in Resources */, FCB4C70526DD018B0012C20D /* file-otp.icns in Resources */, FCB4C77D26DD027B0012C20D /* InfoPlist.strings in Resources */, + 5A9F8D392848AA07007CA93F /* file-xlsm.icns in Resources */, FCB4C77C26DD02750012C20D /* EULA.html in Resources */, FCB4C70626DD018B0012C20D /* file-fb2.icns in Resources */, FCB4C70726DD018B0012C20D /* file-epub.icns in Resources */, @@ -2042,6 +2049,7 @@ 5AFA1CF2277A6D4C00619952 /* file-oform.icns in Resources */, 5AFA1CF1277A6D2900619952 /* file-docxf.icns in Resources */, FCA3F3092570EC9500DCAB12 /* file-otp.icns in Resources */, + 5A9F8D3A2848AA07007CA93F /* file-xlsm.icns in Resources */, FCB4C78326DD02A40012C20D /* InfoPlist.strings in Resources */, FCB4C78226DD02A40012C20D /* EULA.html in Resources */, FCA3F30C2570EC9500DCAB12 /* file-fb2.icns in Resources */, diff --git a/macos/ONLYOFFICE/Resources/ONLYOFFICE-arm/Info.plist b/macos/ONLYOFFICE/Resources/ONLYOFFICE-arm/Info.plist index 2ad93d1c2..a134467b7 100644 --- a/macos/ONLYOFFICE/Resources/ONLYOFFICE-arm/Info.plist +++ b/macos/ONLYOFFICE/Resources/ONLYOFFICE-arm/Info.plist @@ -479,8 +479,6 @@ ONLYOFFICE Document Form Template CFBundleTypeRole Editor - LSHandlerRank - Default CFBundleTypeExtensions @@ -493,8 +491,18 @@ ONLYOFFICE Fillable Online Form CFBundleTypeRole Editor - LSHandlerRank - Default + + + CFBundleTypeExtensions + + xlsm + + CFBundleTypeName + Microsoft Excel Workbook with macro enabled (.xlsm) + CFBundleTypeIconFile + file-xlsm + CFBundleTypeRole + Editor CFBundleExecutable diff --git a/macos/ONLYOFFICE/Resources/ONLYOFFICE-v8/Info.plist b/macos/ONLYOFFICE/Resources/ONLYOFFICE-v8/Info.plist index 910edc5c7..c591e2d18 100644 --- a/macos/ONLYOFFICE/Resources/ONLYOFFICE-v8/Info.plist +++ b/macos/ONLYOFFICE/Resources/ONLYOFFICE-v8/Info.plist @@ -496,6 +496,18 @@ LSHandlerRank Default + + CFBundleTypeExtensions + + xlsm + + CFBundleTypeName + Microsoft Excel Workbook with macro enabled (.xlsm) + CFBundleTypeIconFile + file-xlsm + CFBundleTypeRole + Editor + CFBundleExecutable $(EXECUTABLE_NAME) diff --git a/macos/ONLYOFFICE/Resources/ONLYOFFICE-x86_64/Info.plist b/macos/ONLYOFFICE/Resources/ONLYOFFICE-x86_64/Info.plist index 23fd7dd43..431f7d7bf 100644 --- a/macos/ONLYOFFICE/Resources/ONLYOFFICE-x86_64/Info.plist +++ b/macos/ONLYOFFICE/Resources/ONLYOFFICE-x86_64/Info.plist @@ -492,6 +492,18 @@ CFBundleTypeRole Editor + + CFBundleTypeExtensions + + xlsm + + CFBundleTypeName + Microsoft Excel Workbook with macro enabled (.xlsm) + CFBundleTypeIconFile + file-xlsm + CFBundleTypeRole + Editor + CFBundleExecutable $(EXECUTABLE_NAME) diff --git a/macos/ONLYOFFICE/Resources/file-formats/file-xlsm.icns b/macos/ONLYOFFICE/Resources/file-formats/file-xlsm.icns new file mode 100644 index 0000000000000000000000000000000000000000..8e63cc6cc59d72d093b7f88839afbb6e2eb1a0f5 GIT binary patch literal 83968 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 Date: Thu, 16 Jun 2022 17:16:41 +0300 Subject: [PATCH 21/23] [macos] added missed file to project --- macos/ONLYOFFICE.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/macos/ONLYOFFICE.xcodeproj/project.pbxproj b/macos/ONLYOFFICE.xcodeproj/project.pbxproj index 4c73d5938..6b4ecc10a 100644 --- a/macos/ONLYOFFICE.xcodeproj/project.pbxproj +++ b/macos/ONLYOFFICE.xcodeproj/project.pbxproj @@ -411,6 +411,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 5A18BAA3285B5BF6004625C7 /* CertificateCommon.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CertificateCommon.h; sourceTree = ""; }; 5A452E4A257688C700C58E01 /* providers */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = providers; path = Vendor/ONLYOFFICE/providers; sourceTree = SOURCE_ROOT; }; 5A7F85D027A00C18006B6E27 /* lv-LV */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "lv-LV"; path = "lv-LV.lproj/Document-Sign.strings"; sourceTree = ""; }; 5A7F85D127A00C18006B6E27 /* lv-LV */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "lv-LV"; path = "lv-LV.lproj/Localizable.strings"; sourceTree = ""; }; @@ -818,7 +819,6 @@ FC54A2921F94BCE00086F4FE /* ASCPresentationReporter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ASCPresentationReporter.h; sourceTree = ""; }; FC54A2931F94BCE00086F4FE /* ASCPresentationReporter.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = ASCPresentationReporter.mm; sourceTree = ""; }; FC5919D5208DC6D00006F664 /* OOXMLVerifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXMLVerifier.h; sourceTree = ""; }; - FC5919D6208DC6D00006F664 /* XmlCertificate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XmlCertificate.h; sourceTree = ""; }; FC5919D7208DC6D00006F664 /* OOXMLSigner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXMLSigner.h; sourceTree = ""; }; FC592513208DE7440006F664 /* libooxmlsignature.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libooxmlsignature.dylib; path = ../../../build_tools/out/mac_64/onlyoffice/desktopeditors/libooxmlsignature.dylib; sourceTree = ""; }; FC5A2D2F1BAC0739001ACEB1 /* libascdocumentscore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libascdocumentscore.dylib; path = ../../build_tools/out/mac_64/onlyoffice/desktopeditors/libascdocumentscore.dylib; sourceTree = SOURCE_ROOT; }; @@ -1246,8 +1246,8 @@ FC5919D4208DC6D00006F664 /* include */ = { isa = PBXGroup; children = ( + 5A18BAA3285B5BF6004625C7 /* CertificateCommon.h */, FC5919D5208DC6D00006F664 /* OOXMLVerifier.h */, - FC5919D6208DC6D00006F664 /* XmlCertificate.h */, FC5919D7208DC6D00006F664 /* OOXMLSigner.h */, ); path = include; From db4f77b943ee416aad017223690a3dabbed02d63 Mon Sep 17 00:00:00 2001 From: Semyon Bezrukov Date: Mon, 20 Jun 2022 19:33:17 +0300 Subject: [PATCH 22/23] [macos] Bump version to 7.2.0(533) (#498) --- macos/ONLYOFFICE/Resources/ONLYOFFICE-arm/Info.plist | 4 ++-- macos/ONLYOFFICE/Resources/ONLYOFFICE-v8/Info.plist | 4 ++-- macos/ONLYOFFICE/Resources/ONLYOFFICE-x86_64/Info.plist | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/macos/ONLYOFFICE/Resources/ONLYOFFICE-arm/Info.plist b/macos/ONLYOFFICE/Resources/ONLYOFFICE-arm/Info.plist index a134467b7..fcaf6f8d1 100644 --- a/macos/ONLYOFFICE/Resources/ONLYOFFICE-arm/Info.plist +++ b/macos/ONLYOFFICE/Resources/ONLYOFFICE-arm/Info.plist @@ -518,7 +518,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 7.1 + 7.2 CFBundleSignature ???? CFBundleURLTypes @@ -533,7 +533,7 @@ CFBundleVersion - 532 + 533 LSApplicationCategoryType public.app-category.productivity LSMinimumSystemVersion diff --git a/macos/ONLYOFFICE/Resources/ONLYOFFICE-v8/Info.plist b/macos/ONLYOFFICE/Resources/ONLYOFFICE-v8/Info.plist index c591e2d18..fe7aabf7c 100644 --- a/macos/ONLYOFFICE/Resources/ONLYOFFICE-v8/Info.plist +++ b/macos/ONLYOFFICE/Resources/ONLYOFFICE-v8/Info.plist @@ -522,7 +522,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 7.1 + 7.2 CFBundleSignature ???? CFBundleURLTypes @@ -537,7 +537,7 @@ CFBundleVersion - 532 + 533 LSApplicationCategoryType public.app-category.productivity LSMinimumSystemVersion diff --git a/macos/ONLYOFFICE/Resources/ONLYOFFICE-x86_64/Info.plist b/macos/ONLYOFFICE/Resources/ONLYOFFICE-x86_64/Info.plist index 431f7d7bf..4ec425f78 100644 --- a/macos/ONLYOFFICE/Resources/ONLYOFFICE-x86_64/Info.plist +++ b/macos/ONLYOFFICE/Resources/ONLYOFFICE-x86_64/Info.plist @@ -518,7 +518,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 7.1 + 7.2 CFBundleSignature ???? CFBundleURLTypes @@ -533,7 +533,7 @@ CFBundleVersion - 532 + 533 LSApplicationCategoryType public.app-category.productivity LSMinimumSystemVersion From e5f39d79757c970acabdabb9e507a5c24fcdfde4 Mon Sep 17 00:00:00 2001 From: Oleg Korshul Date: Wed, 22 Jun 2022 22:07:23 +0300 Subject: [PATCH 23/23] Fix path to xmlsec engine --- win-linux/src/linux/cdialogopenssl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win-linux/src/linux/cdialogopenssl.cpp b/win-linux/src/linux/cdialogopenssl.cpp index f350823a4..dc9cb41d1 100644 --- a/win-linux/src/linux/cdialogopenssl.cpp +++ b/win-linux/src/linux/cdialogopenssl.cpp @@ -10,7 +10,7 @@ #include #include -#include "../../../core/DesktopEditor/xmlsec/src/include/CertificateCommon.h" +#include "../../../../core/DesktopEditor/xmlsec/src/include/CertificateCommon.h" class CSslDialog_Private {