diff --git a/win-linux/langs/de.ts b/win-linux/langs/de.ts index 4919593e5..7a65dea9b 100644 --- a/win-linux/langs/de.ts +++ b/win-linux/langs/de.ts @@ -22,6 +22,7 @@ + All files (*.*) Alle Dateien (*.*) @@ -147,15 +148,18 @@ %1 Datei (*.%2) - - + Open Document Dokument öffnen - + + Jpeg (*.jpeg *.jpg);;Png (*.png);;Gif (*.gif);;Bmp (*.bmp);; + + + Png (*.png);;Gif (*.gif);;Bmp (*.bmp);; - Png (*.png);;Gif (*.gif);;Bmp (*.bmp);; + Png (*.png);;Gif (*.gif);;Bmp (*.bmp);; @@ -166,50 +170,63 @@ DATEI - - + + %1 is modified. +Do you want to keep changes? + + + + + Yes + Ja + + + + No + Nein + + + + Cancel + Abbrechen + + + + File format not supported. Dateiformat wird nicht unterstützt. - + File doesn't exists Datei existiert nicht - + Document%1.docx Dokument%1.docx - + Book%1.xlsx Buch%1.xlsx - + Presentation%1.pptx Präsentation%1.pptx - + Open Source Edition - + - + Print Document Dokument drucken - - CMessage - - - &OK - &OK - - CPrintProgress @@ -234,26 +251,11 @@ - CSaveFileMessage + QObject - - Do you want to save modified files? - Wollen Sie die geänderten Daten speichern? - - - - &Yes - Ja - - - - &No - Nein - - - - &Cancel - Abbrechen + + &OK + &OK diff --git a/win-linux/langs/en.ts b/win-linux/langs/en.ts index ff996b65a..06a473318 100644 --- a/win-linux/langs/en.ts +++ b/win-linux/langs/en.ts @@ -22,6 +22,7 @@ + All files (*.*) @@ -147,14 +148,13 @@ - - + Open Document - - Png (*.png);;Gif (*.gif);;Bmp (*.bmp);; + + Jpeg (*.jpeg *.jpg);;Png (*.png);;Gif (*.gif);;Bmp (*.bmp);; @@ -166,50 +166,63 @@ - - + + %1 is modified. +Do you want to keep changes? + + + + + Yes + + + + + No + + + + + Cancel + + + + + File format not supported. File format is not supported - + File doesn't exists File does not exist - + Document%1.docx - + Book%1.xlsx - + Presentation%1.pptx - + Open Source Edition - + Print Document Print document - - CMessage - - - &OK - - - CPrintProgress @@ -234,25 +247,10 @@ - CSaveFileMessage + QObject - - Do you want to save modified files? - - - - - &Yes - - - - - &No - - - - - &Cancel + + &OK diff --git a/win-linux/langs/fr.ts b/win-linux/langs/fr.ts index 21f355996..b9dbc3d38 100644 --- a/win-linux/langs/fr.ts +++ b/win-linux/langs/fr.ts @@ -22,6 +22,7 @@ + All files (*.*) Tous les fichiers (*.*) @@ -147,15 +148,18 @@ %1 Fichier (*.%2) - - + Open Document Document ouvert - + + Jpeg (*.jpeg *.jpg);;Png (*.png);;Gif (*.gif);;Bmp (*.bmp);; + + + Png (*.png);;Gif (*.gif);;Bmp (*.bmp);; - Png (*.png);;Gif (*.gif);;Bmp (*.bmp);; + Png (*.png);;Gif (*.gif);;Bmp (*.bmp);; @@ -166,50 +170,63 @@ FICHIER - - + + %1 is modified. +Do you want to keep changes? + + + + + Yes + Oui + + + + No + Non + + + + Cancel + Annuler + + + + File format not supported. Format de fichier non pris en charge. - + File doesn't exists Fichier n'existe - + Document%1.docx Document%1.docx - + Book%1.xlsx Workbook%1.xlsx - + Presentation%1.pptx Diaporama%1.pptx - + Open Source Edition - + - + Print Document Imprimer document - - CMessage - - - &OK - &OK - - CPrintProgress @@ -234,26 +251,11 @@ - CSaveFileMessage + QObject - - Do you want to save modified files? - Voulez-vous sauvegarder les fichiers modifiés? - - - - &Yes - Oui - - - - &No - Non - - - - &Cancel - Annuler + + &OK + &OK diff --git a/win-linux/langs/ru.ts b/win-linux/langs/ru.ts index 09a795bca..4b8a9b2a8 100644 --- a/win-linux/langs/ru.ts +++ b/win-linux/langs/ru.ts @@ -23,6 +23,7 @@ + All files (*.*) Все файлы (*.*) @@ -148,16 +149,14 @@ %1 Файл (*.%2) - - + Open Document Открыть документ - - Png (*.png);;Gif (*.gif);;Bmp (*.bmp);; - фильтр для картинок - Png (*.png);;Gif (*.gif);;Bmp (*.bmp);; + + Jpeg (*.jpeg *.jpg);;Png (*.png);;Gif (*.gif);;Bmp (*.bmp);; + @@ -168,51 +167,64 @@ ФАЙЛ - - + + %1 is modified. +Do you want to keep changes? + + + + + Yes + Да + + + + No + Нет + + + + Cancel + Стоп + + + + File format not supported. Формат файла не поддерживается. - + File doesn't exists Файл не существует - + Document%1.docx дефолтное название документа при создании. %1 заменяется числом Документ%1.docx - + Book%1.xlsx Книга%1.xlsx - + Presentation%1.pptx Презентация%1.pptx - + Open Source Edition - + - + Print Document Печать документа - - CMessage - - - &OK - &OK - - CPrintProgress @@ -237,26 +249,11 @@ - CSaveFileMessage + QObject - - Do you want to save modified files? - Вы хотите сохранить измененные файлы? - - - - &Yes - Да - - - - &No - Нет - - - - &Cancel - Отмена + + &OK + &OK diff --git a/win-linux/langs/sp.ts b/win-linux/langs/sp.ts index 501522a40..b72cf4732 100644 --- a/win-linux/langs/sp.ts +++ b/win-linux/langs/sp.ts @@ -22,6 +22,7 @@ + All files (*.*) Todos los archivos (*.*) @@ -147,15 +148,14 @@ %1 Archivo (*.%2) - - + Open Document Abrir documento - - Png (*.png);;Gif (*.gif);;Bmp (*.bmp);; - Png (*.png);;Gif (*.gif);;Bmp (*.bmp);; + + Jpeg (*.jpeg *.jpg);;Png (*.png);;Gif (*.gif);;Bmp (*.bmp);; + @@ -166,50 +166,63 @@ Archivo - - + + %1 is modified. +Do you want to keep changes? + + + + + Yes + + + + + No + No + + + + Cancel + Cancelar + + + + File format not supported. Formato de archivo no es compatible - + File doesn't exists Archivo no existe - + Document%1.docx Documento%1.docx - + Book%1.xlsx Libro%1.xlsx - + Presentation%1.pptx Presentación%1.pptx - + Open Source Edition - + - + Print Document Imprimir documento - - CMessage - - - &OK - Aceptar - - CPrintProgress @@ -234,26 +247,11 @@ - CSaveFileMessage + QObject - - Do you want to save modified files? - ¿Quiere usted guardar los archivos modificados? - - - - &Yes - - - - - &No - &No - - - - &Cancel - &Cancelar + + &OK + Aceptar diff --git a/win-linux/src/cmainpanel.cpp b/win-linux/src/cmainpanel.cpp index 3b72021e8..e01611103 100644 --- a/win-linux/src/cmainpanel.cpp +++ b/win-linux/src/cmainpanel.cpp @@ -500,8 +500,8 @@ int CMainPanel::trySaveDocument(int index) #endif m_pTabs->setCurrentIndex(index); - mess.setButtons({"Yes:default", "No", "Cancel"}); - modal_res = mess.question(m_saveDocMessage.arg(m_pTabs->titleByIndex(index))); + mess.setButtons({tr("Yes")+":default", tr("No"), tr("Cancel")}); + modal_res = mess.warning(m_saveDocMessage.arg(m_pTabs->titleByIndex(index))); switch (modal_res) { case MODAL_RESULT_CANCEL: break; diff --git a/win-linux/src/version.h b/win-linux/src/version.h index b80ca707c..542002dba 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,0,250 -#define VER_FILEVERSION_STR "4.1.0.250\0" +#define VER_FILEVERSION 4,1,1,252 +#define VER_FILEVERSION_STR "4.1.1.252\0" #define VER_PRODUCTVERSION VER_FILEVERSION #define VER_PRODUCTVERSION_STR "4.1\0"