diff --git a/limereport/limereport.pro b/limereport/limereport.pro index 15312b5..18554fe 100644 --- a/limereport/limereport.pro +++ b/limereport/limereport.pro @@ -25,11 +25,11 @@ include(limereport.pri) unix { DESTDIR = $${BUILD_DIR}/$${BUILD_TYPE}/lib - #QMAKE_POST_LINK += mkdir -p $$quote($${DESTDIR}/include) $$escape_expand(\\n\\t) + QMAKE_POST_LINK += mkdir -p $$quote($${DESTDIR}/include) $$escape_expand(\\n\\t) # qmake need make mkdir -p on subdirs more than root/ for(FILE,EXTRA_FILES){ - QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($${DEST_INCLUDE_DIR}) $$escape_expand(\\n\\t) + QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($${DESTDIR}/include) $$escape_expand(\\n\\t) # inside of libs make /include/files } - QMAKE_POST_LINK += $(COPY_DIR) $$quote($${DEST_INCLUDE_DIR}*) $$quote($${DEST_DIR}) + QMAKE_POST_LINK += $(COPY_DIR) $$quote($${DEST_INCLUDE_DIR}*) $$quote($${DESTDIR}/include) #copy includes to /lib/include } win32 { diff --git a/translations/limereport_es_ES.ts b/translations/limereport_es_ES.ts index 702d834..cbf4d19 100644 --- a/translations/limereport_es_ES.ts +++ b/translations/limereport_es_ES.ts @@ -649,6 +649,21 @@ p, li { white-space: pre-wrap; } + + LimeReport::PreviewReportWidget + + Form + + + + PDF file name + + + + Report file name + + + LimeReport::PreviewReportWindow @@ -731,14 +746,6 @@ p, li { white-space: pre-wrap; } of %1 - - Report file name - - - - PDF file name - - LimeReport::ProxyHolder diff --git a/translations/limereport_ru.qm b/translations/limereport_ru.qm index 1f378b9..c1d4046 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 31ecc0a..0a3886f 100644 --- a/translations/limereport_ru.ts +++ b/translations/limereport_ru.ts @@ -800,6 +800,21 @@ p, li { white-space: pre-wrap; } Верхний колонтитул + + LimeReport::PreviewReportWidget + + Form + + + + PDF file name + Имя PDF файла + + + Report file name + Файл отчета + + LimeReport::PreviewReportWindow @@ -876,11 +891,11 @@ p, li { white-space: pre-wrap; } Report file name - Файл отчета + Файл отчета PDF file name - Имя PDF файла + Имя PDF файла Preview