diff --git a/common/changes/7.5.0/changes.html b/common/changes/7.5.0/changes.html index 49758ab9a..2706f3016 100644 --- a/common/changes/7.5.0/changes.html +++ b/common/changes/7.5.0/changes.html @@ -4,44 +4,67 @@

All Editors

Document Editor

Spreadsheet Editor

Presentation Editor

Forms

- -

Fixes

- -

All Editors

+

PDF Editor

-

Document Editor

- -

Spreadsheet Editor

- -

Presentation Editor

- -

Forms

- diff --git a/common/changes/7.5.0/changes_ru.html b/common/changes/7.5.0/changes_ru.html index 858ab7bd3..0427dd820 100644 --- a/common/changes/7.5.0/changes_ru.html +++ b/common/changes/7.5.0/changes_ru.html @@ -4,44 +4,66 @@

Все редакторы

Редактор документов

Редактор таблиц

Редактор презентаций

Формы

- -

Исправления

- -

Все редакторы

+

Редактор PDF

-

Редактор документов

- -

Редактор таблиц

- -

Редактор презентаций

- -

Формы

- diff --git a/common/loginpage/locale/bg.js b/common/loginpage/locale/bg.js index 191420376..e102efe07 100644 --- a/common/loginpage/locale/bg.js +++ b/common/loginpage/locale/bg.js @@ -91,4 +91,21 @@ l10n.bg = { settOptLaunchMode: 'Отвори файл', settOptLaunchInTab: 'В раздела', settOptLaunchInWindow: 'В прозореца', + settSpellcheckDetection: 'Откриване на езиково спелуване', + settOptDisabled: 'Деактивирано', + settOptEnabled: 'Активирано', + aboutChangelog: 'Дневник за промени', + updateNoUpdates: 'Приложението е актуално', + updateAvialable: 'Налична е версия $1. Натиснете за изтегляне.', + settOptThemeSystem: 'Същото като в системата', + settOptThemeContrastDark: 'Контрастно Тъмно', + settAUpdateMode: 'Режим за автоматично актуализиране', + settOptAUpdateSilent: 'Тих режим', + settOptAUpdateAsk: 'Помолете за изтегляне', + updateDownloadFinished: 'Изтеглянето приключи. Натиснете за инсталиране', + updateDownloadCanceled: 'Изтеглянето е отказано', + updateDownloadProgress: 'Изтегляне $1%. Натиснете за прекратяване', + settOptDescDisabled: "Автоматичната проверка за актуализации ще бъде деактивирана", + settOptDescAUpdateSilent: "Изтегляне на актуализации и питане преди инсталиране", + settOptDescAUpdateAsk: "Ще бъдете известени за всички стъпки на актуализирането", } \ No newline at end of file diff --git a/common/loginpage/locale/ca.js b/common/loginpage/locale/ca.js index dd54252f1..61d9ceecd 100644 --- a/common/loginpage/locale/ca.js +++ b/common/loginpage/locale/ca.js @@ -56,6 +56,7 @@ l10n.ca = { actActivate: 'Activa', actAbout: 'Sobre', actSettings: 'Configuració', + actTemplates: 'Plantilles', licKeyHolder: 'clau d\'activació d\'entrada', btnActivate: 'Activa', licGetLicense: 'Obtenir ara la teva llicencia', @@ -90,6 +91,21 @@ l10n.ca = { settOptLaunchMode: 'Obre fitxer', settOptLaunchInTab: 'En una pestanya', settOptLaunchInWindow: 'En una finestra', + settSpellcheckDetection: 'Detecció ortogràfica de la llengua', + settOptDisabled: 'Desactivat', + settOptEnabled: 'Activat', + aboutChangelog: 'Registre de canvis', + updateNoUpdates: 'App actualitzada', + updateAvialable: 'La versió $1 està disponible. Feu clic per descarregar-la.', settOptThemeSystem: 'Igual que el sistema', settOptThemeContrastDark: 'Contrast fosc', + settAUpdateMode: 'Mode d\'actualització automàtica', + settOptAUpdateSilent: 'Mode silenciós', + settOptAUpdateAsk: 'Demanar descarregar-la', + updateDownloadFinished: 'La descàrrega ha finalitzat. Feu clic per instal·lar', + updateDownloadCanceled: 'Descàrrega cancel·lada', + updateDownloadProgress: 'Descarregant $1%. Fes clic per pausar', + settOptDescDisabled: "S'inhabilitarà la comprovació d'actualitzacions automàtiques", + settOptDescAUpdateSilent: "Descarregar actualitzacions i preguntar abans d'instal·lar-les", + settOptDescAUpdateAsk: "Se li notificaran tots els passos de les actualitzacions", } diff --git a/common/loginpage/locale/el.js b/common/loginpage/locale/el.js index 58e760d25..0fcc62f75 100644 --- a/common/loginpage/locale/el.js +++ b/common/loginpage/locale/el.js @@ -44,10 +44,10 @@ l10n.el = { pshPhone: 'αριθμός τηλεφώνου', pshCode: 'κωδικός από μήνυμα κειμένου', loginNoteAssignPhone: 'Ο έλεγχος ταυτότητας δύο παραγόντων είναι ενεργοποιημένος για να παρέχει επιπλέον ασφάλεια στο ONLYOFFICE cloud. Εισαγάγετε τον αριθμό του κινητού σας τηλεφώνου για να συνεχίσετε την εργασία σας στο cloud office. Ο αριθμός κινητού τηλεφώνου πρέπει να εισαχθεί χρησιμοποιώντας μια διεθνή μορφή με κωδικό χώρας.', - loginNoteApplyCode: 'Ο έλεγχος ταυτότητας δύο παραγόντων είναι ενεργοποιημένος. Ο κωδικός έχει αποσταλεί στον αριθμό $1.', - newDoc: 'Εγγραφο', - newXlsx: 'Υπολογιστικο φυλλο', - newPptx: 'Παρουσιαση', + loginNoteApplyCode: 'Ο έλεγχος ταυτότητας δύο παραγόντων είναι ενεργοποιημένος. Ο κωδικός έχει αποσταλεί στον αριθμό $1.', + newDoc: 'Έγγραφο', + newXlsx: 'Υπολογιστικό φύλλο', + newPptx: 'Παρουσίαση', newForm: 'Πρότυπο φόρμας', actCreateNew: 'Δημιουργία νέου', actRecentFiles: 'Πρόσφατα αρχεία', diff --git a/common/loginpage/locale/es.js b/common/loginpage/locale/es.js index 12aa998fc..f24883b6c 100644 --- a/common/loginpage/locale/es.js +++ b/common/loginpage/locale/es.js @@ -105,4 +105,7 @@ l10n.es = { updateDownloadFinished: 'Descarga finalizada. Haga clic para instalar', updateDownloadCanceled: 'Descarga cancelada', updateDownloadProgress: 'Descargando $1%. Haga clic para cancelar', + settOptDescDisabled: "Se desactivará la comprobación automática de actualizaciones", + settOptDescAUpdateSilent: "Descargar actualizaciones y preguntar antes de instalarlas", + settOptDescAUpdateAsk: "Se le notificarán todos los pasos de las actualizaciones", } diff --git a/common/loginpage/locale/fr.js b/common/loginpage/locale/fr.js index d86a8c340..de1374e0f 100644 --- a/common/loginpage/locale/fr.js +++ b/common/loginpage/locale/fr.js @@ -105,4 +105,7 @@ l10n.fr = { updateDownloadFinished: 'Téléchargement terminé. Cliquez pour installer', updateDownloadCanceled: 'Téléchargement annulé', updateDownloadProgress: 'Téléchargement de $1%. Cliquez pour arrêter', + settOptDescDisabled: "Vérification automatique des mises à jour sera désactivée", + settOptDescAUpdateSilent: "Télécharger les mises à jour et demander avant l'installation", + settOptDescAUpdateAsk: "Vous serez averti de toutes les étapes de mise à jour", } diff --git a/common/loginpage/locale/hy.js b/common/loginpage/locale/hy.js index d0f387c49..21b62d8b1 100644 --- a/common/loginpage/locale/hy.js +++ b/common/loginpage/locale/hy.js @@ -9,7 +9,7 @@ l10n.hy = { btnBrowse: 'Զննել', btnNext: 'Հաջորդ', portalEmptyTitle: 'Միանալ Ձեր ամպին', - portalEmptyDescr: 'Պահպանեք Ձեր փաստաթղթերը ամպում, և դրանք ցանկացած պահի ցանկացած վայրում հասանելի կլինեն։ Կիսվեք և համագործակցեք դրանց միջոցով։ Զրուցեք Ձեր փաստաթղթի մեջ, ավելացրեք մեկնաբանություններ կամ կիսվեք դրանով՝ կարծիք ստանալու համար։', + portalEmptyDescr: 'Պահպանեք Ձեր փաստաթղթերը ամպում, և դրանք ցանկացած պահի ցանկացած վայրում հասանելի կլինեն։ Կիսվեք և համագործակցեք դրանց միջոցով։ Զրուցեք Ձեր փաստաթղթի մեջ, ավելացրեք մեկնաբանություններ կամ կիսվեք դրանով՝ կարծիք ստանալու համար։', portalEmptyAdv1: 'Դեռևս չունե՞ք ամպային հաշիվ։ Դարձեք առցանց ONLYOFFICE ամպային ծառայության հետ և
անվճար փորձեք համագործակցային հնարավորությունները։', portalListTitle: 'Միացված ամպեր', textNoFiles: 'Ֆայլեր չկան', @@ -105,7 +105,7 @@ l10n.hy = { updateDownloadFinished: 'Ներբեռնումն ավարտված է։ Սեղմեք՝ տեղադրելու համար', updateDownloadCanceled: 'Ներբեռնումը չեղարկվել է', updateDownloadProgress: 'Ներբեռնվում է $1%: Սեղմեք դադարեցնելու համար', - settOptDescDisabled: "Ավտոմատ ստուգման թարմացումները կանջատվեն", - settOptDescAUpdateSilent: "Ներբեռնեք թարմացումները և հարցրեք նախքան տեղադրելը", - settOptDescAUpdateAsk: "Դուք կտեղեկացվեք թարմացումների բոլոր քայլերի մասին", + settOptDescDisabled: "Ավտոմատ ստուգման թարմացումները կանջատվեն։", + settOptDescAUpdateSilent: "Ներբեռնեք թարմացումները և հարցրեք նախքան տեղադրելը։", + settOptDescAUpdateAsk: "Դուք կտեղեկացվեք թարմացումների բոլոր քայլերի մասին։", } diff --git a/common/loginpage/locale/it.js b/common/loginpage/locale/it.js index 312781d10..3be7d4e54 100644 --- a/common/loginpage/locale/it.js +++ b/common/loginpage/locale/it.js @@ -105,4 +105,7 @@ l10n.it_IT = { updateDownloadFinished: 'Download completato. Clicca per installare', updateDownloadCanceled: 'Download annullato', updateDownloadProgress: 'Scaricamento $ 1%. Clicca per interrompere', + settOptDescDisabled: "Il controllo automatico degli aggiornamenti verrà disabilitato", + settOptDescAUpdateSilent: "Scarica gli aggiornamenti e chiedi prima dell'installazione", + settOptDescAUpdateAsk: "Riceverai una notifica su tutte le fasi di aggiornamento", } diff --git a/common/loginpage/locale/ja.js b/common/loginpage/locale/ja.js index affd36126..c1837a7b5 100644 --- a/common/loginpage/locale/ja.js +++ b/common/loginpage/locale/ja.js @@ -105,4 +105,7 @@ l10n.ja = { updateDownloadFinished: 'ダウンロードが完了しました。クリックしてインストールしてください', updateDownloadCanceled: 'ダウンロードがキャンセルされました', updateDownloadProgress: 'ダウンロードは$1%です。停止するにはクリックしてください', + settOptDescDisabled: "アップデートの自動チェックは無効になります", + settOptDescAUpdateSilent: "アップデートをダウンロードし、インストールする前に通知します", + settOptDescAUpdateAsk: "すべてのアップデート手順が通知されます", } diff --git a/common/loginpage/locale/lv.js b/common/loginpage/locale/lv.js index 60cd555c8..f321543e4 100644 --- a/common/loginpage/locale/lv.js +++ b/common/loginpage/locale/lv.js @@ -91,4 +91,21 @@ l10n.lv = { settOptLaunchMode: 'Atvērt failu', settOptLaunchInTab: 'Cilnē', settOptLaunchInWindow: 'Logā', + settSpellcheckDetection: 'Pareizrakstības valodas noteikšana', + settOptDisabled: 'Atspējots', + settOptEnabled: 'Iespējots', + aboutChangelog: 'Izmaiņu žurnāls', + updateNoUpdates: 'Lietotne ir atjaunināta', + updateAvialable: 'Ir pieejama versija $1. Noklikšķiniet, lai lejupielādētu.', + settOptThemeSystem: 'Tas pats kā sistēma', + settOptThemeContrastDark: 'Tumšs kontrasts', + settAUpdateMode: 'Automātiskās atjaunināšanas režīms', + settOptAUpdateSilent: 'Klusuma režīms', + settOptAUpdateAsk: 'Lūgt lejupielādēt', + updateDownloadFinished: 'Lejupielāde ir pabeigta. Noklikšķiniet, lai instalētu', + updateDownloadCanceled: 'Lejupielāde ir atcelta', + updateDownloadProgress: 'Lejupielādē $1%. Noklikšķiniet, lai apturētu', + settOptDescDisabled: "Atjauninājumu automātiskā pārbaude tiks atspējota", + settOptDescAUpdateSilent: "Lejupielādēt atjauninājumus un jautāt pirms instalēšanas", + settOptDescAUpdateAsk: "Jums tiks paziņots par visām atjaunināšanas darbībām", } diff --git a/common/loginpage/locale/pt-BR.js b/common/loginpage/locale/pt-BR.js index 77029a5a8..397da521a 100644 --- a/common/loginpage/locale/pt-BR.js +++ b/common/loginpage/locale/pt-BR.js @@ -105,4 +105,7 @@ l10n.pt_BR = { updateDownloadFinished: 'Download finalizado. Clique para instalar', updateDownloadCanceled: 'Download cancelado', updateDownloadProgress: 'Baixando $1%. Clique para parar', + settOptDescDisabled: "A verificação automática de atualizações será desativada", + settOptDescAUpdateSilent: "Baixe atualizações e pergunte antes de instalar", + settOptDescAUpdateAsk: "Você será notificado sobre todas as etapas de atualização", } diff --git a/common/loginpage/locale/ro.js b/common/loginpage/locale/ro.js index 73e9deeb5..50fdde003 100644 --- a/common/loginpage/locale/ro.js +++ b/common/loginpage/locale/ro.js @@ -105,4 +105,7 @@ l10n.ro = { updateDownloadFinished: 'Descărcare încheiată. Faceți clic pentru a instala', updateDownloadCanceled: 'Descărcare anulată', updateDownloadProgress: 'Se descarcă $1%. Faceți clic pentru a opri descărcarea', + settOptDescDisabled: "Verificarea automată a actualizărilor va fi dezactivată", + settOptDescAUpdateSilent: "Descarcă actualizări și întreabă înainte de a instala", + settOptDescAUpdateAsk: "Veți primi notificări privind fiecare etapă de actualizare", } diff --git a/common/loginpage/locale/sk.js b/common/loginpage/locale/sk.js index 81c2c9e94..6fa281f9d 100644 --- a/common/loginpage/locale/sk.js +++ b/common/loginpage/locale/sk.js @@ -91,4 +91,21 @@ l10n.sk = { settOptLaunchMode: 'Otvoriť súbor', settOptLaunchInTab: 'V tabuľke', settOptLaunchInWindow: 'V okne', + settSpellcheckDetection: 'Rozpoznávanie jazyka pravopisu', + settOptDisabled: 'Vypnuté', + settOptEnabled: 'Zapnuté', + aboutChangelog: 'Protokol zmien', + updateNoUpdates: 'Aplikácia je aktuálna', + updateAvialable: 'Je dostupná verzia $1. Kliknite, aby ste si ju stiahli.', + settOptThemeSystem: 'Rovnaké ako systém', + settOptThemeContrastDark: 'Kontrast tmavý', + settAUpdateMode: 'Režim automatickej aktualizácie', + settOptAUpdateSilent: 'Tichý režim', + settOptAUpdateAsk: 'Spýtať sa pred sťahovaním', + updateDownloadFinished: 'Sťahovanie ukončené. Kliknite, aby sa spustila inštalácia', + updateDownloadCanceled: 'Sťahovanie bolo zrušené', + updateDownloadProgress: 'Sťahovanie $1%. Kliknutím zastavíte', + settOptDescDisabled: "Automatické sledovanie aktualizácií bude vypnuté", + settOptDescAUpdateSilent: "Stiahnuť aktualizácie a spýtať sa pred inštaláciou", + settOptDescAUpdateAsk: "Budete upozornení na všetky kroky aktualizácií", } diff --git a/common/loginpage/locale/sl.js b/common/loginpage/locale/sl.js index 5ef357c60..85bf0f651 100644 --- a/common/loginpage/locale/sl.js +++ b/common/loginpage/locale/sl.js @@ -91,4 +91,21 @@ l10n.sl = { settOptLaunchMode: 'Odpri datoteko', settOptLaunchInTab: 'V zavihku', settOptLaunchInWindow: 'V oknu', + settSpellcheckDetection: 'Zaznavanje črkovanja jezika', + settOptDisabled: 'Onemogočeno', + settOptEnabled: 'Omogočeno', + aboutChangelog: 'Dnevnik sprememb', + updateNoUpdates: 'Aplikacija je posodobljena', + updateAvialable: 'Verzija $1 je na voljo. Kliknite za prenos.', + settOptThemeSystem: 'Enako kot sistem', + settOptThemeContrastDark: 'Temen kontrast', + settAUpdateMode: 'Način samodejnega posodabljanja', + settOptAUpdateSilent: 'Tihi način', + settOptAUpdateAsk: 'Vprašaj pred prenosom', + updateDownloadFinished: 'Prenos končan. Kliknite za namestitev', + updateDownloadCanceled: 'Prenos preklican', + updateDownloadProgress: 'Prenašanje $1%. Kliknite za zaustavitev', + settOptDescDisabled: "Samodejno preverjanje posodobitev bo onemogočeno", + settOptDescAUpdateSilent: "Prenesite posodobitve in vprašaj pred namestitvijo", + settOptDescAUpdateAsk: "O vseh korakih posodobitve boste obveščeni", } diff --git a/common/loginpage/locale/tr.js b/common/loginpage/locale/tr.js index a537c4e12..a557e7660 100644 --- a/common/loginpage/locale/tr.js +++ b/common/loginpage/locale/tr.js @@ -91,4 +91,21 @@ l10n.tr = { settOptLaunchMode: 'Dosya aç', settOptLaunchInTab: 'Sekmede', settOptLaunchInWindow: 'Pencerede', + settSpellcheckDetection: 'Yazım dili algılama', + settOptDisabled: 'Devre Dışı', + settOptEnabled: 'Devrede', + aboutChangelog: 'Değişiklik günlüğü', + updateNoUpdates: 'Uygulama güncel', + updateAvialable: '$1 sürümü mevcut. İndirmek İçin Tıklayın.', + settOptThemeSystem: 'Sistemin aynısı', + settOptThemeContrastDark: 'Kontrast Koyu', + settAUpdateMode: 'Otomatik güncelleme modu', + settOptAUpdateSilent: 'Sessiz mod', + settOptAUpdateAsk: 'İndirmek için sor', + updateDownloadFinished: 'İndirme tamamlandı. Kurmak için tıklayın', + updateDownloadCanceled: 'İndirme iptal edildi', + updateDownloadProgress: '$1% indiriliyor. Durdurmak için tıklayın', + settOptDescDisabled: "Güncellemelerin otomatik olarak kontrol edilmesi devre dışı bırakılacak", + settOptDescAUpdateSilent: "Güncellemeleri indir ve yüklemeden önce sor", + settOptDescAUpdateAsk: "Tüm güncelleme adımları hakkında bilgilendirileceksiniz", } diff --git a/common/loginpage/locale/uk.js b/common/loginpage/locale/uk.js index 84152a33b..b1183b955 100644 --- a/common/loginpage/locale/uk.js +++ b/common/loginpage/locale/uk.js @@ -91,4 +91,21 @@ l10n.uk = { settOptLaunchMode: 'Відкрити файл', settOptLaunchInTab: 'У вкладці', settOptLaunchInWindow: 'У вікні', + settSpellcheckDetection: 'Визначення мови перевірки правопису', + settOptDisabled: 'Вимкнено', + settOptEnabled: 'Увімкнено', + aboutChangelog: 'Журнал змін', + updateNoUpdates: 'Застосунок актуальний', + updateAvialable: 'Доступна версія $1. Клацніть, щоб завантажити.', + settOptThemeSystem: 'Системна', + settOptThemeContrastDark: 'Контрастна темна', + settAUpdateMode: 'Режим автооновлення', + settOptAUpdateSilent: 'Беззвучний режим', + settOptAUpdateAsk: 'Попросити завантажити', + updateDownloadFinished: 'Завантаження завершено. Клацніть, щоб інсталювати', + updateDownloadCanceled: 'Завантаження скасовано', + updateDownloadProgress: 'Завантаження $1%. Клацніть, щоб припинити', + settOptDescDisabled: "Автоматичну перевірку оновлень буде вимкнено", + settOptDescAUpdateSilent: "Завантажити оновлення та запитати перед інсталюванням", + settOptDescAUpdateAsk: "Ви будете сповіщені про всі етапи оновлення", } diff --git a/common/loginpage/res/img/update_status.svg b/common/loginpage/res/img/update_status.svg index 45d2d4ad0..c6c32c330 100644 --- a/common/loginpage/res/img/update_status.svg +++ b/common/loginpage/res/img/update_status.svg @@ -1,8 +1,6 @@ diff --git a/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.5.0/changes.html b/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.5.0/changes.html index b25fd0008..187e1fa85 100644 --- a/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.5.0/changes.html +++ b/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.5.0/changes.html @@ -91,46 +91,69 @@

All Editors

Document Editor

Spreadsheet Editor

Presentation Editor

Forms

- -

Fixes

- -

All Editors

+

PDF Editor

-

Document Editor

- -

Spreadsheet Editor

- -

Presentation Editor

- -

Forms

- diff --git a/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.5.0/changes.ru.html b/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.5.0/changes.ru.html index 031da627a..f019935a7 100644 --- a/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.5.0/changes.ru.html +++ b/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.5.0/changes.ru.html @@ -91,46 +91,69 @@

Все редакторы

Редактор документов

Редактор таблиц

Редактор презентаций

Формы

- -

Исправления

- -

Все редакторы

+

Редактор PDF

-

Редактор документов

- -

Редактор таблиц

- -

Редактор презентаций

- -

Формы

- diff --git a/win-linux/extras/update-daemon/src/classes/csvcmanager.cpp b/win-linux/extras/update-daemon/src/classes/csvcmanager.cpp index c5cc4e4c9..2755b6a81 100644 --- a/win-linux/extras/update-daemon/src/classes/csvcmanager.cpp +++ b/win-linux/extras/update-daemon/src/classes/csvcmanager.cpp @@ -164,6 +164,15 @@ auto restartService()->void CloseHandle(pi.hProcess); CloseHandle(pi.hThread); } + +auto verToAppVer(const wstring &ver)->wstring +{ + size_t pos = ver.find(L'.'); + if (pos == std::wstring::npos) + return ver; + pos = ver.find(L'.', pos + 1); + return (pos == std::wstring::npos) ? ver : ver.substr(0, pos); +} #endif CSvcManager::CSvcManager(): @@ -310,8 +319,7 @@ void CSvcManager::onCompleteUnzip(const int error) } else if (error == UNZIP_ERROR) { - tstring error(_T("An error occured while unpacking the archive")); - if (!m_socket->sendMessage(MSG_OtherError, error)) + if (!m_socket->sendMessage(MSG_OtherError, _T("SVC_TXT_ERR_UNPACKING"))) NS_Logger::WriteLog(DEFAULT_ERROR_MESSAGE); } else @@ -339,18 +347,18 @@ void CSvcManager::onCompleteSlot(const int error, const tstring &filePath) // Pause or Stop } else if (error == -1) { - m_socket->sendMessage(MSG_OtherError, _T("Update download failed: out of memory!")); + m_socket->sendMessage(MSG_OtherError, _T("SVC_TXT_ERR_DNL_OUT_MEM")); } else if (error == -2) { - m_socket->sendMessage(MSG_OtherError, _T("Update download failed: server connection error!")); + m_socket->sendMessage(MSG_OtherError, _T("SVC_TXT_ERR_DNL_CONN")); } else if (error == -3) { - m_socket->sendMessage(MSG_OtherError, _T("Update download failed: wrong URL!")); + m_socket->sendMessage(MSG_OtherError, _T("SVC_TXT_ERR_DNL_URL")); } else if (error == -4) { - m_socket->sendMessage(MSG_OtherError, _T("Update download failed: unable to create file!")); + m_socket->sendMessage(MSG_OtherError, _T("SVC_TXT_ERR_DNL_CREAT")); } else { - m_socket->sendMessage(MSG_OtherError, _T("Update download failed: network error!")); + m_socket->sendMessage(MSG_OtherError, _T("SVC_TXT_ERR_DNL_INET")); } } @@ -536,7 +544,7 @@ void CSvcManager::startReplacingFiles(const tstring &packageType, const bool res wstring app_key(app_name); app_key += (packageType == TEXT("iss")) ? L"_is1" : L""; if (RegOpenKeyEx(hKey, app_key.c_str(), 0, KEY_ALL_ACCESS, &hAppKey) == ERROR_SUCCESS) { - wstring disp_name = app_name + L" " + ver + L" (" + currentArch().substr(1) + L")"; + wstring disp_name = app_name + L" " + verToAppVer(ver) + L" (" + currentArch().substr(1) + L")"; if (RegSetValueEx(hAppKey, TEXT("DisplayName"), 0, REG_SZ, (const BYTE*)disp_name.c_str(), (DWORD)(disp_name.length() + 1) * sizeof(WCHAR)) != ERROR_SUCCESS) NS_Logger::WriteLog(L"Can't update DisplayName in registry!"); if (RegSetValueEx(hAppKey, TEXT("DisplayVersion"), 0, REG_SZ, (const BYTE*)ver.c_str(), (DWORD)(ver.length() + 1) * sizeof(WCHAR)) != ERROR_SUCCESS) diff --git a/win-linux/langs/be.ts b/win-linux/langs/be.ts index c6b252530..5bdc5b723 100644 --- a/win-linux/langs/be.ts +++ b/win-linux/langs/be.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View Рэжым дакладчыка @@ -21,18 +21,18 @@ Усе вокны рэдактара будуць зачыненыя. Вы хочаце працягнуць? - - + + Document%1.docx Дакумент%1.docx - + Book%1.xlsx Кніга%1.xlsx - + Presentation%1.pptx Прэзентацыя%1.pptx @@ -40,7 +40,7 @@ CAscTabWidget - + Document Адкрываецца... @@ -613,154 +613,169 @@ CUpdateManager - - - - Last check performed - - - - - - - - - - - - - - - - + Check for updates - + Unable to check update: URL not defined. - - - + To finish updating, restart app - - - + Restart - + Checking for updates... - + Updates are not allowed! - + This folder configuration does not allow for updates! The folder name should be: - + An error occurred while check updates: Update Service not found! - + Downloading new version %1 (%2%) - + An error occurred while loading updates: Update Service not found! - - Downloading new version %1 (0%) - - - - - + Cancel Скасаваць - + An error occurred while loading updates: package Url is empty! - + Update package error: md5 sum does not match the original. - + Preparing update... - + An error occurred while unzip updates: Update Service not found! - + Update is available (version %1) - + Download update - - + Current version is up to date - + + An error occured while unpacking the archive + + + + + Update download failed: out of memory! + + + + + Update download failed: server connection error! + + + + + Update download failed: wrong URL! + + + + + Update download failed: unable to create file! + + + + + Update download failed: network error! + + + + + A service error has occurred! + + + + + Last check performed %1 + + + + + Error opening JSON file. + + + + Update is available - - + + Current version - - + + Update version - + Would you like to download update now? - + Update is ready to install - + Would you like to restart app now? @@ -858,12 +873,12 @@ - + An error occurred while start install updates! - + An error occurred while start replacing files: Update Service not found! diff --git a/win-linux/langs/bg.ts b/win-linux/langs/bg.ts index acb4851f6..ba9cede51 100644 --- a/win-linux/langs/bg.ts +++ b/win-linux/langs/bg.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View Изглед на водещия @@ -21,18 +21,18 @@ Всички редакторски прозорци ще бъдат затворени. Искате ли да продължите? - - + + Document%1.docx Документ%1.docx - + Book%1.xlsx Книга%1.xlsx - + Presentation%1.pptx Презентация%1.pptx @@ -56,7 +56,7 @@ CAscTabWidget - + Document Отваряне… @@ -303,7 +303,7 @@ Macro-enabled Presentation File (*.pptm) - + Макро-активиран Презентационен Файл (*.pptm) @@ -331,27 +331,27 @@ DOCX Document - + DOCX документ OpenDocument Document template - + OpenDocument Шаблон за Документ OpenDocument Presentation Template - + OpenDocument Шаблон за Презентация Macro-enabled spreadsheet template - + Макро-активиран Шаблон за Таблица OpenDocument Spreadsheet Template - + OpenDocument Шаблон за Таблица @@ -381,7 +381,7 @@ SVG Image (*.svg) - + SVG изображение (*.svg) @@ -465,19 +465,19 @@ Spreadsheet template - + Шаблон за таблица Presentation template - + Шаблон за презентация Document template - + Шаблон за документ @@ -523,12 +523,12 @@ More than one document is open.<br>Close the window anyway? - + Отворени са повече от един документ.<br>Затваряне на прозореца въпреки това? Don't ask again. - + Не питай повторно. @@ -633,156 +633,171 @@ CUpdateManager - - - - Last check performed - - - - - - - - - - - - - - - - + Check for updates - + Проверка за актуализации - + Unable to check update: URL not defined. - + Неуспешна проверка на актуализация: URL адресът не е дефиниран. - - - + To finish updating, restart app - + За да завършите актуализацията, рестартирайте приложението - - - + Restart - + Рестартирай - + Checking for updates... - + Проверяваме за актуализации… - + Updates are not allowed! - + Актуализациите не са позволени! - + This folder configuration does not allow for updates! The folder name should be: - + Конфигурацията на тази папка не позволява актуализации! Името на папката трябва да бъде: - + An error occurred while check updates: Update Service not found! - + Появи се грешка при проверка на актуализациите: Услугата за актуализиране не е намерена! - + Downloading new version %1 (%2%) - + Изтегляне на нова версия %1 (%2%) - + An error occurred while loading updates: Update Service not found! - + Появи се грешка при проверка на актуализациите: Услугата за актуализиране не е намерена! - - Downloading new version %1 (0%) - - - - - + Cancel - Отказ + Отказ - + An error occurred while loading updates: package Url is empty! - + Появи се грешка при проверка на актуализациите: URL адресът на пакета е празен! - + Update package error: md5 sum does not match the original. - + Грешка в пакета за актуализиране: md5 сумата не съвпада с оригинала. - + Preparing update... - + Подготвяне на актуализация… - + An error occurred while unzip updates: Update Service not found! - + Появи се грешка при разархивирането на актуализациите: Услугата за актуализиране не е намерена! - + Update is available (version %1) - + Налична е актуализация (версия %1) - + Download update - Изтеглете актуализация + Изтеглете актуализация - - + Current version is up to date + Настоящата версия е актуална + + + + An error occured while unpacking the archive - + + Update download failed: out of memory! + + + + + Update download failed: server connection error! + + + + + Update download failed: wrong URL! + + + + + Update download failed: unable to create file! + + + + + Update download failed: network error! + + + + + A service error has occurred! + + + + + Last check performed %1 + Последна проверка, извършена %1 + + + + Error opening JSON file. + + + + Update is available - + Налична е актуализация - - + + Current version - + Настояща версия - - + + Update version - + Актуализирай версия - + Would you like to download update now? - + Бихте ли желали да изтеглите актуализация сега? - + Update is ready to install - + Актуализацията е готова за инсталиране - + Would you like to restart app now? - + Бихте ли желали да рестартирате приложението сега? A new version of %1 is available! @@ -826,13 +841,13 @@ XML File (*.xml) - + XML Файл (*.xml) Access to file '%1' is denied! - + Достъпът до файл '%1' е отказан! @@ -865,7 +880,7 @@ Install later - + Инсталирай по-късно @@ -898,60 +913,60 @@ Пуснете бележки - + An error occurred while start install updates! - + Появи се грешка при старта на инсталиране на актуализациите! - + An error occurred while start replacing files: Update Service not found! - + Появи се грешка при старта на замяна на файловете: Услугата за актуализиране не е намерена! Cancel - Отказ + Отказ Yes - Да + Да No - Не + Не OK - ОК + ОК Skip - Пропусни + Пропусни Buy Now - + Купи Сега Activate - + Активирай Continue - + Продължи An error occurred while opening the portal:<br>%1 - + Появи се грешка при отварянето на портал:<br>%1 &OK diff --git a/win-linux/langs/ca.ts b/win-linux/langs/ca.ts index 55ba46158..bdcb36466 100644 --- a/win-linux/langs/ca.ts +++ b/win-linux/langs/ca.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View Vista del presentador @@ -21,18 +21,18 @@ Totes les finestres de l'editor es tancaran. Vols continuar? - - + + Document%1.docx Document%1.docx - + Book%1.xlsx Book%1.xlsx - + Presentation%1.pptx Presentation%1.pptx @@ -40,7 +40,7 @@ CAscTabWidget - + Document Obrint... @@ -95,7 +95,7 @@ Open Document - Obre el document + Obre el document @@ -179,7 +179,7 @@ There are no printers available - + No hi ha cap impressora disponible @@ -287,7 +287,7 @@ Macro-enabled Presentation File (*.pptm) - + Fitxer de presentació macroactiva (*.pptm) @@ -315,27 +315,27 @@ DOCX Document - + Document DOCX OpenDocument Document template - + Plantilla de document OpenDocument OpenDocument Presentation Template - + Plantilla de presentació OpenDocument Macro-enabled spreadsheet template - + Plantilla de full de càlcul amb macros OpenDocument Spreadsheet Template - + Plantilla de full de càlcul OpenDocument @@ -365,12 +365,12 @@ SVG Image (*.svg) - + Imatge SVG (*.svg) JPG Image (*.jpg *.jpeg) - + Imatge JPG (*.jpg *.jpeg) @@ -443,25 +443,25 @@ All supported files - + Tots els fitxers admesos Spreadsheet template - + Plantilla de full de càlcul Presentation template - + Plantilla de presentació Document template - + Plantilla de document @@ -499,7 +499,7 @@ Select Folder - + Seleccionar una carpeta @@ -507,53 +507,53 @@ More than one document is open.<br>Close the window anyway? - + Hi ha més d'un document obert.<br>Voleu tancar la finestra de totes maneres? Don't ask again. - + No tornar a preguntar. File format not supported. - El format de fitxer no és compatible. + El format de fitxer no és compatible. %1 doesn't exists!<br>Remove file from the list? - %1 No està disponible. Es pot canviar el nom, moure-lo o suprimir-lo.<br>Voleu eliminar el fitxer de la llista? + %1 No està disponible. Es pot canviar el nom, moure-lo o suprimir-lo.<br>Voleu eliminar el fitxer de la llista? Document must be saved firstly. - El document s'ha de desar abans. + El document s'ha de desar abans. Document must be saved to continue.<br>Save the document? - El document s'ha de desar per a continuar.<br>Desar el document? + El document s'ha de desar per a continuar.<br>Desar el document? There are no printers available - + No hi ha cap impressora disponible Print Document - Imprimir el document + Imprimir el document Sign Up - Crear portal + Crear portal %1 is modified.<br>Do you want to keep changes? - %1 ha estat modificat.<br>Voleu desar els canvis? + %1 ha estat modificat.<br>Voleu desar els canvis? @@ -613,156 +613,171 @@ CUpdateManager - - - - Last check performed - - - - - - - - - - - - - - - - + Check for updates - + Comprovar si hi ha actualitzacions - + Unable to check update: URL not defined. - + No s'ha pogut comprovar l'actualització: l'URL no està definida. - - - + To finish updating, restart app - + Per finalitzar l'actualització, reinicia l'aplicació - - - + Restart - + Reiniciar - + Checking for updates... - + S'estan comprovant les actualitzacions... - + Updates are not allowed! - + No es permeten actualitzacions! - + This folder configuration does not allow for updates! The folder name should be: - + Aquesta configuració de carpeta no permet actualitzacions! El nom de la carpeta hauria de ser: - + An error occurred while check updates: Update Service not found! - + S'ha produït un error en comprovar les actualitzacions: no s'ha trobat el servei d'actualització! - + Downloading new version %1 (%2%) - + S'està baixant la versió nova %1 (%2%) - + An error occurred while loading updates: Update Service not found! - + S'ha produït un error en carregar les actualitzacions: no s'ha trobat el servei d'actualització! - - Downloading new version %1 (0%) - - - - - + Cancel - Cancel·lar + Cancel·lar - + An error occurred while loading updates: package Url is empty! - + S'ha produït un error en carregar les actualitzacions: l'URL del paquet està buit! - + Update package error: md5 sum does not match the original. - + Error en actualitzar el paquet: la suma md5 no coincideix amb l'original. - + Preparing update... - + S'està preparant l'actualització... - + An error occurred while unzip updates: Update Service not found! - + S'ha produït un error en descomprimir les actualitzacions: no s'ha trobat el servei d'actualització! - + Update is available (version %1) - + Hi ha una actualització disponible (versió %1) - + Download update - + Baixar l'actualització - - + Current version is up to date + La versió actual està actualitzada + + + + An error occured while unpacking the archive - + + Update download failed: out of memory! + + + + + Update download failed: server connection error! + + + + + Update download failed: wrong URL! + + + + + Update download failed: unable to create file! + + + + + Update download failed: network error! + + + + + A service error has occurred! + + + + + Last check performed %1 + Última comprovació realitzada %1 + + + + Error opening JSON file. + + + + Update is available - + Hi ha una actualització disponible - - + + Current version - + Versió actual - - + + Update version - + Actualitzar la versió - + Would you like to download update now? - + Voleu baixar l'actualització ara? - + Update is ready to install - + L'actualització està preparada per instal·lar - + Would you like to restart app now? - + Voleu reiniciar l'aplicació ara? @@ -786,128 +801,128 @@ XML File (*.xml) - + Fitxer XML (*.xml) Access to file '%1' is denied! - + S'ha denegat l'accés al fitxer '%1'! Read only - + Només lectura Skip this version - + Ometre aquesta versió Remind me later - + Recorda'm-ho més tard Install update - + Instal·lar l'actualització Install later - + Instal·lar més tard Save and Restart Now - + Desar i reiniciar ara Save and Install Now - + Desar i actualitzar ara Download update - + Baixar l'actualització Software Update - + Actualitzar el programari Release notes - + Notes de publicació - + An error occurred while start install updates! - + S'ha produït un error en iniciar la instal·lació d'actualitzacions! - + An error occurred while start replacing files: Update Service not found! - + S'ha produït un error en iniciar la substitució dels fitxers: no s'ha trobat el servei d'actualització! Cancel - Cancel·lar + Cancel·lar Yes - Sí + Sí No - No + No OK - D'accord + D'accord Skip - + Ometre Buy Now - + Comprar ara Activate - + Activar Continue - + Continuar An error occurred while opening the portal:<br>%1 - + S'ha produït un error en obrir el portal:<br>%1 &OK diff --git a/win-linux/langs/cs.ts b/win-linux/langs/cs.ts index 074d6558c..812f39725 100644 --- a/win-linux/langs/cs.ts +++ b/win-linux/langs/cs.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View Náhled prezentace @@ -21,18 +21,18 @@ Všechna okna editoru budou zavřena. Chceš pokračovat? - - + + Document%1.docx Dokument%1.docx - + Book%1.xlsx Sešit%1.xlsx - + Presentation%1.pptx Prezentace%1.pptx @@ -56,7 +56,7 @@ CAscTabWidget - + Document Otevírám... @@ -633,154 +633,169 @@ CUpdateManager - - - - Last check performed - - - - - - - - - - - - - - - - + Check for updates - + Unable to check update: URL not defined. - - - + To finish updating, restart app - - - + Restart - + Checking for updates... - + Updates are not allowed! - + This folder configuration does not allow for updates! The folder name should be: - + An error occurred while check updates: Update Service not found! - + Downloading new version %1 (%2%) - + An error occurred while loading updates: Update Service not found! - - Downloading new version %1 (0%) - - - - - + Cancel Storno - + An error occurred while loading updates: package Url is empty! - + Update package error: md5 sum does not match the original. - + Preparing update... - + An error occurred while unzip updates: Update Service not found! - + Update is available (version %1) - + Download update Stáhnout aktualizaci - - + Current version is up to date - + + An error occured while unpacking the archive + + + + + Update download failed: out of memory! + + + + + Update download failed: server connection error! + + + + + Update download failed: wrong URL! + + + + + Update download failed: unable to create file! + + + + + Update download failed: network error! + + + + + A service error has occurred! + + + + + Last check performed %1 + + + + + Error opening JSON file. + + + + Update is available - - + + Current version - - + + Update version - + Would you like to download update now? - + Update is ready to install - + Would you like to restart app now? @@ -898,12 +913,12 @@ Poznámky k vydání - + An error occurred while start install updates! - + An error occurred while start replacing files: Update Service not found! diff --git a/win-linux/langs/da.ts b/win-linux/langs/da.ts index 77d502aaa..5e7cd40f0 100644 --- a/win-linux/langs/da.ts +++ b/win-linux/langs/da.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View Præsentationsvisning @@ -21,18 +21,18 @@ Alle editorvinduerne lukkes. Vil du fortsætte? - - + + Document%1.docx Dokument%1.docx - + Book%1.xlsx Bog%1.xlsx - + Presentation%1.pptx Præsentation%1.pptx @@ -52,7 +52,7 @@ CAscTabWidget - + Document Åbner... @@ -629,154 +629,169 @@ CUpdateManager - - - - Last check performed - - - - - - - - - - - - - - - - + Check for updates - + Unable to check update: URL not defined. - - - + To finish updating, restart app - - - + Restart - + Checking for updates... - + Updates are not allowed! - + This folder configuration does not allow for updates! The folder name should be: - + An error occurred while check updates: Update Service not found! - + Downloading new version %1 (%2%) - + An error occurred while loading updates: Update Service not found! - - Downloading new version %1 (0%) - - - - - + Cancel Annuller - + An error occurred while loading updates: package Url is empty! - + Update package error: md5 sum does not match the original. - + Preparing update... - + An error occurred while unzip updates: Update Service not found! - + Update is available (version %1) - + Download update Download opdatering - - + Current version is up to date - + + An error occured while unpacking the archive + + + + + Update download failed: out of memory! + + + + + Update download failed: server connection error! + + + + + Update download failed: wrong URL! + + + + + Update download failed: unable to create file! + + + + + Update download failed: network error! + + + + + A service error has occurred! + + + + + Last check performed %1 + + + + + Error opening JSON file. + + + + Update is available - - + + Current version - - + + Update version - + Would you like to download update now? - + Update is ready to install - + Would you like to restart app now? @@ -894,12 +909,12 @@ Udgivelsesnoter - + An error occurred while start install updates! - + An error occurred while start replacing files: Update Service not found! diff --git a/win-linux/langs/de.ts b/win-linux/langs/de.ts index adc633c75..eef4bde53 100644 --- a/win-linux/langs/de.ts +++ b/win-linux/langs/de.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View Referentenansicht @@ -21,18 +21,18 @@ Alle Editor-Fenster werden geschlossen. Möchten Sie fortfahren? - - + + Document%1.docx Dokument%1.docx - + Book%1.xlsx Buch%1.xlsx - + Presentation%1.pptx Präsentation%1.pptx @@ -56,7 +56,7 @@ CAscTabWidget - + Document Öffnung... @@ -637,154 +637,169 @@ CUpdateManager - - - - Last check performed - - - - - - - - - - - - - - - - + Check for updates - + Unable to check update: URL not defined. - - - + To finish updating, restart app - - - + Restart - + Checking for updates... - + Updates are not allowed! - + This folder configuration does not allow for updates! The folder name should be: - + An error occurred while check updates: Update Service not found! - + Downloading new version %1 (%2%) - + An error occurred while loading updates: Update Service not found! - - Downloading new version %1 (0%) - - - - - + Cancel Abbrechen - + An error occurred while loading updates: package Url is empty! - + Update package error: md5 sum does not match the original. - + Preparing update... - + An error occurred while unzip updates: Update Service not found! - + Update is available (version %1) - + Download update Update herunterladen - - + Current version is up to date - + + An error occured while unpacking the archive + + + + + Update download failed: out of memory! + + + + + Update download failed: server connection error! + + + + + Update download failed: wrong URL! + + + + + Update download failed: unable to create file! + + + + + Update download failed: network error! + + + + + A service error has occurred! + + + + + Last check performed %1 + + + + + Error opening JSON file. + + + + Update is available - - + + Current version - - + + Update version - + Would you like to download update now? - + Update is ready to install - + Would you like to restart app now? @@ -902,12 +917,12 @@ Hinweise zur Veröffentlichung - + An error occurred while start install updates! - + An error occurred while start replacing files: Update Service not found! diff --git a/win-linux/langs/el_GR.ts b/win-linux/langs/el_GR.ts index c20b86527..a2ab82b9e 100644 --- a/win-linux/langs/el_GR.ts +++ b/win-linux/langs/el_GR.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View Προβολή παρουσιαστή @@ -21,18 +21,18 @@ Όλα τα παράθυρα του προγράμματος επεξεργασίας θα κλείσουν. Θέλετε να συνεχίσετε; - - + + Document%1.docx Έγγραφο%1.docx - + Book%1.xlsx Βιβλίο%1.xlsx - + Presentation%1.pptx Παρουσίαση%1.pptx @@ -40,7 +40,7 @@ CAscTabWidget - + Document Άνοιγμα... @@ -95,7 +95,7 @@ Open Document - Άνοιγμα εγγράφου + Άνοιγμα εγγράφου @@ -179,7 +179,7 @@ There are no printers available - + Δεν υπάρχουν διαθέσιμοι εκτυπωτές @@ -287,7 +287,7 @@ Macro-enabled Presentation File (*.pptm) - + Αρχείο παρουσίασης με δυνατότητα μακροεντολών (*.pptm) @@ -315,27 +315,28 @@ DOCX Document - + Έγγραφο DOCX OpenDocument Document template - + Πρότυπο παρουσίασης OpenDocument + Πρότυπο εγγράφου OpenDocument OpenDocument Presentation Template - + Macro-enabled spreadsheet template - + Πρότυπο λογιστικού φύλλου με δυνατότητα χρήσης μακροεντολών OpenDocument Spreadsheet Template - + Πρότυπο υπολογιστικού φύλλου OpenDocument @@ -365,12 +366,12 @@ SVG Image (*.svg) - + Εικόνα SVG (*.svg) JPG Image (*.jpg *.jpeg) - + Εικόνα JPG (*.jpg *.jpeg) @@ -443,25 +444,25 @@ All supported files - + Όλα τα υποστηριζόμενα αρχεία Spreadsheet template - + Πρότυπο υπολογιστικού φύλλου Presentation template - + Πρότυπο παρουσίασης Document template - + Πρότυπο εγγράφου @@ -499,7 +500,7 @@ Select Folder - + Επιλογή φακέλου @@ -507,53 +508,53 @@ More than one document is open.<br>Close the window anyway? - + Περισσότερα από ένα έγγραφα είναι ανοιχτά.<br>Κλείσιμο του παραθύρου ούτως ή άλλως; Don't ask again. - + Να μην ξαναγίνει ερώτηση. File format not supported. - Η μορφή αρχείου δεν υποστηρίζεται. + Η μορφή αρχείου δεν υποστηρίζεται. %1 doesn't exists!<br>Remove file from the list? - Το %1 δεν είναι διαθέσιμο. Μπορεί να έχει μετονομαστεί, μετακινηθεί ή διαγραφεί.<br>Θέλετε να αφαιρέσετε το αρχείο από τη λίστα; + Το %1 δεν είναι διαθέσιμο. Μπορεί να έχει μετονομαστεί, μετακινηθεί ή διαγραφεί.<br>Θέλετε να αφαιρέσετε το αρχείο από τη λίστα; Document must be saved firstly. - Το έγγραφο πρέπει να αποθηκευτεί πρώτα. + Το έγγραφο πρέπει να αποθηκευτεί πρώτα. Document must be saved to continue.<br>Save the document? - Το έγγραφο πρέπει να αποθηκευτεί για να συνεχίσετε.<br>Αποθήκευση εγγράφου; + Το έγγραφο πρέπει να αποθηκευτεί για να συνεχίσετε.<br>Αποθήκευση εγγράφου; There are no printers available - + Δεν υπάρχουν διαθέσιμοι εκτυπωτές Print Document - Εκτύπωση εγγράφου + Εκτύπωση εγγράφου Sign Up - Δημιουργία πύλης + Δημιουργία πύλης %1 is modified.<br>Do you want to keep changes? - Το %1 έχει τροποποιηθεί.<br>Θέλετε να αποθηκεύσετε τις αλλαγές; + Το %1 έχει τροποποιηθεί.<br>Θέλετε να αποθηκεύσετε τις αλλαγές; @@ -613,156 +614,172 @@ CUpdateManager - - - - Last check performed - - - - - - - - - - - - - - - - + Check for updates - + Έλεγχος για ενημερώσεις - + Unable to check update: URL not defined. - + Δεν είναι δυνατός ο έλεγχος της ενημέρωσης: Δεν έχει οριστεί URL. - - - + To finish updating, restart app - + Επανεκκίνηση + Για να ολοκληρώσετε την ενημέρωση, επανεκκινήστε την εφαρμογή - - - + Restart - + - + Checking for updates... - + Γίνεται έλεγχος για ενημερώσεις... - + Updates are not allowed! - + Οι ενημερώσεις δεν επιτρέπονται! - + This folder configuration does not allow for updates! The folder name should be: - + Αυτή η διαμόρφωση φακέλου δεν επιτρέπει ενημερώσεις! Το όνομα του φακέλου θα πρέπει να είναι: - + An error occurred while check updates: Update Service not found! - + Προέκυψε σφάλμα κατά τον έλεγχο των ενημερώσεων: Η υπηρεσία ενημέρωσης δεν βρέθηκε! - + Downloading new version %1 (%2%) - + Λήψη νέας έκδοσης %1 (%2%) - + An error occurred while loading updates: Update Service not found! - + Εμφανίστηκε σφάλμα κατά τη φόρτωση ενημερώσεων: Η υπηρεσία ενημέρωσης δεν βρέθηκε! - - Downloading new version %1 (0%) - - - - - + Cancel - Ακύρωση + Ακύρωση - + An error occurred while loading updates: package Url is empty! - + Εμφανίστηκε σφάλμα κατά τη φόρτωση ενημερώσεων: Η Url του πακέτου είναι κενή! - + Update package error: md5 sum does not match the original. - + Σφάλμα πακέτου ενημέρωσης: Το άθροισμα md5 δεν ταιριάζει με το αρχικό. - + Preparing update... - + Προετοιμασία ενημέρωσης... - + An error occurred while unzip updates: Update Service not found! - + Εμφανίστηκε σφάλμα κατά την αποσυμπίεση των ενημερώσεων: Η υπηρεσία ενημερώσεων δεν βρέθηκε! - + Update is available (version %1) - + Η ενημέρωση είναι διαθέσιμη (έκδοση %1) - + Download update - + Λήψη ενημέρωσης - - + Current version is up to date + Η τρέχουσα έκδοση είναι ενημερωμένη + + + + An error occured while unpacking the archive - + + Update download failed: out of memory! + + + + + Update download failed: server connection error! + + + + + Update download failed: wrong URL! + + + + + Update download failed: unable to create file! + + + + + Update download failed: network error! + + + + + A service error has occurred! + + + + + Last check performed %1 + Έγινε ο τελευταίος έλεγχος %1 + + + + Error opening JSON file. + + + + Update is available - + Η ενημέρωση είναι διαθέσιμη - - + + Current version - + Τρέχουσα έκδοση - - + + Update version - + Έκδοση ενημέρωσης - + Would you like to download update now? - + Θα θέλατε να κατεβάσετε την ενημέρωση τώρα; - + Update is ready to install - + Η ενημέρωση είναι έτοιμη για εγκατάσταση - + Would you like to restart app now? - + Θα θέλατε να κάνετε επανεκκίνηση της εφαρμογής τώρα; @@ -790,48 +807,48 @@ XML File (*.xml) - + Αρχείο XML (*.xml) Access to file '%1' is denied! - + Η πρόσβαση στο αρχείο '%1' δεν επιτρέπεται! Read only - + Μόνο για ανάγνωση Skip this version - + Παράλειψη αυτής της έκδοσης Remind me later - + Υπενθύμιση αργότερα Install update - + Εγκατάσταση ενημέρωσης Install later - + Εγκατάσταση αργότερα Save and Restart Now - + Αποθήκευση και επανεκκίνηση τώρα @@ -843,75 +860,75 @@ Download update - + Λήψη ενημέρωσης Software Update - + Ενημέρωση λογισμικού Release notes - + Σημειώσεις έκδοσης - + An error occurred while start install updates! - + Εμφανίστηκε σφάλμα κατά την έναρξη εγκατάστασης ενημερώσεων! - + An error occurred while start replacing files: Update Service not found! - + Εμφανίστηκε σφάλμα κατά την έναρξη αντικατάστασης αρχείων: Η υπηρεσία ενημερώσεων δεν βρέθηκε! Cancel - Ακύρωση + Ακύρωση Yes - Ναι + Ναι No - Όχι + Όχι OK - Εντάξει + Εντάξει Skip - + Παράλειψη Buy Now - + Αγορά τώρα Activate - + Ενεργοποίηση Continue - + Συνέχεια An error occurred while opening the portal:<br>%1 - + Εμφανίστηκε σφάλμα κατά το άνοιγμα της πύλης:<br>%1 &OK diff --git a/win-linux/langs/en.qm b/win-linux/langs/en.qm index 2d6167dc7..ca4e19159 100644 Binary files a/win-linux/langs/en.qm and b/win-linux/langs/en.qm differ diff --git a/win-linux/langs/en.ts b/win-linux/langs/en.ts index 3e9b63271..c481e2341 100644 --- a/win-linux/langs/en.ts +++ b/win-linux/langs/en.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View @@ -17,18 +17,18 @@ All the editor windows will be closed. Do you want to continue? - - + + Document%1.docx - + Book%1.xlsx - + Presentation%1.pptx @@ -36,7 +36,7 @@ CAscTabWidget - + Document Opening... @@ -582,154 +582,169 @@ CUpdateManager - - - - Last check performed - - - - - - - - - - - - - - - - + Check for updates - + Unable to check update: URL not defined. - + - - - + To finish updating, restart app - - - + Restart - + Checking for updates... - + Updates are not allowed! - + This folder configuration does not allow for updates! The folder name should be: - + An error occurred while check updates: Update Service not found! - + Downloading new version %1 (%2%) - + An error occurred while loading updates: Update Service not found! - - Downloading new version %1 (0%) - - - - - + Cancel - + An error occurred while loading updates: package Url is empty! - + An error occurred while loading updates: package URL is empty! - + Update package error: md5 sum does not match the original. - + Preparing update... - + An error occurred while unzip updates: Update Service not found! - + Update is available (version %1) - + Download update - - + Current version is up to date - + + An error occured while unpacking the archive + An error occurred while unpacking the archive + + + + Update download failed: out of memory! + + + + + Update download failed: server connection error! + + + + + Update download failed: wrong URL! + + + + + Update download failed: unable to create file! + + + + + Update download failed: network error! + + + + + A service error has occurred! + + + + + Last check performed %1 + + + + + Error opening JSON file. + + + + Update is available - - + + Current version - - + + Update version - + Would you like to download update now? - + Update is ready to install - + Would you like to restart app now? @@ -823,12 +838,12 @@ - + An error occurred while start install updates! An error occurred while start installing updates! - + An error occurred while start replacing files: Update Service not found! diff --git a/win-linux/langs/es.qm b/win-linux/langs/es.qm index e3ecc2d66..80513a400 100644 Binary files a/win-linux/langs/es.qm and b/win-linux/langs/es.qm differ diff --git a/win-linux/langs/es.ts b/win-linux/langs/es.ts index 1fafd08b6..40b9a8ac0 100644 --- a/win-linux/langs/es.ts +++ b/win-linux/langs/es.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View Vista del presentador @@ -21,18 +21,18 @@ Todas las ventanas del editor estarán cerradas. ¿Quiere continuar? - - + + Document%1.docx Documento%1.docx - + Book%1.xlsx Libro%1.xlsx - + Presentation%1.pptx Presentación%1.pptx @@ -56,7 +56,7 @@ CAscTabWidget - + Document Abriendo... @@ -676,154 +676,177 @@ CUpdateManager - - - Last check performed - Se ha realizado la última comprobación + Se ha realizado la última comprobación - - - - - - - - - - - - - + Check for updates Comprobando las actualizaciones - + Unable to check update: URL not defined. - + No se ha podido comprobar la actualización: la URL no está definida. - - - + To finish updating, restart app Para terminar la actualización, reinicie la aplicación - - - + Restart Reiniciar - + Checking for updates... Comprobando las actualizaciones... - + Updates are not allowed! ¡Las actualizaciones no están permitidas! - + This folder configuration does not allow for updates! The folder name should be: Esta configuración de carpeta no permite actualizaciones. El nombre de la carpeta debe ser: - + An error occurred while check updates: Update Service not found! Se ha producido un error al comprobar las actualizaciones: ¡No se ha encontrado el servicio de actualización! - + Downloading new version %1 (%2%) Descargando la nueva versión %1 (%2%) - + An error occurred while loading updates: Update Service not found! Se ha producido un error al cargar las actualizaciones: ¡No se ha encontrado el servicio de actualización! - Downloading new version %1 (0%) - Descargando la nueva versión %1 (0%) + Descargando la nueva versión %1 (0%) - - + Cancel Cancelar - + An error occurred while loading updates: package Url is empty! Se ha producido un error al cargar las actualizaciones: ¡La Url del paquete está vacía! - + Update package error: md5 sum does not match the original. Error al actualizar el paquete: la suma md5 no coincide con la original. - + Preparing update... Preparando la actualización... - + An error occurred while unzip updates: Update Service not found! Se ha producido un error al descomprimir las actualizaciones: ¡No se ha encontrado el servicio de actualización! - + Update is available (version %1) La actualización está disponible (versión %1) - + Download update Descargar actualización - - + Current version is up to date La versión actual está actualizada - + + An error occured while unpacking the archive + Se ha producido un error al descomprimir el archivo + + + + Update download failed: out of memory! + Error al descargar la actualización: ¡no hay memoria! + + + + Update download failed: server connection error! + Error al descargar la actualización: ¡error de conexión con el servidor! + + + + Update download failed: wrong URL! + Error al descargar la actualización: ¡URL incorrecta! + + + + Update download failed: unable to create file! + Error al descargar la actualización: ¡no se ha podido crear el archivo! + + + + Update download failed: network error! + Error al descargar la actualización: ¡error de red! + + + + A service error has occurred! + ¡Se ha producido un error de servicio! + + + + Last check performed %1 + Última comprobación realizada %1 + + + + Error opening JSON file. + Error al abrir el archivo JSON. + + + Update is available La actualización está disponible - - + + Current version Versión actual - - + + Update version Versión de actualización - + Would you like to download update now? ¿Desea descargar la actualización ahora? - + Update is ready to install La actualización está lista para instalarse - + Would you like to restart app now? ¿Desea reiniciar la aplicación ahora? @@ -953,12 +976,12 @@ Se ha producido un error al extraer las actualizaciones: ¡No se ha encontrado el servicio de actualización! - + An error occurred while start install updates! Se ha producido un error al iniciar la instalación de actualizaciones. - + An error occurred while start replacing files: Update Service not found! Se ha producido un error al iniciar la sustitución de archivos: ¡No se ha encontrado el servicio de actualización! diff --git a/win-linux/langs/et.ts b/win-linux/langs/et.ts index 8bb473ea3..e6e4de1cd 100644 --- a/win-linux/langs/et.ts +++ b/win-linux/langs/et.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View Esitaja vaade @@ -21,18 +21,18 @@ Kõik redigeerija aknad suletakse. Kas sa soovid jätkata? - - + + Document%1.docx Dokument%1.docx - + Book%1.xlsx Raamat%1.xlsx - + Presentation%1.pptx Esitlus%1.pptx @@ -40,7 +40,7 @@ CAscTabWidget - + Document Avamine... @@ -613,154 +613,169 @@ CUpdateManager - - - - Last check performed - - - - - - - - - - - - - - - - + Check for updates - + Unable to check update: URL not defined. - - - + To finish updating, restart app - - - + Restart - + Checking for updates... - + Updates are not allowed! - + This folder configuration does not allow for updates! The folder name should be: - + An error occurred while check updates: Update Service not found! - + Downloading new version %1 (%2%) - + An error occurred while loading updates: Update Service not found! - - Downloading new version %1 (0%) - - - - - + Cancel Tühista - + An error occurred while loading updates: package Url is empty! - + Update package error: md5 sum does not match the original. - + Preparing update... - + An error occurred while unzip updates: Update Service not found! - + Update is available (version %1) - + Download update - - + Current version is up to date - + + An error occured while unpacking the archive + + + + + Update download failed: out of memory! + + + + + Update download failed: server connection error! + + + + + Update download failed: wrong URL! + + + + + Update download failed: unable to create file! + + + + + Update download failed: network error! + + + + + A service error has occurred! + + + + + Last check performed %1 + + + + + Error opening JSON file. + + + + Update is available - - + + Current version - - + + Update version - + Would you like to download update now? - + Update is ready to install - + Would you like to restart app now? @@ -854,12 +869,12 @@ - + An error occurred while start install updates! - + An error occurred while start replacing files: Update Service not found! diff --git a/win-linux/langs/fi.ts b/win-linux/langs/fi.ts index 225077869..ead93d618 100644 --- a/win-linux/langs/fi.ts +++ b/win-linux/langs/fi.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View Esittäjän näkymä @@ -21,18 +21,18 @@ Kaikki muokkaus-ikkunat suljetaan. Haluatko jatkaa? - - + + Document%1.docx Dokumentti%1.docx - + Book%1.xlsx Työkirja%1.xlsx - + Presentation%1.pptx Esitys%1.pptx @@ -40,7 +40,7 @@ CAscTabWidget - + Document Avataan... @@ -613,154 +613,169 @@ CUpdateManager - - - - Last check performed - - - - - - - - - - - - - - - - + Check for updates - + Unable to check update: URL not defined. - - - + To finish updating, restart app - - - + Restart - + Checking for updates... - + Updates are not allowed! - + This folder configuration does not allow for updates! The folder name should be: - + An error occurred while check updates: Update Service not found! - + Downloading new version %1 (%2%) - + An error occurred while loading updates: Update Service not found! - - Downloading new version %1 (0%) - - - - - + Cancel Peruuta - + An error occurred while loading updates: package Url is empty! - + Update package error: md5 sum does not match the original. - + Preparing update... - + An error occurred while unzip updates: Update Service not found! - + Update is available (version %1) - + Download update - - + Current version is up to date - + + An error occured while unpacking the archive + + + + + Update download failed: out of memory! + + + + + Update download failed: server connection error! + + + + + Update download failed: wrong URL! + + + + + Update download failed: unable to create file! + + + + + Update download failed: network error! + + + + + A service error has occurred! + + + + + Last check performed %1 + + + + + Error opening JSON file. + + + + Update is available - - + + Current version - - + + Update version - + Would you like to download update now? - + Update is ready to install - + Would you like to restart app now? @@ -858,12 +873,12 @@ - + An error occurred while start install updates! - + An error occurred while start replacing files: Update Service not found! diff --git a/win-linux/langs/fr.ts b/win-linux/langs/fr.ts index 2c767b529..1322e642d 100644 --- a/win-linux/langs/fr.ts +++ b/win-linux/langs/fr.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View Mode présentateur @@ -21,18 +21,18 @@ Toutes les fenêtres de l'éditeur seront fermées. Voulez-vous continuer ? - - + + Document%1.docx Document%1.docx - + Book%1.xlsx Livre%1.xlsx - + Presentation%1.pptx Diaporama%1.pptx @@ -56,7 +56,7 @@ CAscTabWidget - + Document Ouverture... @@ -335,27 +335,27 @@ DOCX Document - + Document DOCX OpenDocument Document template - + Modèle de document OpenDocument OpenDocument Presentation Template - + Modèle de présentation OpenDocument Macro-enabled spreadsheet template - + Modèle de feuille de calcul avec les macros activées OpenDocument Spreadsheet Template - + Modèle de feuille de calcul OpenDocument @@ -385,7 +385,7 @@ SVG Image (*.svg) - + Image SVG (*.svg) @@ -469,19 +469,19 @@ Spreadsheet template - + Modèle de feuille de calcul Presentation template - + Modèle de présentation Document template - + Modèle de document texte @@ -527,12 +527,12 @@ More than one document is open.<br>Close the window anyway? - + Plus d'un document est ouvert.<br>Fermer de toute façon la fenêtre ? Don't ask again. - + Ne plus demander. @@ -637,156 +637,171 @@ CUpdateManager - - - - Last check performed - - - - - - - - - - - - - - - - + Check for updates - + Vérification des mises à jour - + Unable to check update: URL not defined. - + Impossible de vérifier la mise à jour : URL non définie. - - - + To finish updating, restart app - + Pour terminer la mise à jour, redémarrez l'application - - - + Restart - + Redémarrer - + Checking for updates... - + Vérification des mises à jour... - + Updates are not allowed! - + Les mises à jour ne sont pas autorisées ! - + This folder configuration does not allow for updates! The folder name should be: Cette configuration de dossier ne permet pas les mises à jour ! Le nom du dossier doit être : - + An error occurred while check updates: Update Service not found! - Une erreur s'est produite lors de la vérification des mises à jour : Service de mise à jour introuvable ! + Une erreur s'est produite lors de la vérification des mises à jour : Service de mise à jour introuvable ! - + Downloading new version %1 (%2%) - + Téléchargement de la nouvelle version %1 (%2%) - + An error occurred while loading updates: Update Service not found! - Une erreur s'est produite lors du chargement des mises à jour : Service de mise à jour introuvable ! + Une erreur s'est produite lors du chargement des mises à jour : Service de mise à jour introuvable ! - - Downloading new version %1 (0%) - - - - - + Cancel - Annuler + Annuler - + An error occurred while loading updates: package Url is empty! - + Une erreur s'est produite lors du chargement des mises à jour : l'URL du paquet est vide ! - + Update package error: md5 sum does not match the original. - + Erreur de mise à jour du paquet : la somme md5 ne correspond pas à l'original. - + Preparing update... - + Préparation de la mise à jour... - + An error occurred while unzip updates: Update Service not found! - Une erreur s'est produite lors de la décompression des mises à jour : Service de mise à jour introuvable ! + Une erreur s'est produite lors de la décompression des mises à jour : Service de mise à jour introuvable ! - + Update is available (version %1) - + La mise à jour est disponible (version %1) - + Download update - Télécharger la mise à jour + Télécharger la mise à jour - - + Current version is up to date - + La version actuelle est à jour - + + An error occured while unpacking the archive + Une erreur s'est produite lors de la décompression de l'archive + + + + Update download failed: out of memory! + Le téléchargement de la mise à jour a échoué : manque de mémoire ! + + + + Update download failed: server connection error! + Le téléchargement de la mise à jour a échoué : erreur de connexion au serveur ! + + + + Update download failed: wrong URL! + Le téléchargement de la mise à jour a échoué : URL incorrecte ! + + + + Update download failed: unable to create file! + Le téléchargement de la mise à jour a échoué : impossible de créer un fichier ! + + + + Update download failed: network error! + Le téléchargement de la mise à jour a échoué : erreur de connexion au réseau ! + + + + A service error has occurred! + Une erreur de service s'est produite ! + + + + Last check performed %1 + Dernière vérification effectuée %1 + + + + Error opening JSON file. + Erreur d'ouverture du fichier JSON. + + + Update is available - + La mise à jour est disponible - - + + Current version - + Version actuelle - - + + Update version - + Version actualisée - + Would you like to download update now? - + Souhaitez-vous télécharger la mise à jour maintenant ? - + Update is ready to install - + La mise à jour est prête à être installée - + Would you like to restart app now? - + Souhaitez-vous redémarrer l'application maintenant ? A new version of %1 is available! @@ -836,7 +851,7 @@ Access to file '%1' is denied! - L'accès au fichier "%1" est refusé ! + L'accès au fichier '%1' est refusé ! @@ -869,7 +884,7 @@ Install later - + Installer ultérieurement @@ -914,12 +929,12 @@ Une erreur s'est produite lors de la décompression des mises à jour : Service de mise à jour introuvable ! - + An error occurred while start install updates! Une erreur s'est produite lors de l'installation des mises à jour ! - + An error occurred while start replacing files: Update Service not found! Une erreur s'est produite lors du lancement du remplacement des fichiers : Service de mise à jour introuvable ! diff --git a/win-linux/langs/ga.ts b/win-linux/langs/ga.ts index 174106e13..6bbbf6c62 100644 --- a/win-linux/langs/ga.ts +++ b/win-linux/langs/ga.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View Amharc an Láithreora @@ -21,18 +21,18 @@ Dúnfar na fuinneoga eagarthóra go léir. Ar mhaith leat leanúint ar aghaidh? - - + + Document%1.docx Doiciméad%1.docx - + Book%1.xlsx Book%1.xlsx - + Presentation%1.pptx Cur i láthair%1.pptx @@ -40,7 +40,7 @@ CAscTabWidget - + Document Ag oscailt... @@ -617,154 +617,169 @@ CUpdateManager - - - - Last check performed - - - - - - - - - - - - - - - - + Check for updates - + Unable to check update: URL not defined. - - - + To finish updating, restart app - - - + Restart - + Checking for updates... - + Updates are not allowed! - + This folder configuration does not allow for updates! The folder name should be: - + An error occurred while check updates: Update Service not found! - + Downloading new version %1 (%2%) - + An error occurred while loading updates: Update Service not found! - - Downloading new version %1 (0%) - - - - - + Cancel Cealaigh - + An error occurred while loading updates: package Url is empty! - + Update package error: md5 sum does not match the original. - + Preparing update... - + An error occurred while unzip updates: Update Service not found! - + Update is available (version %1) - + Download update - - + Current version is up to date - + + An error occured while unpacking the archive + + + + + Update download failed: out of memory! + + + + + Update download failed: server connection error! + + + + + Update download failed: wrong URL! + + + + + Update download failed: unable to create file! + + + + + Update download failed: network error! + + + + + A service error has occurred! + + + + + Last check performed %1 + + + + + Error opening JSON file. + + + + Update is available - - + + Current version - - + + Update version - + Would you like to download update now? - + Update is ready to install - + Would you like to restart app now? @@ -858,12 +873,12 @@ - + An error occurred while start install updates! - + An error occurred while start replacing files: Update Service not found! diff --git a/win-linux/langs/gl.ts b/win-linux/langs/gl.ts index 4cbc43de0..8d18bbcd2 100644 --- a/win-linux/langs/gl.ts +++ b/win-linux/langs/gl.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View Vista do presentador @@ -21,18 +21,18 @@ Pecharanse todas as xanelas do editor. Queres continuar? - - + + Document%1.docx Documento%1.docx - + Book%1.xlsx Libro%1.xlsx - + Presentation%1.pptx Presentación%1.pptx @@ -40,7 +40,7 @@ CAscTabWidget - + Document Abrindo... @@ -613,154 +613,169 @@ CUpdateManager - - - - Last check performed - - - - - - - - - - - - - - - - + Check for updates - + Unable to check update: URL not defined. - - - + To finish updating, restart app - - - + Restart - + Checking for updates... - + Updates are not allowed! - + This folder configuration does not allow for updates! The folder name should be: - + An error occurred while check updates: Update Service not found! - + Downloading new version %1 (%2%) - + An error occurred while loading updates: Update Service not found! - - Downloading new version %1 (0%) - - - - - + Cancel Cancelar - + An error occurred while loading updates: package Url is empty! - + Update package error: md5 sum does not match the original. - + Preparing update... - + An error occurred while unzip updates: Update Service not found! - + Update is available (version %1) - + Download update - - + Current version is up to date - + + An error occured while unpacking the archive + + + + + Update download failed: out of memory! + + + + + Update download failed: server connection error! + + + + + Update download failed: wrong URL! + + + + + Update download failed: unable to create file! + + + + + Update download failed: network error! + + + + + A service error has occurred! + + + + + Last check performed %1 + + + + + Error opening JSON file. + + + + Update is available - - + + Current version - - + + Update version - + Would you like to download update now? - + Update is ready to install - + Would you like to restart app now? @@ -854,12 +869,12 @@ - + An error occurred while start install updates! - + An error occurred while start replacing files: Update Service not found! diff --git a/win-linux/langs/hi.ts b/win-linux/langs/hi.ts index 7cb3c0eaa..db2595805 100644 --- a/win-linux/langs/hi.ts +++ b/win-linux/langs/hi.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View प्रस्तुतकर्ता दृश्य @@ -21,18 +21,18 @@ सभी संपादन विंडो बंद हो जाएँगी। क्या आप जारी रखना चाहते हैं? - - + + Document%1.docx दस्तावेज़%1.डॉक्स - + Book%1.xlsx बुक%1.एक्सएलएसएक्स - + Presentation%1.pptx प्रस्तुति%1.पीपीटीएक्स @@ -40,7 +40,7 @@ CAscTabWidget - + Document खुल रहा है... @@ -613,154 +613,169 @@ CUpdateManager - - - - Last check performed - - - - - - - - - - - - - - - - + Check for updates - + Unable to check update: URL not defined. - - - + To finish updating, restart app - - - + Restart - + Checking for updates... - + Updates are not allowed! - + This folder configuration does not allow for updates! The folder name should be: - + An error occurred while check updates: Update Service not found! - + Downloading new version %1 (%2%) - + An error occurred while loading updates: Update Service not found! - - Downloading new version %1 (0%) - - - - - + Cancel रद्द करें - + An error occurred while loading updates: package Url is empty! - + Update package error: md5 sum does not match the original. - + Preparing update... - + An error occurred while unzip updates: Update Service not found! - + Update is available (version %1) - + Download update - - + Current version is up to date - + + An error occured while unpacking the archive + + + + + Update download failed: out of memory! + + + + + Update download failed: server connection error! + + + + + Update download failed: wrong URL! + + + + + Update download failed: unable to create file! + + + + + Update download failed: network error! + + + + + A service error has occurred! + + + + + Last check performed %1 + + + + + Error opening JSON file. + + + + Update is available - - + + Current version - - + + Update version - + Would you like to download update now? - + Update is ready to install - + Would you like to restart app now? @@ -854,12 +869,12 @@ - + An error occurred while start install updates! - + An error occurred while start replacing files: Update Service not found! diff --git a/win-linux/langs/hr.ts b/win-linux/langs/hr.ts index 98ba7eb28..998d5fc32 100644 --- a/win-linux/langs/hr.ts +++ b/win-linux/langs/hr.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View Prikaz prezentatora @@ -21,18 +21,18 @@ Svi prozori uređivača bit će zatvoreni. Želite li nastaviti? - - + + Document%1.docx Dokument%1.docx - + Book%1.xlsx Knjiga%1.xlsx - + Presentation%1.pptx Prezentacija%1.pptx @@ -40,7 +40,7 @@ CAscTabWidget - + Document Otvaranje... @@ -613,154 +613,169 @@ CUpdateManager - - - - Last check performed - - - - - - - - - - - - - - - - + Check for updates - + Unable to check update: URL not defined. - - - + To finish updating, restart app - - - + Restart - + Checking for updates... - + Updates are not allowed! - + This folder configuration does not allow for updates! The folder name should be: - + An error occurred while check updates: Update Service not found! - + Downloading new version %1 (%2%) - + An error occurred while loading updates: Update Service not found! - - Downloading new version %1 (0%) - - - - - + Cancel Odustani - + An error occurred while loading updates: package Url is empty! - + Update package error: md5 sum does not match the original. - + Preparing update... - + An error occurred while unzip updates: Update Service not found! - + Update is available (version %1) - + Download update - - + Current version is up to date - + + An error occured while unpacking the archive + + + + + Update download failed: out of memory! + + + + + Update download failed: server connection error! + + + + + Update download failed: wrong URL! + + + + + Update download failed: unable to create file! + + + + + Update download failed: network error! + + + + + A service error has occurred! + + + + + Last check performed %1 + + + + + Error opening JSON file. + + + + Update is available - - + + Current version - - + + Update version - + Would you like to download update now? - + Update is ready to install - + Would you like to restart app now? @@ -854,12 +869,12 @@ - + An error occurred while start install updates! - + An error occurred while start replacing files: Update Service not found! diff --git a/win-linux/langs/hu.ts b/win-linux/langs/hu.ts index 4fabfe492..230783ea4 100644 --- a/win-linux/langs/hu.ts +++ b/win-linux/langs/hu.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View Előadói nézet @@ -21,18 +21,18 @@ Minden szerkesztőablak bezárásra kerül. Folytatja a műveletet? - - + + Document%1.docx Dokumentum%1.docx - + Book%1.xlsx Munkafüzet%1.xlsx - + Presentation%1.pptx Bemutató%1.pptx @@ -40,7 +40,7 @@ CAscTabWidget - + Document Megnyitás... @@ -613,154 +613,169 @@ CUpdateManager - - - - Last check performed - - - - - - - - - - - - - - - - + Check for updates - + Unable to check update: URL not defined. - - - + To finish updating, restart app - - - + Restart - + Checking for updates... - + Updates are not allowed! - + This folder configuration does not allow for updates! The folder name should be: - + An error occurred while check updates: Update Service not found! - + Downloading new version %1 (%2%) - + An error occurred while loading updates: Update Service not found! - - Downloading new version %1 (0%) - - - - - + Cancel Mégse - + An error occurred while loading updates: package Url is empty! - + Update package error: md5 sum does not match the original. - + Preparing update... - + An error occurred while unzip updates: Update Service not found! - + Update is available (version %1) - + Download update - - + Current version is up to date - + + An error occured while unpacking the archive + + + + + Update download failed: out of memory! + + + + + Update download failed: server connection error! + + + + + Update download failed: wrong URL! + + + + + Update download failed: unable to create file! + + + + + Update download failed: network error! + + + + + A service error has occurred! + + + + + Last check performed %1 + + + + + Error opening JSON file. + + + + Update is available - - + + Current version - - + + Update version - + Would you like to download update now? - + Update is ready to install - + Would you like to restart app now? @@ -854,12 +869,12 @@ - + An error occurred while start install updates! - + An error occurred while start replacing files: Update Service not found! diff --git a/win-linux/langs/hy.qm b/win-linux/langs/hy.qm index 20848212c..bea4f8fc1 100644 Binary files a/win-linux/langs/hy.qm and b/win-linux/langs/hy.qm differ diff --git a/win-linux/langs/hy.ts b/win-linux/langs/hy.ts index f3a147cf3..13d39f9e2 100644 --- a/win-linux/langs/hy.ts +++ b/win-linux/langs/hy.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View Ներկայացնողի դիտում @@ -21,18 +21,18 @@ Խմբագրիչի բոլոր պատուհանները կփակվեն։ Ցանկանու՞մ եք շարունակել։ - - + + Document%1.docx Փաստաթուղթ%1.docx - + Book%1.xlsx Գիրք%1.xlsx - + Presentation%1.pptx Շնորհանդես%1.pptx @@ -40,7 +40,7 @@ CAscTabWidget - + Document Բացվում է... @@ -617,154 +617,177 @@ CUpdateManager - - - Last check performed - Կատարված վերջին ստուգումը + Կատարված վերջին ստուգումը - - - - - - - - - - - - - + Check for updates Թարմացումների ստուգում - + Unable to check update: URL not defined. - + Հնարավոր չէ ստուգել թարմացումը. URL-ը սահմանված չէ: - - - + To finish updating, restart app Թարմացումն ավարտելու համար վերագործարկեք հավելվածը - - - + Restart Վերագործարկել - + Checking for updates... Թարմացումների ստուգում... - + Updates are not allowed! Թարմացումներն անթույլատրելի են: - + This folder configuration does not allow for updates! The folder name should be: Այս թղթապանակի կազմաձևումը թույլ չի տալիս թարմացումներ: Թղթապանակի անվանումը պետք է լինի՝ - + An error occurred while check updates: Update Service not found! Թարմացումները ստուգելիս սխալ առաջացավ՝ թարմացման ծառայությունը չի գտնվել: - + Downloading new version %1 (%2%) Նոր տարբերակի ներբեռնում %1 (%2%) - + An error occurred while loading updates: Update Service not found! Թարմացումները բեռնելիս սխալ է տեղի ունեցել՝ թարմացման ծառայությունը չի գտնվել: - Downloading new version %1 (0%) - Նոր տարբերակի ներբեռնում %1 (0%) + Նոր տարբերակի ներբեռնում %1 (0%) - - + Cancel Չեղարկել - + An error occurred while loading updates: package Url is empty! Թարմացումները բեռնելիս սխալ տեղի ունեցավ՝ փաթեթի URL-ը դատարկ է: - + Update package error: md5 sum does not match the original. Փաթեթի թարմացման սխալ՝ md5 գումարը չի համապատասխանում բնօրինակին: - + Preparing update... Թարմացման նախապատրաստում... - + An error occurred while unzip updates: Update Service not found! Թարմացումներն անջատելիս սխալ տեղի ունեցավ` թարմացման ծառայությունը չի գտնվել: - + Update is available (version %1) Թարմացումը հասանելի է (տարբերակ %1) - + Download update Ներբեռնել թարմացումը - - + Current version is up to date Ներկայիս տարբերակը արդիական է - + + An error occured while unpacking the archive + Արխիվը բացելիս սխալ է տեղի ունեցել ։ + + + + Update download failed: out of memory! + Թարմացման ներբեռնումը ձախողվեց՝ հիշողությունը սպառվել է: + + + + Update download failed: server connection error! + Թարմացման ներբեռնումը ձախողվեց՝ սերվերի միացման սխալ: + + + + Update download failed: wrong URL! + Թարմացման ներբեռնումը ձախողվեց՝ սխալ URL: + + + + Update download failed: unable to create file! + Թարմացման ներբեռնումը ձախողվեց՝ հնարավոր չէ ստեղծել ֆայլ: + + + + Update download failed: network error! + Թարմացման ներբեռնումը ձախողվեց՝ ցանցի սխալ: + + + + A service error has occurred! + Ծառայության սխալ է տեղի ունեցել: + + + + Last check performed %1 + Կատարված վերջին ստուգումը %1։ + + + + Error opening JSON file. + JSON ֆայլի բացման սխալ: + + + Update is available Թարմացումը հասանելի է - - + + Current version Ներկայիս տարբերակը - - + + Update version Թարմացնել տարբերակը - + Would you like to download update now? Ցանկանու՞մ եք ներբեռնել թարմացումը հիմա: - + Update is ready to install Թարմացումը պատրաստ է տեղադրման - + Would you like to restart app now? Ցանկանու՞մ եք վերագործարկել հավելվածը հիմա: @@ -874,12 +897,12 @@ Թարմացումներն անջատելիս սխալ տեղի ունեցավ՝ Թարմացման ծառայությունը չի գտնվել: - + An error occurred while start install updates! Տեղադրման թարմացումները սկսելիս սխալ առաջացավ: - + An error occurred while start replacing files: Update Service not found! Սխալ է տեղի ունեցել ֆայլերը փոխարինելիս՝ Թարմացման ծառայությունը չի գտնվել: diff --git a/win-linux/langs/id.ts b/win-linux/langs/id.ts index aab3209ed..ccec868c2 100644 --- a/win-linux/langs/id.ts +++ b/win-linux/langs/id.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View Tampilan Penyaji @@ -17,18 +17,18 @@ Semua jendela editor akan ditutup. Apakah Anda ingin melanjutkan? - - + + Document%1.docx Dokumen%1.docx - + Book%1.xlsx Buku%1.xlsx - + Presentation%1.pptx Presentasi%1.pptx @@ -36,7 +36,7 @@ CAscTabWidget - + Document Membuka... @@ -613,154 +613,169 @@ CUpdateManager - - - - Last check performed - - - - - - - - - - - - - - - - + Check for updates - + Unable to check update: URL not defined. - - - + To finish updating, restart app - - - + Restart - + Checking for updates... - + Updates are not allowed! - + This folder configuration does not allow for updates! The folder name should be: - + An error occurred while check updates: Update Service not found! - + Downloading new version %1 (%2%) - + An error occurred while loading updates: Update Service not found! - - Downloading new version %1 (0%) - - - - - + Cancel Batal - + An error occurred while loading updates: package Url is empty! - + Update package error: md5 sum does not match the original. - + Preparing update... - + An error occurred while unzip updates: Update Service not found! - + Update is available (version %1) - + Download update - - + Current version is up to date - + + An error occured while unpacking the archive + + + + + Update download failed: out of memory! + + + + + Update download failed: server connection error! + + + + + Update download failed: wrong URL! + + + + + Update download failed: unable to create file! + + + + + Update download failed: network error! + + + + + A service error has occurred! + + + + + Last check performed %1 + + + + + Error opening JSON file. + + + + Update is available - - + + Current version - - + + Update version - + Would you like to download update now? - + Update is ready to install - + Would you like to restart app now? @@ -858,12 +873,12 @@ - + An error occurred while start install updates! - + An error occurred while start replacing files: Update Service not found! diff --git a/win-linux/langs/it_IT.qm b/win-linux/langs/it_IT.qm index de27eb241..9428852cd 100644 Binary files a/win-linux/langs/it_IT.qm and b/win-linux/langs/it_IT.qm differ diff --git a/win-linux/langs/it_IT.ts b/win-linux/langs/it_IT.ts index 9533bbe69..89bd50aed 100644 --- a/win-linux/langs/it_IT.ts +++ b/win-linux/langs/it_IT.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View Visualizzazione del presenter @@ -21,18 +21,18 @@ Tutte le finestre dell'editor verranno chiuse. Vuoi continuare? - - + + Document%1.docx Documento%1.docx - + Book%1.xlsx Foglio%1.xlsx - + Presentation%1.pptx Presentazione%1.pptx @@ -56,7 +56,7 @@ CAscTabWidget - + Document Apertura... @@ -637,154 +637,177 @@ CUpdateManager - - - Last check performed - Ultimo controllo effettuato + Ultimo controllo effettuato - - - - - - - - - - - - - + Check for updates - Controllo degli aggiornamenti in corso + Controlla gli aggiornamenti - + Unable to check update: URL not defined. - + Impossibile controllare l'aggiornamento: URL non definito. - - - + To finish updating, restart app Per completare l'aggiornamento, riavvia l'app - - - + Restart Riavvia - + Checking for updates... Controllo degli aggiornamenti in corso... - + Updates are not allowed! Gli aggiornamenti non sono consentiti! - + This folder configuration does not allow for updates! The folder name should be: La configurazione di questa cartella non consente di applicare gli aggiornamenti! Il nome della cartella dovrebbe essere: - + An error occurred while check updates: Update Service not found! Si è verificato un errore durante il controllo degli aggiornamenti: Servizio aggiornamenti non è stato trovato! - + Downloading new version %1 (%2%) Download della nuova versione %1 (%2%) - + An error occurred while loading updates: Update Service not found! Si è verificato un errore durante il caricamento degli aggiornamenti: Servizio aggiornamenti non è stato trovato! - Downloading new version %1 (0%) - Download della nuova versione %1 (0%) + Download della nuova versione %1 (0%) - - + Cancel Annulla - + An error occurred while loading updates: package Url is empty! Si è verificato un errore durante il caricamento degli aggiornamenti: l'URL del pacchetto è vuoto! - + Update package error: md5 sum does not match the original. Errore del pacchetto di aggiornamento: la somma md5 non corrisponde all'originale. - + Preparing update... Preparazione dell'aggiornamento in corso... - + An error occurred while unzip updates: Update Service not found! Si è verificato un errore durante l'estrazione degli aggiornamenti: Servizio aggiornamenti non è stato trovato! - + Update is available (version %1) L'aggiornamento è disponibile (versione %1) - + Download update Scaricare l'aggiornamento - - + Current version is up to date La versione presente è aggiornata - + + An error occured while unpacking the archive + Si è verificato un errore durante la decompressione dell'archivio + + + + Update download failed: out of memory! + Download dell'aggiornamento non riuscito: memoria esaurita! + + + + Update download failed: server connection error! + Download dell'aggiornamento non riuscito: errore di connessione al server! + + + + Update download failed: wrong URL! + Download dell'aggiornamento non riuscito: URL errato! + + + + Update download failed: unable to create file! + Download dell'aggiornamento non riuscito: impossibile creare il file! + + + + Update download failed: network error! + Download dell'aggiornamento non riuscito: errore di rete! + + + + A service error has occurred! + Si è verificato un errore di servizio! + + + + Last check performed %1 + Ultimo controllo effettuato %1 + + + + Error opening JSON file. + Si è verificato un errore durante l'apertura del file JSON. + + + Update is available L'aggiornamento è disponibile - - + + Current version Versione attuale - - + + Update version Aggiorna versione - + Would you like to download update now? Desideri scaricare l'aggiornamento ora? - + Update is ready to install L'aggiornamento è pronto per l'installazione - + Would you like to restart app now? Desideri riavviare l'app ora? @@ -914,12 +937,12 @@ Si è verificato un errore durante la decompressione degli aggiornamenti: il Servizio aggiornamenti non è stato trovato! - + An error occurred while start install updates! Si è verificato un errore durante l'installazione degli aggiornamenti! - + An error occurred while start replacing files: Update Service not found! Si è verificato un errore all'inizio della sostituzione dei file: il Servizio aggiornamenti non è stato trovato! diff --git a/win-linux/langs/ja.ts b/win-linux/langs/ja.ts index 314e6ca51..59db7290d 100644 --- a/win-linux/langs/ja.ts +++ b/win-linux/langs/ja.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View プレゼンタービュー @@ -21,18 +21,18 @@ すべての編集画面が閉じます。続けますか? - - + + Document%1.docx ドキュメント%1.docx - + Book%1.xlsx ブック%1.xlsx - + Presentation%1.pptx プレゼンテーション%1.pptx @@ -56,7 +56,7 @@ CAscTabWidget - + Document 開いています... @@ -335,17 +335,17 @@ DOCX Document - + DOCXドキュメント OpenDocument Document template - + OpenDocument ドキュメントのテンプレート OpenDocument Presentation Template - + OpenDocument プレゼンテーションのテンプレート @@ -355,7 +355,7 @@ OpenDocument Spreadsheet Template - + OpenDocumentスプレッドシートのテンプレート @@ -385,7 +385,7 @@ SVG Image (*.svg) - + SVG画像 (*.svg) @@ -469,19 +469,19 @@ Spreadsheet template - + スプレッドシートのテンプレート Presentation template - + プレゼンテーションのテンプレート Document template - + ドキュメントのテンプレート @@ -527,12 +527,12 @@ More than one document is open.<br>Close the window anyway? - + 複数のドキュメントが開いています。<br>そのままでウィンドウを閉じてもよろしいですか？ Don't ask again. - + 二度と聞かないようにします。 @@ -637,156 +637,171 @@ CUpdateManager - - - - Last check performed - - - - - - - - - - - - - - - - + Check for updates - + アップデートをチェックしています - + Unable to check update: URL not defined. - + アップデートを確認できません: URL が定義されていません。 - - - + To finish updating, restart app - + 更新を終了するには、アプリを再起動してください - - - + Restart - + 再起動 - + Checking for updates... - + アップデートをチェックしています… - + Updates are not allowed! - + アップデートは許可されていません！ - + This folder configuration does not allow for updates! The folder name should be: このフォルダの設定では、アップデートが許可されていません。フォルダ名は次のようにしてください： - + An error occurred while check updates: Update Service not found! - アップデートを確認中にエラーが発生しました：アップデートサービスが見つかりませんでした！ + アップデートを確認中にエラーが発生しました：アップデートサービスが見つかりませんでした！ - + Downloading new version %1 (%2%) - + 新しいバージョン%1 (%2%) をダウンロードしています - + An error occurred while loading updates: Update Service not found! - アップデートの起動中にエラーが発生しました：サービスが見つかりませんでした！ + アップデートの起動中にエラーが発生しました：サービスが見つかりませんでした！ - - Downloading new version %1 (0%) - - - - - + Cancel - キャンセル + キャンセル - + An error occurred while loading updates: package Url is empty! - + 更新のロード中にエラーが発生しました: パッケージ URLが空です！ - + Update package error: md5 sum does not match the original. - + パッケージの更新エラー：md5 sum がオリジナルと一致しません。 - + Preparing update... - + アップデートの準備中です… - + An error occurred while unzip updates: Update Service not found! - アップデートのアーカイブを解除中にエラーが発生しました：アップデートサービスが見つかりませんでした！ + アップデートのアーカイブを解除中にエラーが発生しました：アップデートサービスが見つかりませんでした！ - + Update is available (version %1) - + 更新が利用可能です (バージョン %1) - + Download update - アップデートをダウンロードする + アップデートをダウンロードする - - + Current version is up to date - + 現在のバージョンは最新です - + + An error occured while unpacking the archive + アーカイブの解凍中にエラーが発生しました + + + + Update download failed: out of memory! + アップデートのダウンロードに失敗しました: メモリ不足です + + + + Update download failed: server connection error! + アップデートのダウンロードに失敗しました: サーバー接続エラー + + + + Update download failed: wrong URL! + アップデートのダウンロードに失敗しました: URLが間違っています + + + + Update download failed: unable to create file! + 更新のダウンロードに失敗しました: ファイルを作成できません + + + + Update download failed: network error! + ダウンロードの更新に失敗しました：ネットワークエラー + + + + A service error has occurred! + サービスエラーが発生しました！ + + + + Last check performed %1 + 最後に実行されたチェック %1 + + + + Error opening JSON file. + JSON ファイルを開くときにエラーが発生しました。 + + + Update is available - + アップデートが利用可能です - - + + Current version - + 現在のバージョン - - + + Update version - + バージョンの更新 - + Would you like to download update now? - + アップデートをダウンロードしますか? - + Update is ready to install - + アップデートをインストールする準備ができています - + Would you like to restart app now? - + アプリを再起動しますか？ A new version of %1 is available! @@ -869,7 +884,7 @@ Install later - + 後でインストールする @@ -914,12 +929,12 @@ アップデートのアーカイブを解除中にエラーが発生しました：アップデートサービスが見つかりませんでした！ - + An error occurred while start install updates! アップデートのインストール中にエラーが発生しました！ - + An error occurred while start replacing files: Update Service not found! ファイルの移動中にエラーが発生しました：アップデートサービスが見つかりませんでした！ diff --git a/win-linux/langs/ko.ts b/win-linux/langs/ko.ts index 3eab2a28f..9bdd416e2 100644 --- a/win-linux/langs/ko.ts +++ b/win-linux/langs/ko.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View 발표자 보기 @@ -17,18 +17,18 @@ 업데이트 중입니다. 업데이트를 취소하고 애플케이이션을 닫으시겠습니까? - - + + Document%1.docx Document%1.docx - + Book%1.xlsx Book%1.xlsx - + Presentation%1.pptx Presentation%1.pptx @@ -36,7 +36,7 @@ CAscTabWidget - + Document 여는 중... @@ -609,154 +609,169 @@ CUpdateManager - - - - Last check performed - - - - - - - - - - - - - - - - + Check for updates - + Unable to check update: URL not defined. - - - + To finish updating, restart app - - - + Restart - + Checking for updates... - + Updates are not allowed! - + This folder configuration does not allow for updates! The folder name should be: - + An error occurred while check updates: Update Service not found! - + Downloading new version %1 (%2%) - + An error occurred while loading updates: Update Service not found! - - Downloading new version %1 (0%) - - - - - + Cancel 취소 - + An error occurred while loading updates: package Url is empty! - + Update package error: md5 sum does not match the original. - + Preparing update... - + An error occurred while unzip updates: Update Service not found! - + Update is available (version %1) - + Download update - - + Current version is up to date - + + An error occured while unpacking the archive + + + + + Update download failed: out of memory! + + + + + Update download failed: server connection error! + + + + + Update download failed: wrong URL! + + + + + Update download failed: unable to create file! + + + + + Update download failed: network error! + + + + + A service error has occurred! + + + + + Last check performed %1 + + + + + Error opening JSON file. + + + + Update is available - - + + Current version - - + + Update version - + Would you like to download update now? - + Update is ready to install - + Would you like to restart app now? @@ -854,12 +869,12 @@ - + An error occurred while start install updates! - + An error occurred while start replacing files: Update Service not found! diff --git a/win-linux/langs/lo.ts b/win-linux/langs/lo.ts index 0d4c42ca3..08970871f 100644 --- a/win-linux/langs/lo.ts +++ b/win-linux/langs/lo.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View ມຸມມອງຜູ້ນຳສະເໜີ @@ -21,18 +21,18 @@ ບັນນາທິການທັງ ໝົດ ຈະຖືກປິດ. ທ່ານຕ້ອງການ ດຳ ເນີນການຕໍ່ບໍ? - - + + Document%1.docx ເອກະສານ%1.docx - + Book%1.xlsx ປື້ມ%1.xlsx - + Presentation%1.pptx ການນຳສະເໜີ%1.pptx @@ -40,7 +40,7 @@ CAscTabWidget - + Document ກຳລັງເປີດ @@ -617,154 +617,169 @@ CUpdateManager - - - - Last check performed - - - - - - - - - - - - - - - - + Check for updates - + Unable to check update: URL not defined. - - - + To finish updating, restart app - - - + Restart - + Checking for updates... - + Updates are not allowed! - + This folder configuration does not allow for updates! The folder name should be: ການຕັ້ງຄ່າໂຟນເດີນີ້ບໍ່ອະນຸຍາດໃຫ້ອັບເດດ! ຊື່ໂຟນເດີຄວນຈະເປັນ: - + An error occurred while check updates: Update Service not found! ມີຂໍ້ຜິດພາດເກີດຂຶ້ນໃນຂະນະທີ່ກວດສອບການອັບເດດ: ບໍ່ພົບບໍລິການອັບເດດ! - + Downloading new version %1 (%2%) - + An error occurred while loading updates: Update Service not found! ເກີດຄວາມຜິດພາດໃນລະຫວ່າງການໂຫຼດອັບເດດ: ບໍ່ພົບບໍລິການອັບເດດ! - - Downloading new version %1 (0%) - - - - - + Cancel ຍົກເລີກ - + An error occurred while loading updates: package Url is empty! - + Update package error: md5 sum does not match the original. - + Preparing update... - + An error occurred while unzip updates: Update Service not found! ມີຂໍ້ຜິດພາດເກີດຂຶ້ນໃນຂະນະທີ່ unzip ອັບເດດ: ບໍ່ພົບບໍລິການອັບເດດ! - + Update is available (version %1) - + Download update ດາວໂຫລດອັບເດດ - - + Current version is up to date - + + An error occured while unpacking the archive + + + + + Update download failed: out of memory! + + + + + Update download failed: server connection error! + + + + + Update download failed: wrong URL! + + + + + Update download failed: unable to create file! + + + + + Update download failed: network error! + + + + + A service error has occurred! + + + + + Last check performed %1 + + + + + Error opening JSON file. + + + + Update is available - - + + Current version - - + + Update version - + Would you like to download update now? - + Update is ready to install - + Would you like to restart app now? @@ -890,12 +905,12 @@ ມີຂໍ້ຜິດພາດເກີດຂຶ້ນໃນຂະນະທີ່ unzip ອັບເດດ: ບໍ່ພົບບໍລິການອັບເດດ! - + An error occurred while start install updates! ເກີດຄວາມຜິດພາດຂຶ້ນໃນຂະນະທີ່ ເລີ່ມຕິດຕັ້ງ ອັບເດດ! - + An error occurred while start replacing files: Update Service not found! ເກີດຄວາມຜິດພາດຂຶ້ນໃນຂະນະທີ່ເລີ່ມປ່ຽນໄຟລ໌: ບໍ່ພົບບໍລິການອັບເດດ! diff --git a/win-linux/langs/lt.ts b/win-linux/langs/lt.ts index 6d7afc54d..10f1671c8 100644 --- a/win-linux/langs/lt.ts +++ b/win-linux/langs/lt.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View Peržiūros rėžimas @@ -21,18 +21,18 @@ Visi redagavimo langai bus uždaryti. Ar norite tęsti? - - + + Document%1.docx Documentas%1.docx - + Book%1.xlsx Knyga%1.xlsx - + Presentation%1.pptx Prezentacija%1.pptx @@ -40,7 +40,7 @@ CAscTabWidget - + Document Atidaroma... @@ -613,154 +613,169 @@ CUpdateManager - - - - Last check performed - - - - - - - - - - - - - - - - + Check for updates - + Unable to check update: URL not defined. - - - + To finish updating, restart app - - - + Restart - + Checking for updates... - + Updates are not allowed! - + This folder configuration does not allow for updates! The folder name should be: - + An error occurred while check updates: Update Service not found! - + Downloading new version %1 (%2%) - + An error occurred while loading updates: Update Service not found! - - Downloading new version %1 (0%) - - - - - + Cancel Atšaukti - + An error occurred while loading updates: package Url is empty! - + Update package error: md5 sum does not match the original. - + Preparing update... - + An error occurred while unzip updates: Update Service not found! - + Update is available (version %1) - + Download update - - + Current version is up to date - + + An error occured while unpacking the archive + + + + + Update download failed: out of memory! + + + + + Update download failed: server connection error! + + + + + Update download failed: wrong URL! + + + + + Update download failed: unable to create file! + + + + + Update download failed: network error! + + + + + A service error has occurred! + + + + + Last check performed %1 + + + + + Error opening JSON file. + + + + Update is available - - + + Current version - - + + Update version - + Would you like to download update now? - + Update is ready to install - + Would you like to restart app now? @@ -854,12 +869,12 @@ - + An error occurred while start install updates! - + An error occurred while start replacing files: Update Service not found! diff --git a/win-linux/langs/lv.ts b/win-linux/langs/lv.ts index 4df5d1c49..aa59e5ded 100644 --- a/win-linux/langs/lv.ts +++ b/win-linux/langs/lv.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View Prezentētāja Skats @@ -21,18 +21,18 @@ Visi rediģēšanas logi tiks aizvērti. Vai jūs vēlaties turpināt? - - + + Document%1.docx Dokuments%1.docx - + Book%1.xlsx Grāmata%1.xlsx - + Presentation%1.pptx Prezentācija%1.pptx @@ -40,7 +40,7 @@ CAscTabWidget - + Document Notiek atvēršana... @@ -95,7 +95,7 @@ Open Document - Atvērt Dokumentu + Atvērt Dokumentu @@ -179,7 +179,7 @@ There are no printers available - + Nav pieejams neviens printeris @@ -287,7 +287,7 @@ Macro-enabled Presentation File (*.pptm) - + Prezentācijas fails ar iespējotu makro (*.pptm) @@ -315,27 +315,27 @@ DOCX Document - + DOCX dokuments OpenDocument Document template - + OpenDocument dokumenta veidne OpenDocument Presentation Template - + OpenDocument prezentācijas veidne Macro-enabled spreadsheet template - + Izklājlapas veidne ar iespējotu makro OpenDocument Spreadsheet Template - + OpenDocument izklājlapas veidne @@ -365,12 +365,12 @@ SVG Image (*.svg) - + SVG attēls (*.svg) JPG Image (*.jpg *.jpeg) - + JPG attēls (*.jpg *.jpeg) @@ -443,25 +443,25 @@ All supported files - + Visi atbalstītie faili Spreadsheet template - + Izklājlapas veidne Presentation template - + Prezentācijas veidne Document template - + Dokumenta veidne @@ -499,7 +499,7 @@ Select Folder - + Izvēlēties mapi @@ -507,53 +507,53 @@ More than one document is open.<br>Close the window anyway? - + Ir atvērts vairāk nekā viens dokuments.<br>Vai aizvērt logu tik un tā? Don't ask again. - + Nejautājiet vēlreiz. File format not supported. - Faila formāts netiek atbalstīts. + Faila formāts netiek atbalstīts. %1 doesn't exists!<br>Remove file from the list? - %1 nav pieejams. Tas varētu būt pārdēvēts, pārvietots vai izdzēsts.<br>Vai jūs vēlaties izņemt failu no saraksta? + %1 nav pieejams. Tas varētu būt pārdēvēts, pārvietots vai izdzēsts.<br>Vai jūs vēlaties izņemt failu no saraksta? Document must be saved firstly. - Dokuments vispirms jāsaglabā. + Dokuments vispirms jāsaglabā. Document must be saved to continue.<br>Save the document? - Dokuments jāsaglabā, lai turpinātu.<br>Saglabāt dokumentu? + Dokuments jāsaglabā, lai turpinātu.<br>Saglabāt dokumentu? There are no printers available - + Nav pieejams neviens printeris Print Document - Izprintēt dokumentu + Izprintēt dokumentu Sign Up - Izveidot portālu + Izveidot portālu %1 is modified.<br>Do you want to keep changes? - %1 tika izmainīts.<br>Vai jūs vēlaties saglabāt izmaiņas? + %1 tika izmainīts.<br>Vai jūs vēlaties saglabāt izmaiņas? @@ -613,156 +613,171 @@ CUpdateManager - - - - Last check performed - - - - - - - - - - - - - - - - + Check for updates - + Meklēt atjauninājumus - + Unable to check update: URL not defined. - + Nevar pārbaudīt atjauninājumu: vietrādis URL nav definēts. - - - + To finish updating, restart app - + Lai pabeigtu atjaunināšanu, restartējiet lietotni - - - + Restart - + Restartēt - + Checking for updates... - + Notiek atjauninājumu pārbaude... - + Updates are not allowed! - + Atjauninājumi nav atļauti! - + This folder configuration does not allow for updates! The folder name should be: - + Šī mapes konfigurācija neļauj veikt atjauninājumus! Mapes nosaukumam ir jābūt šādam: - + An error occurred while check updates: Update Service not found! - + Pārbaudot atjauninājumus, radās kļūda: atjaunināšanas pakalpojums nav atrasts! - + Downloading new version %1 (%2%) - + Notiek jaunas versijas %1 lejupielāde (%2%) - + An error occurred while loading updates: Update Service not found! - + Ielādējot atjauninājumus, radās kļūda: atjaunināšanas pakalpojums nav atrasts! - - Downloading new version %1 (0%) - - - - - + Cancel - Atcelt + Atcelt - + An error occurred while loading updates: package Url is empty! - + Ielādējot atjauninājumus, radās kļūda: pakotnes vietrādis URL ir tukšs! - + Update package error: md5 sum does not match the original. - + Atjaunināšanas pakotnes kļūda: md5 summa neatbilst oriģinālam. - + Preparing update... - + Sagatavo atjauninājumu... - + An error occurred while unzip updates: Update Service not found! - + Izpakojot atjauninājumus, radās kļūda: atjaunināšanas pakalpojums nav atrasts! - + Update is available (version %1) - + Ir pieejams atjauninājums (versija %1) - + Download update - + Lejupielādēt atjauninājumu - - + Current version is up to date + Pašreizējā versija ir atjaunināta + + + + An error occured while unpacking the archive - + + Update download failed: out of memory! + + + + + Update download failed: server connection error! + + + + + Update download failed: wrong URL! + + + + + Update download failed: unable to create file! + + + + + Update download failed: network error! + + + + + A service error has occurred! + + + + + Last check performed %1 + Pēdējā pārbaude veikta %1 + + + + Error opening JSON file. + + + + Update is available - + Ir pieejams atjauninājums - - + + Current version - + Pašreizējā versija - - + + Update version - + Atjaunināt versiju - + Would you like to download update now? - + Vai vēlaties lejupielādēt atjauninājumu tūlīt? - + Update is ready to install - + Atjauninājums ir gatavs instalēšanai - + Would you like to restart app now? - + Vai vēlaties restartēt lietotni tūlīt? @@ -790,48 +805,48 @@ XML File (*.xml) - + XML fails (*.xml) Access to file '%1' is denied! - + Piekļuve failam '%1' ir liegta! Read only - + Tikai lasāms Skip this version - + Izlaist šo versiju Remind me later - + Atgādināt man vēlāk Install update - + Instalēt atjauninājumu Install later - + Instalēt vēlāk Save and Restart Now - + Saglabāt un restartēt tagad @@ -843,75 +858,75 @@ Download update - + Lejupielādēt atjauninājumu Software Update - + Programmatūras atjauninājums Release notes - + Izlaiduma piezīmes - + An error occurred while start install updates! - + Uzsākot atjauninājumu instalēšanu, radās kļūda! - + An error occurred while start replacing files: Update Service not found! - + Sākot aizstāt failus, radās kļūda: atjaunināšanas pakalpojums nav atrasts! Cancel - Atcelt + Atcelt Yes - Jā + Jā No - Nē + Nē OK - Labi + Labi Skip - + Izlaist Buy Now - + Pirkt tagad Activate - + Aktivizēt Continue - + Turpināt An error occurred while opening the portal:<br>%1 - + Atverot portālu, radās kļūda:<br>%1 &OK diff --git a/win-linux/langs/nl.ts b/win-linux/langs/nl.ts index bb97b83cf..37424bf42 100644 --- a/win-linux/langs/nl.ts +++ b/win-linux/langs/nl.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View Presentatieweergave @@ -21,18 +21,18 @@ Alle bewerkingsvensters worden gesloten. Wilt u doorgaan? - - + + Document%1.docx Document%1.docx - + Book%1.xlsx Boek%1.xlsx - + Presentation%1.pptx Presentatie%1.pptx @@ -40,7 +40,7 @@ CAscTabWidget - + Document Openen... @@ -613,154 +613,169 @@ CUpdateManager - - - - Last check performed - - - - - - - - - - - - - - - - + Check for updates - + Unable to check update: URL not defined. - - - + To finish updating, restart app - - - + Restart - + Checking for updates... - + Updates are not allowed! - + This folder configuration does not allow for updates! The folder name should be: - + An error occurred while check updates: Update Service not found! - + Downloading new version %1 (%2%) - + An error occurred while loading updates: Update Service not found! - - Downloading new version %1 (0%) - - - - - + Cancel Annuleren - + An error occurred while loading updates: package Url is empty! - + Update package error: md5 sum does not match the original. - + Preparing update... - + An error occurred while unzip updates: Update Service not found! - + Update is available (version %1) - + Download update - - + Current version is up to date - + + An error occured while unpacking the archive + + + + + Update download failed: out of memory! + + + + + Update download failed: server connection error! + + + + + Update download failed: wrong URL! + + + + + Update download failed: unable to create file! + + + + + Update download failed: network error! + + + + + A service error has occurred! + + + + + Last check performed %1 + + + + + Error opening JSON file. + + + + Update is available - - + + Current version - - + + Update version - + Would you like to download update now? - + Update is ready to install - + Would you like to restart app now? @@ -858,12 +873,12 @@ - + An error occurred while start install updates! - + An error occurred while start replacing files: Update Service not found! diff --git a/win-linux/langs/no.ts b/win-linux/langs/no.ts index 7dbcefa5b..9e4ed47c4 100644 --- a/win-linux/langs/no.ts +++ b/win-linux/langs/no.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View Presentasjonsvisning @@ -21,18 +21,18 @@ Alle redigeringsvinduene vil lukkes. Vil du fortsette? - - + + Document%1.docx Dokument%1.docx - + Book%1.xlsx Bok%1.xlsx - + Presentation%1.pptx Presentasjon%1.pptx @@ -40,7 +40,7 @@ CAscTabWidget - + Document Åpner... @@ -613,154 +613,169 @@ CUpdateManager - - - - Last check performed - - - - - - - - - - - - - - - - + Check for updates - + Unable to check update: URL not defined. - - - + To finish updating, restart app - - - + Restart - + Checking for updates... - + Updates are not allowed! - + This folder configuration does not allow for updates! The folder name should be: - + An error occurred while check updates: Update Service not found! - + Downloading new version %1 (%2%) - + An error occurred while loading updates: Update Service not found! - - Downloading new version %1 (0%) - - - - - + Cancel Avbryt - + An error occurred while loading updates: package Url is empty! - + Update package error: md5 sum does not match the original. - + Preparing update... - + An error occurred while unzip updates: Update Service not found! - + Update is available (version %1) - + Download update - - + Current version is up to date - + + An error occured while unpacking the archive + + + + + Update download failed: out of memory! + + + + + Update download failed: server connection error! + + + + + Update download failed: wrong URL! + + + + + Update download failed: unable to create file! + + + + + Update download failed: network error! + + + + + A service error has occurred! + + + + + Last check performed %1 + + + + + Error opening JSON file. + + + + Update is available - - + + Current version - - + + Update version - + Would you like to download update now? - + Update is ready to install - + Would you like to restart app now? @@ -854,12 +869,12 @@ - + An error occurred while start install updates! - + An error occurred while start replacing files: Update Service not found! diff --git a/win-linux/langs/pl.ts b/win-linux/langs/pl.ts index c3078cb78..3b9b1ef65 100644 --- a/win-linux/langs/pl.ts +++ b/win-linux/langs/pl.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View Widok Prezentera @@ -21,18 +21,18 @@ Wszystkie okna edytora zostaną zamknięte. Czy chcesz kontynuować? - - + + Document%1.docx Dokument%1.docx - + Book%1.xlsx Skoroszyt%1.xlsx - + Presentation%1.pptx Prezentacja%1.pptx @@ -40,7 +40,7 @@ CAscTabWidget - + Document Otwieranie... @@ -613,154 +613,169 @@ CUpdateManager - - - - Last check performed - - - - - - - - - - - - - - - - + Check for updates - + Unable to check update: URL not defined. - - - + To finish updating, restart app - - - + Restart - + Checking for updates... - + Updates are not allowed! - + This folder configuration does not allow for updates! The folder name should be: - + An error occurred while check updates: Update Service not found! - + Downloading new version %1 (%2%) - + An error occurred while loading updates: Update Service not found! - - Downloading new version %1 (0%) - - - - - + Cancel Anuluj - + An error occurred while loading updates: package Url is empty! - + Update package error: md5 sum does not match the original. - + Preparing update... - + An error occurred while unzip updates: Update Service not found! - + Update is available (version %1) - + Download update - - + Current version is up to date - + + An error occured while unpacking the archive + + + + + Update download failed: out of memory! + + + + + Update download failed: server connection error! + + + + + Update download failed: wrong URL! + + + + + Update download failed: unable to create file! + + + + + Update download failed: network error! + + + + + A service error has occurred! + + + + + Last check performed %1 + + + + + Error opening JSON file. + + + + Update is available - - + + Current version - - + + Update version - + Would you like to download update now? - + Update is ready to install - + Would you like to restart app now? @@ -858,12 +873,12 @@ - + An error occurred while start install updates! - + An error occurred while start replacing files: Update Service not found! diff --git a/win-linux/langs/pt_BR.qm b/win-linux/langs/pt_BR.qm index 4b7b1b6b2..c6d58e7f7 100644 Binary files a/win-linux/langs/pt_BR.qm and b/win-linux/langs/pt_BR.qm differ diff --git a/win-linux/langs/pt_BR.ts b/win-linux/langs/pt_BR.ts index dae9ca7a8..581754173 100644 --- a/win-linux/langs/pt_BR.ts +++ b/win-linux/langs/pt_BR.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View Vista de apresentador @@ -21,18 +21,18 @@ Todas as janelas do editor serão fechadas. Quer continuar? - - + + Document%1.docx Documento%1.docx - + Book%1.xlsx Planilha%1.xlsx - + Presentation%1.pptx Apresentação%1.pptx @@ -56,7 +56,7 @@ CAscTabWidget - + Document Abrindo... @@ -637,154 +637,177 @@ CUpdateManager - - - Last check performed - Última verificação realizada + Última verificação realizada - - - - - - - - - - - - - + Check for updates Verificando atualizações - + Unable to check update: URL not defined. - + Não foi possível verificar a atualização: URL não definido. - - - + To finish updating, restart app Para terminar a atualização, reinicie o aplicativo - - - + Restart Reiniciar - + Checking for updates... Verificando atualizações... - + Updates are not allowed! Atualizações não são permitidas! - + This folder configuration does not allow for updates! The folder name should be: Esta configuração de pasta não permite atualizações! O nome da pasta deve ser: - + An error occurred while check updates: Update Service not found! Ocorreu um erro ao verificar atualizações: Serviço de atualização não encontrado! - + Downloading new version %1 (%2%) Baixando a nova versão %1 (%2%) - + An error occurred while loading updates: Update Service not found! Ocorreu um erro ao carregar atualizações: Serviço de atualização não encontrado! - Downloading new version %1 (0%) - Baixando a nova versão %1 (0%) + Baixando a nova versão %1 (0%) - - + Cancel Cancelar - + An error occurred while loading updates: package Url is empty! Ocorreu um erro ao carregar atualizações: o URL do pacote está vazio! - + Update package error: md5 sum does not match the original. Erro no pacote de atualização: a soma md5 não corresponde ao original. - + Preparing update... Preparando atualização... - + An error occurred while unzip updates: Update Service not found! Ocorreu um erro ao descompactar atualizações: Serviço de atualização não encontrado! - + Update is available (version %1) A atualização está disponível (versão %1) - + Download update Baixar atualização - - + Current version is up to date A versão atual está atualizada - + + An error occured while unpacking the archive + Ocorreu um erro ao descompactar o arquivo + + + + Update download failed: out of memory! + Falha no download da atualização: sem memória! + + + + Update download failed: server connection error! + Falha no download da atualização: erro de conexão do servidor! + + + + Update download failed: wrong URL! + Falha no download da atualização: URL errado! + + + + Update download failed: unable to create file! + Falha no download da atualização: não foi possível criar o arquivo! + + + + Update download failed: network error! + Falha no download da atualização: erro de rede! + + + + A service error has occurred! + Ocorreu um erro de serviço! + + + + Last check performed %1 + Última verificação realizada %1 + + + + Error opening JSON file. + Erro ao abrir arquivo JSON. + + + Update is available A atualização está disponível - - + + Current version Versão Atual - - + + Update version Versão atualizada - + Would you like to download update now? Gostaria de baixar a atualização agora? - + Update is ready to install A atualização está pronta para ser instalada - + Would you like to restart app now? Gostaria de reiniciar o aplicativo agora? @@ -914,12 +937,12 @@ Ocorreu um erro ao descompactar atualizações: Serviço de atualização não encontrado! - + An error occurred while start install updates! Ocorreu um erro ao iniciar a instalação das atualizações! - + An error occurred while start replacing files: Update Service not found! Ocorreu um erro ao iniciar a substituição de arquivos: Serviço de atualização não encontrado! diff --git a/win-linux/langs/pt_PT.ts b/win-linux/langs/pt_PT.ts index 53f4e4f45..08f8c9e14 100644 --- a/win-linux/langs/pt_PT.ts +++ b/win-linux/langs/pt_PT.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View Vista do Apresentador @@ -21,18 +21,18 @@ Todas as janelas do editor serão fechadas. Deseja continuar? - - + + Document%1.docx Documento%1.docx - + Book%1.xlsx Livro%1.xlsx - + Presentation%1.pptx Apresentação%1.pptx @@ -40,7 +40,7 @@ CAscTabWidget - + Document A abrir... @@ -613,154 +613,169 @@ CUpdateManager - - - - Last check performed - - - - - - - - - - - - - - - - + Check for updates - + Unable to check update: URL not defined. - - - + To finish updating, restart app - - - + Restart - + Checking for updates... - + Updates are not allowed! - + This folder configuration does not allow for updates! The folder name should be: - + An error occurred while check updates: Update Service not found! - + Downloading new version %1 (%2%) - + An error occurred while loading updates: Update Service not found! - - Downloading new version %1 (0%) - - - - - + Cancel Cancelar - + An error occurred while loading updates: package Url is empty! - + Update package error: md5 sum does not match the original. - + Preparing update... - + An error occurred while unzip updates: Update Service not found! - + Update is available (version %1) - + Download update - - + Current version is up to date - + + An error occured while unpacking the archive + + + + + Update download failed: out of memory! + + + + + Update download failed: server connection error! + + + + + Update download failed: wrong URL! + + + + + Update download failed: unable to create file! + + + + + Update download failed: network error! + + + + + A service error has occurred! + + + + + Last check performed %1 + + + + + Error opening JSON file. + + + + Update is available - - + + Current version - - + + Update version - + Would you like to download update now? - + Update is ready to install - + Would you like to restart app now? @@ -858,12 +873,12 @@ - + An error occurred while start install updates! - + An error occurred while start replacing files: Update Service not found! diff --git a/win-linux/langs/ro.qm b/win-linux/langs/ro.qm index 4642997b2..de31e0cbd 100644 Binary files a/win-linux/langs/ro.qm and b/win-linux/langs/ro.qm differ diff --git a/win-linux/langs/ro.ts b/win-linux/langs/ro.ts index bc56b70f9..347d2d320 100644 --- a/win-linux/langs/ro.ts +++ b/win-linux/langs/ro.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View Vizualizarea prezentator @@ -21,18 +21,18 @@ Toate ferestrele vor fi închise. Doriți sã continuați? - - + + Document%1.docx Document%1.docx - + Book%1.xlsx Registru%1.xlsx - + Presentation%1.pptx Prezentare%1.pptx @@ -56,7 +56,7 @@ CAscTabWidget - + Document Deschidere... @@ -637,154 +637,177 @@ CUpdateManager - - - Last check performed - Ultima verificare efectuată + Ultima verificare efectuată - - - - - - - - - - - - - + Check for updates Verificarea a actualizărilor - + Unable to check update: URL not defined. - + Imposibil de verificat actualizarea: Adresa URL nu este definită. - - - + To finish updating, restart app Pentru a finaliza actualizarea, reporniți aplicația - - - + Restart Repornire - + Checking for updates... Verificarea a actualizărilor... - + Updates are not allowed! Actualizări nu sunt permise! - + This folder configuration does not allow for updates! The folder name should be: Actualizări nu sunt acceptate pentru această configurație a folderului! Nume de folder trebuie să fie: - + An error occurred while check updates: Update Service not found! A intervenit o eroare în timpul verificării a actualizărilor: Serviciu de Actualizare nu s-a găsit! - + Downloading new version %1 (%2%) Descărcarea noii versiuni %1 (%2%) - + An error occurred while loading updates: Update Service not found! A intervenit o eroare în timpul incărcării a actualizărilor: Serviciu de Actualizare nu s-a găsit! - Downloading new version %1 (0%) - Descărcarea noii versiuni %1 (0%) + Descărcarea noii versiuni %1 (0%) - - + Cancel Revocare - + An error occurred while loading updates: package Url is empty! A intervenit o eroare la încărcarea actualizărilor: Pachetul URL este gol! - + Update package error: md5 sum does not match the original. Eroare de actualizare a pachetului: suma md5 nu se potrivește cu suma modelului. - + Preparing update... Pregătire pentru actualizarea... - + An error occurred while unzip updates: Update Service not found! A intervenit o eroare în timpul dezarhivării a actualizărilor: Serviciu de Actualizare nu s-a găsit! - + Update is available (version %1) O actualizare este disponibilă (versiune %1) - + Download update Descărcare actualizare - - + Current version is up to date Versiunea curentă este actualizată - + + An error occured while unpacking the archive + A intervenit o eroare în timpul dezarhivării + + + + Update download failed: out of memory! + Descărcarea actualizării eșuată: memoria insuficientă! + + + + Update download failed: server connection error! + Descărcarea actualizării eșuată: eroare de conectare la server! + + + + Update download failed: wrong URL! + Descărcarea actualizării eșuată: adresa URL incorectă! + + + + Update download failed: unable to create file! + Descărcarea actualizării eșuată: imposibil de creat fișierul! + + + + Update download failed: network error! + Descărcarea actualizării eșuată: eroare de rețea! + + + + A service error has occurred! + A intervenit o eroare de serviciu! + + + + Last check performed %1 + Ultima verificare realizată %1 + + + + Error opening JSON file. + Eroare la deschiderea fișierului JSON. + + + Update is available Actualizarea este disponibilă - - + + Current version Versiunea curentă - - + + Update version Actualizați versiunea - + Would you like to download update now? Doriți să descărcați actualizarea acum? - + Update is ready to install Actualizarea este gata de instalare - + Would you like to restart app now? Doriți să reporniți aplicația acum? @@ -914,12 +937,12 @@ A intervenit o eroare în timpul dezarhivării a actualizărilor: Serviciu de Actualizare nu s-a găsit. - + An error occurred while start install updates! A intervenit o eroare în timpul instalării a actualizărilor: - + An error occurred while start replacing files: Update Service not found! A intervenit o eroare în timpul înlocuirii a fișierelor: Serviciu de Actualizare nu s-a găsit. diff --git a/win-linux/langs/ru.qm b/win-linux/langs/ru.qm index 008ae928b..8481542e3 100644 Binary files a/win-linux/langs/ru.qm and b/win-linux/langs/ru.qm differ diff --git a/win-linux/langs/ru.ts b/win-linux/langs/ru.ts index 12b1279ab..bce041852 100644 --- a/win-linux/langs/ru.ts +++ b/win-linux/langs/ru.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View Режим докладчика @@ -21,18 +21,18 @@ Будут закрыты все окна редакторов. Продолжить? - - + + Document%1.docx Документ%1.docx - + Book%1.xlsx Книга%1.xlsx - + Presentation%1.pptx Презентация%1.pptx @@ -56,7 +56,7 @@ CAscTabWidget - + Document Открытие... @@ -641,154 +641,177 @@ Ошибка подключения к серверу! - - - Last check performed - Последняя проверка выполнена + Последняя проверка выполнена - - - - - - - - - - - - - + Check for updates Проверка обновлений - + Unable to check update: URL not defined. - + Невозможно проверить обновление: URL-адрес не определен. - - - + To finish updating, restart app Для завершения обновления перезапустите приложение - - - + Restart Перезапустить - + Checking for updates... Проверка обновлений... - + Updates are not allowed! Обновления не разрешены! - + This folder configuration does not allow for updates! The folder name should be: Данная конфигурация папки не позволяет устанавливать обновления! Имя папки должно быть: - + An error occurred while check updates: Update Service not found! При проверке обновлений произошла ошибка: Сервис обновлений не найден! - + Downloading new version %1 (%2%) Загрузка новой версии %1 (%2%) - + An error occurred while loading updates: Update Service not found! При загрузке обновлений произошла ошибка: Сервис обновлений не найден! - Downloading new version %1 (0%) - Загрузка новой версии %1 (0%) + Загрузка новой версии %1 (0%) - - + Cancel Отмена - + An error occurred while loading updates: package Url is empty! При загрузке обновлений произошла ошибка: URL-адрес пакета пуст! - + Update package error: md5 sum does not match the original. Ошибка при обновлении пакета: сумма md5 не соответствует оригиналу. - + Preparing update... Подготовка обновления... - + An error occurred while unzip updates: Update Service not found! При разархивировании обновлений произошла ошибка: Сервис обновлений не найден! - + Update is available (version %1) Доступно обновление (версия %1) - + Download update Скачать обновление - - + Current version is up to date Текущая версия является актуальной - - Update is available - Обновление доступно + + An error occured while unpacking the archive + При распаковке архива произошла ошибка - - + + Update download failed: out of memory! + Не удалось загрузить обновление: недостаточно памяти! + + + + Update download failed: server connection error! + Не удалось загрузить обновление: ошибка подключения к серверу! + + + + Update download failed: wrong URL! + Не удалось загрузить обновление: неверный URL-адрес! + + + + Update download failed: unable to create file! + Не удалось загрузить обновление: невозможно создать файл! + + + + Update download failed: network error! + Не удалось загрузить обновление: сетевая ошибка! + + + + A service error has occurred! + Произошла ошибка сервиса! + + + + Last check performed %1 + Последняя проверка выполнена %1 + + + + Error opening JSON file. + Ошибка открытия файла JSON. + + + + Update is available + Доступно обновление + + + + Current version Текущая версия - - + + Update version Обновить версию - + Would you like to download update now? Хотите загрузить обновление сейчас? - + Update is ready to install Обновление готово к установке - + Would you like to restart app now? Хотите перезапустить приложение сейчас? @@ -910,12 +933,12 @@ При разархивировании обновлений произошла ошибка: Сервис обновлений не найден! - + An error occurred while start install updates! При запуске установки обновлений произошла ошибка! - + An error occurred while start replacing files: Update Service not found! При запуске замены файлов произошла ошибка: Сервис обновлений не найден! diff --git a/win-linux/langs/si.ts b/win-linux/langs/si.ts index 9163bf9d2..d038e7322 100644 --- a/win-linux/langs/si.ts +++ b/win-linux/langs/si.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View ඉදිරිපත්කරුගේ දැක්ම @@ -17,18 +17,18 @@ All the editor windows will be closed. Do you want to continue? - - + + Document%1.docx ලේඛනය%1.docx - + Book%1.xlsx පොත%1.xlsx - + Presentation%1.pptx සමර්පණය%1.pptx @@ -52,7 +52,7 @@ CAscTabWidget - + Document විවෘත වෙමින්... @@ -634,154 +634,169 @@ CUpdateManager - - - - Last check performed - - - - - - - - - - - - - - - - + Check for updates - + Unable to check update: URL not defined. - - - + To finish updating, restart app - - - + Restart - + Checking for updates... - + Updates are not allowed! - + This folder configuration does not allow for updates! The folder name should be: මෙම බහාලුම් වින්‍යාසය යාවත්කාල සඳහා ඉඩ නොදේ! බහාලුමේ නම විය යුතු වන්නේ: - + An error occurred while check updates: Update Service not found! - + Downloading new version %1 (%2%) - + An error occurred while loading updates: Update Service not found! - - Downloading new version %1 (0%) - - - - - + Cancel අවලංගු - + An error occurred while loading updates: package Url is empty! - + Update package error: md5 sum does not match the original. - + Preparing update... - + An error occurred while unzip updates: Update Service not found! - + Update is available (version %1) - + Download update යාවත්කාලය බාගන්න - - + Current version is up to date - + + An error occured while unpacking the archive + + + + + Update download failed: out of memory! + + + + + Update download failed: server connection error! + + + + + Update download failed: wrong URL! + + + + + Update download failed: unable to create file! + + + + + Update download failed: network error! + + + + + A service error has occurred! + + + + + Last check performed %1 + + + + + Error opening JSON file. + + + + Update is available - - + + Current version - - + + Update version - + Would you like to download update now? - + Update is ready to install - + Would you like to restart app now? @@ -919,7 +934,7 @@ යාවත්කාල ස්ථාපනය ඇරඹීමේදී දෝෂයක් මතු විය! - + An error occurred while start replacing files: Update Service not found! ගොනු ප්‍රතිස්ථාපනය ඇරඹීමේදී දෝෂයක් මතු විය: යාවත්කාල සේවාව හමු නොවිණි! diff --git a/win-linux/langs/sk.ts b/win-linux/langs/sk.ts index ca2b4d812..5a8b65aa2 100644 --- a/win-linux/langs/sk.ts +++ b/win-linux/langs/sk.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View Režim prezentácie @@ -21,18 +21,18 @@ Všetky okná editora budú zatvorené. Chceš pokračovať? - - + + Document%1.docx Dokument%1.docx - + Book%1.xlsx Zošit%1.xlsx - + Presentation%1.pptx Prezentácia%1.pptx @@ -40,7 +40,7 @@ CAscTabWidget - + Document Otváranie... @@ -95,7 +95,7 @@ Open Document - Otvoriť dokument + Otvoriť dokument @@ -179,7 +179,7 @@ There are no printers available - + Nie sú k dispozícii žiadne tlačiarne @@ -287,7 +287,7 @@ Macro-enabled Presentation File (*.pptm) - + Súbor prezentácie s podporou makra (*.pptm) @@ -315,27 +315,27 @@ DOCX Document - + Dokument DOCX OpenDocument Document template - + Šablóna dokumentu OpenDocument OpenDocument Presentation Template - + Šablóna prezentácie OpenDocument Macro-enabled spreadsheet template - + Šablóna tabuľky s podporou makra OpenDocument Spreadsheet Template - + Šablóna tabuľky OpenDocument @@ -365,12 +365,12 @@ SVG Image (*.svg) - + Obrázok SVG (*.svg) JPG Image (*.jpg *.jpeg) - + Obrázok JPG (*.jpg *.jpeg) @@ -443,25 +443,25 @@ All supported files - + Všetky podporované súbory Spreadsheet template - + Šablóna tabuľky Presentation template - + Šablóna prezentácie Document template - + Šablóna dokumentu @@ -499,7 +499,7 @@ Select Folder - + Vybrať priečinok @@ -507,53 +507,53 @@ More than one document is open.<br>Close the window anyway? - + Viac ako jeden dokument je otvorený.<br>Zatvoriť okno aj tak? Don't ask again. - + Nezobrazujte túto otázku znova. File format not supported. - Formát súboru nie je podporovaný. + Formát súboru nie je podporovaný. %1 doesn't exists!<br>Remove file from the list? - %1 neexistuje.<br>Odstrániť súbor zo zoznamu? + %1 neexistuje.<br>Odstrániť súbor zo zoznamu? Document must be saved firstly. - Dokument musí byť uložený ako prvý. + Dokument musí byť uložený ako prvý. Document must be saved to continue.<br>Save the document? - Dokument musí byť uložený, aby ste mohli pokračovať.<br>Uložiť dokument? + Dokument musí byť uložený, aby ste mohli pokračovať.<br>Uložiť dokument? There are no printers available - + Nie sú k dispozícii žiadne tlačiarne Print Document - Vytlačiť dokument + Vytlačiť dokument Sign Up - Vytvoriť kancelárie cloud + Vytvoriť kancelárie cloud %1 is modified.<br>Do you want to keep changes? - %1 bol upravený.<br>Chcete zmeny zachovať? + %1 bol upravený.<br>Chcete zmeny zachovať? @@ -613,156 +613,171 @@ CUpdateManager - - - - Last check performed - - - - - - - - - - - - - - - - + Check for updates - + Skontrolujte si dostupnosť aktualizácií - + Unable to check update: URL not defined. - + Nie je možné skontrolovať aktualizáciu: URL nie je definovaná. - - - + To finish updating, restart app - + Ak chcete dokončiť aktualizáciu, reštartujte aplikáciu - - - + Restart - + Reštartovať - + Checking for updates... - + Kontrola dostupnosti aktualizácií... - + Updates are not allowed! - + Aktualizácie nie sú povolené! - + This folder configuration does not allow for updates! The folder name should be: - + Táto konfigurácia priečinka neumožňuje aktualizácie! Názov priečinka by mal byť: - + An error occurred while check updates: Update Service not found! - + Pri overovaní aktualizácií došlo k chybe: Služba aktualizácie nebola nájdená! - + Downloading new version %1 (%2%) - + Sťahovanie novej verzie %1 (%2%) - + An error occurred while loading updates: Update Service not found! - + Pri nahrávaní aktualizácií sa vyskytla chyba: Služba aktualizácie nebola nájdená! - - Downloading new version %1 (0%) - - - - - + Cancel - Zrušiť + Zrušiť - + An error occurred while loading updates: package Url is empty! - + Pri nahrávaní aktualizácií sa vyskytla chyba: Url balíka je prázdny! - + Update package error: md5 sum does not match the original. - + Chyba aktualizačného balíka: súčet md5 sa nezhoduje s pôvodným. - + Preparing update... - + Príprava aktualizácie... - + An error occurred while unzip updates: Update Service not found! - + Pri rozbaľovaní súboru s aktualizáciou sa vyskytla chyba: Služba aktualizácie nebola nájdená! - + Update is available (version %1) - + Je dostupná aktualizácia (verzia %1) - + Download update - + Stiahnite si aktualizáciu - - + Current version is up to date + Aktuálna verzia je najnovšia + + + + An error occured while unpacking the archive - + + Update download failed: out of memory! + + + + + Update download failed: server connection error! + + + + + Update download failed: wrong URL! + + + + + Update download failed: unable to create file! + + + + + Update download failed: network error! + + + + + A service error has occurred! + + + + + Last check performed %1 + Posledná vykonaná kontrola %1 + + + + Error opening JSON file. + + + + Update is available - + Je dostupná aktualizácia - - + + Current version - + Aktuálna verzia - - + + Update version - + Verzia aktualizácie - + Would you like to download update now? - + Chcete si teraz stiahnuť aktualizáciu? - + Update is ready to install - + Aktualizácia je pripravená na inštaláciu - + Would you like to restart app now? - + Chcete teraz reštartovať aplikáciu? @@ -790,48 +805,48 @@ XML File (*.xml) - + Súbor XML (*.xml) Access to file '%1' is denied! - + Prístup k súboru '%1' je zamietnutý! Read only - + Iba na čítanie Skip this version - + Preskočiť túto verziu Remind me later - + Pripomenúť neskôr Install update - + Inštalovať aktualizáciu Install later - + Inštalovať neskôr Save and Restart Now - + Uložiť a reštartovať teraz @@ -843,75 +858,75 @@ Download update - + Stiahnite si aktualizáciu Software Update - + Aktualizácia softvéru Release notes - + Informácie o verzii - + An error occurred while start install updates! - + Pri spustení inštalácie aktualizácií došlo k chybe! - + An error occurred while start replacing files: Update Service not found! - + Pri spustení výmeny súborov došlo k chybe: Služba aktualizácie nebola nájdená! Cancel - Zrušiť + Zrušiť Yes - Áno + Áno No - Nie + Nie OK - OK + OK Skip - + Preskočiť Buy Now - + Kúpiť teraz Activate - + Aktivovať Continue - + Pokračovať An error occurred while opening the portal:<br>%1 - + Pri otvorení portálu došlo k chybe:<br>%1 &OK diff --git a/win-linux/langs/sl.ts b/win-linux/langs/sl.ts index 78e1dc62b..5ba272c80 100644 --- a/win-linux/langs/sl.ts +++ b/win-linux/langs/sl.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View Pogled predstavitelja @@ -21,18 +21,18 @@ Vsa okna urejevalnika bodo zaprta. Ali želite nadaljevati? - - + + Document%1.docx Dokument%1.docx - + Book%1.xlsx Knjiga%1.xlsx - + Presentation%1.pptx Predstavitev%1.pptx @@ -40,7 +40,7 @@ CAscTabWidget - + Document Odpiranje... @@ -95,7 +95,7 @@ Open Document - Odpri dokument + Odpri dokument @@ -179,7 +179,7 @@ There are no printers available - + Na voljo ni nobenega tiskalnika @@ -287,7 +287,7 @@ Macro-enabled Presentation File (*.pptm) - + Prezentacijska datoteka z omogočenimi makroji (*.pptm) @@ -315,27 +315,27 @@ DOCX Document - + DOCX dokument OpenDocument Document template - + OpenDocument predloga dokumenta OpenDocument Presentation Template - + OpenDocument predloga prezentacije Macro-enabled spreadsheet template - + Predloga preglednice z omogočenimi makroji OpenDocument Spreadsheet Template - + OpenDocument predloga preglednice @@ -365,12 +365,12 @@ SVG Image (*.svg) - + SVG slika (*.svg) JPG Image (*.jpg *.jpeg) - + JPG slika (*.jpg *.jpeg) @@ -443,25 +443,25 @@ All supported files - + Vse podprte datoteke Spreadsheet template - + Predloga preglednice Presentation template - + Predstavitvena predloga Document template - + Predloga dokumenta @@ -499,7 +499,7 @@ Select Folder - + Izberi mapo @@ -507,53 +507,53 @@ More than one document is open.<br>Close the window anyway? - + Odprtih je več dokumentov.<br>Želite vseeno zapreti okno? Don't ask again. - + Ne vprašaj ponovno. File format not supported. - Format datoteke ni podprt. + Format datoteke ni podprt. %1 doesn't exists!<br>Remove file from the list? - %1 ni na voljo. Lahko je bil preimenovan, premaknjen ali izbrisan.<br>Ali želite, da ga izbrišemo iz seznama? + %1 ni na voljo. Lahko je bil preimenovan, premaknjen ali izbrisan.<br>Ali želite, da ga izbrišemo iz seznama? Document must be saved firstly. - Dokument mora biti najprej shranjen. + Dokument mora biti najprej shranjen. Document must be saved to continue.<br>Save the document? - Dokument mora biti shranjen pred nadaljevanjem.<br>Želiš shraniti dokument? + Dokument mora biti shranjen pred nadaljevanjem.<br>Želiš shraniti dokument? There are no printers available - + Na voljo ni nobenega tiskalnika Print Document - Natisni dokument + Natisni dokument Sign Up - Ustvari portal + Ustvari portal %1 is modified.<br>Do you want to keep changes? - %1 je bil spremenjen.<br>Želite shraniti spremembe? + %1 je bil spremenjen.<br>Želite shraniti spremembe? @@ -613,156 +613,171 @@ CUpdateManager - - - - Last check performed - - - - - - - - - - - - - - - - + Check for updates - + Preverite posodobitve - + Unable to check update: URL not defined. - + Ni mogoče preveriti posodobitev: URL ni definiran. - - - + To finish updating, restart app - + Za dokončanje posodabljanja znova zaženite aplikacijo - - - + Restart - + Ponovno zaženi - + Checking for updates... - + Preverjanje posodobitev… - + Updates are not allowed! - + Posodobitve niso dovoljene! - + This folder configuration does not allow for updates! The folder name should be: - + Ta konfiguracija mape ne dovoljuje posodobitev! Ime mape mora biti: - + An error occurred while check updates: Update Service not found! - + Med preverjanjem posodobitev je prišlo do napake: Storitve posodabljanja ni bilo mogoče najti! - + Downloading new version %1 (%2%) - + Prenos nove verzije %1 (%2%) - + An error occurred while loading updates: Update Service not found! - + Med nalaganjem posodobitev je prišlo do napake: Storitve posodabljanja ni bilo mogoče najti! - - Downloading new version %1 (0%) - - - - - + Cancel - Prekliči + Prekliči - + An error occurred while loading updates: package Url is empty! - + Med nalaganjem posodobitev je prišlo do napake: URL paketa je prazen! - + Update package error: md5 sum does not match the original. - + Napaka paketa posodobitve: vsota md5 se ne ujema z originalom. - + Preparing update... - + Pripravljanje posodobitev… - + An error occurred while unzip updates: Update Service not found! - + Med razpakiranjem posodobitev je prišlo do napake: storitve posodobitve ni bilo mogoče najti! - + Update is available (version %1) - + Posodobitev je na voljo (verzija %1) - + Download update - + Prenos posodobitev - - + Current version is up to date + Trenutna verzija je posodobljena + + + + An error occured while unpacking the archive - + + Update download failed: out of memory! + + + + + Update download failed: server connection error! + + + + + Update download failed: wrong URL! + + + + + Update download failed: unable to create file! + + + + + Update download failed: network error! + + + + + A service error has occurred! + + + + + Last check performed %1 + Zadnje preverjanje opravljeno %1 + + + + Error opening JSON file. + + + + Update is available - + Posodobitev je na voljo - - + + Current version - + Trenutna verzija - - + + Update version - + Posodobi verzijo - + Would you like to download update now? - + Ali želite zdaj prenesti posodobitve? - + Update is ready to install - + Posodobitev je pripravljena za namestitev - + Would you like to restart app now? - + Ali želite zdaj znova zagnati aplikacijo? @@ -790,48 +805,48 @@ XML File (*.xml) - + XML Datoteka (*.xml) Access to file '%1' is denied! - + Dostop do datoteke '%1' je zavrnjen! Read only - + Samo za branje Skip this version - + Preskoči to verzijo Remind me later - + Opomni me kasneje Install update - + Namesti posodobitve Install later - + Namesti kasneje Save and Restart Now - + Shrani in ponovno zaženi @@ -843,75 +858,75 @@ Download update - + Prenos posodobitev Software Update - + Posodobitev programske opreme Release notes - + Opombe ob izdaji - + An error occurred while start install updates! - + Med začetkom nameščanja posodobitev je prišlo do napake! - + An error occurred while start replacing files: Update Service not found! - + Med začetkom zamenjave datotek je prišlo do napake: storitve posodobitve ni bilo mogoče najti! Cancel - Prekliči + Prekliči Yes - Da + Da No - Ne + Ne OK - V redu + V redu Skip - + Preskoči Buy Now - + Kupi zdaj Activate - + Aktivacija Continue - + Nadaljuj An error occurred while opening the portal:<br>%1 - + Med odpiranjem portala je prišlo do napake:<br>%1 &OK diff --git a/win-linux/langs/sv.ts b/win-linux/langs/sv.ts index 2128a16d1..aebc59b29 100644 --- a/win-linux/langs/sv.ts +++ b/win-linux/langs/sv.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View Presentationsvy @@ -21,18 +21,18 @@ Alla redigeringsfönster kommer att stängas. Vill du fortsätta? - - + + Document%1.docx Dokument%1.docx - + Book%1.xlsx Kalkylblad%1.xlsx - + Presentation%1.pptx Presentation%1.pptx @@ -40,7 +40,7 @@ CAscTabWidget - + Document Öppnar... @@ -613,154 +613,169 @@ CUpdateManager - - - - Last check performed - - - - - - - - - - - - - - - - + Check for updates - + Unable to check update: URL not defined. - - - + To finish updating, restart app - - - + Restart - + Checking for updates... - + Updates are not allowed! - + This folder configuration does not allow for updates! The folder name should be: - + An error occurred while check updates: Update Service not found! - + Downloading new version %1 (%2%) - + An error occurred while loading updates: Update Service not found! - - Downloading new version %1 (0%) - - - - - + Cancel Avbryt - + An error occurred while loading updates: package Url is empty! - + Update package error: md5 sum does not match the original. - + Preparing update... - + An error occurred while unzip updates: Update Service not found! - + Update is available (version %1) - + Download update - - + Current version is up to date - + + An error occured while unpacking the archive + + + + + Update download failed: out of memory! + + + + + Update download failed: server connection error! + + + + + Update download failed: wrong URL! + + + + + Update download failed: unable to create file! + + + + + Update download failed: network error! + + + + + A service error has occurred! + + + + + Last check performed %1 + + + + + Error opening JSON file. + + + + Update is available - - + + Current version - - + + Update version - + Would you like to download update now? - + Update is ready to install - + Would you like to restart app now? @@ -854,12 +869,12 @@ - + An error occurred while start install updates! - + An error occurred while start replacing files: Update Service not found! diff --git a/win-linux/langs/tr.ts b/win-linux/langs/tr.ts index fab5ef0d1..d74af3d9c 100644 --- a/win-linux/langs/tr.ts +++ b/win-linux/langs/tr.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View Sunucu Görünümü @@ -21,18 +21,18 @@ Tüm editor pencereleri kapatılacaktır. Devam etmek istiyor musunuz? - - + + Document%1.docx Belge%1.docx - + Book%1.xlsx Kitap%1.xlsx - + Presentation%1.pptx Sunum%1.pptx @@ -40,7 +40,7 @@ CAscTabWidget - + Document Açılıyor... @@ -95,7 +95,7 @@ Open Document - Belge Aç + Belge Aç @@ -179,7 +179,7 @@ There are no printers available - + Kullanılabilir yazıcı yok @@ -287,7 +287,7 @@ Macro-enabled Presentation File (*.pptm) - + Makro Etkinleştirilmiş Sunum Dosyası (*.pptm) @@ -315,27 +315,27 @@ DOCX Document - + DOCX belgesi OpenDocument Document template - + OpenDocument Belge Şablonu OpenDocument Presentation Template - + OpenDocument Sunum Şablonu Macro-enabled spreadsheet template - + Makro Etkinleştirilmiş Elektronik Tablo Şablonu OpenDocument Spreadsheet Template - + OpenDocument Elektronik Tablo Şablonu @@ -365,12 +365,12 @@ SVG Image (*.svg) - + SVG Resmi (*.svg) JPG Image (*.jpg *.jpeg) - + JPG Resmi (*.jpg *.jpeg) @@ -443,25 +443,25 @@ All supported files - + Desteklenen tüm dosyalar Spreadsheet template - + Elektronik tablo şablonu Presentation template - + Sunum şablonu Document template - + Belge şablonu @@ -499,7 +499,7 @@ Select Folder - + Dosya Seç @@ -507,53 +507,53 @@ More than one document is open.<br>Close the window anyway? - + Birden fazla belge açık.<br>Yine de pencere kapatılsın mı? Don't ask again. - + Bir daha sorma. File format not supported. - Dosya format desteklenmiyor. + Dosya format desteklenmiyor. %1 doesn't exists!<br>Remove file from the list? - %1 mevcut değil. Yeniden isimlendirilmiş, taşınmış veya silimiş olabilir.<br>Dosyayı listeden kaldırmak istediğinize emin misiniz? + %1 mevcut değil. Yeniden isimlendirilmiş, taşınmış veya silimiş olabilir.<br>Dosyayı listeden kaldırmak istediğinize emin misiniz? Document must be saved firstly. - Belge önce kaydedilmelidir. + Belge önce kaydedilmelidir. Document must be saved to continue.<br>Save the document? - Devam edebilmek için belgenin kaydedilmesi gerekli.<br>Belgeyi kaydet? + Devam edebilmek için belgenin kaydedilmesi gerekli.<br>Belgeyi kaydet? There are no printers available - + Kullanılabilir yazıcı yok Print Document - Belgeyi yazdır + Belgeyi yazdır Sign Up - Portal oluştur + Portal oluştur %1 is modified.<br>Do you want to keep changes? - %1 değiştirildi.<br>Değişiklikleri kaydetmek istiyor musunuz? + %1 değiştirildi.<br>Değişiklikleri kaydetmek istiyor musunuz? @@ -613,156 +613,171 @@ CUpdateManager - - - - Last check performed - - - - - - - - - - - - - - - - + Check for updates - + Güncellemeleri kontrol et - + Unable to check update: URL not defined. - + Güncelleme kontrol edilemiyor: URL tanımlı değil. - - - + To finish updating, restart app - + Güncellemeyi tamamlamak için uygulamayı yeniden başlatın - - - + Restart - + Tekrar başlat - + Checking for updates... - + Güncellemeler kontrol ediliyor... - + Updates are not allowed! - + Güncellemelere izin verilmiyor! - + This folder configuration does not allow for updates! The folder name should be: - + Bu klasör yapılandırması güncellemelere izin vermiyor! Klasör adı şöyle olmalıdır: - + An error occurred while check updates: Update Service not found! - + Güncellemeleri kontrol ederken bir hata oluştu: Güncelleme Hizmeti bulunamadı! - + Downloading new version %1 (%2%) - + Yeni sürüm %1 (%2%) indiriliyor - + An error occurred while loading updates: Update Service not found! - + Güncellemeler yüklenirken bir hata oluştu: Güncelleme Hizmeti bulunamadı! - - Downloading new version %1 (0%) - - - - - + Cancel - İptal + İptal - + An error occurred while loading updates: package Url is empty! - + Güncellemeler yüklenirken bir hata oluştu: Paket bağlantısı boş! - + Update package error: md5 sum does not match the original. - + Güncelleme paketi hatası: md5 toplamı orijinalle eşleşmiyor. - + Preparing update... - + Güncelleme hazırlanıyor... - + An error occurred while unzip updates: Update Service not found! - + Güncellemelerin çıkarılması sırasında bir hata oluştu: Güncelleme Hizmeti bulunamadı! - + Update is available (version %1) - + Güncelleme mevcut (sürüm %1) - + Download update - + Güncellemeyi indir - - + Current version is up to date + Mevcut sürüm güncel + + + + An error occured while unpacking the archive - + + Update download failed: out of memory! + + + + + Update download failed: server connection error! + + + + + Update download failed: wrong URL! + + + + + Update download failed: unable to create file! + + + + + Update download failed: network error! + + + + + A service error has occurred! + + + + + Last check performed %1 + Son kontrol yapıldı %1 + + + + Error opening JSON file. + + + + Update is available - + Güncelleme mevcut - - + + Current version - + Şimdiki versiyonu - - + + Update version - + Sürümü güncelle - + Would you like to download update now? - + Güncellemeyi şimdi indirmek ister misiniz? - + Update is ready to install - + Güncelleme yüklenmeye hazır - + Would you like to restart app now? - + Uygulamayı şimdi yeniden başlatmak ister misiniz? @@ -790,48 +805,48 @@ XML File (*.xml) - + XML Dosyası (*.xml) Access to file '%1' is denied! - + '%1' dosyasına erişim reddedildi! Read only - + Salt okunur Skip this version - + Bu versiyonu atla Remind me later - + Bana daha sonra hatırlat Install update - + Güncellemeyi yükle Install later - + Daha sonra yükle Save and Restart Now - + Şimdi Kaydet ve Yeniden Başlat @@ -843,75 +858,75 @@ Download update - + Güncellemeyi indir Software Update - + Yazılım güncellemesi Release notes - + Sürüm notları - + An error occurred while start install updates! - + Güncellemeleri yüklemeye başlarken bir hata oluştu! - + An error occurred while start replacing files: Update Service not found! - + Dosyaları değiştirmeye başlarken bir hata oluştu: Güncelleme Hizmeti bulunamadı! Cancel - İptal + İptal Yes - Evet + Evet No - Hayır + Hayır OK - Tamam + Tamam Skip - + Atla Buy Now - + Şimdi Satın Al Activate - + Etkinleştir Continue - + Devam Et An error occurred while opening the portal:<br>%1 - + Portal açılırken bir hata oluştu:<br>%1 &OK diff --git a/win-linux/langs/uk.ts b/win-linux/langs/uk.ts index 98fd9960c..d61bb2571 100644 --- a/win-linux/langs/uk.ts +++ b/win-linux/langs/uk.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View Режим доповідача @@ -21,18 +21,18 @@ Усі вікна редактора будуть закриті. Продовжити? - - + + Document%1.docx Документ%1.docx - + Book%1.xlsx Книга%1.xlsx - + Presentation%1.pptx Презентація%1.pptx @@ -40,7 +40,7 @@ CAscTabWidget - + Document Відкриття... @@ -95,7 +95,7 @@ Open Document - Відкрити документ + Відкрити документ @@ -179,7 +179,7 @@ There are no printers available - + Немає доступних принтерів @@ -287,7 +287,7 @@ Macro-enabled Presentation File (*.pptm) - + Файл презентації з підтримкою макросів (*.pptm) @@ -315,27 +315,27 @@ DOCX Document - + Документ DOCX OpenDocument Document template - + Шаблон документа OpenDocument OpenDocument Presentation Template - + Шаблон презентації OpenDocument Macro-enabled spreadsheet template - + Шаблон електронної таблиці з підтримкою макросів OpenDocument Spreadsheet Template - + Шаблон електронної таблиці OpenDocument @@ -365,12 +365,12 @@ SVG Image (*.svg) - + Зображення SVG (*.svg) JPG Image (*.jpg *.jpeg) - + Зображення JPG (*.jpg *.jpeg) @@ -443,25 +443,25 @@ All supported files - + Усі підтримувані файли Spreadsheet template - + Шаблон електронної таблиці Presentation template - + Шаблон презентації Document template - + Шаблон документа @@ -499,7 +499,7 @@ Select Folder - + Вибрати папку @@ -507,53 +507,53 @@ More than one document is open.<br>Close the window anyway? - + Відкрито більше одного документа.<br>Все одно закрити вікно? Don't ask again. - + Більше не запитувати. File format not supported. - Формат файлу не підтримується. + Формат файлу не підтримується. %1 doesn't exists!<br>Remove file from the list? - Файл %1 недоступний. Він може бути перейменований, переміщений або видалений.<br>Видалити цей файл зі списку? + Файл %1 недоступний. Він може бути перейменований, переміщений або видалений.<br>Видалити цей файл зі списку? Document must be saved firstly. - You must save the document first. + You must save the document first. Document must be saved to continue.<br>Save the document? - Щоб продовжити, потрібно зберегти документ.<br>Зберегти документ? + Щоб продовжити, потрібно зберегти документ.<br>Зберегти документ? There are no printers available - + Немає доступних принтерів Print Document - Друк документа + Друк документа Sign Up - Створити портал + Створити портал %1 is modified.<br>Do you want to keep changes? - %1 змінено.<br>Зберегти зміни? + %1 змінено.<br>Зберегти зміни? @@ -613,156 +613,171 @@ CUpdateManager - - - - Last check performed - - - - - - - - - - - - - - - - + Check for updates - + Перевірка оновлень - + Unable to check update: URL not defined. - + Не вдалося перевірити оновлення: URL-адреса не визначена. - - - + To finish updating, restart app - + Щоб завершити оновлення, перезапустіть застосунок - - - + Restart - + Перезапустити - + Checking for updates... - + Перевіряння оновлень… - + Updates are not allowed! - + Оновлення не дозволені! - + This folder configuration does not allow for updates! The folder name should be: - + Ця конфігурація папки не дозволяє оновлення! Назва папки має бути: - + An error occurred while check updates: Update Service not found! - + Під час перевірки оновлень сталася помилка: служба оновлень не знайдена! - + Downloading new version %1 (%2%) - + Завантаження нової версії %1 (%2%) - + An error occurred while loading updates: Update Service not found! - + Під час завантаження оновлень сталася помилка: служба оновлень не знайдена! - - Downloading new version %1 (0%) - - - - - + Cancel - Відмінити + Відмінити - + An error occurred while loading updates: package Url is empty! - + Під час завантаження оновлень сталася помилка: URL-адреса пакета порожня! - + Update package error: md5 sum does not match the original. - + Помилка пакета оновлення: сума md5 не відповідає оригіналу. - + Preparing update... - + Підготування оновлення… - + An error occurred while unzip updates: Update Service not found! - + Під час розпакування оновлень сталася помилка: служба оновлень не знайдена! - + Update is available (version %1) - + Оновлення доступне (версія %1) - + Download update - + Завантажити оновлення - - + Current version is up to date + Поточна версія є актуальною + + + + An error occured while unpacking the archive - + + Update download failed: out of memory! + + + + + Update download failed: server connection error! + + + + + Update download failed: wrong URL! + + + + + Update download failed: unable to create file! + + + + + Update download failed: network error! + + + + + A service error has occurred! + + + + + Last check performed %1 + Останню перевірку виконано %1 + + + + Error opening JSON file. + + + + Update is available - + Оновлення доступне - - + + Current version - + Поточна версія - - + + Update version - + Версія оновлення - + Would you like to download update now? - + Бажаєте завантажити оновлення зараз? - + Update is ready to install - + Оновлення готове до інсталювання - + Would you like to restart app now? - + Бажаєте перезапустити застосунок зараз? @@ -790,48 +805,48 @@ XML File (*.xml) - + Файл XML (*.xml) Access to file '%1' is denied! - + Доступ до файлу '%1' заборонено! Read only - + Лише для читання Skip this version - + Пропустити цю версію Remind me later - + Нагадати мені пізніше Install update - + Інсталювати оновлення Install later - + Інсталювати пізніше Save and Restart Now - + Зберегти й перезапустити зараз @@ -843,75 +858,75 @@ Download update - + Завантажити оновлення Software Update - + Оновлення програмного забезпечення Release notes - + Нотатки про випуск - + An error occurred while start install updates! - + Під час запуску інсталювання оновлень сталася помилка! - + An error occurred while start replacing files: Update Service not found! - + Під час запуску заміни файлів сталася помилка: служба оновлень не знайдена! Cancel - Відмінити + Відмінити Yes - Так + Так No - Ні + Ні OK - OK + OK Skip - + Пропустити Buy Now - + Купити зараз Activate - + Активувати Continue - + Продовжити An error occurred while opening the portal:<br>%1 - + Під час відкриття порталу сталася помилка:<br>%1 &OK diff --git a/win-linux/langs/vi.ts b/win-linux/langs/vi.ts index 4b9078378..7ce6c1580 100644 --- a/win-linux/langs/vi.ts +++ b/win-linux/langs/vi.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View Chế độ xem của người thuyết trình @@ -21,18 +21,18 @@ Tất cả màn hình chỉnh sửa sẽ được đóng. Bạn có muốn tiếp tục không? - - + + Document%1.docx Document%1.docx - + Book%1.xlsx Book%1.xlsx - + Presentation%1.pptx Presentation%1.pptx @@ -40,7 +40,7 @@ CAscTabWidget - + Document Đang mở... @@ -613,154 +613,169 @@ CUpdateManager - - - - Last check performed - - - - - - - - - - - - - - - - + Check for updates - + Unable to check update: URL not defined. - - - + To finish updating, restart app - - - + Restart - + Checking for updates... - + Updates are not allowed! - + This folder configuration does not allow for updates! The folder name should be: - + An error occurred while check updates: Update Service not found! - + Downloading new version %1 (%2%) - + An error occurred while loading updates: Update Service not found! - - Downloading new version %1 (0%) - - - - - + Cancel Hủy - + An error occurred while loading updates: package Url is empty! - + Update package error: md5 sum does not match the original. - + Preparing update... - + An error occurred while unzip updates: Update Service not found! - + Update is available (version %1) - + Download update - - + Current version is up to date - + + An error occured while unpacking the archive + + + + + Update download failed: out of memory! + + + + + Update download failed: server connection error! + + + + + Update download failed: wrong URL! + + + + + Update download failed: unable to create file! + + + + + Update download failed: network error! + + + + + A service error has occurred! + + + + + Last check performed %1 + + + + + Error opening JSON file. + + + + Update is available - - + + Current version - - + + Update version - + Would you like to download update now? - + Update is ready to install - + Would you like to restart app now? @@ -858,12 +873,12 @@ - + An error occurred while start install updates! - + An error occurred while start replacing files: Update Service not found! diff --git a/win-linux/langs/zh_CN.qm b/win-linux/langs/zh_CN.qm index 2f4195ef9..6da1559f5 100644 Binary files a/win-linux/langs/zh_CN.qm and b/win-linux/langs/zh_CN.qm differ diff --git a/win-linux/langs/zh_CN.ts b/win-linux/langs/zh_CN.ts index 5ecaae1c7..6f3042926 100644 --- a/win-linux/langs/zh_CN.ts +++ b/win-linux/langs/zh_CN.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View 演示者视图 @@ -21,18 +21,18 @@ 所有编辑器窗口都将关闭。 你想继续吗？ - - + + Document%1.docx 文档%1.docx - + Book%1.xlsx 工作簿%1.xlsx - + Presentation%1.pptx 演示文稿%1.pptx @@ -56,7 +56,7 @@ CAscTabWidget - + Document 打开中... @@ -637,154 +637,177 @@ CUpdateManager - - - Last check performed - 上次检查 + 上次检查 - - - - - - - - - - - - - + Check for updates 检查更新 - + Unable to check update: URL not defined. - - - + To finish updating, restart app 要完成更新，请重新启动应用程序 - - - + Restart 重新启动 - + Checking for updates... 检查更新... - + Updates are not allowed! 不允许更新！ - + This folder configuration does not allow for updates! The folder name should be: 此文件夹配置不允许更新！文件夹名称应为： - + An error occurred while check updates: Update Service not found! 检查更新时发生错误： 未找到更新服务！ - + Downloading new version %1 (%2%) 下载新版本 %1 (%2%) - + An error occurred while loading updates: Update Service not found! 加载更新时发生错误： 未找到更新服务！ - Downloading new version %1 (0%) - 下载新版本 %1 (0%) + 下载新版本 %1 (0%) - - + Cancel 取消 - + An error occurred while loading updates: package Url is empty! 加载更新时发生错误：软件包 Url 为空！ - + Update package error: md5 sum does not match the original. 更新软件包错误：md5 不匹配。 - + Preparing update... 准备更新... - + An error occurred while unzip updates: Update Service not found! 解压更新时发生错误： 未找到更新服务！ - + Update is available (version %1) 可更新（版本 %1） - + Download update 下载更新 - - + Current version is up to date 当前版本已更新 - + + An error occured while unpacking the archive + + + + + Update download failed: out of memory! + + + + + Update download failed: server connection error! + + + + + Update download failed: wrong URL! + + + + + Update download failed: unable to create file! + + + + + Update download failed: network error! + + + + + A service error has occurred! + + + + + Last check performed %1 + + + + + Error opening JSON file. + + + + Update is available 可更新 - - + + Current version 当前版本 - - + + Update version 更新版本 - + Would you like to download update now? 现在要下载更新吗？ - + Update is ready to install 更新已准备就绪，可以安装 - + Would you like to restart app now? 现在要重启应用程序吗？ @@ -914,12 +937,12 @@ 解压更新时发生错误： 未找到更新服务！ - + An error occurred while start install updates! 开始安装更新时发生错误！ - + An error occurred while start replacing files: Update Service not found! 开始替换文件时发生错误： 未找到更新服务！ diff --git a/win-linux/langs/zh_TW.ts b/win-linux/langs/zh_TW.ts index 2500e9c89..cb52da8d4 100644 --- a/win-linux/langs/zh_TW.ts +++ b/win-linux/langs/zh_TW.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View 簡報者檢視畫面 @@ -21,18 +21,18 @@ 所有編輯器視窗將會關閉。您要繼續嗎？ - - + + Document%1.docx 文件%1.docx - + Book%1.xlsx 書%1.xlsx - + Presentation%1.pptx 簡報%1.pptx @@ -56,7 +56,7 @@ CAscTabWidget - + Document 開啟中... @@ -633,154 +633,169 @@ CUpdateManager - - - - Last check performed - - - - - - - - - - - - - - - - + Check for updates - + Unable to check update: URL not defined. - - - + To finish updating, restart app - - - + Restart - + Checking for updates... - + Updates are not allowed! - + This folder configuration does not allow for updates! The folder name should be: - + An error occurred while check updates: Update Service not found! - + Downloading new version %1 (%2%) - + An error occurred while loading updates: Update Service not found! - - Downloading new version %1 (0%) - - - - - + Cancel 取消 - + An error occurred while loading updates: package Url is empty! - + Update package error: md5 sum does not match the original. - + Preparing update... - + An error occurred while unzip updates: Update Service not found! - + Update is available (version %1) - + Download update 下載更新 - - + Current version is up to date - + + An error occured while unpacking the archive + + + + + Update download failed: out of memory! + + + + + Update download failed: server connection error! + + + + + Update download failed: wrong URL! + + + + + Update download failed: unable to create file! + + + + + Update download failed: network error! + + + + + A service error has occurred! + + + + + Last check performed %1 + + + + + Error opening JSON file. + + + + Update is available - - + + Current version - - + + Update version - + Would you like to download update now? - + Update is ready to install - + Would you like to restart app now? @@ -898,12 +913,12 @@ 發行說明 - + An error occurred while start install updates! - + An error occurred while start replacing files: Update Service not found! diff --git a/win-linux/package/linux/Makefile b/win-linux/package/linux/Makefile index 6f66ec215..9ba820c5e 100644 --- a/win-linux/package/linux/Makefile +++ b/win-linux/package/linux/Makefile @@ -72,8 +72,10 @@ DEB_ASTRA = deb-astra/$(PACKAGE_NAME)_$(PACKAGE_VERSION)$(DEB_ASTRA_RELEASE_SUFF TAR = $(TAR_PACKAGE_DIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)$(TAR_RELEASE_SUFFIX)-$(TAR_ARCH).tar.xz HELP_TAR = $(TAR_PACKAGE_DIR)/$(PACKAGE_NAME)-help-$(PACKAGE_VERSION)$(TAR_RELEASE_SUFFIX)-any.tar.xz -CHANGELOG_RPM = common/usr/share/doc/$(PACKAGE_NAME)/NEWS -CHANGELOG_RPM_M4 = common/usr/share/doc/NEWS.m4 +NEWS_RPM = common/usr/share/doc/$(PACKAGE_NAME)/NEWS +NEWS_RPM_M4 = common/usr/share/doc/NEWS.m4 +CHANGELOG_RPM = common/usr/share/doc/$(PACKAGE_NAME)/ChangeLog +CHANGELOG_RPM_M4 = common/usr/share/doc/ChangeLog.m4 CHANGELOG_DEB = deb/build/debian/changelog CHANGELOG_DEB_M4 = deb/template/changelog.m4 CHANGELOG_DEB_ASTRA = deb-astra/build/debian/changelog @@ -266,6 +268,7 @@ clean: suse-rpm/$(PACKAGE_NAME).spec \ $(shell dirname $(CHANGELOG_RPM)) \ $(CHANGES_DIR)/*/changes_??? \ + $(CHANGES_DIR)/*/news_??? \ $(INSTALLER) branding: $(BRANDING_DIR) @@ -281,10 +284,10 @@ desktopeditor: branding $(LINUX_DEPS) cp -rf ../../../common/package/mimetypes common/opt/desktopeditors ifeq ($(COMPANY_NAME), ONLYOFFICE) - for path in common documenteditor presentationeditor spreadsheeteditor; do \ - mkdir -p common/help/desktopeditors/editors/web-apps/apps/$$path/main/resources; \ - mv -ft common/help/desktopeditors/editors/web-apps/apps/$$path/main/resources \ - common/opt/desktopeditors/editors/web-apps/apps/$$path/main/resources/help; \ + for path in common/opt/desktopeditors/editors/web-apps/apps/*/main/resources/help; do \ + path_new=$$(echo $$path | sed 's|/opt/|/help/|'); \ + mkdir -p $$path_new; \ + mv -fT $$path $$path_new; \ done endif @@ -335,11 +338,13 @@ $(CHANGELOG_DEB) : $(CHANGELOG_DEB_M4) $(CHANGELOG_RPM) $(foreach dir, \ $(CHANGES_DIR_LIST), \ $(shell \ - sed 's/^[^ *]/* &/' $(CHANGES_DIR)/$(dir)/changes_rpm | \ + sed 's/^[^ *]/* &/' $(CHANGES_DIR)/$(dir)/news_rpm | \ sed 's/^/ /' \ > $(CHANGES_DIR)/$(dir)/changes_deb; \ mkdir -p deb/build/debian; \ m4 $(M4_DEB_PARAMS) -D M4_PACKAGE_VERSION='$(dir)' -D M4_DATE='$(shell date -d "$(shell grep \"releasedate\" $(CHANGES_DIR)/$(dir)/$(CHANGES_HTML) | sed 's/.* - //' | sed 's/<\/span>.*//' | sed 's/{{DATE}}/$(shell date -R)/')" -R)' $(CHANGELOG_DEB_M4) | sed '2r $(CHANGES_DIR)/$(dir)/changes_deb' >> $(CHANGELOG_DEB))) + $(shell \ + sed -i 's/$(PRODUCT_VERSION)/$(PACKAGE_VERSION)/' $(CHANGELOG_DEB)) $(CHANGELOG_RPM) : $(foreach dir, \ @@ -359,9 +364,19 @@ $(CHANGELOG_RPM) : sed '/<\/ul>/d' | \ sed '/

/d' | \ sed '/^$$/d' \ + > $(CHANGES_DIR)/$(dir)/news_rpm; \ + mkdir -p $(shell dirname $(NEWS_RPM)); \ + m4 $(M4_PARAMS) -D M4_VERSION='$(dir)' -D M4_DATE_SHORT='$(shell date -d "$(shell grep \"releasedate\" $(CHANGES_DIR)/$(dir)/$(CHANGES_HTML) | sed 's/.* - //' | sed 's/<\/span>.*//' | sed 's/{{DATE}}/$(shell date -R)/')" -I)' $(NEWS_RPM_M4) | sed '2r $(CHANGES_DIR)/$(dir)/news_rpm' >> $(NEWS_RPM))) + + $(foreach dir, \ + $(CHANGES_DIR_LIST), \ + $(shell \ + sed 's/ - / - /' $(CHANGES_DIR)/$(dir)/news_rpm | \ + sed 's/* / - /' | \ + sed 's/^[^ *]/- &/' \ > $(CHANGES_DIR)/$(dir)/changes_rpm; \ mkdir -p $(shell dirname $(CHANGELOG_RPM)); \ - m4 $(M4_PARAMS) -D M4_VERSION='$(dir)' -D M4_DATE_SHORT='$(shell date -d "$(shell grep \"releasedate\" $(CHANGES_DIR)/$(dir)/$(CHANGES_HTML) | sed 's/.* - //' | sed 's/<\/span>.*//' | sed 's/{{DATE}}/$(shell date -R)/')" -I)' $(CHANGELOG_RPM_M4) | sed '2r $(CHANGES_DIR)/$(dir)/changes_rpm' >> $(CHANGELOG_RPM))) + m4 $(M4_PARAMS) -D M4_VERSION='$(dir)' -D M4_DATE='$(shell LC_TIME="en_US.UTF-8" date -d "$(shell grep \"releasedate\" $(CHANGES_DIR)/$(dir)/$(CHANGES_HTML) | sed 's/.* - //' | sed 's/<\/span>.*//' | sed 's/{{DATE}}/$(shell date -R)/')" +"%a %b %d %Y")' $(CHANGELOG_RPM_M4) | sed '1r $(CHANGES_DIR)/$(dir)/changes_rpm' >> $(CHANGELOG_RPM))) deb/build/debian/$(PACKAGE_NAME).% : deb/template/package.%.m4 mkdir -pv $(@D) && m4 $(M4_DEB_PARAMS) $< > $@ diff --git a/win-linux/package/linux/common/usr/share/doc/ChangeLog.m4 b/win-linux/package/linux/common/usr/share/doc/ChangeLog.m4 new file mode 100644 index 000000000..c95783f12 --- /dev/null +++ b/win-linux/package/linux/common/usr/share/doc/ChangeLog.m4 @@ -0,0 +1,2 @@ +* M4_DATE M4_PUBLISHER_NAME M4_VERSION + diff --git a/win-linux/package/linux/rpm/common.spec b/win-linux/package/linux/rpm/common.spec index 347874c9a..ba9c62ebe 100644 --- a/win-linux/package/linux/rpm/common.spec +++ b/win-linux/package/linux/rpm/common.spec @@ -78,10 +78,7 @@ rm -rf "%{buildroot}" %attr(755, root, root) %{_bindir}/%{_desktopeditors_exec} %if "%{_company_name}" == "ONLYOFFICE" %attr(-, root, root) %{_bindir}/desktopeditors -%exclude /opt/%{_desktopeditors_prefix}/editors/web-apps/apps/common/main/resources/help -%exclude /opt/%{_desktopeditors_prefix}/editors/web-apps/apps/documenteditor/main/resources/help -%exclude /opt/%{_desktopeditors_prefix}/editors/web-apps/apps/presentationeditor/main/resources/help -%exclude /opt/%{_desktopeditors_prefix}/editors/web-apps/apps/spreadsheeteditor/main/resources/help +%exclude /opt/%{_desktopeditors_prefix}/editors/web-apps/apps/*/main/resources/help %else %attr(755, root, root) %{_bindir}/%{_imageviewer_exec} %attr(755, root, root) %{_bindir}/%{_videoplayer_exec} @@ -92,10 +89,7 @@ rm -rf "%{buildroot}" %if "%{_company_name}" == "ONLYOFFICE" %files help %defattr(-, root, root, -) -/opt/%{_desktopeditors_prefix}/editors/web-apps/apps/common/main/resources/help -/opt/%{_desktopeditors_prefix}/editors/web-apps/apps/documenteditor/main/resources/help -/opt/%{_desktopeditors_prefix}/editors/web-apps/apps/presentationeditor/main/resources/help -/opt/%{_desktopeditors_prefix}/editors/web-apps/apps/spreadsheeteditor/main/resources/help +/opt/%{_desktopeditors_prefix}/editors/web-apps/apps/*/main/resources/help %endif %pre @@ -184,3 +178,7 @@ for icon in "/opt/%{_desktopeditors_prefix}/asc-de-"*.png; do size="${icon##*/asc-de-}" "$XDG_ICON_RESOURCE" install --size "${size%.png}" "$icon" "%{_package_name}" done + +%changelog + +%include ../common/usr/share/doc/%{_package_name}/ChangeLog diff --git a/win-linux/package/windows/common.iss b/win-linux/package/windows/common.iss index 1ed1abcbc..d1b1405ed 100644 --- a/win-linux/package/windows/common.iss +++ b/win-linux/package/windows/common.iss @@ -994,10 +994,9 @@ Source: {#sBrandingFolder}\win-linux\package\windows\data\VisualElementsManifest Source: {#sBrandingFolder}\win-linux\package\windows\data\visual_elements_icon_150x150.png; DestDir: {app}\browser; MinVersion: 6.3; Source: {#sBrandingFolder}\win-linux\package\windows\data\visual_elements_icon_71x71.png; DestDir: {app}\browser; MinVersion: 6.3; -#if defined(_WIN_XP) + defined(EMBED_HELP) Source: {#DEPLOY_PATH}\*; DestDir: {app}; Flags: recursesubdirs; -#else -Source: {#DEPLOY_PATH}\*; DestDir: {app}; Excludes: "editors\web-apps\apps\*\main\resources\help"; Flags: recursesubdirs; +#if defined(_WIN_XP) | defined(EMBED_HELP) +Source: "{#DEPLOY_PATH}-Help\*"; DestDir: {app}; Flags: recursesubdirs; #endif Source: {#DEPLOY_PATH}\*.exe; DestDir: {app}; Flags: signonce; Source: {#DEPLOY_PATH}\*.dll; DestDir: {app}; Flags: signonce; diff --git a/win-linux/package/windows/make_zip.ps1 b/win-linux/package/windows/make_zip.ps1 index 5da7361d8..46f052be6 100644 --- a/win-linux/package/windows/make_zip.ps1 +++ b/win-linux/package/windows/make_zip.ps1 @@ -3,6 +3,7 @@ param ( [string]$BuildDir = "build", [string]$DesktopDir = "DesktopEditors", [string]$MultimediaDir, + [string]$BrandingDir = ".", [switch]$ExcludeHelp, [switch]$Sign, [string]$CertName = "Ascensio System SIA", @@ -19,16 +20,36 @@ $Suffix = switch ( $Target ) "windows_x64_xp" { "x64-xp" } "windows_x86_xp" { "x86-xp" } } +$DesktopHelpDir = "$DesktopDir-Help" # Check directory -if ( -Not (Test-Path -Path $BuildDir) ) { +if ( -Not (Test-Path $BuildDir) ) { Write-Error "Path $BuildDir does not exist" } -if ( $Sign ) { - if ( $DesktopDir ) { - Set-Location "$BuildDir\$DesktopDir" +# Copy VisualElements +Write-Host "Copy: $BrandingDir\data\VisualElementsManifest.xml > $BuildDir\$DesktopDir\DesktopEditors.VisualElementsManifest.xml" -ForegroundColor Yellow +Copy-Item -Path "$BrandingDir\data\VisualElementsManifest.xml" ` + -Destination "$BuildDir\$DesktopDir\DesktopEditors.VisualElementsManifest.xml" ` + -Force +Write-Host "Copy: $BrandingDir\data\visual_elements_icon_* > $BuildDir\$DesktopDir\browser" -ForegroundColor Yellow +New-Item "$BuildDir\$DesktopDir\browser" -ItemType Directory -Force | Out-Null +Copy-Item -Path "$BrandingDir\data\visual_elements_icon_*" ` + -Destination "$BuildDir\$DesktopDir\browser" -Force +# Move Help +Get-ChildItem "$BuildDir\$DesktopDir\editors\web-apps\apps\*\main\resources\help" -Directory ` + | ForEach-Object { + $src = $(Split-Path $_.FullName -Parent | Resolve-Path -Relative) + $dst = $src.Replace("\$DesktopDir\","\$DesktopHelpDir\") + Write-Host "Move: $src\help > $dst" -ForegroundColor Yellow + New-Item "$dst" -ItemType Directory | Out-Null + Move-Item -Path "$src\help" -Destination "$dst" + } + +if ( $DesktopDir ) { + Set-Location "$BuildDir\$DesktopDir" + if ( $Sign ) { $SignFiles = Get-ChildItem ` *.exe, *.dll, converter\*.exe, converter\*.dll, plugins\*\*.dll ` | Resolve-Path -Relative @@ -40,13 +61,21 @@ if ( $Sign ) { Write-Host "signtool verify /pa /all $SignFiles" -ForegroundColor Yellow & signtool verify /pa /all $SignFiles if ( $LastExitCode -ne 0 ) { throw } - - Set-Location $PSScriptRoot + # VLC plugin cache + Write-Host ".\vlc-cache-gen $PWD\plugins" -ForegroundColor Yellow + & .\vlc-cache-gen "$PWD\plugins" + if ( $LastExitCode -ne 0 ) { throw } } + if ( Test-Path "vlc-cache-gen.exe" ) { + Write-Host "Delete: vlc-cache-gen.exe" -ForegroundColor Yellow + Remove-Item "vlc-cache-gen.exe" -Force + } + Set-Location $PSScriptRoot +} - if ( $MultimediaDir ) { - Set-Location "$BuildDir\$MultimediaDir" - +if ( $MultimediaDir ) { + Set-Location "$BuildDir\$MultimediaDir" + if ( $Sign ) { $SignFiles = Get-ChildItem *.exe, *.dll, plugins\*\*.dll ` | Resolve-Path -Relative # Sign @@ -57,23 +86,28 @@ if ( $Sign ) { Write-Host "signtool verify /pa /all $SignFiles" -ForegroundColor Yellow & signtool verify /pa /all $SignFiles if ( $LastExitCode -ne 0 ) { throw } - - Set-Location $PSScriptRoot + # VLC plugin cache + Write-Host ".\vlc-cache-gen $PWD\plugins" -ForegroundColor Yellow + & .\vlc-cache-gen "$PWD\plugins" + if ( $LastExitCode -ne 0 ) { throw } } + if ( Test-Path "vlc-cache-gen.exe" ) { + Write-Host "Delete: vlc-cache-gen.exe" -ForegroundColor Yellow + Remove-Item "vlc-cache-gen.exe" -Force + } + Set-Location $PSScriptRoot } -# Create archive - +# Create archives $OutFile = "$Env:COMPANY_NAME-$DesktopDir-$Env:PRODUCT_VERSION.$Env:BUILD_NUMBER-$Suffix.zip" -if ( !$ExcludeHelp ) { - Write-Host "7z a -y $OutFile .\$BuildDir\$DesktopDir\*" -ForegroundColor Yellow - & 7z a -y $OutFile .\$BuildDir\$DesktopDir\* -} else { - Write-Host "7z a -y $OutFile .\$BuildDir\$DesktopDir\* -xr!editors\web-apps\apps\*\main\resources\help" -ForegroundColor Yellow - & 7z a -y $OutFile .\$BuildDir\$DesktopDir\* -xr!editors\web-apps\apps\*\main\resources\help -} +Write-Host "7z a -y $OutFile .\$BuildDir\$DesktopDir\*" -ForegroundColor Yellow +& 7z a -y $OutFile .\$BuildDir\$DesktopDir\* if ( $LastExitCode -ne 0 ) { throw } - +if ( !$ExcludeHelp ) { + Write-Host "7z a -y $OutFile .\$BuildDir\$DesktopHelpDir\*" -ForegroundColor Yellow + & 7z a -y $OutFile .\$BuildDir\$DesktopHelpDir\* + if ( $LastExitCode -ne 0 ) { throw } +} if ( $MultimediaDir ) { $OutFile = "$Env:COMPANY_NAME-$MultimediaDir-$Env:PRODUCT_VERSION.$Env:BUILD_NUMBER-$Suffix.zip" Write-Host "7z a -y $OutFile .\$BuildDir\$MultimediaDir\*" -ForegroundColor Yellow diff --git a/win-linux/package/windows/update/changes/7.5.0/changes.html b/win-linux/package/windows/update/changes/7.5.0/changes.html index 4e0070197..cdfe6d5a8 100644 --- a/win-linux/package/windows/update/changes/7.5.0/changes.html +++ b/win-linux/package/windows/update/changes/7.5.0/changes.html @@ -10,7 +10,7 @@ font-family: "Lucida Grande", "Lucida Sans Unicode", Verdana, Lucida, Helvetica, sans-serif; } h1, h2, h3 { - color: #7.5.00; + color: #000; font-family: "Helvetica"; font-weight: normal; font-style: normal; @@ -52,48 +52,70 @@

