mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-24 00:33:02 +03:00
Code

Merge tag '1.7.15' into develop

Browse Source 
Finish 1.7.15

# Conflicts:
#	console/main.cpp
This commit is contained in:
Arin Alex 2024-09-19 20:19:50 +03:00
commit ffce341ce1
19 changed files with 2057 additions and 505 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.appveyor.yml
View File

@ -4,5 +4,6 @@ install:
- set QTDIR=C:\Qt\5.12\mingw73_64 - set QTDIR=C:\Qt\5.12\mingw73_64
- set PATH=%QTDIR%\bin;C:\Qt\Tools\mingw730_64\bin;%PATH% - set PATH=%QTDIR%\bin;C:\Qt\Tools\mingw730_64\bin;%PATH%
build_script: build_script:
- git fetch --prune --tags
- qmake LimeReport.pro - qmake LimeReport.pro
- mingw32-make - mingw32-make

1
.gitattributes vendored Normal file
View File

@ -0,0 +1 @@
limereport/version.h.in export-subst

38
.github/workflows/cmake.yml vendored
View File

@ -23,7 +23,14 @@ jobs:
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v4
with:
fetch-tags: true
# https://github.com/actions/checkout/issues/1781
# workaround https://github.com/actions/checkout/issues/1471#issuecomment-1755560284
- name: Fetch tags
run: git fetch --prune --unshallow --tags
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v3 uses: jurplel/install-qt-action@v3
@ -57,7 +64,14 @@ jobs:
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v4
with:
fetch-tags: true
# https://github.com/actions/checkout/issues/1781
# workaround https://github.com/actions/checkout/issues/1471#issuecomment-1755560284
- name: Fetch tags
run: git fetch --prune --unshallow --tags
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v3 uses: jurplel/install-qt-action@v3
@ -94,7 +108,9 @@ jobs:
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v4
with:
fetch-tags: true
- name: Install MinGW-w64 packages Qt5 - name: Install MinGW-w64 packages Qt5
if: "startsWith(matrix.qt_version, '5')" if: "startsWith(matrix.qt_version, '5')"
@ -107,6 +123,7 @@ jobs:
cc:p cc:p
cmake:p cmake:p
ninja:p ninja:p
git:
qt${{ matrix.qt_version }}-base:p qt${{ matrix.qt_version }}-base:p
qt${{ matrix.qt_version }}-svg:p qt${{ matrix.qt_version }}-svg:p
qt${{ matrix.qt_version }}-tools:p qt${{ matrix.qt_version }}-tools:p
@ -123,11 +140,17 @@ jobs:
cc:p cc:p
cmake:p cmake:p
ninja:p ninja:p
git:
qt${{ matrix.qt_version }}-base:p qt${{ matrix.qt_version }}-base:p
qt${{ matrix.qt_version }}-svg:p qt${{ matrix.qt_version }}-svg:p
qt${{ matrix.qt_version }}-tools:p qt${{ matrix.qt_version }}-tools:p
qt${{ matrix.qt_version }}-declarative:p qt${{ matrix.qt_version }}-declarative:p
# https://github.com/actions/checkout/issues/1781
# workaround https://github.com/actions/checkout/issues/1471#issuecomment-1755560284
- name: Fetch tags
run: git fetch --prune --unshallow --tags
- name: Configure CMake for Qt5 - name: Configure CMake for Qt5
if: "startsWith(matrix.qt_version, '5')" if: "startsWith(matrix.qt_version, '5')"
run: cmake -DCMAKE_BUILD_TYPE="${{env.BUILD_TYPE}}" -DLIMEREPORT_STATIC=${{ matrix.static }} -DLIMEREPORT_DEMO=ON -B "${{github.workspace}}/build" run: cmake -DCMAKE_BUILD_TYPE="${{env.BUILD_TYPE}}" -DLIMEREPORT_STATIC=${{ matrix.static }} -DLIMEREPORT_DEMO=ON -B "${{github.workspace}}/build"
@ -151,7 +174,14 @@ jobs:
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v4
with:
fetch-tags: true
# https://github.com/actions/checkout/issues/1781
# workaround https://github.com/actions/checkout/issues/1471#issuecomment-1755560284
- name: Fetch tags
run: git fetch --prune --unshallow --tags
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v3 uses: jurplel/install-qt-action@v3

266
.gitignore vendored
View File

