diff --git a/.github/workflows/Linux-pack.yml b/.github/workflows/Linux-pack.yml
index 8e524118..8734eb9f 100644
--- a/.github/workflows/Linux-pack.yml
+++ b/.github/workflows/Linux-pack.yml
@@ -23,7 +23,7 @@ env:
# docker images, see https://hub.docker.com/r/vitzy/flameshot
# vitzy/flameshot or packpack/packpack
DOCKER_REPO: vitzy/flameshot
- # upload services: 0x0.st, file.io, transfer.sh, wetransfer.com
+ # upload services: wetransfer.com, file.io, 0x0.st
UPLOAD_SERVICE: wetransfer.com
jobs:
@@ -67,7 +67,7 @@ jobs:
echo ${last_committed_tag:1}
echo "Details: ${last_committed_tag}+git${git_revno}.${git_hash}"
echo "================================"
- echo ::set-env name=VERSION::$(echo ${last_committed_tag:1})
+ echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV
- name: Get packpack tool
uses: actions/checkout@v2
with:
@@ -132,7 +132,7 @@ jobs:
echo ${last_committed_tag:1}
echo "Details: ${last_committed_tag}+git${git_revno}.${git_hash}"
echo "================================"
- echo ::set-env name=VERSION::$(echo ${last_committed_tag:1})
+ echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV
- name: Install dependencies
run: |
apt-get -y -qq update
@@ -234,7 +234,7 @@ jobs:
echo ${last_committed_tag:1}
echo "Details: ${last_committed_tag}+git${git_revno}.${git_hash}"
echo "================================"
- echo ::set-env name=VERSION::$(echo ${last_committed_tag:1})
+ echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV
- name: Get packpack tool
uses: actions/checkout@v2
with:
@@ -327,7 +327,7 @@ jobs:
echo ${last_committed_tag:1}
echo "Details: ${last_committed_tag}+git${git_revno}.${git_hash}"
echo "================================"
- echo ::set-env name=VERSION::$(echo ${last_committed_tag:1})
+ echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV
- name: Install Dependencies
run: |
sudo apt-get -y -qq update
@@ -427,7 +427,7 @@ jobs:
echo ${last_committed_tag:1}
echo "Details: ${last_committed_tag}+git${git_revno}.${git_hash}"
echo "================================"
- echo ::set-env name=VERSION::$(echo ${last_committed_tag:1})
+ echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV
- name: Setup flatpak
run: |
sudo apt-get -y -qq update
@@ -493,8 +493,7 @@ jobs:
echo ${last_committed_tag:1}
echo "Details: ${last_committed_tag}+git${git_revno}.${git_hash}"
echo "================================"
- echo ::set-env name=VERSION::$(echo ${last_committed_tag:1})
-
+ echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV
- name: Packaging snap
uses: snapcore/action-build@v1
id: snapcraft
diff --git a/.github/workflows/Windows-pack.yml b/.github/workflows/Windows-pack.yml
index 19970892..aaaead8d 100644
--- a/.github/workflows/Windows-pack.yml
+++ b/.github/workflows/Windows-pack.yml
@@ -78,7 +78,7 @@ jobs:
echo ${last_committed_tag:1}
echo "Details: ${last_committed_tag}+git${git_revno}.${git_hash}"
echo "================================"
- echo ::set-env name=VERSION::$(echo ${last_committed_tag:1})
+ echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV
- name: Restore from cache and run vcpkg
uses: lukka/run-vcpkg@v4
diff --git a/README.md b/README.md
index 4cca1d4a..8bbbbea4 100644
--- a/README.md
+++ b/README.md
@@ -30,8 +30,11 @@
- 
-
+
+
+
+ 
+
diff --git a/data/translations/Internationalization_zh_HK.ts b/data/translations/Internationalization_zh_HK.ts
new file mode 100644
index 00000000..a1d38922
--- /dev/null
+++ b/data/translations/Internationalization_zh_HK.ts
@@ -0,0 +1,1244 @@
+
+
+
+
+ AppLauncher
+
+
+ App Launcher
+ 應用程式啟動器
+
+
+
+ Choose an app to open the capture
+ 選擇一個程式打開此截圖
+
+
+
+ AppLauncherWidget
+
+
+ Open With
+ 打開方式
+
+
+
+ Launch in terminal
+ 從終端啟動
+
+
+
+ Keep open after selection
+ 選擇後保持開啟
+
+
+
+
+ Error
+ 錯誤
+
+
+
+ Unable to launch in terminal.
+ 無法從終端啟動。
+
+
+
+ Unable to write in
+ 無法寫入
+
+
+
+ ArrowTool
+
+
+ Arrow
+ 指針
+
+
+
+ Set the Arrow as the paint tool
+ 選取指針作為繪製工具
+
+
+
+ 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.
+Use the Mouse Wheel to change the thickness of your tool.
+Press Space to open the side panel.
+ 使用鼠標選擇一片區域，或按Esc退出。
+按Enter以捕獲屏幕。
+點擊右鍵顯示拾色器。
+使用鼠標滾輪以較工具寬度。
+按Space以打開側方面板。
+
+
+
+ Tool Settings
+ 工具選項
+
+
+
+ CircleCountTool
+
+
+ Circle Counter
+ 環狀計數器
+
+
+
+ Add an autoincrementing counter bubble
+ 添加自增計數器
+
+
+
+ CircleTool
+
+
+ Circle
+ 環形
+
+
+
+ Set the Circle as the paint tool
+ 選取環形作為繪畫工具
+
+
+
+ ConfigWindow
+
+
+ Configuration
+ 設定
+
+
+
+ Interface
+ 接口
+
+
+
+ Filename Editor
+ 文檔名稱編輯器
+
+
+
+ General
+ 一般
+
+
+
+ Controller
+
+
+ &Take Screenshot
+ &捕獲截圖
+
+
+
+ &Open Launcher
+ &開啓啓動器
+
+
+
+ &Configuration
+ &設定
+
+
+
+ &About
+ &關於
+
+
+ &Information
+ &資訊
+
+
+
+ &Quit
+ &結束
+
+
+
+ CopyTool
+
+
+ Copy
+ 複製
+
+
+
+ Copy the selection into the clipboard
+ 複製選項到剪貼板
+
+
+
+ DBusUtils
+
+
+ Unable to connect via DBus
+ 無法通過 DBus 連接
+
+
+
+ ExitTool
+
+
+ Exit
+ 離開
+
+
+
+ Leave the capture screen
+ 離開螢幕擷取
+
+
+
+ FileNameEditor
+
+
+ Edit the name of your captures:
+ 編輯您的截圖名稱:
+
+
+
+ Edit:
+ 編輯器:
+
+
+
+ Preview:
+ 預覽:
+
+
+
+ Save
+ 存檔
+
+
+
+ Saves the pattern
+ 儲存樣式
+
+
+
+ Reset
+ 重設
+
+
+
+ Restores the saved pattern
+ 恢復儲存的樣式
+
+
+
+ Clear
+ 清除
+
+
+
+ Deletes the name
+ 刪除這個名稱
+
+
+
+ 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?
+ 你確定想要重設？
+
+
+
+ Show the side panel button
+ 顯示側邊欄按鈕
+
+
+
+ Show the side panel toggle button in the capture mode.
+ 在截圖模式下顯示側邊欄切換按鈕。
+
+
+
+ Configuration File
+ 設定文檔
+
+
+
+ Export
+ 導出
+
+
+
+ Reset
+ 重設
+
+
+
+ Launch at startup
+ 自動啟動
+
+
+
+ Launch Flameshot
+ 啓動Flameshot
+
+
+
+ Close after capture
+ 捕獲截圖后關閉
+
+
+
+ Close after taking a screenshot
+ 進行截屏后關閉
+
+
+
+ Copy URL after upload
+ 上載后複製URL
+
+
+
+ Copy URL and close window after upload
+ 上載后複製URL並關閉窗口
+
+
+
+ Save image after copy
+ 複製後保存圖像
+
+
+
+ Save image file after copying it
+ 複製圖像檔案后保存
+
+
+
+ Save Path
+ 保存路徑
+
+
+
+ Change...
+ 變更...
+
+
+
+ Choose a Folder
+ 選取檔案集
+
+
+
+ Unable to write to directory.
+ 無法寫入目錄。
+
+
+
+ ImgurUploader
+
+
+ Upload to Imgur
+ 上傳到 Imgur
+
+
+
+ Uploading Image
+ 正在上傳
+
+
+
+ Copy URL
+ 複製連結
+
+
+
+ Open URL
+ 打開連結
+
+
+
+ Delete image
+ 刪除圖像
+
+
+
+ Image to Clipboard.
+ 將檔案複製到剪貼簿。
+
+
+
+
+ Unable to open the URL.
+ 無法打開該URL。
+
+
+
+ URL copied to clipboard.
+ URL已複製到剪貼板。
+
+
+
+ Screenshot copied to clipboard.
+ 截圖已複製到剪貼板。
+
+
+
+ ImgurUploaderTool
+
+
+ Image Uploader
+ 上傳圖片
+
+
+
+ Upload the selection to Imgur
+ 上載到 Imgur
+
+
+
+ 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.
+ 螢幕捕獲模式中的可用快捷鍵。
+
+
+
+ LineTool
+
+
+ Line
+ 直綫
+
+
+
+ Set the Line as the paint tool
+ 將直綫設定為繪畫工具
+
+
+
+ MarkerTool
+
+
+ Marker
+ 標記
+
+
+
+ Set the Marker as the paint tool
+ 將標記設定為繪畫工具
+
+
+
+ MoveTool
+
+
+ Move
+ 移動
+
+
+
+ Move the selection area
+ 移動選擇區域
+
+
+
+ PencilTool
+
+
+ Pencil
+ 鉛筆
+
+
+
+ Set the Pencil as the paint tool
+ 將鉛筆設定為繪畫工具
+
+
+
+ PinTool
+
+
+ Pin Tool
+ 固定工具
+
+
+
+ Pin image on the desktop
+ 將圖像固定到桌面
+
+
+
+ PixelateTool
+
+
+ Pixelate
+ 馬賽克工具
+
+
+
+ Set Pixelate as the paint tool
+ 將馬賽克工具設定為繪畫工具
+
+
+
+ QObject
+
+
+ Save Error
+ 存檔錯誤
+
+
+
+
+ Capture saved as
+ 截圖已另存為
+
+
+
+ Capture saved to clipboard.
+ 熒幕捕獲已存儲到剪貼板。
+
+
+
+ Capture saved to clipboard
+ 螢幕捕獲已存儲到剪貼板
+
+
+
+
+ Error trying to save as
+ 嘗試另存新檔時發生錯誤
+
+
+
+
+
+
+
+ Unable to connect via DBus
+ 無法透過 DBus 進行連接
+
+
+
+ Powerful yet simple to use screenshot software.
+
+
+
+
+ See
+
+
+
+
+ Capture the entire desktop.
+ 捕獲整個桌面。
+
+
+
+ Open the capture launcher.
+ 開啓捕獲啓動器。
+
+
+
+ Start a manual capture in GUI mode.
+ 在GUi模式下開啓手動捕獲。
+
+
+
+ Configure
+ Configure
+
+
+
+ Capture a single screen.
+ 捕獲單一熒幕。
+
+
+
+ Path where the capture will be saved
+
+
+
+
+ Save the capture to the clipboard
+
+
+
+
+ Delay time in milliseconds
+
+
+
+
+ Set the filename pattern
+
+
+
+
+ Enable or disable the trayicon
+
+
+
+
+ Enable or disable run at startup
+
+
+
+
+ Show the help message in the capture mode
+
+
+
+
+ Define the main UI color
+
+
+
+
+ Define the contrast UI color
+
+
+
+
+ Print raw PNG capture
+
+
+
+
+ Define the screen to capture
+
+
+
+
+ default: screen containing the cursor
+
+
+
+
+ Screen number
+
+
+
+
+ Invalid color, this flag supports the following formats:
+- #RGB (each of R, G, and B is a single hex digit)
+- #RRGGBB
+- #RRRGGGBBB
+- #RRRRGGGGBBBB
+- Named colors like 'blue' or 'red'
+You may need to escape the '#' sign as in '\#FFF'
+
+
+
+
+ Invalid delay, it must be higher than 0
+
+
+
+
+ Invalid screen number, it must be non negative
+
+
+
+
+ Invalid path, it must be a real path in the system
+
+
+
+
+ Invalid value, it must be defined as 'true' or 'false'
+
+
+
+
+ Error
+ 錯誤
+
+
+
+ Unable to write in
+ 無法寫入
+
+
+
+ URL copied to clipboard.
+ 連結已複製到剪貼板。
+
+
+
+ Options
+ 選項
+
+
+
+ Arguments
+
+
+
+
+ arguments
+
+
+
+
+ Usage
+ 使用
+
+
+
+ options
+ 選項
+
+
+
+ Per default runs Flameshot in the background and adds a tray icon for configuration.
+
+
+
+
+ RectangleTool
+
+
+ Rectangle
+ 矩形
+
+
+
+ Set the Rectangle as the paint tool
+ 將矩形設定為繪畫工具
+
+
+
+ RedoTool
+
+
+ Redo
+ 重做
+
+
+
+ Redo the next modification
+ 重做下一次修改
+
+
+
+ SaveTool
+
+
+ Save
+ 儲存
+
+
+
+ Save the capture
+ 儲存螢幕捕獲
+
+
+
+ ScreenGrabber
+
+
+ Unable to capture screen
+ 無法捕獲螢幕
+
+
+
+ SelectionTool
+
+
+ Rectangular Selection
+ 矩形選擇
+
+
+
+ Set Selection as the paint tool
+ 將矩形選擇設定為繪畫工具
+
+
+
+ SidePanelWidget
+
+
+ Active thickness:
+ 動態寬度：
+
+
+
+ Active color:
+ 動態顔色：
+
+
+
+ Press ESC to cancel
+ 按ESC以取消
+
+
+
+ Grab Color
+ 選取顔色
+
+
+
+ SizeIndicatorTool
+
+
+ Selection Size Indicator
+ 選擇尺寸指示
+
+
+
+ Show the dimensions of the selection (X Y)
+ 顯示選擇的尺寸 (X Y)
+
+
+
+ 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)
+ 星期(mon)
+
+
+
+ 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)
+ 時間(%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)
+
+
+
+ SystemNotification
+
+
+ Flameshot Info
+ Flameshot相關資訊
+
+
+
+ TextConfig
+
+
+ StrikeOut
+ 劃去
+
+
+
+ Underline
+ 下劃綫
+
+
+
+ Bold
+ 加粗
+
+
+
+ Italic
+ 斜體
+
+
+
+ TextTool
+
+
+ Text
+ 文本工具
+
+
+
+ Add text to your capture
+ 往您捕獲的截圖中添加文本
+
+
+
+ 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.
+ 點選按鈕設定對比色。
+
+
+
+ UndoTool
+
+
+ Undo
+ 撤銷
+
+
+
+ Undo the last modification
+ 撤銷上次修改
+
+
+
+ UtilityPanel
+
+
+ Close
+ 關閉
+
+
+
+ VisualsEditor
+
+
+ Opacity of area outside selection:
+ 選取區域以外的不透明度：
+
+
+
+ Button Selection
+ 按鈕選取
+
+
+
+ Select All
+ 全選
+
+
+
diff --git a/docs/Releasing.md b/docs/Releasing.md
index e46c4c7c..30787c62 100644
--- a/docs/Releasing.md
+++ b/docs/Releasing.md
@@ -12,6 +12,9 @@ These are the steps for actually making the release
- [ ] Create sha256 for each binary and compare against sha256 shown in the CI to verify there was no corruption or inserted malware.
- [ ] Create a new "New Release" in githhub and explain changes in release notes
- [ ] Upload all binaries and sha's
+- [ ] Update flatpak manifest for flathub: https://github.com/flathub/org.flameshot.Flameshot
+- [ ] Push snapcraft edge release to stable
+- [ ] If this is a major release coordinate with sign path on signed windows binaries
- [ ] Update change log on [website](https://github.com/flameshot-org/flameshot-org.github.io/) data/changelog.md
- [ ] Update version on [website](https://github.com/flameshot-org/flameshot-org.github.io/blob/master/_coverpage.md)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6732b8c7..eb37bcaa 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -52,6 +52,7 @@ set(FLAMESHOT_TS_FILES
${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_HK.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_zh_TW.ts)
if(GENERATE_TS)