fergalmoran/flameshot
1
0
Fork 0
mirror of https://github.com/fergalmoran/flameshot.git synced 2025-12-22 09:51:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'flameshot-org-master' into feature/RND-656-flameshot-ability-to-lock-switching-between-s3-and-imgur-and-use-s3-only

Browse Source 
# Conflicts:
#	data/translations/Internationalization_eu.ts
This commit is contained in:
Yuriy Puchkov
2020-10-06 16:13:45 +03:00
parent 7d0d51efb5 2bc3d82666
commit 0a31d2d94d
3 changed files with 315 additions and 635 deletions
Download Patch File Download Diff File Expand all files Collapse all files

944
data/translations/Internationalization_eu_ES.ts → data/translations/Internationalization_eu.ts
View File

File diff suppressed because it is too large Load Diff

2
docs/desktopEntry/package/flameshot.desktop
View File

@@ -21,7 +21,7 @@ Comment[sk]=Mocný, no tiež jednoduchý softvér na zachytávanie obrazovky.
Comment[sr]=Једноставан, а моћан алат за снимање екрана
Comment[uk]=Потужний простий у використанні додаток для створення знімків екрану.
Comment[es]=Software de captura de pantalla potente y fácil de usar.
Comment[de]=Einfache, umfängliche Sreenshot-Software
Comment[de]=Schlichte, leistungsstarke Screenshot-Software
Keywords=flameshot;screenshot;capture;shutter;
Keywords[zh_CN]=flameshot;screenshot;capture;shutter;截图;屏幕;
Keywords[fr]=flameshot;capture d'écran;capter;shutter;

2
src/CMakeLists.txt
View File

@@ -34,7 +34,7 @@ set(FLAMESHOT_TS_FILES
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_cs.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_de_DE.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_es.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_eu_ES.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_eu.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_fr.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_hu.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_it_IT.ts