All Editors

    -
  • TODO
    • +
  • Added support for interface scales >200% (225, 250, 275, 300, 350, 400, 450, 500)
    • +
  • Files from the "Recent files" list of the application have been added to the "File" > “Open Recent” section, according to the editor formats
    • +
  • Updated VLC libraries (for Windows)
    • +
  • Updated the “About” page and the “Check for updates” block (for Windows)
    • +
  • Added a list of changes to deb/rpm packages (for Linux)
    • +
  • The "Last used" option has been added to the editors settings for "Default Zoom Value"
    • +
  • Add a menu for quick access to the most popular symbols to the button for inserting symbols
    • +
  • Support for SVG images
    • +
  • Add a setting to hide the toolbar for equation
    • +
  • Add hints for images in SmartArt objects
    • +
  • Add the ability to open files protected with a password in the embedded viewer
    • +
  • Add the ability to edit points of the autoshape border to the right panel
    • +
  • Only Ctrl + ./Ctrl + , keyboard shortcuts are now used for superscript/subscript characters
    • +
  • Change keyboard shortcuts for moving through the text on macOS

Document Editor

    -
  • TODO
    • +
  • Automatic hyphenation
    • +
  • Change the selection logic, add the “Smart paragraph selection” option in Advanced Setting
    • +
  • Add the “Remove content control when contents are edited” option to content control settings
    • +
  • Change behavior of the Accept/Reject review buttons in the toolbar
    • +
  • Disable the Zoom out action for the Ctrl + Numpad keyboard shortcut due to the conflict with inserting an em dash
    • +
  • Change the keyboard shortcut for strikeout text formatting on macOS: Ctrl + 5 replaced with Cmd + Shift + X
    • +
  • Change the keyboard shortcut for inserting ellipsis on macOS: Ctrl + Option + . replaced with Option + ;

