From 37f9c4e0f5d9612f97bbf5036bce27254d7b4291 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Mon, 3 Oct 2016 18:20:53 +0300 Subject: [PATCH] [win-nix] fixed bugs 33170, 33171, 33173 --- common/loginpage/deploy/index.html | 2 +- common/loginpage/src/locale.js | 2 +- win-linux/langs/en.qm | Bin 3158 -> 3161 bytes win-linux/langs/en.ts | 3 +-- win-linux/langs/es.qm | Bin 4386 -> 4389 bytes win-linux/langs/es.ts | 3 +-- win-linux/langs/fr.qm | Bin 4424 -> 4427 bytes win-linux/langs/fr.ts | 3 +-- win-linux/langs/ru.qm | Bin 4177 -> 4180 bytes win-linux/langs/ru.ts | 3 +-- win-linux/package/windows/associate_page.iss | 10 +++++----- win-linux/package/windows/common.iss | 8 ++++---- win-linux/src/cmainpanel.cpp | 2 +- win-linux/src/version.h | 4 ++-- win-linux/src/win/cwinwindow.cpp | 1 + 15 files changed, 19 insertions(+), 22 deletions(-) diff --git a/common/loginpage/deploy/index.html b/common/loginpage/deploy/index.html index 6a74a2ab2..227ff326d 100644 --- a/common/loginpage/deploy/index.html +++ b/common/loginpage/deploy/index.html @@ -158,5 +158,5 @@ .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) }(jQuery); - \ No newline at end of file diff --git a/common/loginpage/src/locale.js b/common/loginpage/src/locale.js index 1fbadcf63..e4349bd16 100644 --- a/common/loginpage/src/locale.js +++ b/common/loginpage/src/locale.js @@ -175,7 +175,7 @@ var de = { licGetLicense: 'Erwerben Sie jetzt eine Lizenz', licPanelTitle: 'Geben Sie den Produktschlüssel ein', licPanelDescr: 'Ihr Produktschlüssel wurde an die E-Mail-Adresse zugeschickt, die Sie beim Kauf angegeben haben.' - ,adsText1: 'Bearbeitung in Echtzeit und Dokumentkontrolle (Kommentarfunktion)' + ,adsText1: 'Bearbeitung in Echtzeit und Dokumentkontrolle (Kommentarfunktion)' ,adsText2: 'Nutzung von Überarbeitungen und Versionen, um geringere Veränderungen im Dokument zu verfolgen' ,adsText3: 'Zugriff auf die Dokumente jederzeit und überall auf jedem beliebigen Gerät' }; diff --git a/win-linux/langs/en.qm b/win-linux/langs/en.qm index 0fb37e99edad112e5b98fe85e106a84daff3bb96..9843c3e3eff49e67e301a25a2ac264900c56f787 100644 GIT binary patch delta 178 zcmca6aZ_S~jNwiO25oBw2Cj_^4Dp8<7&t>2Sk|#JFtDFxT>1SwkiU@e5eHBWLk2U$ z?ioPw`4fHR1*=%K=dNU6VBF2>%)5huf#cT1S_ux;ySMTg7}zFEoNCS(F!8Lopa<6s z&pALN%DFZR#sRHpp7>W>kcU_G#%=}%rWQWtB4wa?A113ZhO_<61j=97+{7rrE~2k$ bsE}E#kei>9nU1SwkUx*{5ywsj28Ik~ zhTSuO;&UeY$_tjWYR_HCz`(eh)tPq(0|UqPiM0|F=b9V(a`u#5W?*0q;M}_RCIbU= z50{{r98lhsYli0>pkXCkn+4;5mNjs5#@=UOV4E=Uuecy5uj-B63=B*ye9T44KpWmp qR%Hxl`;`e)cXo3VqX4_0j;f(TX0bwUeoAIqW@?Ha*XCs$o0$QVxHMJ( diff --git a/win-linux/langs/en.ts b/win-linux/langs/en.ts index 139bdabf4..30f6ea670 100644 --- a/win-linux/langs/en.ts +++ b/win-linux/langs/en.ts @@ -167,8 +167,7 @@ - %1 is modified. -Do you want to keep changes? + %1 is modified.<br>Do you want to keep changes? %1 has been modified.<br>Do you want to save the changes? diff --git a/win-linux/langs/es.qm b/win-linux/langs/es.qm index 19974bf9682d1e921393572db5186bbc0cd3624c..89f46e559c013254c3343ee12e5322ccb53fdf44 100644 GIT binary patch delta 178 zcmZ3av{Y$=jNwlP25oBw2L5~ohWNt_47|q~Sk|#JFmQimT>1Sw0|TEX<0Fop3=9la z%nZ9{0L7P2^pzJZV%46zl7WHgIIA=74xlEviM0|Otaon#4dE)8IMtldVB%SE!78p9 zo^yb*Z@D%L#sRHRo%mN=u#8vr#%=}%=6ih1Mam2eJZh6w8N=B+GlBARHa9VT;1bbS cHB`tfR>;jy$xO>kP0_PSDze+$%rl<_0Q=}N2><{9 delta 193 zcmZ3gv`A@!jNvy125oBw2L2odhWNt_47^7eSk|#JFmQijT>1Sw0|TEL<0Fop3=9la z%nZ9{0L7O~^pzLPXVsp&l7WHgIIA=74xlFKiM0|F=b9Vpa`u#5W?4-3$!O_xPBLl!1zs rC#y1sv$bUc)y>@8#Q1?rP)F5JA+uN^H$NpaEi*Mmk85)q&wLgDM`tsy diff --git a/win-linux/langs/es.ts b/win-linux/langs/es.ts index e74da61f0..9545594c7 100644 --- a/win-linux/langs/es.ts +++ b/win-linux/langs/es.ts @@ -167,8 +167,7 @@ - %1 is modified. -Do you want to keep changes? + %1 is modified.<br>Do you want to keep changes? % 1 ha sido modificado.<br>¿Quiere guardar los cambios? diff --git a/win-linux/langs/fr.qm b/win-linux/langs/fr.qm index 5de3b9555b413b52913181d740619b942c475660..618245055bdbd0b8cf491a117ed7f7706185727e 100644 GIT binary patch delta 178 zcmX@1bXsYGjNx|%25oBw2L8DW4Dp8<73VC;k-|EZ|kWv73Q``34_zkun1VkJ4mS#&EW!nLznNo0}M4af#@w c8Y*NKE9B;G7@0E#b~=qoRn&#FClB?AM~K~`tp9Y9Ue6Kf?V&NVkw=j2fq^Sw;$LyWTwc{1yBQdmZ}2e}DFYSD rPgZ3NXIqpBRJVU~6XPo`K^;{?h0J1w-29Zxw9M2LJ+93SJf~RziE%Vb diff --git a/win-linux/langs/fr.ts b/win-linux/langs/fr.ts index 1b50816da..9bba248e5 100644 --- a/win-linux/langs/fr.ts +++ b/win-linux/langs/fr.ts @@ -171,8 +171,7 @@ - %1 is modified. -Do you want to keep changes? + %1 is modified.<br>Do you want to keep changes? %1 a été modifié.<br>Voulez-vous enregistrer les changements ? diff --git a/win-linux/langs/ru.qm b/win-linux/langs/ru.qm index 6c4cf97a105b7e5fcbec391f985bbd7fa9cea968..429d134d706907f8a3fcd896e758f62d081dd763 100644 GIT binary patch delta 178 zcmcbpa7AH)jG-q3gSIsT1K(^0hWNt_47|b&EbCYq7`Ou&SAPEv=BLL{I!HE_jSr^~P=n2Ie_@%tgvT^J*rmGKRCA&jiXJ*xbYz#wDV! cYN(J|tdN_Zl9`s7nxbcuRAjgLC3gl30C9~mt^fc4 delta 193 zcmcbja8Y4`jG-F?gSIsT1K$h=hWNt_47>siEbCYq7`XiySAPEv(pkZcQn+4;5mPK%L#@=UO;Jh>Oueji0Uez1B85o%7@G%!D0~J?J qR%HxlJCg}iw|8?BV;Gm9j;f(TX0bwUeoAIqW@?Ha*XB3e87u(0cr%0m diff --git a/win-linux/langs/ru.ts b/win-linux/langs/ru.ts index 427e0e2d4..f53963d67 100644 --- a/win-linux/langs/ru.ts +++ b/win-linux/langs/ru.ts @@ -168,8 +168,7 @@ - %1 is modified. -Do you want to keep changes? + %1 is modified.<br>Do you want to keep changes? Файл %1 был изменен.<br>Вы хотите сохранить изменения? diff --git a/win-linux/package/windows/associate_page.iss b/win-linux/package/windows/associate_page.iss index bdca448d7..d9249f9ca 100644 --- a/win-linux/package/windows/associate_page.iss +++ b/win-linux/package/windows/associate_page.iss @@ -9,9 +9,9 @@ ChangesAssociations=true en.AssociateDescription =Associate office document file types with {#ASSC_APP_NAME} ru.AssociateDescription =Ассоциировать типы файлов офисных документов с {#ASSC_APP_NAME} -de.AssociateDescription =Video- und Audiodateitypen mit AVS Media Player {#ASSC_APP_NAME} -fr.AssociateDescription =Associer des types de fichiers vidйo et audio а {#ASSC_APP_NAME} -es.AssociateDescription =Asociar tipos de archivos de vнdeo y audio con {#ASSC_APP_NAME} +de.AssociateDescription =Verknüpfung von Office-Dokumenten mit {#ASSC_APP_NAME} +fr.AssociateDescription =Associer les fichiers office avec {#ASSC_APP_NAME} +es.AssociateDescription =Asociar tipos de archivos de documentos de oficina con {#ASSC_APP_NAME} ;it.AssociateDescription =Associare i tipi di file video/audio ad {#ASSC_APP_NAME} en.AssociateCaption =File Associations @@ -37,8 +37,8 @@ es.AssociateAll =Asociar todo en.AssociateSel =Associate selected ru.AssociateSel =Ассоциировать выбранные -de.AssociateSel =Ausgewдhlte assoziieren -fr.AssociateSel =Associer sйlectionnйs +de.AssociateSel =Ausgewählte assoziieren +fr.AssociateSel =Associer sélectionnés es.AssociateSel =Asociar seleccionado ;it.AssociateSel =Associare selezione diff --git a/win-linux/package/windows/common.iss b/win-linux/package/windows/common.iss index 77f8c455f..8b806ed5b 100644 --- a/win-linux/package/windows/common.iss +++ b/win-linux/package/windows/common.iss @@ -67,21 +67,21 @@ es.Launch =Ejecutar %1 en.CreateDesktopIcon =Create %1 &desktop icon ru.CreateDesktopIcon =Создать иконку %1 на &рабочем столе de.CreateDesktopIcon =%1 &Desktop-Icon erstellen -fr.CreateDesktopIcon =Crйer l'icфne du bureau pour %1 +fr.CreateDesktopIcon =Créer l'icône du bureau pour %1 es.CreateDesktopIcon =Crear %1 &icono en el escritorio ;it.CreateDesktopIcon =Creare un collegamento %1 sul &desktop ;====================================================================================================== en.InstallAdditionalComponents =Installing additional system components. Please wait... ru.InstallAdditionalComponents =Установка дополнительных системных компонентов. Пожалуйста, подождите... -de.InstallAdditionalComponents =Installation zusдtzlicher Systemkomponenten. Bitte warten... -fr.InstallAdditionalComponents =L'installation des composants supplйmentaires du systиme. Attendez... +de.InstallAdditionalComponents =Installation zusätzlicher Systemkomponenten. Bitte warten... +fr.InstallAdditionalComponents =L'installation des composants supplémentaires du système. Attendez... es.InstallAdditionalComponents =Instalando componentes adicionales del sistema. Por favor espere... ;it.InstallAdditionalComponents =Installazione dei componenti addizionali del sistema. Per favore, attendi... ;====================================================================================================== en.AdditionalTasks =Tasks: ru.AdditionalTasks =Задачи: de.AdditionalTasks =Aufgaben: -fr.AdditionalTasks =Tвches: +fr.AdditionalTasks =Tâches: es.AdditionalTasks =Tareas: ;it.AdditionalTasks =Compiti: ;====================================================================================================== diff --git a/win-linux/src/cmainpanel.cpp b/win-linux/src/cmainpanel.cpp index 1ab46dde8..77b1e2d6e 100644 --- a/win-linux/src/cmainpanel.cpp +++ b/win-linux/src/cmainpanel.cpp @@ -266,7 +266,7 @@ CMainPanel::CMainPanel(QWidget *parent, CAscApplicationManager *manager, bool is wparams.replace(wparams.find(L"%4"), 2, last_name); m_pManager->InitAdditionalEditorParams(wparams); - m_saveDocMessage = tr("%1 is modified.\nDo you want to keep changes?"); + m_saveDocMessage = tr("%1 is modified.
Do you want to keep changes?"); } void CMainPanel::RecalculatePlaces() diff --git a/win-linux/src/version.h b/win-linux/src/version.h index 7b7fdb045..5d4f94af0 100644 --- a/win-linux/src/version.h +++ b/win-linux/src/version.h @@ -33,8 +33,8 @@ #ifndef VERSION_H #define VERSION_H -#define VER_FILEVERSION 4,1,1,256 -#define VER_FILEVERSION_STR "4.1.1.256\0" +#define VER_FILEVERSION 4,1,1,258 +#define VER_FILEVERSION_STR "4.1.1.258\0" #define VER_PRODUCTVERSION VER_FILEVERSION #define VER_PRODUCTVERSION_STR "4.1\0" diff --git a/win-linux/src/win/cwinwindow.cpp b/win-linux/src/win/cwinwindow.cpp index 697970b47..0abef7d53 100644 --- a/win-linux/src/win/cwinwindow.cpp +++ b/win-linux/src/win/cwinwindow.cpp @@ -99,6 +99,7 @@ void CWinWindow::modal() } EnableWindow(m_hParent, TRUE); + SetActiveWindow(m_hParent); } void CWinWindow::setSize(int w, int h)