fergalmoran/flameshot
1
0
Fork 0
mirror of https://github.com/fergalmoran/flameshot.git synced 2025-12-30 13:49:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,101 Commits 1 Branch 0 Tags
73fe772b70646cbef59dc44eabc984e5ca0ebef1
Commit Graph

86 Commits

Author SHA1 Message Date
Jeremy Borgman
73fe772b70 resolving merge conflicts 2021-01-08 10:19:53 -06:00
Heimen Stoffels
38bc11093e Updated Dutch translations 2021-01-04 13:05:11 -06:00
Åke Engelbrektson
ead92be632 Update Internationalization_sv_SE.ts 
Correct and complete Swedish translation.
I also fixed the source string on line 438, to better match GUI and translate. You might want to fix that error in other translations. Thanks!
 2020-12-28 19:12:04 -06:00
Yuriy Puchkov
47c99774ce Add timer for auto-checks for available updates (every 24 hours) 2020-12-11 17:50:53 +02:00
Yuriy Puchkov
586ecb07eb Code refactoring - remove number of build warnings 2020-12-06 08:33:19 +02:00
Yurii Puchkov
bad270cce4 MacOS dmg package build (cmake only, no CI yet) 2020-11-27 02:00:12 -08:00
Yuriy Puchkov
deee448de4 Read s3 creds for upload from URL in private network (VPN) - fix 2020-11-18 22:11:19 +02:00
Yuriy Puchkov
50d5afed8f Read s3 creds for upload from URL in private network (VPN) 2020-11-18 17:57:15 +02:00
Jeremy Fleischman
05c2bc6ae7 Added a gui --selection option to print out the geometry of the selection. 
Fixes #425.
 2020-10-26 11:46:39 -05:00