@ -1,5 +1,160 @@
# C++ objects and libs # File created using '.gitignore Generator' for Visual Studio Code: https://bit.ly/vscode-gig
# Created by https://www.toptal.com/developers/gitignore/api/visualstudiocode,qtcreator,qt,macos,intellij+iml,cmake,linux,windows
# Edit at https://www.toptal.com/developers/gitignore?templates=visualstudiocode,qtcreator,qt,macos,intellij+iml,cmake,linux,windows
### CMake ###
CMakeLists.txt.user
CMakeCache.txt
CMakeFiles
CMakeScripts
Testing
Makefile
cmake_install.cmake
install_manifest.txt
compile_commands.json
CTestTestfile.cmake
_deps
### CMake Patch ###
# External projects
*-prefix/
### Intellij+iml ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf
# AWS User-specific
.idea/**/aws.xml
# Generated files
.idea/**/contentModel.xml
# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml
# Gradle
.idea/**/gradle.xml
.idea/**/libraries
# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/artifacts
# .idea/compiler.xml
# .idea/jarRepositories.xml
# .idea/modules.xml
# .idea/*.iml
# .idea/modules
# *.iml
# *.ipr
# CMake
cmake-build-*/
# Mongo Explorer plugin
.idea/**/mongoSettings.xml
# File-based project format
*.iws
# IntelliJ
out/
# mpeltonen/sbt-idea plugin
.idea_modules/
# JIRA plugin
atlassian-ide-plugin.xml
# Cursive Clojure plugin
.idea/replstate.xml
# SonarLint plugin
.idea/sonarlint/
# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties
# Editor-based Rest Client
.idea/httpRequests
# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser
### Intellij+iml Patch ###
# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023
*.iml
modules.xml
.idea/misc.xml
*.ipr
### Linux ###
*~
# temporary files which can be created if a process still has a handle open of a deleted file
.fuse_hidden*
# KDE directory preferences
.directory
# Linux trash folder which might appear on any partition or disk
.Trash-*
# .nfs files are created when an open file is removed but is still being accessed
.nfs*
### macOS ###
# General
.DS_Store
.AppleDouble
.LSOverride
# Icon must end with two \r
Icon
# Thumbnails
._*
# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent
# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk
### macOS Patch ###
# iCloud generated files
*.icloud
### Qt ###
# C++ objects and libs
*.slo *.slo
*.lo *.lo
*.o *.o
@ -7,11 +162,14 @@
*.la *.la
*.lai *.lai
*.so *.so
*.so.*
*.dll *.dll
*.dylib *.dylib
# Qt-es # Qt-es
object_script.*.Release
object_script.*.Debug
*_plugin_import.cpp
/.qmake.cache /.qmake.cache
/.qmake.stash /.qmake.stash
*.pro.user *.pro.user
@ -20,17 +178,117 @@
*.qbs.user.* *.qbs.user.*
*.moc *.moc
moc_*.cpp moc_*.cpp
moc_*.h
qrc_*.cpp qrc_*.cpp
ui_*.h ui_*.h
*.qmlc
*.jsc
Makefile* Makefile*
*build-* *build-*
*.qm *.qm
*.prl
# Qt unit tests
target_wrapper.*
# QtCreator # QtCreator
*.autosave *.autosave
#QtCtreator Qml # QtCreator Qml
*.qmlproject.user *.qmlproject.user
*.qmlproject.user.* *.qmlproject.user.*
# QtCreator CMake
CMakeLists.txt.user*
# QtCreator 4.8< compilation database
# QtCreator local machine specific files for imported projects
*creator.user*
*_qmlcache.qrc
### QtCreator ###
# gitignore for Qt Creator like IDE for pure C/C++ project without Qt
#
# Reference: http://doc.qt.io/qtcreator/creator-project-generic.html
# Qt Creator autogenerated files
# A listing of all the files included in the project
*.files
# Include directories
*.includes
# Project configuration settings like predefined Macros
*.config
# Qt Creator settings
*.creator
# User project settings
*.creator.user*
# Qt Creator backups
# Flags for Clang Code Model
*.cxxflags
*.cflags
### VisualStudioCode ###
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
!.vscode/*.code-snippets
# Local History for Visual Studio Code
.history/
# Built Visual Studio Code Extensions
*.vsix
### VisualStudioCode Patch ###
# Ignore all local history of files
.history
.ionide
### Windows ###
# Windows thumbnail cache files
Thumbs.db
Thumbs.db:encryptable
ehthumbs.db
ehthumbs_vista.db
# Dump file
*.stackdump
# Folder config file
[Dd]esktop.ini
# Recycle Bin used on file shares
$RECYCLE.BIN/
# Windows Installer files
*.cab
*.msi
*.msix
*.msm
*.msp
# Windows shortcuts
*.lnk
# End of https://www.toptal.com/developers/gitignore/api/visualstudiocode,qtcreator,qt,macos,intellij+iml,cmake,linux,windows
# Custom rules (everything added below won't be overriden by 'Generate .gitignore File' if you use 'Update' option)
limereport/version.h
/build/ /build/
*.app

13
CMakeLists.txt
View File

@ -1,10 +1,10 @@
cmake_minimum_required(VERSION 3.14) cmake_minimum_required(VERSION 3.14)
project(limereport) project(limereport)
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" "${CMAKE_MODULE_PATH}")
include(GenerateVersionHeader)
set(DEFAULT_ITEM_PADDING 0) set(DEFAULT_ITEM_PADDING 0)
set(LIMEREPORT_VERSION_MAJOR 1)
set(LIMEREPORT_VERSION_MINOR 7)
set(LIMEREPORT_VERSION_RELEASE 14)
option(ENABLE_ZINT "Enable libzint build for barcode support" OFF) option(ENABLE_ZINT "Enable libzint build for barcode support" OFF)
option(LIMEREPORT_STATIC "Build LimeReport as static library" OFF) option(LIMEREPORT_STATIC "Build LimeReport as static library" OFF)
@ -349,14 +349,12 @@ set(EXTRA_FILES
${PROJECT_NAME}/lrpreparedpagesintf.h ${PROJECT_NAME}/lrpreparedpagesintf.h
) )
configure_file(config.h.in config.h @ONLY)
set(GLOBAL_HEADERS set(GLOBAL_HEADERS
${PROJECT_NAME}/LimeReport ${PROJECT_NAME}/LimeReport
${PROJECT_NAME}/LRCallbackDS ${PROJECT_NAME}/LRCallbackDS
${PROJECT_NAME}/LRDataManager ${PROJECT_NAME}/LRDataManager
${PROJECT_NAME}/LRScriptManager ${PROJECT_NAME}/LRScriptManager
${CMAKE_CURRENT_BINARY_DIR}/config.h ${CMAKE_BINARY_DIR}/limereport/version.h
) )
set(PROJECT_NAME ${PROJECT_NAME}-qt${QT_VERSION_MAJOR}) set(PROJECT_NAME ${PROJECT_NAME}-qt${QT_VERSION_MAJOR})
@ -371,8 +369,6 @@ else()
target_compile_definitions( ${PROJECT_NAME} INTERFACE -DLIMEREPORT_IMPORTS) target_compile_definitions( ${PROJECT_NAME} INTERFACE -DLIMEREPORT_IMPORTS)
endif() endif()
target_compile_definitions(${PROJECT_NAME} PUBLIC -DCMAKE_CONFIG)
if(Qt${QT_VERSION_MAJOR}UiTools_FOUND) if(Qt${QT_VERSION_MAJOR}UiTools_FOUND)
target_compile_definitions( ${PROJECT_NAME} PRIVATE -DHAVE_UI_LOADER) target_compile_definitions( ${PROJECT_NAME} PRIVATE -DHAVE_UI_LOADER)
target_link_libraries( ${PROJECT_NAME} PUBLIC target_link_libraries( ${PROJECT_NAME} PUBLIC
@ -396,6 +392,7 @@ target_compile_definitions( ${PROJECT_NAME} PRIVATE -DDEFAULT_ITEM_PADDING=${DEF
target_include_directories( ${PROJECT_NAME} PRIVATE target_include_directories( ${PROJECT_NAME} PRIVATE
limereport/ limereport/
${CMAKE_BINARY_DIR}/limereport
limereport/base limereport/base
limereport/bands limereport/bands
limereport/databrowser limereport/databrowser

28
cmake/modules/GenerateVersionHeader.cmake Normal file
View File

@ -0,0 +1,28 @@
find_package(Git)
if(GIT_EXECUTABLE)
# Generate a git-describe version string from Git repository tags
execute_process(
COMMAND ${GIT_EXECUTABLE} describe --tags --dirty
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE GIT_DESCRIBE_VERSION
RESULT_VARIABLE GIT_DESCRIBE_ERROR_CODE
OUTPUT_STRIP_TRAILING_WHITESPACE
)
if(NOT GIT_DESCRIBE_ERROR_CODE)
set(GIT_VERSION ${GIT_DESCRIBE_VERSION})
endif()
endif()
# Final fallback: Just use a bogus version string that is semantically older
# than anything else and spit out a warning to the developer.
if(NOT DEFINED GIT_VERSION)
set(GIT_VERSION 0.0.0-unknown)
message(WARNING "Failed to determine version from Git tags. Using default version \"${GIT_VERSION}\".")
endif()
configure_file(
${CMAKE_SOURCE_DIR}/limereport/version.h.in
${CMAKE_BINARY_DIR}/limereport/version.h
@ONLY)

7
common.pri
View File

@ -139,13 +139,6 @@ UI_SOURCES_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/ui
OBJECTS_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/obj OBJECTS_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/obj
RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
LIMEREPORT_VERSION_MAJOR = 1
LIMEREPORT_VERSION_MINOR = 7
LIMEREPORT_VERSION_RELEASE = 14
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"
QT *= xml sql QT *= xml sql
REPORT_PATH = $$PWD/limereport REPORT_PATH = $$PWD/limereport

7
config.h.in
View File

@ -1,7 +0,0 @@
#pragma once
#cmakedefine LIMEREPORT_VERSION_MAJOR "@LIMEREPORT_VERSION_MAJOR@"
#cmakedefine LIMEREPORT_VERSION_MINOR "@LIMEREPORT_VERSION_MINOR@"
#cmakedefine LIMEREPORT_VERSION_RELEASE "@LIMEREPORT_VERSION_RELEASE@"
#define LIMEREPORT_VERSION_STR LIMEREPORT_VERSION_MAJOR"." LIMEREPORT_VERSION_MINOR"." LIMEREPORT_VERSION_RELEASE

1
console/main.cpp
View File

@ -7,6 +7,7 @@
#include <QFile> #include <QFile>
#include <QCommandLineParser> #include <QCommandLineParser>
#include <QPrinterInfo> #include <QPrinterInfo>
#include "../limereport/version.h"
#ifdef _WIN32 #ifdef _WIN32
#include <io.h> #include <io.h>

16
limereport/limereport.pri
View File

@ -237,3 +237,19 @@ FORMS += \
RESOURCES += \ RESOURCES += \
$$REPORT_PATH/report.qrc \ $$REPORT_PATH/report.qrc \
$$REPORT_PATH/items/items.qrc $$REPORT_PATH/items/items.qrc
system("git --version") {
LR_VERSION = $$system("git --git-dir=$$PWD/../.git describe --tags --dirty")
} else {
LR_VERSION = "0.0.0-unknown"
}
VERSION_TEMPLATE = $$PWD/version.h.in
generateversion.depends = FORCE
generateversion.input = VERSION_TEMPLATE
generateversion.output = $$OUT_PWD/version.h
generateversion.commands = $$QMAKE_STREAM_EDITOR \'s/@GIT_VERSION@/$$LR_VERSION/\' ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
generateversion.CONFIG = no_link target_predeps
QMAKE_EXTRA_COMPILERS += generateversion

4
limereport/lraboutdialog.cpp
View File

@ -27,9 +27,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. * * GNU General Public License for more details. *
****************************************************************************/ ****************************************************************************/
#ifdef CMAKE_CONFIG #include "version.h"
#include <config.h>
#endif
#include "lraboutdialog.h" #include "lraboutdialog.h"
#include "ui_lraboutdialog.h" #include "ui_lraboutdialog.h"

