Commit 7b3f8076 authored by Ingemar Ceicer's avatar Ingemar Ceicer

Fixing hashsum

parent 4634a1b7
......@@ -24,6 +24,11 @@
# AppImage
**/.DirIcon
**/AppRun
**/*.AppImage
# Windows portable
win-portable.zip
\ No newline at end of file
win-portable.zip
# Linux executable
**/hashsum-*
/*
hashSum
Copyright (C) 2011-2019 Ingemar Ceicer
Copyright (C) 2011-2020 Ingemar Ceicer
http://ceicer.org/
programmering1 (at) ceicer (dot) org
......
/*
hashSum
Copyright (C) 2011-2019 Ingemar Ceicer
Copyright (C) 2011-2020 Ingemar Ceicer
http://ceicer.org/
programmering1 (at) ceicer (dot) org
......
/*
hashSum
Copyright (C) 2011-2019 Ingemar Ceicer
Copyright (C) 2011-2020 Ingemar Ceicer
http://ceicer.org/
programmering1 (at) ceicer (dot) org
......
/*
Hash
Copyright (C) 2011-2019 Ingemar Ceicer
Copyright (C) 2011-2020 Ingemar Ceicer
http://ceicer.org/
programmering1 (at) ceicer (dot) org
......
/*
hashSum
Copyright (C) 2011-2019 Ingemar Ceicer
Copyright (C) 2011-2020 Ingemar Ceicer
http://ceicer.org/
programmering1 (at) ceicer (dot) org
......
/*
hashSum
Copyright (C) 2011-2019 Ingemar Ceicer
Copyright (C) 2011-2020 Ingemar Ceicer
http://ceicer.org/
programmering1 (at) ceicer (dot) org
......
/*
hashSum
Copyright (C) 2011-2019 Ingemar Ceicer
Copyright (C) 2011-2020 Ingemar Ceicer
http://ceicer.org/
programmering1 (at) ceicer (dot) org
......
/*
hashSum
Copyright (C) 2011-2019 Ingemar Ceicer
Copyright (C) 2011-2020 Ingemar Ceicer
http://ceicer.org/
programmering1 (at) ceicer (dot) org
......
/*
hashSum
Copyright (C) 2011-2019 Ingemar Ceicer
Copyright (C) 2011-2020 Ingemar Ceicer
http://ceicer.org/
programmering1 (at) ceicer (dot) org
......
/*
hashSum
Copyright (C) 2011-2019 Ingemar Ceicer
Copyright (C) 2011-2020 Ingemar Ceicer
http://ceicer.org/
programmering1 (at) ceicer (dot) org
......@@ -40,7 +40,7 @@
#define EXECUTABLE_NAME "hashsum"
#define VERSION "2.3.2"
#define BUILD_DATE_TIME __DATE__ " " __TIME__
#define CURRENT_YEAR "2019"
#define CURRENT_YEAR "2020"
#define LICENCE_VERSION "3"
#define PROGRAMMER_EMAIL "programmering1@ceicer.org"
#define PROGRAMMER_NAME "Ingemar Ceicer"
......
######################################################################
#
# hashSum
# Copyright (C) 2011-2019 Ingemar Ceicer
# Copyright (C) 2011-2020 Ingemar Ceicer
# http://ceicer.org/
# programmering1 (at) ceicer (dot) org
#
......@@ -22,11 +22,8 @@
QT += core gui network
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
<<<<<<< HEAD
CONFIG += c++14
=======
CONFIG += C++14
>>>>>>> b3395d9612385667d63d79c2b401a12cda9cd749
# CONFIG += static
# MSVC
......@@ -48,21 +45,12 @@ TARGET = hashsum-2.3.2
## 32-bit Lubuntu 16.04
# CONFIG += /usr/lib/i386-linux-gnu/qt5/bin/lrelease embed_translations
## 64-bit Lubuntu 16.04
<<<<<<< HEAD
CONFIG += /opt/Qt5.14.0_static/bin/lrelease embed_translations
# CONFIG += /opt/Qt5.13.1/5.13.1/gcc_64/bin/lrelease embed_translations
## Windows
# CONFIG += C:\Qt\Qt5.13.2_static\5.13.2\bin\lrelease embed_translations
# CONFIG += C:\Qt\Qt5.13.2\5.13.2\bin\lrelease embed_translations
# CONFIG += C:\Qt\Qt5.13.2\5.13.2\bin\lrelease embed_translations
=======
# CONFIG += /opt/Qt5.14.0_static/bin/lrelease embed_translations
# CONFIG += /opt/Qt5.13.1/5.13.1/gcc_64/bin/lrelease embed_translations
## Windows
# CONFIG += C:\Qt\Qt5.13.2_static\5.13.2\bin\lrelease embed_translations
## Windows VC++
CONFIG += C:\Qt\Qt5.14.0\5.14.0\msvc2017_64\bin\lrelease embed_translations
>>>>>>> b3395d9612385667d63d79c2b401a12cda9cd749
## 64-bit Lubuntu 14.04
# CONFIG += /opt/Qt5.8.0/5.8/gcc_64/bin\lrelease embed_translations
## Ubuntu 18.04
......
......@@ -436,13 +436,8 @@ Es gab einen Fehler bei der Überprüfung der Version.</translation>
<location filename="../hash.cpp" line="1619"/>
<location filename="../hash.cpp" line="1628"/>
<location filename="../hash.cpp" line="2215"/>
<<<<<<< HEAD:code/i18n/hashSum_de_DE.ts
<location filename="../hash.cpp" line="3633"/>
<location filename="../hash.cpp" line="3640"/>
=======
<location filename="../hash.cpp" line="3645"/>
<location filename="../hash.cpp" line="3652"/>
>>>>>>> b3395d9612385667d63d79c2b401a12cda9cd749:code/i18n/hashSum_de_DE.ts
<location filename="../hash.cpp" line="3648"/>
<location filename="../hash.cpp" line="3655"/>
<source>No hash sum could be calculated</source>
<translation>Es konnte keine Hashsumme berechnet werden</translation>
</message>
......@@ -522,13 +517,8 @@ Es gab einen Fehler bei der Überprüfung der Version.</translation>
<location filename="../hash.cpp" line="2982"/>
<location filename="../hash.cpp" line="2987"/>
<location filename="../hash.cpp" line="3338"/>
<<<<<<< HEAD:code/i18n/hashSum_de_DE.ts
<location filename="../hash.cpp" line="3664"/>
<location filename="../hash.cpp" line="3778"/>
=======
<location filename="../hash.cpp" line="3676"/>
<location filename="../hash.cpp" line="3790"/>
>>>>>>> b3395d9612385667d63d79c2b401a12cda9cd749:code/i18n/hashSum_de_DE.ts
<location filename="../hash.cpp" line="3679"/>
<location filename="../hash.cpp" line="3793"/>
<source>Algorithm: </source>
<translation>Algorithmus: </translation>
</message>
......@@ -712,13 +702,8 @@ Zwei Dateien in diesem Ordner oder eine Datei in diesem Ordner und eine zweite D
<location filename="../hash.cpp" line="2583"/>
<location filename="../hash.cpp" line="2651"/>
<location filename="../hash.cpp" line="3414"/>
<<<<<<< HEAD:code/i18n/hashSum_de_DE.ts
<location filename="../hash.cpp" line="3714"/>
<location filename="../hash.cpp" line="3772"/>
=======
<location filename="../hash.cpp" line="3726"/>
<location filename="../hash.cpp" line="3784"/>
>>>>>>> b3395d9612385667d63d79c2b401a12cda9cd749:code/i18n/hashSum_de_DE.ts
<location filename="../hash.cpp" line="3729"/>
<location filename="../hash.cpp" line="3787"/>
<source>Could not save a file to store hash sums in. Check your file permissions. </source>
<translation type="unfinished"></translation>
</message>
......@@ -992,35 +977,21 @@ Bitte reduzieren Sie die Länge des Textes.</translation>
</translation>
</message>
<message>
<<<<<<< HEAD:code/i18n/hashSum_de_DE.ts
<location filename="../hash.cpp" line="3693"/>
<location filename="../hash.cpp" line="3751"/>
=======
<location filename="../hash.cpp" line="3705"/>
<location filename="../hash.cpp" line="3763"/>
>>>>>>> b3395d9612385667d63d79c2b401a12cda9cd749:code/i18n/hashSum_de_DE.ts
<location filename="../hash.cpp" line="3708"/>
<location filename="../hash.cpp" line="3766"/>
<source>Save the hash summary list as a text file</source>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD:code/i18n/hashSum_de_DE.ts
<location filename="../hash.cpp" line="3693"/>
<location filename="../hash.cpp" line="3751"/>
=======
<location filename="../hash.cpp" line="3705"/>
<location filename="../hash.cpp" line="3763"/>
>>>>>>> b3395d9612385667d63d79c2b401a12cda9cd749:code/i18n/hashSum_de_DE.ts
<location filename="../hash.cpp" line="3708"/>
<location filename="../hash.cpp" line="3766"/>
<source>Any file (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../hash.cpp" line="1650"/>
<location filename="../hash.cpp" line="2175"/>
<<<<<<< HEAD:code/i18n/hashSum_de_DE.ts
<location filename="../hash.cpp" line="3663"/>
=======
<location filename="../hash.cpp" line="3675"/>
>>>>>>> b3395d9612385667d63d79c2b401a12cda9cd749:code/i18n/hashSum_de_DE.ts
<location filename="../hash.cpp" line="3678"/>
<source>Path: </source>
<translation>Pfad: </translation>
</message>
......@@ -1182,29 +1153,17 @@ Bitte reduzieren Sie die Länge des Textes.</translation>
<message>
<location filename="../hash.cpp" line="3540"/>
<location filename="../hash.cpp" line="3542"/>
<<<<<<< HEAD:code/i18n/hashSum_de_DE.ts
<location filename="../hash.cpp" line="3603"/>
=======
<location filename="../hash.cpp" line="3615"/>
>>>>>>> b3395d9612385667d63d79c2b401a12cda9cd749:code/i18n/hashSum_de_DE.ts
<location filename="../hash.cpp" line="3618"/>
<source>Compiled by</source>
<translation>Kompiliert von</translation>
</message>
<message>
<<<<<<< HEAD:code/i18n/hashSum_de_DE.ts
<location filename="../hash.cpp" line="3599"/>
=======
<location filename="../hash.cpp" line="3611"/>
>>>>>>> b3395d9612385667d63d79c2b401a12cda9cd749:code/i18n/hashSum_de_DE.ts
<location filename="../hash.cpp" line="3614"/>
<source>Unknown version</source>
<translation>Unbekannte Version</translation>
</message>
<message>
<<<<<<< HEAD:code/i18n/hashSum_de_DE.ts
<location filename="../hash.cpp" line="3605"/>
=======
<location filename="../hash.cpp" line="3617"/>
>>>>>>> b3395d9612385667d63d79c2b401a12cda9cd749:code/i18n/hashSum_de_DE.ts
<location filename="../hash.cpp" line="3620"/>
<source>Unknown compiler.</source>
<translation>Unbekannter Kompiler.</translation>
</message>
......
......@@ -436,13 +436,8 @@ There was an error when the version was checked.</source>
<location filename="../hash.cpp" line="1619"/>
<location filename="../hash.cpp" line="1628"/>
<location filename="../hash.cpp" line="2215"/>
<<<<<<< HEAD:code/i18n/hashSum_el_GR.ts
<location filename="../hash.cpp" line="3633"/>
<location filename="../hash.cpp" line="3640"/>
=======
<location filename="../hash.cpp" line="3645"/>
<location filename="../hash.cpp" line="3652"/>
>>>>>>> b3395d9612385667d63d79c2b401a12cda9cd749:code/i18n/hashSum_el_GR.ts
<location filename="../hash.cpp" line="3648"/>
<location filename="../hash.cpp" line="3655"/>
<source>No hash sum could be calculated</source>
<translation>Δεν ήταν δυνατός ο υπολογισμός του αθροίσματος ελέγχου</translation>
</message>
......@@ -522,13 +517,8 @@ There was an error when the version was checked.</source>
<location filename="../hash.cpp" line="2982"/>
<location filename="../hash.cpp" line="2987"/>
<location filename="../hash.cpp" line="3338"/>
<<<<<<< HEAD:code/i18n/hashSum_el_GR.ts
<location filename="../hash.cpp" line="3664"/>
<location filename="../hash.cpp" line="3778"/>
=======
<location filename="../hash.cpp" line="3676"/>
<location filename="../hash.cpp" line="3790"/>
>>>>>>> b3395d9612385667d63d79c2b401a12cda9cd749:code/i18n/hashSum_el_GR.ts
<location filename="../hash.cpp" line="3679"/>
<location filename="../hash.cpp" line="3793"/>
<source>Algorithm: </source>
<translation>Αλγόριθμος: </translation>
</message>
......@@ -710,13 +700,8 @@ Two files in this folder or one file in this folder and a second file in another
<location filename="../hash.cpp" line="2583"/>
<location filename="../hash.cpp" line="2651"/>
<location filename="../hash.cpp" line="3414"/>
<<<<<<< HEAD:code/i18n/hashSum_el_GR.ts
<location filename="../hash.cpp" line="3714"/>
<location filename="../hash.cpp" line="3772"/>
=======
<location filename="../hash.cpp" line="3726"/>
<location filename="../hash.cpp" line="3784"/>
>>>>>>> b3395d9612385667d63d79c2b401a12cda9cd749:code/i18n/hashSum_el_GR.ts
<location filename="../hash.cpp" line="3729"/>
<location filename="../hash.cpp" line="3787"/>
<source>Could not save a file to store hash sums in. Check your file permissions. </source>
<translation type="unfinished"></translation>
</message>
......@@ -984,35 +969,21 @@ Please reduce the length of the text.</source>
</translation>
</message>
<message>
<<<<<<< HEAD:code/i18n/hashSum_el_GR.ts
<location filename="../hash.cpp" line="3693"/>
<location filename="../hash.cpp" line="3751"/>
=======
<location filename="../hash.cpp" line="3705"/>
<location filename="../hash.cpp" line="3763"/>
>>>>>>> b3395d9612385667d63d79c2b401a12cda9cd749:code/i18n/hashSum_el_GR.ts
<location filename="../hash.cpp" line="3708"/>
<location filename="../hash.cpp" line="3766"/>
<source>Save the hash summary list as a text file</source>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD:code/i18n/hashSum_el_GR.ts
<location filename="../hash.cpp" line="3693"/>
<location filename="../hash.cpp" line="3751"/>
=======
<location filename="../hash.cpp" line="3705"/>
<location filename="../hash.cpp" line="3763"/>
>>>>>>> b3395d9612385667d63d79c2b401a12cda9cd749:code/i18n/hashSum_el_GR.ts
<location filename="../hash.cpp" line="3708"/>
<location filename="../hash.cpp" line="3766"/>
<source>Any file (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../hash.cpp" line="1650"/>
<location filename="../hash.cpp" line="2175"/>
<<<<<<< HEAD:code/i18n/hashSum_el_GR.ts
<location filename="../hash.cpp" line="3663"/>
=======
<location filename="../hash.cpp" line="3675"/>
>>>>>>> b3395d9612385667d63d79c2b401a12cda9cd749:code/i18n/hashSum_el_GR.ts
<location filename="../hash.cpp" line="3678"/>
<source>Path: </source>
<translation>Διαδρομή: </translation>
</message>
......@@ -1178,29 +1149,17 @@ Please reduce the length of the text.</source>
<message>
<location filename="../hash.cpp" line="3540"/>
<location filename="../hash.cpp" line="3542"/>
<<<<<<< HEAD:code/i18n/hashSum_el_GR.ts
<location filename="../hash.cpp" line="3603"/>
=======
<location filename="../hash.cpp" line="3615"/>
>>>>>>> b3395d9612385667d63d79c2b401a12cda9cd749:code/i18n/hashSum_el_GR.ts
<location filename="../hash.cpp" line="3618"/>
<source>Compiled by</source>
<translation>Μεταγλωττίσθηκε από </translation>
</message>
<message>
<<<<<<< HEAD:code/i18n/hashSum_el_GR.ts
<location filename="../hash.cpp" line="3599"/>
=======
<location filename="../hash.cpp" line="3611"/>
>>>>>>> b3395d9612385667d63d79c2b401a12cda9cd749:code/i18n/hashSum_el_GR.ts
<location filename="../hash.cpp" line="3614"/>
<source>Unknown version</source>
<translation>Άγνωστη έκδοση</translation>
</message>
<message>
<<<<<<< HEAD:code/i18n/hashSum_el_GR.ts
<location filename="../hash.cpp" line="3605"/>
=======
<location filename="../hash.cpp" line="3617"/>
>>>>>>> b3395d9612385667d63d79c2b401a12cda9cd749:code/i18n/hashSum_el_GR.ts
<location filename="../hash.cpp" line="3620"/>
<source>Unknown compiler.</source>
<translation>Άγνωστος μεταγλωττιστής.</translation>
</message>
......
......@@ -462,13 +462,8 @@ Det blev ett fel när versionen kontrollerades.</translation>
<location filename="../hash.cpp" line="2982"/>
<location filename="../hash.cpp" line="2987"/>
<location filename="../hash.cpp" line="3338"/>
<<<<<<< HEAD:code/i18n/hashSum_sv_SE.ts
<location filename="../hash.cpp" line="3664"/>
<location filename="../hash.cpp" line="3778"/>
=======
<location filename="../hash.cpp" line="3676"/>
<location filename="../hash.cpp" line="3790"/>
>>>>>>> b3395d9612385667d63d79c2b401a12cda9cd749:code/i18n/hashSum_sv_SE.ts
<location filename="../hash.cpp" line="3679"/>
<location filename="../hash.cpp" line="3793"/>
<source>Algorithm: </source>
<translation>Algoritm: </translation>
</message>
......@@ -518,13 +513,8 @@ Det blev ett fel när versionen kontrollerades.</translation>
<location filename="../hash.cpp" line="1619"/>
<location filename="../hash.cpp" line="1628"/>
<location filename="../hash.cpp" line="2215"/>
<<<<<<< HEAD:code/i18n/hashSum_sv_SE.ts
<location filename="../hash.cpp" line="3633"/>
<location filename="../hash.cpp" line="3640"/>
=======
<location filename="../hash.cpp" line="3645"/>
<location filename="../hash.cpp" line="3652"/>
>>>>>>> b3395d9612385667d63d79c2b401a12cda9cd749:code/i18n/hashSum_sv_SE.ts
<location filename="../hash.cpp" line="3648"/>
<location filename="../hash.cpp" line="3655"/>
<source>No hash sum could be calculated</source>
<oldsource>No checksum could be calculated</oldsource>
<translation>Ingen hashsumma kunde beräknas</translation>
......@@ -551,11 +541,7 @@ Det blev ett fel när versionen kontrollerades.</translation>
<message>
<location filename="../hash.cpp" line="1650"/>
<location filename="../hash.cpp" line="2175"/>
<<<<<<< HEAD:code/i18n/hashSum_sv_SE.ts
<location filename="../hash.cpp" line="3663"/>
=======
<location filename="../hash.cpp" line="3675"/>
>>>>>>> b3395d9612385667d63d79c2b401a12cda9cd749:code/i18n/hashSum_sv_SE.ts
<location filename="../hash.cpp" line="3678"/>
<source>Path: </source>
<translation>Sökväg: </translation>
</message>
......@@ -894,13 +880,8 @@ Två filer i denna mapp eller en fil i denna mapp och en andra fil i en annan ma
<location filename="../hash.cpp" line="2583"/>
<location filename="../hash.cpp" line="2651"/>
<location filename="../hash.cpp" line="3414"/>
<<<<<<< HEAD:code/i18n/hashSum_sv_SE.ts
<location filename="../hash.cpp" line="3714"/>
<location filename="../hash.cpp" line="3772"/>
=======
<location filename="../hash.cpp" line="3726"/>
<location filename="../hash.cpp" line="3784"/>
>>>>>>> b3395d9612385667d63d79c2b401a12cda9cd749:code/i18n/hashSum_sv_SE.ts
<location filename="../hash.cpp" line="3729"/>
<location filename="../hash.cpp" line="3787"/>
<source>Could not save a file to store hash sums in. Check your file permissions. </source>
<translation>Det gick inte att spara filen för att lagra hash-summor. Kontrollera dina filbehörigheter. </translation>
</message>
......@@ -1155,24 +1136,14 @@ Make sure the file exists and check your file permissions.</source>
<translation>CPU-arkitektur:</translation>
</message>
<message>
<<<<<<< HEAD:code/i18n/hashSum_sv_SE.ts
<location filename="../hash.cpp" line="3693"/>
<location filename="../hash.cpp" line="3751"/>
=======
<location filename="../hash.cpp" line="3705"/>
<location filename="../hash.cpp" line="3763"/>
>>>>>>> b3395d9612385667d63d79c2b401a12cda9cd749:code/i18n/hashSum_sv_SE.ts
<location filename="../hash.cpp" line="3708"/>
<location filename="../hash.cpp" line="3766"/>
<source>Save the hash summary list as a text file</source>
<translation>Spara hashlistan som en textfil</translation>
</message>
<message>
<<<<<<< HEAD:code/i18n/hashSum_sv_SE.ts
<location filename="../hash.cpp" line="3693"/>
<location filename="../hash.cpp" line="3751"/>
=======
<location filename="../hash.cpp" line="3705"/>
<location filename="../hash.cpp" line="3763"/>
>>>>>>> b3395d9612385667d63d79c2b401a12cda9cd749:code/i18n/hashSum_sv_SE.ts
<location filename="../hash.cpp" line="3708"/>
<location filename="../hash.cpp" line="3766"/>
<source>Any file (*)</source>
<translation>Alla filer (*)</translation>
</message>
......@@ -1316,29 +1287,17 @@ Make sure the file exists and check your file permissions.</source>
<message>
<location filename="../hash.cpp" line="3540"/>
<location filename="../hash.cpp" line="3542"/>
<<<<<<< HEAD:code/i18n/hashSum_sv_SE.ts
<location filename="../hash.cpp" line="3603"/>
=======
<location filename="../hash.cpp" line="3615"/>
>>>>>>> b3395d9612385667d63d79c2b401a12cda9cd749:code/i18n/hashSum_sv_SE.ts
<location filename="../hash.cpp" line="3618"/>
<source>Compiled by</source>
<translation>Kompilerad med</translation>
</message>
<message>
<<<<<<< HEAD:code/i18n/hashSum_sv_SE.ts
<location filename="../hash.cpp" line="3599"/>
=======
<location filename="../hash.cpp" line="3611"/>
>>>>>>> b3395d9612385667d63d79c2b401a12cda9cd749:code/i18n/hashSum_sv_SE.ts
<location filename="../hash.cpp" line="3614"/>
<source>Unknown version</source>
<translation>Okänd version</translation>
</message>
<message>
<<<<<<< HEAD:code/i18n/hashSum_sv_SE.ts
<location filename="../hash.cpp" line="3605"/>
=======
<location filename="../hash.cpp" line="3617"/>
>>>>>>> b3395d9612385667d63d79c2b401a12cda9cd749:code/i18n/hashSum_sv_SE.ts
<location filename="../hash.cpp" line="3620"/>
<source>Unknown compiler.</source>
<translation>Okänd kompilatot.</translation>
</message>
......
......@@ -431,13 +431,8 @@ There was an error when the version was checked.</source>
<location filename="../hash.cpp" line="1619"/>
<location filename="../hash.cpp" line="1628"/>
<location filename="../hash.cpp" line="2215"/>
<<<<<<< HEAD:code/i18n/hashSum_xx_XX.ts
<location filename="../hash.cpp" line="3633"/>
<location filename="../hash.cpp" line="3640"/>
=======
<location filename="../hash.cpp" line="3645"/>
<location filename="../hash.cpp" line="3652"/>
>>>>>>> b3395d9612385667d63d79c2b401a12cda9cd749:code/i18n/hashSum_xx_XX.ts
<location filename="../hash.cpp" line="3648"/>
<location filename="../hash.cpp" line="3655"/>
<source>No hash sum could be calculated</source>
<translation type="unfinished"></translation>
</message>
......@@ -517,13 +512,8 @@ There was an error when the version was checked.</source>
<location filename="../hash.cpp" line="2982"/>
<location filename="../hash.cpp" line="2987"/>
<location filename="../hash.cpp" line="3338"/>
<<<<<<< HEAD:code/i18n/hashSum_xx_XX.ts
<location filename="../hash.cpp" line="3664"/>
<location filename="../hash.cpp" line="3778"/>
=======
<location filename="../hash.cpp" line="3676"/>
<location filename="../hash.cpp" line="3790"/>
>>>>>>> b3395d9612385667d63d79c2b401a12cda9cd749:code/i18n/hashSum_xx_XX.ts
<location filename="../hash.cpp" line="3679"/>
<location filename="../hash.cpp" line="3793"/>
<source>Algorithm: </source>
<translation type="unfinished"></translation>
</message>
......@@ -706,13 +696,8 @@ Two files in this folder or one file in this folder and a second file in another
<location filename="../hash.cpp" line="2583"/>
<location filename="../hash.cpp" line="2651"/>
<location filename="../hash.cpp" line="3414"/>
<<<<<<< HEAD:code/i18n/hashSum_xx_XX.ts
<location filename="../hash.cpp" line="3714"/>
<location filename="../hash.cpp" line="3772"/>
=======
<location filename="../hash.cpp" line="3726"/>
<location filename="../hash.cpp" line="3784"/>
>>>>>>> b3395d9612385667d63d79c2b401a12cda9cd749:code/i18n/hashSum_xx_XX.ts
<location filename="../hash.cpp" line="3729"/>
<location filename="../hash.cpp" line="3787"/>
<source>Could not save a file to store hash sums in. Check your file permissions. </source>
<translation type="unfinished"></translation>
</message>
......@@ -978,35 +963,21 @@ Please reduce the length of the text.</source>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD:code/i18n/hashSum_xx_XX.ts
<location filename="../hash.cpp" line="3693"/>