diff --git a/.travis.yml b/.travis.yml index 55b2ec72..e1f854d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ env: # Environment variables for packaging - PRODUCT=flameshot #TODO: we should take version from the last tag in git history + build number - - VERSION=0.7.9 + - VERSION=0.7.10 - RELEASE=1 - ARCH=x86_64 # Dockerfile from https://github.com/flameshotapp/flameshot-docker-images diff --git a/appveyor.yml b/appveyor.yml index ad6142cb..5fa104ee 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,7 @@ image: Visual Studio 2015 #TODO: we should take version from the last tag in git history + build number -version: 0.7.9.{build} +version: 0.7.10.{build} # Major_Version_Number.Minor_Version_Number.Patch_Number.Build_Number skip_branch_with_pr: true diff --git a/flameshot.pro b/flameshot.pro index 84930ff6..0c525b7c 100644 --- a/flameshot.pro +++ b/flameshot.pro @@ -8,7 +8,7 @@ win32:LIBS += -luser32 -lshell32 LIBS += -Llibeay32 -Lssleay32 -BASE_VERSION = 0.7.9 +BASE_VERSION = 0.7.10 TAG_VERSION = "$$system(git --git-dir $$PWD/.git rev-parse --short HEAD)" isEmpty(TAG_VERSION){ DEFINES += APP_VERSION=\\\"$$BASE_VERSION\\\" diff --git a/translations/Internationalization_ca.ts b/translations/Internationalization_ca.ts index 503f9d3a..be90ee0d 100644 --- a/translations/Internationalization_ca.ts +++ b/translations/Internationalization_ca.ts @@ -818,24 +818,29 @@ 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 - + + Save screenshot + + + + Capture saved and copied to the clipboard as @@ -859,7 +864,7 @@ Press Space to open the side panel. No es pot escriure a - + Capture saved to clipboard diff --git a/translations/Internationalization_de_DE.ts b/translations/Internationalization_de_DE.ts index d4c34b2e..aa402869 100644 --- a/translations/Internationalization_de_DE.ts +++ b/translations/Internationalization_de_DE.ts @@ -821,29 +821,34 @@ 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 - + + Save screenshot + + + + Capture saved and copied to the clipboard as diff --git a/translations/Internationalization_es.ts b/translations/Internationalization_es.ts index 811669a2..35f0e7a6 100644 --- a/translations/Internationalization_es.ts +++ b/translations/Internationalization_es.ts @@ -821,29 +821,34 @@ 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 - + + Save screenshot + + + + Capture saved and copied to the clipboard as diff --git a/translations/Internationalization_fr.ts b/translations/Internationalization_fr.ts index 40c624e7..8982529b 100644 --- a/translations/Internationalization_fr.ts +++ b/translations/Internationalization_fr.ts @@ -821,29 +821,34 @@ 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 - + + Save screenshot + + + + Capture saved and copied to the clipboard as diff --git a/translations/Internationalization_hu.ts b/translations/Internationalization_hu.ts index b2daa6c3..b2fbe717 100644 --- a/translations/Internationalization_hu.ts +++ b/translations/Internationalization_hu.ts @@ -735,6 +735,10 @@ You can find me in the system tray. Capture saved and copied to the clipboard as + + Save screenshot + + RectangleTool diff --git a/translations/Internationalization_ja.ts b/translations/Internationalization_ja.ts index 5c8408dc..c1c28838 100644 --- a/translations/Internationalization_ja.ts +++ b/translations/Internationalization_ja.ts @@ -821,29 +821,34 @@ Enter を押すと画面をキャプチャー。 QObject - + Save Error 保存エラー - - + + Capture saved as キャプチャーを保存しました: - + Capture saved to clipboard キャプチャーをクリップボードに保存しました - - + + Error trying to save as 保存時にエラーが発生しました: - + + Save screenshot + + + + Capture saved and copied to the clipboard as diff --git a/translations/Internationalization_ka.ts b/translations/Internationalization_ka.ts index abf02694..3b11f61e 100644 --- a/translations/Internationalization_ka.ts +++ b/translations/Internationalization_ka.ts @@ -817,29 +817,34 @@ Press Space to open the side panel. QObject - + Save Error შეცდომა შენახვისას - - + + Capture saved as სურათი შენახულია როგორც: - + Capture saved to clipboard - - + + Error trying to save as შეცდომა მცდელობისას შენახულიყო როგორც: - + + Save screenshot + + + + Capture saved and copied to the clipboard as diff --git a/translations/Internationalization_nl.ts b/translations/Internationalization_nl.ts index 52532b3c..93afd16b 100644 --- a/translations/Internationalization_nl.ts +++ b/translations/Internationalization_nl.ts @@ -821,29 +821,34 @@ 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 - + + Save screenshot + + + + Capture saved and copied to the clipboard as diff --git a/translations/Internationalization_pl.ts b/translations/Internationalization_pl.ts index 6f17affb..dbb18796 100644 --- a/translations/Internationalization_pl.ts +++ b/translations/Internationalization_pl.ts @@ -820,29 +820,34 @@ 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 - + + Save screenshot + + + + Capture saved and copied to the clipboard as diff --git a/translations/Internationalization_pt_br.ts b/translations/Internationalization_pt_br.ts index eb32f7bc..fe86b7dd 100644 --- a/translations/Internationalization_pt_br.ts +++ b/translations/Internationalization_pt_br.ts @@ -821,29 +821,34 @@ 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 - + + Save screenshot + + + + Capture saved and copied to the clipboard as diff --git a/translations/Internationalization_ru.ts b/translations/Internationalization_ru.ts index 50f5b4ee..02613f0e 100644 --- a/translations/Internationalization_ru.ts +++ b/translations/Internationalization_ru.ts @@ -849,29 +849,34 @@ Press Space to open the side panel. QObject - + Save Error Ошибка сохранения - - + + Capture saved as Снимок сохранён как - + Capture saved to clipboard Снимок сохранён в буфер обмена - - + + Error trying to save as Ошибка при попытке сохранить как - + + Save screenshot + + + + Capture saved and copied to the clipboard as Файл сохранен и путь к нему скопирован как diff --git a/translations/Internationalization_sk.ts b/translations/Internationalization_sk.ts index 98070e3a..5a2aa4fe 100644 --- a/translations/Internationalization_sk.ts +++ b/translations/Internationalization_sk.ts @@ -840,29 +840,34 @@ Stlačte medzerník pre otvorenie postranného panelu. 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 screenshot + + + + Capture saved and copied to the clipboard as - + Save Error Chyba pri ukladaní diff --git a/translations/Internationalization_sr.ts b/translations/Internationalization_sr.ts index 53c4f822..37fd02ac 100644 --- a/translations/Internationalization_sr.ts +++ b/translations/Internationalization_sr.ts @@ -821,29 +821,34 @@ Press Space to open the side panel. QObject - + Save Error Грешка приликом упусивања - - + + Capture saved as Сачувај снимак као - + Capture saved to clipboard Снимак је сачуван у привремену меморију - - + + Error trying to save as Грешка приликом уписивања као - + + Save screenshot + + + + Capture saved and copied to the clipboard as diff --git a/translations/Internationalization_tr.ts b/translations/Internationalization_tr.ts index c6836d09..9c1b9a8a 100644 --- a/translations/Internationalization_tr.ts +++ b/translations/Internationalization_tr.ts @@ -821,29 +821,34 @@ 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 - + + Save screenshot + + + + Capture saved and copied to the clipboard as diff --git a/translations/Internationalization_uk.ts b/translations/Internationalization_uk.ts index 9dd07351..9320a67e 100644 --- a/translations/Internationalization_uk.ts +++ b/translations/Internationalization_uk.ts @@ -849,29 +849,34 @@ Press Space to open the side panel. QObject - + Save Error Помилка збереження - - + + Capture saved as Знімок збережено як - + Capture saved to clipboard Знімок збережено до буферу обміну - - + + Error trying to save as Помилка під час збереження як - + + Save screenshot + + + + Capture saved and copied to the clipboard as Файл збережено та шлях до нього скопійовано як diff --git a/translations/Internationalization_zh_CN.ts b/translations/Internationalization_zh_CN.ts index b5e3b8ee..12a98f56 100644 --- a/translations/Internationalization_zh_CN.ts +++ b/translations/Internationalization_zh_CN.ts @@ -822,29 +822,34 @@ Press Space to open the side panel. QObject - + Save Error 保存错误 - - + + Capture saved as 捕获已保存为 - + Capture saved to clipboard 捕获已保存至剪贴板 - - + + Error trying to save as 尝试另存为时出错 - + + Save screenshot + + + + Capture saved and copied to the clipboard as diff --git a/translations/Internationalization_zh_TW.ts b/translations/Internationalization_zh_TW.ts index 30256acb..f699d927 100644 --- a/translations/Internationalization_zh_TW.ts +++ b/translations/Internationalization_zh_TW.ts @@ -817,29 +817,34 @@ Press Space to open the side panel. QObject - + Save Error 存檔錯誤 - - + + Capture saved as 截圖已另存為 - + Capture saved to clipboard - - + + Error trying to save as 嘗試另存新檔時發生錯誤 - + + Save screenshot + + + + Capture saved and copied to the clipboard as diff --git a/update_release_version.sh b/update_release_version.sh index 69246d8d..bfeab2cc 100755 --- a/update_release_version.sh +++ b/update_release_version.sh @@ -3,7 +3,7 @@ set -x GIT_REMOTE=origin -BASE_VERSION_NEW="0.7.9" +BASE_VERSION_NEW="0.7.10" BASE_VERSION_CUR=$(cat flameshot.pro |grep "[0-9]\+\.[0-9]\+\.[0-9]\+" |awk "{print \$3}") if [ "${BASE_VERSION_CUR}" == "${BASE_VERSION_NEW}" ]; then diff --git a/win_setup/flameshot.iss b/win_setup/flameshot.iss index 2a28d129..a1b191f1 100644 --- a/win_setup/flameshot.iss +++ b/win_setup/flameshot.iss @@ -6,9 +6,9 @@ [Setup] AppName=Flameshot -AppVersion=0.7.9-04712ff +AppVersion=0.7.10-18b0f27 AppCopyright=NameCheap inc. -VersionInfoVersion=0.7.9 +VersionInfoVersion=0.7.10 WizardStyle=modern DefaultDirName={autopf}\Flameshot DefaultGroupName=Flameshot