9
limereport/version.h.in Normal file
View File

@ -0,0 +1,9 @@
#pragma once
// git will put "#define GIT_ARCHIVE 1" on the next line inside archives. $Format:%n#define GIT_ARCHIVE 1$
#ifdef GIT_ARCHIVE
#define LIMEREPORT_VERSION_STR "$Format:%(describe:tags=true)$"
#else
#define LIMEREPORT_VERSION_STR "@GIT_VERSION@"
#endif

235
translations/limereport_ar.ts
View File

@ -509,6 +509,109 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>LimeReport::BorderEditor</name>
<message>
<source>Edit border</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Presets</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Outline</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Border</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>...</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Style</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No style</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Solid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Dash</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Dot</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Dash dot</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Dash dot dot</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Width:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>0.25</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>0.5</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>1.5</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>4</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>5</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>6</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>LimeReport::BorderFrameEditor</name> <name>LimeReport::BorderFrameEditor</name>
<message> <message>
@ -1045,18 +1148,6 @@ p, li { white-space: pre-wrap; }
<source>HorizontalBar</source> <source>HorizontalBar</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>LegendAlignTop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>LegendAlignCenter</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>LegendAlignBottom</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>TitleAlignLeft</source> <source>TitleAlignLeft</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -1093,6 +1184,102 @@ p, li { white-space: pre-wrap; }
<source>Split</source> <source>Split</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>GridLines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Solid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>NoStyle</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Dashed</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Dot</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>DashDot</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>DashDotDot</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Doubled</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>LegendPoints</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>LegendLines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>LegendAlignRightCenter</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>LegendAlignRightTop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>LegendAlignRightBottom</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>LegendAlignBottomRight</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>LegendAlignBottomCenter</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>LegendAlignBottomLeft</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>SolidLine</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>NoPen</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>DashLine</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>DotLine</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>DashDotLine</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>DashDotDotLine</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>CustomDashLine</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>LimeReport::FlagsPropItem</name> <name>LimeReport::FlagsPropItem</name>
@ -2222,6 +2409,14 @@ p, li { white-space: pre-wrap; }
<source>mixWithPriorPage</source> <source>mixWithPriorPage</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>shadow</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>borderStyle</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>LimeReport::RectPropItem</name> <name>LimeReport::RectPropItem</name>
@ -2942,6 +3137,18 @@ This preview is no longer valid.</source>
<source>RowIndex</source> <source>RowIndex</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>RoleIndex</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>RoleName</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>columnIndex</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>LimeReport::SettingDialog</name> <name>LimeReport::SettingDialog</name>
@ -3001,6 +3208,10 @@ This preview is no longer valid.</source>
<source>Report settings</source> <source>Report settings</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Base Item Padding: </source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>LimeReport::SubDetailBand</name> <name>LimeReport::SubDetailBand</name>

