benkyd/flameshot
1
0
Fork 0
Code Issues Pull Requests Actions 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

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