Spreadsheet Editor

    -
  • TODO
    • +
  • The ability to display only formulas in cells
    • +
  • Trace precedents / dependents
    • +
  • New function: SORTBY
    • +
  • Added presets for "Margins" and the ability to show/hide "Print titles" in the "File" > "Print" menu
    • +
  • Add the ability to set a number format in the field settings for pivot tables
    • +
  • The Show details feature for working with a Pivot Table
    • +
  • Improvement of the ability to open data on a new sheet by double-clicking a value in a Pivot Table
    • +
  • Autocompletion for days of the week and months when stretching a cell value
    • +
  • Drag-and-drop for columns and rows
    • +
  • Add filters by date and the ability to display data with the "Date" format in the form of a tree in the Autofilter window
    • +
  • Inserting images into headers/footers
    • +
  • External data update for the currently edited source file
    • +
  • The last used Delimiter and Encoding setting for CSV files is now stored locally on the client side
    • +
  • The ability to insert page breaks from the Layout toolbar
    • +
  • Add the ability to open the source for external links
    • +
  • Add the Alt + Down keyboard shortcut for opening the Autofilter window when the header of a column with a filter is selected
    • +

Presentation Editor

    -
  • TODO
    • +
  • Add the "Morph" transition
    • +
  • Assigning names to objects in advanced settings
    • +
  • The "Number slides from" option has been added to the slide size settings
    • +
  • Notes and Handouts in headers/footers settings
    • +
  • Slide placeholders have alternative descriptions
    • +
  • SmartArt insertion is available via a slide placeholder
    • +
  • Add the ability to navigate to the specific slide with the consecutive pressing of the *slide number* + Enter when previewing a presentation
    • +
  • Change the keyboard shortcut for starting a presentation on macOS: Cmd + Shift + Return is used