236
translations/limereport_es.ts
View File

@ -638,7 +638,109 @@ p, li { white-space: pre-wrap; }
</message> </message>
</context> </context>
<context> <context>
<name>LimeReport::BorderEditor</name>
<message>
<source>Edit border</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Presets</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Outline</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Border</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>...</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Style</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No style</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Solid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Dash</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Dot</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Dash dot</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Dash dot dot</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Width:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>0.25</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>0.5</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>1.5</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>4</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>5</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>6</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LimeReport::BorderFrameEditor</name> <name>LimeReport::BorderFrameEditor</name>
<message> <message>
<source>BorderFrameEditor</source> <source>BorderFrameEditor</source>
@ -1174,18 +1276,6 @@ p, li { white-space: pre-wrap; }
<source>HorizontalBar</source> <source>HorizontalBar</source>
<translation>Barra horizontal</translation> <translation>Barra horizontal</translation>
</message> </message>
<message>
<source>LegendAlignTop</source>
<translation>Alinear Leyenda Arriba</translation>
</message>
<message>
<source>LegendAlignCenter</source>
<translation>Centrar leyenda</translation>
</message>
<message>
<source>LegendAlignBottom</source>
<translation>Alinear Leyenda Abajo</translation>
</message>
<message> <message>
<source>TitleAlignLeft</source> <source>TitleAlignLeft</source>
<translation>Alinear titulo a la izquierda</translation> <translation>Alinear titulo a la izquierda</translation>
@ -1222,6 +1312,102 @@ p, li { white-space: pre-wrap; }
<source>Split</source> <source>Split</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>GridLines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Solid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>NoStyle</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Dashed</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Dot</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>DashDot</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>DashDotDot</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Doubled</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>LegendPoints</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>LegendLines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>LegendAlignRightCenter</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>LegendAlignRightTop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>LegendAlignRightBottom</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>LegendAlignBottomRight</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>LegendAlignBottomCenter</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>LegendAlignBottomLeft</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>SolidLine</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>NoPen</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>DashLine</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>DotLine</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>DashDotLine</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>DashDotDotLine</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>CustomDashLine</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>LimeReport::FlagsPropItem</name> <name>LimeReport::FlagsPropItem</name>
@ -2351,6 +2537,14 @@ p, li { white-space: pre-wrap; }
<source>mixWithPriorPage</source> <source>mixWithPriorPage</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>shadow</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>borderStyle</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>LimeReport::RectPropItem</name> <name>LimeReport::RectPropItem</name>
@ -3073,6 +3267,18 @@ Esta vista previa ya no es válida.</translation>
<source>RowIndex</source> <source>RowIndex</source>
<translation>Índice de fila</translation> <translation>Índice de fila</translation>
</message> </message>
<message>
<source>RoleIndex</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>RoleName</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>columnIndex</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>LimeReport::SettingDialog</name> <name>LimeReport::SettingDialog</name>
@ -3132,6 +3338,10 @@ Esta vista previa ya no es válida.</translation>
<source>Report units</source> <source>Report units</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Base Item Padding: </source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>LimeReport::SubDetailBand</name> <name>LimeReport::SubDetailBand</name>

642
translations/limereport_fr.ts
View File

File diff suppressed because it is too large Load Diff

643
translations/limereport_pl.ts
View File

File diff suppressed because it is too large Load Diff

BIN
translations/limereport_ru.qm
View File

Binary file not shown.

177
translations/limereport_ru.ts
View File

