Skip to content
This repository has been archived by the owner on Oct 27, 2020. It is now read-only.

Commit

Permalink
Update version to 0.7.8
Browse files Browse the repository at this point in the history
  • Loading branch information
Yuriy Puchkov committed Aug 18, 2020
1 parent f3b5c1c commit 4e233c6
Show file tree
Hide file tree
Showing 22 changed files with 702 additions and 518 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.7
- VERSION=0.7.8
- RELEASE=1
- ARCH=x86_64
# Dockerfile from https://github.com/flameshotapp/flameshot-docker-images
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -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.7.{build}
version: 0.7.8.{build}
# Major_Version_Number.Minor_Version_Number.Patch_Number.Build_Number

skip_branch_with_pr: true
Expand Down
2 changes: 1 addition & 1 deletion flameshot.pro
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ win32:LIBS += -luser32 -lshell32

LIBS += -Llibeay32 -Lssleay32

BASE_VERSION = 0.7.7
BASE_VERSION = 0.7.8
TAG_VERSION = "$$system(git --git-dir $$PWD/.git rev-parse --short HEAD)"
isEmpty(TAG_VERSION){
DEFINES += APP_VERSION=\\\"$$BASE_VERSION\\\"
Expand Down
75 changes: 43 additions & 32 deletions translations/Internationalization_ca.ts
Original file line number Diff line number Diff line change
Expand Up @@ -327,112 +327,118 @@ Press Space to open the side panel.</source>
<context>
<name>GeneneralConf</name>
<message>
<location filename="../src/config/geneneralconf.cpp" line="140"/>
<location filename="../src/config/geneneralconf.cpp" line="145"/>
<source>Show help message</source>
<translation>Mostra el missatge d&apos;ajuda</translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="144"/>
<location filename="../src/config/geneneralconf.cpp" line="149"/>
<source>Show the help message at the beginning in the capture mode.</source>
<translation>Mostra el missatge d&apos;ajuda en iniciar el mode de captura.</translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="154"/>
<location filename="../src/config/geneneralconf.cpp" line="158"/>
<location filename="../src/config/geneneralconf.cpp" line="159"/>
<location filename="../src/config/geneneralconf.cpp" line="163"/>
<source>Show desktop notifications</source>
<translation>Mostra les notificacions d&apos;escriptori</translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="167"/>
<location filename="../src/config/geneneralconf.cpp" line="172"/>
<source>Show tray icon</source>
<translation>Mostra la icona en la barra de tasques</translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="171"/>
<location filename="../src/config/geneneralconf.cpp" line="176"/>
<source>Show the systemtray icon</source>
<translation>Mostra la icona en la barra de tasques</translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="86"/>
<location filename="../src/config/geneneralconf.cpp" line="192"/>
<location filename="../src/config/geneneralconf.cpp" line="91"/>
<location filename="../src/config/geneneralconf.cpp" line="197"/>
<source>Import</source>
<translation>Importar</translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="93"/>
<location filename="../src/config/geneneralconf.cpp" line="101"/>
<location filename="../src/config/geneneralconf.cpp" line="123"/>
<location filename="../src/config/geneneralconf.cpp" line="98"/>
<location filename="../src/config/geneneralconf.cpp" line="106"/>
<location filename="../src/config/geneneralconf.cpp" line="128"/>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="93"/>
<location filename="../src/config/geneneralconf.cpp" line="98"/>
<source>Unable to read file.</source>
<translation>Impossible llegir el fitxer.</translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="101"/>
<location filename="../src/config/geneneralconf.cpp" line="123"/>
<location filename="../src/config/geneneralconf.cpp" line="106"/>
<location filename="../src/config/geneneralconf.cpp" line="128"/>
<source>Unable to write file.</source>
<translation>Impossible escriure al fitxer.</translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="109"/>
<location filename="../src/config/geneneralconf.cpp" line="114"/>
<source>Save File</source>
<translation>Guardar Arxiu</translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="130"/>
<location filename="../src/config/geneneralconf.cpp" line="135"/>
<source>Confirm Reset</source>
<translation>Confirmar Reset</translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="131"/>
<location filename="../src/config/geneneralconf.cpp" line="136"/>
<source>Are you sure you want to reset the configuration?</source>
<translation>Esteu segur que voleu reiniciar la configuració?</translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="182"/>
<location filename="../src/config/geneneralconf.cpp" line="187"/>
<source>Configuration File</source>
<translation>Fitxer de Configuració</translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="187"/>
<location filename="../src/config/geneneralconf.cpp" line="192"/>
<source>Export</source>
<translation>Exportar</translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="197"/>
<location filename="../src/config/geneneralconf.cpp" line="202"/>
<source>Reset</source>
<translation>Reset</translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="205"/>
<location filename="../src/config/geneneralconf.cpp" line="209"/>
<source>Launch at startup</source>
<translation>Llançament a l&apos;inici</translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="209"/>
<location filename="../src/config/geneneralconf.cpp" line="213"/>
<location filename="../src/config/geneneralconf.cpp" line="225"/>
<source>Launch Flameshot</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="217"/>
<location filename="../src/config/geneneralconf.cpp" line="221"/>
<source>Show welcome message on launch</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="234"/>
<source>Close application after capture</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="221"/>
<location filename="../src/config/geneneralconf.cpp" line="238"/>
<source>Close after taking a screenshot</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="230"/>
<location filename="../src/config/geneneralconf.cpp" line="247"/>
<source>Copy URL after upload</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="233"/>
<location filename="../src/config/geneneralconf.cpp" line="250"/>
<source>Copy URL and close window after upload</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -798,11 +804,11 @@ Press Space to open the side panel.</source>
<translation>S&apos;ha produït un error en anomenar i guardar </translation>
</message>
<message>
<location filename="../src/main.cpp" line="79"/>
<location filename="../src/main.cpp" line="229"/>
<location filename="../src/main.cpp" line="378"/>
<location filename="../src/main.cpp" line="402"/>
<location filename="../src/main.cpp" line="431"/>
<location filename="../src/main.cpp" line="77"/>
<location filename="../src/main.cpp" line="227"/>
<location filename="../src/main.cpp" line="376"/>
<location filename="../src/main.cpp" line="400"/>
<location filename="../src/main.cpp" line="429"/>
<source>Unable to connect via DBus</source>
<translation>No es pot connectar mitjançant DBus</translation>
</message>
Expand All @@ -827,11 +833,16 @@ Press Space to open the side panel.</source>
<translation type="unfinished">L&apos;URL s&apos;ha copiat al porta-retalls.</translation>
</message>
<message>
<location filename="../src/third-party/singleapplication/singleapplication.cpp" line="427"/>
<location filename="../src/third-party/singleapplication/singleapplication.cpp" line="423"/>
<source>Hi, I&apos;m already running!
You can find me in the system tray.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/core/controller.cpp" line="231"/>
<source>Hello, I&apos;m here! Click icon in the tray to take a screenshot or click with a right button to see more options.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RectangleTool</name>
Expand Down
75 changes: 43 additions & 32 deletions translations/Internationalization_de_DE.ts
Original file line number Diff line number Diff line change
Expand Up @@ -330,112 +330,118 @@ Drücke die Leertaste um das Seitenmenü zu öffnen.</translation>
<context>
<name>GeneneralConf</name>
<message>
<location filename="../src/config/geneneralconf.cpp" line="86"/>
<location filename="../src/config/geneneralconf.cpp" line="192"/>
<location filename="../src/config/geneneralconf.cpp" line="91"/>
<location filename="../src/config/geneneralconf.cpp" line="197"/>
<source>Import</source>
<translation>Importieren</translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="93"/>
<location filename="../src/config/geneneralconf.cpp" line="101"/>
<location filename="../src/config/geneneralconf.cpp" line="123"/>
<location filename="../src/config/geneneralconf.cpp" line="98"/>
<location filename="../src/config/geneneralconf.cpp" line="106"/>
<location filename="../src/config/geneneralconf.cpp" line="128"/>
<source>Error</source>
<translation>Fehler</translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="93"/>
<location filename="../src/config/geneneralconf.cpp" line="98"/>
<source>Unable to read file.</source>
<translation>Datei kann nicht gelesen werden.</translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="101"/>
<location filename="../src/config/geneneralconf.cpp" line="123"/>
<location filename="../src/config/geneneralconf.cpp" line="106"/>
<location filename="../src/config/geneneralconf.cpp" line="128"/>
<source>Unable to write file.</source>
<translation>Datei kann nicht geschrieben werden.</translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="109"/>
<location filename="../src/config/geneneralconf.cpp" line="114"/>
<source>Save File</source>
<translation>Datei speichern</translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="130"/>
<location filename="../src/config/geneneralconf.cpp" line="135"/>
<source>Confirm Reset</source>
<translation>Zurücksetzen bestätigen</translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="131"/>
<location filename="../src/config/geneneralconf.cpp" line="136"/>
<source>Are you sure you want to reset the configuration?</source>
<translation>Sind Sie sicher, dass sie die Konfiguration zurücksetzen wollen?</translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="140"/>
<location filename="../src/config/geneneralconf.cpp" line="145"/>
<source>Show help message</source>
<translation>Hilfetext anzeigen</translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="144"/>
<location filename="../src/config/geneneralconf.cpp" line="149"/>
<source>Show the help message at the beginning in the capture mode.</source>
<translation>Hilfetext am Start der Auswahl anzeigen.</translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="154"/>
<location filename="../src/config/geneneralconf.cpp" line="158"/>
<location filename="../src/config/geneneralconf.cpp" line="159"/>
<location filename="../src/config/geneneralconf.cpp" line="163"/>
<source>Show desktop notifications</source>
<translation>Zeige Desktopbenachrichtigungen</translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="167"/>
<location filename="../src/config/geneneralconf.cpp" line="172"/>
<source>Show tray icon</source>
<translation>Zeige Taskleistensymbol</translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="171"/>
<location filename="../src/config/geneneralconf.cpp" line="176"/>
<source>Show the systemtray icon</source>
<translation>Zeigt das Taskleistensymbol</translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="182"/>
<location filename="../src/config/geneneralconf.cpp" line="187"/>
<source>Configuration File</source>
<translation>Konfigurationsdatei</translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="187"/>
<location filename="../src/config/geneneralconf.cpp" line="192"/>
<source>Export</source>
<translation>Exportieren</translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="197"/>
<location filename="../src/config/geneneralconf.cpp" line="202"/>
<source>Reset</source>
<translation>Zurücksetzen</translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="205"/>
<location filename="../src/config/geneneralconf.cpp" line="209"/>
<source>Launch at startup</source>
<translation>Automatisch starten</translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="209"/>
<location filename="../src/config/geneneralconf.cpp" line="213"/>
<location filename="../src/config/geneneralconf.cpp" line="225"/>
<source>Launch Flameshot</source>
<translation>Starte Flameshot</translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="217"/>
<location filename="../src/config/geneneralconf.cpp" line="221"/>
<source>Show welcome message on launch</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="234"/>
<source>Close application after capture</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="221"/>
<location filename="../src/config/geneneralconf.cpp" line="238"/>
<source>Close after taking a screenshot</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="230"/>
<location filename="../src/config/geneneralconf.cpp" line="247"/>
<source>Copy URL after upload</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/config/geneneralconf.cpp" line="233"/>
<location filename="../src/config/geneneralconf.cpp" line="250"/>
<source>Copy URL and close window after upload</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -806,11 +812,11 @@ Drücke die Leertaste um das Seitenmenü zu öffnen.</translation>
<translation>Fehler beim Speichern unter </translation>
</message>
<message>
<location filename="../src/main.cpp" line="79"/>
<location filename="../src/main.cpp" line="229"/>
<location filename="../src/main.cpp" line="378"/>
<location filename="../src/main.cpp" line="402"/>
<location filename="../src/main.cpp" line="431"/>
<location filename="../src/main.cpp" line="77"/>
<location filename="../src/main.cpp" line="227"/>
<location filename="../src/main.cpp" line="376"/>
<location filename="../src/main.cpp" line="400"/>
<location filename="../src/main.cpp" line="429"/>
<source>Unable to connect via DBus</source>
<translation>Kann nicht via DBus verbinden</translation>
</message>
Expand All @@ -830,11 +836,16 @@ Drücke die Leertaste um das Seitenmenü zu öffnen.</translation>
<translation type="unfinished">URL kopiert.</translation>
</message>
<message>
<location filename="../src/third-party/singleapplication/singleapplication.cpp" line="427"/>
<location filename="../src/third-party/singleapplication/singleapplication.cpp" line="423"/>
<source>Hi, I&apos;m already running!
You can find me in the system tray.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/core/controller.cpp" line="231"/>
<source>Hello, I&apos;m here! Click icon in the tray to take a screenshot or click with a right button to see more options.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RectangleTool</name>
Expand Down
Loading

0 comments on commit 4e233c6

Please sign in to comment.