diff --git a/.clang-format b/.clang-format new file mode 100644 index 00000000..5778e924 --- /dev/null +++ b/.clang-format @@ -0,0 +1,89 @@ +Language: Cpp +# BasedOnStyle: Google +AccessModifierOffset: -1 +AlignAfterOpenBracket: Align +AlignConsecutiveAssignments: false +AlignConsecutiveDeclarations: false +AlignEscapedNewlinesLeft: true +AlignOperands: true +AlignTrailingComments: true +AllowAllParametersOfDeclarationOnNextLine: true +AllowShortBlocksOnASingleLine: false +AllowShortCaseLabelsOnASingleLine: false +AllowShortFunctionsOnASingleLine: All +AllowShortIfStatementsOnASingleLine: true +AllowShortLoopsOnASingleLine: true +AlwaysBreakAfterDefinitionReturnType: None +AlwaysBreakAfterReturnType: None +AlwaysBreakBeforeMultilineStrings: true +AlwaysBreakTemplateDeclarations: true +BinPackArguments: true +BinPackParameters: true +BraceWrapping: + AfterClass: true + AfterControlStatement: true + AfterEnum: true + AfterFunction: true + AfterNamespace: true + AfterObjCDeclaration: true + AfterStruct: true + AfterUnion: true + BeforeCatch: true + BeforeElse: true + IndentBraces: false +BreakBeforeBinaryOperators: None +BreakBeforeBraces: Allman +BreakBeforeTernaryOperators: true +BreakConstructorInitializers: BeforeColon +BreakConstructorInitializersBeforeComma: false +ColumnLimit: 80 +CommentPragmas: '^ IWYU pragma:' +ConstructorInitializerAllOnOneLineOrOnePerLine: false +ConstructorInitializerIndentWidth: 0 +ContinuationIndentWidth: 2 +Cpp11BracedListStyle: true +DerivePointerAlignment: true +DisableFormat: false +ExperimentalAutoDetectBinPacking: false +ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ] +IncludeCategories: + - Regex: '^<.*\.h>' + Priority: 1 + - Regex: '^<.*' + Priority: 2 + - Regex: '.*' + Priority: 3 +IndentCaseLabels: true +IndentWidth: 2 +IndentWrappedFunctionNames: false +KeepEmptyLinesAtTheStartOfBlocks: false +MacroBlockBegin: '' +MacroBlockEnd: '' +MaxEmptyLinesToKeep: 1 +NamespaceIndentation: None +ObjCBlockIndentWidth: 2 +ObjCSpaceAfterProperty: false +ObjCSpaceBeforeProtocolList: false +PenaltyBreakBeforeFirstCallParameter: 1 +PenaltyBreakComment: 300 +PenaltyBreakFirstLessLess: 120 +PenaltyBreakString: 1000 +PenaltyExcessCharacter: 1000000 +PenaltyReturnTypeOnItsOwnLine: 200 +PointerAlignment: Left +ReflowComments: true +SortIncludes: true +SpaceAfterCStyleCast: false +SpaceBeforeAssignmentOperators: true +SpaceBeforeParens: ControlStatements +SpaceInEmptyParentheses: false +SpacesBeforeTrailingComments: 2 +SpacesInAngles: false +SpacesInContainerLiterals: true +SpacesInCStyleCastParentheses: false +SpacesInParentheses: false +SpacesInSquareBrackets: false +Standard: Auto +TabWidth: 2 +UseTab: Never + diff --git a/.clang-tidy b/.clang-tidy new file mode 100644 index 00000000..42e4670c --- /dev/null +++ b/.clang-tidy @@ -0,0 +1,6 @@ + +--- +Checks: '*,-fuchsia-*,-google-*,-zircon-*,-abseil-*,-modernize-use-trailing-return-type,-llvm-*' +WarningsAsErrors: '*' +HeaderFilterRegex: '' +FormatStyle: none \ No newline at end of file diff --git a/.cmake-format.yaml b/.cmake-format.yaml new file mode 100644 index 00000000..e7be3399 --- /dev/null +++ b/.cmake-format.yaml @@ -0,0 +1,18 @@ +additional_commands: + foo: + flags: + - BAR + - BAZ + kwargs: + DEPENDS: '*' + HEADERS: '*' + SOURCES: '*' +bullet_char: '*' +dangle_parens: false +enum_char: . +line_ending: unix +line_width: 120 +max_pargs_hwrap: 3 +separate_ctrl_name_with_space: false +separate_fn_name_with_space: false +tab_size: 2 \ No newline at end of file diff --git a/.gitignore b/.gitignore index a886f32c..b212b0c3 100644 --- a/.gitignore +++ b/.gitignore @@ -49,5 +49,10 @@ stage/ .snapcraft/ flameshot*.tar.bz2 +.vscode/ +build/ +data/flatpak/.flatpak-builder +# NVIM +*~ # End of https://www.gitignore.io/api/snapcraft diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 9d4c8f5e..00000000 --- a/.travis.yml +++ /dev/null @@ -1,98 +0,0 @@ -dist: xenial -sudo: required - -language: cpp - -branches: - only: - - master - -cache: - directories: - - $HOME/.cache - -env: - global: - # Environment variables for packaging - - PRODUCT=flameshot - - VERSION=0.6.0 - - RELEASE=1 - - ARCH=x86_64 - # Dockerfile from https://github.com/flameshotapp/flameshot-docker-images - - DOCKER_REPO=vitzy/flameshot - # Option: wetransfer.com, file.io, 0x0.st, transfer.sh - - UPLOAD_SERVICE=wetransfer.com - -# The actual list of distribution is available on -# https://hub.docker.com/r/vitzy/flameshot/tags/ -matrix: - include: - - os: linux - # 28 - env: OS=fedora DIST=28 EXTEN=rpm - services: docker - - os: linux - # 29 - env: OS=fedora DIST=29 EXTEN=rpm - services: docker - - os: linux - # 30 - env: OS=fedora DIST=30 EXTEN=rpm - services: docker - - os: linux - # 16.04 LTS - env: OS=ubuntu DIST=xenial EXTEN=deb - services: docker - - os: linux - # 18.04 LTS - env: OS=ubuntu DIST=bionic EXTEN=deb - services: docker - - os: linux - # 19.04 - env: OS=ubuntu DIST=disco EXTEN=deb - services: docker - - os: linux - # 8 - env: OS=debian DIST=jessie EXTEN=deb - services: docker - - os: linux - # 9 - env: OS=debian DIST=stretch EXTEN=deb - services: docker - - os: linux - # No docker environment, just for CI build & test - # ubuntu xenial; default Qt version is 5.6.1 - env: OS=ubuntu DIST=xenial EXTEN=other -# - os: osx -# compiler: clang -# osx_image: xcode9.2 - -before_install: - - export ROOT_PATH="$(pwd)" - - chmod +x .travis/*.sh - - chmod +x .travis/services/*.sh - - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then source .travis/linux_before_install.sh; fi - -install: - - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then source .travis/linux_install.sh; fi - -script: -# - git submodule update --init --recursive -# - git describe --long - - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then source .travis/linux_script.sh; fi -# - if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then source .travis/osx_script.sh; fi - -after_success: - - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then source .travis/linux_after_success.sh; fi - - echo "Download URL is $TEMP_DOWNLOAD_URL ." - -# deploy: -# # Deploy packages to Github Release -# provider: releases -# api_key: "GITHUB ENCYPTED OAUTH TOKEN" -# file_glob: true -# file: dist/*.{deb,rpm,AppImage,dmg} -# skip_cleanup: true -# on: -# tags: true -# branch: master diff --git a/.travis/linux_after_success.sh b/.travis/linux_after_success.sh deleted file mode 100644 index 8d101d33..00000000 --- a/.travis/linux_after_success.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -- - -set -e - -DIST_PATH=dist - -if [[ "${EXTEN}" == "other" ]]; then - cp "${BUILD_DST_PATH}/flameshot" "${ROOT_PATH}/.travis/services/flameshot_${VERSION}_${ARCH}" - cd "${ROOT_PATH}/.travis/services" - TEMP_DOWNLOAD_URL=$(travis_retry bash \ - "${ROOT_PATH}/.travis/services/${UPLOAD_SERVICE}.sh" \ - flameshot_"${VERSION}_${ARCH}") -else - case "${OS}" in - "ubuntu"|"debian") - cp "${DIST_PATH}/flameshot_${VERSION}_${DIST}_${ARCH}.${EXTEN}" "${ROOT_PATH}/.travis/services/flameshot_${VERSION}_${DIST}_${ARCH}.${EXTEN}" - cd "${ROOT_PATH}/.travis/services" - TEMP_DOWNLOAD_URL=$(travis_retry bash \ - "${ROOT_PATH}/.travis/services/${UPLOAD_SERVICE}.sh" \ - "flameshot_${VERSION}_${DIST}_${ARCH}.${EXTEN}") - ;; - "fedora") - cp "${DIST_PATH}/flameshot_${VERSION}_fedora${DIST}_${ARCH}.${EXTEN}" "${ROOT_PATH}/.travis/services/flameshot_${VERSION}_fedora${DIST}_${ARCH}.${EXTEN}" - cd "${ROOT_PATH}/.travis/services" - TEMP_DOWNLOAD_URL=$(travis_retry bash \ - "${ROOT_PATH}/.travis/services/${UPLOAD_SERVICE}.sh" \ - "flameshot_${VERSION}_fedora${DIST}_${ARCH}.${EXTEN}") - ;; - esac -fi - diff --git a/.travis/linux_before_install.sh b/.travis/linux_before_install.sh deleted file mode 100644 index 68e6cc53..00000000 --- a/.travis/linux_before_install.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -- - -set -e - -if [[ "${EXTEN}" == "other" ]]; then - travis_retry sudo apt update -fi diff --git a/.travis/linux_install.sh b/.travis/linux_install.sh deleted file mode 100644 index f0006ea1..00000000 --- a/.travis/linux_install.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -- - -set -e - -if [[ "${EXTEN}" == "other" ]]; then - # Compile-time - travis_retry sudo apt install -y gcc g++ build-essential qt5-default qt5-qmake qttools5-dev-tools - # Run-time - travis_retry sudo apt install -y libqt5dbus5 libqt5network5 libqt5core5a libqt5widgets5 libqt5gui5 libqt5svg5-dev - # Optional - travis_retry sudo apt install -y openssl ca-certificates - # Install fcitx-frontend-qt5 - travis_retry sudo apt install -y fcitx-frontend-qt5 - -fi diff --git a/.travis/linux_script.sh b/.travis/linux_script.sh deleted file mode 100644 index 8b1b29a2..00000000 --- a/.travis/linux_script.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash -- - -set -e - -DIST_PATH=dist - -if [[ ! -d "${DIST_PATH}" ]]; then - mkdir "${DIST_PATH}" -fi - -if [[ "${EXTEN}" == "other" ]]; then - project_dir="$(pwd)" - BUILD_DST_PATH=build-test - - qmake --version - mkdir "${BUILD_DST_PATH}" - qmake -makefile DESTDIR="${BUILD_DST_PATH}" "${project_dir}"/flameshot.pro - # Building flameshot - make -j$(nproc) - # Running flameshot tests - make check -j$(nproc) - ls -alhR - -else - travis_retry git clone https://github.com/flameshotapp/packpack.git - travis_retry packpack/packpack - pwd && ls - - case "${OS}" in - "ubuntu"|"debian") - # copy deb to dist path for distribution - cp \ - build/flameshot_*_*.deb \ - "${DIST_PATH}"/flameshot_${VERSION}_${DIST}_${ARCH}.${EXTEN} - ;; - "fedora") - cp \ - build/flameshot-${VERSION}-${RELEASE}.*.${ARCH}.rpm \ - "${DIST_PATH}"/flameshot_${VERSION}_fedora${DIST}_${ARCH}.${EXTEN} - ;; - esac -fi diff --git a/.travis/osx_script.sh b/.travis/osx_script.sh deleted file mode 100644 index 49bf68af..00000000 --- a/.travis/osx_script.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/bash -- - -set -e - -project_dir="$(pwd)" - -brew update > /dev/null -brew install qt -QTDIR=/usr/local/opt/qt -PATH="${QTDIR}"/bin:"${PATH}" -LDFLAGS=-L"${QTDIR}"/lib -CPPFLAGS=-I"${QTDIR}"/include - -# Build your app -cd "${project_dir}" -mkdir dist -mkdir build -cd build -qmake -version -qmake CONFIG-=debug CONFIG+=release CONFIG+=packaging ../flameshot.pro -make -j$(nproc) - -git clone https://github.com/aurelien-rainone/macdeployqtfix.git -pwd -ls - -ls /Users/travis/build/ZetaoYang/flameshot - -# Package DMG from build/flamshot.app directory -"${QTDIR}"/bin/macdeployqt flameshot.app -python \ - "${project_dir}"/build/macdeployqtfix/macdeployqtfix.py \ - flameshot.app/Contents/MacOS/flameshot \ - "${QTDIR}" - -cd "${project_dir}"/build -mkdir -p distrib/Flameshot -cd distrib/Flameshot -mv "${project_dir}"/build/flameshot.app "${project_dir}"/build/distrib/Flameshot/ -cp "${project_dir}"/LICENSE LICENSE -cp "${project_dir}"/README.md README.md -echo "${VERSION}" > version -echo "${TRAVIS_COMMIT}" >> version - -ln -s /Applications ./Applications - -cd .. -hdiutil create -srcfolder ./Flameshot -format UDBZ ./flameshot.dmg -mv flameshot.dmg flameshot_X64_${VERSION}.dmg -mv flameshot_X64_${VERSION}.dmg "${project_dir}"/dist/flameshot_X64_$VERSION.dmg -TEMP_DOWNLOAD_URL=$(curl \ - --upload-file \ - flameshot_X64_$VERSION.dmg \ - "https://transfer.sh/flameshot_X64_$VERSION.dmg") -cd .. diff --git a/.travis/services/0x0.st.sh b/.travis/services/0x0.st.sh deleted file mode 100644 index c2f5ad09..00000000 --- a/.travis/services/0x0.st.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -#=============================================================== -# File URLs are valid for at least 30 days and up to a year (see below). -# Shortened URLs do not expire. -# Maximum file size: 512.0 MiB -# Blocked file types: application/x-dosexec, application/x-executable -#=============================================================== - -URL="https://0x0.st" - -if [ $# -eq 0 ]; then - echo "Usage: 0x0.st FILE\n" - exit 1 -fi - -FILE=$1 - -if [ ! -f "$FILE" ]; then - echo "File ${FILE} not found" - exit 1 -fi - -RESPONSE=$(curl -# -F "file=@${FILE}" "${URL}") - -echo "${RESPONSE}" # to terminal diff --git a/.travis/services/file.io.sh b/.travis/services/file.io.sh deleted file mode 100644 index ec55d921..00000000 --- a/.travis/services/file.io.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -#========================================== -# 100 uploads per day, 5GB file size limit for FREE plan. -#========================================== - -URL="https://file.io" -DEFAULT_EXPIRE="14d" # Default to 14 days - -if [ $# -eq 0 ]; then - echo "Usage: file.io FILE [DURATION]\n" - echo "Example: file.io path/to/my/file 1w\n" - exit 1 -fi - -FILE=$1 -EXPIRE=${2:-$DEFAULT_EXPIRE} - -if [ ! -f "$FILE" ]; then - echo "File ${FILE} not found" - exit 1 -fi - -RESPONSE=$(curl -# -F "file=@${FILE}" "${URL}/?expires=${EXPIRE}") - -echo "${RESPONSE}" # to terminal diff --git a/.travis/services/transfer.sh.sh b/.travis/services/transfer.sh.sh deleted file mode 100644 index 082ac8c4..00000000 --- a/.travis/services/transfer.sh.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -URL="https://transfer.sh" - -if [ $# -eq 0 ]; then - echo "Usage: transfer.sh FILE\n" - exit 1 -fi - -FILE=$1 - -if [ ! -f "$FILE" ]; then - echo "File ${FILE} not found" - exit 1 -fi - -RESPONSE=$(curl -# -F "file=@${FILE}" "${URL}") - -echo "${RESPONSE}" # to terminal \ No newline at end of file diff --git a/.travis/services/transferwee.py b/.travis/services/transferwee.py deleted file mode 100755 index 3bf4fc30..00000000 --- a/.travis/services/transferwee.py +++ /dev/null @@ -1,330 +0,0 @@ -#!/usr/bin/env python3.7 - -# -# Copyright (c) 2018-2019 Leonardo Taccari -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS -# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -# - - -""" -Download/upload files via wetransfer.com - -transferwee is a script/module to download/upload files via wetransfer.com. - -It exposes `download' and `upload' subcommands, respectively used to download -files from a `we.tl' or `wetransfer.com/downloads' URLs and upload files that -will be shared via emails or link. -""" - - -from typing import List -import os.path -import urllib.parse -import zlib - -import requests - - -WETRANSFER_API_URL = 'https://wetransfer.com/api/v4/transfers' -WETRANSFER_DOWNLOAD_URL = WETRANSFER_API_URL + '/{transfer_id}/download' -WETRANSFER_UPLOAD_EMAIL_URL = WETRANSFER_API_URL + '/email' -WETRANSFER_UPLOAD_LINK_URL = WETRANSFER_API_URL + '/link' -WETRANSFER_FILES_URL = WETRANSFER_API_URL + '/{transfer_id}/files' -WETRANSFER_PART_PUT_URL = WETRANSFER_FILES_URL + '/{file_id}/part-put-url' -WETRANSFER_FINALIZE_MPP_URL = WETRANSFER_FILES_URL + '/{file_id}/finalize-mpp' -WETRANSFER_FINALIZE_URL = WETRANSFER_API_URL + '/{transfer_id}/finalize' - -WETRANSFER_DEFAULT_CHUNK_SIZE = 5242880 - - -def download_url(url: str) -> str: - """Given a wetransfer.com download URL download return the downloadable URL. - - The URL should be of the form `https://we.tl/' or - `https://wetransfer.com/downloads/'. If it is a short URL (i.e. `we.tl') - the redirect is followed in order to retrieve the corresponding - `wetransfer.com/downloads/' URL. - - The following type of URLs are supported: - - `https://we.tl/`: - received via link upload, via email to the sender and printed by - `upload` action - - `https://wetransfer.com//`: - directly not shared in any ways but the short URLs actually redirect to - them - - `https://wetransfer.com///`: - received via email by recipients when the files are shared via email - upload - - Return the download URL (AKA `direct_link') as a str or None if the URL - could not be parsed. - """ - # Follow the redirect if we have a short URL - if url.startswith('https://we.tl/'): - r = requests.head(url, allow_redirects=True) - url = r.url - - recipient_id = None - params = url.replace('https://wetransfer.com/downloads/', '').split('/') - - if len(params) == 2: - transfer_id, security_hash = params - elif len(params) == 3: - transfer_id, recipient_id, security_hash = params - else: - return None - - j = { - "security_hash": security_hash, - } - if recipient_id: - j["recipient_id"] = recipient_id - r = requests.post(WETRANSFER_DOWNLOAD_URL.format(transfer_id=transfer_id), - json=j) - - j = r.json() - return j.get('direct_link') - - -def download(url: str) -> None: - """Given a `we.tl/' or `wetransfer.com/downloads/' download it. - - First a direct link is retrieved (via download_url()), the filename will - be extracted to it and it will be fetched and stored on the current - working directory. - """ - dl_url = download_url(url) - file = urllib.parse.urlparse(dl_url).path.split('/')[-1] - - r = requests.get(dl_url, stream=True) - with open(file, 'wb') as f: - for chunk in r.iter_content(chunk_size=1024): - f.write(chunk) - - -def _file_name_and_size(file: str) -> dict: - """Given a file, prepare the "name" and "size" dictionary. - - Return a dictionary with "name" and "size" keys. - """ - filename = os.path.basename(file) - filesize = os.path.getsize(file) - - return { - "name": filename, - "size": filesize - } - - -def _prepare_email_upload(filenames: List[str], message: str, - sender: str, recipients: List[str]) -> str: - """Given a list of filenames, message a sender and recipients prepare for - the email upload. - - Return the parsed JSON response. - """ - j = { - "files": [_file_name_and_size(f) for f in filenames], - "from": sender, - "message": message, - "recipients": recipients, - "ui_language": "en", - } - - r = requests.post(WETRANSFER_UPLOAD_EMAIL_URL, json=j) - return r.json() - - -def _prepare_link_upload(filenames: List[str], message: str) -> str: - """Given a list of filenames and a message prepare for the link upload. - - Return the parsed JSON response. - """ - j = { - "files": [_file_name_and_size(f) for f in filenames], - "message": message, - "ui_language": "en", - } - - r = requests.post(WETRANSFER_UPLOAD_LINK_URL, json=j) - return r.json() - - -def _prepare_file_upload(transfer_id: str, file: str) -> str: - """Given a transfer_id and file prepare it for the upload. - - Return the parsed JSON response. - """ - j = _file_name_and_size(file) - r = requests.post(WETRANSFER_FILES_URL.format(transfer_id=transfer_id), - json=j) - return r.json() - - -def _upload_chunks(transfer_id: str, file_id: str, file: str, - default_chunk_size: int = WETRANSFER_DEFAULT_CHUNK_SIZE) -> str: - """Given a transfer_id, file_id and file upload it. - - Return the parsed JSON response. - """ - f = open(file, 'rb') - - chunk_number = 0 - while True: - chunk = f.read(default_chunk_size) - chunk_size = len(chunk) - if chunk_size == 0: - break - chunk_number += 1 - - j = { - "chunk_crc": zlib.crc32(chunk), - "chunk_number": chunk_number, - "chunk_size": chunk_size, - "retries": 0 - } - - r = requests.post( - WETRANSFER_PART_PUT_URL.format(transfer_id=transfer_id, - file_id=file_id), - json=j) - url = r.json().get('url') - r = requests.options(url, - headers={ - 'Origin': 'https://wetransfer.com', - 'Access-Control-Request-Method': 'PUT', - }) - r = requests.put(url, data=chunk) - - j = { - 'chunk_count': chunk_number - } - r = requests.put( - WETRANSFER_FINALIZE_MPP_URL.format(transfer_id=transfer_id, - file_id=file_id), - json=j) - - return r.json() - - -def _finalize_upload(transfer_id: str) -> str: - """Given a transfer_id finalize the upload. - - Return the parsed JSON response. - """ - r = requests.put(WETRANSFER_FINALIZE_URL.format(transfer_id=transfer_id)) - - return r.json() - - -def upload(files: List[str], message: str = '', sender: str = None, - recipients: List[str] = []) -> str: - """Given a list of files upload them and return the corresponding URL. - - Also accepts optional parameters: - - `message': message used as a description of the transfer - - `sender': email address used to receive an ACK if the upload is - successfull. For every download by the recipients an email - will be also sent - - `recipients': list of email addresses of recipients. When the upload - succeed every recipients will receive an email with a link - - If both sender and recipient parameters are passed the email upload will be - used. Otherwise, the link upload will be used. - - Return the short URL of the transfer on success. - """ - - # Check that all files exists - for f in files: - if not os.path.exists(f): - return None - - # Check that there are no duplicates filenames - # (despite possible different dirname()) - filenames = [os.path.basename(f) for f in files] - if len(files) != len(set(filenames)): - return None - - transfer_id = None - if sender and recipients: - # email upload - transfer_id = \ - _prepare_email_upload(filenames, message, sender, recipients)['id'] - else: - # link upload - transfer_id = _prepare_link_upload(filenames, message)['id'] - - for f in files: - file_id = _prepare_file_upload(transfer_id, os.path.basename(f))['id'] - _upload_chunks(transfer_id, file_id, f) - - return _finalize_upload(transfer_id)['shortened_url'] - - -if __name__ == '__main__': - import argparse - - ap = argparse.ArgumentParser( - prog='transferwee', - description='Download/upload files via wetransfer.com' - ) - sp = ap.add_subparsers(dest='action', help='action') - - # download subcommand - dp = sp.add_parser('download', help='download files') - dp.add_argument('-g', action='store_true', - help='only print the direct link (without downloading it)') - dp.add_argument('url', nargs='+', type=str, metavar='url', - help='URL (we.tl/... or wetransfer.com/downloads/...)') - - # upload subcommand - up = sp.add_parser('upload', help='upload files') - up.add_argument('-m', type=str, default='', metavar='message', - help='message description for the transfer') - up.add_argument('-f', type=str, metavar='from', help='sender email') - up.add_argument('-t', nargs='+', type=str, metavar='to', - help='recipient emails') - up.add_argument('files', nargs='+', type=str, metavar='file', - help='files to upload') - - args = ap.parse_args() - - if args.action == 'download': - if args.g: - for u in args.url: - print(download_url(u)) - else: - for u in args.url: - download(u) - exit(0) - - if args.action == 'upload': - print(upload(args.files, args.m, args.f, args.t)) - exit(0) - - # No action selected, print help message - ap.print_help() - exit(1) diff --git a/.travis/services/wetransfer.com.sh b/.travis/services/wetransfer.com.sh deleted file mode 100755 index e730f46d..00000000 --- a/.travis/services/wetransfer.com.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -#========================================================================================================================= -# WeTransfer is a service to send big or small files from A to B. -# It can transfer any type of file - such as presentations, photos, videos, music or documents - to friends and colleagues. -# You can send files up to 2 GB and they will be available for 7 days, with no registration. - -# API doc: https://developers.wetransfer.com/documentation -# Using transferwee.py: https://github.com/iamleot/transferwee -#========================================================================================================================= - -if [ $# -eq 0 ]; then - echo "Usage: python3 transferwee.py FILE\n" - exit 1 -fi - -FILE=$1 - -if [ ! -f "$FILE" ]; then - echo "File ${FILE} not found" - exit 1 -fi - -RESPONSE=$(python3 transferwee.py upload "${FILE}") - -echo "${RESPONSE}" # to terminal diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 00000000..75877649 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,25 @@ +cmake_minimum_required(VERSION 3.13) + +project( + flameshot + VERSION 0.8.0 + LANGUAGES CXX) + +include(cmake/StandardProjectSettings.cmake) + +add_library(project_options INTERFACE) +target_compile_features(project_options INTERFACE cxx_std_17) + +add_library(project_warnings INTERFACE) + +# standard compiler warnings +include(cmake/CompilerWarnings.cmake) +# set_project_warnings(project_warnings) + +# sanitizer options if supported by compiler +include(cmake/Sanitizers.cmake) +# enable_sanitizers(project_options) + +# allow for static analysis options include(cmake/StaticAnalyzers.cmake) + +add_subdirectory(src) diff --git a/README.md b/README.md index 9960ca13..faeeb82d 100644 --- a/README.md +++ b/README.md @@ -247,9 +247,9 @@ To build the application in your system, you'll need to install the dependencies #### Compile-time -- Qt >= 5.3 +- Qt >= 5.9 + Development tools -- GCC >= 4.9.2 +- GCC >= 7.4 #### Run-time @@ -308,7 +308,7 @@ After installing all the dependencies, finally run the following commands in the ```shell mkdir build cd build -qmake ../ +cmake ../ make ``` @@ -316,23 +316,6 @@ make Simply use `make install` with privileges. -## Packaging - -Having `git` installed is required if you're building Flameshot from a snapshot to have precise version information. - -In order to generate the instructions in the `Makefile` to install the application in `/usr` instead of in `/usr/local` you can pass the `packaging` option to `qmake` (`qmake CONFIG+=packaging`). - -If you want to install in a custom directory you can use the `INSTALL_ROOT` variable. - -**Example**: - -If you want to install Flameshot in `~/myBuilds/test`, you can execute the following to do so: - -```shell -qmake CONFIG+=packaging -make INSTALL_ROOT=~/myBuilds/test install -``` - ## License - The main code is licensed under [GPLv3](LICENSE) - The logo of Flameshot is licensed under [Free Art License v1.3](img/app/flameshotLogoLicense.txt) @@ -348,15 +331,11 @@ Info: If I take code from your project and that implies a relicense to GPLv3, yo If you want to contribute check the [CONTRIBUTING.md](CONTRIBUTING.md) -## Donations -I improve Flameshot in my free time because I want to create something good for everyone to use. -If you want you can donate some bucks with the following options: -- [Paypal](https://www.paypal.me/lupoDharkael) -- bitcoin:1K6oiUKWVjP3x9ZuW9C7NbDfcFkMx3G8ue ## Acknowledgment -I really appreciate those who have shown interest in the early development process: +Thanks to those who have shown interest in the early development process: +- [lupoDharkael](https://github.com/lupoDharkael) - [Cosmo](https://github.com/philpem) - [XerTheSquirrel](https://github.com/XerTheSquirrel) - [The members of Sugus GNU/Linux](https://github.com/SUGUS-GNULinux) diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index d2b6560d..00000000 --- a/appveyor.yml +++ /dev/null @@ -1,72 +0,0 @@ -image: Visual Studio 2015 - -version: 0.6.{build}.0 -# Major_Version_Number.Minor_Version_Number.Build_Number.Revision_Number - -branches: - only: - - master - -environment: - COMPILER: msvc - VSVER: 14 - - matrix: - - QT: C:\Qt\5.9\msvc2015_64 - PLATFORM: amd64 - - QT: C:\Qt\5.9\msvc2015 - PLATFORM: x86 -init: - - ps: | - $version = new-object System.Version $env:APPVEYOR_BUILD_VERSION - $packageVersion = "{0}.{1}.{2}" -f $version.Major, $version.Minor, $version.Revision - $env:build_number = $version.Build - $env:flameshot_version = $packageVersion - -# scripts that run after cloning repository -install: - - set PATH=%QT%\bin\;C:\Qt\Tools\QtCreator\bin\;C:\Qt\QtIFW3.0.1\bin\;%PATH% - -# scripts that run before build -before_build: - - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %PLATFORM% - # After calling vcvarsall.bat, %PLATFORM% will be X64 or x86 - - qmake --version - - mkdir build - - cd build - - if "%PLATFORM%" EQU "X64" (qmake -r -spec win32-msvc CONFIG+=x86_64 CONFIG-=debug CONFIG+=release ../flameshot.pro) - - if "%PLATFORM%" EQU "x86" (qmake -r -spec win32-msvc CONFIG+=Win32 CONFIG-=debug CONFIG+=release ../flameshot.pro) - -# custom build scripts -build_script: - - nmake - -# scripts that run after build -after_build: - # Clone OpenSSL DLLs - - git clone https://github.com/tamlok/openssl-utils.git openssl-utils.git - - mkdir distrib\flameshot - - windeployqt.exe --dir .\distrib\flameshot %APPVEYOR_BUILD_FOLDER%\build\release\flameshot.exe - - copy "%APPVEYOR_BUILD_FOLDER%\build\release\flameshot.exe" "distrib\flameshot\flameshot.exe" - - copy "%APPVEYOR_BUILD_FOLDER%\README.md" "distrib\flameshot\README.md" - - copy "%APPVEYOR_BUILD_FOLDER%\LICENSE" "distrib\flameshot\LICENSE.txt" - - echo %flameshot_version% > "distrib\flameshot\version.txt" - - echo Build:%build_number% >> "distrib\flameshot\version.txt" - - echo %APPVEYOR_REPO_COMMIT% >> "distrib\flameshot\version.txt" - - copy "distrib\flameshot\flameshot.exe" "distrib\flameshot_win_%PLATFORM%.exe" - - copy "%APPVEYOR_BUILD_FOLDER%\build\translations\Internationalization_*.qm" "distrib\flameshot\translations" - # Delete translations\qt_*.qm - - del /F /Q "distrib\flameshot\translations\qt_*.qm" - # Copy OpenSSL DLLs - - if "%PLATFORM%" EQU "X64" (xcopy "openssl-utils.git\win64\*.dll" "distrib\flameshot") - - if "%PLATFORM%" EQU "x86" (xcopy "openssl-utils.git\win32\*.dll" "distrib\flameshot") - - cd distrib - - 7z a flameshot_%flameshot_version%_win_%PLATFORM%.zip flameshot - - appveyor-retry curl --upload-file ./flameshot_%flameshot_version%_win_%PLATFORM%.zip https://transfer.sh/flameshot_%flameshot_version%_win_%PLATFORM%.zip - - -# artifacts: -# - path: build\distrib\flameshot_win_%PLATFORM%_portable_%flameshot_version%.zip -# name: portable -# - path: build\distrib\flameshot_win_%PLATFORM%.exe -# name: exe_only diff --git a/cmake/CompilerWarnings.cmake b/cmake/CompilerWarnings.cmake new file mode 100644 index 00000000..d933ce30 --- /dev/null +++ b/cmake/CompilerWarnings.cmake @@ -0,0 +1,78 @@ +# from here: +# +# https://github.com/lefticus/cppbestpractices/blob/master/02-Use_the_Tools_Avai lable.md + +function(set_project_warnings project_name) + option(WARNINGS_AS_ERRORS "Treat compiler warnings as errors" TRUE) + + set(MSVC_WARNINGS + /W4 # Baseline reasonable warnings + /w14242 # 'identifier': conversion from 'type1' to 'type1', possible loss of data + /w14254 # 'operator': conversion from 'type1:field_bits' to 'type2:field_bits', possible loss of data + /w14263 # 'function': member function does not override any base class virtual member function + /w14265 # 'classname': class has virtual functions, but destructor is not virtual instances of this class may not + # be destructed correctly + /w14287 # 'operator': unsigned/negative constant mismatch + /we4289 # nonstandard extension used: 'variable': loop control variable declared in the for-loop is used outside + # the for-loop scope + /w14296 # 'operator': expression is always 'boolean_value' + /w14311 # 'variable': pointer truncation from 'type1' to 'type2' + /w14545 # expression before comma evaluates to a function which is missing an argument list + /w14546 # function call before comma missing argument list + /w14547 # 'operator': operator before comma has no effect; expected operator with side-effect + /w14549 # 'operator': operator before comma has no effect; did you intend 'operator'? + /w14555 # expression has no effect; expected expression with side- effect + /w14619 # pragma warning: there is no warning number 'number' + /w14640 # Enable warning on thread un-safe static member initialization + /w14826 # Conversion from 'type1' to 'type_2' is sign-extended. This may cause unexpected runtime behavior. + /w14905 # wide string literal cast to 'LPSTR' + /w14906 # string literal cast to 'LPWSTR' + /w14928 # illegal copy-initialization; more than one user-defined conversion has been implicitly applied + /permissive- # standards conformance mode for MSVC compiler. + ) + + set(CLANG_WARNINGS + -Wall + -Wextra # reasonable and standard + -Wshadow # warn the user if a variable declaration shadows one from a parent context + -Wnon-virtual-dtor # warn the user if a class with virtual functions has a non-virtual destructor. This helps + # catch hard to track down memory errors + -Wold-style-cast # warn for c-style casts + -Wcast-align # warn for potential performance problem casts + -Wunused # warn on anything being unused + -Woverloaded-virtual # warn if you overload (not override) a virtual function + -Wpedantic # warn if non-standard C++ is used + -Wconversion # warn on type conversions that may lose data + -Wsign-conversion # warn on sign conversions + -Wnull-dereference # warn if a null dereference is detected + -Wdouble-promotion # warn if float is implicit promoted to double + -Wformat=2 # warn on security issues around functions that format output (ie printf) + ) + + if(WARNINGS_AS_ERRORS) + set(CLANG_WARNINGS ${CLANG_WARNINGS} -Werror) + set(MSVC_WARNINGS ${MSVC_WARNINGS} /WX) + endif() + + set(GCC_WARNINGS + ${CLANG_WARNINGS} + -Wmisleading-indentation # warn if indentation implies blocks where blocks do not exist + -Wduplicated-cond # warn if if / else chain has duplicated conditions + -Wduplicated-branches # warn if if / else branches have duplicated code + -Wlogical-op # warn about logical operations being used where bitwise were probably wanted + -Wuseless-cast # warn if you perform a cast to the same type + ) + + if(MSVC) + set(PROJECT_WARNINGS ${MSVC_WARNINGS}) + elseif(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang") + set(PROJECT_WARNINGS ${CLANG_WARNINGS}) + elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + set(PROJECT_WARNINGS ${GCC_WARNINGS}) + else() + message(AUTHOR_WARNING "No compiler warnings set for '${CMAKE_CXX_COMPILER_ID}' compiler.") + endif() + + target_compile_options(${project_name} INTERFACE ${PROJECT_WARNINGS}) + +endfunction() diff --git a/cmake/Sanitizers.cmake b/cmake/Sanitizers.cmake new file mode 100644 index 00000000..dda0d26c --- /dev/null +++ b/cmake/Sanitizers.cmake @@ -0,0 +1,66 @@ +function(enable_sanitizers project_name) + + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES ".*Clang") + option(ENABLE_COVERAGE "Enable coverage reporting for gcc/clang" FALSE) + + if(ENABLE_COVERAGE) + target_compile_options(${project_name} INTERFACE --coverage -O0 -g) + target_link_libraries(${project_name} INTERFACE --coverage) + endif() + + set(SANITIZERS "") + + option(ENABLE_SANITIZER_ADDRESS "Enable address sanitizer" FALSE) + if(ENABLE_SANITIZER_ADDRESS) + list(APPEND SANITIZERS "address") + endif() + + option(ENABLE_SANITIZER_LEAK "Enable leak sanitizer" FALSE) + if(ENABLE_SANITIZER_LEAK) + list(APPEND SANITIZERS "leak") + endif() + + option(ENABLE_SANITIZER_UNDEFINED_BEHAVIOR "Enable undefined behavior sanitizer" FALSE) + if(ENABLE_SANITIZER_UNDEFINED_BEHAVIOR) + list(APPEND SANITIZERS "undefined") + endif() + + option(ENABLE_SANITIZER_THREAD "Enable thread sanitizer" FALSE) + if(ENABLE_SANITIZER_THREAD) + if("address" IN_LIST SANITIZERS OR "leak" IN_LIST SANITIZERS) + message(WARNING "Thread sanitizer does not work with Address and Leak sanitizer enabled") + else() + list(APPEND SANITIZERS "thread") + endif() + endif() + + option(ENABLE_SANITIZER_MEMORY "Enable memory sanitizer" FALSE) + if(ENABLE_SANITIZER_MEMORY AND CMAKE_CXX_COMPILER_ID MATCHES ".*Clang") + if("address" IN_LIST SANITIZERS + OR "thread" IN_LIST SANITIZERS + OR "leak" IN_LIST SANITIZERS) + message(WARNING "Memory sanitizer does not work with Address, Thread and Leak sanitizer enabled") + else() + list(APPEND SANITIZERS "memory") + endif() + endif() + + list( + JOIN + SANITIZERS + "," + LIST_OF_SANITIZERS) + + endif() + + if(LIST_OF_SANITIZERS) + if(NOT + "${LIST_OF_SANITIZERS}" + STREQUAL + "") + target_compile_options(${project_name} INTERFACE -fsanitize=${LIST_OF_SANITIZERS}) + target_link_libraries(${project_name} INTERFACE -fsanitize=${LIST_OF_SANITIZERS}) + endif() + endif() + +endfunction() \ No newline at end of file diff --git a/cmake/StandardProjectSettings.cmake b/cmake/StandardProjectSettings.cmake new file mode 100644 index 00000000..743b0712 --- /dev/null +++ b/cmake/StandardProjectSettings.cmake @@ -0,0 +1,34 @@ +# Set a default build type if none was specified +if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + message(STATUS "Setting build type to 'RelWithDebInfo' as none was specified.") + set(CMAKE_BUILD_TYPE + RelWithDebInfo + CACHE STRING "Choose the type of build." FORCE) + # Set the possible values of build type for cmake-gui, ccmake + set_property( + CACHE CMAKE_BUILD_TYPE + PROPERTY STRINGS + "Debug" + "Release" + "MinSizeRel" + "RelWithDebInfo") +endif() + +# Generate compile_commands.json to make it easier to work with clang based tools +set(CMAKE_EXPORT_COMPILE_COMMANDS ON) + +option(ENABLE_IPO "Enable Interprocedural Optimization, aka Link Time Optimization (LTO)" OFF) + +if(ENABLE_IPO) + include(CheckIPOSupported) + check_ipo_supported( + RESULT + result + OUTPUT + output) + if(result) + set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE) + else() + message(SEND_ERROR "IPO is not supported: ${output}") + endif() +endif() \ No newline at end of file diff --git a/cmake/StaticAnalyzers.cmake b/cmake/StaticAnalyzers.cmake new file mode 100644 index 00000000..43964447 --- /dev/null +++ b/cmake/StaticAnalyzers.cmake @@ -0,0 +1,37 @@ +option(ENABLE_CPPCHECK "Enable static analysis with cppcheck" OFF) +option(ENABLE_CLANG_TIDY "Enable static analysis with clang-tidy" OFF) +option(ENABLE_INCLUDE_WHAT_YOU_USE "Enable static analysis with include-what-you-use" OFF) + +if(ENABLE_CPPCHECK) + find_program(CPPCHECK cppcheck) + if(CPPCHECK) + set(CMAKE_CXX_CPPCHECK + ${CPPCHECK} + --suppress=missingInclude + --enable=all + --inline-suppr + --inconclusive + -i + ${CMAKE_SOURCE_DIR}/imgui/lib) + else() + message(SEND_ERROR "cppcheck requested but executable not found") + endif() +endif() + +if(ENABLE_CLANG_TIDY) + find_program(CLANGTIDY clang-tidy) + if(CLANGTIDY) + set(CMAKE_CXX_CLANG_TIDY ${CLANGTIDY} -extra-arg=-Wno-unknown-warning-option) + else() + message(SEND_ERROR "clang-tidy requested but executable not found") + endif() +endif() + +if(ENABLE_INCLUDE_WHAT_YOU_USE) + find_program(INCLUDE_WHAT_YOU_USE include-what-you-use) + if(INCLUDE_WHAT_YOU_USE) + set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE ${INCLUDE_WHAT_YOU_USE}) + else() + message(SEND_ERROR "include-what-you-use requested but executable not found") + endif() +endif() diff --git a/dbus/make/org.dharkael.Flameshot.service b/data/dbus/make/org.dharkael.Flameshot.service similarity index 100% rename from dbus/make/org.dharkael.Flameshot.service rename to data/dbus/make/org.dharkael.Flameshot.service diff --git a/dbus/org.dharkael.Flameshot.xml b/data/dbus/org.dharkael.Flameshot.xml similarity index 100% rename from dbus/org.dharkael.Flameshot.xml rename to data/dbus/org.dharkael.Flameshot.xml diff --git a/dbus/org.freedesktop.Notifications.xml b/data/dbus/org.freedesktop.Notifications.xml similarity index 100% rename from dbus/org.freedesktop.Notifications.xml rename to data/dbus/org.freedesktop.Notifications.xml diff --git a/dbus/other-path/service-gen.sh b/data/dbus/other-path/service-gen.sh similarity index 100% rename from dbus/other-path/service-gen.sh rename to data/dbus/other-path/service-gen.sh diff --git a/dbus/package/org.dharkael.Flameshot.service b/data/dbus/package/org.dharkael.Flameshot.service similarity index 100% rename from dbus/package/org.dharkael.Flameshot.service rename to data/dbus/package/org.dharkael.Flameshot.service diff --git a/debian/changelog b/data/debian/changelog similarity index 100% rename from debian/changelog rename to data/debian/changelog diff --git a/debian/compat b/data/debian/compat similarity index 100% rename from debian/compat rename to data/debian/compat diff --git a/debian/control b/data/debian/control similarity index 100% rename from debian/control rename to data/debian/control diff --git a/debian/copyright b/data/debian/copyright similarity index 100% rename from debian/copyright rename to data/debian/copyright diff --git a/debian/docs b/data/debian/docs similarity index 100% rename from debian/docs rename to data/debian/docs diff --git a/debian/rules b/data/debian/rules similarity index 100% rename from debian/rules rename to data/debian/rules diff --git a/debian/source/format b/data/debian/source/format similarity index 100% rename from debian/source/format rename to data/debian/source/format diff --git a/data/flatpak/org.flameshot.flameshot.yml b/data/flatpak/org.flameshot.flameshot.yml new file mode 100644 index 00000000..0adef6bd --- /dev/null +++ b/data/flatpak/org.flameshot.flameshot.yml @@ -0,0 +1,19 @@ +app-id: org.flameshot.app +runtime: org.kde.Platform +runtime-version: '5.14' +sdk: org.kde.Sdk +command: flameshot +finish-args: + - --share=ipc + - --socket=x11 + - --socket=wayland + - --filesystem=host +modules: + - name: flameshot + buildsystem: cmake-ninja + config-opts: + - -DCMAKE_BUILD_TYPE=RelWithDebInfo + sources: + - type: git + url: https://github.com/borgmanJeremy/flameshot/ + branch: master diff --git a/graphics.qrc b/data/graphics.qrc similarity index 96% rename from graphics.qrc rename to data/graphics.qrc index 87a2a790..14e7d803 100644 --- a/graphics.qrc +++ b/data/graphics.qrc @@ -64,5 +64,7 @@ img/material/white/circle-outline.svg img/material/white/blur.svg img/material/white/arrow-bottom-left.svg + img/material/black/circlecount-outline.svg + img/material/white/circlecount-outline.svg diff --git a/img/app/flameshot.ico b/data/img/app/flameshot.ico similarity index 100% rename from img/app/flameshot.ico rename to data/img/app/flameshot.ico diff --git a/img/app/flameshot.png b/data/img/app/flameshot.png similarity index 100% rename from img/app/flameshot.png rename to data/img/app/flameshot.png diff --git a/img/app/flameshot.svg b/data/img/app/flameshot.svg similarity index 100% rename from img/app/flameshot.svg rename to data/img/app/flameshot.svg diff --git a/img/app/flameshotLogoLicense.txt b/data/img/app/flameshotLogoLicense.txt similarity index 100% rename from img/app/flameshotLogoLicense.txt rename to data/img/app/flameshotLogoLicense.txt diff --git a/img/hicolor/128x128/apps/flameshot.png b/data/img/hicolor/128x128/apps/flameshot.png similarity index 100% rename from img/hicolor/128x128/apps/flameshot.png rename to data/img/hicolor/128x128/apps/flameshot.png diff --git a/img/hicolor/48x48/apps/flameshot.png b/data/img/hicolor/48x48/apps/flameshot.png similarity index 100% rename from img/hicolor/48x48/apps/flameshot.png rename to data/img/hicolor/48x48/apps/flameshot.png diff --git a/img/hicolor/scalable/apps/flameshot.svg b/data/img/hicolor/scalable/apps/flameshot.svg similarity index 100% rename from img/hicolor/scalable/apps/flameshot.svg rename to data/img/hicolor/scalable/apps/flameshot.svg diff --git a/img/material/LICENSE.txt b/data/img/material/LICENSE.txt similarity index 100% rename from img/material/LICENSE.txt rename to data/img/material/LICENSE.txt diff --git a/img/material/README.md b/data/img/material/README.md similarity index 100% rename from img/material/README.md rename to data/img/material/README.md diff --git a/img/material/black/arrow-bottom-left.png b/data/img/material/black/arrow-bottom-left.png similarity index 100% rename from img/material/black/arrow-bottom-left.png rename to data/img/material/black/arrow-bottom-left.png diff --git a/img/material/black/arrow-bottom-left.svg b/data/img/material/black/arrow-bottom-left.svg similarity index 100% rename from img/material/black/arrow-bottom-left.svg rename to data/img/material/black/arrow-bottom-left.svg diff --git a/img/material/black/blur.png b/data/img/material/black/blur.png similarity index 100% rename from img/material/black/blur.png rename to data/img/material/black/blur.png diff --git a/img/material/black/blur.svg b/data/img/material/black/blur.svg similarity index 100% rename from img/material/black/blur.svg rename to data/img/material/black/blur.svg diff --git a/img/material/black/circle-outline.png b/data/img/material/black/circle-outline.png similarity index 100% rename from img/material/black/circle-outline.png rename to data/img/material/black/circle-outline.png diff --git a/img/material/black/circle-outline.svg b/data/img/material/black/circle-outline.svg similarity index 100% rename from img/material/black/circle-outline.svg rename to data/img/material/black/circle-outline.svg diff --git a/data/img/material/black/circlecount-outline.png b/data/img/material/black/circlecount-outline.png new file mode 100644 index 00000000..d81063cd Binary files /dev/null and b/data/img/material/black/circlecount-outline.png differ diff --git a/data/img/material/black/circlecount-outline.svg b/data/img/material/black/circlecount-outline.svg new file mode 100644 index 00000000..e9273516 --- /dev/null +++ b/data/img/material/black/circlecount-outline.svg @@ -0,0 +1,79 @@ + + + + + + image/svg+xml + + + + + + + + + + + 1 + diff --git a/img/material/black/close.png b/data/img/material/black/close.png similarity index 100% rename from img/material/black/close.png rename to data/img/material/black/close.png diff --git a/img/material/black/close.svg b/data/img/material/black/close.svg similarity index 100% rename from img/material/black/close.svg rename to data/img/material/black/close.svg diff --git a/img/material/black/cloud-upload.png b/data/img/material/black/cloud-upload.png similarity index 100% rename from img/material/black/cloud-upload.png rename to data/img/material/black/cloud-upload.png diff --git a/img/material/black/cloud-upload.svg b/data/img/material/black/cloud-upload.svg similarity index 100% rename from img/material/black/cloud-upload.svg rename to data/img/material/black/cloud-upload.svg diff --git a/img/material/black/colorize.png b/data/img/material/black/colorize.png similarity index 100% rename from img/material/black/colorize.png rename to data/img/material/black/colorize.png diff --git a/img/material/black/colorize.svg b/data/img/material/black/colorize.svg similarity index 100% rename from img/material/black/colorize.svg rename to data/img/material/black/colorize.svg diff --git a/img/material/black/config.png b/data/img/material/black/config.png similarity index 100% rename from img/material/black/config.png rename to data/img/material/black/config.png diff --git a/img/material/black/config.svg b/data/img/material/black/config.svg similarity index 100% rename from img/material/black/config.svg rename to data/img/material/black/config.svg diff --git a/img/material/black/content-copy.png b/data/img/material/black/content-copy.png similarity index 100% rename from img/material/black/content-copy.png rename to data/img/material/black/content-copy.png diff --git a/img/material/black/content-copy.svg b/data/img/material/black/content-copy.svg similarity index 100% rename from img/material/black/content-copy.svg rename to data/img/material/black/content-copy.svg diff --git a/img/material/black/content-save.png b/data/img/material/black/content-save.png similarity index 100% rename from img/material/black/content-save.png rename to data/img/material/black/content-save.png diff --git a/img/material/black/content-save.svg b/data/img/material/black/content-save.svg similarity index 100% rename from img/material/black/content-save.svg rename to data/img/material/black/content-save.svg diff --git a/img/material/black/cursor-move.png b/data/img/material/black/cursor-move.png similarity index 100% rename from img/material/black/cursor-move.png rename to data/img/material/black/cursor-move.png diff --git a/img/material/black/cursor-move.svg b/data/img/material/black/cursor-move.svg similarity index 100% rename from img/material/black/cursor-move.svg rename to data/img/material/black/cursor-move.svg diff --git a/img/material/black/exit-to-app.png b/data/img/material/black/exit-to-app.png similarity index 100% rename from img/material/black/exit-to-app.png rename to data/img/material/black/exit-to-app.png diff --git a/img/material/black/exit-to-app.svg b/data/img/material/black/exit-to-app.svg similarity index 100% rename from img/material/black/exit-to-app.svg rename to data/img/material/black/exit-to-app.svg diff --git a/img/material/black/format-text.svg b/data/img/material/black/format-text.svg similarity index 100% rename from img/material/black/format-text.svg rename to data/img/material/black/format-text.svg diff --git a/img/material/black/format_bold.png b/data/img/material/black/format_bold.png similarity index 100% rename from img/material/black/format_bold.png rename to data/img/material/black/format_bold.png diff --git a/img/material/black/format_bold.svg b/data/img/material/black/format_bold.svg similarity index 100% rename from img/material/black/format_bold.svg rename to data/img/material/black/format_bold.svg diff --git a/img/material/black/format_italic.png b/data/img/material/black/format_italic.png similarity index 100% rename from img/material/black/format_italic.png rename to data/img/material/black/format_italic.png diff --git a/img/material/black/format_italic.svg b/data/img/material/black/format_italic.svg similarity index 100% rename from img/material/black/format_italic.svg rename to data/img/material/black/format_italic.svg diff --git a/img/material/black/format_strikethrough.png b/data/img/material/black/format_strikethrough.png similarity index 100% rename from img/material/black/format_strikethrough.png rename to data/img/material/black/format_strikethrough.png diff --git a/img/material/black/format_strikethrough.svg b/data/img/material/black/format_strikethrough.svg similarity index 100% rename from img/material/black/format_strikethrough.svg rename to data/img/material/black/format_strikethrough.svg diff --git a/img/material/black/format_underlined.png b/data/img/material/black/format_underlined.png similarity index 100% rename from img/material/black/format_underlined.png rename to data/img/material/black/format_underlined.png diff --git a/img/material/black/format_underlined.svg b/data/img/material/black/format_underlined.svg similarity index 100% rename from img/material/black/format_underlined.svg rename to data/img/material/black/format_underlined.svg diff --git a/img/material/black/graphics.png b/data/img/material/black/graphics.png similarity index 100% rename from img/material/black/graphics.png rename to data/img/material/black/graphics.png diff --git a/img/material/black/graphics.svg b/data/img/material/black/graphics.svg similarity index 100% rename from img/material/black/graphics.svg rename to data/img/material/black/graphics.svg diff --git a/img/material/black/line.png b/data/img/material/black/line.png similarity index 100% rename from img/material/black/line.png rename to data/img/material/black/line.png diff --git a/img/material/black/line.svg b/data/img/material/black/line.svg similarity index 100% rename from img/material/black/line.svg rename to data/img/material/black/line.svg diff --git a/img/material/black/marker.png b/data/img/material/black/marker.png similarity index 100% rename from img/material/black/marker.png rename to data/img/material/black/marker.png diff --git a/img/material/black/marker.svg b/data/img/material/black/marker.svg similarity index 100% rename from img/material/black/marker.svg rename to data/img/material/black/marker.svg diff --git a/img/material/black/mouse-off.svg b/data/img/material/black/mouse-off.svg similarity index 100% rename from img/material/black/mouse-off.svg rename to data/img/material/black/mouse-off.svg diff --git a/img/material/black/mouse.svg b/data/img/material/black/mouse.svg similarity index 100% rename from img/material/black/mouse.svg rename to data/img/material/black/mouse.svg diff --git a/img/material/black/name_edition.png b/data/img/material/black/name_edition.png similarity index 100% rename from img/material/black/name_edition.png rename to data/img/material/black/name_edition.png diff --git a/img/material/black/name_edition.svg b/data/img/material/black/name_edition.svg similarity index 100% rename from img/material/black/name_edition.svg rename to data/img/material/black/name_edition.svg diff --git a/img/material/black/open_with.png b/data/img/material/black/open_with.png similarity index 100% rename from img/material/black/open_with.png rename to data/img/material/black/open_with.png diff --git a/img/material/black/open_with.svg b/data/img/material/black/open_with.svg similarity index 100% rename from img/material/black/open_with.svg rename to data/img/material/black/open_with.svg diff --git a/img/material/black/pencil.png b/data/img/material/black/pencil.png similarity index 100% rename from img/material/black/pencil.png rename to data/img/material/black/pencil.png diff --git a/img/material/black/pencil.svg b/data/img/material/black/pencil.svg similarity index 100% rename from img/material/black/pencil.svg rename to data/img/material/black/pencil.svg diff --git a/img/material/black/pin.png b/data/img/material/black/pin.png similarity index 100% rename from img/material/black/pin.png rename to data/img/material/black/pin.png diff --git a/img/material/black/pin.svg b/data/img/material/black/pin.svg similarity index 100% rename from img/material/black/pin.svg rename to data/img/material/black/pin.svg diff --git a/img/material/black/redo-variant.png b/data/img/material/black/redo-variant.png similarity index 100% rename from img/material/black/redo-variant.png rename to data/img/material/black/redo-variant.png diff --git a/img/material/black/redo-variant.svg b/data/img/material/black/redo-variant.svg similarity index 100% rename from img/material/black/redo-variant.svg rename to data/img/material/black/redo-variant.svg diff --git a/img/material/black/size_indicator.png b/data/img/material/black/size_indicator.png similarity index 100% rename from img/material/black/size_indicator.png rename to data/img/material/black/size_indicator.png diff --git a/img/material/black/size_indicator.svg b/data/img/material/black/size_indicator.svg similarity index 100% rename from img/material/black/size_indicator.svg rename to data/img/material/black/size_indicator.svg diff --git a/img/material/black/square-outline.png b/data/img/material/black/square-outline.png similarity index 100% rename from img/material/black/square-outline.png rename to data/img/material/black/square-outline.png diff --git a/img/material/black/square-outline.svg b/data/img/material/black/square-outline.svg similarity index 100% rename from img/material/black/square-outline.svg rename to data/img/material/black/square-outline.svg diff --git a/img/material/black/square.png b/data/img/material/black/square.png similarity index 100% rename from img/material/black/square.png rename to data/img/material/black/square.png diff --git a/img/material/black/square.svg b/data/img/material/black/square.svg similarity index 100% rename from img/material/black/square.svg rename to data/img/material/black/square.svg diff --git a/img/material/black/text.png b/data/img/material/black/text.png similarity index 100% rename from img/material/black/text.png rename to data/img/material/black/text.png diff --git a/img/material/black/text.svg b/data/img/material/black/text.svg similarity index 100% rename from img/material/black/text.svg rename to data/img/material/black/text.svg diff --git a/img/material/black/undo-variant.png b/data/img/material/black/undo-variant.png similarity index 100% rename from img/material/black/undo-variant.png rename to data/img/material/black/undo-variant.png diff --git a/img/material/black/undo-variant.svg b/data/img/material/black/undo-variant.svg similarity index 100% rename from img/material/black/undo-variant.svg rename to data/img/material/black/undo-variant.svg diff --git a/img/material/white/arrow-bottom-left.png b/data/img/material/white/arrow-bottom-left.png similarity index 100% rename from img/material/white/arrow-bottom-left.png rename to data/img/material/white/arrow-bottom-left.png diff --git a/img/material/white/arrow-bottom-left.svg b/data/img/material/white/arrow-bottom-left.svg similarity index 100% rename from img/material/white/arrow-bottom-left.svg rename to data/img/material/white/arrow-bottom-left.svg diff --git a/img/material/white/blur.png b/data/img/material/white/blur.png similarity index 100% rename from img/material/white/blur.png rename to data/img/material/white/blur.png diff --git a/img/material/white/blur.svg b/data/img/material/white/blur.svg similarity index 100% rename from img/material/white/blur.svg rename to data/img/material/white/blur.svg diff --git a/img/material/white/circle-outline.png b/data/img/material/white/circle-outline.png similarity index 100% rename from img/material/white/circle-outline.png rename to data/img/material/white/circle-outline.png diff --git a/img/material/white/circle-outline.svg b/data/img/material/white/circle-outline.svg similarity index 100% rename from img/material/white/circle-outline.svg rename to data/img/material/white/circle-outline.svg diff --git a/data/img/material/white/circlecount-outline.png b/data/img/material/white/circlecount-outline.png new file mode 100644 index 00000000..e6156ae8 Binary files /dev/null and b/data/img/material/white/circlecount-outline.png differ diff --git a/data/img/material/white/circlecount-outline.svg b/data/img/material/white/circlecount-outline.svg new file mode 100644 index 00000000..e19f14e8 --- /dev/null +++ b/data/img/material/white/circlecount-outline.svg @@ -0,0 +1,79 @@ + + + + + + image/svg+xml + + + + + + + + + + + 1 + diff --git a/img/material/white/close.png b/data/img/material/white/close.png similarity index 100% rename from img/material/white/close.png rename to data/img/material/white/close.png diff --git a/img/material/white/close.svg b/data/img/material/white/close.svg similarity index 100% rename from img/material/white/close.svg rename to data/img/material/white/close.svg diff --git a/img/material/white/cloud-upload.png b/data/img/material/white/cloud-upload.png similarity index 100% rename from img/material/white/cloud-upload.png rename to data/img/material/white/cloud-upload.png diff --git a/img/material/white/cloud-upload.svg b/data/img/material/white/cloud-upload.svg similarity index 100% rename from img/material/white/cloud-upload.svg rename to data/img/material/white/cloud-upload.svg diff --git a/img/material/white/colorize.png b/data/img/material/white/colorize.png similarity index 100% rename from img/material/white/colorize.png rename to data/img/material/white/colorize.png diff --git a/img/material/white/colorize.svg b/data/img/material/white/colorize.svg similarity index 100% rename from img/material/white/colorize.svg rename to data/img/material/white/colorize.svg diff --git a/img/material/white/config.png b/data/img/material/white/config.png similarity index 100% rename from img/material/white/config.png rename to data/img/material/white/config.png diff --git a/img/material/white/config.svg b/data/img/material/white/config.svg similarity index 100% rename from img/material/white/config.svg rename to data/img/material/white/config.svg diff --git a/img/material/white/content-copy.png b/data/img/material/white/content-copy.png similarity index 100% rename from img/material/white/content-copy.png rename to data/img/material/white/content-copy.png diff --git a/img/material/white/content-copy.svg b/data/img/material/white/content-copy.svg similarity index 100% rename from img/material/white/content-copy.svg rename to data/img/material/white/content-copy.svg diff --git a/img/material/white/content-save.png b/data/img/material/white/content-save.png similarity index 100% rename from img/material/white/content-save.png rename to data/img/material/white/content-save.png diff --git a/img/material/white/content-save.svg b/data/img/material/white/content-save.svg similarity index 100% rename from img/material/white/content-save.svg rename to data/img/material/white/content-save.svg diff --git a/img/material/white/cursor-move.png b/data/img/material/white/cursor-move.png similarity index 100% rename from img/material/white/cursor-move.png rename to data/img/material/white/cursor-move.png diff --git a/img/material/white/cursor-move.svg b/data/img/material/white/cursor-move.svg similarity index 100% rename from img/material/white/cursor-move.svg rename to data/img/material/white/cursor-move.svg diff --git a/img/material/white/exit-to-app.png b/data/img/material/white/exit-to-app.png similarity index 100% rename from img/material/white/exit-to-app.png rename to data/img/material/white/exit-to-app.png diff --git a/img/material/white/exit-to-app.svg b/data/img/material/white/exit-to-app.svg similarity index 100% rename from img/material/white/exit-to-app.svg rename to data/img/material/white/exit-to-app.svg diff --git a/img/material/white/format-text.png b/data/img/material/white/format-text.png similarity index 100% rename from img/material/white/format-text.png rename to data/img/material/white/format-text.png diff --git a/img/material/white/format-text.svg b/data/img/material/white/format-text.svg similarity index 100% rename from img/material/white/format-text.svg rename to data/img/material/white/format-text.svg diff --git a/img/material/white/format_bold.png b/data/img/material/white/format_bold.png similarity index 100% rename from img/material/white/format_bold.png rename to data/img/material/white/format_bold.png diff --git a/img/material/white/format_bold.svg b/data/img/material/white/format_bold.svg similarity index 100% rename from img/material/white/format_bold.svg rename to data/img/material/white/format_bold.svg diff --git a/img/material/white/format_italic.png b/data/img/material/white/format_italic.png similarity index 100% rename from img/material/white/format_italic.png rename to data/img/material/white/format_italic.png diff --git a/img/material/white/format_italic.svg b/data/img/material/white/format_italic.svg similarity index 100% rename from img/material/white/format_italic.svg rename to data/img/material/white/format_italic.svg diff --git a/img/material/white/format_strikethrough.png b/data/img/material/white/format_strikethrough.png similarity index 100% rename from img/material/white/format_strikethrough.png rename to data/img/material/white/format_strikethrough.png diff --git a/img/material/white/format_strikethrough.svg b/data/img/material/white/format_strikethrough.svg similarity index 100% rename from img/material/white/format_strikethrough.svg rename to data/img/material/white/format_strikethrough.svg diff --git a/img/material/white/format_underlined.png b/data/img/material/white/format_underlined.png similarity index 100% rename from img/material/white/format_underlined.png rename to data/img/material/white/format_underlined.png diff --git a/img/material/white/format_underlined.svg b/data/img/material/white/format_underlined.svg similarity index 100% rename from img/material/white/format_underlined.svg rename to data/img/material/white/format_underlined.svg diff --git a/img/material/white/graphics.png b/data/img/material/white/graphics.png similarity index 100% rename from img/material/white/graphics.png rename to data/img/material/white/graphics.png diff --git a/img/material/white/graphics.svg b/data/img/material/white/graphics.svg similarity index 100% rename from img/material/white/graphics.svg rename to data/img/material/white/graphics.svg diff --git a/img/material/white/line.png b/data/img/material/white/line.png similarity index 100% rename from img/material/white/line.png rename to data/img/material/white/line.png diff --git a/img/material/white/line.svg b/data/img/material/white/line.svg similarity index 100% rename from img/material/white/line.svg rename to data/img/material/white/line.svg diff --git a/img/material/white/marker.png b/data/img/material/white/marker.png similarity index 100% rename from img/material/white/marker.png rename to data/img/material/white/marker.png diff --git a/img/material/white/marker.svg b/data/img/material/white/marker.svg similarity index 100% rename from img/material/white/marker.svg rename to data/img/material/white/marker.svg diff --git a/img/material/white/mouse-off.svg b/data/img/material/white/mouse-off.svg similarity index 100% rename from img/material/white/mouse-off.svg rename to data/img/material/white/mouse-off.svg diff --git a/img/material/white/mouse.svg b/data/img/material/white/mouse.svg similarity index 100% rename from img/material/white/mouse.svg rename to data/img/material/white/mouse.svg diff --git a/img/material/white/name_edition.png b/data/img/material/white/name_edition.png similarity index 100% rename from img/material/white/name_edition.png rename to data/img/material/white/name_edition.png diff --git a/img/material/white/name_edition.svg b/data/img/material/white/name_edition.svg similarity index 100% rename from img/material/white/name_edition.svg rename to data/img/material/white/name_edition.svg diff --git a/img/material/white/open_with.png b/data/img/material/white/open_with.png similarity index 100% rename from img/material/white/open_with.png rename to data/img/material/white/open_with.png diff --git a/img/material/white/open_with.svg b/data/img/material/white/open_with.svg similarity index 100% rename from img/material/white/open_with.svg rename to data/img/material/white/open_with.svg diff --git a/img/material/white/pencil.png b/data/img/material/white/pencil.png similarity index 100% rename from img/material/white/pencil.png rename to data/img/material/white/pencil.png diff --git a/img/material/white/pencil.svg b/data/img/material/white/pencil.svg similarity index 100% rename from img/material/white/pencil.svg rename to data/img/material/white/pencil.svg diff --git a/img/material/white/pin.png b/data/img/material/white/pin.png similarity index 100% rename from img/material/white/pin.png rename to data/img/material/white/pin.png diff --git a/img/material/white/pin.svg b/data/img/material/white/pin.svg similarity index 100% rename from img/material/white/pin.svg rename to data/img/material/white/pin.svg diff --git a/img/material/white/redo-variant.png b/data/img/material/white/redo-variant.png similarity index 100% rename from img/material/white/redo-variant.png rename to data/img/material/white/redo-variant.png diff --git a/img/material/white/redo-variant.svg b/data/img/material/white/redo-variant.svg similarity index 100% rename from img/material/white/redo-variant.svg rename to data/img/material/white/redo-variant.svg diff --git a/img/material/white/size_indicator.png b/data/img/material/white/size_indicator.png similarity index 100% rename from img/material/white/size_indicator.png rename to data/img/material/white/size_indicator.png diff --git a/img/material/white/size_indicator.svg b/data/img/material/white/size_indicator.svg similarity index 100% rename from img/material/white/size_indicator.svg rename to data/img/material/white/size_indicator.svg diff --git a/img/material/white/square-outline.png b/data/img/material/white/square-outline.png similarity index 100% rename from img/material/white/square-outline.png rename to data/img/material/white/square-outline.png diff --git a/img/material/white/square-outline.svg b/data/img/material/white/square-outline.svg similarity index 100% rename from img/material/white/square-outline.svg rename to data/img/material/white/square-outline.svg diff --git a/img/material/white/square.png b/data/img/material/white/square.png similarity index 100% rename from img/material/white/square.png rename to data/img/material/white/square.png diff --git a/img/material/white/square.svg b/data/img/material/white/square.svg similarity index 100% rename from img/material/white/square.svg rename to data/img/material/white/square.svg diff --git a/img/material/white/text.png b/data/img/material/white/text.png similarity index 100% rename from img/material/white/text.png rename to data/img/material/white/text.png diff --git a/img/material/white/text.svg b/data/img/material/white/text.svg similarity index 100% rename from img/material/white/text.svg rename to data/img/material/white/text.svg diff --git a/img/material/white/undo-variant.png b/data/img/material/white/undo-variant.png similarity index 100% rename from img/material/white/undo-variant.png rename to data/img/material/white/undo-variant.png diff --git a/img/material/white/undo-variant.svg b/data/img/material/white/undo-variant.svg similarity index 100% rename from img/material/white/undo-variant.svg rename to data/img/material/white/undo-variant.svg diff --git a/img/preview/animatedUsage.gif b/data/img/preview/animatedUsage.gif similarity index 100% rename from img/preview/animatedUsage.gif rename to data/img/preview/animatedUsage.gif diff --git a/img/preview/usageStatic.png b/data/img/preview/usageStatic.png similarity index 100% rename from img/preview/usageStatic.png rename to data/img/preview/usageStatic.png diff --git a/rpm/flameshot.spec b/data/rpm/flameshot.spec similarity index 100% rename from rpm/flameshot.spec rename to data/rpm/flameshot.spec diff --git a/translations/Internationalization_ca.ts b/data/translations/Internationalization_ca.ts similarity index 57% rename from translations/Internationalization_ca.ts rename to data/translations/Internationalization_ca.ts index f7646be6..f69794b2 100644 --- a/translations/Internationalization_ca.ts +++ b/data/translations/Internationalization_ca.ts @@ -4,12 +4,12 @@ AppLauncher - + App Launcher Llançador d'aplicacions - + Choose an app to open the capture Trieu una aplicació per obrir la captura @@ -17,33 +17,33 @@ AppLauncherWidget - + Open With Obrir Amb - + Launch in terminal Llançament a la terminal - + Keep open after selection Segueix obert després de la selecció - - + + Error Error - + Unable to launch in terminal. No es pot iniciar a la terminal. - + Unable to write in No es pot escriure a @@ -51,12 +51,12 @@ ArrowTool - + Arrow Fletxa - + Set the Arrow as the paint tool Estableix la fletxa com a eina de dibuix @@ -64,26 +64,74 @@ BlurTool - + Blur Desenfocament - + Set Blur as the paint tool Estableix el desenfocament com a eina de dibuix + + CaptureLauncher + + + <b>Capture Mode</b> + + + + + Rectangular Region + + + + + Full Screen (All Monitors) + + + + + No Delay + + + + + second + + + + + seconds + + + + + Take new screenshot + + + + + Area: + + + + + Delay: + + + CaptureWidget - + Unable to capture screen Impossible capturar la pantalla Imposible capturar la pantalla - + Select an area with the mouse, or press Esc to exit. Press Enter to capture the screen. Press Right Click to show the color picker. @@ -92,15 +140,28 @@ Press Space to open the side panel. + + CircleCountTool + + + Circle Counter + + + + + Add an autoincrementing counter bubble + + + CircleTool - + Circle Cercle - + Set the Circle as the paint tool Estableix el cercle com a eina de dibuix @@ -108,22 +169,22 @@ Press Space to open the side panel. ConfigWindow - + Configuration Configuració - + Interface Interfície - + Filename Editor Editor de noms - + General General @@ -131,22 +192,27 @@ Press Space to open the side panel. Controller - + + &Open Launcher + + + + &Configuration &Configuració - + &Information &Informació - + &Quit &Ix - + &Take Screenshot @@ -154,12 +220,12 @@ Press Space to open the side panel. CopyTool - + Copy Copia - + Copy the selection into the clipboard @@ -167,7 +233,7 @@ Press Space to open the side panel. DBusUtils - + Unable to connect via DBus Impossible connectar mitjançant DBus @@ -175,12 +241,12 @@ Press Space to open the side panel. ExitTool - + Exit Ix - + Leave the capture screen Ix de la pantalla de captura @@ -188,47 +254,47 @@ Press Space to open the side panel. FileNameEditor - + Edit the name of your captures: Editeu el nom de les vostres captures: - + Edit: Edita: - + Preview: Previsualització: - + Save Guarda - + Saves the pattern Guarda el patró - + Reset Reinicialitza - + Restores the saved pattern Restaura el patró guardat - + Clear Neteja - + Deletes the name Elimina el patró @@ -236,141 +302,161 @@ Press Space to open the side panel. GeneneralConf - + Show help message Mostra el missatge d'ajuda - + Show the help message at the beginning in the capture mode. Mostra el missatge d'ajuda en iniciar el mode de captura. - - + + Show desktop notifications Mostra les notificacions d'escriptori - + Show tray icon Mostra la icona en la barra de tasques - + Show the systemtray icon Mostra la icona en la barra de tasques - - + + Import Importar - - - + + + Error Error - + Unable to read file. Impossible llegir el fitxer. - - + + Unable to write file. Impossible escriure al fitxer. - + Save File Guardar Arxiu - + Confirm Reset Confirmar Reset - + Are you sure you want to reset the configuration? Esteu segur que voleu reiniciar la configuració? - + Configuration File Fitxer de Configuració - + Export Exportar - + Reset Reset - + Launch at startup Llançament a l'inici - + Launch Flameshot + + + Close after capture + + + + + Close after taking a screenshot + + + + + Copy URL after upload + + + + + Copy URL and close window after upload + + ImgurUploader - + Upload to Imgur Puja a Imgur - + Uploading Image S'està pujant la imatge - + Copy URL Copia l'URL - + Open URL Obri l'URL - + Image to Clipboard. Imatge al porta-retalls. - - + + Unable to open the URL. No es pot obrir l'URL. - + URL copied to clipboard. L'URL s'ha copiat al porta-retalls. - + Screenshot copied to clipboard. La captura s'ha copiat al porta-retalls. - + Delete image @@ -378,12 +464,12 @@ Press Space to open the side panel. ImgurUploaderTool - + Image Uploader Puja la imatge - + Upload the selection to Imgur Puja la selecció a Imgur @@ -391,92 +477,97 @@ Press Space to open the side panel. InfoWindow - + About Quant a - + + SPACEBAR + + + + Right Click Clic dret - + Mouse Wheel Roda del ratolí - + Move selection 1px Mou la selecció 1 px - + Resize selection 1px Redimensiona la selecció 1 px - + Quit capture Ix de la captura - + Copy to clipboard Copia al porta-retalls - + Save selection as a file Guarda la selecció com a fitxer - + Undo the last modification Desfés l'última modificació - + Toggle visibility of sidebar with options of the selected tool - + Show color picker Mostra el selector de color - + Change the tool's thickness Canvia el gruix de l'eina - + Key Tecla - + Description Descripció - + <u><b>License</b></u> <u><b>Llicència</b></u> - + <u><b>Version</b></u> <u><b>Versió</b></u> - + <u><b>Shortcuts</b></u> <u><b>Dreceres</b></u> - + Available shortcuts in the screen capture mode. Dreceres disponibles en el mode de captura de pantalla. @@ -484,12 +575,12 @@ Press Space to open the side panel. LineTool - + Line Línia - + Set the Line as the paint tool Estableix la línia com a eina de dibuix @@ -497,12 +588,12 @@ Press Space to open the side panel. MarkerTool - + Marker Marcador - + Set the Marker as the paint tool Estableix el marcador com a eina de dibuix @@ -510,12 +601,12 @@ Press Space to open the side panel. MoveTool - + Move Mou - + Move the selection area Mou la selecció @@ -523,12 +614,12 @@ Press Space to open the side panel. PencilTool - + Pencil Llapis - + Set the Pencil as the paint tool Estableix el llapis com a eina de dibuix @@ -536,12 +627,12 @@ Press Space to open the side panel. PinTool - + Pin Tool - + Pin image on the desktop @@ -549,55 +640,61 @@ Press Space to open the side panel. QObject - + Save Error S'ha produït un error en guardar - - + + Capture saved as Anomena i guarda la captura - - + + Error trying to save as S'ha produït un error en anomenar i guardar - - - - + + + + + Unable to connect via DBus No es pot connectar mitjançant DBus - + Error Error - + Unable to write in No es pot escriure a - + Capture saved to clipboard + + + URL copied to clipboard. + L'URL s'ha copiat al porta-retalls. + RectangleTool - + Rectangle Rectangle - + Set the Rectangle as the paint tool Estableix el rectangle com a eina de dibuix @@ -605,12 +702,12 @@ Press Space to open the side panel. RedoTool - + Redo - + Redo the next modification @@ -618,12 +715,12 @@ Press Space to open the side panel. SaveTool - + Save Guarda - + Save the capture Guarda la captura @@ -631,7 +728,7 @@ Press Space to open the side panel. ScreenGrabber - + Unable to capture screen Imposible capturar la pantalla @@ -639,12 +736,12 @@ Press Space to open the side panel. SelectionTool - + Rectangular Selection Selecció rectangular - + Set Selection as the paint tool Estableix la selecció com a eina de dibuix @@ -652,22 +749,22 @@ Press Space to open the side panel. SidePanelWidget - + Active thickness: - + Active color: - + Press ESC to cancel - + Grab Color @@ -675,12 +772,12 @@ Press Space to open the side panel. SizeIndicatorTool - + Selection Size Indicator Indicador de mida de selecció - + Show the dimensions of the selection (X Y) Mostra les mides de la selecció (X Y) @@ -688,107 +785,107 @@ Press Space to open the side panel. StrftimeChooserWidget - + Century (00-99) Segle (00-99) - + Year (00-99) Any (00-99) - + Year (2000) Any (2000) - + Month Name (jan) Nom del mes (jul) - + Month Name (january) Nom del mes (juliol) - + Month (01-12) Mes (01-12) - + Week Day (1-7) Dia de la setmana (1-7) - + Week (01-53) Setmana (01-53) - + Day Name (mon) Nom del dia (dg) - + Day Name (monday) Nom del dia (diumenge) - + Day (01-31) Dia (01-31) - + Day of Month (1-31) Dia del mes (1-31) - + Day (001-366) Dia (001-366) - + Hour (00-23) Hora (00-23) - + Hour (01-12) Hora (01-12) - + Minute (00-59) Minut (00-59) - + Second (00-59) Segon (00-59) - + Full Date (%m/%d/%y) Data (%m/%d/%y) - + Full Date (%Y-%m-%d) Data (%Y-%m-%d) - + Time (%H-%M-%S) - + Time (%H-%M) @@ -796,7 +893,7 @@ Press Space to open the side panel. SystemNotification - + Flameshot Info @@ -804,22 +901,22 @@ Press Space to open the side panel. TextConfig - + StrikeOut - + Underline - + Bold - + Italic @@ -827,12 +924,12 @@ Press Space to open the side panel. TextTool - + Text - + Add text to your capture @@ -840,37 +937,37 @@ Press Space to open the side panel. UIcolorEditor - + UI Color Editor Editor de color de la interfície - + Change the color moving the selectors and see the changes in the preview buttons. Canvieu el color movent els selectors i observeu els canvis en els botons de previsualització. - + Select a Button to modify it Seleccioneu un botó per a modificar-lo - + Main Color Color principal - + Click on this button to set the edition mode of the main color. Feu clic en aquest botó per a aplicar el mode d'edició per al color principal. - + Contrast Color Color de contrast - + Click on this button to set the edition mode of the contrast color. Feu clic en aquest botó per a aplicar el mode d'edició per al color de contrast. @@ -878,12 +975,12 @@ Press Space to open the side panel. UndoTool - + Undo Desfés - + Undo the last modification Desfés l'última modificació @@ -891,17 +988,17 @@ Press Space to open the side panel. VisualsEditor - + Opacity of area outside selection: Opacitat de la zona fora de la selecció: - + Button Selection Selecció de botó - + Select All Selecciona-ho tot diff --git a/translations/Internationalization_de_DE.ts b/data/translations/Internationalization_de_DE.ts similarity index 57% rename from translations/Internationalization_de_DE.ts rename to data/translations/Internationalization_de_DE.ts index 0a6ef859..9ca35784 100644 --- a/translations/Internationalization_de_DE.ts +++ b/data/translations/Internationalization_de_DE.ts @@ -4,12 +4,12 @@ AppLauncher - + App Launcher Anwendungs Starter - + Choose an app to open the capture Wähle eine Anwendung um die Auswahl zu öffnen @@ -17,33 +17,33 @@ AppLauncherWidget - + Open With Öffne mit - + Launch in terminal Starte in der Konsole - + Keep open after selection Nach Auswahl geöffnet lassen - - + + Error Fehler - + Unable to write in Kein Schreibzugriff auf - + Unable to launch in terminal. Kann im Terminal nicht geöffnet werden. @@ -51,12 +51,12 @@ ArrowTool - + Arrow Pfeil - + Set the Arrow as the paint tool Wähle den Pfeil als Werkzeug @@ -64,25 +64,73 @@ BlurTool - + Blur Verwischen - + Set Blur as the paint tool Wähle Verwischen als Werkzeug + + CaptureLauncher + + + <b>Capture Mode</b> + + + + + Rectangular Region + + + + + Full Screen (All Monitors) + + + + + No Delay + + + + + second + + + + + seconds + + + + + Take new screenshot + + + + + Area: + + + + + Delay: + + + CaptureWidget - + Unable to capture screen Bereich kann nicht erfasst werden - + Select an area with the mouse, or press Esc to exit. Press Enter to capture the screen. Press Right Click to show the color picker. @@ -95,15 +143,28 @@ Benutze das Mausrad um die Dicke des Werkzeugs auszuwählen. Drücke die Leertaste um das Seitenmenü zu öffnen. + + CircleCountTool + + + Circle Counter + + + + + Add an autoincrementing counter bubble + + + CircleTool - + Circle Kreis - + Set the Circle as the paint tool Wähle den Kreis als Werkzeug @@ -111,22 +172,22 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. ConfigWindow - + Configuration Einstellungen - + Interface Benutzeroberfläche - + Filename Editor Dateinamen Editor - + General Allgemein @@ -134,22 +195,27 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. Controller - + &Take Screenshot &Bildschirmaufnahme anfertigen - + + &Open Launcher + + + + &Configuration &Einstellungen - + &Information &Informationen - + &Quit &Beenden @@ -157,12 +223,12 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. CopyTool - + Copy Kopieren - + Copy the selection into the clipboard Auswahl in die Zwischenablage kopieren @@ -170,7 +236,7 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. DBusUtils - + Unable to connect via DBus Kann nicht via DBus verbinden @@ -178,12 +244,12 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. ExitTool - + Exit Beenden - + Leave the capture screen Auswahl beenden @@ -191,47 +257,47 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. FileNameEditor - + Edit the name of your captures: Bearbeite den Namen deiner Aufnahmen: - + Edit: Bearbeite: - + Preview: Vorschau: - + Save Speichern - + Saves the pattern Speichere die Vorlage - + Reset Zurücksetzen - + Restores the saved pattern Setzt die gespeicherte Vorlage zurück - + Clear Löschen - + Deletes the name Löscht den Namen @@ -239,141 +305,161 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. GeneneralConf - - + + Import Importieren - - - + + + Error Fehler - + Unable to read file. Datei kann nicht gelesen werden. - - + + Unable to write file. Datei kann nicht geschrieben werden. - + Save File Datei speichern - + Confirm Reset Zurücksetzen bestätigen - + Are you sure you want to reset the configuration? Sind Sie sicher, dass sie die Konfiguration zurücksetzen wollen? - + Show help message Hilfetext anzeigen - + Show the help message at the beginning in the capture mode. Hilfetext am Start der Auswahl anzeigen. - - + + Show desktop notifications Zeige Desktopbenachrichtigungen - + Show tray icon Zeige Taskleistensymbol - + Show the systemtray icon Zeigt das Taskleistensymbol - + Configuration File Konfigurationsdatei - + Export Exportieren - + Reset Zurücksetzen - + Launch at startup Automatisch starten - + Launch Flameshot Starte Flameshot + + + Close after capture + + + + + Close after taking a screenshot + + + + + Copy URL after upload + + + + + Copy URL and close window after upload + + ImgurUploader - + Upload to Imgur Zu Imgur hochladen - + Uploading Image Bild hochladen - + Copy URL URL kopieren - + Open URL URL öffnen - + Delete image Bild löschen - + Image to Clipboard. Bild in Zwischenablage. - - + + Unable to open the URL. Kann URL nicht öffnen. - + URL copied to clipboard. URL kopiert. - + Screenshot copied to clipboard. Bildschirmaufnahme in Zwischenablage kopiert. @@ -381,12 +467,12 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. ImgurUploaderTool - + Image Uploader Bild hochladen - + Upload the selection to Imgur Auswahl zu Imgur hochladen @@ -394,97 +480,97 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. InfoWindow - + About Über - + SPACEBAR Leertaste - + - + Right Click Rechtsklick - + Mouse Wheel Mausrad - + Move selection 1px Verschiebe Auswahl um 1px - + Resize selection 1px Größenänderung um 1px - + Quit capture Auswahl verlassen - + Copy to clipboard In Zwischenablage kopieren - + Save selection as a file Speichere Auswahl als Datei - + Undo the last modification Letze Änderungen zurücksetzen - + Toggle visibility of sidebar with options of the selected tool Öffne/Schließe Seitenauswahlmenü des gewählten Werkzeugs - + Show color picker Zeige Farbauswahl - + Change the tool's thickness Ändere die Dicke des Werkzeugs - + Available shortcuts in the screen capture mode. Verfügbare Tastenkürzel im Aufnahmemodus. - + Key Taste - + Description Beschreibung - + <u><b>License</b></u> <u><b>Lizenz</b></u> - + <u><b>Version</b></u> <u><b>Version</b></u> - + <u><b>Shortcuts</b></u> <u><b>Tastenkürzel</b></u> @@ -492,12 +578,12 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. LineTool - + Line Linie - + Set the Line as the paint tool Wähle Linie als Werkzeug @@ -505,12 +591,12 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. MarkerTool - + Marker Markierer - + Set the Marker as the paint tool Wähle den Markierer als Werkzeug @@ -518,12 +604,12 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. MoveTool - + Move Bewege - + Move the selection area Bewege den Auswahlbereich @@ -531,12 +617,12 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. PencilTool - + Pencil Stift - + Set the Pencil as the paint tool Wähle den Stift als Werkzeug @@ -544,12 +630,12 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. PinTool - + Pin Tool - Pinnwand Werkzeug + Pinnwand Werkzeug - + Pin image on the desktop Pinne Bild auf den Dekstop @@ -557,55 +643,61 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. QObject - + Save Error Speicherfehler - - + + Capture saved as Aufnahme gespeichert als - + Capture saved to clipboard Aufnahme in Zwischenablage gespeichert - - + + Error trying to save as Fehler beim Speichern unter - - - - + + + + + Unable to connect via DBus Kann nicht via DBus verbinden - + Error Fehler - + Unable to write in Kein Schreibzugriff auf + + + URL copied to clipboard. + URL kopiert. + RectangleTool - + Rectangle Rechteck - + Set the Rectangle as the paint tool Wähle ausgefülltes Rechteck als Werkzeug @@ -613,12 +705,12 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. RedoTool - + Redo Wiederholen - + Redo the next modification Wiederhole die nächste Veränderung @@ -626,12 +718,12 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. SaveTool - + Save Speichern - + Save the capture Speichere die Aufnahme @@ -639,7 +731,7 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. ScreenGrabber - + Unable to capture screen Kann Bereich nicht aufnehmen @@ -647,12 +739,12 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. SelectionTool - + Rectangular Selection Rechteckige Auswahl - + Set Selection as the paint tool Wähle Rechteck als Werkzeug @@ -660,22 +752,22 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. SidePanelWidget - + Active thickness: Aktuelle Dicke - + Active color: Aktuelle Farbe: - + Press ESC to cancel Drücke ESC für Abbruch - + Grab Color Wähle Farbe @@ -683,12 +775,12 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. SizeIndicatorTool - + Selection Size Indicator Auswahlgrößen Indentifikator - + Show the dimensions of the selection (X Y) Zeige die Dimensionen der Auswahl (X Y) @@ -696,107 +788,107 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. StrftimeChooserWidget - + Century (00-99) Jarhhundert (00-99) - + Year (00-99) Jahr (00-99) - + Year (2000) Jahr (2000) - + Month Name (jan) Monatsname (Jan) - + Month Name (january) Monatsname (Januar) - + Month (01-12) Monat (01-12) - + Week Day (1-7) Wochentag (1-7) - + Week (01-53) Woche (01-53) - + Day Name (mon) Tagesname (Mon) - + Day Name (monday) Tagesname (Montag) - + Day (01-31) Tag (01-31) - + Day of Month (1-31) Tag des Monats (1-31) - + Day (001-366) Tag (001-366) - + Time (%H-%M-%S) Zeit (%H-%M-%S) - + Time (%H-%M) Zeit (%H-%M) - + Hour (00-23) Stunde (00-23) - + Hour (01-12) Stunde (01-12) - + Minute (00-59) Minute (00-59) - + Second (00-59) Sekunde (00-59) - + Full Date (%m/%d/%y) Komplettes Datum (%m/%d/%y) - + Full Date (%Y-%m-%d) Komplettes Datum (%Y-%m-%d) @@ -804,7 +896,7 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. SystemNotification - + Flameshot Info Flameshot Info @@ -812,22 +904,22 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. TextConfig - + StrikeOut Durchstreichen - + Underline Unterstrichen - + Bold Fettdruck - + Italic Kursiv @@ -835,12 +927,12 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. TextTool - + Text Text - + Add text to your capture Füge Text zur Auswahl hinzu @@ -848,37 +940,37 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. UIcolorEditor - + UI Color Editor UI Farb Editor - + Change the color moving the selectors and see the changes in the preview buttons. Ändere die Farbauswahl und betrachte die Vorschau in den Vorschau-Buttons. - + Select a Button to modify it Wähle einen Button um ihn zu verändern - + Main Color Hauptfarbe - + Click on this button to set the edition mode of the main color. Wähle diesen Button um den Bearbeitungsmodus der Hauptfarbe zu wählen. - + Contrast Color Kontrastfarbe - + Click on this button to set the edition mode of the contrast color. Wähle diesen Button um den Bearbeitungsmodus der Kontrastfarbe zu wählen. @@ -886,12 +978,12 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. UndoTool - + Undo Verwerfen - + Undo the last modification Letzte Änderung verwerfen @@ -899,17 +991,17 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. VisualsEditor - + Opacity of area outside selection: Deckkraft des Bereichs außerhalb der Auswahl: - + Button Selection Button Auswahl - + Select All Alle wählen diff --git a/translations/Internationalization_es.ts b/data/translations/Internationalization_es.ts similarity index 57% rename from translations/Internationalization_es.ts rename to data/translations/Internationalization_es.ts index 9773bb5e..5326d473 100644 --- a/translations/Internationalization_es.ts +++ b/data/translations/Internationalization_es.ts @@ -4,12 +4,12 @@ AppLauncher - + App Launcher Lanzador de Aplicaciones - + Choose an app to open the capture Elige una aplicación con la que abrir la captura @@ -17,33 +17,33 @@ AppLauncherWidget - + Open With Abrir Con - + Launch in terminal Lanzar en terminal - + Keep open after selection Mantener abierto tras la selección - - + + Error Error - + Unable to write in Imposible escribir en - + Unable to launch in terminal. Imposible lanzar en terminal. @@ -51,12 +51,12 @@ ArrowTool - + Arrow Flecha - + Set the Arrow as the paint tool Establece la Flecha como herramienta de dibujo @@ -64,25 +64,73 @@ BlurTool - + Blur Desenfoque - + Set Blur as the paint tool Establece el Desenfoque como herramienta de dibujo + + CaptureLauncher + + + <b>Capture Mode</b> + + + + + Rectangular Region + + + + + Full Screen (All Monitors) + + + + + No Delay + + + + + second + + + + + seconds + + + + + Take new screenshot + + + + + Area: + + + + + Delay: + + + CaptureWidget - + Unable to capture screen Imposible capturar la pantalla - + Select an area with the mouse, or press Esc to exit. Press Enter to capture the screen. Press Right Click to show the color picker. @@ -95,15 +143,28 @@ Usa la rueda del ratón para cambiar el grosor de la herramienta. Presiona Espacio para abrir el panel lateral. + + CircleCountTool + + + Circle Counter + + + + + Add an autoincrementing counter bubble + + + CircleTool - + Circle Círculo - + Set the Circle as the paint tool Establece el Círculo como herramienta de dibujo @@ -111,22 +172,22 @@ Presiona Espacio para abrir el panel lateral. ConfigWindow - + Configuration Configuración - + Interface Interfaz - + Filename Editor Editor de Nombre - + General General @@ -134,22 +195,27 @@ Presiona Espacio para abrir el panel lateral. Controller - + &Take Screenshot &Tomar captura de pantalla - + + &Open Launcher + + + + &Configuration &Configuración - + &Information &Información - + &Quit &Salir @@ -157,12 +223,12 @@ Presiona Espacio para abrir el panel lateral. CopyTool - + Copy Copiar - + Copy the selection into the clipboard Copia la selección al portapapeles @@ -170,7 +236,7 @@ Presiona Espacio para abrir el panel lateral. DBusUtils - + Unable to connect via DBus Imposible conectarse mediante DBus @@ -178,12 +244,12 @@ Presiona Espacio para abrir el panel lateral. ExitTool - + Exit Salir - + Leave the capture screen Salir de la pantalla de captura @@ -191,47 +257,47 @@ Presiona Espacio para abrir el panel lateral. FileNameEditor - + Edit the name of your captures: Edita el nombre de tus capturas: - + Edit: Editar: - + Preview: Previsualización: - + Save Guardar - + Saves the pattern Guarda el patrón - + Reset Reiniciar - + Restores the saved pattern Restaura el patrón guardado - + Clear Limpiar - + Deletes the name Borra el patrón @@ -239,141 +305,161 @@ Presiona Espacio para abrir el panel lateral. GeneneralConf - - + + Import Importar - - - + + + Error Error - + Unable to read file. Imposible leer el archivo. - - + + Unable to write file. Imposible escribir el archivo. - + Save File Guardar Archivo - + Confirm Reset Confirmar Reset - + Are you sure you want to reset the configuration? ¿Estás seguro de que quieres reiniciar la configuración? - + Show help message Mostrar mensaje de ayuda - + Show the help message at the beginning in the capture mode. Muestra el mensaje de ayuda al iniciar el modo de captura. - - + + Show desktop notifications Mostrar notificaciones del escritorio - + Show tray icon Mostrar icono en la barra de tareas - + Show the systemtray icon Mostrar el icono en la barra de tareas - + Configuration File Archivo de Configuración - + Export Exportar - + Reset Reset - + Launch at startup Lanzar en el arranque - + Launch Flameshot Lanzar Flameshot + + + Close after capture + + + + + Close after taking a screenshot + + + + + Copy URL after upload + + + + + Copy URL and close window after upload + + ImgurUploader - + Upload to Imgur Subir a Imgur - + Uploading Image Subiendo Imagen - + Copy URL Copiar URL - + Open URL Abrir URL - + Delete image Borrar imagen - + Image to Clipboard. Imagen al Portapapeles. - - + + Unable to open the URL. No puede abrir la URL. - + URL copied to clipboard. URL copiada al portapapeles. - + Screenshot copied to clipboard. Captura copiada al portapapeles. @@ -381,12 +467,12 @@ Presiona Espacio para abrir el panel lateral. ImgurUploaderTool - + Image Uploader Subir Imagen - + Upload the selection to Imgur Sube la selección a Imgur @@ -394,92 +480,97 @@ Presiona Espacio para abrir el panel lateral. InfoWindow - + About Información - + + SPACEBAR + + + + Right Click Click Derecho - + Mouse Wheel Rueda del Ratón - + Move selection 1px Mover la selección 1px - + Resize selection 1px Redimensionar la selección 1px - + Quit capture Salir de la captura - + Copy to clipboard Copiar al portapapeles - + Save selection as a file Guardar la selección como un archivo - + Undo the last modification Deshacer la última modificación - + Toggle visibility of sidebar with options of the selected tool Alternar la visualización de la barra lateral de opciones de la herramienta seleccionada - + Show color picker Mostrar el selector de color - + Change the tool's thickness Cambiar el grosor de la herramienta - + Available shortcuts in the screen capture mode. Atajos disponibles en el modo captura de pantalla. - + Key Tecla - + Description Descripción - + <u><b>License</b></u> <u><b>Licencia</b></u> - + <u><b>Version</b></u> <u><b>Versión</b></u> - + <u><b>Shortcuts</b></u> <u><b>Atajos</b></u> @@ -487,12 +578,12 @@ Presiona Espacio para abrir el panel lateral. LineTool - + Line Línea - + Set the Line as the paint tool Establece la Línea como herramienta de dibujo @@ -500,12 +591,12 @@ Presiona Espacio para abrir el panel lateral. MarkerTool - + Marker Marcador - + Set the Marker as the paint tool Establece el Marcador como herramienta de dibujo @@ -513,12 +604,12 @@ Presiona Espacio para abrir el panel lateral. MoveTool - + Move Mover Selección - + Move the selection area Mueve la selección @@ -526,12 +617,12 @@ Presiona Espacio para abrir el panel lateral. PencilTool - + Pencil Lápiz - + Set the Pencil as the paint tool Establece el Lápiz como herramienta de dibujo @@ -539,12 +630,12 @@ Presiona Espacio para abrir el panel lateral. PinTool - + Pin Tool Chincheta - + Pin image on the desktop Fija la imagen sobre el escritorio @@ -552,55 +643,61 @@ Presiona Espacio para abrir el panel lateral. QObject - + Save Error Error al Guardar - - + + Capture saved as Captura guardada como - + Capture saved to clipboard Captura guardada en el portapapeles - - + + Error trying to save as Error intentando guardar como - - - - + + + + + Unable to connect via DBus Imposible conectar mediante DBus - + Error Error - + Unable to write in Imposible escribir en + + + URL copied to clipboard. + URL copiada al portapapeles. + RectangleTool - + Rectangle Rectángulo - + Set the Rectangle as the paint tool Establece el Rectángulo como herramienta de dibujo @@ -608,12 +705,12 @@ Presiona Espacio para abrir el panel lateral. RedoTool - + Redo Rehacer - + Redo the next modification Rehacer la siguiente modificación @@ -621,12 +718,12 @@ Presiona Espacio para abrir el panel lateral. SaveTool - + Save Guardar - + Save the capture Guardar la captura @@ -634,7 +731,7 @@ Presiona Espacio para abrir el panel lateral. ScreenGrabber - + Unable to capture screen Imposible capturar la pantalla @@ -642,12 +739,12 @@ Presiona Espacio para abrir el panel lateral. SelectionTool - + Rectangular Selection Selección Rectangular - + Set Selection as the paint tool Establece la Selección como herramienta de dibujo @@ -655,22 +752,22 @@ Presiona Espacio para abrir el panel lateral. SidePanelWidget - + Active thickness: Espesor activo: - + Active color: Color activo: - + Press ESC to cancel Presiona ESC para cancelar - + Grab Color Tomar Color @@ -678,12 +775,12 @@ Presiona Espacio para abrir el panel lateral. SizeIndicatorTool - + Selection Size Indicator Indicador de Tamaño de Selección - + Show the dimensions of the selection (X Y) Muestra la dimensión de la selección (X Y) @@ -691,107 +788,107 @@ Presiona Espacio para abrir el panel lateral. StrftimeChooserWidget - + Century (00-99) Siglo (00-99) - + Year (00-99) Año (00-99) - + Year (2000) Año (2000) - + Month Name (jan) Nombre del Mes (jul) - + Month Name (january) Nombre del Mes (julio) - + Month (01-12) Mes (01-12) - + Week Day (1-7) Día de la Semana (1-7) - + Week (01-53) Semana (01-53) - + Day Name (mon) Nombre del Día (dom) - + Day Name (monday) Nombre del Día (domingo) - + Day (01-31) Día (01-31) - + Day of Month (1-31) Día del Mes (1-31) - + Day (001-366) Día (001-366) - + Time (%H-%M-%S) Tiempo (%H-%M-%S) - + Time (%H-%M) Tiempo (%H-%M) - + Hour (00-23) Hora (00-23) - + Hour (01-12) Hora (01-12) - + Minute (00-59) Minuto (00-59) - + Second (00-59) Segundo (00-59) - + Full Date (%m/%d/%y) Fecha (%m/%d/%y) - + Full Date (%Y-%m-%d) Fecha (%Y-%m-%d) @@ -799,7 +896,7 @@ Presiona Espacio para abrir el panel lateral. SystemNotification - + Flameshot Info Información de Flameshot @@ -807,22 +904,22 @@ Presiona Espacio para abrir el panel lateral. TextConfig - + StrikeOut Tachado - + Underline Subrayado - + Bold Negrita - + Italic Cursiva @@ -830,12 +927,12 @@ Presiona Espacio para abrir el panel lateral. TextTool - + Text Texto - + Add text to your capture Agregar texto a la captura @@ -843,37 +940,37 @@ Presiona Espacio para abrir el panel lateral. UIcolorEditor - + UI Color Editor Editor de Color de Interfaz - + Change the color moving the selectors and see the changes in the preview buttons. Cambia el color moviendo los selectores y observa los cambios en los botones de previsualización. - + Select a Button to modify it Selecciona un Botón para modificarlo - + Main Color Color Principal - + Click on this button to set the edition mode of the main color. Clica en este botón para aplicar el modo edición para el color primario. - + Contrast Color Color de Contraste - + Click on this button to set the edition mode of the contrast color. Clica en este botón para aplicar el modo edición para el color de contraste. @@ -881,12 +978,12 @@ Presiona Espacio para abrir el panel lateral. UndoTool - + Undo Deshacer - + Undo the last modification Borra la última modificación @@ -894,17 +991,17 @@ Presiona Espacio para abrir el panel lateral. VisualsEditor - + Opacity of area outside selection: Opacidad del area fuera de la selección: - + Button Selection Selección de Botón - + Select All Seleccionar Todos diff --git a/translations/Internationalization_fr.ts b/data/translations/Internationalization_fr.ts similarity index 59% rename from translations/Internationalization_fr.ts rename to data/translations/Internationalization_fr.ts index 71e776b9..41b8144f 100644 --- a/translations/Internationalization_fr.ts +++ b/data/translations/Internationalization_fr.ts @@ -4,12 +4,12 @@ AppLauncher - + App Launcher Lanceur d'applications - + Choose an app to open the capture Sélectionner une application pour ouvrir la capture @@ -17,33 +17,33 @@ AppLauncherWidget - + Open With Ouvrir Avec - + Launch in terminal Lancer dans le terminal - + Keep open after selection Maintenir ouvert après la sélection - - + + Error Erreur - + Unable to write in Imposible d'écrire dessus - + Unable to launch in terminal. Imposible de lancer dans le terminal. @@ -51,12 +51,12 @@ ArrowTool - + Arrow Flèche - + Set the Arrow as the paint tool Sélectionner l'outil Flèche @@ -64,87 +64,130 @@ BlurTool - + Blur Flou - + Set Blur as the paint tool Sélectionner l'outil Flou + + CaptureLauncher + + + <b>Capture Mode</b> + + + + + Rectangular Region + + + + + Full Screen (All Monitors) + + + + + No Delay + + + + + second + + + + + seconds + + + + + Take new screenshot + + + + + Area: + + + + + Delay: + + + CaptureWidget - + Unable to capture screen Imposible de capturer l'écran - + Select an area with the mouse, or press Esc to exit. Press Enter to capture the screen. Press Right Click to show the color picker. Use the Mouse Wheel to change the thickness of your tool. Press Space to open the side panel. Sélectionner une zone avec la souris ou appuyer sur Echap pour quitter -Appuyer sur Entrée pour capturer l'écran +Appuyer sur Entrée pour capturer l'écran Effectuer un clic droit pour afficher le sélecteur de couleurs. -Utiliser la molette de la souris pour changer l'épaisseur de l'outil. +Utiliser la molette de la souris pour changer l'épaisseur de l'outil. Appuyer sur Espace pour ouvrir le panneau latéral. + + CircleCountTool + + + Circle Counter + + + + + Add an autoincrementing counter bubble + + + CircleTool - + Circle Ellipse - + Set the Circle as the paint tool Sélectionner l'outil Ellipse - - SidePanelWidget - - - Active color: - Couleur actuelle: - - - - Press ESC to cancel - Appuyer sur Echap pour annuler - - - - Grab Color - Saisir la couleur - - ConfigWindow - + Configuration Configuration - + Interface Interface - + Filename Editor Editeur de Noms - + General Général @@ -152,22 +195,27 @@ Appuyer sur Espace pour ouvrir le panneau latéral. Controller - + &Take Screenshot &Capturer l'écran - + + &Open Launcher + + + + &Configuration &Configuration - + &Information &Informations - + &Quit &Quitter @@ -175,12 +223,12 @@ Appuyer sur Espace pour ouvrir le panneau latéral. CopyTool - + Copy Copier - + Copy the selection into the clipboard Copier la sélection dans le presse-papier @@ -188,7 +236,7 @@ Appuyer sur Espace pour ouvrir le panneau latéral. DBusUtils - + Unable to connect via DBus Imposible de se connecter via DBus @@ -196,12 +244,12 @@ Appuyer sur Espace pour ouvrir le panneau latéral. ExitTool - + Exit Sortir - + Leave the capture screen Quitter l'écran de capture @@ -209,47 +257,47 @@ Appuyer sur Espace pour ouvrir le panneau latéral. FileNameEditor - + Edit the name of your captures: Editer le nom des captures: - + Edit: Editer: - + Preview: Prévisualisation: - + Save Sauvegarder - + Saves the pattern Sauvegarder le modèle - + Reset Réinitialiser - + Restores the saved pattern Réstaurer le modèle sauvegardé - + Clear Purger - + Deletes the name Supprime le nom @@ -257,151 +305,161 @@ Appuyer sur Espace pour ouvrir le panneau latéral. GeneneralConf - - + + Import Importer - - - + + + Error Erreur - + Unable to read file. Impossible de lire le fichier. - - + + Unable to write file. Impossible d'écrire le fichier. - + Save File Sauvegarder le fichier - + Confirm Reset Confirmer la Réinitialisation - + Are you sure you want to reset the configuration? Êtes-vous sûr de vouloir réinitialiser la configuration ? - + Show help message Montrer le message d'aide - + Show the help message at the beginning in the capture mode. Afficher ce message au lancement du mode capture. - - + + Show desktop notifications Afficher les notifications du bureau - + Show tray icon Afficher les icones de la barre d'état - + Show the systemtray icon Afficher l'icône dans la barre de tâches - + Configuration File Fichier de Configuration - + Export Exporter - + Reset Réinitialiser - + Launch at startup Lancer au démarrage - + Launch Flameshot Démarrer Flameshot - + Close after capture Fermer après une capture - + Close after taking a screenshot Fermer l'application après une capture d'écran + + + Copy URL after upload + + + + + Copy URL and close window after upload + + ImgurUploader - + Upload to Imgur Mettre en ligne vers Imgur - + Uploading Image Mise en ligne de l'image - + Copy URL Copier l'URL - + Open URL Ouvrir l'URL - + Delete image - + Image to Clipboard. Image dans le Presse-papier. - - + + Unable to open the URL. Impossible d'ouvrir l'URL. - + URL copied to clipboard. URL copiée dans le Presse-papier. - + Screenshot copied to clipboard. Capture d'écran copiée dans le Presse-papier. @@ -409,12 +467,12 @@ Appuyer sur Espace pour ouvrir le panneau latéral. ImgurUploaderTool - + Image Uploader Mise en ligne d'images - + Upload the selection to Imgur Mettre en ligne la sélection vers Imgur @@ -422,92 +480,97 @@ Appuyer sur Espace pour ouvrir le panneau latéral. InfoWindow - + About À propos - + + SPACEBAR + + + + Right Click Clic Droit - + Mouse Wheel Molette de la Souris - + Move selection 1px Déplacer la sélection 1px - + Resize selection 1px Redimensionner la sélection 1px - + Quit capture Quitter la capture d'écran - + Copy to clipboard Copier vers le Presse-papier - + Save selection as a file Sauvegarder la sélection vers un fichier - + Undo the last modification Annuler la dernière modification - + Toggle visibility of sidebar with options of the selected tool - + Show color picker Afficher la palette de couleurs - + Change the tool's thickness Changer l'épaisseur des outils - + Available shortcuts in the screen capture mode. Raccourcis disponibles en mode capture d'écran. - + Key Clé - + Description Description - + <u><b>License</b></u> <u><b>Licences</b></u> - + <u><b>Version</b></u> <u><b>Version</b></u> - + <u><b>Shortcuts</b></u> <u><b>Raccourci</b></u> @@ -515,12 +578,12 @@ Appuyer sur Espace pour ouvrir le panneau latéral. LineTool - + Line Ligne - + Set the Line as the paint tool Sélectionner l'outil Ligne @@ -528,12 +591,12 @@ Appuyer sur Espace pour ouvrir le panneau latéral. MarkerTool - + Marker Surligneur - + Set the Marker as the paint tool Sélectionner l'outil Surligneur @@ -541,12 +604,12 @@ Appuyer sur Espace pour ouvrir le panneau latéral. MoveTool - + Move Déplacer - + Move the selection area Déplacer la sélection @@ -554,12 +617,12 @@ Appuyer sur Espace pour ouvrir le panneau latéral. PencilTool - + Pencil Crayon - + Set the Pencil as the paint tool Sélectionner l'outil Crayon @@ -567,12 +630,12 @@ Appuyer sur Espace pour ouvrir le panneau latéral. PinTool - + Pin Tool Outil Épinglage - + Pin image on the desktop Épingler l'image sur le bureau @@ -580,55 +643,61 @@ Appuyer sur Espace pour ouvrir le panneau latéral. QObject - + Save Error Erreur lors de la sauvegarde - - + + Capture saved as Capture d'écran sauvegardée sous - + Capture saved to clipboard Capture d'écran copiée dans le Presse-papier - - + + Error trying to save as Erreur lors de la sauvegarde sous - - - - + + + + + Unable to connect via DBus Impossible de se connecter via DBus - + Error Erreur - + Unable to write in Imposible d'écrire par dessus + + + URL copied to clipboard. + URL copiée dans le Presse-papier. + RectangleTool - + Rectangle Rectangle plein - + Set the Rectangle as the paint tool Sélectionner l'outil Rectangle plein @@ -636,12 +705,12 @@ Appuyer sur Espace pour ouvrir le panneau latéral. RedoTool - + Redo Rétablir - + Redo the next modification Refaire la prochaine modification @@ -649,12 +718,12 @@ Appuyer sur Espace pour ouvrir le panneau latéral. SaveTool - + Save Sauvegarder - + Save the capture Sauvegarder la capture d'écran @@ -662,7 +731,7 @@ Appuyer sur Espace pour ouvrir le panneau latéral. ScreenGrabber - + Unable to capture screen Imposible de capturer l'écran @@ -670,12 +739,12 @@ Appuyer sur Espace pour ouvrir le panneau latéral. SelectionTool - + Rectangular Selection Rectangle - + Set Selection as the paint tool Sélectionner l'outil Rectangle @@ -683,35 +752,35 @@ Appuyer sur Espace pour ouvrir le panneau latéral. SidePanelWidget - - Active thickness: - - - - + Active color: - + Couleur actuelle: - + Press ESC to cancel - + Appuyer sur Echap pour annuler - + Grab Color + Saisir la couleur + + + + Active thickness: SizeIndicatorTool - + Selection Size Indicator Indicateur de la taille de la sélection - + Show the dimensions of the selection (X Y) Montre les dimmensions de la sélection (X Y) @@ -719,107 +788,107 @@ Appuyer sur Espace pour ouvrir le panneau latéral. StrftimeChooserWidget - + Century (00-99) Siècle (00-99) - + Year (00-99) Année (00-99) - + Year (2000) Année (2000) - + Month Name (jan) Nom des Mois (jan) - + Month Name (january) nom des Mois (janvier) - + Month (01-12) Mois (01-12) - + Week Day (1-7) Jour de la Semaine (1-7) - + Week (01-53) Semaine (01-53) - + Day Name (mon) Nom du Jour (lun) - + Day Name (monday) Nom du Jour (lundi) - + Day (01-31) Jour (01-31) - + Day of Month (1-31) Jour du Mois (1-31) - + Day (001-366) Jour de l'année (001-366) - + Time (%H-%M-%S) Heure (%H-%M-%S) - + Time (%H-%M) Heure (%H-%M) - + Hour (00-23) Heure (00-23) - + Hour (01-12) Heure (01-12) - + Minute (00-59) Minute (00-59) - + Second (00-59) Seconde (00-59) - + Full Date (%m/%d/%y) Date (%m/%d/%y) - + Full Date (%Y-%m-%d) Date Complête (%Y-%m-%d) @@ -827,7 +896,7 @@ Appuyer sur Espace pour ouvrir le panneau latéral. SystemNotification - + Flameshot Info Info Flameshot @@ -835,22 +904,22 @@ Appuyer sur Espace pour ouvrir le panneau latéral. TextConfig - + StrikeOut Rayer - + Underline Souligner - + Bold Gras - + Italic Italique @@ -858,12 +927,12 @@ Appuyer sur Espace pour ouvrir le panneau latéral. TextTool - + Text Texte - + Add text to your capture Ajouter du texte à la capture @@ -871,37 +940,37 @@ Appuyer sur Espace pour ouvrir le panneau latéral. UIcolorEditor - + UI Color Editor Editeur de la Couleur de l'interface - + Change the color moving the selectors and see the changes in the preview buttons. Modifiez la couleur en déplaçant les sélecteur et voir les changements dans les boutons de prévisualisation. - + Select a Button to modify it Sélectionner un bouton pour le modifier - + Main Color Couleur Principale - + Click on this button to set the edition mode of the main color. Cliquer sur ce boutton pour définir le mode édition de la couleur principale. - + Contrast Color Couleur de Contraste - + Click on this button to set the edition mode of the contrast color. Cliquer sur ce boutton pour définir le mode édition de la couleur de contraste. @@ -909,12 +978,12 @@ Appuyer sur Espace pour ouvrir le panneau latéral. UndoTool - + Undo Annuler - + Undo the last modification Annuler la dernière modification @@ -922,17 +991,17 @@ Appuyer sur Espace pour ouvrir le panneau latéral. VisualsEditor - + Opacity of area outside selection: Opacité de la zone en dehors de la sélection: - + Button Selection Boutton de sélection - + Select All Sélectionner Tout diff --git a/translations/Internationalization_hu.ts b/data/translations/Internationalization_hu.ts similarity index 76% rename from translations/Internationalization_hu.ts rename to data/translations/Internationalization_hu.ts index e779ce30..e19cec20 100644 --- a/translations/Internationalization_hu.ts +++ b/data/translations/Internationalization_hu.ts @@ -1,6 +1,6 @@ - + AppLauncher @@ -61,6 +61,45 @@ Beállítja a Homályosítás eszközt festő eszközként + + CaptureLauncher + + <b>Capture Mode</b> + + + + Rectangular Region + + + + Full Screen (All Monitors) + + + + No Delay + + + + second + + + + seconds + + + + Take new screenshot + + + + Area: + + + + Delay: + + + CaptureWidget @@ -68,7 +107,7 @@ Press Enter to capture the screen. Press Right Click to show the color picker. Use the Mouse Wheel to change the thickness of your tool. - Válassz egy területet egérrel, vagy nyomj Esc-et a kilépéshez. + Válassz egy területet egérrel, vagy nyomj Esc-et a kilépéshez. Nyomj entert a felvételhez. Kattints job egérgombal a szín választásához. Használd a görgőt az eszköz vastagságának állítására. @@ -77,6 +116,25 @@ Használd a görgőt az eszköz vastagságának állítására. Unable to capture screen Nem lehet felvételt készíteni + + Select an area with the mouse, or press Esc to exit. +Press Enter to capture the screen. +Press Right Click to show the color picker. +Use the Mouse Wheel to change the thickness of your tool. +Press Space to open the side panel. + + + + + CircleCountTool + + Circle Counter + + + + Add an autoincrementing counter bubble + + CircleTool @@ -122,6 +180,14 @@ Használd a görgőt az eszköz vastagságának állítására. &Quit &Bezár + + &Take Screenshot + + + + &Open Launcher + + CopyTool @@ -131,7 +197,11 @@ Használd a görgőt az eszköz vastagságának állítására. Copies the selecion into the clipboard - Másolja a kiválasztott területet + Másolja a kiválasztott területet + + + Copy the selection into the clipboard + @@ -195,14 +265,14 @@ Használd a görgőt az eszköz vastagságának állítására. FileNameHandler screenshot - Képernyőmentés + Képernyőmentés FlameshotDBusAdapter Unable to capture screen - Nem lehet képernyőképet készíteni + Nem lehet képernyőképet készíteni @@ -275,6 +345,22 @@ Használd a görgőt az eszköz vastagságának állítására. Launch Flameshot Flameshot indítása + + Close after capture + + + + Close after taking a screenshot + + + + Copy URL after upload + + + + Copy URL and close window after upload + + ImgurUploader @@ -310,6 +396,10 @@ Használd a görgőt az eszköz vastagságának állítására. Screenshot copied to clipboard. Képernyőmentés másolva a vágólapra. + + Delete image + + ImgurUploaderTool @@ -392,6 +482,14 @@ Használd a görgőt az eszköz vastagságának állítására. Available shortcuts in the screen capture mode. Elérhető gyorsbillentyűk a képernyőfelvétel módban. + + SPACEBAR + + + + Toggle visibility of sidebar with options of the selected tool + + LineTool @@ -437,6 +535,17 @@ Használd a görgőt az eszköz vastagságának állítására. Beállítja a Ceruza eszközt festő eszközként + + PinTool + + Pin Tool + + + + Pin image on the desktop + + + QObject @@ -468,6 +577,10 @@ Használd a görgőt az eszköz vastagságának állítására. Capture saved to clipboard Felvétel mentve a vágólapra + + URL copied to clipboard. + URL másolva a vágólapra. + RectangleTool @@ -486,6 +599,10 @@ Használd a görgőt az eszköz vastagságának állítására. Redo Újra + + Redo the next modification + + SaveTool @@ -498,6 +615,13 @@ Használd a görgőt az eszköz vastagságának állítására. Menti a felvételt + + ScreenGrabber + + Unable to capture screen + + + SelectionTool @@ -509,6 +633,25 @@ Használd a görgőt az eszköz vastagságának állítására. Beállítja a Téglalapos kijelölő eszközt Festő eszközként + + SidePanelWidget + + Active thickness: + + + + Active color: + + + + Press ESC to cancel + + + + Grab Color + + + SizeIndicatorTool @@ -576,11 +719,11 @@ Használd a görgőt az eszköz vastagságának állítására. Time (%H:%M:%S) - Idő (%H:%M:%S) + Idő (%H:%M:%S) Time (%H:%M) - Idő (%H:%M) + Idő (%H:%M) Hour (00-23) @@ -606,6 +749,51 @@ Használd a görgőt az eszköz vastagságának állítására. Full Date (%Y-%m-%d) Teljes dátum (%Y-%m-%d) + + Time (%H-%M-%S) + + + + Time (%H-%M) + + + + + SystemNotification + + Flameshot Info + + + + + TextConfig + + StrikeOut + + + + Underline + + + + Bold + + + + Italic + + + + + TextTool + + Text + + + + Add text to your capture + + UIcolorEditor diff --git a/translations/Internationalization_ja.ts b/data/translations/Internationalization_ja.ts similarity index 58% rename from translations/Internationalization_ja.ts rename to data/translations/Internationalization_ja.ts index 25331690..e809e5d4 100644 --- a/translations/Internationalization_ja.ts +++ b/data/translations/Internationalization_ja.ts @@ -4,12 +4,12 @@ AppLauncher - + App Launcher アプリケーションランチャー - + Choose an app to open the capture キャプチャーを開くアプリケーションを選択する @@ -17,33 +17,33 @@ AppLauncherWidget - + Open With 次で開く - + Launch in terminal 端末内で起動する - + Keep open after selection 選択後も開いたままにする - - + + Error エラー - + Unable to launch in terminal. 端末内で起動できません。 - + Unable to write in 書き込めません: @@ -51,12 +51,12 @@ ArrowTool - + Arrow 矢印 - + Set the Arrow as the paint tool ペイントツールとして「矢印」をセットする @@ -64,25 +64,73 @@ BlurTool - + Blur ぼかし - + Set Blur as the paint tool ペイントツールとして「ぼかし」をセットする + + CaptureLauncher + + + <b>Capture Mode</b> + + + + + Rectangular Region + + + + + Full Screen (All Monitors) + + + + + No Delay + + + + + second + + + + + seconds + + + + + Take new screenshot + + + + + Area: + + + + + Delay: + + + CaptureWidget - + Unable to capture screen 画面をキャプチャーできません - + Select an area with the mouse, or press Esc to exit. Press Enter to capture the screen. Press Right Click to show the color picker. @@ -95,15 +143,28 @@ Enter を押すと画面をキャプチャー。 スペースを押すとサイドパネルを開く。 + + CircleCountTool + + + Circle Counter + + + + + Add an autoincrementing counter bubble + + + CircleTool - + Circle 円形 - + Set the Circle as the paint tool ペイントツールとして「円形」をセットする @@ -111,22 +172,22 @@ Enter を押すと画面をキャプチャー。 ConfigWindow - + Configuration 設定 - + Interface インターフェース - + Filename Editor ファイル名エディター - + General 全般 @@ -134,22 +195,27 @@ Enter を押すと画面をキャプチャー。 Controller - + &Take Screenshot スクリーンショットを撮る(&T) - + + &Open Launcher + + + + &Configuration 設定(&C) - + &Information 情報(&I) - + &Quit 終了(&Q) @@ -157,12 +223,12 @@ Enter を押すと画面をキャプチャー。 CopyTool - + Copy コピー - + Copy the selection into the clipboard 選択範囲をクリップボードにコピーする @@ -170,7 +236,7 @@ Enter を押すと画面をキャプチャー。 DBusUtils - + Unable to connect via DBus DBus に接続できません @@ -178,12 +244,12 @@ Enter を押すと画面をキャプチャー。 ExitTool - + Exit 終了 - + Leave the capture screen 画面キャプチャーを終了する @@ -191,47 +257,47 @@ Enter を押すと画面をキャプチャー。 FileNameEditor - + Edit the name of your captures: キャプチャー名の編集: - + Edit: 編集: - + Preview: プレビュー: - + Save 保存 - + Saves the pattern パターンを保存する - + Reset リセット - + Restores the saved pattern 保存されたパターンに戻す - + Clear 消去 - + Deletes the name 名前を削除する @@ -239,141 +305,161 @@ Enter を押すと画面をキャプチャー。 GeneneralConf - + Show help message ヘルプメッセージを表示する - + Show the help message at the beginning in the capture mode. キャプチャーモード開始時にヘルプメッセージを表示する。 - - + + Show desktop notifications デスクトップの通知を表示する - + Show tray icon トレイアイコンを表示する - + Show the systemtray icon システムトレイアイコンを表示する - - + + Import インポート - - - + + + Error エラー - + Unable to read file. ファイルを読み込めません。 - - + + Unable to write file. ファイルに書き込めません。 - + Save File ファイルを保存 - + Confirm Reset リセットの確認 - + Are you sure you want to reset the configuration? 設定をリセットしてもよろしいですか? - + Configuration File 設定ファイル - + Export エクスポート - + Reset リセット - + Launch at startup スタートアップ時に起動する - + Launch Flameshot Flameshot を起動する + + + Close after capture + + + + + Close after taking a screenshot + + + + + Copy URL after upload + + + + + Copy URL and close window after upload + + ImgurUploader - + Upload to Imgur Imgur にアップロード - + Uploading Image 画像をアップロード中 - + Copy URL URL をコピー - + Open URL URL を開く - + Delete image 画像を削除 - + Image to Clipboard. 画像をクリップボードへ。 - - + + Unable to open the URL. URL を開けません。 - + URL copied to clipboard. URL をクリップボードにコピーしました。 - + Screenshot copied to clipboard. スクリーンショットをクリップボードにコピーしました。 @@ -381,12 +467,12 @@ Enter を押すと画面をキャプチャー。 ImgurUploaderTool - + Image Uploader 画像アップローダー - + Upload the selection to Imgur Imgur に選択範囲をアップロードする @@ -394,92 +480,97 @@ Enter を押すと画面をキャプチャー。 InfoWindow - + About このアプリケーションについて - + + SPACEBAR + + + + Right Click 右クリック - + Mouse Wheel マウスホイール - + Move selection 1px 選択範囲を 1px 動かす - + Resize selection 1px 選択範囲を 1px リサイズする - + Quit capture キャプチャーを終了する - + Copy to clipboard クリップボードにコピーする - + Save selection as a file 選択範囲をファイルに保存する - + Undo the last modification 最後の変更を元に戻す - + Toggle visibility of sidebar with options of the selected tool - + Show color picker カラーピッカーを表示する - + Change the tool's thickness ツールの値 (太さや濃さ) を変更する - + Key キー - + Description 説明 - + <u><b>License</b></u> <u><b>ライセンス</b></u> - + <u><b>Version</b></u> <u><b>バージョン</b></u> - + <u><b>Shortcuts</b></u> <u><b>ショートカット</b></u> - + Available shortcuts in the screen capture mode. スクリーンキャプチャーモードで利用可能なショートカット。 @@ -487,12 +578,12 @@ Enter を押すと画面をキャプチャー。 LineTool - + Line 直線 - + Set the Line as the paint tool ペイントツールとして「直線」をセットする @@ -500,12 +591,12 @@ Enter を押すと画面をキャプチャー。 MarkerTool - + Marker マーカー - + Set the Marker as the paint tool ペイントツールとして「マーカー」をセットする @@ -513,12 +604,12 @@ Enter を押すと画面をキャプチャー。 MoveTool - + Move 移動 - + Move the selection area 選択範囲を移動する @@ -526,12 +617,12 @@ Enter を押すと画面をキャプチャー。 PencilTool - + Pencil 鉛筆 - + Set the Pencil as the paint tool ペイントツールとして「鉛筆」をセットする @@ -539,12 +630,12 @@ Enter を押すと画面をキャプチャー。 PinTool - + Pin Tool 固定ツール - + Pin image on the desktop 選択範囲をデスクトップ上に配置する @@ -552,55 +643,61 @@ Enter を押すと画面をキャプチャー。 QObject - + Save Error 保存エラー - - + + Capture saved as キャプチャーを保存しました: - + Capture saved to clipboard キャプチャーをクリップボードに保存しました - - + + Error trying to save as 保存時にエラーが発生しました: - - - - + + + + + Unable to connect via DBus DBus に接続できません - + Error エラー - + Unable to write in 書き込めません: + + + URL copied to clipboard. + URL をクリップボードにコピーしました。 + RectangleTool - + Rectangle 矩形 - + Set the Rectangle as the paint tool ペイントツールとして「矩形」をセットする @@ -608,12 +705,12 @@ Enter を押すと画面をキャプチャー。 RedoTool - + Redo やり直し - + Redo the next modification 次の変更にやり直す @@ -621,12 +718,12 @@ Enter を押すと画面をキャプチャー。 SaveTool - + Save 保存 - + Save the capture キャプチャーを保存する @@ -634,7 +731,7 @@ Enter を押すと画面をキャプチャー。 ScreenGrabber - + Unable to capture screen 画面をキャプチャーできません @@ -642,12 +739,12 @@ Enter を押すと画面をキャプチャー。 SelectionTool - + Rectangular Selection 矩形選択 - + Set Selection as the paint tool ペイントツールとして「矩形選択」をセットする @@ -655,22 +752,22 @@ Enter を押すと画面をキャプチャー。 SidePanelWidget - + Active thickness: - + Active color: アクティブな色: - + Press ESC to cancel ESC でキャンセル - + Grab Color 色の取得 @@ -678,12 +775,12 @@ Enter を押すと画面をキャプチャー。 SizeIndicatorTool - + Selection Size Indicator 選択サイズインジケーター - + Show the dimensions of the selection (X Y) 選択範囲の寸法 (X Y) を表示する @@ -691,107 +788,107 @@ Enter を押すと画面をキャプチャー。 StrftimeChooserWidget - + Century (00-99) 世紀 (00-99) - + Year (00-99) 年 (00-99) - + Year (2000) 年 (2000) - + Month Name (jan) 月 (jan) - + Month Name (january) 月 (january) - + Month (01-12) 月 (01-12) - + Week Day (1-7) 週日 (1-7) - + Week (01-53) 週 (01-53) - + Day Name (mon) 曜日 (月) - + Day Name (monday) 曜日 (月曜日) - + Day (01-31) 日 (01-31) - + Day of Month (1-31) 日 (1-31) - + Day (001-366) 日 (001-366) - + Time (%H-%M-%S) 時刻 (%H-%M-%S) - + Time (%H-%M) 時刻 (%H-%M) - + Hour (00-23) 時 (00-23) - + Hour (01-12) 時 (01-12) - + Minute (00-59) 分 (00-59) - + Second (00-59) 秒 (00-59) - + Full Date (%m/%d/%y) 年月日 (%m/%d/%y) - + Full Date (%Y-%m-%d) 年月日 (%Y-%m-%d) @@ -799,7 +896,7 @@ Enter を押すと画面をキャプチャー。 SystemNotification - + Flameshot Info Flameshot の情報 @@ -807,22 +904,22 @@ Enter を押すと画面をキャプチャー。 TextConfig - + StrikeOut 取り消し線 - + Underline 下線 - + Bold 太字 - + Italic 斜体 @@ -830,12 +927,12 @@ Enter を押すと画面をキャプチャー。 TextTool - + Text テキスト - + Add text to your capture キャプチャーにテキストを追加する @@ -843,37 +940,37 @@ Enter を押すと画面をキャプチャー。 UIcolorEditor - + UI Color Editor UI カラーエディター - + Change the color moving the selectors and see the changes in the preview buttons. セレクターを動かして色を変更し、プレビューボタンの色がどう変化するか確認してください。 - + Select a Button to modify it 変更するボタンを選択してください - + Main Color メインカラー - + Click on this button to set the edition mode of the main color. このボタンをクリックすると、メインカラーの編集モードをセットします。 - + Contrast Color コントラストカラー - + Click on this button to set the edition mode of the contrast color. このボタンをクリックすると、コントラストカラーの編集モードをセットします。 @@ -881,12 +978,12 @@ Enter を押すと画面をキャプチャー。 UndoTool - + Undo 元に戻す - + Undo the last modification 最後の変更を元に戻す @@ -894,17 +991,17 @@ Enter を押すと画面をキャプチャー。 VisualsEditor - + Opacity of area outside selection: 選択範囲外の不透明度: - + Button Selection ボタンの選択 - + Select All すべて選択 diff --git a/translations/Internationalization_ka.ts b/data/translations/Internationalization_ka.ts similarity index 61% rename from translations/Internationalization_ka.ts rename to data/translations/Internationalization_ka.ts index 386ff940..bb7f2da3 100644 --- a/translations/Internationalization_ka.ts +++ b/data/translations/Internationalization_ka.ts @@ -4,12 +4,12 @@ AppLauncher - + App Launcher აპლიკაციის გამშვები - + Choose an app to open the capture აირჩიეთ აპლიკაცია სურათის გასახსნელად @@ -17,33 +17,33 @@ AppLauncherWidget - + Open With გახსნა პროგრამით - + Launch in terminal ტერმინალში გაშვება - + Keep open after selection არ დახურო დიალოგი არჩევის შემდეგ - - + + Error შეცდომა - + Unable to write in შემდეგ მისამართზე ჩაწერა ვერ მოხერხდა: - + Unable to launch in terminal. ტერმინალში გაშვება ვერ მოხერხდა. @@ -51,12 +51,12 @@ ArrowTool - + Arrow ისარი - + Set the Arrow as the paint tool ისრის ხელსაწყოს არჩევა სახატავად @@ -64,25 +64,73 @@ BlurTool - + Blur გაბუნდოვნება - + Set Blur as the paint tool გაბუნდოვნების ხელსაწყოს არჩევა სახატავად + + CaptureLauncher + + + <b>Capture Mode</b> + + + + + Rectangular Region + + + + + Full Screen (All Monitors) + + + + + No Delay + + + + + second + + + + + seconds + + + + + Take new screenshot + + + + + Area: + + + + + Delay: + + + CaptureWidget - + Unable to capture screen ეკრანის გადაღება ვერ მოხერხდა - + Select an area with the mouse, or press Esc to exit. Press Enter to capture the screen. Press Right Click to show the color picker. @@ -91,15 +139,28 @@ Press Space to open the side panel. + + CircleCountTool + + + Circle Counter + + + + + Add an autoincrementing counter bubble + + + CircleTool - + Circle წრე - + Set the Circle as the paint tool წრის ხელსაწყოს არჩევა სახატავად @@ -107,22 +168,22 @@ Press Space to open the side panel. ConfigWindow - + Configuration პარამეტრები - + Interface ინტერფეისი - + Filename Editor ფაილის სახელის რედაქტორი - + General ზოგადი @@ -130,22 +191,27 @@ Press Space to open the side panel. Controller - + &Take Screenshot - + + &Open Launcher + + + + &Configuration &პარამეტრები - + &Information &ინფორმაცია - + &Quit &გამოსვლა @@ -153,12 +219,12 @@ Press Space to open the side panel. CopyTool - + Copy კოპირება - + Copy the selection into the clipboard @@ -166,7 +232,7 @@ Press Space to open the side panel. DBusUtils - + Unable to connect via DBus DBus-ით დაკავშირება ვერ მოხერხდა @@ -174,12 +240,12 @@ Press Space to open the side panel. ExitTool - + Exit გამოსვლა - + Leave the capture screen ეკრანის გადაღების დატოვება @@ -187,47 +253,47 @@ Press Space to open the side panel. FileNameEditor - + Edit the name of your captures: შეცვალეთ თქვენი სურათების სახელი: - + Edit: თარგი: - + Preview: გადახედვა: - + Save შენახვა - + Saves the pattern თარგის შენახვა - + Reset განულება - + Restores the saved pattern შენახული შაბლონის განულება - + Clear გაწმენდა - + Deletes the name სახელის წაშლა @@ -235,141 +301,161 @@ Press Space to open the side panel. GeneneralConf - - + + Import იმპორტირება - - - + + + Error შეცდომა - + Unable to read file. ფაილის წაკითხვა ვერ მოხერხდა. - - + + Unable to write file. ფაილის ჩაწერა ვერ მოხერხდა. - + Save File ფაილის შენახვა - + Confirm Reset განულების დადასტურება - + Are you sure you want to reset the configuration? დარწმუნებული ხართ, რომ გსურთ პარამეტრების განულება? - + Show help message დახმარების შეტყობინების ნახვა - + Show the help message at the beginning in the capture mode. დახმარების შეტყობინების ნახვა გადაღების რეჟიმის დაწყებისას. - - + + Show desktop notifications ცნობების ჩვენება სამუშაო მაგიდაზე - + Show tray icon ხატულის ჩვენება სისტემურ პანელზე - + Show the systemtray icon ხატულის ჩვენება სისტემურ პანელზე - + Configuration File პარამეტრების ფაილი - + Export ექსპორტირება - + Reset განულება - + Launch at startup გაშვება სისტემის ჩატვირთვისას - + Launch Flameshot + + + Close after capture + + + + + Close after taking a screenshot + + + + + Copy URL after upload + + + + + Copy URL and close window after upload + + ImgurUploader - + Upload to Imgur Imgur-ზე ატვირთვა - + Uploading Image სურათის ატვირთვა - + Copy URL URL-ის კოპირება - + Open URL URL-ის გახსნა - + Delete image - + Image to Clipboard. სურათის გაცვლის ბუფერში გაგზავნა - - + + Unable to open the URL. URL-ის გახსნა ვერ მოხერხდა. - + URL copied to clipboard. URL დაკოპირდა გაცვლის ბუფერში. - + Screenshot copied to clipboard. სურათი დაკოპირდა გაცვლის ბუფერში. @@ -377,12 +463,12 @@ Press Space to open the side panel. ImgurUploaderTool - + Image Uploader სურათის ამტვირთველი - + Upload the selection to Imgur შერჩეულის Imgur-ზე ატვირთვა @@ -390,92 +476,97 @@ Press Space to open the side panel. InfoWindow - + About პროგრამის შესახებ - + + SPACEBAR + + + + Right Click მაუსის მარჯვენა ღილაკი - + Mouse Wheel მაუსის გორგოლაჭი - + Move selection 1px შერჩეულის გადაადგილება 1px-ით - + Resize selection 1px შერჩეულის ზომის შეცვლა 1px-ით - + Quit capture გადაღებიდან გამოსვლა - + Copy to clipboard გაცვლის ბუფერში კოპირება - + Save selection as a file შერჩეულის ფაილად შენახვა - + Undo the last modification ბოლო ცვლილების გაუქმება - + Toggle visibility of sidebar with options of the selected tool - + Show color picker ფერის შესარჩევის ჩვენება - + Change the tool's thickness ხელსაწყოს სისქის შეცვლა - + Available shortcuts in the screen capture mode. გადაღების რეჟიმში ხელმისაწვდომი მალსახმობები. - + Key კლავიში - + Description აღწერა - + <u><b>License</b></u> <u><b>ლიცენზია</b></u> - + <u><b>Version</b></u> <u><b>ვერსია</b></u> - + <u><b>Shortcuts</b></u> <u><b>მალსახმობები</b></u> @@ -483,12 +574,12 @@ Press Space to open the side panel. LineTool - + Line ხაზი - + Set the Line as the paint tool ხაზის ხელსაწყოს არჩევა სახატავად @@ -496,12 +587,12 @@ Press Space to open the side panel. MarkerTool - + Marker მარკერი - + Set the Marker as the paint tool მარკერის ხელსაწყოს არჩევა სახატავად @@ -509,12 +600,12 @@ Press Space to open the side panel. MoveTool - + Move გადაადგილება - + Move the selection area შერჩეული არის გადაადგილება @@ -522,12 +613,12 @@ Press Space to open the side panel. PencilTool - + Pencil ფანქარი - + Set the Pencil as the paint tool ფანქრის ხელსაწყოს არჩევა სახატავად @@ -535,12 +626,12 @@ Press Space to open the side panel. PinTool - + Pin Tool - + Pin image on the desktop @@ -548,55 +639,61 @@ Press Space to open the side panel. QObject - + Save Error შეცდომა შენახვისას - - + + Capture saved as სურათი შენახულია როგორც: - + Capture saved to clipboard - - + + Error trying to save as შეცდომა მცდელობისას შენახულიყო როგორც: - - - - + + + + + Unable to connect via DBus DBus-ით დაკავშირება ვერ მოხერხდა - + Error შეცდომა - + Unable to write in შემდეგ მისამართზე ჩაწერა ვერ მოხერხდა: + + + URL copied to clipboard. + URL დაკოპირდა გაცვლის ბუფერში. + RectangleTool - + Rectangle მართკუთხედი - + Set the Rectangle as the paint tool მართკუთხედის ხელსაწყოს არჩევა სახატავად @@ -604,12 +701,12 @@ Press Space to open the side panel. RedoTool - + Redo - + Redo the next modification @@ -617,12 +714,12 @@ Press Space to open the side panel. SaveTool - + Save შენახვა - + Save the capture სურათის შენახვა @@ -630,7 +727,7 @@ Press Space to open the side panel. ScreenGrabber - + Unable to capture screen ეკრანის გადაღება ვერ მოხერხდა @@ -638,12 +735,12 @@ Press Space to open the side panel. SelectionTool - + Rectangular Selection მართკუთხა შერჩევა - + Set Selection as the paint tool შერჩევის ხელსაწყოს არჩევა სახატავად @@ -651,22 +748,22 @@ Press Space to open the side panel. SidePanelWidget - + Active thickness: - + Active color: - + Press ESC to cancel - + Grab Color @@ -674,12 +771,12 @@ Press Space to open the side panel. SizeIndicatorTool - + Selection Size Indicator შერჩეულის ზომის მაჩვენებელი - + Show the dimensions of the selection (X Y) აჩვენებს შერჩეული არის განზომილებებს (X Y) @@ -687,107 +784,107 @@ Press Space to open the side panel. StrftimeChooserWidget - + Century (00-99) საუკუნე (00-99) - + Year (00-99) წელი (00-99) - + Year (2000) წელი (2000) - + Month Name (jan) თვის სახელი (იან) - + Month Name (january) თვის სახელი (იანვარი) - + Month (01-12) თვე (01-12) - + Week Day (1-7) კვირის დღე (1-7) - + Week (01-53) კვირა (01-53) - + Day Name (mon) დღის სახელი (ორშ) - + Day Name (monday) დღის სახელი (ორშაბათი) - + Day (01-31) დღე (01-31) - + Day of Month (1-31) თვის დღე (1-31) - + Day (001-366) დღე (001-366) - + Time (%H-%M-%S) - + Time (%H-%M) - + Hour (00-23) საათი (00-23) - + Hour (01-12) საათი (01-12) - + Minute (00-59) წუთი (00-59) - + Second (00-59) წამი (00-59) - + Full Date (%m/%d/%y) სრული თარიღი (%m/%d/%y) - + Full Date (%Y-%m-%d) სრული თარიღი (%Y-%m-%d) @@ -795,7 +892,7 @@ Press Space to open the side panel. SystemNotification - + Flameshot Info @@ -803,22 +900,22 @@ Press Space to open the side panel. TextConfig - + StrikeOut - + Underline - + Bold - + Italic @@ -826,12 +923,12 @@ Press Space to open the side panel. TextTool - + Text - + Add text to your capture @@ -839,37 +936,37 @@ Press Space to open the side panel. UIcolorEditor - + UI Color Editor ინტერფეისის ფერის რედაქტორი - + Change the color moving the selectors and see the changes in the preview buttons. შეცვალეთ ფერი ნიშნულის გადაადგილებით და შეხედეთ ცვლილებებს გადასახედ ღილაკებზე. - + Select a Button to modify it აირჩიეთ ღილაკი მის შესაცვლელად - + Main Color ძირითადი ფერი - + Click on this button to set the edition mode of the main color. დააწექით ამ ღილაკს ძირითადი ფერის არჩევის რეჟიმის ჩასართავად. - + Contrast Color კონტრასტული ფერი - + Click on this button to set the edition mode of the contrast color. დააწექით ამ ღილაკს კონტრასტული ფერის არჩევის რეჟიმის ჩასართავად. @@ -877,12 +974,12 @@ Press Space to open the side panel. UndoTool - + Undo უკუქმნა - + Undo the last modification ბოლო ცვლილების გაუქმება @@ -890,17 +987,17 @@ Press Space to open the side panel. VisualsEditor - + Opacity of area outside selection: შერჩეულის გარე არეს გაუმჭვირვალობა - + Button Selection ღილაკის არჩევა - + Select All ყველაფრის შერჩევა diff --git a/translations/Internationalization_nl.ts b/data/translations/Internationalization_nl.ts similarity index 57% rename from translations/Internationalization_nl.ts rename to data/translations/Internationalization_nl.ts index e1d59b3e..6404d7b5 100644 --- a/translations/Internationalization_nl.ts +++ b/data/translations/Internationalization_nl.ts @@ -4,12 +4,12 @@ AppLauncher - + App Launcher App-starter - + Choose an app to open the capture Kies een app om de schermafdruk mee te openen @@ -17,33 +17,33 @@ AppLauncherWidget - + Open With Openen met - + Launch in terminal Openen in terminalvenster - + Keep open after selection Openhouden na selectie - - + + Error Fout - + Unable to write in Kan niet schrijven naar - + Unable to launch in terminal. Kan niet openen in terminalvenster. @@ -51,12 +51,12 @@ ArrowTool - + Arrow Cursor - + Set the Arrow as the paint tool Cursor instellen als verfgereedschap @@ -64,25 +64,73 @@ BlurTool - + Blur Vervaging - + Set Blur as the paint tool Vervaging instellen als verfgereedschap + + CaptureLauncher + + + <b>Capture Mode</b> + + + + + Rectangular Region + + + + + Full Screen (All Monitors) + + + + + No Delay + + + + + second + + + + + seconds + + + + + Take new screenshot + + + + + Area: + + + + + Delay: + + + CaptureWidget - + Unable to capture screen Kan scherm niet vastleggen - + Select an area with the mouse, or press Esc to exit. Press Enter to capture the screen. Press Right Click to show the color picker. @@ -95,15 +143,28 @@ Gebruik het muiswiel om de gereedschapsdikte aan te passen. Druk op spatie om het zijpaneel te openen. + + CircleCountTool + + + Circle Counter + + + + + Add an autoincrementing counter bubble + + + CircleTool - + Circle Cirkel - + Set the Circle as the paint tool Cirkel instellen als verfgereedschap @@ -111,22 +172,22 @@ Druk op spatie om het zijpaneel te openen. ConfigWindow - + Configuration Configuratie - + Interface Uiterlijk - + Filename Editor Bestandsnaambewerker - + General Algemeen @@ -134,22 +195,27 @@ Druk op spatie om het zijpaneel te openen. Controller - + &Take Screenshot Schermafdruk &maken - + + &Open Launcher + + + + &Configuration &Configuratie - + &Information &Informatie - + &Quit &Afsluiten @@ -157,12 +223,12 @@ Druk op spatie om het zijpaneel te openen. CopyTool - + Copy Kopiëren - + Copy the selection into the clipboard Selectie kopiëren naar klembord @@ -170,7 +236,7 @@ Druk op spatie om het zijpaneel te openen. DBusUtils - + Unable to connect via DBus Kan niet verbinden via DBus @@ -178,12 +244,12 @@ Druk op spatie om het zijpaneel te openen. ExitTool - + Exit Afsluiten - + Leave the capture screen Verlaat het vastlegscherm @@ -191,47 +257,47 @@ Druk op spatie om het zijpaneel te openen. FileNameEditor - + Edit the name of your captures: Bewerk de naam van je schermafdrukken: - + Edit: Bewerken: - + Preview: Voorbeeld: - + Save Opslaan - + Saves the pattern Slaat het patroon op - + Reset Standaardwaarden - + Restores the saved pattern Herstelt het standaardpatroon - + Clear Wissen - + Deletes the name Wist de naam @@ -239,141 +305,161 @@ Druk op spatie om het zijpaneel te openen. GeneneralConf - - + + Import Importeren - - - + + + Error Fout - + Unable to read file. Kan bestand niet uitlezen. - - + + Unable to write file. Kan bestand niet wegschrijven. - + Save File Bestand opslaan - + Confirm Reset Herstellen bevestigen - + Are you sure you want to reset the configuration? Weet je zeker dat je de standwaardwaarden van de configuratie wilt herstellen? - + Show help message Uitleg tonen - + Show the help message at the beginning in the capture mode. Toont een bericht met uitleg bij het openen van de vastlegmodus. - - + + Show desktop notifications Bureaubladmeldingen tonen - + Show tray icon Systeemvakpictogram tonen - + Show the systemtray icon Toont het systeemvakpictogram - + Configuration File Configuratiebestand - + Export Exporteren - + Reset Standaardwaarden - + Launch at startup Automatisch opstarten - + Launch Flameshot Flameshot openen + + + Close after capture + + + + + Close after taking a screenshot + + + + + Copy URL after upload + + + + + Copy URL and close window after upload + + ImgurUploader - + Upload to Imgur Uploaden naar Imgur - + Uploading Image Bezig met uploaden van afbeelding... - + Copy URL URL kopiëren - + Open URL URL openen - + Delete image Afbeelding verwijderen - + Image to Clipboard. Afbeelding naar klembord. - - + + Unable to open the URL. Kan URL niet openen. - + URL copied to clipboard. URL gekopieerd naar klembord. - + Screenshot copied to clipboard. Schermafdruk gekopieerd naar klembord. @@ -381,12 +467,12 @@ Druk op spatie om het zijpaneel te openen. ImgurUploaderTool - + Image Uploader Afbeeldingsuploader - + Upload the selection to Imgur Upload de selectie naar Imgur @@ -394,92 +480,97 @@ Druk op spatie om het zijpaneel te openen. InfoWindow - + About Over - + + SPACEBAR + + + + Right Click Rechtsklikken - + Mouse Wheel Muiswiel - + Move selection 1px Selectie 1px verplaatsen - + Resize selection 1px Afmetingen van selectie 1px aanpassen - + Quit capture Vastleggen afsluiten - + Copy to clipboard Kopiëren naar klembord - + Save selection as a file Selectie opslaan als bestand - + Undo the last modification Laatste wijziging ongedaan maken - + Toggle visibility of sidebar with options of the selected tool Zijbalk met gereedschapsopties tonen/verbergen - + Show color picker Kleurkiezer tonen - + Change the tool's thickness Wijzig de gereedschapsdikte - + Available shortcuts in the screen capture mode. Beschikbare sneltoetsen in de vastlegmodus. - + Key Toets - + Description Omschrijving - + <u><b>License</b></u> <u><b>Лиценца</b></u> - + <u><b>Version</b></u> <u><b>Верзија</b></u> - + <u><b>Shortcuts</b></u> <u><b>Пречице</b></u> @@ -487,12 +578,12 @@ Druk op spatie om het zijpaneel te openen. LineTool - + Line Lijn - + Set the Line as the paint tool Lijn instellen als verfgereedschap @@ -500,12 +591,12 @@ Druk op spatie om het zijpaneel te openen. MarkerTool - + Marker Markeerstift - + Set the Marker as the paint tool Markeerstift instellen als verfgereedschap @@ -513,12 +604,12 @@ Druk op spatie om het zijpaneel te openen. MoveTool - + Move Verplaatsen - + Move the selection area Selectiegebied verplaatsen @@ -526,12 +617,12 @@ Druk op spatie om het zijpaneel te openen. PencilTool - + Pencil Potlood - + Set the Pencil as the paint tool Potlood instellen als verfgereedschap @@ -539,12 +630,12 @@ Druk op spatie om het zijpaneel te openen. PinTool - + Pin Tool Vastmaken - + Pin image on the desktop Afbeelding vastmaken op bureaublad @@ -552,55 +643,61 @@ Druk op spatie om het zijpaneel te openen. QObject - + Save Error Fout tijdens opslaan - - + + Capture saved as Schermafdruk opgeslagen als - + Capture saved to clipboard Schermafdruk vastgelegd op klembord - - + + Error trying to save as Fout tijdens opslaan als - - - - + + + + + Unable to connect via DBus Kan niet verbinden via DBus - + Error Fout - + Unable to write in Kan niet wegschrijven naar + + + URL copied to clipboard. + URL gekopieerd naar klembord. + RectangleTool - + Rectangle Rechthoek - + Set the Rectangle as the paint tool Rechthoek instellen als verfgereedschap @@ -608,12 +705,12 @@ Druk op spatie om het zijpaneel te openen. RedoTool - + Redo Opnieuw - + Redo the next modification Volgende wijziging opnieuw toepassen @@ -621,13 +718,13 @@ Druk op spatie om het zijpaneel te openen. SaveTool - + Save Сачувај Opslaan - + Save the capture Schermafdruk opslaan @@ -635,7 +732,7 @@ Druk op spatie om het zijpaneel te openen. ScreenGrabber - + Unable to capture screen Kan scherm niet vastleggen @@ -643,12 +740,12 @@ Druk op spatie om het zijpaneel te openen. SelectionTool - + Rectangular Selection Rechthoekige selectie - + Set Selection as the paint tool Selectie instellen als verfgereedschap @@ -656,22 +753,22 @@ Druk op spatie om het zijpaneel te openen. SidePanelWidget - + Active thickness: Actieve dikte: - + Active color: Actieve kleur: - + Press ESC to cancel Druk op Esc om te annuleren - + Grab Color Kleur opnemen @@ -679,12 +776,12 @@ Druk op spatie om het zijpaneel te openen. SizeIndicatorTool - + Selection Size Indicator Grootteindicatie van selectie - + Show the dimensions of the selection (X Y) Toon de afmetingen van de selectie (X Y) @@ -692,107 +789,107 @@ Druk op spatie om het zijpaneel te openen. StrftimeChooserWidget - + Century (00-99) Eeuw (00-99) - + Year (00-99) Jaar (00-99) - + Year (2000) Jaar (2000) - + Month Name (jan) Naam van de maand (јаn) - + Month Name (january) Naam van de maand (јаnuari) - + Month (01-12) Maand (01-12) - + Week Day (1-7) Weekdag (1-7) - + Week (01-53) Week (01-53) - + Day Name (mon) Naam van de dag (ma) - + Day Name (monday) Naam van de dag (maandag) - + Day (01-31) Dag (01-31) - + Day of Month (1-31) Dag van de maand (1-31) - + Day (001-366) Dag (001-366) - + Time (%H-%M-%S) Tijd (%H-%M-%S) - + Time (%H-%M) Tijd (%H-%M) - + Hour (00-23) Uur (00-23) - + Hour (01-12) Uur (01-12) - + Minute (00-59) Minuten (00-59) - + Second (00-59) Seconden (00-59) - + Full Date (%m/%d/%y) Volledige datum (%m/%d/%y) - + Full Date (%Y-%m-%d) Volledige datum (%Y-%m-%d) @@ -800,7 +897,7 @@ Druk op spatie om het zijpaneel te openen. SystemNotification - + Flameshot Info Flameshot-informatie @@ -808,22 +905,22 @@ Druk op spatie om het zijpaneel te openen. TextConfig - + StrikeOut Doorhalen - + Underline Onderstrepen - + Bold Vetgedrukt - + Italic Cursief @@ -831,12 +928,12 @@ Druk op spatie om het zijpaneel te openen. TextTool - + Text Tekst - + Add text to your capture Voeg tekst toe aan je schermafdruk @@ -844,37 +941,37 @@ Druk op spatie om het zijpaneel te openen. UIcolorEditor - + UI Color Editor Kleurenschemabewerker - + Change the color moving the selectors and see the changes in the preview buttons. Wijzig de kleur d.m.v. de selectie-indicators en bekijk de wijzigingen op de voorbeeldknoppen. - + Select a Button to modify it Kies een te bewerken knop - + Main Color Hoofdkleur - + Click on this button to set the edition mode of the main color. Klik op deze knop om de hoofdkleur te bwerken. - + Contrast Color Contrastkleur - + Click on this button to set the edition mode of the contrast color. Klik op deze knop om de contrastkleur te bewerken. @@ -882,12 +979,12 @@ Druk op spatie om het zijpaneel te openen. UndoTool - + Undo Ongedaan mken - + Undo the last modification Laatste wijziging ongedaan maken @@ -895,17 +992,17 @@ Druk op spatie om het zijpaneel te openen. VisualsEditor - + Opacity of area outside selection: Doorzichtigheid van gebied buiten selectie: - + Button Selection Knopselectie - + Select All Alles selecteren diff --git a/translations/Internationalization_pl.ts b/data/translations/Internationalization_pl.ts similarity index 57% rename from translations/Internationalization_pl.ts rename to data/translations/Internationalization_pl.ts index ff1a60c6..c0b2d696 100644 --- a/translations/Internationalization_pl.ts +++ b/data/translations/Internationalization_pl.ts @@ -4,12 +4,12 @@ AppLauncher - + App Launcher Uruchamianie aplikacji - + Choose an app to open the capture Wybierz aplikację do otwierania zrzutu @@ -17,33 +17,33 @@ AppLauncherWidget - + Open With Otwórz w - + Launch in terminal Otwórz w terminalu - + Keep open after selection Pozostaw otwarte po zaznaczeniu - - + + Error Błąd - + Unable to write in Nie można zapisać - + Unable to launch in terminal. Nie można uruchomić w terminalu. @@ -51,12 +51,12 @@ ArrowTool - + Arrow Strzałka - + Set the Arrow as the paint tool Rysowanie strzałek @@ -64,25 +64,73 @@ BlurTool - + Blur Rozmycie - + Set Blur as the paint tool Rozmywanie obszarów + + CaptureLauncher + + + <b>Capture Mode</b> + + + + + Rectangular Region + + + + + Full Screen (All Monitors) + + + + + No Delay + + + + + second + + + + + seconds + + + + + Take new screenshot + + + + + Area: + + + + + Delay: + + + CaptureWidget - + Unable to capture screen Nie można przechwycić ekranu - + Select an area with the mouse, or press Esc to exit. Press Enter to capture the screen. Press Right Click to show the color picker. @@ -94,15 +142,28 @@ Prawy klik, aby pokazać próbnik kolorów. Spacja, aby pokazać panel boczny. + + CircleCountTool + + + Circle Counter + + + + + Add an autoincrementing counter bubble + + + CircleTool - + Circle Okręgi - + Set the Circle as the paint tool Rysowanie okręgów i elips @@ -110,22 +171,22 @@ Spacja, aby pokazać panel boczny. ConfigWindow - + Configuration Konfiguracja - + Interface Interfejs - + Filename Editor Edytor nazw plików - + General Ogólne @@ -133,22 +194,27 @@ Spacja, aby pokazać panel boczny. Controller - + &Take Screenshot &Zrzut ekranu - + + &Open Launcher + + + + &Configuration &Konfiguracja - + &Information &Informacje - + &Quit &Wyjdź @@ -156,12 +222,12 @@ Spacja, aby pokazać panel boczny. CopyTool - + Copy Kopiuj - + Copy the selection into the clipboard @@ -169,7 +235,7 @@ Spacja, aby pokazać panel boczny. DBusUtils - + Unable to connect via DBus Nie można się połączyć za pomocą DBus @@ -177,12 +243,12 @@ Spacja, aby pokazać panel boczny. ExitTool - + Exit Wyjdź - + Leave the capture screen Opuść ekran przechwytywania @@ -190,47 +256,47 @@ Spacja, aby pokazać panel boczny. FileNameEditor - + Edit the name of your captures: Edycja wzorca nazwy plików: - + Edit: Edytuj: - + Preview: Podgląd: - + Save Zapisz - + Saves the pattern Zapisuje wzorzec - + Reset Reset - + Restores the saved pattern Resetuje wzorzec - + Clear Wyczyść - + Deletes the name Czyści wzorzec @@ -238,141 +304,161 @@ Spacja, aby pokazać panel boczny. GeneneralConf - - + + Import Import - - - + + + Error Błąd - + Unable to read file. Nie można odczytać pliku. - - + + Unable to write file. Nie można zapisać pliku. - + Save File Zapisz plik - + Confirm Reset Potwierdź Reset - + Are you sure you want to reset the configuration? Czy na pewno chcesz zresetować konfigurację? - + Show help message Pokaż podpowiedzi - + Show the help message at the beginning in the capture mode. Pokaż podpowiedzi na początku trybu przechwytywania. - - + + Show desktop notifications Pokaż powiadomienia ekranowe - + Show tray icon Pokaż ikonę w trayu - + Show the systemtray icon Pokaż ikonę w zasobniku systemowym - + Configuration File Plik konfiguracyjny - + Export Export - + Reset Reset - + Launch at startup Uruchom podczas startu - + Launch Flameshot Uruchom Flameshot + + + Close after capture + + + + + Close after taking a screenshot + + + + + Copy URL after upload + + + + + Copy URL and close window after upload + + ImgurUploader - + Upload to Imgur Wyślij do Imgur - + Uploading Image Wysyłanie obrazka - + Copy URL Kopiuj URL - + Open URL Otwórz URL - + Delete image Usuń obrazek - + Image to Clipboard. Obrazek do schowka. - - + + Unable to open the URL. Nie można otworzyć adresu URL. - + URL copied to clipboard. URL skopiowany do schowka. - + Screenshot copied to clipboard. Zrzut ekranu skopiowany do schowka. @@ -380,12 +466,12 @@ Spacja, aby pokazać panel boczny. ImgurUploaderTool - + Image Uploader Uploader obrazów - + Upload the selection to Imgur Wyślij zaznaczenie do Imgur @@ -393,92 +479,97 @@ Spacja, aby pokazać panel boczny. InfoWindow - + About O programie - + + SPACEBAR + + + + Right Click Prawy klik - + Mouse Wheel Kółko myszy - + Move selection 1px Przesuń zaznaczenie o 1px - + Resize selection 1px Zmień rozmiar zaznaczenia o 1px - + Quit capture Zakończ przechwytywanie - + Copy to clipboard Kopiuj do schowka - + Save selection as a file Zapisz zaznaczenie jako plik - + Undo the last modification Cofnij ostatnią modyfikację - + Toggle visibility of sidebar with options of the selected tool - + Show color picker Pokaż próbnik kolorów - + Change the tool's thickness Zmień grubość narzędzia - + Available shortcuts in the screen capture mode. Dostępne skróty w trybie przechwytywania obrazu. - + Key Klawisz - + Description Działanie - + <u><b>License</b></u> <u><b>Licencja</b></u> - + <u><b>Version</b></u> <u><b>Wersja</b></u> - + <u><b>Shortcuts</b></u> <u><b>Skróty klawiszowe</b></u> @@ -486,12 +577,12 @@ Spacja, aby pokazać panel boczny. LineTool - + Line Linia - + Set the Line as the paint tool Ustawia linię jako narzędzie do rysowania @@ -499,12 +590,12 @@ Spacja, aby pokazać panel boczny. MarkerTool - + Marker Marker - + Set the Marker as the paint tool Ustawia Marker jako narzędzie rysowania @@ -512,12 +603,12 @@ Spacja, aby pokazać panel boczny. MoveTool - + Move Przesuwanie - + Move the selection area Przesuwa zaznaczenie @@ -525,12 +616,12 @@ Spacja, aby pokazać panel boczny. PencilTool - + Pencil Ołówek - + Set the Pencil as the paint tool Ustawia ołówek jako narzędzie do rysowania @@ -538,12 +629,12 @@ Spacja, aby pokazać panel boczny. PinTool - + Pin Tool Narzędzie przypinania - + Pin image on the desktop Przypnij obrazek do pulpitu @@ -551,55 +642,61 @@ Spacja, aby pokazać panel boczny. QObject - + Save Error Błąd zapisu - - + + Capture saved as Zaznaczenie zapisano jako - + Capture saved to clipboard Zrzut skopiowano do schowka - - + + Error trying to save as Błąd przy próbie zapisu jako - - - - + + + + + Unable to connect via DBus Nie udało się połączyć za pomocą DBus - + Error Błąd - + Unable to write in Nie można zapisać w + + + URL copied to clipboard. + URL skopiowany do schowka. + RectangleTool - + Rectangle Prostokąt - + Set the Rectangle as the paint tool Ustawia prostokąt jako narzędzie do rysowania @@ -607,12 +704,12 @@ Spacja, aby pokazać panel boczny. RedoTool - + Redo Cofnij - + Redo the next modification @@ -620,12 +717,12 @@ Spacja, aby pokazać panel boczny. SaveTool - + Save Zapisz - + Save the capture Zapisz zaznaczenie @@ -633,7 +730,7 @@ Spacja, aby pokazać panel boczny. ScreenGrabber - + Unable to capture screen Nie można przechwycić ekranu @@ -641,12 +738,12 @@ Spacja, aby pokazać panel boczny. SelectionTool - + Rectangular Selection Zaznaczenie prostokątne - + Set Selection as the paint tool Ustawia zaznaczenie prostokątne jako narzędzie do rysowania @@ -654,22 +751,22 @@ Spacja, aby pokazać panel boczny. SidePanelWidget - + Active thickness: - + Active color: Aktywny kolor: - + Press ESC to cancel Wciśnij ESC, aby anulować - + Grab Color Pobierz kolor @@ -677,12 +774,12 @@ Spacja, aby pokazać panel boczny. SizeIndicatorTool - + Selection Size Indicator Miernik zaznaczenia - + Show the dimensions of the selection (X Y) Pokazuje wymiary zaznaczenia (X Y) @@ -690,107 +787,107 @@ Spacja, aby pokazać panel boczny. StrftimeChooserWidget - + Century (00-99) Wiek (00-99) - + Year (00-99) Rok (00-99) - + Year (2000) Rok (2000) - + Month Name (jan) Nazwa miesiąca (cze) - + Month Name (january) Nazwa miesiąca (czerwiec) - + Month (01-12) Miesiąc (01-12) - + Week Day (1-7) Dzień tygodnia (1-7) - + Week (01-53) Tydzień (01-53) - + Day Name (mon) Nazwa dniaa (pią) - + Day Name (monday) Nazwa dnia (piątek) - + Day (01-31) Dzień (01-31) - + Day of Month (1-31) Dzień miesiąca (1-31) - + Day (001-366) Dzień (001-366) - + Time (%H-%M-%S) Czas (%H-%M-%S) - + Time (%H-%M) Czas (%H-%M) - + Hour (00-23) Godzina (00-23) - + Hour (01-12) Godzina (01-12) - + Minute (00-59) Minuta (00-59) - + Second (00-59) Sekunda (00-59) - + Full Date (%m/%d/%y) Data (%m/%d/%y) - + Full Date (%Y-%m-%d) Data (%Y-%m-%d) @@ -798,7 +895,7 @@ Spacja, aby pokazać panel boczny. SystemNotification - + Flameshot Info Flameshot Info @@ -806,22 +903,22 @@ Spacja, aby pokazać panel boczny. TextConfig - + StrikeOut Przekreślenie - + Underline Podkreślenie - + Bold Pogrubienie - + Italic Kursywa @@ -829,12 +926,12 @@ Spacja, aby pokazać panel boczny. TextTool - + Text Tekst - + Add text to your capture Dodaje tekst do zrzutu @@ -842,37 +939,37 @@ Spacja, aby pokazać panel boczny. UIcolorEditor - + UI Color Editor Edytor kolorów interfejsu - + Change the color moving the selectors and see the changes in the preview buttons. Zmień kolor przesuwając selektory i obserwując podgląd przycisków. - + Select a Button to modify it Wybierz przycisk do zmodyfikowania - + Main Color Kolor główny - + Click on this button to set the edition mode of the main color. Kliknij na przycisk aby móc modyfikować kolor główny. - + Contrast Color Kolor kontrastowy - + Click on this button to set the edition mode of the contrast color. Kliknij na przycisk aby móc modyfikować kolor kontrastowy. @@ -880,12 +977,12 @@ Spacja, aby pokazać panel boczny. UndoTool - + Undo Cofnij - + Undo the last modification Cofnij ostatnią zmianę @@ -893,17 +990,17 @@ Spacja, aby pokazać panel boczny. VisualsEditor - + Opacity of area outside selection: Przezroczystość obszaru poza zaznaczeniem: - + Button Selection Wybór przycisków - + Select All Wybierz wszystkie diff --git a/translations/Internationalization_pt_br.ts b/data/translations/Internationalization_pt_br.ts similarity index 57% rename from translations/Internationalization_pt_br.ts rename to data/translations/Internationalization_pt_br.ts index 2605fc14..0b453255 100644 --- a/translations/Internationalization_pt_br.ts +++ b/data/translations/Internationalization_pt_br.ts @@ -4,12 +4,12 @@ AppLauncher - + App Launcher App Launcher - + Choose an app to open the capture Escolha uma aplicação para abrir a captura @@ -17,33 +17,33 @@ AppLauncherWidget - + Open With Abrir Com - + Launch in terminal Abrir no terminal - + Keep open after selection Manter aberto após seleção - - + + Error Erro - + Unable to write in Não é possível escrever em - + Unable to launch in terminal. Não foi possível abrir no terminal. @@ -51,12 +51,12 @@ ArrowTool - + Arrow Flecha - + Set the Arrow as the paint tool Usa a Flecha como ferramenta de desenho @@ -64,25 +64,73 @@ BlurTool - + Blur Desfoque - + Set Blur as the paint tool Usa o Desfoque como ferramenta de desenho + + CaptureLauncher + + + <b>Capture Mode</b> + + + + + Rectangular Region + + + + + Full Screen (All Monitors) + + + + + No Delay + + + + + second + + + + + seconds + + + + + Take new screenshot + + + + + Area: + + + + + Delay: + + + CaptureWidget - + Unable to capture screen Não foi possível capturar a tela - + Select an area with the mouse, or press Esc to exit. Press Enter to capture the screen. Press Right Click to show the color picker. @@ -95,15 +143,28 @@ Use a roda do mouse para aumentar a grossura do pincel. Pressione espaço abrir o painel lateral. + + CircleCountTool + + + Circle Counter + + + + + Add an autoincrementing counter bubble + + + CircleTool - + Circle Círculo - + Set the Circle as the paint tool Usa o Círculo como ferramenta de desenho @@ -111,22 +172,22 @@ Pressione espaço abrir o painel lateral. ConfigWindow - + Configuration Configuração - + Interface Interface - + Filename Editor Editor de nome de arquivo - + General Geral @@ -134,22 +195,27 @@ Pressione espaço abrir o painel lateral. Controller - + &Take Screenshot &Tirar Screenshot - + + &Open Launcher + + + + &Configuration &Configuração - + &Information &Informações - + &Quit &Sair @@ -157,12 +223,12 @@ Pressione espaço abrir o painel lateral. CopyTool - + Copy Copiar - + Copy the selection into the clipboard Copia a seleção para o clipboard @@ -170,7 +236,7 @@ Pressione espaço abrir o painel lateral. DBusUtils - + Unable to connect via DBus Não foi possível conectar via DBus @@ -178,12 +244,12 @@ Pressione espaço abrir o painel lateral. ExitTool - + Exit Sair - + Leave the capture screen Sair da ferramenta de captura @@ -191,47 +257,47 @@ Pressione espaço abrir o painel lateral. FileNameEditor - + Edit the name of your captures: Edite o nome das suas capturas: - + Edit: Editar: - + Preview: Preview: - + Save Salvar - + Saves the pattern Salva o padrão - + Reset Reiniciar - + Restores the saved pattern Restaura o padrão salvo - + Clear Limpar - + Deletes the name Deleta o nome @@ -239,141 +305,161 @@ Pressione espaço abrir o painel lateral. GeneneralConf - - + + Import Importar - - - + + + Error Erro - + Unable to read file. Não foi possível ler o arquivo. - - + + Unable to write file. Não foi possível escrever no arquivo. - + Save File Salvar Arquivo - + Confirm Reset Confirmar Reset - + Are you sure you want to reset the configuration? Tem certeza que deseja resetar a configuração? - + Show help message Mostrar mensagem de ajuda - + Show the help message at the beginning in the capture mode. Mostrar mensagem de ajuda no início do modo de captura. - - + + Show desktop notifications Mostrar notificações de Desktop - + Show tray icon Mostrar ícone de tray - + Show the systemtray icon Mosrar ícone na barra de aplicações - + Configuration File Arquivo de Configurações - + Export Exportar - + Reset Reset - + Launch at startup Iniciar junto com o sistema - + Launch Flameshot Iniciar Flameshot + + + Close after capture + + + + + Close after taking a screenshot + + + + + Copy URL after upload + + + + + Copy URL and close window after upload + + ImgurUploader - + Upload to Imgur Upload no Imgur - + Uploading Image Upando Imagem - + Copy URL Copiar URL - + Open URL Abrir URL - + Delete image Deletar imagem - + Image to Clipboard. Imagem no Clipboard. - - + + Unable to open the URL. Não foi possível abrir a URL. - + URL copied to clipboard. URL copiada para o clipboard. - + Screenshot copied to clipboard. Screenshot copiada para o clipboard. @@ -381,12 +467,12 @@ Pressione espaço abrir o painel lateral. ImgurUploaderTool - + Image Uploader Uploader de imagens - + Upload the selection to Imgur Upa a seleção no Imgur @@ -394,92 +480,97 @@ Pressione espaço abrir o painel lateral. InfoWindow - + About Sobre - + + SPACEBAR + + + + Right Click Botão Direito - + Mouse Wheel Roda do mouse - + Move selection 1px Move a seleção em 1px - + Resize selection 1px Redimensiona a seleção em 1px - + Quit capture Sair da captura - + Copy to clipboard Copiar ao clipboard - + Save selection as a file Salva seleção em um arquivo - + Undo the last modification Desfazer última modificação - + Toggle visibility of sidebar with options of the selected tool - + Show color picker Mostra seletor de cores - + Change the tool's thickness Muda a grossura do pincel - + Available shortcuts in the screen capture mode. Atalhos disponívels na tela de captura. - + Key Tecla - + Description Descrição - + <u><b>License</b></u> <u><b>Licença</b></u> - + <u><b>Version</b></u> <u><b>Versão</b></u> - + <u><b>Shortcuts</b></u> <u><b>Atalhos</b></u> @@ -487,12 +578,12 @@ Pressione espaço abrir o painel lateral. LineTool - + Line Linha - + Set the Line as the paint tool Usa a Linha como ferramenta de desenho @@ -500,12 +591,12 @@ Pressione espaço abrir o painel lateral. MarkerTool - + Marker Marcador - + Set the Marker as the paint tool Usa o marcador como ferramenta de desenho @@ -513,12 +604,12 @@ Pressione espaço abrir o painel lateral. MoveTool - + Move Mover - + Move the selection area Move a área de seleção @@ -526,12 +617,12 @@ Pressione espaço abrir o painel lateral. PencilTool - + Pencil Pincel - + Set the Pencil as the paint tool Usa o Lápis como ferramenta de desenho @@ -539,12 +630,12 @@ Pressione espaço abrir o painel lateral. PinTool - + Pin Tool Ferramenta de Pin - + Pin image on the desktop Pinnar imagem no desktop @@ -552,55 +643,61 @@ Pressione espaço abrir o painel lateral. QObject - + Save Error Salvar erro - - + + Capture saved as Captura salva como - + Capture saved to clipboard Captura salva no clipboard - - + + Error trying to save as Erro tentando salvar como - - - - + + + + + Unable to connect via DBus Não foi possível conectar via DBus - + Error Erro - + Unable to write in Não foi possível escrever em + + + URL copied to clipboard. + URL copiada para o clipboard. + RectangleTool - + Rectangle Retângulo - + Set the Rectangle as the paint tool Seta o Retângulo como ferramenta de desenho @@ -608,12 +705,12 @@ Pressione espaço abrir o painel lateral. RedoTool - + Redo Refazer - + Redo the next modification Refazer última modificação @@ -621,12 +718,12 @@ Pressione espaço abrir o painel lateral. SaveTool - + Save Salvar - + Save the capture Salva a captura @@ -634,7 +731,7 @@ Pressione espaço abrir o painel lateral. ScreenGrabber - + Unable to capture screen Não foi possível capturar a tela @@ -642,12 +739,12 @@ Pressione espaço abrir o painel lateral. SelectionTool - + Rectangular Selection Seleção Retangular - + Set Selection as the paint tool Estabelece o Selecionador como ferramenta de desenho @@ -655,22 +752,22 @@ Pressione espaço abrir o painel lateral. SidePanelWidget - + Active thickness: - + Active color: Cor ativa: - + Press ESC to cancel Presione Esc para cancelar - + Grab Color Usar Cor @@ -678,12 +775,12 @@ Pressione espaço abrir o painel lateral. SizeIndicatorTool - + Selection Size Indicator Indicador do Tamanho da Seleção - + Show the dimensions of the selection (X Y) Mostra a dimensão da seleção (X Y) @@ -691,107 +788,107 @@ Pressione espaço abrir o painel lateral. StrftimeChooserWidget - + Century (00-99) Século (00-99) - + Year (00-99) Ano (00-99) - + Year (2000) Ano (2000) - + Month Name (jan) Nome do mês (jan) - + Month Name (january) Nome do mês (janeiro) - + Month (01-12) Mês (01-12) - + Week Day (1-7) Dia da semana (1-7) - + Week (01-53) Semana (01-53) - + Day Name (mon) Nome do dia (seg) - + Day Name (monday) Nome do dia (segunda) - + Day (01-31) Dia (01-31) - + Day of Month (1-31) Dia do Mês (1-31) - + Day (001-366) Dia (001-366) - + Time (%H-%M-%S) Tempo (%H-%M-%S) - + Time (%H-%M) Tempo (%H-%M) - + Hour (00-23) Hora (00-23) - + Hour (01-12) Hora (01-12) - + Minute (00-59) Minuto (00-59) - + Second (00-59) Segundo (00-59) - + Full Date (%m/%d/%y) Data Completa (%m/%d/%y) - + Full Date (%Y-%m-%d) Data Completa (%Y-%m-%d) @@ -799,7 +896,7 @@ Pressione espaço abrir o painel lateral. SystemNotification - + Flameshot Info Informações do Flameshot @@ -807,22 +904,22 @@ Pressione espaço abrir o painel lateral. TextConfig - + StrikeOut Sobrescrito - + Underline Sublinhado - + Bold Negrito - + Italic Itálico @@ -830,12 +927,12 @@ Pressione espaço abrir o painel lateral. TextTool - + Text Texto - + Add text to your capture Adicionar texto à captura @@ -843,37 +940,37 @@ Pressione espaço abrir o painel lateral. UIcolorEditor - + UI Color Editor Interface de Edição de Cores - + Change the color moving the selectors and see the changes in the preview buttons. Modifique a cor movendo os seletores e veja as mudanças nos botões de preview. - + Select a Button to modify it Selecione um botão para modificá-lo - + Main Color Cor Principal - + Click on this button to set the edition mode of the main color. Clique neste botão para setar o modo de edição da cor principal. - + Contrast Color Cor de Contraste - + Click on this button to set the edition mode of the contrast color. Clique neste botão para setar o modo de edição da cor de contraste. @@ -881,12 +978,12 @@ Pressione espaço abrir o painel lateral. UndoTool - + Undo Desfazer - + Undo the last modification Desfaz a última modificação @@ -894,17 +991,17 @@ Pressione espaço abrir o painel lateral. VisualsEditor - + Opacity of area outside selection: Opacidade da área de seleção: - + Button Selection Botão de seleção - + Select All Selecionar Todos diff --git a/translations/Internationalization_ru.ts b/data/translations/Internationalization_ru.ts similarity index 60% rename from translations/Internationalization_ru.ts rename to data/translations/Internationalization_ru.ts index 72429749..50c5e731 100644 --- a/translations/Internationalization_ru.ts +++ b/data/translations/Internationalization_ru.ts @@ -4,12 +4,12 @@ AppLauncher - + App Launcher Запуск приложения - + Choose an app to open the capture Выберите приложение, которым открыть снимок @@ -17,33 +17,33 @@ AppLauncherWidget - + Open With Открыть с помощью - + Launch in terminal Запустить в терминале - + Keep open after selection Оставить запущенным после выделения - - + + Error Ошибка - + Unable to write in Не удалось сохранить - + Unable to launch in terminal. Не удалось запустить в терминале. @@ -51,12 +51,12 @@ ArrowTool - + Arrow Стрелка - + Set the Arrow as the paint tool Выбрать Стрелку инструментом для рисования @@ -64,25 +64,73 @@ BlurTool - + Blur Размытие - + Set Blur as the paint tool Выбрать Размытие инструментом для рисования + + CaptureLauncher + + + <b>Capture Mode</b> + + + + + Rectangular Region + + + + + Full Screen (All Monitors) + + + + + No Delay + + + + + second + + + + + seconds + + + + + Take new screenshot + + + + + Area: + + + + + Delay: + + + CaptureWidget - + Unable to capture screen Не удалось захватить экран - + Select an area with the mouse, or press Esc to exit. Press Enter to capture the screen. Press Right Click to show the color picker. @@ -95,15 +143,28 @@ Press Space to open the side panel. Нажмите Пробел чтобы открыть боковую панель. + + CircleCountTool + + + Circle Counter + + + + + Add an autoincrementing counter bubble + + + CircleTool - + Circle Окружность - + Set the Circle as the paint tool Выбрать Окружность инструментом для рисования @@ -111,22 +172,22 @@ Press Space to open the side panel. ConfigWindow - + Configuration Настройка - + Interface Интерфейс - + Filename Editor Редактор имен файлов - + General Общие @@ -134,22 +195,27 @@ Press Space to open the side panel. Controller - + &Take Screenshot &Сделать снимок - + + &Open Launcher + + + + &Configuration &Настройка - + &Information &Информация - + &Quit &Выход @@ -157,12 +223,12 @@ Press Space to open the side panel. CopyTool - + Copy Скопировать - + Copy the selection into the clipboard Скопировать выделение в буфер обмена @@ -170,7 +236,7 @@ Press Space to open the side panel. DBusUtils - + Unable to connect via DBus Не удалось подключиться через DBus @@ -178,12 +244,12 @@ Press Space to open the side panel. ExitTool - + Exit Выход - + Leave the capture screen Покинуть захват экрана @@ -191,47 +257,47 @@ Press Space to open the side panel. FileNameEditor - + Edit the name of your captures: Отредактируйте имя ваших снимков: - + Edit: Шаблон: - + Preview: Предпросмотр: - + Save Сохранить - + Saves the pattern Сохранить шаблон - + Reset Сбросить - + Restores the saved pattern Восстанавливает сохраненный шаблон - + Clear Очистить - + Deletes the name Удаляет имя @@ -239,141 +305,161 @@ Press Space to open the side panel. GeneneralConf - - + + Import Импорт - - - + + + Error Ошибка - + Unable to read file. Не удалось прочитать файл. - - + + Unable to write file. Не удалось записать файл. - + Save File Сохранить файл - + Confirm Reset Подтвердить сброс - + Are you sure you want to reset the configuration? Вы действительно хотите сбросить настройки? - + Show help message Показывать справочное сообщение - + Show the help message at the beginning in the capture mode. Показывать справочное сообщение перед началом захвата экрана. - - + + Show desktop notifications Показывать уведомления - + Show tray icon Показывать значок в трее - + Show the systemtray icon Показать значок в системном трее - + Configuration File Файл конфигурации - + Export Экспорт - + Reset Сброс - + Launch at startup Запускать при старте системы - + Launch Flameshot Запустить Flameshot + + + Close after capture + + + + + Close after taking a screenshot + + + + + Copy URL after upload + + + + + Copy URL and close window after upload + + ImgurUploader - + Upload to Imgur Загрузить в Imgur - + Uploading Image Загрузка изображения - + Copy URL Скопировать URL - + Open URL Открыть URL - + Delete image Удалить изображение - + Image to Clipboard. Изображение в буфер обмена. - - + + Unable to open the URL. Не удалось открыть URL. - + URL copied to clipboard. URL скопирован в буфер обмена. - + Screenshot copied to clipboard. Снимок скопирован в буфер обмена. @@ -381,12 +467,12 @@ Press Space to open the side panel. ImgurUploaderTool - + Image Uploader Отправка изображений - + Upload the selection to Imgur Загрузить выделение на Imgur @@ -394,92 +480,97 @@ Press Space to open the side panel. InfoWindow - + About Информация - + + SPACEBAR + + + + Right Click Правый клик - + Mouse Wheel Колесико мыши - + Move selection 1px Переместить выделение на 1px - + Resize selection 1px Изменить размер выделения на 1px - + Quit capture Выйти из захвата экрана - + Copy to clipboard Скопировать в буфер обмена - + Save selection as a file Сохранить выделение в файл - + Undo the last modification Отменить последнее изменение - + Toggle visibility of sidebar with options of the selected tool Показать боковую панель с настройками выбранного инструмента - + Show color picker Показать выбор цвета - + Change the tool's thickness Изменить толщину инструмента - + Available shortcuts in the screen capture mode. Доступные горячие клавиши в режиме захвата экрана. - + Key Клавиша - + Description Описание - + <u><b>License</b></u> <u><b>Лицензия</b></u> - + <u><b>Version</b></u> <u><b>Версия</b></u> - + <u><b>Shortcuts</b></u> <u><b>Горячие клавиши</b></u> @@ -487,12 +578,12 @@ Press Space to open the side panel. LineTool - + Line Линия - + Set the Line as the paint tool Выбрать Линию инструментом для рисования @@ -500,12 +591,12 @@ Press Space to open the side panel. MarkerTool - + Marker Маркер - + Set the Marker as the paint tool Выбрать Маркер инструментом для рисования @@ -513,12 +604,12 @@ Press Space to open the side panel. MoveTool - + Move Перемещение - + Move the selection area Выбрать Перемещение инструментом для рисования @@ -526,12 +617,12 @@ Press Space to open the side panel. PencilTool - + Pencil Карандаш - + Set the Pencil as the paint tool Выбрать Карандаш инструментом для рисования @@ -539,12 +630,12 @@ Press Space to open the side panel. PinTool - + Pin Tool Булавка - + Pin image on the desktop Прикрепить изображение к рабочему столу @@ -552,55 +643,61 @@ Press Space to open the side panel. QObject - + Save Error Ошибка сохранения - - + + Capture saved as Снимок сохранён как - + Capture saved to clipboard Снимок сохранён в буфер обмена - - + + Error trying to save as Ошибка при попытке сохранить как - - - - + + + + + Unable to connect via DBus Не удалось подключиться через DBus - + Error Ошибка - + Unable to write in Не удалось сохранить + + + URL copied to clipboard. + URL скопирован в буфер обмена. + RectangleTool - + Rectangle Прямоугольник - + Set the Rectangle as the paint tool Выбрать Прямоугольник инструментом для рисования @@ -608,12 +705,12 @@ Press Space to open the side panel. RedoTool - + Redo Повторить - + Redo the next modification Повторить последнее изменение @@ -621,12 +718,12 @@ Press Space to open the side panel. SaveTool - + Save Сохранить - + Save the capture Сохранить снимок @@ -634,7 +731,7 @@ Press Space to open the side panel. ScreenGrabber - + Unable to capture screen Не удалось захватить экран @@ -642,12 +739,12 @@ Press Space to open the side panel. SelectionTool - + Rectangular Selection Прямоугольное выделение - + Set Selection as the paint tool Выбрать Прямоугольное выделение инструментом для рисования @@ -655,22 +752,22 @@ Press Space to open the side panel. SidePanelWidget - + Active thickness: Активная толщина: - + Active color: Активный цвет: - + Press ESC to cancel Нажмите Esc для отмены - + Grab Color Захватить цвет с экрана @@ -678,12 +775,12 @@ Press Space to open the side panel. SizeIndicatorTool - + Selection Size Indicator Индикатор размера выделения - + Show the dimensions of the selection (X Y) Показывает размер выделения (X Y) @@ -691,107 +788,107 @@ Press Space to open the side panel. StrftimeChooserWidget - + Century (00-99) Век (00-99) - + Year (00-99) Год (00-99) - + Year (2000) Год (2000) - + Month Name (jan) Название месяца (янв) - + Month Name (january) Название месяца (январь) - + Month (01-12) Месяц (01-12) - + Week Day (1-7) День недели (1-7) - + Week (01-53) Неделя (01-53) - + Day Name (mon) День недели (пн) - + Day Name (monday) День недели (понедельник) - + Day (01-31) День (01-31) - + Day of Month (1-31) День месяца (1-31) - + Day (001-366) День (001-366) - + Time (%H-%M-%S) Время (%H-%M-%S) - + Time (%H-%M) Время (%H-%M) - + Hour (00-23) Час (00-23) - + Hour (01-12) Час (01-12) - + Minute (00-59) Минута (00-59) - + Second (00-59) Секунда (00-59) - + Full Date (%m/%d/%y) Полная дата (%m/%d/%y) - + Full Date (%Y-%m-%d) Полная дата (%Y-%m-%d) @@ -799,7 +896,7 @@ Press Space to open the side panel. SystemNotification - + Flameshot Info Flameshot Инфо @@ -807,22 +904,22 @@ Press Space to open the side panel. TextConfig - + StrikeOut Зачеркнутый - + Underline Подчеркнутый - + Bold Полужирный - + Italic Курсив @@ -830,12 +927,12 @@ Press Space to open the side panel. TextTool - + Text Текст - + Add text to your capture Добавить текст на снимок @@ -843,37 +940,37 @@ Press Space to open the side panel. UIcolorEditor - + UI Color Editor Редактор цвета интерфейса - + Change the color moving the selectors and see the changes in the preview buttons. Измените цвет, перемещая выделение, и посмотрите изменения в кнопках предварительного просмотра. - + Select a Button to modify it Выберите кнопку, чтобы изменить ее - + Main Color Основной цвет - + Click on this button to set the edition mode of the main color. Нажмите на эту кнопку, чтобы перейти в режим редактирования основного цвета. - + Contrast Color Контрастный цвет - + Click on this button to set the edition mode of the contrast color. Нажмите на эту кнопку, чтобы перейти в режим редактирования контрастного цвета. @@ -881,12 +978,12 @@ Press Space to open the side panel. UndoTool - + Undo Отменить - + Undo the last modification Отменить последнее изменение @@ -894,17 +991,17 @@ Press Space to open the side panel. VisualsEditor - + Opacity of area outside selection: Затемнение невыделенной области: - + Button Selection Выбор кнопок - + Select All Выбрать все diff --git a/translations/Internationalization_sk.ts b/data/translations/Internationalization_sk.ts similarity index 61% rename from translations/Internationalization_sk.ts rename to data/translations/Internationalization_sk.ts index f099e085..3dd9948d 100644 --- a/translations/Internationalization_sk.ts +++ b/data/translations/Internationalization_sk.ts @@ -4,12 +4,12 @@ AppLauncher - + App Launcher Spúšťač aplikácií - + Choose an app to open the capture Vyberte aplikáciu na otvorenie snímky obrazovky @@ -17,33 +17,33 @@ AppLauncherWidget - + Open With Otvoriť s - + Launch in terminal Otvoriť v termináli - + Keep open after selection Nechať otvorené po výbere - - + + Error Chyba - + Unable to write in Zlyhal zápis do - + Unable to launch in terminal. Nepodarilo sa spustiť v termináli. @@ -51,12 +51,12 @@ ArrowTool - + Arrow Šípka - + Set the Arrow as the paint tool Nastaviť Šípku ako nástroj pre úpravy @@ -64,12 +64,12 @@ BlurTool - + Blur Rozmazanie - + Set Blur as the paint tool Nastaviť Rozmazanie ako nástroj pre úpravy @@ -77,47 +77,47 @@ CaptureLauncher - + <b>Capture Mode</b> <b>Režim zachytávania</b> - + Rectangular Region Pravouhlá oblasť - + Full Screen (All Monitors) Celá obrazovka (všetky monitory) - + No Delay Bez oneskorenia - + second sekunda - + seconds sekundy - + Take new screenshot Urobiť novú snímku - + Area: Oblasť: - + Delay: Oneskorenie: @@ -125,12 +125,12 @@ CaptureWidget - + Unable to capture screen Nepodarilo sa zachytiť obrazovku - + Select an area with the mouse, or press Esc to exit. Press Enter to capture the screen. Press Right Click to show the color picker. @@ -143,15 +143,28 @@ Použite kolečko myši pre zmenu hrúbky vybraného nástroja. Stlačte medzerník pre otvorenie postranného panelu. + + CircleCountTool + + + Circle Counter + + + + + Add an autoincrementing counter bubble + + + CircleTool - + Circle Kruh - + Set the Circle as the paint tool @@ -159,22 +172,22 @@ Stlačte medzerník pre otvorenie postranného panelu. ConfigWindow - + Configuration Konfigurácia - + Interface Interfejs - + Filename Editor Editor názvov súborov - + General Všeobecné @@ -182,27 +195,27 @@ Stlačte medzerník pre otvorenie postranného panelu. Controller - + &Take Screenshot &Vytvoriť snímku - + &Open Launcher - + &Configuration &Konfigurácia - + &Information &Informácie - + &Quit &Ukončiť @@ -210,12 +223,12 @@ Stlačte medzerník pre otvorenie postranného panelu. CopyTool - + Copy Kopírovať - + Copy the selection into the clipboard Kopírovať výber do schránky @@ -223,7 +236,7 @@ Stlačte medzerník pre otvorenie postranného panelu. DBusUtils - + Unable to connect via DBus Nie je možné pripojiť sa prostredníctvom DBus @@ -231,12 +244,12 @@ Stlačte medzerník pre otvorenie postranného panelu. ExitTool - + Exit Ukončiť - + Leave the capture screen Opustiť obrazovku so zachytávaním obrazovky @@ -244,47 +257,47 @@ Stlačte medzerník pre otvorenie postranného panelu. FileNameEditor - + Edit the name of your captures: Upraviť meno vašich snímok obrazovky: - + Edit: Upraviť: - + Preview: Náhľad: - + Save Uložiť - + Saves the pattern Uloží vzor - + Reset Resetovať - + Restores the saved pattern Vráti zmeny - + Clear Vyčistiť - + Deletes the name Vymaže meno @@ -292,151 +305,161 @@ Stlačte medzerník pre otvorenie postranného panelu. GeneneralConf - - + + Import Importovať - - - + + + Error Chyba - + Unable to read file. Zlyhalo čítanie súboru. - - + + Unable to write file. Zlyhal zápis do súboru. - + Save File Uložiť súbor - + Confirm Reset Potvrdiť Reset - + Are you sure you want to reset the configuration? Naozaj si želáte resetovať aktuálnu konfiguráciu? - + Show help message Zobraziť nápovedu - + Show the help message at the beginning in the capture mode. Zobraziť nápovedu na začiatku počas režimu zachytávania obrazovky. - - + + Show desktop notifications Zobraziť systémové upozornenia - + Show tray icon Zobraziť stavovú ikonu - + Show the systemtray icon Zobraziť ikonu v stavovej oblasti - + Configuration File Súbor s konfiguráciou - + Export Exportovať - + Reset Resetovať - + Launch at startup Spúšťať pri štarte - + Launch Flameshot Spustiť Flameshot - + Close after capture Zavrieť po vytvorení snímky - + Close after taking a screenshot Zatvoriť po vytvorení snímky obrazovky + + + Copy URL after upload + + + + + Copy URL and close window after upload + + ImgurUploader - + Upload to Imgur Nahrať na Imgur - + Uploading Image Nahrávam obrázok - + Copy URL Kopírovať URL - + Open URL Otvoriť URL - + Delete image Vymazať obrázok - + Image to Clipboard. Obrázok do schránky. - - + + Unable to open the URL. Nepodarilo sa otvoriť URL. - + URL copied to clipboard. URL skopírovaná do schránky. - + Screenshot copied to clipboard. Snímka obrazovky bola skopírovaná do schránky. @@ -444,12 +467,12 @@ Stlačte medzerník pre otvorenie postranného panelu. ImgurUploaderTool - + Image Uploader Uploader obrázkov - + Upload the selection to Imgur Nahrať výber na Imgur @@ -457,97 +480,97 @@ Stlačte medzerník pre otvorenie postranného panelu. InfoWindow - + About O programe - + SPACEBAR MEDZERNÍK - + Right Click Kliknutie pravým tlačidlom - + Mouse Wheel Kolečko myši - + Move selection 1px Presunúť výber o 1 px - + Resize selection 1px Zmeniť rozmery výberu o 1 px - + Quit capture Ukončiť zachytávanie obrazovky - + Copy to clipboard Kopírovať do schránky - + Save selection as a file Zapísať výber do súboru - + Undo the last modification Vrátiť poslednú úpravu - + Toggle visibility of sidebar with options of the selected tool Prepnúť viditeľnosť bočnej lišty s možnosťami vybraného nástroja - + Show color picker Zobraziť dialóg na výber farby - + Change the tool's thickness Zmena hrúbky nástroja - + Available shortcuts in the screen capture mode. Dostupné klávesové skratky v režime zachytávania obrazovky. - + Key Kláves - + Description Popis - + <u><b>License</b></u> <u><b>Licencia</b></u> - + <u><b>Version</b></u> <u><b>Verzia</b></u> - + <u><b>Shortcuts</b></u> <u><b>Klávesové skratky</b></u> @@ -555,12 +578,12 @@ Stlačte medzerník pre otvorenie postranného panelu. LineTool - + Line Čiara - + Set the Line as the paint tool Nastaviť Čiaru ako nástroj pre úpravy @@ -568,12 +591,12 @@ Stlačte medzerník pre otvorenie postranného panelu. MarkerTool - + Marker Fixka - + Set the Marker as the paint tool Nastaviť Fixku ako nástroj pre úpravy @@ -581,12 +604,12 @@ Stlačte medzerník pre otvorenie postranného panelu. MoveTool - + Move Presun - + Move the selection area Presunúť oblasť výberu @@ -594,12 +617,12 @@ Stlačte medzerník pre otvorenie postranného panelu. PencilTool - + Pencil Ceruzka - + Set the Pencil as the paint tool Nastaviť Ceruzku ako nástroj pre úpravy @@ -607,12 +630,12 @@ Stlačte medzerník pre otvorenie postranného panelu. PinTool - + Pin Tool Špendlík - + Pin image on the desktop Pripnúť obrázok na plochu @@ -620,56 +643,61 @@ Stlačte medzerník pre otvorenie postranného panelu. QObject - - - - - + + + + + Unable to connect via DBus Nie je možné pripojiť sa prostredníctvom DBus - + Error Chyba - + Unable to write in Zlyhal zápis do - + Capture saved to clipboard Snímka uložená do schránky - - + + Capture saved as Snímka uložená ako - - + + Error trying to save as Chyba pri ukladaní do - + Save Error Chyba pri ukladaní + + + URL copied to clipboard. + URL skopírovaná do schránky. + RectangleTool - + Rectangle Obdĺžnik - + Set the Rectangle as the paint tool Nastaviť Obdĺžnik ako nástroj pre úpravy @@ -677,12 +705,12 @@ Stlačte medzerník pre otvorenie postranného panelu. RedoTool - + Redo Znova - + Redo the next modification Zopakovať úpravu @@ -690,12 +718,12 @@ Stlačte medzerník pre otvorenie postranného panelu. SaveTool - + Save Uložiť - + Save the capture Uložiť snímku obrazovky @@ -703,7 +731,7 @@ Stlačte medzerník pre otvorenie postranného panelu. ScreenGrabber - + Unable to capture screen Nepodarilo sa zachytiť obrazovku @@ -711,12 +739,12 @@ Stlačte medzerník pre otvorenie postranného panelu. SelectionTool - + Rectangular Selection Obdĺžnikový výber - + Set Selection as the paint tool Nastaviť Výber ako nástroj pre úpravy @@ -724,22 +752,22 @@ Stlačte medzerník pre otvorenie postranného panelu. SidePanelWidget - + Active thickness: Aktívna hrúbka: - + Active color: Aktívna farba: - + Press ESC to cancel Stlačte ESC pre zrušenie - + Grab Color Snímať farbu @@ -747,12 +775,12 @@ Stlačte medzerník pre otvorenie postranného panelu. SizeIndicatorTool - + Selection Size Indicator Ukazovateľ veľkosti výberu - + Show the dimensions of the selection (X Y) Zobraziť rozmery výberu (X Y) @@ -760,107 +788,107 @@ Stlačte medzerník pre otvorenie postranného panelu. StrftimeChooserWidget - + Century (00-99) Storočie (00-99) - + Year (00-99) Rok (00-99) - + Year (2000) Rok (2000) - + Month Name (jan) Meno mesiaca (jan) - + Month Name (january) Meno mesiaca (január) - + Month (01-12) Mesiac (01-12) - + Week Day (1-7) Deň v týždni (1-7) - + Week (01-53) Týždeň (01-53) - + Day Name (mon) Meno dňa (pon) - + Day Name (monday) Meno dňa (pondelok) - + Day (01-31) Deň (01-31) - + Day of Month (1-31) Deň v mesiaci (1-31) - + Day (001-366) Deň (001-366) - + Time (%H-%M-%S) Čas (%H-%M-%S) - + Time (%H-%M) Čas (%H-%M) - + Hour (00-23) Hodina (00-23) - + Hour (01-12) Hodina (01-12) - + Minute (00-59) Minúta (00-59) - + Second (00-59) Sekunda (00-59) - + Full Date (%m/%d/%y) Celý dátum (%m/%d/%y) - + Full Date (%Y-%m-%d) Celý dátum (%Y-%m-%d) @@ -868,7 +896,7 @@ Stlačte medzerník pre otvorenie postranného panelu. SystemNotification - + Flameshot Info Informácie o programe Flameshot @@ -876,22 +904,22 @@ Stlačte medzerník pre otvorenie postranného panelu. TextConfig - + StrikeOut Preškrtnuté - + Underline Podčiarknuté - + Bold Tučné - + Italic Kurzíva @@ -899,12 +927,12 @@ Stlačte medzerník pre otvorenie postranného panelu. TextTool - + Text Text - + Add text to your capture Pridať text do snímky @@ -912,37 +940,37 @@ Stlačte medzerník pre otvorenie postranného panelu. UIcolorEditor - + UI Color Editor Editor farieb interfejsu - + Change the color moving the selectors and see the changes in the preview buttons. Presunom bežcov nastavte farbu a sledujte tieto zmeny v náhľade. - + Select a Button to modify it Kliknite na tlačidlo pre jeho úpravu - + Main Color Hlavná farba - + Click on this button to set the edition mode of the main color. Pre nastavenie hlavnej farby kliknite na toto tlačidlo. - + Contrast Color Kontrastná farba - + Click on this button to set the edition mode of the contrast color. Pre nastavenie kontrastnej farby kliknite na toto tlačidlo. @@ -950,12 +978,12 @@ Stlačte medzerník pre otvorenie postranného panelu. UndoTool - + Undo Späť - + Undo the last modification Vrátiť poslednú úpravu @@ -963,17 +991,17 @@ Stlačte medzerník pre otvorenie postranného panelu. VisualsEditor - + Opacity of area outside selection: Priehľadnosť oblasti mimo výberu: - + Button Selection Výber tlačidiel - + Select All Vybrať všetky diff --git a/translations/Internationalization_sr.ts b/data/translations/Internationalization_sr.ts similarity index 59% rename from translations/Internationalization_sr.ts rename to data/translations/Internationalization_sr.ts index 00945fd4..152535ec 100644 --- a/translations/Internationalization_sr.ts +++ b/data/translations/Internationalization_sr.ts @@ -4,12 +4,12 @@ AppLauncher - + App Launcher Покретач - + Choose an app to open the capture Изаберите програм у ком желите да отворите снимак @@ -17,33 +17,33 @@ AppLauncherWidget - + Open With Отвори помоћу - + Launch in terminal Покрени у терминалу - + Keep open after selection Остави отворено након избора - - + + Error Грешка - + Unable to write in Нисам успео да сачувам - + Unable to launch in terminal. Нисам успео да покренем у терминалу. @@ -51,12 +51,12 @@ ArrowTool - + Arrow Стрелица - + Set the Arrow as the paint tool Избор цртања стрелице @@ -64,25 +64,73 @@ BlurTool - + Blur Замућење - + Set Blur as the paint tool Избор цртања замућене области + + CaptureLauncher + + + <b>Capture Mode</b> + + + + + Rectangular Region + + + + + Full Screen (All Monitors) + + + + + No Delay + + + + + second + + + + + seconds + + + + + Take new screenshot + + + + + Area: + + + + + Delay: + + + CaptureWidget - + Unable to capture screen Нисам успео да снимим екран - + Select an area with the mouse, or press Esc to exit. Press Enter to capture the screen. Press Right Click to show the color picker. @@ -95,15 +143,28 @@ Press Space to open the side panel. Притисните размак на тастатури за приказ помоћног панела. + + CircleCountTool + + + Circle Counter + + + + + Add an autoincrementing counter bubble + + + CircleTool - + Circle Круг - + Set the Circle as the paint tool Избор цртања круга @@ -111,22 +172,22 @@ Press Space to open the side panel. ConfigWindow - + Configuration Подешавања - + Interface Изглед - + Filename Editor Избор имена датотеке - + General Опште @@ -134,22 +195,27 @@ Press Space to open the side panel. Controller - + &Take Screenshot &Направи снимак екрана - + + &Open Launcher + + + + &Configuration &Подешавања - + &Information Ин&формације - + &Quit &Излаз @@ -157,12 +223,12 @@ Press Space to open the side panel. CopyTool - + Copy Запамти - + Copy the selection into the clipboard Копира избор у привремену оставу @@ -170,7 +236,7 @@ Press Space to open the side panel. DBusUtils - + Unable to connect via DBus Нисам успео да се повежем кроз DBus @@ -178,12 +244,12 @@ Press Space to open the side panel. ExitTool - + Exit Излаз - + Leave the capture screen Напусти екран за снимање @@ -191,47 +257,47 @@ Press Space to open the side panel. FileNameEditor - + Edit the name of your captures: Уређивање имена снимака: - + Edit: Уређивање: - + Preview: Преглед: - + Save Сачувај - + Saves the pattern Сачувај шаблон - + Reset Ресетуј - + Restores the saved pattern Поврати сачувани шаблон - + Clear Очисти - + Deletes the name Брише име @@ -239,141 +305,161 @@ Press Space to open the side panel. GeneneralConf - - + + Import Увоз - - - + + + Error Грешка - + Unable to read file. Нисам успео да прочитам датотеку. - - + + Unable to write file. Нисам успео да сачувам датотеку. - + Save File Сачувај датотеку - + Confirm Reset Потврда поништавања - + Are you sure you want to reset the configuration? Да ли сте сигурни да желите да поништите сва прилагођена подешавања? - + Show help message Приказуј поруку са упутством - + Show the help message at the beginning in the capture mode. Приказуј поруку са кратким упутством на почетку снимања екрана. - - + + Show desktop notifications Користи системска обавештења - + Show tray icon Иконица на системској полици - + Show the systemtray icon Приказуј иконицу на системској полици - + Configuration File Датотека са подешавањима - + Export Извоз - + Reset Поништи - + Launch at startup Покрени на почетку - + Launch Flameshot Покрени Flameshot + + + Close after capture + + + + + Close after taking a screenshot + + + + + Copy URL after upload + + + + + Copy URL and close window after upload + + ImgurUploader - + Upload to Imgur Објави на Imgur - + Uploading Image Објављујем слику - + Copy URL Запамти интернет адресу - + Open URL Посети интернет адресу - + Delete image Избриши слику - + Image to Clipboard. Сачувај у привремену меморију. - - + + Unable to open the URL. Нисам успео да посетим интернет адресу. - + URL copied to clipboard. Интернет адреса је сачувана у привременој меморији. - + Screenshot copied to clipboard. Слика је сачувана у привременој меморији. @@ -381,12 +467,12 @@ Press Space to open the side panel. ImgurUploaderTool - + Image Uploader Објављивање слике - + Upload the selection to Imgur Објави избор на Imgur сајту @@ -394,92 +480,97 @@ Press Space to open the side panel. InfoWindow - + About О програму - + + SPACEBAR + + + + Right Click Десни клик - + Mouse Wheel Точкић миша - + Move selection 1px Помери избор за 1px - + Resize selection 1px Увећај избор за 1px - + Quit capture Излаз из снимача екрана - + Copy to clipboard Запамти у привременој меморији - + Save selection as a file Сачувај избор у датотеку - + Undo the last modification Поништи последње измене - + Toggle visibility of sidebar with options of the selected tool - + Show color picker Прикажи избор боје - + Change the tool's thickness Измени дебљину линије алата - + Available shortcuts in the screen capture mode. Доступне пречице у моду снимка екрана. - + Key Тастер - + Description Опис - + <u><b>License</b></u> <u><b>Лиценца</b></u> - + <u><b>Version</b></u> <u><b>Верзија</b></u> - + <u><b>Shortcuts</b></u> <u><b>Пречице</b></u> @@ -487,12 +578,12 @@ Press Space to open the side panel. LineTool - + Line Линија - + Set the Line as the paint tool Избор цртања линије @@ -500,12 +591,12 @@ Press Space to open the side panel. MarkerTool - + Marker Маркер - + Set the Marker as the paint tool Избор цртања маркером @@ -513,12 +604,12 @@ Press Space to open the side panel. MoveTool - + Move Премештање - + Move the selection area Премешта изабрану област @@ -526,12 +617,12 @@ Press Space to open the side panel. PencilTool - + Pencil Оловка - + Set the Pencil as the paint tool Избор цртања оловком @@ -539,12 +630,12 @@ Press Space to open the side panel. PinTool - + Pin Tool Закачка - + Pin image on the desktop Закачи слику за радну површину @@ -552,55 +643,61 @@ Press Space to open the side panel. QObject - + Save Error Грешка приликом упусивања - - + + Capture saved as Сачувај снимак као - + Capture saved to clipboard Снимак је сачуван у привремену меморију - - + + Error trying to save as Грешка приликом уписивања као - - - - + + + + + Unable to connect via DBus Нисам успео да се повежем кроз DBus - + Error Грешка - + Unable to write in Нисам успео са сачувам + + + URL copied to clipboard. + Интернет адреса је сачувана у привременој меморији. + RectangleTool - + Rectangle Правоугаоник - + Set the Rectangle as the paint tool Избор цртања обојеног правоугаоника @@ -608,12 +705,12 @@ Press Space to open the side panel. RedoTool - + Redo Понови - + Redo the next modification Понови поништену измену @@ -621,13 +718,13 @@ Press Space to open the side panel. SaveTool - + Save Сачувај Сохранить - + Save the capture Сачувај снимак @@ -635,7 +732,7 @@ Press Space to open the side panel. ScreenGrabber - + Unable to capture screen Нисам успео да снимим екран @@ -643,12 +740,12 @@ Press Space to open the side panel. SelectionTool - + Rectangular Selection Правоугаони оквир - + Set Selection as the paint tool Избор цртања правоугаоног оквира @@ -656,22 +753,22 @@ Press Space to open the side panel. SidePanelWidget - + Active thickness: - + Active color: Активна боја: - + Press ESC to cancel Притисните ESC за прекид - + Grab Color Преузмите боју @@ -679,12 +776,12 @@ Press Space to open the side panel. SizeIndicatorTool - + Selection Size Indicator Приказ величине избора - + Show the dimensions of the selection (X Y) Приказује величину избора (X Y) @@ -692,107 +789,107 @@ Press Space to open the side panel. StrftimeChooserWidget - + Century (00-99) Век (00-99) - + Year (00-99) Година (00-99) - + Year (2000) Година (2000) - + Month Name (jan) Име месеца (јан) - + Month Name (january) Име месеца (јануар) - + Month (01-12) Месец (01-12) - + Week Day (1-7) Дани у недељи (1-7) - + Week (01-53) Недеља (01-53) - + Day Name (mon) Дан у недељи (пон) - + Day Name (monday) Дан у недељи (понедељак) - + Day (01-31) Дан (01-31) - + Day of Month (1-31) Дан месеца (1-31) - + Day (001-366) Дан (001-366) - + Time (%H-%M-%S) Време (%H-%M-%S) - + Time (%H-%M) Време (%H-%M) - + Hour (00-23) Сат (00-23) - + Hour (01-12) Сат (01-12) - + Minute (00-59) Минута (00-59) - + Second (00-59) Секунда (00-59) - + Full Date (%m/%d/%y) Комплетан датум (%m/%d/%y) - + Full Date (%Y-%m-%d) Комплетан датум (%Y-%m-%d) @@ -800,7 +897,7 @@ Press Space to open the side panel. SystemNotification - + Flameshot Info Информације о Flameshot-у @@ -808,22 +905,22 @@ Press Space to open the side panel. TextConfig - + StrikeOut Прецртано - + Underline Подвучено - + Bold Задебљано - + Italic Накошено @@ -831,12 +928,12 @@ Press Space to open the side panel. TextTool - + Text Текст - + Add text to your capture Додаје текст на снимак @@ -844,37 +941,37 @@ Press Space to open the side panel. UIcolorEditor - + UI Color Editor Уређивање боје сучеља - + Change the color moving the selectors and see the changes in the preview buttons. Измените боју померањем изборника и видите резултат у прегледу дугмића. - + Select a Button to modify it Изаберите дугме да би га изменили - + Main Color Основна боја - + Click on this button to set the edition mode of the main color. Кликните на дугме да би прешли у режим уређивања основне боје. - + Contrast Color Боја контраста - + Click on this button to set the edition mode of the contrast color. Кликните на дугме да би прешли у режим уређивања боје контраста. @@ -882,12 +979,12 @@ Press Space to open the side panel. UndoTool - + Undo Поништи - + Undo the last modification Поништи последњу измену @@ -895,17 +992,17 @@ Press Space to open the side panel. VisualsEditor - + Opacity of area outside selection: Провидност подручја ван избора: - + Button Selection Избор дугмића - + Select All Изабери све diff --git a/translations/Internationalization_tr.ts b/data/translations/Internationalization_tr.ts similarity index 57% rename from translations/Internationalization_tr.ts rename to data/translations/Internationalization_tr.ts index c3d7a317..01b0aeab 100644 --- a/translations/Internationalization_tr.ts +++ b/data/translations/Internationalization_tr.ts @@ -4,12 +4,12 @@ AppLauncher - + App Launcher Uygulama Başlatıcı - + Choose an app to open the capture Yakalamayı açmak için bir uygulama seçin @@ -17,33 +17,33 @@ AppLauncherWidget - + Open With ile Aç - + Launch in terminal Terminalde aç - + Keep open after selection Seçimden sonra açık tutun - - + + Error Hata - + Unable to write in Yazma mümkün değil - + Unable to launch in terminal. Terminalde başlatılamadı. @@ -51,12 +51,12 @@ ArrowTool - + Arrow Ok - + Set the Arrow as the paint tool Oku çizim aracı olarak ayarlar @@ -64,25 +64,73 @@ BlurTool - + Blur Bulanıklık - + Set Blur as the paint tool Bulnıklığı boyama aracı olarak ayarlar + + CaptureLauncher + + + <b>Capture Mode</b> + + + + + Rectangular Region + + + + + Full Screen (All Monitors) + + + + + No Delay + + + + + second + + + + + seconds + + + + + Take new screenshot + + + + + Area: + + + + + Delay: + + + CaptureWidget - + Unable to capture screen Ekran resmi alınamadı - + Select an area with the mouse, or press Esc to exit. Press Enter to capture the screen. Press Right Click to show the color picker. @@ -95,15 +143,28 @@ Aracınızın kalınlığını değiştirmek için Fare Tekerleğini kullanın. Yan paneli açmak için Boşluk tuşuna basın. + + CircleCountTool + + + Circle Counter + + + + + Add an autoincrementing counter bubble + + + CircleTool - + Circle Çember - + Set the Circle as the paint tool Çemberi boyama aracı olarak ayarlar @@ -111,22 +172,22 @@ Yan paneli açmak için Boşluk tuşuna basın. ConfigWindow - + Configuration Ayarlar - + Interface Arayüz - + Filename Editor Dosya Adı Düzenleyici - + General Genel @@ -134,22 +195,27 @@ Yan paneli açmak için Boşluk tuşuna basın. Controller - + &Take Screenshot &Ekran Resmi Al - + + &Open Launcher + + + + &Configuration &Ayarlar - + &Information &Bilgi - + &Quit &Çıkış @@ -157,12 +223,12 @@ Yan paneli açmak için Boşluk tuşuna basın. CopyTool - + Copy Kopyala - + Copy the selection into the clipboard Seçimi panoya kopyalar @@ -170,7 +236,7 @@ Yan paneli açmak için Boşluk tuşuna basın. DBusUtils - + Unable to connect via DBus DBus ile bağlanılamadı @@ -178,12 +244,12 @@ Yan paneli açmak için Boşluk tuşuna basın. ExitTool - + Exit Çıkış - + Leave the capture screen Yakalama ekranından ayrıl @@ -191,47 +257,47 @@ Yan paneli açmak için Boşluk tuşuna basın. FileNameEditor - + Edit the name of your captures: Çekimlerinizin adını düzenleyin: - + Edit: Düzenle: - + Preview: Önizleme: - + Save Kaydet - + Saves the pattern Desenini kaydeder - + Reset Sıfırla - + Restores the saved pattern Kaydedilen deseni geri yükler - + Clear Temizle - + Deletes the name İsmi siler @@ -239,141 +305,161 @@ Yan paneli açmak için Boşluk tuşuna basın. GeneneralConf - - + + Import Dışa aktar - - - + + + Error Hata - + Unable to read file. Dosya okunamıyor. - - + + Unable to write file. Dosya yazılamıyor. - + Save File Dosyayı Kaydet - + Confirm Reset Sıfırlamayı Onayla - + Are you sure you want to reset the configuration? Ayarları sıfırlamak istediğinizden emin misiniz? - + Show help message Yardım mesajını göster - + Show the help message at the beginning in the capture mode. Yakalama modunda başında yardım mesajını gösterin. - - + + Show desktop notifications Masaüstü bildirimlerini göster - + Show tray icon Tepsi simgesini göster - + Show the systemtray icon Sistem tepsisi simgesini göster - + Configuration File Yapılandırma Dosyası - + Export Dışa aktar - + Reset Sıfırla - + Launch at startup Başlangıçta başlatın - + Launch Flameshot Flameshot'ı başlat + + + Close after capture + + + + + Close after taking a screenshot + + + + + Copy URL after upload + + + + + Copy URL and close window after upload + + ImgurUploader - + Upload to Imgur Imgur'a yükle - + Uploading Image Resim Yükleniyor - + Copy URL URL Kopyala - + Open URL URL Aç - + Delete image Resmi sil - + Image to Clipboard. Resim Pano'ya. - - + + Unable to open the URL. URL açılamıyor. - + URL copied to clipboard. URL panoya kopyalandı. - + Screenshot copied to clipboard. Ekran görüntüsü panoya kopyalandı. @@ -381,12 +467,12 @@ Yan paneli açmak için Boşluk tuşuna basın. ImgurUploaderTool - + Image Uploader Resim Yükleme Aracı - + Upload the selection to Imgur Seçimi Imgur'a yükler @@ -394,92 +480,97 @@ Yan paneli açmak için Boşluk tuşuna basın. InfoWindow - + About Hakkında - + + SPACEBAR + + + + Right Click Sağ Tık - + Mouse Wheel Fare Tekerleği - + Move selection 1px 1px seçimini hareket ettir - + Resize selection 1px 1px seçimini yeniden boyutlandır - + Quit capture Çıkış - + Copy to clipboard Panoya kopyala - + Save selection as a file Seçimi dosya olarak kaydet - + Undo the last modification Son değişikliği geri al - + Toggle visibility of sidebar with options of the selected tool - + Show color picker Renk seçici göster - + Change the tool's thickness Araç kalınlığını değiştirin - + Available shortcuts in the screen capture mode. Ekran yakalama modunda kullanılabilir kısayollar. - + Key Anahtar - + Description Tanım - + <u><b>License</b></u> <u><b>Lisans</b></u> - + <u><b>Version</b></u> <u><b>Sürüm</b></u> - + <u><b>Shortcuts</b></u> <u><b>Kısayollar</b></u> @@ -487,12 +578,12 @@ Yan paneli açmak için Boşluk tuşuna basın. LineTool - + Line Çizgi - + Set the Line as the paint tool Çizgiyi boyama aracı olarak ayarlar @@ -500,12 +591,12 @@ Yan paneli açmak için Boşluk tuşuna basın. MarkerTool - + Marker İşaretleyici - + Set the Marker as the paint tool İşaretleyiciyi boyama aracı olarak ayarlar @@ -513,12 +604,12 @@ Yan paneli açmak için Boşluk tuşuna basın. MoveTool - + Move Oynat - + Move the selection area Seçim alanını hareket ettir @@ -526,12 +617,12 @@ Yan paneli açmak için Boşluk tuşuna basın. PencilTool - + Pencil Kurşun Kalem - + Set the Pencil as the paint tool Kurşun Kalemi çizim aracı olarak ayarlar @@ -539,12 +630,12 @@ Yan paneli açmak için Boşluk tuşuna basın. PinTool - + Pin Tool Pin Aracı - + Pin image on the desktop Masaüstündeki PIN resmi @@ -552,55 +643,61 @@ Yan paneli açmak için Boşluk tuşuna basın. QObject - + Save Error Kaydetme Hatası - - + + Capture saved as Yakalama farklı kaydedildi - + Capture saved to clipboard Yakalama panoya kaydedildi - - + + Error trying to save as Farklı kaydetmeye çalışılırken hata oluştu - - - - + + + + + Unable to connect via DBus DBus ile bağlanılamadı - + Error Hata - + Unable to write in Yazma mümkün değil + + + URL copied to clipboard. + URL panoya kopyalandı. + RectangleTool - + Rectangle Dikdörtgen - + Set the Rectangle as the paint tool Dikdörtgeni boyama aracı olarak ayarlar @@ -608,12 +705,12 @@ Yan paneli açmak için Boşluk tuşuna basın. RedoTool - + Redo Yeniden - + Redo the next modification @@ -621,12 +718,12 @@ Yan paneli açmak için Boşluk tuşuna basın. SaveTool - + Save Kaydet - + Save the capture Yakalamayı kaydet @@ -634,7 +731,7 @@ Yan paneli açmak için Boşluk tuşuna basın. ScreenGrabber - + Unable to capture screen Ekran resmi alınamadı @@ -642,12 +739,12 @@ Yan paneli açmak için Boşluk tuşuna basın. SelectionTool - + Rectangular Selection Dikdörtgen Seçim - + Set Selection as the paint tool Seçimi boyama aracı olarak ayarlar @@ -655,22 +752,22 @@ Yan paneli açmak için Boşluk tuşuna basın. SidePanelWidget - + Active thickness: - + Active color: Aktif Renk: - + Press ESC to cancel Çıkmak için ESC'ye tıklayın - + Grab Color @@ -678,12 +775,12 @@ Yan paneli açmak için Boşluk tuşuna basın. SizeIndicatorTool - + Selection Size Indicator Seçim Boyutu Göstergesi - + Show the dimensions of the selection (X Y) Seçimin boyutlarını gösterir (X Y) @@ -691,107 +788,107 @@ Yan paneli açmak için Boşluk tuşuna basın. StrftimeChooserWidget - + Century (00-99) Ülke (00-99) - + Year (00-99) Yıl (00-99) - + Year (2000) Yıl (2000) - + Month Name (jan) Ay Adı (Oca) - + Month Name (january) Ay Adı (Ocak) - + Month (01-12) Ay (01-12) - + Week Day (1-7) Haftanın Günü (1-7) - + Week (01-53) Hafta (01-53) - + Day Name (mon) Gün Adı (pzt) - + Day Name (monday) Gün Adı (pazartesi) - + Day (01-31) Gün (01-31) - + Day of Month (1-31) Ayın Günü (1-31) - + Day (001-366) Gün (001-366) - + Time (%H-%M-%S) - + Time (%H-%M) - + Hour (00-23) Saat (00-23) - + Hour (01-12) Saat (01-12) - + Minute (00-59) Dakika (00-59) - + Second (00-59) Saniye (00-59) - + Full Date (%m/%d/%y) Tam Tarih (%d/%m/%y) - + Full Date (%Y-%m-%d) Tam Tarih (%d-%m-%Y) @@ -799,7 +896,7 @@ Yan paneli açmak için Boşluk tuşuna basın. SystemNotification - + Flameshot Info Flameshot Hakkında @@ -807,22 +904,22 @@ Yan paneli açmak için Boşluk tuşuna basın. TextConfig - + StrikeOut - + Underline Altçizgi - + Bold Kalın - + Italic Eğik @@ -830,12 +927,12 @@ Yan paneli açmak için Boşluk tuşuna basın. TextTool - + Text Metin - + Add text to your capture Bilgisayardan yazı ekle @@ -843,37 +940,37 @@ Yan paneli açmak için Boşluk tuşuna basın. UIcolorEditor - + UI Color Editor UI Renk Editörü - + Change the color moving the selectors and see the changes in the preview buttons. Seçicileri hareket ettiren rengi değiştirin ve önizleme düğmelerindeki değişiklikleri görün. - + Select a Button to modify it Değiştirmek için bir buton seçin - + Main Color Ana Renk - + Click on this button to set the edition mode of the main color. Ana rengin baskı modunu ayarlamak için bu butonu tıklayın. - + Contrast Color Kontrast Renk - + Click on this button to set the edition mode of the contrast color. Kontrast renginin baskı modunu ayarlamak için bu butonu tıklayın. @@ -881,12 +978,12 @@ Yan paneli açmak için Boşluk tuşuna basın. UndoTool - + Undo Geri - + Undo the last modification Son değişikliği geri al @@ -894,17 +991,17 @@ Yan paneli açmak için Boşluk tuşuna basın. VisualsEditor - + Opacity of area outside selection: Seçimin dışındaki alanın opaklığı: - + Button Selection Buton Seçimi - + Select All Tümünü Seç diff --git a/translations/Internationalization_uk.ts b/data/translations/Internationalization_uk.ts similarity index 60% rename from translations/Internationalization_uk.ts rename to data/translations/Internationalization_uk.ts index b11a5894..1211a83a 100644 --- a/translations/Internationalization_uk.ts +++ b/data/translations/Internationalization_uk.ts @@ -1,15 +1,15 @@ - + AppLauncher - + App Launcher Запуск програми - + Choose an app to open the capture Виберіть програму, щоб відкрити знімок @@ -17,33 +17,33 @@ AppLauncherWidget - + Open With Відкрити у - + Launch in terminal Запустити у терміналі - + Keep open after selection Не закривати після вибору - - + + Error Помилка - + Unable to write in Не вдалось записати - + Unable to launch in terminal. Не вдалось запустити у терміналі. @@ -51,12 +51,12 @@ ArrowTool - + Arrow Стрілка - + Set the Arrow as the paint tool Вибрати стрілку інструментом малювання @@ -64,25 +64,73 @@ BlurTool - + Blur Розмиття - + Set Blur as the paint tool Вибрати розмиття інструментом малювання + + CaptureLauncher + + + <b>Capture Mode</b> + + + + + Rectangular Region + + + + + Full Screen (All Monitors) + + + + + No Delay + + + + + second + + + + + seconds + + + + + Take new screenshot + + + + + Area: + + + + + Delay: + + + CaptureWidget - + Unable to capture screen Не вдалось захопити екран - + Select an area with the mouse, or press Esc to exit. Press Enter to capture the screen. Press Right Click to show the color picker. @@ -95,15 +143,28 @@ Press Space to open the side panel. Натисніть Пробіл, щоб відкрити бічну панель. + + CircleCountTool + + + Circle Counter + + + + + Add an autoincrementing counter bubble + + + CircleTool - + Circle Коло - + Set the Circle as the paint tool Вибрати коло інструментом малювання @@ -111,22 +172,22 @@ Press Space to open the side panel. ConfigWindow - + Configuration Налаштування - + Interface Інтерфейс - + Filename Editor Редактор імені файлів - + General Загальне @@ -134,22 +195,27 @@ Press Space to open the side panel. Controller - + &Take Screenshot &Зробити знімок - + + &Open Launcher + + + + &Configuration &Налаштування - + &Information &Інформація - + &Quit Ви&йти @@ -157,12 +223,12 @@ Press Space to open the side panel. CopyTool - + Copy Копіювати - + Copy the selection into the clipboard Копіювати вибране до буферу обміну @@ -170,7 +236,7 @@ Press Space to open the side panel. DBusUtils - + Unable to connect via DBus Не вдалось підключитись через DBus @@ -178,12 +244,12 @@ Press Space to open the side panel. ExitTool - + Exit Вийти - + Leave the capture screen Вийти із захоплення екрану @@ -191,47 +257,47 @@ Press Space to open the side panel. FileNameEditor - + Edit the name of your captures: Відредагуйте ім'я ваших знімків: - + Edit: Шаблон: - + Preview: Перегляд: - + Save Зберегти - + Saves the pattern Зберегти шаблон - + Reset Скинути - + Restores the saved pattern Відновлює збережений шаблон - + Clear Очистити - + Deletes the name Видаляє ім'я @@ -239,141 +305,161 @@ Press Space to open the side panel. GeneneralConf - - + + Import Імпорт - - - + + + Error Помилка - + Unable to read file. Не вдалось прочитати файл. - - + + Unable to write file. Не вдалось записати файл. - + Save File Зберегти файл - + Confirm Reset Підтвердити скидання - + Are you sure you want to reset the configuration? Ви дійсно хочете скинути налаштування? - + Show help message Показувати повідомлення довідки - + Show the help message at the beginning in the capture mode. Показувати повідомлення довідки на початку режиму захоплення. - - + + Show desktop notifications Показувати повідомлення - + Show tray icon Показувати значок на панелі - + Show the systemtray icon Показувати значок на панелі повідомленнь - + Configuration File Файл налаштувань - + Export Експорт - + Reset Скинути - + Launch at startup Запускати при старті системи - + Launch Flameshot Запускати Flameshot + + + Close after capture + + + + + Close after taking a screenshot + + + + + Copy URL after upload + + + + + Copy URL and close window after upload + + ImgurUploader - + Upload to Imgur Вивантажити до Imgur - + Uploading Image Вивантаження зображення - + Copy URL Скопіювати URL - + Open URL Відкрити URL - + Delete image Видалити зображення - + Image to Clipboard. Зображення до буферу обміну. - - + + Unable to open the URL. Не вдалось відкрити URL. - + URL copied to clipboard. URL скопійовано до буферу обміну. - + Screenshot copied to clipboard. Знімок скопійовано до буферу обміну. @@ -381,12 +467,12 @@ Press Space to open the side panel. ImgurUploaderTool - + Image Uploader Вивантаження зображень - + Upload the selection to Imgur Вивантажити вибране до Imgur @@ -394,92 +480,97 @@ Press Space to open the side panel. InfoWindow - + About Про... - + + SPACEBAR + + + + Right Click Права кнопка миші - + Mouse Wheel Колесо миші - + Move selection 1px Перемістити виділення на 1px - + Resize selection 1px Змінити розмір виділення на 1px - + Quit capture Вийти із захоплення екрану - + Copy to clipboard Копіювати до буферу обміну - + Save selection as a file Зберегти вибране до файлу - + Undo the last modification Скасувати останню зміну - + Toggle visibility of sidebar with options of the selected tool Переключити видимість бічної панелі - + Show color picker Показати вибір кольору - + Change the tool's thickness Змінити товщину інструменту - + Available shortcuts in the screen capture mode. Доступні комбінації клавіш у режимі захоплення екрану. - + Key Клавіша - + Description Опис - + <u><b>License</b></u> <u><b>Ліцензія</b></u> - + <u><b>Version</b></u> <u><b>Версія</b></u> - + <u><b>Shortcuts</b></u> <u><b>Комбінації клавіш</b></u> @@ -487,12 +578,12 @@ Press Space to open the side panel. LineTool - + Line Лінія - + Set the Line as the paint tool Вибрати лінію інструментом малювання @@ -500,12 +591,12 @@ Press Space to open the side panel. MarkerTool - + Marker Маркер - + Set the Marker as the paint tool Вибрати маркер інструментом малювання @@ -513,12 +604,12 @@ Press Space to open the side panel. MoveTool - + Move Переміщення - + Move the selection area Перемістити вибір @@ -526,12 +617,12 @@ Press Space to open the side panel. PencilTool - + Pencil Олівець - + Set the Pencil as the paint tool Вибрати олівець інструментом малювання @@ -539,12 +630,12 @@ Press Space to open the side panel. PinTool - + Pin Tool Прикріплення - + Pin image on the desktop Прикріпити зображення до робочого столу @@ -552,55 +643,61 @@ Press Space to open the side panel. QObject - + Save Error Помилка збереження - - + + Capture saved as Знімок збережено як - + Capture saved to clipboard Знімок збережено до буферу обміну - - + + Error trying to save as Помилка під час збереження як - - - - + + + + + Unable to connect via DBus Не вдалось підключитись через DBus - + Error Помилка - + Unable to write in Не вдалось зберегти + + + URL copied to clipboard. + URL скопійовано до буферу обміну. + RectangleTool - + Rectangle Прямокутник - + Set the Rectangle as the paint tool Вибрати прямокутник інструментом малювання @@ -608,12 +705,12 @@ Press Space to open the side panel. RedoTool - + Redo Повторити - + Redo the next modification Повторити наступну зміну @@ -621,12 +718,12 @@ Press Space to open the side panel. SaveTool - + Save Зберегти - + Save the capture Зберегти знімок @@ -634,7 +731,7 @@ Press Space to open the side panel. ScreenGrabber - + Unable to capture screen Не вдалось захопити екран @@ -642,12 +739,12 @@ Press Space to open the side panel. SelectionTool - + Rectangular Selection Прямокутне виділення - + Set Selection as the paint tool Вибрати прямокутне виділення інструментом малювання @@ -655,22 +752,22 @@ Press Space to open the side panel. SidePanelWidget - + Active thickness: Активна товщина: - + Active color: Активний колір: - + Press ESC to cancel Натисніть Esc для скасування - + Grab Color Визначити колір з екрану @@ -678,12 +775,12 @@ Press Space to open the side panel. SizeIndicatorTool - + Selection Size Indicator Індикатор розміру виділення - + Show the dimensions of the selection (X Y) Показує розмір виділення (X Y) @@ -691,107 +788,107 @@ Press Space to open the side panel. StrftimeChooserWidget - + Century (00-99) Століття (00-99) - + Year (00-99) Рік (00-99) - + Year (2000) Рік (2000) - + Month Name (jan) Назва місяця (січ) - + Month Name (january) Назва місяця (січень) - + Month (01-12) Місяць (01-12) - + Week Day (1-7) День тижня (1-7) - + Week (01-53) Тиждень (01-53) - + Day Name (mon) Назва дня тижня (пн) - + Day Name (monday) Назва дня тижня (понеділок) - + Day (01-31) День (01-31) - + Day of Month (1-31) День місяця (1-31) - + Day (001-366) День (001-366) - + Time (%H-%M-%S) Час (%H-%M-%S) - + Time (%H-%M) Час (%H-%M) - + Hour (00-23) Година (00-23) - + Hour (01-12) Година (01-12) - + Minute (00-59) Хвилина (00-59) - + Second (00-59) Секунда (00-59) - + Full Date (%m/%d/%y) Повна дата (%m/%d/%y) - + Full Date (%Y-%m-%d) Повна дата (%Y-%m-%d) @@ -799,7 +896,7 @@ Press Space to open the side panel. SystemNotification - + Flameshot Info Довідка Flameshot @@ -807,22 +904,22 @@ Press Space to open the side panel. TextConfig - + StrikeOut Перекреслення - + Underline Підкреслення - + Bold Жирний - + Italic Курсив @@ -830,12 +927,12 @@ Press Space to open the side panel. TextTool - + Text Текст - + Add text to your capture Додати текст на знімок @@ -843,37 +940,37 @@ Press Space to open the side panel. UIcolorEditor - + UI Color Editor Редактор кольору інтерфейсу - + Change the color moving the selectors and see the changes in the preview buttons. Змініть колір пересуваючи виділення та перегляньте зміни у кнопках перегляду. - + Select a Button to modify it Виберіть кнопку, щоб змінити її - + Main Color Основний колір - + Click on this button to set the edition mode of the main color. Натисніть на цю кнопку, щоб включити режим редагування основного кольору. - + Contrast Color Контрасний колір - + Click on this button to set the edition mode of the contrast color. Натисніть на цю кнопку, щоб включити режим редагування контрасного кольору. @@ -881,12 +978,12 @@ Press Space to open the side panel. UndoTool - + Undo Скасувати - + Undo the last modification Скасувати останню зміну @@ -894,17 +991,17 @@ Press Space to open the side panel. VisualsEditor - + Opacity of area outside selection: Нерозорість області за межами вибору: - + Button Selection Вибір кнопок - + Select All Вибрати все diff --git a/translations/Internationalization_zh_CN.ts b/data/translations/Internationalization_zh_CN.ts similarity index 60% rename from translations/Internationalization_zh_CN.ts rename to data/translations/Internationalization_zh_CN.ts index 0fceb19f..7a9e476a 100644 --- a/translations/Internationalization_zh_CN.ts +++ b/data/translations/Internationalization_zh_CN.ts @@ -4,12 +4,12 @@ AppLauncher - + App Launcher 应用启动器 - + Choose an app to open the capture 选择一个应用打开此截图 @@ -17,33 +17,33 @@ AppLauncherWidget - + Open With 打开 - + Launch in terminal 在终端中启动 - + Keep open after selection 选择后保持此窗口打开 - - + + Error 错误 - + Unable to launch in terminal. 无法在终端中启动。 - + Unable to write in 无法写入 @@ -51,12 +51,12 @@ ArrowTool - + Arrow 箭头 - + Set the Arrow as the paint tool 选择箭头作为绘画工具 @@ -64,12 +64,12 @@ BlurTool - + Blur 模糊 - + Set Blur as the paint tool 选择模糊作为绘画工具 @@ -77,47 +77,47 @@ CaptureLauncher - + <b>Capture Mode</b> <b>捕获模式</b> - + Rectangular Region 方形区域 - + Full Screen (All Monitors) 全屏（所有显示器） - + No Delay 无延迟 - + second 秒 - + seconds 秒 - + Take new screenshot 获取新屏幕截图 - + Area: 区域： - + Delay: 延迟： @@ -125,13 +125,13 @@ CaptureWidget - + Unable to capture screen 无法捕获屏幕 无法捕获屏幕 - + Select an area with the mouse, or press Esc to exit. Press Enter to capture the screen. Press Right Click to show the color picker. @@ -144,15 +144,28 @@ Press Space to open the side panel. 按下空格键以打开侧边面板。 + + CircleCountTool + + + Circle Counter + + + + + Add an autoincrementing counter bubble + + + CircleTool - + Circle 圆环 - + Set the Circle as the paint tool 选择圆环作为绘画工具 @@ -160,22 +173,22 @@ Press Space to open the side panel. ConfigWindow - + Configuration 配置 - + Interface 界面 - + Filename Editor 文件名编辑器 - + General 常规 @@ -183,27 +196,27 @@ Press Space to open the side panel. Controller - + &Take Screenshot 进行截图(&T) - + &Open Launcher 打开启动器(&O) - + &Configuration 配置(&C) - + &Information 信息(&I) - + &Quit 退出(&Q) @@ -211,12 +224,12 @@ Press Space to open the side panel. CopyTool - + Copy 复制 - + Copy the selection into the clipboard 复制选择到剪贴板 @@ -224,7 +237,7 @@ Press Space to open the side panel. DBusUtils - + Unable to connect via DBus 无法通过 DBus 进行连接 @@ -232,12 +245,12 @@ Press Space to open the side panel. ExitTool - + Exit 退出 - + Leave the capture screen 离开屏幕捕获 @@ -245,47 +258,47 @@ Press Space to open the side panel. FileNameEditor - + Edit the name of your captures: 编辑您的截图名称: - + Edit: 编辑器: - + Preview: 预览: - + Save 保存 - + Saves the pattern 保存样式 - + Reset 恢复 - + Restores the saved pattern 恢复保存的样式 - + Clear 清空 - + Deletes the name 删除这个名字 @@ -293,151 +306,161 @@ Press Space to open the side panel. GeneneralConf - + Show help message 显示帮助文档 - + Show the help message at the beginning in the capture mode. 在捕获之前显示帮助信息。 - - + + Show desktop notifications 显示桌面通知 - + Show tray icon 显示托盘图标 - + Show the systemtray icon 显示任务栏图标 - - + + Import 导入 - - - + + + Error 错误 - + Unable to read file. 无法读取文件。 - - + + Unable to write file. 无法写入文件。 - + Save File 保存到文件 - + Confirm Reset 确定重置 - + Are you sure you want to reset the configuration? 你确定你想要重置配置？ - + Configuration File 配置文件 - + Export 导出 - + Reset 重置 - + Launch at startup 开机时启动 - + Launch Flameshot 启动 Flameshot - + Close after capture 捕获后关闭 - + Close after taking a screenshot 获取屏幕截图后关闭 + + + Copy URL after upload + + + + + Copy URL and close window after upload + + ImgurUploader - + Upload to Imgur 上传到Imgur - + Uploading Image 正在上传 - + Copy URL 复制链接 - + Open URL 打开链接 - + Delete image 删除图像 - + Image to Clipboard. 保存文件到剪贴板。 - - + + Unable to open the URL. 无法打开此链接。 - + URL copied to clipboard. 复制链接到剪贴板。 - + Screenshot copied to clipboard. 截图复制到剪贴板。 @@ -445,12 +468,12 @@ Press Space to open the side panel. ImgurUploaderTool - + Image Uploader 上传图片 - + Upload the selection to Imgur 上传选择到 Imgur @@ -458,97 +481,97 @@ Press Space to open the side panel. InfoWindow - + About 关于 - + SPACEBAR 空格 - + Right Click 右键 - + Mouse Wheel 鼠标滑轮 - + Move selection 1px 移动选择 1 px - + Resize selection 1px 调整选择大小 1 px - + Quit capture 退出捕获 - + Copy to clipboard 复制到剪贴板 - + Save selection as a file 将选择保存为文件 - + Undo the last modification 撤消上次修改 - + Toggle visibility of sidebar with options of the selected tool 切换侧边栏可见性 - + Show color picker 显示颜色选择器 - + Change the tool's thickness 改变工具的厚度 - + Key 键 - + Description 描述 - + <u><b>License</b></u> <u><b>许可证</b></u> - + <u><b>Version</b></u> <u><b>版本</b></u> - + <u><b>Shortcuts</b></u> <u><b>快捷键</b></u> - + Available shortcuts in the screen capture mode. 屏幕捕捉模式中的可用快捷键。 @@ -556,12 +579,12 @@ Press Space to open the side panel. LineTool - + Line 直线 - + Set the Line as the paint tool 将直线线设置为绘画工具 @@ -569,12 +592,12 @@ Press Space to open the side panel. MarkerTool - + Marker 标记 - + Set the Marker as the paint tool 将标记设置为绘画工具 @@ -582,12 +605,12 @@ Press Space to open the side panel. MoveTool - + Move 移动 - + Move the selection area 移动选择区域 @@ -595,12 +618,12 @@ Press Space to open the side panel. PencilTool - + Pencil 铅笔 - + Set the Pencil as the paint tool 将铅笔设置为绘画工具 @@ -608,12 +631,12 @@ Press Space to open the side panel. PinTool - + Pin Tool 贴图工具 - + Pin image on the desktop 在桌面上固定图像 @@ -621,56 +644,61 @@ Press Space to open the side panel. QObject - + Save Error 保存错误 - - + + Capture saved as 捕获已保存为 - + Capture saved to clipboard 捕获已保存至剪贴板 - - + + Error trying to save as 尝试另存为时出错 - - - - - + + + + + Unable to connect via DBus 无法通过DBus进行连接 - + Error 错误 - + Unable to write in 无法写入 + + + URL copied to clipboard. + 复制链接到剪贴板。 + RectangleTool - + Rectangle 实心矩形 - + Set the Rectangle as the paint tool 将实心矩形设置为绘画工具 @@ -678,12 +706,12 @@ Press Space to open the side panel. RedoTool - + Redo 重做 - + Redo the next modification 重做上次修改 @@ -691,12 +719,12 @@ Press Space to open the side panel. SaveTool - + Save 保存 - + Save the capture 保存捕获 @@ -704,7 +732,7 @@ Press Space to open the side panel. ScreenGrabber - + Unable to capture screen 无法捕获屏幕 @@ -712,12 +740,12 @@ Press Space to open the side panel. SelectionTool - + Rectangular Selection 矩形选择 - + Set Selection as the paint tool 将矩形选择设置为绘画工具 @@ -725,22 +753,22 @@ Press Space to open the side panel. SidePanelWidget - + Active thickness: 当前宽度： - + Active color: 活动颜色： - + Press ESC to cancel 按下 ESC 键以取消 - + Grab Color 获取颜色 @@ -748,12 +776,12 @@ Press Space to open the side panel. SizeIndicatorTool - + Selection Size Indicator 选择尺寸指示 - + Show the dimensions of the selection (X Y) 显示选择的尺寸 (X Y) @@ -761,107 +789,107 @@ Press Space to open the side panel. StrftimeChooserWidget - + Century (00-99) 世纪（00-99） - + Year (00-99) 年（00-99） - + Year (2000) 年（2000） - + Month Name (jan) 月（1月 - 12月） - + Month Name (january) 月（一月 - 十二月） - + Month (01-12) 月 (01-12) - + Week Day (1-7) 周内的日（1-7） - + Week (01-53) 周（01-53） - + Day Name (mon) 星期（一 - 七） - + Day Name (monday) 星期（星期一 - 星期日） - + Day (01-31) 天（01-31） - + Day of Month (1-31) 一月中的某天（1-31） - + Day (001-366) 天（001-366） - + Time (%H-%M-%S) 时间（%H-%M-%S） - + Time (%H-%M) 时间（%H-%M） - + Hour (00-23) 小时（00-23） - + Hour (01-12) 小时（01-12） - + Minute (00-59) 分钟（00-59） - + Second (00-59) 秒（00-59） - + Full Date (%m/%d/%y) 完整日期（%m/%d/%y） - + Full Date (%Y-%m-%d) 完整日期（%Y-%m-%d） @@ -869,7 +897,7 @@ Press Space to open the side panel. SystemNotification - + Flameshot Info Flameshot 消息 @@ -877,22 +905,22 @@ Press Space to open the side panel. TextConfig - + StrikeOut 删除线 - + Underline 下划线 - + Bold 粗体 - + Italic 斜体 @@ -900,12 +928,12 @@ Press Space to open the side panel. TextTool - + Text 文本 - + Add text to your capture 在您的捕获中添加文本 @@ -913,37 +941,37 @@ Press Space to open the side panel. UIcolorEditor - + UI Color Editor 用户界面颜色编辑器 - + Change the color moving the selectors and see the changes in the preview buttons. 移动颜色选择并在预览按钮查看。 - + Select a Button to modify it 选择一个按钮以进行修改 - + Main Color 主色 - + Click on this button to set the edition mode of the main color. 点击按钮设置主色。 - + Contrast Color 对比色 - + Click on this button to set the edition mode of the contrast color. 点击按钮设置对比色。 @@ -951,12 +979,12 @@ Press Space to open the side panel. UndoTool - + Undo 撤消 - + Undo the last modification 撤消上次修改 @@ -964,17 +992,17 @@ Press Space to open the side panel. VisualsEditor - + Opacity of area outside selection: 选中区域之外的不透明度： - + Button Selection 按钮选择 - + Select All 全选 diff --git a/translations/Internationalization_zh_TW.ts b/data/translations/Internationalization_zh_TW.ts similarity index 56% rename from translations/Internationalization_zh_TW.ts rename to data/translations/Internationalization_zh_TW.ts index 2612b0a3..b0c649a9 100644 --- a/translations/Internationalization_zh_TW.ts +++ b/data/translations/Internationalization_zh_TW.ts @@ -4,12 +4,12 @@ AppLauncher - + App Launcher 應用程式啟動器 - + Choose an app to open the capture 選擇一個程式打開此截圖 @@ -17,33 +17,33 @@ AppLauncherWidget - + Open With 打開 - + Launch in terminal 在終端機中啟動 - + Keep open after selection 選擇後維持此視窗開啟 - - + + Error 錯誤 - + Unable to launch in terminal. 無法在終端機中啟動 - + Unable to write in 無法寫入 @@ -51,12 +51,12 @@ ArrowTool - + Arrow 箭頭 - + Set the Arrow as the paint tool 選擇箭頭作為繪製工具 @@ -64,25 +64,73 @@ BlurTool - + Blur 模糊 - + Set Blur as the paint tool 選擇模糊作為繪製工具 + + CaptureLauncher + + + <b>Capture Mode</b> + + + + + Rectangular Region + + + + + Full Screen (All Monitors) + + + + + No Delay + + + + + second + + + + + seconds + + + + + Take new screenshot + + + + + Area: + + + + + Delay: + + + CaptureWidget - + Unable to capture screen 無法擷取螢幕 - + Select an area with the mouse, or press Esc to exit. Press Enter to capture the screen. Press Right Click to show the color picker. @@ -91,15 +139,28 @@ Press Space to open the side panel. + + CircleCountTool + + + Circle Counter + + + + + Add an autoincrementing counter bubble + + + CircleTool - + Circle 圈型 - + Set the Circle as the paint tool 選擇圈型作為繪畫工具 @@ -107,22 +168,22 @@ Press Space to open the side panel. ConfigWindow - + Configuration 設定 - + Interface 介面 - + Filename Editor 檔案名稱編輯器 - + General 一般 @@ -130,22 +191,27 @@ Press Space to open the side panel. Controller - + &Take Screenshot - + + &Open Launcher + + + + &Configuration &設定 - + &Information &資訊 - + &Quit &結束 @@ -153,12 +219,12 @@ Press Space to open the side panel. CopyTool - + Copy 複製 - + Copy the selection into the clipboard @@ -166,7 +232,7 @@ Press Space to open the side panel. DBusUtils - + Unable to connect via DBus 無法透過 DBus 進行連接 @@ -174,12 +240,12 @@ Press Space to open the side panel. ExitTool - + Exit 離開 - + Leave the capture screen 離開螢幕擷取 @@ -187,47 +253,47 @@ Press Space to open the side panel. FileNameEditor - + Edit the name of your captures: 編輯您的截圖名稱: - + Edit: 編輯器: - + Preview: 預覽: - + Save 存檔 - + Saves the pattern 儲存樣式 - + Reset 重設 - + Restores the saved pattern 恢復儲存的樣式 - + Clear 清空 - + Deletes the name 刪除這個名稱 @@ -235,141 +301,161 @@ Press Space to open the side panel. GeneneralConf - + Show help message 顯示説明資訊 - + Show the help message at the beginning in the capture mode. 在擷取之前顯示説明資訊 - - + + Show desktop notifications 顯示桌面通知 - + Show tray icon 顯示託盤圖示 - + Show the systemtray icon 顯示工作列圖示 - - + + Import 匯入 - - - + + + Error 錯誤 - + Unable to read file. 無法讀取檔案 - - + + Unable to write file. 無法寫入檔案 - + Save File 存檔 - + Confirm Reset 確認重設 - + Are you sure you want to reset the configuration? 你確定你想要重設？ - + Configuration File 設定檔 - + Export 匯出 - + Reset 重設 - + Launch at startup 自動啟動 - + Launch Flameshot + + + Close after capture + + + + + Close after taking a screenshot + + + + + Copy URL after upload + + + + + Copy URL and close window after upload + + ImgurUploader - + Upload to Imgur 上傳到 Imgur - + Uploading Image 正在上傳 - + Copy URL 複製連結 - + Open URL 打開連結 - + Delete image - + Image to Clipboard. 將檔案複製到剪貼簿 - - + + Unable to open the URL. 無法打開此連結 - + URL copied to clipboard. 連結已複製到剪貼簿 - + Screenshot copied to clipboard. 截圖已複製到剪貼簿 @@ -377,12 +463,12 @@ Press Space to open the side panel. ImgurUploaderTool - + Image Uploader 上傳圖片 - + Upload the selection to Imgur 上傳到 Imgur @@ -390,92 +476,97 @@ Press Space to open the side panel. InfoWindow - + About 關於 - + + SPACEBAR + + + + Right Click 右鍵 - + Mouse Wheel 滑鼠滑輪 - + Move selection 1px 移動 1px - + Resize selection 1px 調整大小 1px - + Quit capture 結束擷取 - + Copy to clipboard 複製到剪貼簿 - + Save selection as a file 將選擇範圍另存新檔 - + Undo the last modification 復原上次修改 - + Toggle visibility of sidebar with options of the selected tool - + Show color picker 顯示顏色選擇器 - + Change the tool's thickness 改變工具的寬度 - + Key 鍵 - + Description 描述 - + <u><b>License</b></u> <u><b>授權條款</b></u> - + <u><b>Version</b></u> <u><b>版本</b></u> - + <u><b>Shortcuts</b></u> <u><b>快速鍵</b></u> - + Available shortcuts in the screen capture mode. 螢幕擷取模式中的可用快速鍵 @@ -483,12 +574,12 @@ Press Space to open the side panel. LineTool - + Line 直線 - + Set the Line as the paint tool 將直線線設定為繪畫工具 @@ -496,12 +587,12 @@ Press Space to open the side panel. MarkerTool - + Marker 標記 - + Set the Marker as the paint tool 將標記設定為繪畫工具 @@ -509,12 +600,12 @@ Press Space to open the side panel. MoveTool - + Move 移動 - + Move the selection area 移動選擇區域 @@ -522,12 +613,12 @@ Press Space to open the side panel. PencilTool - + Pencil 鉛筆 - + Set the Pencil as the paint tool 將鉛筆設定為繪畫工具 @@ -535,12 +626,12 @@ Press Space to open the side panel. PinTool - + Pin Tool - + Pin image on the desktop @@ -548,55 +639,61 @@ Press Space to open the side panel. QObject - + Save Error 存檔錯誤 - - + + Capture saved as 截圖已另存為 - + Capture saved to clipboard - - + + Error trying to save as 嘗試另存新檔時發生錯誤 - - - - + + + + + Unable to connect via DBus 無法透過 DBus 進行連接 - + Error 錯誤 - + Unable to write in 無法寫入 + + + URL copied to clipboard. + 連結已複製到剪貼簿 + RectangleTool - + Rectangle 實心矩形 - + Set the Rectangle as the paint tool 將實心矩形設定為繪畫工具 @@ -604,12 +701,12 @@ Press Space to open the side panel. RedoTool - + Redo - + Redo the next modification @@ -617,12 +714,12 @@ Press Space to open the side panel. SaveTool - + Save 儲存 - + Save the capture 儲存擷取 @@ -630,7 +727,7 @@ Press Space to open the side panel. ScreenGrabber - + Unable to capture screen 無法擷取螢幕 @@ -638,12 +735,12 @@ Press Space to open the side panel. SelectionTool - + Rectangular Selection 矩形選擇 - + Set Selection as the paint tool 將矩形選擇設定為繪畫工具 @@ -651,22 +748,22 @@ Press Space to open the side panel. SidePanelWidget - + Active thickness: - + Active color: - + Press ESC to cancel - + Grab Color @@ -674,12 +771,12 @@ Press Space to open the side panel. SizeIndicatorTool - + Selection Size Indicator 選擇尺寸指示 - + Show the dimensions of the selection (X Y) 顯示選擇的尺寸 (X Y) @@ -687,107 +784,107 @@ Press Space to open the side panel. StrftimeChooserWidget - + Century (00-99) 世紀 (00-99) - + Year (00-99) 年 (00-99) - + Year (2000) 年 (2000) - + Month Name (jan) 月 (jul) - + Month Name (january) 月 (juliol) - + Month (01-12) 月 (01-12) - + Week Day (1-7) 平常日 (1-7) - + Week (01-53) 周 (01-53) - + Day Name (mon) 星期 (dg) - + Day Name (monday) 星期 (diumenge) - + Day (01-31) 天 (01-31) - + Day of Month (1-31) 一月中的某天 (1-31) - + Day (001-366) 天 (001-366) - + Time (%H-%M-%S) - + Time (%H-%M) - + Hour (00-23) 小時 (00-23) - + Hour (01-12) 小時 (01-12) - + Minute (00-59) 分鐘 (00-59) - + Second (00-59) 秒 (00-59) - + Full Date (%m/%d/%y) 日期 (%m/%d/%y) - + Full Date (%Y-%m-%d) 日期 (%Y-%m-%d) @@ -795,7 +892,7 @@ Press Space to open the side panel. SystemNotification - + Flameshot Info @@ -803,22 +900,22 @@ Press Space to open the side panel. TextConfig - + StrikeOut - + Underline - + Bold - + Italic @@ -826,12 +923,12 @@ Press Space to open the side panel. TextTool - + Text - + Add text to your capture @@ -839,37 +936,37 @@ Press Space to open the side panel. UIcolorEditor - + UI Color Editor UI 顏色編輯器 - + Change the color moving the selectors and see the changes in the preview buttons. 移動顏色選擇並在預覽按鈕檢視 - + Select a Button to modify it 選擇一個按鈕來修改它 - + Main Color 主色 - + Click on this button to set the edition mode of the main color. 點選按鈕設定主色 - + Contrast Color 對比色 - + Click on this button to set the edition mode of the contrast color. 點選按鈕設定對比色 @@ -877,12 +974,12 @@ Press Space to open the side panel. UndoTool - + Undo 復原 - + Undo the last modification 復原上次修改 @@ -890,17 +987,17 @@ Press Space to open the side panel. VisualsEditor - + Opacity of area outside selection: 選擇區域以外的不透明度 - + Button Selection 按鈕選擇 - + Select All 全選 diff --git a/docs/0000-template.md b/docs/0000-template.md new file mode 100644 index 00000000..e69de29b diff --git a/CONTRIBUTING.md b/docs/CONTRIBUTING.md similarity index 95% rename from CONTRIBUTING.md rename to docs/CONTRIBUTING.md index 41d1caaf..98d81d22 100644 --- a/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -30,6 +30,7 @@ Check this nice official documentation from Qt docs as it explains how to transl ## Code +For small fixes or incremental improvements simply fork the repo and follow the process below. For larger changes submit an [RFC:](RFC.md) 1. [Fork](https://help.github.com/articles/fork-a-repo/) the repository and [clone](https://help.github.com/articles/cloning-a-repository/) your fork. 2. Start coding! diff --git a/docs/RFC.md b/docs/RFC.md new file mode 100644 index 00000000..ed43c477 --- /dev/null +++ b/docs/RFC.md @@ -0,0 +1,233 @@ +# Flameshot RFCs + +[Flameshot RFCs]: #flameshot-rfcs + +Many changes, including bug fixes and documentation improvements can be +implemented and reviewed via the normal GitHub pull request workflow. + +Some changes though are "substantial", and we ask that these be put through a +bit of a design process and produce a consensus among the Flameshot community and development team. + +The "RFC" (request for comments) process is intended to provide a consistent +and controlled path for new features to enter the language and standard +libraries, so that all stakeholders can be confident about the direction the +project is evolving in. + +## Table of Contents + +[Table of Contents]: #table-of-contents + + + [Opening](#flameshot-rfcs) + + [Table of Contents] + + [When you need to follow this process] + + [Before creating an RFC] + + [What the process is] + + [The RFC life-cycle] + + [Reviewing RFCs] + + [Implementing an RFC] + + [RFC Postponement] + + [Help this is all too informal!] + +## When you need to follow this process + +[When you need to follow this process]: #when-you-need-to-follow-this-process + +You need to follow this process if you intend to make "substantial" changes to +flameshot or the RFC process itself. What constitutes a +"substantial" change is evolving based on community norms and varies depending +on what part of the ecosystem you are proposing to change, but may include the +following. + + + Any changes breaking compatibility to command line flags or config files. + + Any major changes to the UI + + Substantial new features like new tools. + +Some changes do not require an RFC: + + + Rephrasing, reorganizing, refactoring, or otherwise "changing shape does + + not change meaning". + + + Improving translations. + + Additions that strictly improve objective, numerical quality criteria + + (warning removal, speedup, better platform coverage, etc.) + + + Additions only likely to be _noticed by_ other developers-of-flameshot, + + invisible to users-of-flameshot. + +If you submit a pull request to implement a new feature without going through +the RFC process, it may be closed with a polite request to submit an RFC first. + +## Before creating an RFC + +[Before creating an RFC]: #before-creating-an-rfc + +A hastily-proposed RFC can hurt its chances of acceptance. Low quality +proposals, proposals for previously-rejected features, or those that don't fit +into the near-term roadmap, may be quickly rejected, which can be demotivating +for the unprepared contributor. Laying some groundwork ahead of the RFC can +make the process smoother. + +Although there is no single way to prepare for submitting an RFC, it is +generally a good idea to pursue feedback from other project developers +beforehand, to ascertain that the RFC may be desirable; having a consistent +impact on the project requires concerted effort toward consensus-building. + +The most common preparations for writing and submitting an RFC include talking +the idea over on our [official Slack server](flameshotworkspace.slack.com) or opening an issue on github for discussion. + +## What the process is + +[What the process is]: #what-the-process-is + +In short, to get a major feature added to Flameshot, one must first get the RFC +merged into the RFC repository as a markdown file. At that point the RFC is +"active" and may be implemented with the goal of eventual inclusion into Flameshot. + + + Fork the Flameshot repo + + Copy `docs/0000-template.md` to `docs/RFC/0000-my-feature.md` (where "my-feature" is + + descriptive). Don't assign an RFC number yet; This is going to be the PR + number and we'll rename the file accordingly if the RFC is accepted. + + + Fill in the RFC. Put care into the details: RFCs that do not present + + convincing motivation, demonstrate lack of understanding of the design's + impact, or are disingenuous about the drawbacks or alternatives tend to + be poorly-received. + + + Submit a pull request. As a pull request the RFC will receive design + + feedback from the larger community, and the author should be prepared to + revise it in response. + + + Build consensus and integrate feedback. RFCs that have broad support are + + much more likely to make progress than those that don't receive any + comments. Feel free to reach out to the RFC assignee in particular to get + help identifying stakeholders and obstacles. + + + The team will discuss the RFC pull request, as much as possible in the + + comment thread of the pull request itself. Offline discussion will be + summarized on the pull request comment thread. + + + RFCs rarely go through this process unchanged, especially as alternatives + + and drawbacks are shown. You can make edits, big and small, to the RFC to + clarify or change the design, but make changes as new commits to the pull + request, and leave a comment on the pull request explaining your changes. + Specifically, do not squash or rebase commits after they are visible on the + pull request. + + + At some point, a member of the development team will propose a "motion for final + + comment period" (FCP), along with a *disposition* for the RFC (merge, close, + or postpone). + + - This step is taken when enough of the tradeoffs have been discussed that + + the development is in a position to make a decision. That does not require + consensus amongst all participants in the RFC thread (which is usually + impossible). However, the argument supporting the disposition on the RFC + needs to have already been clearly articulated, and there should not be a + strong consensus *against* that position outside of the development team. Team + members use their best judgment in taking this step, and the FCP itself + ensures there is ample time and notification for stakeholders to push back + if it is made prematurely. + + + In most cases, the FCP period is quiet, and the RFC is either merged or + + closed. However, sometimes substantial new arguments or ideas are raised, + the FCP is canceled, and the RFC goes back into development mode. + +## The RFC life-cycle + +[The RFC life-cycle]: #the-rfc-life-cycle + +Once an RFC becomes "active" then authors may implement it and submit the +feature as a pull request to the Flameshot repo. Being "active" is not a rubber +stamp, and in particular still does not mean the feature will ultimately be +merged; it does mean that in principle all the major stakeholders have agreed +to the feature and are amenable to merging it. + +Furthermore, the fact that a given RFC has been accepted and is "active" +implies nothing about what priority is assigned to its implementation, nor does +it imply anything about whether a developer has been assigned the task of +implementing the feature. While it is not *necessary* that the author of the +RFC also write the implementation, it is by far the most effective way to see +an RFC through to completion: authors should not expect that other project +developers will take on responsibility for implementing their accepted feature. + +Modifications to "active" RFCs can be done in follow-up pull requests. We +strive to write each RFC in a manner that it will reflect the final design of +the feature; but the nature of the process means that we cannot expect every +merged RFC to actually reflect what the end result will be at the time of the +next major release. + +In general, once accepted, RFCs should not be substantially changed. Only very +minor changes should be submitted as amendments. More substantial changes +should be new RFCs, with a note added to the original RFC. Exactly what counts +as a "very minor change" is up to the development team. + + + +## Reviewing RFCs + +[Reviewing RFCs]: #reviewing-rfcs + +The preferred method of discussing RFC's is the github issue. However, the development team may schedule meetings with the +author and/or relevant stakeholders to discuss the issues in greater detail. In either +case a summary from the meeting will be posted back to the RFC pull request. + +The development team makes final decisions about RFCs after the benefits and drawbacks +are well understood. These decisions can be made at any time, but the sub-team +will regularly issue decisions. When a decision is made, the RFC pull request +will either be merged or closed. In either case, if the reasoning is not clear +from the discussion in thread, the sub-team will add a comment describing the +rationale for the decision. + +## Implementing an RFC + +[Implementing an RFC]: #implementing-an-rfc + +Some accepted RFCs represent vital features that need to be implemented right +away. Other accepted RFCs can represent features that can wait until some +arbitrary developer feels like doing the work. Every accepted RFC has an +associated issue tracking its implementation in the Flameshot repository; thus that +associated issue can be assigned a priority via the triage process that the +team uses for all issues in the Flameshot repository. + +The author of an RFC is not obligated to implement it. Of course, the RFC +author (like any other developer) is welcome to post an implementation for +review after the RFC has been accepted. + +If you are interested in working on the implementation for an "active" RFC, but +cannot determine if someone else is already working on it, feel free to ask +(e.g. by leaving a comment on the associated issue). + +## RFC Postponement + +[RFC Postponement]: #rfc-postponement + +Some RFC pull requests are tagged with the "postponed" label when they are +closed (as part of the rejection process). An RFC closed with "postponed" is +marked as such because we want neither to think about evaluating the proposal +nor about implementing the described feature until some time in the future, and +we believe that we can afford to wait until then to do so. + +Usually an RFC pull request marked as "postponed" has already passed an +informal first round of evaluation, namely the round of "do we think we would +ever possibly consider making this change, as outlined in the RFC pull request, +or some semi-obvious variation of it." (When the answer to the latter question +is "no", then the appropriate response is to close the RFC, not postpone it.) + +### Help this is all too informal! + +[Help this is all too informal!]: #help-this-is-all-too-informal + +The process is intended to be as lightweight as reasonable for the present +circumstances. As usual, we are trying to let the process be driven by +consensus and community norms, not impose more structure than necessary. diff --git a/src/third-party/Qt-Color-Widgets/COPYING b/external/Qt-Color-Widgets/COPYING similarity index 100% rename from src/third-party/Qt-Color-Widgets/COPYING rename to external/Qt-Color-Widgets/COPYING diff --git a/src/third-party/Qt-Color-Widgets/LICENSE-EXCEPTION b/external/Qt-Color-Widgets/LICENSE-EXCEPTION similarity index 100% rename from src/third-party/Qt-Color-Widgets/LICENSE-EXCEPTION rename to external/Qt-Color-Widgets/LICENSE-EXCEPTION diff --git a/src/third-party/Qt-Color-Widgets/README.md b/external/Qt-Color-Widgets/README.md similarity index 100% rename from src/third-party/Qt-Color-Widgets/README.md rename to external/Qt-Color-Widgets/README.md diff --git a/src/third-party/Qt-Color-Widgets/color_widgets.pri b/external/Qt-Color-Widgets/color_widgets.pri similarity index 100% rename from src/third-party/Qt-Color-Widgets/color_widgets.pri rename to external/Qt-Color-Widgets/color_widgets.pri diff --git a/src/third-party/Qt-Color-Widgets/color_widgets.pro b/external/Qt-Color-Widgets/color_widgets.pro similarity index 100% rename from src/third-party/Qt-Color-Widgets/color_widgets.pro rename to external/Qt-Color-Widgets/color_widgets.pro diff --git a/src/third-party/Qt-Color-Widgets/include/ColorWheel b/external/Qt-Color-Widgets/include/ColorWheel similarity index 100% rename from src/third-party/Qt-Color-Widgets/include/ColorWheel rename to external/Qt-Color-Widgets/include/ColorWheel diff --git a/src/third-party/Qt-Color-Widgets/include/color_wheel.hpp b/external/Qt-Color-Widgets/include/color_wheel.hpp similarity index 100% rename from src/third-party/Qt-Color-Widgets/include/color_wheel.hpp rename to external/Qt-Color-Widgets/include/color_wheel.hpp diff --git a/src/third-party/Qt-Color-Widgets/src/alphaback.png b/external/Qt-Color-Widgets/src/alphaback.png similarity index 100% rename from src/third-party/Qt-Color-Widgets/src/alphaback.png rename to external/Qt-Color-Widgets/src/alphaback.png diff --git a/src/third-party/Qt-Color-Widgets/src/color_utils.cpp b/external/Qt-Color-Widgets/src/color_utils.cpp similarity index 100% rename from src/third-party/Qt-Color-Widgets/src/color_utils.cpp rename to external/Qt-Color-Widgets/src/color_utils.cpp diff --git a/src/third-party/Qt-Color-Widgets/src/color_utils.hpp b/external/Qt-Color-Widgets/src/color_utils.hpp similarity index 100% rename from src/third-party/Qt-Color-Widgets/src/color_utils.hpp rename to external/Qt-Color-Widgets/src/color_utils.hpp diff --git a/src/third-party/Qt-Color-Widgets/src/color_wheel.cpp b/external/Qt-Color-Widgets/src/color_wheel.cpp similarity index 99% rename from src/third-party/Qt-Color-Widgets/src/color_wheel.cpp rename to external/Qt-Color-Widgets/src/color_wheel.cpp index 335b29ce..6219a64f 100644 --- a/src/third-party/Qt-Color-Widgets/src/color_wheel.cpp +++ b/external/Qt-Color-Widgets/src/color_wheel.cpp @@ -23,6 +23,7 @@ #include #include +#include #include #include #include @@ -65,7 +66,7 @@ public: display_flags(FLAGS_DEFAULT), color_from(&QColor::fromHsvF), rainbow_from_hue(&detail::rainbow_hsv) { - QColor bgColor = widget->palette().background().color(); + QColor bgColor = widget->palette().window().color(); bgBrightness = color_widgets::detail::color_lumaF(bgColor); } diff --git a/src/third-party/Qt-Color-Widgets/src/color_widgets.qrc b/external/Qt-Color-Widgets/src/color_widgets.qrc similarity index 100% rename from src/third-party/Qt-Color-Widgets/src/color_widgets.qrc rename to external/Qt-Color-Widgets/src/color_widgets.qrc diff --git a/src/third-party/singleapplication/CHANGELOG.md b/external/singleapplication/CHANGELOG.md similarity index 100% rename from src/third-party/singleapplication/CHANGELOG.md rename to external/singleapplication/CHANGELOG.md diff --git a/src/third-party/singleapplication/LICENSE b/external/singleapplication/LICENSE similarity index 100% rename from src/third-party/singleapplication/LICENSE rename to external/singleapplication/LICENSE diff --git a/src/third-party/singleapplication/README.md b/external/singleapplication/README.md similarity index 100% rename from src/third-party/singleapplication/README.md rename to external/singleapplication/README.md diff --git a/src/third-party/singleapplication/Windows.md b/external/singleapplication/Windows.md similarity index 100% rename from src/third-party/singleapplication/Windows.md rename to external/singleapplication/Windows.md diff --git a/src/third-party/singleapplication/singleapplication.cpp b/external/singleapplication/singleapplication.cpp similarity index 99% rename from src/third-party/singleapplication/singleapplication.cpp rename to external/singleapplication/singleapplication.cpp index f452e70d..1f5a5b8c 100644 --- a/src/third-party/singleapplication/singleapplication.cpp +++ b/external/singleapplication/singleapplication.cpp @@ -107,7 +107,8 @@ void SingleApplicationPrivate::genBlockServerName( int timeout ) #endif #ifdef Q_OS_UNIX QProcess process; - process.start( QStringLiteral("whoami") ); + process.start( QStringLiteral("whoami"),QStringList{} ); + if( process.waitForFinished( timeout ) && process.exitCode() == QProcess::NormalExit) { appData.addData( process.readLine() ); diff --git a/src/third-party/singleapplication/singleapplication.h b/external/singleapplication/singleapplication.h similarity index 100% rename from src/third-party/singleapplication/singleapplication.h rename to external/singleapplication/singleapplication.h diff --git a/src/third-party/singleapplication/singleapplication.pri b/external/singleapplication/singleapplication.pri similarity index 100% rename from src/third-party/singleapplication/singleapplication.pri rename to external/singleapplication/singleapplication.pri diff --git a/src/third-party/singleapplication/singleapplication_p.h b/external/singleapplication/singleapplication_p.h similarity index 100% rename from src/third-party/singleapplication/singleapplication_p.h rename to external/singleapplication/singleapplication_p.h diff --git a/flameshot.pro b/flameshot.pro deleted file mode 100644 index 84a2e65b..00000000 --- a/flameshot.pro +++ /dev/null @@ -1,291 +0,0 @@ -#------------------------------------------------- -# -# Project created by Dharkael 2017-04-21T00:42:49 -# -#------------------------------------------------- - -win32:LIBS += -luser32 -lshell32 - -TAG_VERSION = $$system(git --git-dir $$PWD/.git --work-tree $$PWD describe --always --tags) -isEmpty(TAG_VERSION){ - TAG_VERSION = v0.6.0 -} -DEFINES += APP_VERSION=\\\"$$TAG_VERSION\\\" - -QT += core gui widgets network svg - -unix:!macx { - QT += dbus -} - -CONFIG += c++11 link_pkgconfig - -#CONFIG += packaging # Enables "make install" for packaging paths - -TARGET = flameshot -TEMPLATE = app - -win32:RC_ICONS += img/app/flameshot.ico - -#release: DESTDIR = build/release -#debug: DESTDIR = build/debug - -#OBJECTS_DIR = $$DESTDIR/.obj -#MOC_DIR = $$DESTDIR/.moc -#RCC_DIR = $$DESTDIR/.qrc -#UI_DIR = $$DESTDIR/.ui - -TRANSLATIONS = translations/Internationalization_es.ts \ - translations/Internationalization_ca.ts \ - translations/Internationalization_ru.ts \ - translations/Internationalization_zh_CN.ts \ - translations/Internationalization_zh_TW.ts \ - translations/Internationalization_tr.ts \ - translations/Internationalization_ka.ts \ - translations/Internationalization_fr.ts \ - translations/Internationalization_pl.ts \ - translations/Internationalization_ja.ts \ - translations/Internationalization_pt_br.ts \ - translations/Internationalization_sr.ts \ - translations/Internationalization_uk.ts \ - translations/Internationalization_de_DE.ts \ - translations/Internationalization_sk.ts \ - -# Generate translations in build -TRANSLATIONS_FILES = - -qtPrepareTool(LRELEASE, lrelease) -for(tsfile, TRANSLATIONS) { - qmfile = $$shadowed($$tsfile) - qmfile ~= s,.ts$,.qm, - qmdir = $$dirname(qmfile) - !exists($$qmdir) { - mkpath($$qmdir)|error("Aborting.") - } - command = $$LRELEASE -removeidentical $$tsfile -qm $$qmfile - system($$command)|error("Failed to run: $$command") - TRANSLATIONS_FILES += $$qmfile -} - -DEFINES += QT_DEPRECATED_WARNINGS - -include(src/third-party/singleapplication/singleapplication.pri) -include(src/third-party/Qt-Color-Widgets//color_widgets.pri) - -DEFINES += QAPPLICATION_CLASS=QApplication - -SOURCES += src/main.cpp \ - src/widgets/capture/buttonhandler.cpp \ - src/widgets/infowindow.cpp \ - src/config/configwindow.cpp \ - src/widgets/capture/capturewidget.cpp \ - src/widgets/capture/colorpicker.cpp \ - src/config/buttonlistview.cpp \ - src/config/uicoloreditor.cpp \ - src/config/geneneralconf.cpp \ - src/core/controller.cpp \ - src/config/clickablelabel.cpp \ - src/config/filenameeditor.cpp \ - src/config/strftimechooserwidget.cpp \ - src/widgets/capture/capturebutton.cpp \ - src/tools/pencil/penciltool.cpp \ - src/tools/undo/undotool.cpp \ - src/tools/redo/redotool.cpp \ - src/tools/arrow/arrowtool.cpp \ - src/tools/circle/circletool.cpp \ - src/tools/copy/copytool.cpp \ - src/tools/exit/exittool.cpp \ - src/tools/imgur/imguruploadertool.cpp \ - src/tools/line/linetool.cpp \ - src/tools/marker/markertool.cpp \ - src/tools/move/movetool.cpp \ - src/tools/rectangle/rectangletool.cpp \ - src/tools/save/savetool.cpp \ - src/tools/selection/selectiontool.cpp \ - src/tools/sizeindicator/sizeindicatortool.cpp \ - src/tools/toolfactory.cpp \ - src/utils/filenamehandler.cpp \ - src/utils/screengrabber.cpp \ - src/utils/confighandler.cpp \ - src/utils/systemnotification.cpp \ - src/cli/commandlineparser.cpp \ - src/cli/commandoption.cpp \ - src/cli/commandargument.cpp \ - src/utils/screenshotsaver.cpp \ - src/tools/imgur/imguruploader.cpp \ - src/widgets/loadspinner.cpp \ - src/widgets/imagelabel.cpp \ - src/widgets/notificationwidget.cpp \ - src/widgets/capture/notifierbox.cpp \ - src/utils/desktopinfo.cpp \ - src/tools/launcher/applauncherwidget.cpp \ - src/utils/desktopfileparse.cpp \ - src/tools/launcher/launcheritemdelegate.cpp \ - src/tools/blur/blurtool.cpp \ - src/tools/pin/pintool.cpp \ - src/tools/launcher/terminallauncher.cpp \ - src/config/visualseditor.cpp \ - src/config/extendedslider.cpp \ - src/tools/launcher/openwithprogram.cpp \ - src/tools/launcher/applaunchertool.cpp \ - src/utils/pathinfo.cpp \ - src/utils/colorutils.cpp \ - src/tools/capturecontext.cpp \ - src/widgets/capture/modificationcommand.cpp \ - src/tools/abstractpathtool.cpp \ - src/tools/abstracttwopointtool.cpp \ - src/tools/abstractactiontool.cpp \ - src/utils/globalvalues.cpp \ - src/widgets/panel/utilitypanel.cpp \ - src/widgets/capture/hovereventfilter.cpp \ - src/widgets/capture/selectionwidget.cpp \ - src/tools/pin/pinwidget.cpp \ - src/widgets/capturelauncher.cpp \ - src/tools/text/texttool.cpp \ - src/tools/text/textwidget.cpp \ - src/core/capturerequest.cpp \ - src/tools/text/textconfig.cpp \ - src/widgets/panel/sidepanelwidget.cpp - -HEADERS += src/widgets/capture/buttonhandler.h \ - src/widgets/infowindow.h \ - src/config/configwindow.h \ - src/widgets/capture/capturewidget.h \ - src/widgets/capture/colorpicker.h \ - src/config/buttonlistview.h \ - src/config/uicoloreditor.h \ - src/config/geneneralconf.h \ - src/config/clickablelabel.h \ - src/config/filenameeditor.h \ - src/utils/filenamehandler.h \ - src/config/strftimechooserwidget.h \ - src/utils/screengrabber.h \ - src/tools/capturetool.h \ - src/widgets/capture/capturebutton.h \ - src/tools/pencil/penciltool.h \ - src/tools/undo/undotool.h \ - src/tools/redo/redotool.h \ - src/tools/arrow/arrowtool.h \ - src/tools/circle/circletool.h \ - src/tools/copy/copytool.h \ - src/tools/exit/exittool.h \ - src/tools/imgur/imguruploadertool.h \ - src/tools/line/linetool.h \ - src/tools/marker/markertool.h \ - src/tools/move/movetool.h \ - src/tools/rectangle/rectangletool.h \ - src/tools/save/savetool.h \ - src/tools/selection/selectiontool.h \ - src/tools/sizeindicator/sizeindicatortool.h \ - src/tools/toolfactory.h \ - src/utils/confighandler.h \ - src/core/controller.h \ - src/utils/systemnotification.h \ - src/cli/commandlineparser.h \ - src/cli/commandoption.h \ - src/cli/commandargument.h \ - src/utils/screenshotsaver.h \ - src/tools/imgur/imguruploader.h \ - src/widgets/loadspinner.h \ - src/widgets/imagelabel.h \ - src/widgets/notificationwidget.h \ - src/widgets/capture/notifierbox.h \ - src/utils/desktopinfo.h \ - src/tools/launcher/applauncherwidget.h \ - src/utils/desktopfileparse.h \ - src/tools/launcher/launcheritemdelegate.h \ - src/tools/blur/blurtool.h \ - src/tools/pin/pintool.h \ - src/tools/launcher/terminallauncher.h \ - src/config/visualseditor.h \ - src/config/extendedslider.h \ - src/tools/launcher/openwithprogram.h \ - src/utils/pathinfo.h \ - src/tools/capturecontext.h \ - src/tools/launcher/applaunchertool.h \ - src/utils/globalvalues.h \ - src/utils/colorutils.h \ - src/widgets/capture/modificationcommand.h \ - src/tools/abstractpathtool.h \ - src/tools/abstracttwopointtool.h \ - src/tools/abstractactiontool.h \ - src/widgets/panel/utilitypanel.h \ - src/widgets/capture/hovereventfilter.h \ - src/widgets/capture/selectionwidget.h \ - src/tools/pin/pinwidget.h \ - src/widgets/capturelauncher.h \ - src/tools/text/texttool.h \ - src/tools/text/textwidget.h \ - src/core/capturerequest.h \ - src/tools/text/textconfig.h \ - src/widgets/panel/sidepanelwidget.h - -unix:!macx { - SOURCES += src/core/flameshotdbusadapter.cpp \ - src/utils/dbusutils.cpp - - HEADERS += src/core/flameshotdbusadapter.h \ - src/utils/dbusutils.h -} - -win32 { - SOURCES += src/core/globalshortcutfilter.cpp - - HEADERS += src/core/globalshortcutfilter.h -} - -RESOURCES += \ - graphics.qrc - -# installs -unix:!macx { - isEmpty(PREFIX) { - packaging { - PREFIX = /usr - } else { - PREFIX = /usr/local - } - } - - DEFINES += APP_PREFIX=\\\"$$PREFIX\\\" - - target.path = $${PREFIX}/bin/ - - qmfile.path = $${PREFIX}/share/flameshot/translations/ - qmfile.files = $${TRANSLATIONS_FILES} - - dbus.path = $${PREFIX}/share/dbus-1/interfaces/ - dbus.files = dbus/org.dharkael.Flameshot.xml - - icon.path = $${PREFIX}/share/icons/hicolor/ - icon.files = img/hicolor/* - - completion.path = $${PREFIX}/share/bash-completion/completions/ - completion.files = docs/bash-completion/flameshot - - appdata.path = $${PREFIX}/share/metainfo/ - appdata.files = docs/appdata/flameshot.appdata.xml - - desktopentry.path = $${PREFIX}/share/applications - desktopentry.files = docs/desktopEntry/package/flameshot.desktop - - servicedbus.path = $${PREFIX}/share/dbus-1/services/ - - packaging { - servicedbus.files = dbus/package/org.dharkael.Flameshot.service - } else { - servicedbus.files = dbus/make/org.dharkael.Flameshot.service - } - - INSTALLS += target \ - icon \ - desktopentry \ - qmfile \ - servicedbus \ - dbus \ - completion \ - appdata -} - -# Imgur API data -include(src/imgur.pri) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 00000000..04b7896f --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,127 @@ +find_package( + Qt5 + CONFIG + REQUIRED + Core + Gui + Widgets + Network + Svg + DBus + LinguistTools) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +add_executable(flameshot) + +add_executable(Flameshot::flameshot ALIAS flameshot) + +add_subdirectory(cli) +add_subdirectory(config) +add_subdirectory(core) +add_subdirectory(utils) +add_subdirectory(widgets) +add_subdirectory(tools) + +qt5_create_translation( + QM_FILES + ${CMAKE_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/data/translations/Internationalization_ca.ts + ${CMAKE_SOURCE_DIR}/data/translations/Internationalization_de_DE.ts + ${CMAKE_SOURCE_DIR}/data/translations/Internationalization_fr.ts + ${CMAKE_SOURCE_DIR}/data/translations/Internationalization_es.ts + ${CMAKE_SOURCE_DIR}/data/translations/Internationalization_hu.ts + ${CMAKE_SOURCE_DIR}/data/translations/Internationalization_ja.ts + ${CMAKE_SOURCE_DIR}/data/translations/Internationalization_ka.ts + ${CMAKE_SOURCE_DIR}/data/translations/Internationalization_nl.ts + ${CMAKE_SOURCE_DIR}/data/translations/Internationalization_pl.ts + ${CMAKE_SOURCE_DIR}/data/translations/Internationalization_pt_br.ts + ${CMAKE_SOURCE_DIR}/data/translations/Internationalization_ru.ts + ${CMAKE_SOURCE_DIR}/data/translations/Internationalization_sk.ts + ${CMAKE_SOURCE_DIR}/data/translations/Internationalization_sr.ts + ${CMAKE_SOURCE_DIR}/data/translations/Internationalization_tr.ts + ${CMAKE_SOURCE_DIR}/data/translations/Internationalization_uk.ts + ${CMAKE_SOURCE_DIR}/data/translations/Internationalization_zh_CN.ts + ${CMAKE_SOURCE_DIR}/data/translations/Internationalization_zh_TW.ts) + +target_sources( + flameshot + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../external/singleapplication/singleapplication.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/../external/Qt-Color-Widgets/src/color_utils.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/../external/Qt-Color-Widgets/src/color_wheel.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/../external/Qt-Color-Widgets/include/color_wheel.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/../data/graphics.qrc + ${QM_FILES} + main.cpp) + +target_include_directories( + flameshot + PUBLIC $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $) + +target_link_libraries( + flameshot + project_warnings + project_options + Qt5::Svg + Qt5::DBus + Qt5::Network + Qt5::Widgets) + +target_compile_definitions(flameshot PRIVATE APP_PREFIX="/usr") +target_compile_definitions(flameshot PRIVATE APP_VERSION="v0.8.0") +target_compile_definitions(flameshot PRIVATE IMGUR_CLIENT_ID="313baf0c7b4d3ff") +target_compile_definitions(flameshot PRIVATE QAPPLICATION_CLASS=QApplication) + +foreach(FILE ${QM_FILES}) + get_filename_component(F_NAME ${FILE} NAME) + add_custom_command( + TARGET flameshot + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/${F_NAME} + ${CMAKE_CURRENT_BINARY_DIR}/translations/${F_NAME}) +endforeach() +# ###################################################################################################################### +# Installation instructions + +include(GNUInstallDirs) +set(INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/Flameshot) + +install( + TARGETS flameshot + EXPORT flameshot-targets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt new file mode 100644 index 00000000..5be613ac --- /dev/null +++ b/src/cli/CMakeLists.txt @@ -0,0 +1 @@ +target_sources(flameshot PRIVATE commandlineparser.cpp commandoption.cpp commandargument.cpp) diff --git a/src/config/CMakeLists.txt b/src/config/CMakeLists.txt new file mode 100644 index 00000000..72360542 --- /dev/null +++ b/src/config/CMakeLists.txt @@ -0,0 +1,11 @@ +target_sources( + flameshot + PRIVATE buttonlistview.cpp + clickablelabel.cpp + configwindow.cpp + extendedslider.cpp + filenameeditor.cpp + geneneralconf.cpp + strftimechooserwidget.cpp + uicoloreditor.cpp + visualseditor.cpp) diff --git a/src/config/configwindow.cpp b/src/config/configwindow.cpp index 56687e60..665bef8a 100644 --- a/src/config/configwindow.cpp +++ b/src/config/configwindow.cpp @@ -52,7 +52,7 @@ ConfigWindow::ConfigWindow(QWidget *parent) : QTabWidget(parent) { connect(m_configWatcher, &QFileSystemWatcher::fileChanged, this, changedSlot); - QColor background = this->palette().background().color(); + QColor background = this->palette().window().color(); bool isDark = ColorUtils::colorIsDark(background); QString modifier = isDark ? PathInfo::whiteIconPath() : PathInfo::blackIconPath(); diff --git a/src/config/filenameeditor.cpp b/src/config/filenameeditor.cpp index 36b6cddb..a6c0aa11 100644 --- a/src/config/filenameeditor.cpp +++ b/src/config/filenameeditor.cpp @@ -58,7 +58,7 @@ void FileNameEditor::initWidgets() { // preview m_outputLabel = new QLineEdit(this); m_outputLabel->setDisabled(true); - QString foreground = this->palette().foreground().color().name(); + QString foreground = this->palette().windowText().color().name(); m_outputLabel->setStyleSheet(QStringLiteral("color: %1").arg(foreground)); QPalette pal = m_outputLabel->palette(); QColor color = pal.color(QPalette::Disabled, m_outputLabel->backgroundRole()); diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt new file mode 100644 index 00000000..7afe8865 --- /dev/null +++ b/src/core/CMakeLists.txt @@ -0,0 +1,5 @@ + +# Required to generate MOC +target_sources(flameshot PRIVATE controller.h flameshotdbusadapter.h) + +target_sources(flameshot PRIVATE capturerequest.cpp controller.cpp flameshotdbusadapter.cpp) diff --git a/src/core/controller.cpp b/src/core/controller.cpp index 7860853f..d7c6e32e 100644 --- a/src/core/controller.cpp +++ b/src/core/controller.cpp @@ -83,6 +83,7 @@ void Controller::requestCapture(const CaptureRequest &request) { this->startFullscreenCapture(id); }); break; + // TODO: Figure out the code path that gets here so the deprated warning can be fixed case CaptureRequest::SCREEN_MODE: { int &&number = request.data().toInt(); doLater(request.delay(), this, [this, id, number](){ diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt new file mode 100644 index 00000000..b42d7c20 --- /dev/null +++ b/src/tools/CMakeLists.txt @@ -0,0 +1,60 @@ +target_sources(flameshot PRIVATE arrow/arrowtool.h arrow/arrowtool.cpp) +target_sources(flameshot PRIVATE blur/blurtool.h blur/blurtool.cpp) +target_sources(flameshot PRIVATE circle/circletool.h circle/circletool.cpp) +target_sources(flameshot PRIVATE circlecount/circlecounttool.h circlecount/circlecounttool.cpp) +target_sources(flameshot PRIVATE copy/copytool.h copy/copytool.cpp) +target_sources(flameshot PRIVATE exit/exittool.h exit/exittool.cpp) +target_sources( + flameshot + PRIVATE imgur/imguruploader.h + imgur/imguruploadertool.h + imgur/imguruploader.cpp + imgur/imguruploadertool.cpp) +target_sources( + flameshot + PRIVATE launcher/applaunchertool.h + launcher/applauncherwidget.h + launcher/launcheritemdelegate.h + launcher/terminallauncher.h + launcher/applaunchertool.cpp + launcher/applauncherwidget.cpp + launcher/launcheritemdelegate.cpp + launcher/openwithprogram.cpp + launcher/terminallauncher.cpp) +target_sources(flameshot PRIVATE line/linetool.h line/linetool.cpp) +target_sources(flameshot PRIVATE marker/markertool.h marker/markertool.cpp) +target_sources(flameshot PRIVATE move/movetool.h move/movetool.cpp) +target_sources(flameshot PRIVATE pencil/penciltool.h pencil/penciltool.cpp) +target_sources( + flameshot + PRIVATE pin/pintool.h + pin/pinwidget.h + pin/pintool.cpp + pin/pinwidget.cpp) +target_sources(flameshot PRIVATE rectangle/rectangletool.h rectangle/rectangletool.cpp) +target_sources(flameshot PRIVATE redo/redotool.h redo/redotool.cpp) +target_sources(flameshot PRIVATE save/savetool.h save/savetool.cpp) +target_sources(flameshot PRIVATE selection/selectiontool.h selection/selectiontool.cpp) +target_sources(flameshot PRIVATE sizeindicator/sizeindicatortool.h sizeindicator/sizeindicatortool.cpp) +target_sources( + flameshot + PRIVATE text/textconfig.h + text/texttool.h + text/textwidget.h + text/textconfig.cpp + text/texttool.cpp + text/textwidget.cpp) +target_sources(flameshot PRIVATE undo/undotool.h undo/undotool.cpp) + +target_sources( + flameshot + PRIVATE abstractactiontool.cpp + abstractpathtool.cpp + abstracttwopointtool.cpp + capturecontext.cpp + toolfactory.cpp + abstractactiontool.h + abstractpathtool.h + abstracttwopointtool.h + capturetool.h + toolfactory.h) diff --git a/src/tools/arrow/arrowtool.h b/src/tools/arrow/arrowtool.h index 9d81452a..add23691 100644 --- a/src/tools/arrow/arrowtool.h +++ b/src/tools/arrow/arrowtool.h @@ -19,6 +19,7 @@ #include "src/tools/abstracttwopointtool.h" #include +#include class ArrowTool : public AbstractTwoPointTool { Q_OBJECT diff --git a/src/tools/blur/blurtool.cpp b/src/tools/blur/blurtool.cpp index a927da8f..597e326d 100644 --- a/src/tools/blur/blurtool.cpp +++ b/src/tools/blur/blurtool.cpp @@ -16,73 +16,132 @@ // along with Flameshot. If not, see . #include "blurtool.h" -#include +#include #include #include #include -#include +#include +#include -BlurTool::BlurTool(QObject *parent) : AbstractTwoPointTool(parent) { +BlurTool::BlurTool(QObject *parent) : AbstractTwoPointTool(parent) {} +QIcon BlurTool::icon(const QColor &background, bool inEditor) const +{ + Q_UNUSED(inEditor); + return QIcon(iconPath(background) + "blur.svg"); +} +QString BlurTool::name() const { return tr("Blur"); } + +QString BlurTool::nameID() { return QLatin1String(""); } + +QString BlurTool::description() const +{ + return tr("Set Blur as the paint tool"); } -QIcon BlurTool::icon(const QColor &background, bool inEditor) const { - Q_UNUSED(inEditor); - return QIcon(iconPath(background) + "blur.svg"); -} -QString BlurTool::name() const { - return tr("Blur"); -} +CaptureTool *BlurTool::copy(QObject *parent) { return new BlurTool(parent); } -QString BlurTool::nameID() { - return QLatin1String(""); -} +void write_block(QImage &image, int x_start, int y_start, int pixel_size, + QRgb block_color) +{ + assert(x_start + pixel_size < image.width()); + assert(y_start + pixel_size < image.height()); -QString BlurTool::description() const { - return tr("Set Blur as the paint tool"); -} - -CaptureTool* BlurTool::copy(QObject *parent) { - return new BlurTool(parent); -} - -void BlurTool::process(QPainter &painter, const QPixmap &pixmap, bool recordUndo) { - if (recordUndo) { - updateBackup(pixmap); + for (auto x = x_start; x < x_start + pixel_size; x++) + { + for (auto y = y_start; y < y_start + pixel_size; y++) + { + image.setPixel(x, y, block_color); } - QPoint &p0 = m_points.first; - QPoint &p1 = m_points.second; - auto pixelRatio = pixmap.devicePixelRatio(); - - QRect selection = QRect(p0, p1).normalized(); - QRect selectionScaled = QRect(p0 * pixelRatio, p1 * pixelRatio).normalized(); - - QGraphicsBlurEffect *blur = new QGraphicsBlurEffect; - blur->setBlurRadius(10); - QGraphicsPixmapItem *item = new QGraphicsPixmapItem ( - pixmap.copy(selectionScaled)); - item->setGraphicsEffect(blur); - - QGraphicsScene scene; - scene.addItem(item); - - scene.render(&painter, selection, QRectF()); - blur->setBlurRadius(12); - scene.render(&painter, selection, QRectF()); - scene.render(&painter, selection, QRectF()); + } } -void BlurTool::paintMousePreview(QPainter &painter, const CaptureContext &context) { - Q_UNUSED(context); - Q_UNUSED(painter); +QRgb calculate_block_averge(QImage &image, int x_start, int y_start, + int pixel_size) +{ + assert(x_start + pixel_size < image.width()); + assert(y_start + pixel_size < image.height()); + + int red_count = 0; + int blue_count = 0; + int green_count = 0; + int pixel_count = 0; + for (auto x = x_start; x < x_start + pixel_size; x++) + { + for (auto y = y_start; y < y_start + pixel_size; y++) + { + auto pixel = image.pixel(x, y); + + red_count += qRed(pixel); + green_count += qGreen(pixel); + blue_count += qBlue(pixel); + pixel_count++; + } + } + return (qRgb(red_count / pixel_count, green_count / pixel_count, + blue_count / pixel_count)); +} +void BlurTool::process(QPainter &painter, const QPixmap &pixmap, + bool recordUndo) +{ + if (recordUndo) + { + updateBackup(pixmap); + } + QPoint &p0 = m_points.first; + QPoint &p1 = m_points.second; + auto pixelRatio = pixmap.devicePixelRatio(); + + QRect selection = QRect(p0, p1).normalized(); + QRect selectionScaled = QRect(p0 * pixelRatio, p1 * pixelRatio).normalized(); + + QPixmap *source = new QPixmap(pixmap.copy(selectionScaled)); + + QImage original_image{source->toImage()}; + QImage imageResult{source->toImage()}; + unsigned int pixel_size = m_thickness; + if (pixel_size < 1) + { + pixel_size =1; + } + + + const unsigned int width = source->width(); + const unsigned int height = source->height(); + + // Don't start pixelating until the region is at least as big as the pixel + if ((width > pixel_size) && (height > pixel_size)) + { + for (unsigned int x = 0; x < (width - pixel_size); x += pixel_size) + { + for (unsigned int y = 0; y < (height - pixel_size); y += pixel_size) + { + auto block_color = + calculate_block_averge(original_image, x, y, pixel_size); + write_block(imageResult, x, y, pixel_size, block_color); + } + } + } + QPixmap result{QPixmap::fromImage(imageResult)}; + + QGraphicsScene scene; + scene.addPixmap(result); + + scene.render(&painter, selection, QRectF()); } -void BlurTool::drawStart(const CaptureContext &context) { - m_thickness = context.thickness; - m_points.first = context.mousePos; - m_points.second = context.mousePos; +void BlurTool::paintMousePreview(QPainter &painter, + const CaptureContext &context) +{ + Q_UNUSED(context); + Q_UNUSED(painter); } -void BlurTool::pressed(const CaptureContext &context) { - Q_UNUSED(context); +void BlurTool::drawStart(const CaptureContext &context) +{ + m_thickness = context.thickness; + m_points.first = context.mousePos; + m_points.second = context.mousePos; } + +void BlurTool::pressed(const CaptureContext &context) { Q_UNUSED(context); } diff --git a/src/tools/capturecontext.cpp b/src/tools/capturecontext.cpp index 4e3c9773..2af6593e 100644 --- a/src/tools/capturecontext.cpp +++ b/src/tools/capturecontext.cpp @@ -24,3 +24,4 @@ QPixmap CaptureContext::selectedScreenshotArea() const { return screenshot.copy(selection); } } + diff --git a/src/tools/capturecontext.h b/src/tools/capturecontext.h index 0175fe16..9ce19148 100644 --- a/src/tools/capturecontext.h +++ b/src/tools/capturecontext.h @@ -41,6 +41,7 @@ struct CaptureContext { QPoint mousePos; // Value of the desired thickness int thickness; + int circleCount; // Mode of the capture widget bool fullscreen; diff --git a/src/tools/capturetool.h b/src/tools/capturetool.h index ae1a70c0..9f2382af 100644 --- a/src/tools/capturetool.h +++ b/src/tools/capturetool.h @@ -62,6 +62,8 @@ public: REQ_ADD_CHILD_WINDOW, // Instance this->widget()'s widget which handles its own lifetime. REQ_ADD_EXTERNAL_WIDGETS, + + REQ_INCREMENT_CIRCLE_COUNT, }; explicit CaptureTool(QObject *parent = nullptr) : QObject(parent){} diff --git a/src/tools/circlecount/circlecounttool.cpp b/src/tools/circlecount/circlecounttool.cpp new file mode 100644 index 00000000..25494158 --- /dev/null +++ b/src/tools/circlecount/circlecounttool.cpp @@ -0,0 +1,75 @@ +// Copyright(c) 2017-2019 Alejandro Sirgo Rica & Contributors +// +// This file is part of Flameshot. +// +// Flameshot is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Flameshot is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Flameshot. If not, see . + +#include "circlecounttool.h" +#include +namespace { +#define PADDING_VALUE 2 +} + +CircleCountTool::CircleCountTool(QObject *parent) : AbstractTwoPointTool(parent) { + m_count = 0; +} + +QIcon CircleCountTool::icon(const QColor &background, bool inEditor) const { + Q_UNUSED(inEditor); + return QIcon(iconPath(background) + "circlecount-outline.svg"); +} +QString CircleCountTool::name() const { + return tr("Circle Counter"); +} + +QString CircleCountTool::nameID() { + return QLatin1String(""); +} + +QString CircleCountTool::description() const { + return tr("Add an autoincrementing counter bubble"); +} + +CaptureTool* CircleCountTool::copy(QObject *parent) { + return new CircleCountTool(parent); +} + +void CircleCountTool::process(QPainter &painter, const QPixmap &pixmap, bool recordUndo) { + if (recordUndo) { + updateBackup(pixmap); + } + painter.setBrush(m_color); + + int bubble_size=16; + painter.drawEllipse(m_points.first,bubble_size,bubble_size); + painter.drawText(QRectF(m_points.first.x()-bubble_size/2, m_points.first.y()-bubble_size/2, bubble_size, bubble_size), Qt::AlignCenter, QString::number(m_count)); +} + +void CircleCountTool::paintMousePreview(QPainter &painter, const CaptureContext &context) { + painter.setPen(QPen(context.color, PADDING_VALUE + context.thickness)); + painter.drawLine(context.mousePos, context.mousePos); +} + +void CircleCountTool::drawStart(const CaptureContext &context) { + m_color = context.color; + m_thickness = context.thickness + PADDING_VALUE; + m_points.first = context.mousePos; + m_count = context.circleCount; + emit requestAction(REQ_INCREMENT_CIRCLE_COUNT); + +} + +void CircleCountTool::pressed(const CaptureContext &context) { + Q_UNUSED(context); +} diff --git a/src/tools/circlecount/circlecounttool.h b/src/tools/circlecount/circlecounttool.h new file mode 100644 index 00000000..7893384a --- /dev/null +++ b/src/tools/circlecount/circlecounttool.h @@ -0,0 +1,41 @@ +// Copyright(c) 2017-2019 Alejandro Sirgo Rica & Contributors +// +// This file is part of Flameshot. +// +// Flameshot is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Flameshot is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Flameshot. If not, see . + +#pragma once + +#include "src/tools/abstracttwopointtool.h" + +class CircleCountTool : public AbstractTwoPointTool { + Q_OBJECT +public: + explicit CircleCountTool(QObject *parent = nullptr); + + QIcon icon(const QColor &background, bool inEditor) const override; + QString name() const override; + static QString nameID(); + QString description() const override; + + CaptureTool* copy(QObject *parent = nullptr) override; + void process( + QPainter &painter, const QPixmap &pixmap, bool recordUndo = false) override; + void paintMousePreview(QPainter &painter, const CaptureContext &context) override; +private: + unsigned int m_count; +public slots: + void drawStart(const CaptureContext &context) override; + void pressed(const CaptureContext &context) override; +}; diff --git a/src/tools/launcher/applauncherwidget.cpp b/src/tools/launcher/applauncherwidget.cpp index e1048b21..a44e4c57 100644 --- a/src/tools/launcher/applauncherwidget.cpp +++ b/src/tools/launcher/applauncherwidget.cpp @@ -103,6 +103,8 @@ void AppLauncherWidget::launch(const QModelIndex &index) { } QString command = index.data(Qt::UserRole).toString().replace( QRegExp("(\\%.)"), '"' + m_tempFile + '"'); + + QString app_name = index.data(Qt::UserRole).toString().split(" ").at(0); bool inTerminal = index.data(Qt::UserRole+1).toBool() || m_terminalCheckbox->isChecked(); if (inTerminal) { @@ -112,7 +114,7 @@ void AppLauncherWidget::launch(const QModelIndex &index) { tr("Unable to launch in terminal.")); } } else { - QProcess::startDetached(command); + QProcess::startDetached(app_name,{m_tempFile}); } if (!m_keepOpen) { close(); diff --git a/src/tools/launcher/terminallauncher.cpp b/src/tools/launcher/terminallauncher.cpp index 451f60fa..4369d2e1 100644 --- a/src/tools/launcher/terminallauncher.cpp +++ b/src/tools/launcher/terminallauncher.cpp @@ -56,5 +56,5 @@ TerminalApp TerminalLauncher::getPreferedTerminal() { bool TerminalLauncher::launchDetached(const QString &command) { TerminalApp app = getPreferedTerminal(); QString s = app.name + " " + app.arg + " " + command; - return QProcess::startDetached(s); + return QProcess::startDetached(app.name, {app.arg,command}); } diff --git a/src/tools/pin/pinwidget.cpp b/src/tools/pin/pinwidget.cpp index b4d2df6e..6999839b 100644 --- a/src/tools/pin/pinwidget.cpp +++ b/src/tools/pin/pinwidget.cpp @@ -58,7 +58,7 @@ int PinWidget::margin() const { } void PinWidget::wheelEvent(QWheelEvent *e) { - int val = e->delta() > 0 ? 15 : -15; + int val = e->angleDelta().y() > 0 ? 15 : -15; int newWidth = qBound(50, m_label->width() + val, maximumWidth()); int newHeight = qBound(50, m_label->height() + val, maximumHeight()); diff --git a/src/tools/text/textconfig.cpp b/src/tools/text/textconfig.cpp index 229d57ed..f63b3069 100644 --- a/src/tools/text/textconfig.cpp +++ b/src/tools/text/textconfig.cpp @@ -36,7 +36,7 @@ TextConfig::TextConfig(QWidget *parent) : QWidget(parent) { int index = fontsCB->findText(font().family()); fontsCB->setCurrentIndex(index); - QColor bgColor(palette().background().color()); + QColor bgColor(palette().windowText().color()); QString iconPrefix = ColorUtils::colorIsDark(bgColor) ? PathInfo::whiteIconPath() : PathInfo::blackIconPath(); diff --git a/src/tools/toolfactory.cpp b/src/tools/toolfactory.cpp index 23c5032b..588df1b1 100644 --- a/src/tools/toolfactory.cpp +++ b/src/tools/toolfactory.cpp @@ -18,6 +18,7 @@ #include "toolfactory.h" #include "arrow/arrowtool.h" #include "circle/circletool.h" +#include "circlecount/circlecounttool.h" #include "copy/copytool.h" #include "exit/exittool.h" #include "imgur/imguruploadertool.h" @@ -103,6 +104,10 @@ CaptureTool* ToolFactory::CreateTool( case CaptureButton::TYPE_TEXT: tool = new TextTool(parent); break; + case CaptureButton::TYPE_CIRCLECOUNT: + tool = new CircleCountTool(parent); + break; + default: tool = nullptr; break; diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt new file mode 100644 index 00000000..048d09ab --- /dev/null +++ b/src/utils/CMakeLists.txt @@ -0,0 +1,21 @@ +# Required to generate MOC +target_sources( + flameshot + PRIVATE dbusutils.h + filenamehandler.h + screengrabber.h + systemnotification.h) + +target_sources( + flameshot + PRIVATE filenamehandler.cpp + screengrabber.cpp + confighandler.cpp + systemnotification.cpp + screenshotsaver.cpp + dbusutils.cpp + globalvalues.cpp + desktopfileparse.cpp + desktopinfo.cpp + pathinfo.cpp + colorutils.cpp) diff --git a/src/utils/confighandler.cpp b/src/utils/confighandler.cpp index 14f3e55f..15c4194b 100644 --- a/src/utils/confighandler.cpp +++ b/src/utils/confighandler.cpp @@ -56,7 +56,8 @@ QVector ConfigHandler::getButtons() { << CaptureButton::TYPE_IMAGEUPLOADER << CaptureButton::TYPE_OPEN_APP << CaptureButton::TYPE_PIN - << CaptureButton::TYPE_TEXT; + << CaptureButton::TYPE_TEXT + << CaptureButton::TYPE_CIRCLECOUNT; } using bt = CaptureButton::ButtonType; diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt new file mode 100644 index 00000000..3226b2ee --- /dev/null +++ b/src/widgets/CMakeLists.txt @@ -0,0 +1,19 @@ +add_subdirectory(panel) +add_subdirectory(capture) + +# Required to generate MOC +target_sources( + flameshot + PRIVATE capturelauncher.h + imagelabel.h + infowindow.h + loadspinner.h + notificationwidget.h) + +target_sources( + flameshot + PRIVATE capturelauncher.cpp + imagelabel.cpp + infowindow.cpp + loadspinner.cpp + notificationwidget.cpp) diff --git a/src/widgets/capture/CMakeLists.txt b/src/widgets/capture/CMakeLists.txt new file mode 100644 index 00000000..24945708 --- /dev/null +++ b/src/widgets/capture/CMakeLists.txt @@ -0,0 +1,21 @@ +# Required to generate MOC +target_sources( + flameshot + PRIVATE buttonhandler.h + capturebutton.h + capturewidget.h + colorpicker.h + hovereventfilter.h + selectionwidget.h + notifierbox.h) + +target_sources( + flameshot + PRIVATE buttonhandler.cpp + capturebutton.cpp + capturewidget.cpp + colorpicker.cpp + hovereventfilter.cpp + modificationcommand.cpp + notifierbox.cpp + selectionwidget.cpp) diff --git a/src/widgets/capture/buttonhandler.cpp b/src/widgets/capture/buttonhandler.cpp index 373a096d..95a37e32 100644 --- a/src/widgets/capture/buttonhandler.cpp +++ b/src/widgets/capture/buttonhandler.cpp @@ -221,7 +221,7 @@ QVector ButtonHandler::verticalPoints( QRect ButtonHandler::intersectWithAreas(const QRect &rect) { QRect res; - for(const QRect &r : m_screenRegions.rects()) { + for(const QRect &r : m_screenRegions) { QRect temp = rect.intersected(r); if (temp.height() * temp.width() > res.height() * res.width()) { res = temp; diff --git a/src/widgets/capture/capturebutton.cpp b/src/widgets/capture/capturebutton.cpp index 8a809660..8dde6768 100644 --- a/src/widgets/capture/capturebutton.cpp +++ b/src/widgets/capture/capturebutton.cpp @@ -166,6 +166,7 @@ static std::map buttonTypeOrder { { CaptureButton::TYPE_IMAGEUPLOADER, 16 }, { CaptureButton::TYPE_OPEN_APP, 17 }, { CaptureButton::TYPE_PIN, 18 }, + { CaptureButton::TYPE_CIRCLECOUNT, 19 }, }; int CaptureButton::getPriorityByButton(CaptureButton::ButtonType b) { @@ -193,4 +194,5 @@ QVector CaptureButton::iterableButtonTypes = { CaptureButton::TYPE_IMAGEUPLOADER, CaptureButton::TYPE_OPEN_APP, CaptureButton::TYPE_PIN, + CaptureButton::TYPE_CIRCLECOUNT, }; diff --git a/src/widgets/capture/capturebutton.h b/src/widgets/capture/capturebutton.h index 4ca4b880..4bc9f96e 100644 --- a/src/widgets/capture/capturebutton.h +++ b/src/widgets/capture/capturebutton.h @@ -51,6 +51,8 @@ public: TYPE_REDO = 16, TYPE_PIN = 17, TYPE_TEXT = 18, + TYPE_CIRCLECOUNT = 19, + }; #if QT_VERSION < QT_VERSION_CHECK(5, 5, 0) diff --git a/src/widgets/capture/capturewidget.cpp b/src/widgets/capture/capturewidget.cpp index 1db615bb..e7eab3c7 100644 --- a/src/widgets/capture/capturewidget.cpp +++ b/src/widgets/capture/capturewidget.cpp @@ -68,7 +68,7 @@ CaptureWidget::CaptureWidget(const uint id, const QString &savePath, setMouseTracking(true); initContext(savePath, fullScreen); initShortcuts(); - + m_context.circleCount=1; #ifdef Q_OS_WIN // Top left of the whole set of screens QPoint topLeft(0,0); @@ -263,7 +263,7 @@ void CaptureWidget::paintEvent(QPaintEvent *) { painter.setRenderHint(QPainter::Antialiasing); painter.setBrush(m_uiColor); for(auto r: m_selection->handlerAreas()) { - painter.drawRoundRect(r, 100, 100); + painter.drawRoundedRect(r, 100, 100); } } } @@ -510,7 +510,7 @@ void CaptureWidget::keyReleaseEvent(QKeyEvent *e) { } void CaptureWidget::wheelEvent(QWheelEvent *e) { - m_context.thickness += e->delta() / 120; + m_context.thickness += e->angleDelta().y() / 120; m_context.thickness = qBound(0, m_context.thickness, 100); QPoint topLeft = qApp->desktop()->screenGeometry( qApp->desktop()->screenNumber(QCursor::pos())).topLeft(); @@ -636,6 +636,11 @@ void CaptureWidget::handleButtonSignal(CaptureTool::Request r) { m_undoStack.setIndex(0); update(); break; + + case CaptureTool::REQ_INCREMENT_CIRCLE_COUNT: + incrementCircleCount(); + break; + case CaptureTool::REQ_CLOSE_GUI: close(); break; @@ -715,7 +720,12 @@ void CaptureWidget::setDrawColor(const QColor &c) { emit colorChanged(c); } -void CaptureWidget::setDrawThickness(const int &t) +void CaptureWidget::incrementCircleCount() +{ + m_context.circleCount++; +} + + void CaptureWidget::setDrawThickness(const int &t) { m_context.thickness = qBound(0, t, 100); ConfigHandler().setdrawThickness(m_context.thickness); diff --git a/src/widgets/capture/capturewidget.h b/src/widgets/capture/capturewidget.h index 171ab33c..c33157c4 100644 --- a/src/widgets/capture/capturewidget.h +++ b/src/widgets/capture/capturewidget.h @@ -90,7 +90,7 @@ private slots: void handleButtonSignal(CaptureTool::Request r); void setDrawColor(const QColor &c); void setDrawThickness(const int &t); - + void incrementCircleCount(); protected: void paintEvent(QPaintEvent *); void mousePressEvent(QMouseEvent *); @@ -112,6 +112,7 @@ protected: // Outside selection opacity int m_opacity; + // utility flags bool m_mouseIsClicked; bool m_rightClick; @@ -122,6 +123,8 @@ protected: bool m_previewEnabled; bool m_adjustmentButtonPressed; + + private: void initContext(const QString &savePath, bool fullscreen); void initPanel(); diff --git a/src/widgets/capture/colorpicker.cpp b/src/widgets/capture/colorpicker.cpp index e714b2b4..249330b4 100644 --- a/src/widgets/capture/colorpicker.cpp +++ b/src/widgets/capture/colorpicker.cpp @@ -82,11 +82,11 @@ void ColorPicker::paintEvent(QPaintEvent *) { highlight.moveTo(highlight.x() - 3, highlight.y() - 3); highlight.setHeight(highlight.height() + 6); highlight.setWidth(highlight.width() + 6); - painter.drawRoundRect(highlight, 100, 100); + painter.drawRoundedRect(highlight, 100, 100); painter.setPen(QColor(Qt::black)); } painter.setBrush(QColor(m_colorList.at(i))); - painter.drawRoundRect(rects.at(i), 100, 100); + painter.drawRoundedRect(rects.at(i), 100, 100); } } diff --git a/src/widgets/infowindow.cpp b/src/widgets/infowindow.cpp index fe3517d0..c3698624 100644 --- a/src/widgets/infowindow.cpp +++ b/src/widgets/infowindow.cpp @@ -131,6 +131,7 @@ void InfoWindow::initLabels() { QLabel *versionTitleLabel = new QLabel(tr("Version"), this); versionTitleLabel->setAlignment(Qt::AlignHCenter); m_layout->addWidget(versionTitleLabel); + QString versionMsg = "Flameshot " + QStringLiteral(APP_VERSION) + "\nCompiled with Qt " + QT_VERSION_STR; QLabel *versionLabel = new QLabel(versionMsg, this); diff --git a/src/widgets/panel/CMakeLists.txt b/src/widgets/panel/CMakeLists.txt new file mode 100644 index 00000000..eeb4de27 --- /dev/null +++ b/src/widgets/panel/CMakeLists.txt @@ -0,0 +1,4 @@ +# Required to generate MOC +target_sources(flameshot PRIVATE sidepanelwidget.h utilitypanel.h) + +target_sources(flameshot PRIVATE sidepanelwidget.cpp utilitypanel.cpp) diff --git a/src/widgets/panel/sidepanelwidget.cpp b/src/widgets/panel/sidepanelwidget.cpp index b39a2fb9..90ece87c 100644 --- a/src/widgets/panel/sidepanelwidget.cpp +++ b/src/widgets/panel/sidepanelwidget.cpp @@ -73,7 +73,7 @@ SidePanelWidget::SidePanelWidget(QPixmap *p, QWidget *parent) : connect(this, &SidePanelWidget::thicknessChanged, this, &SidePanelWidget::updateThickness); - QColor background = this->palette().background().color(); + QColor background = this->palette().window().color(); bool isDark = ColorUtils::colorIsDark(background); QString modifier = isDark ? PathInfo::whiteIconPath() : PathInfo::blackIconPath(); diff --git a/src/widgets/panel/utilitypanel.cpp b/src/widgets/panel/utilitypanel.cpp index 321a1308..97da5083 100644 --- a/src/widgets/panel/utilitypanel.cpp +++ b/src/widgets/panel/utilitypanel.cpp @@ -90,7 +90,7 @@ void UtilityPanel::initInternalPanel() { m_layout->addLayout(m_upLayout); widget->setLayout(m_layout); - QColor bgColor = palette().background().color(); + QColor bgColor = palette().window().color(); bgColor.setAlphaF(0.0); m_internalPanel->setStyleSheet(QStringLiteral("QScrollArea {background-color: %1}") .arg(bgColor.name()));