Jeremy Borgman
ffb119fabb updating namecheap PR 2020-10-20 06:19:04 -05:00
Yuriy Puchkov
472d0dca29 Merge branch 'flameshot-org-master' into bugfix/RND-664-flameshot-update-history-widget-on-new-capture 2020-10-16 15:05:12 +03:00
Leekilalala
49c87138a8 Update Hong Kong, China translation. (#1075) 
* Add files via upload

* Update China-hongkong translation.
 2020-10-16 05:27:07 -05:00
Yuriy Puchkov
428c058d50 Update *.ts files 2020-10-15 16:03:26 +03:00
Yuriy Puchkov
1438790211 Fix - delete.svg in the graphics.qrc file 2020-10-15 15:54:24 +03:00
Yuriy Puchkov
654455e9ac Merge branch 'flameshot-org-master' into merge-from-upstream 
# Conflicts:
#	.github/workflows/Linux-pack.yml
#	CMakeLists.txt
#	appveyor.yml
#	data/graphics.qrc
#	src/tools/imgur/imguruploader.cpp
 2020-10-15 15:44:49 +03:00
Jeremy Borgman
376a6f2a9c Added releasing info for v0.8.5 2020-10-14 18:43:26 -05:00
Jeremy Borgman
ce331924a4 organizing files 2020-10-14 11:08:12 -05:00
Jeremy Borgman
cc34ede2c7 matching flatpak files to flathub repo 2020-10-13 21:48:59 -05:00
borgmanJeremy
f11073bc00 fixing icon regression (#1051) 
* fixing icon regression

* fixed symlink
 2020-10-12 08:40:35 -05:00
Yuriy Puchkov
0c4bb3716c Fix - add keyboar icon in the SetShortcutDialog 2020-10-11 20:59:10 +03:00
Yuriy Puchkov
c92f8e3014 Merge branch 'flameshot-org-master' into bugfix/memory-leak 
# Conflicts:
#	.github/workflows/Linux-pack.yml
#	CMakeLists.txt
#	data/graphics.qrc
#	src/config/configwindow.cpp
#	src/tools/imgur/imguruploader.cpp
 2020-10-11 20:49:15 +03:00
Jeremy Borgman
81c68c06d6 staging for 0.8.4 release 2020-10-10 19:43:35 -05:00
borgmanJeremy
8ff94a95a8 Cleaned up flatpak build for flathub submission (#1040) 
* Cleaned up flatpak build for flathub submission. Fixed app-id and other assets to match dbus naming.

* fixed missing updates

* fixing build issues
 2020-10-10 13:04:19 -05:00
Jeremy Borgman
2a15611445 merged latest changes from namecheap 2020-10-08 15:04:11 -05:00
RieL
9ecad94667 Update Internationalization_ko.ts 
Improved Korean translation.

1.도움 메세지를 보여줍니다 -> 도움 메세지 보기
2.캡처 모드 시작에 도움 메세지를 보여줍니다 -> 캡처 모드 시작에 도움 메세지 보기
3.데스크톱 알림을 사용합니다 -> 데스크톱 알림 사용
4.트레이 아이콘을 보임 -> 트레이 아이콘 보기
5.시작할때 실행 -> 컴퓨터를 시작할 때 실행
6.Toggle visibility of sidebar with options of the selected tool -> 사이드바를 열어 선택한 도구의 옵션보기
7.도구의 두께를 바꿉니다 -> 도구 두께 변경
8.직사각형 선택->직사각형 Selection (need more proper word to translate)
9.변경할 버튼을 선택하세요 -> 변경 할 버튼 선택
10.콘트래스트 색상 -> 대비 색상
11.선택 영역 외의 불투명도: -> 선택 영역 외 불투명도
12. 버튼 셀렉션 -> 버튼 선택
 2020-10-07 10:57:10 -05:00
Yuriy Puchkov
30c4f4f172 Update translation files 2020-10-06 16:15:17 +03:00
Yuriy Puchkov
0a31d2d94d Merge branch 'flameshot-org-master' into feature/RND-656-flameshot-ability-to-lock-switching-between-s3-and-imgur-and-use-s3-only 
# Conflicts:
#	data/translations/Internationalization_eu.ts
 2020-10-06 16:13:45 +03:00
Yuriy Puchkov
24ebd9b6d4 Translations update (Ukrainian & Russian) 2020-10-05 10:42:28 +03:00
Jeremy Borgman
785da76c22 removed merge conflicts 2020-10-04 11:17:34 -05:00
Porrumentzio
2bc3d82666 Updated Basque translation (#1027) 
* Added Basque translation

* Changed translation code from eu_ES to eu

* Updated Basque translation

* Modified CMakeLists.txt to fit the new Basque translation code
 2020-10-03 18:50:48 -05:00
Yuriy Puchkov
8e92ea5ab4 Merge 0.8.3 upstream 2020-10-02 10:15:56 +03:00
Ahmed Zetao Yang
60c290c540 feat: update windows rc file 2020-09-30 10:58:48 -05:00
Jeremy Borgman
ecfaa2359b Fixed readme 2020-09-28 19:33:36 -05:00
Martin-Eckleben
d349cb5f9d black and white plus and minus icons 2020-09-28 19:02:19 -05:00
Tiago Rinaldi
938bf8815d Add Brazilian portuguese translation 2020-09-28 19:01:15 -05:00
Jeremy Borgman
ceb51a90bd Added releasing info for 0.8.3 2020-09-28 09:24:35 -05:00
Yuriy Puchkov
fc86f473cd Update Ukrainian and Russian translations 2020-09-28 15:18:52 +03:00
Yuriy Puchkov
9f26384003 Set default storage based on config.ini file (s3 if creds exist otherwise imgur) 2020-09-28 11:04:58 +03:00
Jeremy Borgman
991da44968 Fixed snap on ubuntu 20.04 (needed unity7) -S 2020-09-27 18:57:45 -05:00
pafri
9df7c45d62 Update Internationalization_cs.ts 2020-09-27 10:14:36 -05:00
Yuriy Puchkov
d4d3b9eae0 Merge branch 'master-flameshotorg' into master_nc_merge_upstream 
# Conflicts:
#	.travis.yml
#	appveyor.yml
#	data/graphics.qrc
#	data/img/app/keyboard.svg
#	data/img/material/black/delete.png
#	data/img/material/black/delete.svg
#	data/img/material/black/filepath.svg
#	data/img/material/black/shortcut.svg
#	data/img/material/white/filepath.svg
#	data/img/material/white/shortcut.svg
#	data/translations/Internationalization_hu.ts
#	data/translations/Internationalization_ka.ts
#	external/Qt-Color-Widgets/src/color_wheel.cpp
#	external/singleapplication/singleapplication.cpp
#	flameshot.pro
#	src/cli/commandlineparser.cpp
#	src/config/buttonlistview.cpp
#	src/config/configwindow.cpp
#	src/config/configwindow.h
#	src/config/geneneralconf.cpp
#	src/config/geneneralconf.h
#	src/config/uicoloreditor.cpp
#	src/config/uicoloreditor.h
#	src/core/controller.cpp
#	src/core/globalshortcutfilter.cpp
#	src/main.cpp
#	src/third-party/Qt-Color-Widgets/src/color_utils.cpp
#	src/tools/abstractactiontool.h
#	src/tools/abstractpathtool.h
#	src/tools/arrow/arrowtool.cpp
#	src/tools/arrow/arrowtool.h
#	src/tools/blur/blurtool.cpp
#	src/tools/capturetool.h
#	src/tools/circle/circletool.cpp
#	src/tools/circle/circletool.h
#	src/tools/copy/copytool.cpp
#	src/tools/copy/copytool.h
#	src/tools/exit/exittool.cpp
#	src/tools/exit/exittool.h
#	src/tools/imgur/imguruploader.cpp
#	src/tools/launcher/applaunchertool.cpp
#	src/tools/launcher/applaunchertool.h
#	src/tools/launcher/applauncherwidget.cpp
#	src/tools/launcher/openwithprogram.cpp
#	src/tools/line/linetool.cpp
#	src/tools/line/linetool.h
#	src/tools/marker/markertool.cpp
#	src/tools/marker/markertool.h
#	src/tools/move/movetool.cpp
#	src/tools/pencil/penciltool.cpp
#	src/tools/pencil/penciltool.h
#	src/tools/pin/pintool.cpp
#	src/tools/pin/pintool.h
#	src/tools/pin/pinwidget.cpp
#	src/tools/pixelate/pixelatetool.h
#	src/tools/rectangle/rectangletool.cpp
#	src/tools/rectangle/rectangletool.h
#	src/tools/redo/redotool.cpp
#	src/tools/redo/redotool.h
#	src/tools/save/savetool.cpp
#	src/tools/save/savetool.h
#	src/tools/selection/selectiontool.cpp
#	src/tools/selection/selectiontool.h
#	src/tools/sizeindicator/sizeindicatortool.cpp
#	src/tools/sizeindicator/sizeindicatortool.h
#	src/tools/storage/imgur/imguruploader.h
#	src/tools/storage/imgur/imguruploadertool.cpp
#	src/tools/storage/imgur/imguruploadertool.h
#	src/tools/text/textconfig.cpp
#	src/tools/text/texttool.cpp
#	src/tools/text/texttool.h
#	src/tools/toolfactory.cpp
#	src/tools/toolfactory.h
#	src/tools/undo/undotool.cpp
#	src/tools/undo/undotool.h
#	src/utils/confighandler.cpp
#	src/utils/confighandler.h
#	src/utils/dbusutils.cpp
#	src/utils/screenshotsaver.cpp
#	src/utils/screenshotsaver.h
#	src/widgets/capture/buttonhandler.cpp
#	src/widgets/capture/buttonhandler.h
#	src/widgets/capture/capturebutton.cpp
#	src/widgets/capture/capturebutton.h
#	src/widgets/capture/capturewidget.cpp
#	src/widgets/capture/capturewidget.h
#	src/widgets/capture/colorpicker.cpp
#	src/widgets/capturelauncher.cpp
#	src/widgets/infowindow.cpp
#	src/widgets/infowindow.h
#	src/widgets/panel/sidepanelwidget.cpp
#	src/widgets/panel/utilitypanel.cpp
#	src/widgets/panel/utilitypanel.h
#	translations/Internationalization_ca.ts
#	translations/Internationalization_de_DE.ts
#	translations/Internationalization_es.ts
#	translations/Internationalization_fr.ts
#	translations/Internationalization_ja.ts
#	translations/Internationalization_nl.ts
#	translations/Internationalization_pl.ts
#	translations/Internationalization_pt_br.ts
#	translations/Internationalization_ru.ts
#	translations/Internationalization_sk.ts
#	translations/Internationalization_sr.ts
#	translations/Internationalization_tr.ts
#	translations/Internationalization_uk.ts
#	translations/Internationalization_zh_CN.ts
#	translations/Internationalization_zh_TW.ts
 2020-09-24 18:52:49 +03:00
Jose Riha
2cbccc3d0a Update Slovak translation (#971) 2020-09-24 07:52:59 -05:00
borgmanJeremy
58b09bf259 bumped version for 0.8.1 patch release (#968) 
* bumped versio for 0.8.1 patch release

* Updated debian log and bumped windows version

* bumped CI version

* Applied patch by @hosiet
 2020-09-23 19:57:12 -05:00
Boyuan Yang
2d1d664a57 Remove a trailing space; update translation files 2020-09-23 12:50:43 -05:00
Ahmed Zetao Yang
def8ce21bb Enable deb packaging for ubuntu 18.04 (#959) 
* chore: update rpm packaging dependencies version

* chore: update debian dependencies version & changelog

* chore: enable deb packaging for ubuntu 18.04
 2020-09-23 08:02:51 -05:00
Jeremy Borgman
1b2d704b21 Cleaned up snap and changed confinement settings 2020-09-18 11:01:22 -05:00
Boyuan Yang
ab65c22db2 data/debian: Prepare for 0.8.0 release 
Files under data/debian/ directory are updated to be prepared for
flameshot 0.8.0 release.
 2020-09-14 19:53:13 -05:00
Ahmed Zetao Yang
7a8853def7 fix: flatpak enhancement 
* add network support
* add device=dri for wayland
* add notification access
* system Tray Icon
 2020-09-14 08:45:00 -05:00
Daniel Napora
7a82c1f271 Polish translation update 2020-09-14 07:56:31 -05:00
Boyuan Yang
74c48975d3 Update zh_CN translation again 
This commit really finishes zh_CN translation for 0.8.0 release.
The translation for .desktop file action is also updated.
 2020-09-13 20:07:25 -05:00