@ -559,58 +559,58 @@ p, li { white-space: pre-wrap; }
<context> <context>
<name>LimeReport::BaseDesignIntf</name> <name>LimeReport::BaseDesignIntf</name>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1450"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1445"/>
<source>Copy</source> <source>Copy</source>
<translation>Копировать</translation> <translation>Копировать</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1451"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1446"/>
<source>Cut</source> <source>Cut</source>
<translation>Вырезать</translation> <translation>Вырезать</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1452"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1447"/>
<source>Paste</source> <source>Paste</source>
<translation>Вставить</translation> <translation>Вставить</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1473"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1468"/>
<source>Bring to top</source> <source>Bring to top</source>
<translation>На передний план</translation> <translation>На передний план</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1474"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1469"/>
<source>Send to back</source> <source>Send to back</source>
<translation>На задний план</translation> <translation>На задний план</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1484"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1479"/>
<source>No borders</source> <source>No borders</source>
<translation>Удалить границы</translation> <translation>Удалить границы</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1485"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1480"/>
<source>All borders</source> <source>All borders</source>
<translation>Внешние границы</translation> <translation>Внешние границы</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1477"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1472"/>
<source>Create Horizontal Layout</source> <source>Create Horizontal Layout</source>
<translation>Создать Горизонтальную Компановку</translation> <translation>Создать Горизонтальную Компановку</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1481"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1476"/>
<source>Create Vertical Layout</source> <source>Create Vertical Layout</source>
<translation>Создать Вертикальную Компановку</translation> <translation>Создать Вертикальную Компановку</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1444"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1439"/>
<location filename="../limereport/lrbasedesignintf.cpp" line="1889"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1888"/>
<source>Lock item geometry</source> <source>Lock item geometry</source>
<translation>Заблокировать геометрию элемента</translation> <translation>Заблокировать геометрию элемента</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1486"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1481"/>
<source>Edit borders...</source> <source>Edit borders...</source>
<translation type="unfinished">Редактор границ ...</translation> <translation type="unfinished">Редактор границ ...</translation>
</message> </message>
@ -763,8 +763,8 @@ p, li { white-space: pre-wrap; }
<context> <context>
<name>LimeReport::ConnectionDesc</name> <name>LimeReport::ConnectionDesc</name>
<message> <message>
<location filename="../limereport/lrdatadesignintf.cpp" line="377"/> <location filename="../limereport/lrdatadesignintf.cpp" line="402"/>
<location filename="../limereport/lrdatadesignintf.cpp" line="382"/> <location filename="../limereport/lrdatadesignintf.cpp" line="407"/>
<source>defaultConnection</source> <source>defaultConnection</source>
<translation>Соединение по умолчанию</translation> <translation>Соединение по умолчанию</translation>
</message> </message>
@ -1879,12 +1879,12 @@ p, li { white-space: pre-wrap; }
<context> <context>
<name>LimeReport::MasterDetailProxyModel</name> <name>LimeReport::MasterDetailProxyModel</name>
<message> <message>
<location filename="../limereport/lrdatadesignintf.cpp" line="598"/> <location filename="../limereport/lrdatadesignintf.cpp" line="623"/>
<source>Field: &quot;%1&quot; not found in &quot;%2&quot; child datasource</source> <source>Field: &quot;%1&quot; not found in &quot;%2&quot; child datasource</source>
<translation>Поле &quot;%1&quot; не найдено в подчиненном источнике данных &quot;%2&quot;</translation> <translation>Поле &quot;%1&quot; не найдено в подчиненном источнике данных &quot;%2&quot;</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrdatadesignintf.cpp" line="612"/> <location filename="../limereport/lrdatadesignintf.cpp" line="637"/>
<source>Field: &quot;%1&quot; not found in &quot;%2&quot; master datasource</source> <source>Field: &quot;%1&quot; not found in &quot;%2&quot; master datasource</source>
<translation>Поле &quot;%1&quot; не найдено в главном источнике данных &quot;%2&quot;</translation> <translation>Поле &quot;%1&quot; не найдено в главном источнике данных &quot;%2&quot;</translation>
</message> </message>
@ -1892,7 +1892,7 @@ p, li { white-space: pre-wrap; }
<context> <context>
<name>LimeReport::ModelToDataSource</name> <name>LimeReport::ModelToDataSource</name>
<message> <message>
<location filename="../limereport/lrdatadesignintf.cpp" line="338"/> <location filename="../limereport/lrdatadesignintf.cpp" line="363"/>
<source>model is destroyed</source> <source>model is destroyed</source>
<translation>модель уничтожена</translation> <translation>модель уничтожена</translation>
</message> </message>
@ -2213,12 +2213,12 @@ p, li { white-space: pre-wrap; }
<translation>Печать в PDF</translation> <translation>Печать в PDF</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrpreviewreportwindow.cpp" line="83"/> <location filename="../limereport/lrpreviewreportwindow.cpp" line="81"/>
<source>Page: </source> <source>Page: </source>
<translation>Страница: </translation> <translation>Страница: </translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrpreviewreportwindow.cpp" line="188"/> <location filename="../limereport/lrpreviewreportwindow.cpp" line="185"/>
<source> of %1</source> <source> of %1</source>
<translation> из %1</translation> <translation> из %1</translation>
</message> </message>
@ -2258,12 +2258,12 @@ p, li { white-space: pre-wrap; }
<translation>Показать панель инструментов</translation> <translation>Показать панель инструментов</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrpreviewreportwindow.cpp" line="106"/> <location filename="../limereport/lrpreviewreportwindow.cpp" line="104"/>
<source>Font</source> <source>Font</source>
<translation>Шрифт</translation> <translation>Шрифт</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrpreviewreportwindow.cpp" line="109"/> <location filename="../limereport/lrpreviewreportwindow.cpp" line="107"/>
<source>Text align</source> <source>Text align</source>
<translation>Выравнивание текста</translation> <translation>Выравнивание текста</translation>
</message> </message>
@ -2313,17 +2313,17 @@ p, li { white-space: pre-wrap; }
<translation>Панель инструментов редактирования</translation> <translation>Панель инструментов редактирования</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrpreviewreportwindow.cpp" line="65"/> <location filename="../limereport/lrpreviewreportwindow.cpp" line="63"/>
<source>Printing</source> <source>Printing</source>
<translation>Печатается</translation> <translation>Печатается</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrpreviewreportwindow.cpp" line="306"/> <location filename="../limereport/lrpreviewreportwindow.cpp" line="292"/>
<source>Attention</source> <source>Attention</source>
<translation>Внимание</translation> <translation>Внимание</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrpreviewreportwindow.cpp" line="306"/> <location filename="../limereport/lrpreviewreportwindow.cpp" line="292"/>
<source>The printing is in process</source> <source>The printing is in process</source>
<translation>Отчет находится в процессе печати</translation> <translation>Отчет находится в процессе печати</translation>
</message> </message>
@ -2331,7 +2331,7 @@ p, li { white-space: pre-wrap; }
<context> <context>
<name>LimeReport::ProxyHolder</name> <name>LimeReport::ProxyHolder</name>
<message> <message>
<location filename="../limereport/lrdatadesignintf.cpp" line="537"/> <location filename="../limereport/lrdatadesignintf.cpp" line="562"/>
<source>Datasource has been invalidated</source> <source>Datasource has been invalidated</source>
<translation>Источник данных недействителен</translation> <translation>Источник данных недействителен</translation>
</message> </message>
@ -3074,7 +3074,7 @@ p, li { white-space: pre-wrap; }
<context> <context>
<name>LimeReport::ReportDesignWidget</name> <name>LimeReport::ReportDesignWidget</name>
<message> <message>
<location filename="../limereport/lrreportdesignwidget.cpp" line="498"/> <location filename="../limereport/lrreportdesignwidget.cpp" line="500"/>
<source>Report file name</source> <source>Report file name</source>
<translation>Имя файла отчета</translation> <translation>Имя файла отчета</translation>
</message> </message>
@ -3084,12 +3084,12 @@ p, li { white-space: pre-wrap; }
<translation>Скрипт</translation> <translation>Скрипт</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrreportdesignwidget.cpp" line="524"/> <location filename="../limereport/lrreportdesignwidget.cpp" line="531"/>
<source>Error</source> <source>Error</source>
<translation>Ошибка</translation> <translation>Ошибка</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrreportdesignwidget.cpp" line="524"/> <location filename="../limereport/lrreportdesignwidget.cpp" line="531"/>
<source>Wrong file format</source> <source>Wrong file format</source>
<translation>Неверный формат файла</translation> <translation>Неверный формат файла</translation>
</message> </message>
@ -3483,24 +3483,24 @@ p, li { white-space: pre-wrap; }
<translation>Предпросмотр</translation> <translation>Предпросмотр</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrreportengine.cpp" line="670"/> <location filename="../limereport/lrreportengine.cpp" line="680"/>
<source>Report File Change</source> <source>Report File Change</source>
<translation>Монитор изменений файлов</translation> <translation>Монитор изменений файлов</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrreportengine.cpp" line="671"/> <location filename="../limereport/lrreportengine.cpp" line="681"/>
<source>The report file &quot;%1&quot; has changed names or been deleted. <source>The report file &quot;%1&quot; has changed names or been deleted.
This preview is no longer valid.</source> This preview is no longer valid.</source>
<translation>Файл отчета &quot;%1&quot; изменил имя или был удален.</translation> <translation>Файл отчета &quot;%1&quot; изменил имя или был удален.</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrreportengine.cpp" line="754"/> <location filename="../limereport/lrreportengine.cpp" line="764"/>
<source>Designer not found!</source> <source>Designer not found!</source>
<translation>Дизайнер не найден!</translation> <translation>Дизайнер не найден!</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrreportengine.cpp" line="1049"/> <location filename="../limereport/lrreportengine.cpp" line="1059"/>
<source>Language %1 already exists</source> <source>Language %1 already exists</source>
<translation>Язык %1 уже существует</translation> <translation>Язык %1 уже существует</translation>
</message> </message>
@ -3814,13 +3814,13 @@ This preview is no longer valid.</source>
<context> <context>
<name>LimeReport::ScriptEngineContext</name> <name>LimeReport::ScriptEngineContext</name>
<message> <message>
<location filename="../limereport/lrscriptenginemanager.cpp" line="1305"/> <location filename="../limereport/lrscriptenginemanager.cpp" line="1383"/>
<source>Dialog with name: %1 can`t be created</source> <source>Dialog with name: %1 can`t be created</source>
<translation>Диалог %1 не может быть создан</translation> <translation>Диалог %1 не может быть создан</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrscriptenginemanager.cpp" line="1597"/> <location filename="../limereport/lrscriptenginemanager.cpp" line="1675"/>
<location filename="../limereport/lrscriptenginemanager.cpp" line="1605"/> <location filename="../limereport/lrscriptenginemanager.cpp" line="1683"/>
<source>Error</source> <source>Error</source>
<translation>Ошибка</translation> <translation>Ошибка</translation>
</message> </message>
@ -3923,6 +3923,11 @@ This preview is no longer valid.</source>
<location filename="../limereport/lrscriptenginemanager.cpp" line="1036"/> <location filename="../limereport/lrscriptenginemanager.cpp" line="1036"/>
<location filename="../limereport/lrscriptenginemanager.cpp" line="1051"/> <location filename="../limereport/lrscriptenginemanager.cpp" line="1051"/>
<location filename="../limereport/lrscriptenginemanager.cpp" line="1066"/> <location filename="../limereport/lrscriptenginemanager.cpp" line="1066"/>
<location filename="../limereport/lrscriptenginemanager.cpp" line="1081"/>
<location filename="../limereport/lrscriptenginemanager.cpp" line="1096"/>
<location filename="../limereport/lrscriptenginemanager.cpp" line="1111"/>
<location filename="../limereport/lrscriptenginemanager.cpp" line="1125"/>
<location filename="../limereport/lrscriptenginemanager.cpp" line="1140"/>
<source>GENERAL</source> <source>GENERAL</source>
<translation>ОБЩИЕ</translation> <translation>ОБЩИЕ</translation>
</message> </message>
@ -3934,6 +3939,9 @@ This preview is no longer valid.</source>
<message> <message>
<location filename="../limereport/lrscriptenginemanager.cpp" line="339"/> <location filename="../limereport/lrscriptenginemanager.cpp" line="339"/>
<location filename="../limereport/lrscriptenginemanager.cpp" line="991"/> <location filename="../limereport/lrscriptenginemanager.cpp" line="991"/>
<location filename="../limereport/lrscriptenginemanager.cpp" line="1083"/>
<location filename="../limereport/lrscriptenginemanager.cpp" line="1098"/>
<location filename="../limereport/lrscriptenginemanager.cpp" line="1113"/>
<source>FieldName</source> <source>FieldName</source>
<translation>Имя поля</translation> <translation>Имя поля</translation>
</message> </message>
@ -3983,11 +3991,31 @@ This preview is no longer valid.</source>
</message> </message>
<message> <message>
<location filename="../limereport/lrscriptenginemanager.cpp" line="1068"/> <location filename="../limereport/lrscriptenginemanager.cpp" line="1068"/>
<location filename="../limereport/lrscriptenginemanager.cpp" line="1127"/>
<location filename="../limereport/lrscriptenginemanager.cpp" line="1142"/>
<source>datasourceName</source> <source>datasourceName</source>
<translation>Имя источника данных</translation> <translation>Имя источника данных</translation>
</message> </message>
<message>
<location filename="../limereport/lrscriptenginemanager.cpp" line="1084"/>
<source>RoleIndex</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../limereport/lrscriptenginemanager.cpp" line="1099"/>
<location filename="../limereport/lrscriptenginemanager.cpp" line="1113"/>
<source>RoleName</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../limereport/lrscriptenginemanager.cpp" line="1128"/>
<source>columnIndex</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<location filename="../limereport/lrscriptenginemanager.cpp" line="992"/> <location filename="../limereport/lrscriptenginemanager.cpp" line="992"/>
<location filename="../limereport/lrscriptenginemanager.cpp" line="1083"/>
<location filename="../limereport/lrscriptenginemanager.cpp" line="1098"/>
<source>RowIndex</source> <source>RowIndex</source>
<translation>Индекс строки</translation> <translation>Индекс строки</translation>
</message> </message>
@ -4024,6 +4052,11 @@ This preview is no longer valid.</source>
<source>Suppress absent fields and variables warning</source> <source>Suppress absent fields and variables warning</source>
<translation>Не выводить сообщения об отсутствии полей или переменных</translation> <translation>Не выводить сообщения об отсутствии полей или переменных</translation>
</message> </message>
<message>
<location filename="../limereport/lrsettingdialog.ui" line="327"/>
<source>Base Item Padding: </source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<location filename="../limereport/lrsettingdialog.ui" line="134"/> <location filename="../limereport/lrsettingdialog.ui" line="134"/>
<source>Language</source> <source>Language</source>
@ -4134,66 +4167,66 @@ This preview is no longer valid.</source>
<context> <context>
<name>LimeReport::TextItem</name> <name>LimeReport::TextItem</name>
<message> <message>
<location filename="../limereport/items/lrtextitem.cpp" line="86"/> <location filename="../limereport/items/lrtextitem.cpp" line="82"/>
<location filename="../limereport/items/lrtextitem.cpp" line="124"/> <location filename="../limereport/items/lrtextitem.cpp" line="120"/>
<source>Edit</source> <source>Edit</source>
<translation>Правка</translation> <translation>Правка</translation>
</message> </message>
<message> <message>
<location filename="../limereport/items/lrtextitem.cpp" line="92"/> <location filename="../limereport/items/lrtextitem.cpp" line="88"/>
<location filename="../limereport/items/lrtextitem.cpp" line="128"/> <location filename="../limereport/items/lrtextitem.cpp" line="124"/>
<source>Auto height</source> <source>Auto height</source>
<translation>Автоматическая высота</translation> <translation>Автоматическая высота</translation>
</message> </message>
<message> <message>
<location filename="../limereport/items/lrtextitem.cpp" line="96"/> <location filename="../limereport/items/lrtextitem.cpp" line="92"/>
<location filename="../limereport/items/lrtextitem.cpp" line="131"/> <location filename="../limereport/items/lrtextitem.cpp" line="127"/>
<source>Allow HTML</source> <source>Allow HTML</source>
<translation>Разрешить HTML</translation> <translation>Разрешить HTML</translation>
</message> </message>
<message> <message>
<location filename="../limereport/items/lrtextitem.cpp" line="100"/> <location filename="../limereport/items/lrtextitem.cpp" line="96"/>
<location filename="../limereport/items/lrtextitem.cpp" line="134"/> <location filename="../limereport/items/lrtextitem.cpp" line="130"/>
<source>Allow HTML in fields</source> <source>Allow HTML in fields</source>
<translation>Разрешить HTML в полях</translation> <translation>Разрешить HTML в полях</translation>
</message> </message>
<message> <message>
<location filename="../limereport/items/lrtextitem.cpp" line="104"/> <location filename="../limereport/items/lrtextitem.cpp" line="100"/>
<location filename="../limereport/items/lrtextitem.cpp" line="137"/> <location filename="../limereport/items/lrtextitem.cpp" line="133"/>
<source>Stretch to max height</source> <source>Stretch to max height</source>
<translation>Растягивать до максимальной высоты</translation> <translation>Растягивать до максимальной высоты</translation>
</message> </message>
<message> <message>
<location filename="../limereport/items/lrtextitem.cpp" line="678"/> <location filename="../limereport/items/lrtextitem.cpp" line="674"/>
<location filename="../limereport/items/lrtextitem.cpp" line="688"/> <location filename="../limereport/items/lrtextitem.cpp" line="684"/>
<source>Error</source> <source>Error</source>
<translation>Ошибка</translation> <translation>Ошибка</translation>
</message> </message>
<message> <message>
<location filename="../limereport/items/lrtextitem.cpp" line="679"/> <location filename="../limereport/items/lrtextitem.cpp" line="675"/>
<source>TextItem &quot; %1 &quot; already has folower &quot; %2 &quot; </source> <source>TextItem &quot; %1 &quot; already has folower &quot; %2 &quot; </source>
<translation>Текстовый элемент %1 уже следует за %2 </translation> <translation>Текстовый элемент %1 уже следует за %2 </translation>
</message> </message>
<message> <message>
<location filename="../limereport/items/lrtextitem.cpp" line="689"/> <location filename="../limereport/items/lrtextitem.cpp" line="685"/>
<source>TextItem &quot; %1 &quot; not found!</source> <source>TextItem &quot; %1 &quot; not found!</source>
<translation>Текстовый элемент %1 не найден!</translation> <translation>Текстовый элемент %1 не найден!</translation>
</message> </message>
<message> <message>
<location filename="../limereport/items/lrtextitem.cpp" line="108"/> <location filename="../limereport/items/lrtextitem.cpp" line="104"/>
<location filename="../limereport/items/lrtextitem.cpp" line="141"/> <location filename="../limereport/items/lrtextitem.cpp" line="137"/>
<source>Transparent</source> <source>Transparent</source>
<translation>Прозрачный</translation> <translation>Прозрачный</translation>
</message> </message>
<message> <message>
<location filename="../limereport/items/lrtextitem.cpp" line="112"/> <location filename="../limereport/items/lrtextitem.cpp" line="108"/>
<location filename="../limereport/items/lrtextitem.cpp" line="148"/> <location filename="../limereport/items/lrtextitem.cpp" line="144"/>
<source>Watermark</source> <source>Watermark</source>
<translation>Водный знак</translation> <translation>Водный знак</translation>
</message> </message>
<message> <message>
<location filename="../limereport/items/lrtextitem.cpp" line="116"/> <location filename="../limereport/items/lrtextitem.cpp" line="112"/>
<location filename="../limereport/items/lrtextitem.cpp" line="152"/> <location filename="../limereport/items/lrtextitem.cpp" line="148"/>
<source>Hide if empty</source> <source>Hide if empty</source>
<translation>Скрывать, если пустое</translation> <translation>Скрывать, если пустое</translation>
</message> </message>
@ -4440,34 +4473,34 @@ This preview is no longer valid.</source>
<translation>Неверное соединение %1</translation> <translation>Неверное соединение %1</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrdatadesignintf.cpp" line="509"/> <location filename="../limereport/lrdatadesignintf.cpp" line="534"/>
<source>Child</source> <source>Child</source>
<translation>Подчиненный</translation> <translation>Подчиненный</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrdatadesignintf.cpp" line="509"/> <location filename="../limereport/lrdatadesignintf.cpp" line="534"/>
<source> and child </source> <source> and child </source>
<translation> и подчиненный </translation> <translation> и подчиненный </translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrdatadesignintf.cpp" line="510"/> <location filename="../limereport/lrdatadesignintf.cpp" line="535"/>
<source>datasouce &quot;%1&quot; not found!</source> <source>datasouce &quot;%1&quot; not found!</source>
<translation>источник данных %1 не найден!</translation> <translation>источник данных %1 не найден!</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrpagedesignintf.cpp" line="1700"/> <location filename="../limereport/lrpagedesignintf.cpp" line="1697"/>
<location filename="../limereport/lrpagedesignintf.cpp" line="1742"/> <location filename="../limereport/lrpagedesignintf.cpp" line="1739"/>
<source>Attention!</source> <source>Attention!</source>
<translation>Внимание!</translation> <translation>Внимание!</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrpagedesignintf.cpp" line="1700"/> <location filename="../limereport/lrpagedesignintf.cpp" line="1697"/>
<location filename="../limereport/lrpagedesignintf.cpp" line="1742"/> <location filename="../limereport/lrpagedesignintf.cpp" line="1739"/>
<source>Selected elements have different parent containers</source> <source>Selected elements have different parent containers</source>
<translation>Выделенные элементы имеют различные родительские контейнеры</translation> <translation>Выделенные элементы имеют различные родительские контейнеры</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrscriptenginemanager.cpp" line="1708"/> <location filename="../limereport/lrscriptenginemanager.cpp" line="1786"/>
<source>Function %1 not found or have wrong arguments</source> <source>Function %1 not found or have wrong arguments</source>
<translation>Функция %1 не найдена или вызвана с неверными аргументами</translation> <translation>Функция %1 не найдена или вызвана с неверными аргументами</translation>
</message> </message>
@ -4532,7 +4565,7 @@ This preview is no longer valid.</source>
<translation>содержимое</translation> <translation>содержимое</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrdatadesignintf.cpp" line="508"/> <location filename="../limereport/lrdatadesignintf.cpp" line="533"/>
<source>Master datasouce &quot;%1&quot; not found!</source> <source>Master datasouce &quot;%1&quot; not found!</source>
<translation>Главный источник данных %1 не найден!</translation> <translation>Главный источник данных %1 не найден!</translation>
</message> </message>
@ -4614,7 +4647,7 @@ This preview is no longer valid.</source>
<translation>Неверный формат файла</translation> <translation>Неверный формат файла</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrdatadesignintf.cpp" line="425"/> <location filename="../limereport/lrdatadesignintf.cpp" line="450"/>
<source>Master datasource &quot;%1&quot; not found!</source> <source>Master datasource &quot;%1&quot; not found!</source>
<translation>Главный источник данных %1 не найден!</translation> <translation>Главный источник данных %1 не найден!</translation>
</message> </message>
@ -4645,7 +4678,7 @@ This preview is no longer valid.</source>
<translation>Третий</translation> <translation>Третий</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrscriptenginemanager.cpp" line="1711"/> <location filename="../limereport/lrscriptenginemanager.cpp" line="1789"/>
<source>Datasource manager not found</source> <source>Datasource manager not found</source>
<translation>Менеджер источников данных не найден</translation> <translation>Менеджер источников данных не найден</translation>
</message> </message>
@ -4666,20 +4699,20 @@ This preview is no longer valid.</source>
<translation>Светаля</translation> <translation>Светаля</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrreportdesignwidget.cpp" line="799"/> <location filename="../limereport/lrreportdesignwidget.cpp" line="807"/>
<source>Default</source> <source>Default</source>
<translation>По умолчанию</translation> <translation>По умолчанию</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrreportdesignwidget.cpp" line="808"/> <location filename="../limereport/lrreportdesignwidget.cpp" line="816"/>
<location filename="../limereport/lrreportdesignwidget.cpp" line="811"/> <location filename="../limereport/lrreportdesignwidget.cpp" line="819"/>
<location filename="../limereport/lrreportdesignwidget.cpp" line="818"/> <location filename="../limereport/lrreportdesignwidget.cpp" line="826"/>
<source>Millimeters</source> <source>Millimeters</source>
<translation>Миллиметры</translation> <translation>Миллиметры</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrreportdesignwidget.cpp" line="808"/> <location filename="../limereport/lrreportdesignwidget.cpp" line="816"/>
<location filename="../limereport/lrreportdesignwidget.cpp" line="812"/> <location filename="../limereport/lrreportdesignwidget.cpp" line="820"/>
<source>Inches</source> <source>Inches</source>
<translation>Дюймы</translation> <translation>Дюймы</translation>
</message> </message>

