diff --git a/.travis.yml b/.travis.yml index e376e688..cc2cc043 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,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.4 + - VERSION=0.7.5 - RELEASE=1 - ARCH=x86_64 # Dockerfile from https://github.com/flameshotapp/flameshot-docker-images diff --git a/appveyor.yml b/appveyor.yml index 36f8e290..cc1ea021 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.4.{build} +version: 0.7.5.{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 63d8fcef..d02a08c4 100644 --- a/flameshot.pro +++ b/flameshot.pro @@ -6,7 +6,7 @@ win32:LIBS += -luser32 -lshell32 -BASE_VERSION = 0.7.4 +BASE_VERSION = 0.7.5 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 8dc3b634..310200b3 100644 --- a/translations/Internationalization_ca.ts +++ b/translations/Internationalization_ca.ts @@ -435,42 +435,42 @@ Press Space to open the side panel. ImgS3Uploader - + Upload to ImgS3 - + Uploading Image S'està pujant la imatge - + Copy URL Copia l'URL - + Open URL Obri l'URL - + Image to Clipboard. Imatge al porta-retalls. - + Unable to open the URL. No es pot obrir l'URL. - + URL copied to clipboard. L'URL s'ha copiat al porta-retalls. - + Screenshot copied to clipboard. La captura s'ha copiat al porta-retalls. @@ -478,12 +478,12 @@ Press Space to open the side panel. ImgS3UploaderTool - + Image Uploader Puja la imatge - + Upload the selection to S3 bucket @@ -757,7 +757,7 @@ Press Space to open the side panel. - + URL copied to clipboard. L'URL s'ha copiat al porta-retalls. diff --git a/translations/Internationalization_de_DE.ts b/translations/Internationalization_de_DE.ts index f5cdb8ed..b84693d0 100644 --- a/translations/Internationalization_de_DE.ts +++ b/translations/Internationalization_de_DE.ts @@ -438,42 +438,42 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. ImgS3Uploader - + Upload to ImgS3 - + Uploading Image Bild hochladen - + Copy URL URL kopieren - + Open URL URL öffnen - + Image to Clipboard. Bild in Zwischenablage. - + Unable to open the URL. Kann URL nicht öffnen. - + URL copied to clipboard. URL kopiert. - + Screenshot copied to clipboard. Bildschirmaufnahme in Zwischenablage kopiert. @@ -481,12 +481,12 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. ImgS3UploaderTool - + Image Uploader Bild hochladen - + Upload the selection to S3 bucket @@ -760,7 +760,7 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. Kein Schreibzugriff auf - + URL copied to clipboard. URL kopiert. diff --git a/translations/Internationalization_es.ts b/translations/Internationalization_es.ts index a38efd01..dbc5ab14 100644 --- a/translations/Internationalization_es.ts +++ b/translations/Internationalization_es.ts @@ -438,42 +438,42 @@ Presiona Espacio para abrir el panel lateral. ImgS3Uploader - + Upload to ImgS3 - + Uploading Image Subiendo Imagen - + Copy URL Copiar URL - + Open URL Abrir URL - + Image to Clipboard. Imagen al Portapapeles. - + Unable to open the URL. No puede abrir la URL. - + URL copied to clipboard. URL copiada al portapapeles. - + Screenshot copied to clipboard. Captura copiada al portapapeles. @@ -481,12 +481,12 @@ Presiona Espacio para abrir el panel lateral. ImgS3UploaderTool - + Image Uploader Subir Imagen - + Upload the selection to S3 bucket @@ -760,7 +760,7 @@ Presiona Espacio para abrir el panel lateral. Imposible escribir en - + URL copied to clipboard. URL copiada al portapapeles. diff --git a/translations/Internationalization_fr.ts b/translations/Internationalization_fr.ts index 1cac89e6..35718e62 100644 --- a/translations/Internationalization_fr.ts +++ b/translations/Internationalization_fr.ts @@ -438,42 +438,42 @@ Appuyer sur Espace pour ouvrir le panneau latéral. ImgS3Uploader - + Upload to ImgS3 - + Uploading Image Mise en ligne de l'image - + Copy URL Copier l'URL - + Open URL Ouvrir l'URL - + Image to Clipboard. Image dans le Presse-papier. - + Unable to open the URL. Impossible d'ouvrir l'URL. - + URL copied to clipboard. URL copiée dans le Presse-papier. - + Screenshot copied to clipboard. Capture d'écran copiée dans le Presse-papier. @@ -481,12 +481,12 @@ Appuyer sur Espace pour ouvrir le panneau latéral. ImgS3UploaderTool - + Image Uploader Mise en ligne d'images - + Upload the selection to S3 bucket @@ -760,7 +760,7 @@ Appuyer sur Espace pour ouvrir le panneau latéral. Imposible d'écrire par dessus - + URL copied to clipboard. URL copiée dans le Presse-papier. diff --git a/translations/Internationalization_ja.ts b/translations/Internationalization_ja.ts index af1a1d25..7e8f651e 100644 --- a/translations/Internationalization_ja.ts +++ b/translations/Internationalization_ja.ts @@ -438,42 +438,42 @@ Enter を押すと画面をキャプチャー。 ImgS3Uploader - + Upload to ImgS3 - + Uploading Image 画像をアップロード中 - + Copy URL URL をコピー - + Open URL URL を開く - + Image to Clipboard. 画像をクリップボードへ。 - + Unable to open the URL. URL を開けません。 - + URL copied to clipboard. URL をクリップボードにコピーしました。 - + Screenshot copied to clipboard. スクリーンショットをクリップボードにコピーしました。 @@ -481,12 +481,12 @@ Enter を押すと画面をキャプチャー。 ImgS3UploaderTool - + Image Uploader 画像アップローダー - + Upload the selection to S3 bucket @@ -760,7 +760,7 @@ Enter を押すと画面をキャプチャー。 書き込めません: - + URL copied to clipboard. URL をクリップボードにコピーしました。 diff --git a/translations/Internationalization_ka.ts b/translations/Internationalization_ka.ts index 12cbe9d6..fcdd73ed 100644 --- a/translations/Internationalization_ka.ts +++ b/translations/Internationalization_ka.ts @@ -434,42 +434,42 @@ Press Space to open the side panel. ImgS3Uploader - + Upload to ImgS3 - + Uploading Image სურათის ატვირთვა - + Copy URL URL-ის კოპირება - + Open URL URL-ის გახსნა - + Image to Clipboard. სურათის გაცვლის ბუფერში გაგზავნა - + Unable to open the URL. URL-ის გახსნა ვერ მოხერხდა. - + URL copied to clipboard. URL დაკოპირდა გაცვლის ბუფერში. - + Screenshot copied to clipboard. სურათი დაკოპირდა გაცვლის ბუფერში. @@ -477,12 +477,12 @@ Press Space to open the side panel. ImgS3UploaderTool - + Image Uploader სურათის ამტვირთველი - + Upload the selection to S3 bucket @@ -756,7 +756,7 @@ Press Space to open the side panel. შემდეგ მისამართზე ჩაწერა ვერ მოხერხდა: - + URL copied to clipboard. URL დაკოპირდა გაცვლის ბუფერში. diff --git a/translations/Internationalization_nl.ts b/translations/Internationalization_nl.ts index a72c62ad..c9d09797 100644 --- a/translations/Internationalization_nl.ts +++ b/translations/Internationalization_nl.ts @@ -438,42 +438,42 @@ Druk op spatie om het zijpaneel te openen. ImgS3Uploader - + Upload to ImgS3 - + Uploading Image Bezig met uploaden van afbeelding... - + Copy URL URL kopiëren - + Open URL URL openen - + Image to Clipboard. Afbeelding naar klembord. - + Unable to open the URL. Kan URL niet openen. - + URL copied to clipboard. URL gekopieerd naar klembord. - + Screenshot copied to clipboard. Schermafdruk gekopieerd naar klembord. @@ -481,12 +481,12 @@ Druk op spatie om het zijpaneel te openen. ImgS3UploaderTool - + Image Uploader Afbeeldingsuploader - + Upload the selection to S3 bucket @@ -760,7 +760,7 @@ Druk op spatie om het zijpaneel te openen. Kan niet wegschrijven naar - + URL copied to clipboard. URL gekopieerd naar klembord. diff --git a/translations/Internationalization_pl.ts b/translations/Internationalization_pl.ts index 62fbf16b..c7bea720 100644 --- a/translations/Internationalization_pl.ts +++ b/translations/Internationalization_pl.ts @@ -437,42 +437,42 @@ Spacja, aby pokazać panel boczny. ImgS3Uploader - + Upload to ImgS3 - + Uploading Image Wysyłanie obrazka - + Copy URL Kopiuj URL - + Open URL Otwórz URL - + Image to Clipboard. Obrazek do schowka. - + Unable to open the URL. Nie można otworzyć adresu URL. - + URL copied to clipboard. URL skopiowany do schowka. - + Screenshot copied to clipboard. Zrzut ekranu skopiowany do schowka. @@ -480,12 +480,12 @@ Spacja, aby pokazać panel boczny. ImgS3UploaderTool - + Image Uploader Uploader obrazów - + Upload the selection to S3 bucket @@ -759,7 +759,7 @@ Spacja, aby pokazać panel boczny. Nie można zapisać w - + URL copied to clipboard. URL skopiowany do schowka. diff --git a/translations/Internationalization_pt_br.ts b/translations/Internationalization_pt_br.ts index 2d7c308f..fad4e75c 100644 --- a/translations/Internationalization_pt_br.ts +++ b/translations/Internationalization_pt_br.ts @@ -438,42 +438,42 @@ Pressione espaço abrir o painel lateral. ImgS3Uploader - + Upload to ImgS3 - + Uploading Image Upando Imagem - + Copy URL Copiar URL - + Open URL Abrir URL - + Image to Clipboard. Imagem no Clipboard. - + Unable to open the URL. Não foi possível abrir a URL. - + URL copied to clipboard. URL copiada para o clipboard. - + Screenshot copied to clipboard. Screenshot copiada para o clipboard. @@ -481,12 +481,12 @@ Pressione espaço abrir o painel lateral. ImgS3UploaderTool - + Image Uploader Uploader de imagens - + Upload the selection to S3 bucket @@ -760,7 +760,7 @@ Pressione espaço abrir o painel lateral. Não foi possível escrever em - + URL copied to clipboard. URL copiada para o clipboard. diff --git a/translations/Internationalization_ru.ts b/translations/Internationalization_ru.ts index e9a502b4..e9d67f60 100644 --- a/translations/Internationalization_ru.ts +++ b/translations/Internationalization_ru.ts @@ -438,22 +438,22 @@ Press Space to open the side panel. ImgS3Uploader - + Upload to ImgS3 Загрузить на S3 - + Uploading Image Загрузка изображения - + Copy URL Скопировать URL - + Open URL Открыть URL @@ -462,22 +462,22 @@ Press Space to open the side panel. Удалить изображение - + Image to Clipboard. Изображение в буфер обмена. - + Unable to open the URL. Не удалось открыть URL. - + URL copied to clipboard. URL скопирован в буфер обмена. - + Screenshot copied to clipboard. Снимок скопирован в буфер обмена. @@ -485,12 +485,12 @@ Press Space to open the side panel. ImgS3UploaderTool - + Image Uploader Отправка изображений - + Upload the selection to S3 bucket Загрузить выделение на S3 @@ -768,7 +768,7 @@ Press Space to open the side panel. Не удалось сохранить - + URL copied to clipboard. URL скопирован в буфер обмена. diff --git a/translations/Internationalization_sk.ts b/translations/Internationalization_sk.ts index f2b92bcf..c7b74642 100644 --- a/translations/Internationalization_sk.ts +++ b/translations/Internationalization_sk.ts @@ -438,42 +438,42 @@ Stlačte medzerník pre otvorenie postranného panelu. ImgS3Uploader - + Upload to ImgS3 - + Uploading Image Nahrávam obrázok - + Copy URL Kopírovať URL - + Open URL Otvoriť URL - + Image to Clipboard. Obrázok do schránky. - + Unable to open the URL. Nepodarilo sa otvoriť URL. - + URL copied to clipboard. URL skopírovaná do schránky. - + Screenshot copied to clipboard. Snímka obrazovky bola skopírovaná do schránky. @@ -481,12 +481,12 @@ Stlačte medzerník pre otvorenie postranného panelu. ImgS3UploaderTool - + Image Uploader Uploader obrázkov - + Upload the selection to S3 bucket @@ -760,7 +760,7 @@ Stlačte medzerník pre otvorenie postranného panelu. Chyba pri ukladaní - + URL copied to clipboard. URL skopírovaná do schránky. diff --git a/translations/Internationalization_sr.ts b/translations/Internationalization_sr.ts index 57ae8deb..aebc19c1 100644 --- a/translations/Internationalization_sr.ts +++ b/translations/Internationalization_sr.ts @@ -438,42 +438,42 @@ Press Space to open the side panel. ImgS3Uploader - + Upload to ImgS3 - + Uploading Image Објављујем слику - + Copy URL Запамти интернет адресу - + Open URL Посети интернет адресу - + Image to Clipboard. Сачувај у привремену меморију. - + Unable to open the URL. Нисам успео да посетим интернет адресу. - + URL copied to clipboard. Интернет адреса је сачувана у привременој меморији. - + Screenshot copied to clipboard. Слика је сачувана у привременој меморији. @@ -481,12 +481,12 @@ Press Space to open the side panel. ImgS3UploaderTool - + Image Uploader Објављивање слике - + Upload the selection to S3 bucket @@ -760,7 +760,7 @@ Press Space to open the side panel. Нисам успео са сачувам - + URL copied to clipboard. Интернет адреса је сачувана у привременој меморији. diff --git a/translations/Internationalization_tr.ts b/translations/Internationalization_tr.ts index a90b219f..2c383089 100644 --- a/translations/Internationalization_tr.ts +++ b/translations/Internationalization_tr.ts @@ -438,42 +438,42 @@ Yan paneli açmak için Boşluk tuşuna basın. ImgS3Uploader - + Upload to ImgS3 - + Uploading Image Resim Yükleniyor - + Copy URL URL Kopyala - + Open URL URL Aç - + Image to Clipboard. Resim Pano'ya. - + Unable to open the URL. URL açılamıyor. - + URL copied to clipboard. URL panoya kopyalandı. - + Screenshot copied to clipboard. Ekran görüntüsü panoya kopyalandı. @@ -481,12 +481,12 @@ Yan paneli açmak için Boşluk tuşuna basın. ImgS3UploaderTool - + Image Uploader Resim Yükleme Aracı - + Upload the selection to S3 bucket @@ -760,7 +760,7 @@ Yan paneli açmak için Boşluk tuşuna basın. Yazma mümkün değil - + URL copied to clipboard. URL panoya kopyalandı. diff --git a/translations/Internationalization_uk.ts b/translations/Internationalization_uk.ts index 021a467b..224a45aa 100644 --- a/translations/Internationalization_uk.ts +++ b/translations/Internationalization_uk.ts @@ -438,22 +438,22 @@ Press Space to open the side panel. ImgS3Uploader - + Upload to ImgS3 Вивантажити на S3 - + Uploading Image Вивантаження зображення - + Copy URL Скопіювати URL - + Open URL Відкрити URL @@ -462,22 +462,22 @@ Press Space to open the side panel. Видалити зображення - + Image to Clipboard. Зображення до буферу обміну. - + Unable to open the URL. Не вдалось відкрити URL. - + URL copied to clipboard. URL скопійовано до буферу обміну. - + Screenshot copied to clipboard. Знімок скопійовано до буферу обміну. @@ -485,12 +485,12 @@ Press Space to open the side panel. ImgS3UploaderTool - + Image Uploader Вивантаження зображень - + Upload the selection to S3 bucket Вивантажити виділення на S3 @@ -768,7 +768,7 @@ Press Space to open the side panel. Не вдалось зберегти - + URL copied to clipboard. URL скопійовано до буферу обміну. diff --git a/translations/Internationalization_zh_CN.ts b/translations/Internationalization_zh_CN.ts index e874f974..404d38e8 100644 --- a/translations/Internationalization_zh_CN.ts +++ b/translations/Internationalization_zh_CN.ts @@ -439,42 +439,42 @@ Press Space to open the side panel. ImgS3Uploader - + Upload to ImgS3 - + Uploading Image 正在上传 - + Copy URL 复制链接 - + Open URL 打开链接 - + Image to Clipboard. 保存文件到剪贴板。 - + Unable to open the URL. 无法打开此链接。 - + URL copied to clipboard. 复制链接到剪贴板。 - + Screenshot copied to clipboard. 截图复制到剪贴板。 @@ -482,12 +482,12 @@ Press Space to open the side panel. ImgS3UploaderTool - + Image Uploader 上传图片 - + Upload the selection to S3 bucket @@ -761,7 +761,7 @@ Press Space to open the side panel. 无法写入 - + URL copied to clipboard. 复制链接到剪贴板。 diff --git a/translations/Internationalization_zh_TW.ts b/translations/Internationalization_zh_TW.ts index 324665c1..14e822a0 100644 --- a/translations/Internationalization_zh_TW.ts +++ b/translations/Internationalization_zh_TW.ts @@ -434,42 +434,42 @@ Press Space to open the side panel. ImgS3Uploader - + Upload to ImgS3 - + Uploading Image 正在上傳 - + Copy URL 複製連結 - + Open URL 打開連結 - + Image to Clipboard. 將檔案複製到剪貼簿 - + Unable to open the URL. 無法打開此連結 - + URL copied to clipboard. 連結已複製到剪貼簿 - + Screenshot copied to clipboard. 截圖已複製到剪貼簿 @@ -477,12 +477,12 @@ Press Space to open the side panel. ImgS3UploaderTool - + Image Uploader 上傳圖片 - + Upload the selection to S3 bucket @@ -756,7 +756,7 @@ Press Space to open the side panel. 無法寫入 - + URL copied to clipboard. 連結已複製到剪貼簿 diff --git a/update_release_version.sh b/update_release_version.sh index 8144c249..0ed345c8 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.4" +BASE_VERSION_NEW="0.7.5" 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 696eefa1..dc4c272e 100644 --- a/win_setup/flameshot.iss +++ b/win_setup/flameshot.iss @@ -6,9 +6,9 @@ [Setup] AppName=Flameshot -AppVersion=0.7.4-9b1372a +AppVersion=0.7.5-57b5773 AppCopyright=NameCheap inc. -VersionInfoVersion=0.7.4 +VersionInfoVersion=0.7.5 WizardStyle=modern DefaultDirName={autopf}\Flameshot DefaultGroupName=Flameshot