diff --git a/designer/main.cpp b/designer/main.cpp index d36ee1d..413f33f 100644 --- a/designer/main.cpp +++ b/designer/main.cpp @@ -10,17 +10,24 @@ int main(int argc, char *argv[]) DesignerSettingManager manager; QTranslator limeReportTranslator; - QTranslator qtTranslator; + QTranslator qtBaseTranslator; + QTranslator qtDesignerTranslator; + QTranslator qtLinguistTranslator; + QString translationPath = QApplication::applicationDirPath(); - translationPath.append("/languages"); + translationPath.append("/translations"); Qt::LayoutDirection layoutDirection = QLocale::system().textDirection(); QString designerTranslation = QLocale(manager.getCurrentDefaultLanguage()).name(); if (limeReportTranslator.load("limereport_"+designerTranslation, translationPath)){ - qtTranslator.load("qt_" + designerTranslation, translationPath); - a.installTranslator(&qtTranslator); + qtBaseTranslator.load("qtbase_" + designerTranslation, translationPath); + qtDesignerTranslator.load("designer_"+designerTranslation,translationPath); + + a.installTranslator(&qtBaseTranslator); + a.installTranslator(&qtDesignerTranslator); a.installTranslator(&limeReportTranslator); + Qt::LayoutDirection layoutDirection = QLocale(manager.getCurrentDefaultLanguage()).textDirection(); a.setLayoutDirection(layoutDirection); } diff --git a/limereport/objectinspector/lrobjectitemmodel.cpp b/limereport/objectinspector/lrobjectitemmodel.cpp index b39c4d0..2addb1e 100644 --- a/limereport/objectinspector/lrobjectitemmodel.cpp +++ b/limereport/objectinspector/lrobjectitemmodel.cpp @@ -154,6 +154,7 @@ void QObjectPropertyModel::translatePropertyName() tr("replaceCRwithBR"); tr("hideIfEmpty"); tr("hideEmptyItems"); + tr("useExternalPainter"); } void QObjectPropertyModel::clearObjectsList() diff --git a/translations/limereport_ru.qm b/translations/limereport_ru.qm index 0b912bd..aa82093 100644 Binary files a/translations/limereport_ru.qm and b/translations/limereport_ru.qm differ diff --git a/translations/limereport_ru.ts b/translations/limereport_ru.ts index cca8845..9d72224 100644 --- a/translations/limereport_ru.ts +++ b/translations/limereport_ru.ts @@ -384,6 +384,14 @@ p, li { white-space: pre-wrap; } Print if empty Печатать, если пустое + + Cut + Вырезать + + + Copy + Копировать + LimeReport::BaseDesignIntf @@ -1086,6 +1094,10 @@ p, li { white-space: pre-wrap; } LimeReport::ImageItem + + Ext. + Внешний + Image Изображение @@ -1864,6 +1876,10 @@ p, li { white-space: pre-wrap; } hideEmptyItems Скрывать пустые элементы + + useExternalPainter + Использовать внешний отрисовщик + LimeReport::RectMMPropItem