236
translations/limereport_zh.ts
View File

@ -522,7 +522,109 @@ p, li { white-space: pre-wrap; }
</message> </message>
</context> </context>
<context> <context>
<name>LimeReport::BorderEditor</name>
<message>
<source>Edit border</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Presets</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Outline</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Border</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>...</source>
<translation type="unfinished">...</translation>
</message>
<message>
<source>Style</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No style</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Solid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Dash</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Dot</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Dash dot</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Dash dot dot</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Width:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>0.25</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>0.5</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>1.5</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>4</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>5</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>6</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LimeReport::BorderFrameEditor</name> <name>LimeReport::BorderFrameEditor</name>
<message> <message>
<source>BorderFrameEditor</source> <source>BorderFrameEditor</source>
@ -1058,18 +1160,6 @@ p, li { white-space: pre-wrap; }
<source>HorizontalBar</source> <source>HorizontalBar</source>
<translation>条形图</translation> <translation>条形图</translation>
</message> </message>
<message>
<source>LegendAlignTop</source>
<translation>图例靠上对齐</translation>
</message>
<message>
<source>LegendAlignCenter</source>
<translation>图例居中</translation>
</message>
<message>
<source>LegendAlignBottom</source>
<translation>图例靠下对齐</translation>
</message>
<message> <message>
<source>TitleAlignLeft</source> <source>TitleAlignLeft</source>
<translation>标题左对齐</translation> <translation>标题左对齐</translation>
@ -1106,6 +1196,102 @@ p, li { white-space: pre-wrap; }
<source>Split</source> <source>Split</source>
<translation>划分</translation> <translation>划分</translation>
</message> </message>
<message>
<source>GridLines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Solid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>NoStyle</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Dashed</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Dot</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>DashDot</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>DashDotDot</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Doubled</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>LegendPoints</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>LegendLines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>LegendAlignRightCenter</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>LegendAlignRightTop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>LegendAlignRightBottom</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>LegendAlignBottomRight</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>LegendAlignBottomCenter</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>LegendAlignBottomLeft</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>SolidLine</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>NoPen</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>DashLine</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>DotLine</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>DashDotLine</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>DashDotDotLine</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>CustomDashLine</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>LimeReport::FlagsPropItem</name> <name>LimeReport::FlagsPropItem</name>
@ -2235,6 +2421,14 @@ p, li { white-space: pre-wrap; }
<source>mixWithPriorPage</source> <source>mixWithPriorPage</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>shadow</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>borderStyle</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>LimeReport::RectPropItem</name> <name>LimeReport::RectPropItem</name>
@ -2957,6 +3151,18 @@ This preview is no longer valid.</source>
<source>RowIndex</source> <source>RowIndex</source>
<translation>行索引</translation> <translation>行索引</translation>
</message> </message>
<message>
<source>RoleIndex</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>RoleName</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>columnIndex</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>LimeReport::SettingDialog</name> <name>LimeReport::SettingDialog</name>
@ -3016,6 +3222,10 @@ This preview is no longer valid.</source>
<source>Report settings</source> <source>Report settings</source>
<translation>报表设置</translation> <translation>报表设置</translation>
</message> </message>
<message>
<source>Base Item Padding: </source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>LimeReport::SubDetailBand</name> <name>LimeReport::SubDetailBand</name>