Forms

    -
  • TODO
    • +
  • Bring settings on the right toolbar to unified appearance
- -

Fixes

- -

All Editors

+

PDF Editor

    -
  • TODO
    • +
  • Support for the PDF form, annotations, comments and drawings
-

Document Editor

-
    -
  • TODO
    • -
-

Spreadsheet Editor

-
    -
  • TODO
    • -
-

Presentation Editor

-
    -
  • TODO
    • -
-

Forms

-
    -
  • TODO
    • -
-
and a little more...
diff --git a/win-linux/package/windows/update/changes/7.5.0/changes_ru.html b/win-linux/package/windows/update/changes/7.5.0/changes_ru.html index d7cc70e23..73e3455b2 100644 --- a/win-linux/package/windows/update/changes/7.5.0/changes_ru.html +++ b/win-linux/package/windows/update/changes/7.5.0/changes_ru.html @@ -10,7 +10,7 @@ font-family: "Lucida Grande", "Lucida Sans Unicode", Verdana, Lucida, Helvetica, sans-serif; } h1, h2, h3 { - color: #7.5.00; + color: #000; font-family: "Helvetica"; font-weight: normal; font-style: normal; @@ -52,48 +52,69 @@

Все редакторы

    -
  • TODO
    • +
  • Добавлена поддержка масштабов интерфейса >200% (225, 250, 275, 300, 350, 400, 450, 500)
    • +
  • В меню "Файл" > "Открыть недавние" добавлены файлы из списка "Последние файлы" приложения, по формату соответствующие редактору
    • +
  • Обновлены библиотеки VLC (для Windows)
    • +
  • Обновлена страница О программе и блок обновлений (для Windows)
    • +
  • Добавлен список изменений в deb/rpm пакеты (для Linux)
    • +
  • В "Дополнительные параметры" редакторов в список "Стандартное значение масштаба" добавлена опция "Последний использованный"
    • +
  • В кнопку вставки символов добавлено меню для быстрого доступа к наиболее популярным символам
    • +
  • Добавлена возможность вставки SVG изображений
    • +
  • Добавлена настройка, позволяющая скрыть тулбар для уравнений
    • +
  • Добавлены подсказки к изображениям в SmartArt
    • +
  • Добавлена возможность открытия файлов с паролем в embedded viewer
    • +
  • В правую панель добавлена возможность редактировать точки для границы автофигуры
    • +
  • Горячие клавиши для надстрочных/подстрочных знаков теперь только Ctrl + . / Ctrl + ,
    • +
  • Изменена работа перемещения по тексту с помощью горячих клавиш для macOS

Редактор документов

    -
  • TODO
    • +
  • Добавлена возможность автоматической расстановки переносов
    • +
  • Изменена логика работы выделения, добавлена настройка "Использовать умное выделение абзацев"
    • +
  • Добавлена настройка "Удалять элемент управления содержимым при редактировании содержимого" в настройки элементов управления содержимым
    • +
  • Изменено поведение кнопок для рецензирования в тулбаре Принять/Отклонить
    • +
  • Отключено действие Уменьшить для Ctrl + Numpad – из-за конфликта со вставкой короткого тире
    • +
  • Изменена клавиша применения Зачеркнутый c Ctrl + 5 на Cmd + Shift + X для macOS
    • +
  • Изменено сочетание для вставки многоточия для macOS с Ctrl + Option + . на Option + ;

Редактор таблиц

    -
  • TODO
    • +
  • Добавлена возможность показать формулы в ячейках
    • +
  • Добавлена возможность отображения связей между формулами и ячейками
    • +
  • Добавлена поддержка новой функции СОРТПО
    • +
  • В меню "Файл" > "Печать" для опции "Поля" добавлены пресеты и возможность скрыть/показать для "Печатать залоговки"
    • +
  • В настройки полей для сводных таблиц добавлена возможность задать формат числа
    • +
  • В контекстное меню сводных таблиц добавлен пункт Показать детали для отображения подробных сведений о поле значений
    • +
  • Возможность показать детали двойным кликом по ячейке сводной таблицы
    • +
  • Добавлено автозаполнение днями недели и месяцами
    • +
  • Добавлена возможность перемещения строк и столбцов таблицы с помощью drag-n-drop
    • +
  • В окно Автофильтра добавлены фильтры по датам и вывод данных с форматом Дата в форме дерева
    • +
  • Добавлена возможность вставлять изображения в колонтитулы
    • +
  • Добавлена возможность обновления внешних данных в редакторе таблиц для файла-источника, который находится в процессе редактирования
    • +
  • Последние использованные настройки "Кодировка" и "Разделитель" для CSV-файлов теперь хранятся локально на стороне клиента
    • +
  • На панель инструментов "Макет" добавлена возможность вставлять разрывы страниц
    • +
  • Добавлена возможность открытия источника для внешних ссылок
    • +
  • Добавлена горячая клавиша Alt + Down для вызова окна Автофильтра, если выделен заголовок столбца с фильтром

Редактор презентаций

    -
  • TODO
    • +
  • Добавлен переход "Трансформация"
    • +
  • В "Дополнительные параметры" для объектов на слайде добавлена возможность присваивать имена
    • +
  • В "Настройки размера слайда" добавлена опция "Нумеровать слайды с"
    • +
  • Добавлена вкладка Заметки и раздаточные материалы в настройки колонтитулов
    • +
  • Добавлены подсказки к плейсхолдерам на слайдах в редакторе презентаций
    • +
  • Добавлена возможность добавлять SmartArt через плейсхолдер на слайде
    • +
  • Добавлена возможность перехода к нужному слайду через последовательное нажатие *номер слайда* + Enter в режиме демонстрации
    • +
  • Запуск слайдшоу в редакторе презентаций для macOS изменен на Cmd + Shift + Return

Формы

    -
  • TODO
    • +
  • Названия настроек на правой панели инструментов приведены к общему виду
- -

Исправления

- -

Все редакторы

+

Редактор PDF

    -
  • TODO
    • +
  • Заполнение форм, аннотации, комментарии и рисование
-

Редактор документов

-
    -
  • TODO
    • -
-

Редактор таблиц

-
    -
  • TODO
    • -
-

Редактор презентаций

-
    -
  • TODO
    • -
-

Формы

-
    -
  • TODO
    • -
-
и прочее...
diff --git a/win-linux/res/styles/theme-contrast-dark.json b/win-linux/res/styles/theme-contrast-dark.json index a13c6495b..f388b42da 100644 --- a/win-linux/res/styles/theme-contrast-dark.json +++ b/win-linux/res/styles/theme-contrast-dark.json @@ -5,7 +5,7 @@ "brand-word": "#1e1e1e", "brand-slide": "#1e1e1e", "brand-cell": "#1e1e1e", - "brand-pdf": "#2a2a2a", + "brand-pdf": "#1e1e1e", "window-background": "#2a2a2a", "window-border": "#616161", diff --git a/win-linux/src/cascapplicationmanagerwrapper.cpp b/win-linux/src/cascapplicationmanagerwrapper.cpp index b57b53ddd..1bf564ad2 100644 --- a/win-linux/src/cascapplicationmanagerwrapper.cpp +++ b/win-linux/src/cascapplicationmanagerwrapper.cpp @@ -342,16 +342,25 @@ bool CAscApplicationManagerWrapper::processCommonEvent(NSEditorApi::CAscCefMenuE QRegularExpressionMatch match = re.match(QString::fromStdWString(pData->get_Param())); if ( match.hasMatch() ) { bool is_dark = match.captured(1) == "dark"; - m_themes->onSystemDarkColorScheme(is_dark); + + if ( m_themes->isSystemSchemeDark() != is_dark ) { + m_themes->onSystemDarkColorScheme(is_dark); + + QJsonObject jparams{{"theme", QJsonObject{{"system", match.captured(1)}}}}; + QString params = Utils::stringifyJson(jparams); + for (auto i: GetViewsId()) { + sendCommandTo(GetViewById(i), L"renderervars:changed", params.toStdWString()); + } #ifndef Q_OS_WIN - for (auto i: GetViewsId()) { - sendCommandTo(GetViewById(i), cmd, pData->get_Param()); - } +// for (auto i: GetViewsId()) { +// sendCommandTo(GetViewById(i), cmd, pData->get_Param()); +// } #endif - if ( themes().current().isSystem() && themes().current().isDark() != is_dark ) - applyTheme(themes().current().id()); + if ( themes().current().isSystem() && themes().current().isDark() != is_dark ) + applyTheme(themes().current().id()); + } } @@ -1615,7 +1624,10 @@ bool CAscApplicationManagerWrapper::applySettings(const wstring& wstrjson) _reg_user.setValue("locale", _lang_id); CLangater::reloadTranslations(_lang_id); - EditorJSVariables::setVariable("lang", _lang_id); +#ifdef _UPDMODULE + if (m_pUpdateManager) + m_pUpdateManager->refreshStartPage(); +#endif } } @@ -1709,8 +1721,7 @@ void CAscApplicationManagerWrapper::applyTheme(const wstring& theme, bool force) {"type", _app.m_themes->current().stype()}, {"id", QString::fromStdWString(_app.m_themes->current().id())} #ifndef Q_OS_LINUX -// ,{"system", _app.m_themes->isSystemSchemeDark() ? "dark" : "light"} - ,{"system", "disabled"} + ,{"system", _app.m_themes->isSystemSchemeDark() ? "dark" : "light"} #else ,{"system", "disabled"} #endif diff --git a/win-linux/src/components/celipsislabel.cpp b/win-linux/src/components/celipsislabel.cpp index ee4f978e2..05f31704c 100644 --- a/win-linux/src/components/celipsislabel.cpp +++ b/win-linux/src/components/celipsislabel.cpp @@ -62,6 +62,13 @@ void CElipsisLabel::resizeEvent(QResizeEvent *event) if ( event->size().width() != event->oldSize().width() ) { QString elt = ellipsis_text_(this, orig_text, elide_mode); QLabel::setText(elt); + QFontMetrics fm(font()); +#if (QT_VERSION < QT_VERSION_CHECK(5,11,0)) + int textWidth = fm.width(elt); +#else + int textWidth = fm.horizontalAdvance(elt); +#endif + emit onResize(event->size(), textWidth); } } diff --git a/win-linux/src/components/celipsislabel.h b/win-linux/src/components/celipsislabel.h index 194992fce..a3ff8df8a 100644 --- a/win-linux/src/components/celipsislabel.h +++ b/win-linux/src/components/celipsislabel.h @@ -38,6 +38,7 @@ class CElipsisLabel : public QLabel { + Q_OBJECT public: CElipsisLabel(const QString &text, QWidget *parent = Q_NULLPTR); CElipsisLabel(QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags()); @@ -46,6 +47,9 @@ public: auto setEllipsisMode(Qt::TextElideMode) -> void; auto updateText() -> void; +signals: + void onResize(QSize size, int textWidth); + protected: virtual void resizeEvent(QResizeEvent *event) final; using QLabel::setText; diff --git a/win-linux/src/components/ctabbar.cpp b/win-linux/src/components/ctabbar.cpp index ca5ac07be..a1f1c4ab1 100644 --- a/win-linux/src/components/ctabbar.cpp +++ b/win-linux/src/components/ctabbar.cpp @@ -1149,7 +1149,7 @@ bool CTabBar::eventFilter(QObject *watched, QEvent *event) if (mouse_event->button() == Qt::LeftButton) { while (d->animationInProgress) PROCESSEVENTS(); - if (d->movedTab) { + if (d->movedTab && !d->lock) { if (d->currentIndex != d->movedTabIndex) { d->reorderIndexes(); int posX = d->tabLayouts[d->currentIndex].x(); diff --git a/win-linux/src/cthemes.cpp b/win-linux/src/cthemes.cpp index ef99a965f..d82b22762 100644 --- a/win-linux/src/cthemes.cpp +++ b/win-linux/src/cthemes.cpp @@ -212,9 +212,9 @@ public: } } - auto setCurrent(const QString& id) -> bool + auto setCurrent(const QString& id, bool force = false) -> bool { - if ( current->id() != id.toStdWString() ) { + if ( current->id() != id.toStdWString() || force ) { if ( id != THEME_ID_SYSTEM ) { delete current; @@ -477,7 +477,7 @@ auto CThemes::defaultLight() -> const CTheme& auto CThemes::setCurrentTheme(const std::wstring& name) -> void { - if ( !isThemeCurrent(name) && m_priv->setCurrent(QString::fromStdWString(name)) ) { + if ( !isThemeCurrent(name) && m_priv->setCurrent(QString::fromStdWString(name), true) ) { GET_REGISTRY_USER(_reg_user); if ( !m_priv->current->m_priv->source_file.isEmpty() ) diff --git a/win-linux/src/cupdatemanager.cpp b/win-linux/src/cupdatemanager.cpp index a7fb6f572..c4f189cd6 100644 --- a/win-linux/src/cupdatemanager.cpp +++ b/win-linux/src/cupdatemanager.cpp @@ -75,6 +75,35 @@ using std::vector; +const char *SVC_TXT_ERR_UNPACKING = QT_TRANSLATE_NOOP("CUpdateManager", "An error occured while unpacking the archive"), + *SVC_TXT_ERR_DNL_OUT_MEM = QT_TRANSLATE_NOOP("CUpdateManager", "Update download failed: out of memory!"), + *SVC_TXT_ERR_DNL_CONN = QT_TRANSLATE_NOOP("CUpdateManager", "Update download failed: server connection error!"), + *SVC_TXT_ERR_DNL_URL = QT_TRANSLATE_NOOP("CUpdateManager", "Update download failed: wrong URL!"), + *SVC_TXT_ERR_DNL_CREAT = QT_TRANSLATE_NOOP("CUpdateManager", "Update download failed: unable to create file!"), + *SVC_TXT_ERR_DNL_INET = QT_TRANSLATE_NOOP("CUpdateManager", "Update download failed: network error!"), + *SVC_TXT_ERR_OTHER = QT_TRANSLATE_NOOP("CUpdateManager", "A service error has occurred!"), + + *TXT_LAST_CHECK = QT_TRANSLATE_NOOP("CUpdateManager", "Last check performed %1"), + *TXT_UPDATED = QT_TRANSLATE_NOOP("CUpdateManager", "Current version is up to date"), + *TXT_CHECKING_UPD = QT_TRANSLATE_NOOP("CUpdateManager", "Checking for updates..."), + *TXT_AVAILABLE_UPD = QT_TRANSLATE_NOOP("CUpdateManager", "Update is available (version %1)"), + *TXT_DOWNLOADING_UPD = QT_TRANSLATE_NOOP("CUpdateManager", "Downloading new version %1 (%2%)"), + *TXT_PREPARING_UPD = QT_TRANSLATE_NOOP("CUpdateManager", "Preparing update..."), + *TXT_RESTART_TO_UPD = QT_TRANSLATE_NOOP("CUpdateManager", "To finish updating, restart app"), + *TXT_ERR_NOT_ALLOWED = QT_TRANSLATE_NOOP("CUpdateManager", "Updates are not allowed!"), + *TXT_ERR_URL = QT_TRANSLATE_NOOP("CUpdateManager", "Unable to check update: URL not defined."), + *TXT_ERR_PACK_URL = QT_TRANSLATE_NOOP("CUpdateManager", "An error occurred while loading updates: package Url is empty!"), + *TXT_ERR_CHECK = QT_TRANSLATE_NOOP("CUpdateManager", "An error occurred while check updates: Update Service not found!"), + *TXT_ERR_LOAD = QT_TRANSLATE_NOOP("CUpdateManager", "An error occurred while loading updates: Update Service not found!"), + *TXT_ERR_UNZIP = QT_TRANSLATE_NOOP("CUpdateManager", "An error occurred while unzip updates: Update Service not found!"), + *TXT_ERR_JSON = QT_TRANSLATE_NOOP("CUpdateManager", "Error opening JSON file."), + *TXT_ERR_MD5 = QT_TRANSLATE_NOOP("CUpdateManager", "Update package error: md5 sum does not match the original."), + + *BTN_TXT_CHECK = QT_TRANSLATE_NOOP("CUpdateManager", "Check for updates"), + *BTN_TXT_DOWNLOAD = QT_TRANSLATE_NOOP("CUpdateManager", "Download update"), + *BTN_TXT_RESTART = QT_TRANSLATE_NOOP("CUpdateManager", "Restart"), + *BTN_TXT_CANCEL = QT_TRANSLATE_NOOP("CUpdateManager", "Cancel"); + class CUpdateManager::DialogSchedule : public QObject { Q_OBJECT @@ -112,7 +141,7 @@ CUpdateManager::DialogSchedule::DialogSchedule(QObject *owner) : m_shedule_vec.removeFirst(); if (m_shedule_vec.isEmpty()) { m_timer->stop(); - qobject_cast(owner)->refreshStartPage({"", "", "", "", "false"}); + qobject_cast(owner)->refreshStartPage({"", {}, nullptr, "", "false"}); } } }); @@ -123,7 +152,7 @@ void CUpdateManager::DialogSchedule::addToSchedule(const QString &method, const m_shedule_vec.push_back({method, text}); if (!m_timer->isActive()) { m_timer->start(); - qobject_cast(m_owner)->refreshStartPage({"", "", "", "", "true"}); + qobject_cast(m_owner)->refreshStartPage({"", {}, nullptr, "", "true"}); } } @@ -253,7 +282,7 @@ CUpdateManager::CUpdateManager(QObject *parent): m_pLastCheckMsgTimer->setSingleShot(true); m_pLastCheckMsgTimer->setInterval(RESET_MESSAGE_MS); connect(m_pLastCheckMsgTimer, &QTimer::timeout, this, [=]() { - refreshStartPage({"lastcheck", tr("Last check performed ") + formattedTime(m_lastCheck)}); + refreshStartPage({"lastcheck", {TXT_LAST_CHECK, formattedTime(m_lastCheck)}}); }); if (IsPackage(Portable)) { runProcess(QStrToTStr(qApp->applicationDirPath()) + DAEMON_NAME, _T("--run-as-app")); @@ -271,7 +300,7 @@ CUpdateManager::CUpdateManager(QObject *parent): init(); } else { CLogger::log("Updates is off, URL is empty."); - refreshStartPage({"error", tr("Unable to check update: URL not defined."), tr("Check for updates"), "", "true"}); + refreshStartPage({"error", {TXT_ERR_URL}, BTN_TXT_CHECK, "", "true"}); } } @@ -296,8 +325,7 @@ void CUpdateManager::init() m_savedPackageData->fileType = reg_user.value("type", QString()).toString(); m_savedPackageData->version = reg_user.value("version", QString()).toString(); m_lastCheck = time_t(reg_user.value("last_check", 0).toLongLong()); - refreshStartPage({"lastcheck", tr("Last check performed ") + formattedTime(m_lastCheck), - tr("Check for updates"), "check", "false"}); + refreshStartPage({"lastcheck", {TXT_LAST_CHECK, formattedTime(m_lastCheck)}, BTN_TXT_CHECK, "check", "false"}); m_interval = reg_user.value("interval", DAY_TO_SEC).toInt(); if (m_interval < MINIMUM_INTERVAL) m_interval = MINIMUM_INTERVAL; @@ -316,7 +344,7 @@ void CUpdateManager::init() break; case MSG_ShowStartInstallMessage: { - refreshStartPage({"success", tr("To finish updating, restart app"), tr("Restart"), "install", "false"}); + refreshStartPage({"success", {TXT_RESTART_TO_UPD}, BTN_TXT_RESTART, "install", "false"}); QMetaObject::invokeMethod(m_dialogSchedule, "addToSchedule", Qt::QueuedConnection, Q_ARG(QString, QString("showStartInstallMessage"))); break; } @@ -376,13 +404,13 @@ void CUpdateManager::checkUpdates(bool manualCheck) __GLOBAL_LOCK - refreshStartPage({"load", tr("Checking for updates..."), tr("Check for updates"), "check", "true"}); + refreshStartPage({"load", {TXT_CHECKING_UPD}, BTN_TXT_CHECK, "check", "true"}); m_manualCheck = manualCheck; m_packageData->clear(); #ifdef CHECK_DIRECTORY if (QFileInfo(qApp->applicationDirPath()).baseName() != QString(REG_APP_NAME)) { - refreshStartPage({"error", tr("Updates are not allowed!")}); + refreshStartPage({"error", {TXT_ERR_NOT_ALLOWED}}); m_dialogSchedule->addToSchedule("criticalMsg", tr("This folder configuration does not allow for " "updates! The folder name should be: ") + QString(REG_APP_NAME)); return; @@ -390,8 +418,7 @@ void CUpdateManager::checkUpdates(bool manualCheck) #endif if (!m_socket->sendMessage(MSG_CheckUpdates, WStrToTStr(m_checkUrl))) { - refreshStartPage({"error", tr("An error occurred while check updates: Update Service not found!"), - tr("Check for updates"), "check", "false"}); + refreshStartPage({"error", {TXT_ERR_CHECK}, BTN_TXT_CHECK, "check", "false"}); __UNLOCK // m_dialogSchedule->addToSchedule("criticalMsg", QObject::tr("An error occurred while check updates: Update Service not found!")); } @@ -414,12 +441,31 @@ void CUpdateManager::updateNeededCheking() void CUpdateManager::onProgressSlot(const int percent) { - refreshStartPage({"", tr("Downloading new version %1 (%2%)").arg(m_packageData->version, QString::number(percent))}); + refreshStartPage({"", {TXT_DOWNLOADING_UPD, m_packageData->version, QString::number(percent)}}); } void CUpdateManager::onError(const QString &error) { - refreshStartPage({"error", error, tr("Check for updates"), "check", "false"}); + const char *_error = SVC_TXT_ERR_OTHER; + if (error == "SVC_TXT_ERR_UNPACKING") + _error = SVC_TXT_ERR_UNPACKING; + else + if (error == "SVC_TXT_ERR_DNL_OUT_MEM") + _error = SVC_TXT_ERR_DNL_OUT_MEM; + else + if (error == "SVC_TXT_ERR_DNL_CONN") + _error = SVC_TXT_ERR_DNL_CONN; + else + if (error == "SVC_TXT_ERR_DNL_URL") + _error = SVC_TXT_ERR_DNL_URL; + else + if (error == "SVC_TXT_ERR_DNL_CREAT") + _error = SVC_TXT_ERR_DNL_CREAT; + else + if (error == "SVC_TXT_ERR_DNL_INET") + _error = SVC_TXT_ERR_DNL_INET; + + refreshStartPage({"error", {_error}, BTN_TXT_CHECK, "check", "false"}); __UNLOCK // m_dialogSchedule->addToSchedule("criticalMsg", error); } @@ -478,21 +524,21 @@ void CUpdateManager::loadUpdates() __UNLOCK unzipIfNeeded(); } else { - refreshStartPage({"success", tr("To finish updating, restart app"), tr("Restart"), "install", "false"}); + refreshStartPage({"success", {TXT_RESTART_TO_UPD}, BTN_TXT_RESTART, "install", "false"}); m_dialogSchedule->addToSchedule("showStartInstallMessage"); } } else if (!m_packageData->packageUrl.empty()) { if (!m_socket->sendMessage(MSG_LoadUpdates, WStrToTStr(m_packageData->packageUrl), QStrToTStr(m_packageData->fileType))) { - refreshStartPage({"error", tr("An error occurred while loading updates: Update Service not found!"), tr("Check for updates"), "check", "false"}); + refreshStartPage({"error", {TXT_ERR_LOAD}, BTN_TXT_CHECK, "check", "false"}); __UNLOCK // m_dialogSchedule->addToSchedule("criticalMsg", QObject::tr("An error occurred while loading updates: Update Service not found!")); } else { - refreshStartPage({"load", tr("Downloading new version %1 (0%)").arg(m_packageData->version), tr("Cancel"), "abort", "false"}); + refreshStartPage({"load", {TXT_DOWNLOADING_UPD, m_packageData->version, "0"}, BTN_TXT_CANCEL, "abort", "false"}); } } else { - refreshStartPage({"error", tr("An error occurred while loading updates: package Url is empty!"), tr("Check for updates"), "check", "false"}); + refreshStartPage({"error", {TXT_ERR_PACK_URL}, BTN_TXT_CHECK, "check", "false"}); __UNLOCK // m_dialogSchedule->addToSchedule("criticalMsg", QObject::tr("An error occurred while loading updates: package Url is empty!")); } @@ -515,10 +561,10 @@ void CUpdateManager::refreshStartPage(const Command &cmd) lock = false; if (!m_lastCommand.icon.isEmpty()) jsn["icon"] = m_lastCommand.icon; - if (!m_lastCommand.text.isEmpty()) - jsn["text"] = m_lastCommand.text; - if (!m_lastCommand.btn_text.isEmpty()) - btn_jsn["text"] = m_lastCommand.btn_text; + if (m_lastCommand.text.text != nullptr) + jsn["text"] = tr(m_lastCommand.text.text, "CUpdateManager").arg(m_lastCommand.text.arg1, m_lastCommand.text.arg2); + if (m_lastCommand.btn_text != nullptr) + btn_jsn["text"] = tr(m_lastCommand.btn_text, "CUpdateManager"); if (!m_lastCommand.btn_action.isEmpty()) btn_jsn["action"] = m_lastCommand.btn_action; if (!m_lastCommand.btn_lock.isEmpty()) @@ -528,13 +574,13 @@ void CUpdateManager::refreshStartPage(const Command &cmd) m_lastCommand.icon = cmd.icon; jsn["icon"] = cmd.icon; } - if (!cmd.text.isEmpty()) { + if (cmd.text.text != nullptr) { m_lastCommand.text = cmd.text; - jsn["text"] = cmd.text; + jsn["text"] = tr(cmd.text.text, "CUpdateManager").arg(cmd.text.arg1, cmd.text.arg2); } - if (!cmd.btn_text.isEmpty()) { + if (cmd.btn_text != nullptr) { m_lastCommand.btn_text = cmd.btn_text; - btn_jsn["text"] = cmd.btn_text; + btn_jsn["text"] = tr(cmd.btn_text, "CUpdateManager"); } if (!cmd.btn_action.isEmpty()) { m_lastCommand.btn_action = cmd.btn_action; @@ -567,8 +613,7 @@ QString CUpdateManager::getVersion() const void CUpdateManager::onLoadUpdateFinished(const QString &filePath) { if (getFileHash(filePath) != m_packageData->hash) { - refreshStartPage({"error", tr("Update package error: md5 sum does not match the original."), - tr("Check for updates"), "check", "false"}); + refreshStartPage({"error", {TXT_ERR_MD5}, BTN_TXT_CHECK, "check", "false"}); __UNLOCK // m_dialogSchedule->addToSchedule("criticalMsg", "Update package error: md5 sum does not match the original."); return; @@ -579,7 +624,7 @@ void CUpdateManager::onLoadUpdateFinished(const QString &filePath) __UNLOCK unzipIfNeeded(); } else { - refreshStartPage({"success", tr("To finish updating, restart app"), tr("Restart"), "install", "false"}); + refreshStartPage({"success", {TXT_RESTART_TO_UPD}, BTN_TXT_RESTART, "install", "false"}); m_dialogSchedule->addToSchedule("showStartInstallMessage"); } } @@ -588,9 +633,9 @@ void CUpdateManager::unzipIfNeeded() { __GLOBAL_LOCK - refreshStartPage({"load", tr("Preparing update..."), tr("Cancel"), "abort", "true"}); + refreshStartPage({"load", {TXT_PREPARING_UPD}, BTN_TXT_CANCEL, "abort", "true"}); if (!m_socket->sendMessage(MSG_UnzipIfNeeded, QStrToTStr(m_packageData->fileName), QStrToTStr(m_packageData->version))) { - refreshStartPage({"error", tr("An error occurred while unzip updates: Update Service not found!"), tr("Check for updates"), "check", "false"}); + refreshStartPage({"error", {TXT_ERR_UNZIP}, BTN_TXT_CHECK, "check", "false"}); __UNLOCK // m_dialogSchedule->addToSchedule("criticalMsg", QObject::tr("An error occurred while unzip updates: Update Service not found!")); } @@ -644,8 +689,7 @@ void CUpdateManager::setNewUpdateSetting(const QString& _rate) void CUpdateManager::cancelLoading() { - refreshStartPage({"lastcheck", tr("Last check performed ") + formattedTime(m_lastCheck), - tr("Check for updates"), "check", "false"}); + refreshStartPage({"lastcheck", {TXT_LAST_CHECK, formattedTime(m_lastCheck)}, BTN_TXT_CHECK, "check", "false"}); m_socket->sendMessage(MSG_StopDownload); __UNLOCK } @@ -724,7 +768,7 @@ void CUpdateManager::onLoadCheckFinished(const QString &filePath) onCheckFinished(false, false, "", ""); } } else { - onCheckFinished(true, false, "", "Error opening JSON file."); + onCheckFinished(true, false, "", ""); } } @@ -743,19 +787,18 @@ void CUpdateManager::onCheckFinished(bool error, bool updateExist, const QString __UNLOCK loadUpdates(); } else { - refreshStartPage({"lastcheck", tr("Update is available (version %1)").arg(version), - tr("Download update"), "download", "false"}); + refreshStartPage({"lastcheck", {TXT_AVAILABLE_UPD, version}, BTN_TXT_DOWNLOAD, "download", "false"}); m_dialogSchedule->addToSchedule("showUpdateMessage"); } break; } } else { - refreshStartPage({"success", tr("Current version is up to date"), tr("Check for updates"), "check", "false"}); + refreshStartPage({"success", {TXT_UPDATED}, BTN_TXT_CHECK, "check", "false"}); m_pLastCheckMsgTimer->start(); __UNLOCK; } } else { - refreshStartPage({"error", changelog, tr("Check for updates"), "check", "false"}); + refreshStartPage({"error", {TXT_ERR_JSON}, BTN_TXT_CHECK, "check", "false"}); __UNLOCK // m_dialogSchedule->addToSchedule("criticalMsg", changelog); } @@ -774,7 +817,7 @@ void CUpdateManager::showUpdateMessage(QWidget *parent) { break; case WinDlg::DLG_RESULT_SKIP: { skipVersion(); - refreshStartPage({"success", tr("Current version is up to date"), tr("Check for updates"), "check", "false"}); + refreshStartPage({"success", {TXT_UPDATED}, BTN_TXT_CHECK, "check", "false"}); m_pLastCheckMsgTimer->start(); break; } diff --git a/win-linux/src/cupdatemanager.h b/win-linux/src/cupdatemanager.h index 574977db4..345e32d46 100644 --- a/win-linux/src/cupdatemanager.h +++ b/win-linux/src/cupdatemanager.h @@ -56,12 +56,25 @@ enum UpdateMode { DISABLE=0, SILENT=1, ASK=2 }; +struct ComplexText { + ComplexText(const char *_text = nullptr, const QString &_arg1 = "", const QString &_arg2 = "") : + text(_text), arg1(_arg1), arg2(_arg2) {} + const char *text = nullptr; + QString arg1, arg2; +}; + struct Command { + Command(const QString &_icon = "", const ComplexText &_text = ComplexText(), const char *_btn_text = nullptr, + const QString &_btn_action = "", const QString &_btn_lock = "") : + icon(_icon), text(_text), btn_text(_btn_text), btn_action(_btn_action), btn_lock(_btn_lock) {} bool isEmpty() const { - return (icon.isEmpty() && text.isEmpty() && btn_text.isEmpty() && + return (icon.isEmpty() && text.text == nullptr && btn_text == nullptr && btn_action.isEmpty() && btn_lock.isEmpty()); } - QString icon, text, btn_text, btn_action, btn_lock; + QString icon; + ComplexText text; + const char *btn_text = nullptr; + QString btn_action, btn_lock; }; class CUpdateManager: public QObject diff --git a/win-linux/src/platform_win/printdialog.cpp b/win-linux/src/platform_win/printdialog.cpp index 93bd231a0..31068f830 100644 --- a/win-linux/src/platform_win/printdialog.cpp +++ b/win-linux/src/platform_win/printdialog.cpp @@ -149,6 +149,7 @@ PrintDialog::PrintDialog(QPrinter *printer, QWidget *parent) : if (m_printer->collateCopies()) m_options |= PrintOption::PrintCollateCopies; m_page_ranges.append(PageRanges(m_printer->fromPage(), m_printer->toPage())); + m_pages_count = m_printer->toPage(); } PrintDialog::~PrintDialog() @@ -286,8 +287,8 @@ QDialog::DialogCode PrintDialog::exec() // DuplexLongSide = 2 // DuplexShortSide = 3 if (pDevMode->dmFields & DM_DUPLEX) { - pDevMode->dmDuplex = (qt_duplex == QPrinter::DuplexLongSide) ? DMDUP_HORIZONTAL : - (qt_duplex == QPrinter::DuplexShortSide) ? DMDUP_VERTICAL : DMDUP_SIMPLEX; + pDevMode->dmDuplex = (qt_duplex == QPrinter::DuplexLongSide) ? DMDUP_VERTICAL : + (qt_duplex == QPrinter::DuplexShortSide) ? DMDUP_HORIZONTAL : DMDUP_SIMPLEX; } if (pDevMode->dmFields & DM_PAPERSIZE) @@ -345,8 +346,8 @@ QDialog::DialogCode PrintDialog::exec() dlg.nMaxPageRanges = MAXPAGERANGES; dlg.nPageRanges = 1; dlg.lpPageRanges = page_ranges; - dlg.nMinPage = (DWORD)m_printer->fromPage(); - dlg.nMaxPage = (DWORD)m_printer->toPage(); + dlg.nMinPage = 1; + dlg.nMaxPage = (DWORD)m_pages_count; PrintDialogCallback clb(&dialog_was_changed); dlg.lpCallback = static_cast(&clb); @@ -376,8 +377,8 @@ QDialog::DialogCode PrintDialog::exec() m_printer->setFromTo(start > end ? end : start, start > end ? start : end); } m_printer->setCollateCopies(bool(dlg.Flags & PD_COLLATE)); - m_printer->setDuplex(pDevmode->dmDuplex == DMDUP_HORIZONTAL ? QPrinter::DuplexLongSide : - pDevmode->dmDuplex == DMDUP_VERTICAL ? QPrinter::DuplexShortSide : QPrinter::DuplexNone); + m_printer->setDuplex(pDevmode->dmDuplex == DMDUP_VERTICAL ? QPrinter::DuplexLongSide : + pDevmode->dmDuplex == DMDUP_HORIZONTAL ? QPrinter::DuplexShortSide : QPrinter::DuplexNone); m_printer->setCopyCount(pDevmode->dmCopies); // auto path = QUrl::fromPercentEncoding(QByteArray(output_uri)).replace("file://", ""); diff --git a/win-linux/src/platform_win/printdialog.h b/win-linux/src/platform_win/printdialog.h index 64633b59c..3c45d1a39 100644 --- a/win-linux/src/platform_win/printdialog.h +++ b/win-linux/src/platform_win/printdialog.h @@ -70,6 +70,7 @@ private: PrintOptions m_options; PrintRange m_print_range; QVector m_page_ranges; + int m_pages_count; }; #endif // PRINTDIALOG_H diff --git a/win-linux/src/windows/ceditorwindow.cpp b/win-linux/src/windows/ceditorwindow.cpp index 402d64d59..b8d74ab2c 100644 --- a/win-linux/src/windows/ceditorwindow.cpp +++ b/win-linux/src/windows/ceditorwindow.cpp @@ -76,10 +76,8 @@ CEditorWindow::CEditorWindow(const QRect& rect, CTabPanel* panel) AscAppManager::bindReceiver(panel->cef()->GetId(), d_ptr.get()); AscAppManager::sendCommandTo(panel->cef(), L"editor:config", L"request"); - QFileInfo i{QString::fromStdWString(panel->data()->url())}; - if ( i.suffix() == "oform" || panel->data()->hasFeature(L"uitype\":\"fillform") ) { + if (d_ptr->fillformMode()) d_ptr->ffWindowCustomize(); - } QTimer::singleShot(200, this, [=]() { if (d_ptr->canExtendTitle()) diff --git a/win-linux/src/windows/ceditorwindow_p.h b/win-linux/src/windows/ceditorwindow_p.h index fab96ced5..be8e1473d 100644 --- a/win-linux/src/windows/ceditorwindow_p.h +++ b/win-linux/src/windows/ceditorwindow_p.h @@ -65,6 +65,7 @@ #define TOP_PANEL_OFFSET 6*TOOLBTN_WIDTH #define ICON_SPACER_WIDTH 9 +#define ICON_SIZE QSize(20,20) using namespace NSEditorApi; @@ -121,7 +122,7 @@ public: void init(CTabPanel * const p) override { CCefEventsGate::init(p); - if (!m_panel->data()->hasFeature(L"btnhome") || viewerMode()) { // For old editors only + if (!m_panel->data()->hasFeature(L"btnhome") || viewerMode() || fillformMode()) { // For old editors only usedOldEditorVersion = true; leftboxbuttons = new QWidget; leftboxbuttons->setLayout(new QHBoxLayout); @@ -181,7 +182,7 @@ public: auto extendableTitleToSimple() -> void { Q_ASSERT(window->m_boxTitleBtns != nullptr); QGridLayout * const _layout = static_cast(window->m_pMainPanel->layout()); - if ( !_layout->findChild(window->m_boxTitleBtns->objectName()) ) { + if ( !_layout->itemAtPosition(0,0) && !_layout->findChild(window->m_boxTitleBtns->objectName()) ) { _layout->addWidget(window->m_boxTitleBtns,0,0,Qt::AlignTop); if (iconuser) iconuser->hide(); @@ -205,7 +206,7 @@ public: auto centerTitle(double dpiRatio)->void { - int left_btns = viewerMode() ? 1 : 6; + int left_btns = (viewerMode() || fillformMode()) ? 1 : 6; int right_btns = 3; int spacing = window->m_boxTitleBtns->layout()->spacing(); int left_offset = left_btns*TOOLBTN_WIDTH + 3*spacing; // added extra spacing @@ -213,7 +214,7 @@ public: int diffW = (left_offset - right_offset)*dpiRatio; if (iconuser) { diffW -= ICON_SPACER_WIDTH + spacing*dpiRatio; - if (!viewerMode()) { + if (!viewerMode() && !fillformMode()) { diffW -= iconuser->width() + spacing*dpiRatio; } } @@ -232,7 +233,7 @@ public: if( jerror.error == QJsonParseError::NoError ) { QJsonObject objRoot = jdoc.object(); - if ( viewerMode() ) + if ( viewerMode() && !fillformMode()) extendableTitleToSimple(); if ( canExtendTitle() ) { @@ -315,7 +316,7 @@ public: panel()->data()->setFeatures(L"old version of editor"); extendableTitleToSimple(); } - if (m_panel->data()->hasFeature(L"btnhome") && usedOldEditorVersion && !viewerMode()) { // For old editors only + if (m_panel->data()->hasFeature(L"btnhome") && usedOldEditorVersion && !viewerMode() && !fillformMode()) { // For old editors only usedOldEditorVersion = false; adjustToNewEditorVersion(); } @@ -612,6 +613,7 @@ public: if ( iconcrypted ) { iconcrypted->setPixmap(QIcon{":/title/icons/secure.svg"}.pixmap(QSize(20,20) * f)); + iconcrypted->setFixedSize(ICON_SIZE * f); } for (const auto& btn: m_mapTitleButtons) { @@ -737,12 +739,22 @@ public: QLabel * iconCrypted() { - Q_ASSERT(window->m_boxTitleBtns != nullptr); + Q_ASSERT(window->m_labelTitle != nullptr); if ( !iconcrypted ) { - iconcrypted = new QLabel(window->m_boxTitleBtns); + iconcrypted = new QLabel(window->m_labelTitle); iconcrypted->setObjectName("iconcrypted"); iconcrypted->setPixmap(QIcon{":/title/icons/secure.svg"}.pixmap(QSize(20,20) * window->m_dpiRatio)); + iconcrypted->setFixedSize(ICON_SIZE * window->m_dpiRatio); + int y = (window->m_labelTitle->height() - ICON_SIZE.height() * window->m_dpiRatio)/2; + iconcrypted->move(0, y); + connect(window->m_labelTitle, &CElipsisLabel::onResize, this, [=](QSize size, int textWidth) { + if (iconcrypted) { + int x = (size.width() - textWidth)/2 - ((ICON_SIZE.width() + 6) * window->m_dpiRatio); + int y = (size.height() - ICON_SIZE.height() * window->m_dpiRatio)/2; + iconcrypted->move(x, y); + } + }); } return iconcrypted; @@ -750,17 +762,19 @@ public: void onWebAppsFeatures(int, std::wstring f) override { + bool is_read_only = panel()->data()->hasFeature(L"readonly\":"); panel()->data()->setFeatures(f); if ( m_panel->data()->hasFeature(L"uitype\":\"fillform") ) { ffWindowCustomize(); + centerTitle(window->m_dpiRatio); } if ( panel()->data()->hasFeature(L"crypted\":true") && boxtitlelabel && !iconcrypted ) { - qobject_cast(boxtitlelabel->layout())->insertWidget(0, iconCrypted()); + iconCrypted(); } - if ( panel()->data()->hasFeature(L"readonly\":") && boxtitlelabel ) { + if ( is_read_only != panel()->data()->hasFeature(L"readonly\":") && boxtitlelabel ) { window->setWindowTitle(m_panel->data()->title()); window->m_boxTitleBtns->repaint(); } @@ -827,6 +841,11 @@ public: return m_panel->data()->hasFeature(L"viewmode\":true"); } + auto fillformMode() -> bool { + QFileInfo i{QString::fromStdWString(m_panel->data()->url())}; + return i.suffix() == "oform" || m_panel->data()->hasFeature(L"uitype\":\"fillform"); + } + auto calcTitleLabelWidth(int basewidth) const -> int { if ( iconuser ) basewidth -= iconuser->width(); @@ -855,12 +874,10 @@ public: boxtitlelabel->layout()->setSpacing(0); boxtitlelabel->layout()->setMargin(0); boxtitlelabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); - - if ( m_panel->data()->hasFeature(L"crypted\":true") && !iconcrypted ) { - boxtitlelabel->layout()->addWidget(iconCrypted()); - } - boxtitlelabel->layout()->addWidget(window->m_labelTitle); + if ( m_panel->data()->hasFeature(L"crypted\":true") && !iconcrypted ) { + iconCrypted(); + } if (usedOldEditorVersion) { // For old editors only _layout->insertWidget(1, boxtitlelabel); @@ -874,8 +891,17 @@ public: auto ffWindowCustomize() -> void { Q_ASSERT(window->m_boxTitleBtns != nullptr); QGridLayout * const _layout = static_cast(window->m_pMainPanel->layout()); - if ( !_layout->findChild(window->m_boxTitleBtns->objectName()) ) { + if ( !_layout->itemAtPosition(0,0) && !_layout->findChild(window->m_boxTitleBtns->objectName()) ) { _layout->addWidget(window->m_boxTitleBtns,0,0,Qt::AlignTop); + if (iconuser) + iconuser->hide(); + auto layout = qobject_cast(window->m_boxTitleBtns->layout()); + auto stretch = layout->takeAt(1); + if (stretch) + delete stretch; + stretch = layout->takeAt(2); + if (stretch) + delete stretch; } } }; diff --git a/win-linux/src/windows/cmainwindow.cpp b/win-linux/src/windows/cmainwindow.cpp index 5ad1b3033..1fd586ed2 100644 --- a/win-linux/src/windows/cmainwindow.cpp +++ b/win-linux/src/windows/cmainwindow.cpp @@ -248,9 +248,9 @@ void CMainWindow::close() onFullScreen(-1, false); #ifdef _WIN32 - if (isSessionInProgress() && m_pTabs->count() > 1) { + if (isSessionInProgress() && m_pTabs->count(cvwtEditor) > 1) { #else - if (m_pTabs->count() > 1) { + if (m_pTabs->count(cvwtEditor) > 1) { #endif GET_REGISTRY_USER(reg_user); if (!reg_user.value("ignoreMsgAboutOpenTabs", false).toBool()) { @@ -314,7 +314,7 @@ void CMainWindow::dragEnterEvent(QDragEnterEvent *event) return; QSet _exts; - _exts << "docx" << "doc" << "odt" << "rtf" << "txt" << "doct" << "dotx" << "ott"; + _exts << "docx" << "doc" << "odt" << "rtf" << "txt" << "doct" << "dotx" << "ott" << "docxf" << "oform"; _exts << "html" << "mht" << "epub"; _exts << "pptx" << "ppt" << "odp" << "ppsx" << "pptt" << "potx" << "otp"; _exts << "xlsx" << "xls" << "ods" << "csv" << "xlst" << "xltx" << "ots"; @@ -1206,8 +1206,9 @@ void CMainWindow::onFullScreen(int id, bool apply) m_isMaximized = windowState().testFlag(Qt::WindowMaximized); m_pTabs->setFullScreen(apply, id); QTimer::singleShot(0, this, [=] { - CAscMenuEvent * pEvent = new CAscMenuEvent(ASC_MENU_EVENT_TYPE_CEF_ONFULLSCREENENTER); - AscAppManager::getInstance().GetViewById(id)->Apply(pEvent); + CCefView* pView = AscAppManager::getInstance().GetViewById(id); + if (pView) + pView->Apply(new CAscMenuEvent(ASC_MENU_EVENT_TYPE_CEF_ONFULLSCREENENTER)); }); } } else