diff --git a/localization/rssguard-cs_CZ.ts b/localization/rssguard-cs_CZ.ts
index 8fdb26338..40a7d272e 100644
--- a/localization/rssguard-cs_CZ.ts
+++ b/localization/rssguard-cs_CZ.ts
@@ -475,7 +475,7 @@ or this functionality is not implemented yet.
<b>%8</b><br><b>Version:</b> %1 (build on %2 with CMake %3)<br><b>Revision:</b> %4<br><b>Build date:</b> %5<br><b>Qt:</b> %6 (compiled against %7)<br>
- <b>%8</b><br><b>Verze:</b> %1 (při sestavování použit OS %2 a CMake %3)<br><b>Revize:</b> %4<br><b>Datum sestavení:</b> %5<br><b>Qt:</b> %6 (při kompilaci %7)<br>
+ <b>%8</b><br><b>Verze:</b> %1 (při sestavování použit OS %2 a CMake %3)<br><b>Revize:</b> %4<br><b>Datum sestavení:</b> %5<br><b>Qt:</b> %6 (při kompilaci %7)<br>About %1
@@ -510,6 +510,10 @@ or this functionality is not implemented yet.
<body>%5 is a (very) tiny feed reader.<br><br>This software is distributed under the terms of GNU General Public License, version 3.<br><br>Contacts:<ul><li><a href="mailto://%1">%1</a> ~e-mail</li><li><a href="%2">%2</a> ~website</li></ul>You can obtain source code for %5 from its website.<br><br><br>Copyright (C) 2011-%3 %4</body><body>%5 je (velmi) lehká čtečka kanálů.<br><br>Tento software je šířen pod podmínkami licence GNU General Public License, verze 3.<br><br>Kontakty:<ul><li><a href="mailto://%1">%1</a> ~e-mail</li><li><a href="%2">%2</a> ~web</li></ul>Zdrojový kód pro %5 lze získat na jeho webu.<br><br><br>Copyright (C) 2011-%3 %4</body>
+
+ <b>%8</b><br><b>Version:</b> %1<br><b>Build date:</b> %2<br><b>Qt:</b> %3 (compiled against %4)<br>
+
+ FormAddAccount
diff --git a/localization/rssguard-da_DK.ts b/localization/rssguard-da_DK.ts
index bfb025f0d..1923f6dec 100644
--- a/localization/rssguard-da_DK.ts
+++ b/localization/rssguard-da_DK.ts
@@ -468,10 +468,6 @@ or this functionality is not implemented yet.
Changelog not found.
-
- <b>%8</b><br><b>Version:</b> %1 (build on %2 with CMake %3)<br><b>Revision:</b> %4<br><b>Build date:</b> %5<br><b>Qt:</b> %6 (compiled against %7)<br>
-
- About %1About RSS Guard dialog title.
@@ -505,6 +501,10 @@ or this functionality is not implemented yet.
<body>%5 is a (very) tiny feed reader.<br><br>This software is distributed under the terms of GNU General Public License, version 3.<br><br>Contacts:<ul><li><a href="mailto://%1">%1</a> ~e-mail</li><li><a href="%2">%2</a> ~website</li></ul>You can obtain source code for %5 from its website.<br><br><br>Copyright (C) 2011-%3 %4</body>
+
+ <b>%8</b><br><b>Version:</b> %1<br><b>Build date:</b> %2<br><b>Qt:</b> %3 (compiled against %4)<br>
+
+ FormAddAccount
diff --git a/localization/rssguard-de_DE.ts b/localization/rssguard-de_DE.ts
index c7af2fb33..3bb44bbd9 100644
--- a/localization/rssguard-de_DE.ts
+++ b/localization/rssguard-de_DE.ts
@@ -470,7 +470,7 @@ or this functionality is not implemented yet.
<b>%8</b><br><b>Version:</b> %1 (build on %2 with CMake %3)<br><b>Revision:</b> %4<br><b>Build date:</b> %5<br><b>Qt:</b> %6 (compiled against %7)<br>
- <b>%8</b><br><b>Version:</b> %1 (gebildet am %2 mit CMake %3)<br><b>Revision:</b> %4<br><b>Bildungsdatum:</b> %5<br><b>Qt:</b> %6 (kompiliert unter %7)<br>
+ <b>%8</b><br><b>Version:</b> %1 (gebildet am %2 mit CMake %3)<br><b>Revision:</b> %4<br><b>Bildungsdatum:</b> %5<br><b>Qt:</b> %6 (kompiliert unter %7)<br>About %1
@@ -505,6 +505,10 @@ or this functionality is not implemented yet.
<body>%5 is a (very) tiny feed reader.<br><br>This software is distributed under the terms of GNU General Public License, version 3.<br><br>Contacts:<ul><li><a href="mailto://%1">%1</a> ~e-mail</li><li><a href="%2">%2</a> ~website</li></ul>You can obtain source code for %5 from its website.<br><br><br>Copyright (C) 2011-%3 %4</body>
+
+ <b>%8</b><br><b>Version:</b> %1<br><b>Build date:</b> %2<br><b>Qt:</b> %3 (compiled against %4)<br>
+
+ FormAddAccount
diff --git a/localization/rssguard-en_GB.ts b/localization/rssguard-en_GB.ts
index a5fe19d29..6df147e34 100644
--- a/localization/rssguard-en_GB.ts
+++ b/localization/rssguard-en_GB.ts
@@ -468,10 +468,6 @@ or this functionality is not implemented yet.
Changelog not found.
-
- <b>%8</b><br><b>Version:</b> %1 (build on %2 with CMake %3)<br><b>Revision:</b> %4<br><b>Build date:</b> %5<br><b>Qt:</b> %6 (compiled against %7)<br>
-
- About %1About RSS Guard dialog title.
@@ -505,6 +501,10 @@ or this functionality is not implemented yet.
<body>%5 is a (very) tiny feed reader.<br><br>This software is distributed under the terms of GNU General Public License, version 3.<br><br>Contacts:<ul><li><a href="mailto://%1">%1</a> ~e-mail</li><li><a href="%2">%2</a> ~website</li></ul>You can obtain source code for %5 from its website.<br><br><br>Copyright (C) 2011-%3 %4</body>
+
+ <b>%8</b><br><b>Version:</b> %1<br><b>Build date:</b> %2<br><b>Qt:</b> %3 (compiled against %4)<br>
+
+ FormAddAccount
diff --git a/localization/rssguard-en_US.ts b/localization/rssguard-en_US.ts
index f09157bce..c1fcca4de 100644
--- a/localization/rssguard-en_US.ts
+++ b/localization/rssguard-en_US.ts
@@ -468,10 +468,6 @@ or this functionality is not implemented yet.
Changelog not found.
-
- <b>%8</b><br><b>Version:</b> %1 (build on %2 with CMake %3)<br><b>Revision:</b> %4<br><b>Build date:</b> %5<br><b>Qt:</b> %6 (compiled against %7)<br>
-
- About %1About RSS Guard dialog title.
@@ -505,6 +501,10 @@ or this functionality is not implemented yet.
<body>%5 is a (very) tiny feed reader.<br><br>This software is distributed under the terms of GNU General Public License, version 3.<br><br>Contacts:<ul><li><a href="mailto://%1">%1</a> ~e-mail</li><li><a href="%2">%2</a> ~website</li></ul>You can obtain source code for %5 from its website.<br><br><br>Copyright (C) 2011-%3 %4</body>
+
+ <b>%8</b><br><b>Version:</b> %1<br><b>Build date:</b> %2<br><b>Qt:</b> %3 (compiled against %4)<br>
+
+ FormAddAccount
diff --git a/localization/rssguard-fr_FR.ts b/localization/rssguard-fr_FR.ts
index 972f7d000..ff3fe5753 100644
--- a/localization/rssguard-fr_FR.ts
+++ b/localization/rssguard-fr_FR.ts
@@ -470,7 +470,7 @@ or this functionality is not implemented yet.
<b>%8</b><br><b>Version:</b> %1 (build on %2 with CMake %3)<br><b>Revision:</b> %4<br><b>Build date:</b> %5<br><b>Qt:</b> %6 (compiled against %7)<br>
- <b>%8</b><br><b>Version :</b> %1 (construit sur %2 avec CMake %3)<br><b>Révision :</b> %4<br><b>Date de création :</b> %5<br><b>Qt:</b> %6 (compilé avec %7)<br>
+ <b>%8</b><br><b>Version :</b> %1 (construit sur %2 avec CMake %3)<br><b>Révision :</b> %4<br><b>Date de création :</b> %5<br><b>Qt:</b> %6 (compilé avec %7)<br>About %1
@@ -505,6 +505,10 @@ or this functionality is not implemented yet.
<body>%5 is a (very) tiny feed reader.<br><br>This software is distributed under the terms of GNU General Public License, version 3.<br><br>Contacts:<ul><li><a href="mailto://%1">%1</a> ~e-mail</li><li><a href="%2">%2</a> ~website</li></ul>You can obtain source code for %5 from its website.<br><br><br>Copyright (C) 2011-%3 %4</body>
+
+ <b>%8</b><br><b>Version:</b> %1<br><b>Build date:</b> %2<br><b>Qt:</b> %3 (compiled against %4)<br>
+
+ FormAddAccount
diff --git a/localization/rssguard-he_IL.ts b/localization/rssguard-he_IL.ts
index 3c4f91780..9f6728299 100644
--- a/localization/rssguard-he_IL.ts
+++ b/localization/rssguard-he_IL.ts
@@ -468,10 +468,6 @@ or this functionality is not implemented yet.
Changelog not found.
-
- <b>%8</b><br><b>Version:</b> %1 (build on %2 with CMake %3)<br><b>Revision:</b> %4<br><b>Build date:</b> %5<br><b>Qt:</b> %6 (compiled against %7)<br>
-
- About %1About RSS Guard dialog title.
@@ -505,6 +501,10 @@ or this functionality is not implemented yet.
<body>%5 is a (very) tiny feed reader.<br><br>This software is distributed under the terms of GNU General Public License, version 3.<br><br>Contacts:<ul><li><a href="mailto://%1">%1</a> ~e-mail</li><li><a href="%2">%2</a> ~website</li></ul>You can obtain source code for %5 from its website.<br><br><br>Copyright (C) 2011-%3 %4</body>
+
+ <b>%8</b><br><b>Version:</b> %1<br><b>Build date:</b> %2<br><b>Qt:</b> %3 (compiled against %4)<br>
+
+ FormAddAccount
diff --git a/localization/rssguard-id_ID.ts b/localization/rssguard-id_ID.ts
index ed9b9cdf4..52b8f6529 100644
--- a/localization/rssguard-id_ID.ts
+++ b/localization/rssguard-id_ID.ts
@@ -468,7 +468,7 @@ atau fungsi ini belum diimplementasikan.
<b>%8</b><br><b>Version:</b> %1 (build on %2 with CMake %3)<br><b>Revision:</b> %4<br><b>Build date:</b> %5<br><b>Qt:</b> %6 (compiled against %7)<br>
- <b>%8</b><br><b>Versi:</b> %1 (dibangun di %2 dengan CMake %3)<br><b>Revisi:</b> %4<br><b>Tanggal dibangun:</b> %5<br><b>Qt:</b> %6 (dikompilasi terhadap %7)<br>
+ <b>%8</b><br><b>Versi:</b> %1 (dibangun di %2 dengan CMake %3)<br><b>Revisi:</b> %4<br><b>Tanggal dibangun:</b> %5<br><b>Qt:</b> %6 (dikompilasi terhadap %7)<br>About %1
@@ -503,6 +503,10 @@ atau fungsi ini belum diimplementasikan.
<body>%5 is a (very) tiny feed reader.<br><br>This software is distributed under the terms of GNU General Public License, version 3.<br><br>Contacts:<ul><li><a href="mailto://%1">%1</a> ~e-mail</li><li><a href="%2">%2</a> ~website</li></ul>You can obtain source code for %5 from its website.<br><br><br>Copyright (C) 2011-%3 %4</body><body>%5 merupakan sebuah pembaca feed yang sangat kecil.<br><br>Perangkat lunak ini didistribusikan di bawah ketentuan dari Lisensi Publik Umum GNU, versi 3.<br><br>Kontak:<ul><li><a href="mailto://%1">%1</a> ~e-mail</li><li><a href="%2">%2</a> ~website</li></ul>Anda dapat memperoleh kode sumber untuk %5 dari website-nya.<br><br><br>Hak cipta (C) 2011-%3 %4</body>
+
+ <b>%8</b><br><b>Version:</b> %1<br><b>Build date:</b> %2<br><b>Qt:</b> %3 (compiled against %4)<br>
+
+ FormAddAccount
diff --git a/localization/rssguard-it_IT.ts b/localization/rssguard-it_IT.ts
index 5ae720e14..4cf3c216f 100644
--- a/localization/rssguard-it_IT.ts
+++ b/localization/rssguard-it_IT.ts
@@ -468,10 +468,6 @@ or this functionality is not implemented yet.
Changelog not found.Changelog non trovato.
-
- <b>%8</b><br><b>Version:</b> %1 (build on %2 with CMake %3)<br><b>Revision:</b> %4<br><b>Build date:</b> %5<br><b>Qt:</b> %6 (compiled against %7)<br>
-
- About %1About RSS Guard dialog title.
@@ -505,6 +501,10 @@ or this functionality is not implemented yet.
<body>%5 is a (very) tiny feed reader.<br><br>This software is distributed under the terms of GNU General Public License, version 3.<br><br>Contacts:<ul><li><a href="mailto://%1">%1</a> ~e-mail</li><li><a href="%2">%2</a> ~website</li></ul>You can obtain source code for %5 from its website.<br><br><br>Copyright (C) 2011-%3 %4</body>
+
+ <b>%8</b><br><b>Version:</b> %1<br><b>Build date:</b> %2<br><b>Qt:</b> %3 (compiled against %4)<br>
+
+ FormAddAccount
diff --git a/localization/rssguard-ja_JP.ts b/localization/rssguard-ja_JP.ts
index 9c2498978..9f6a7b2df 100644
--- a/localization/rssguard-ja_JP.ts
+++ b/localization/rssguard-ja_JP.ts
@@ -464,10 +464,6 @@ or this functionality is not implemented yet.
Changelog not found.更新履歴がありません。
-
- <b>%8</b><br><b>Version:</b> %1 (build on %2 with CMake %3)<br><b>Revision:</b> %4<br><b>Build date:</b> %5<br><b>Qt:</b> %6 (compiled against %7)<br>
-
- About %1About RSS Guard dialog title.
@@ -501,6 +497,10 @@ or this functionality is not implemented yet.
<body>%5 is a (very) tiny feed reader.<br><br>This software is distributed under the terms of GNU General Public License, version 3.<br><br>Contacts:<ul><li><a href="mailto://%1">%1</a> ~e-mail</li><li><a href="%2">%2</a> ~website</li></ul>You can obtain source code for %5 from its website.<br><br><br>Copyright (C) 2011-%3 %4</body>
+
+ <b>%8</b><br><b>Version:</b> %1<br><b>Build date:</b> %2<br><b>Qt:</b> %3 (compiled against %4)<br>
+
+ FormAddAccount
diff --git a/localization/rssguard-lt_LT.ts b/localization/rssguard-lt_LT.ts
index 770485dda..779b42625 100644
--- a/localization/rssguard-lt_LT.ts
+++ b/localization/rssguard-lt_LT.ts
@@ -475,7 +475,7 @@ or this functionality is not implemented yet.
<b>%8</b><br><b>Version:</b> %1 (build on %2 with CMake %3)<br><b>Revision:</b> %4<br><b>Build date:</b> %5<br><b>Qt:</b> %6 (compiled against %7)<br>
- <b>%8</b><br><b>Versija:</b> %1 (sukurta sistemoje %2 su CMake %3)<br><b>Poversijis:</b> %4<br><b>Kūrimo data:</b> %5<br><b>Qt:</b> %6 (sukompiliuota remiantis %7)<br>
+ <b>%8</b><br><b>Versija:</b> %1 (sukurta sistemoje %2 su CMake %3)<br><b>Poversijis:</b> %4<br><b>Kūrimo data:</b> %5<br><b>Qt:</b> %6 (sukompiliuota remiantis %7)<br>About %1
@@ -510,6 +510,10 @@ or this functionality is not implemented yet.
<body>%5 is a (very) tiny feed reader.<br><br>This software is distributed under the terms of GNU General Public License, version 3.<br><br>Contacts:<ul><li><a href="mailto://%1">%1</a> ~e-mail</li><li><a href="%2">%2</a> ~website</li></ul>You can obtain source code for %5 from its website.<br><br><br>Copyright (C) 2011-%3 %4</body><body>%5 yra (labai) mažytė sklaidos kanalų skaitytuvė.<br><br>Ši programinė įranga yra platinama pagal GNU Bendrosios Viešosios Licencijos, versija 3, nuostatas.<br><br>Kontaktai:<ul><li><a href="mailto://%1">%1</a> ~el. paštas</li><li><a href="%2">%2</a> ~tinklalapis</li></ul>Jūs galite gauti %5 pirminį kodą iš programos tinklalapio.<br><br><br>Autorių Teisės (C) 2011-%3 %4</body>
+
+ <b>%8</b><br><b>Version:</b> %1<br><b>Build date:</b> %2<br><b>Qt:</b> %3 (compiled against %4)<br>
+
+ FormAddAccount
diff --git a/localization/rssguard-nl_NL.ts b/localization/rssguard-nl_NL.ts
index 251e3d57f..f713d0535 100644
--- a/localization/rssguard-nl_NL.ts
+++ b/localization/rssguard-nl_NL.ts
@@ -473,7 +473,7 @@ of deze functie bestaat nog niet.
<b>%8</b><br><b>Version:</b> %1 (build on %2 with CMake %3)<br><b>Revision:</b> %4<br><b>Build date:</b> %5<br><b>Qt:</b> %6 (compiled against %7)<br>
- <b>%8</b><br><b>Versie:</b> %1 (Gecompileerd onder %2 en Cmake %3)<br><b> Revisie:</b> %4<br><b>Gecompileerd op:</b> %5<br><b>QT versie:</b> %6 (Gecompileerd met %7)<br>
+ <b>%8</b><br><b>Versie:</b> %1 (Gecompileerd onder %2 en Cmake %3)<br><b> Revisie:</b> %4<br><b>Gecompileerd op:</b> %5<br><b>QT versie:</b> %6 (Gecompileerd met %7)<br>About %1
@@ -508,6 +508,10 @@ of deze functie bestaat nog niet.
<body>%5 is a (very) tiny feed reader.<br><br>This software is distributed under the terms of GNU General Public License, version 3.<br><br>Contacts:<ul><li><a href="mailto://%1">%1</a> ~e-mail</li><li><a href="%2">%2</a> ~website</li></ul>You can obtain source code for %5 from its website.<br><br><br>Copyright (C) 2011-%3 %4</body><body>%5 is een (zeer) makelijk te gebruiken feed lezer.<br><br>Dit programma is beschikbaar onder te termen van de GNU General Public License, versie 3.<br><br>Contact:<ul><li><a href="mailto://%1">%1</a> ~e-mail</li><li><a href="%2">%2</a> ~Website</li><li>U kunt de broncode voor %5 downloaden van de website.<br><br><br>Auteursrecht (C) 2011-%3 %4</body>
+
+ <b>%8</b><br><b>Version:</b> %1<br><b>Build date:</b> %2<br><b>Qt:</b> %3 (compiled against %4)<br>
+
+ FormAddAccount
diff --git a/localization/rssguard-pt_BR.ts b/localization/rssguard-pt_BR.ts
index c7cb6b0a3..a4a3c6b01 100644
--- a/localization/rssguard-pt_BR.ts
+++ b/localization/rssguard-pt_BR.ts
@@ -472,7 +472,7 @@ ou esta função ainda não foi implementada.
<b>%8</b><br><b>Version:</b> %1 (build on %2 with CMake %3)<br><b>Revision:</b> %4<br><b>Build date:</b> %5<br><b>Qt:</b> %6 (compiled against %7)<br>
- <b>%8</b><br><b>Versão:</b> %1 (criado em %2 com o CMake %3)<br><b>Revisão:</b> %4<br><b>Data de criação:</b> %5<br><b>Qt:</b> %6 (compilado contra %7)<br>
+ <b>%8</b><br><b>Versão:</b> %1 (criado em %2 com o CMake %3)<br><b>Revisão:</b> %4<br><b>Data de criação:</b> %5<br><b>Qt:</b> %6 (compilado contra %7)<br>About %1
@@ -507,6 +507,10 @@ ou esta função ainda não foi implementada.
<body>%5 is a (very) tiny feed reader.<br><br>This software is distributed under the terms of GNU General Public License, version 3.<br><br>Contacts:<ul><li><a href="mailto://%1">%1</a> ~e-mail</li><li><a href="%2">%2</a> ~website</li></ul>You can obtain source code for %5 from its website.<br><br><br>Copyright (C) 2011-%3 %4</body><body>O %5 é um leitor de feeds (muito) pequeno.<br><br>Este software é distribuído sob os termos da GNU General Public License, versão 3.<br><br>Contato:<ul><li><a href="mailto://%1">%1</a> ~e-mail</li><li><a href="%2">%2</a> ~website</li></ul>Você pode obter o código fonte do %5 a partir do seu site.<br><br><br>Copyright (C) 2011-%3 %4</body>
+
+ <b>%8</b><br><b>Version:</b> %1<br><b>Build date:</b> %2<br><b>Qt:</b> %3 (compiled against %4)<br>
+
+ FormAddAccount
diff --git a/localization/rssguard-sv_SE.ts b/localization/rssguard-sv_SE.ts
index 4548576c7..5f3e54eb8 100644
--- a/localization/rssguard-sv_SE.ts
+++ b/localization/rssguard-sv_SE.ts
@@ -472,7 +472,7 @@ att funktionen inte är implementerad än.
<b>%8</b><br><b>Version:</b> %1 (build on %2 with CMake %3)<br><b>Revision:</b> %4<br><b>Build date:</b> %5<br><b>Qt:</b> %6 (compiled against %7)<br>
- <b>%8</b><br><b>Version:</b> %1 (byggd på %2 med CMake %3)<br><b>Revision:</b> %4<br><b>Byggdatum:</b> %5<br><b>Qt:</b> %6 (kompilerad mot %7)<br>
+ <b>%8</b><br><b>Version:</b> %1 (byggd på %2 med CMake %3)<br><b>Revision:</b> %4<br><b>Byggdatum:</b> %5<br><b>Qt:</b> %6 (kompilerad mot %7)<br>About %1
@@ -507,6 +507,10 @@ att funktionen inte är implementerad än.
<body>%5 is a (very) tiny feed reader.<br><br>This software is distributed under the terms of GNU General Public License, version 3.<br><br>Contacts:<ul><li><a href="mailto://%1">%1</a> ~e-mail</li><li><a href="%2">%2</a> ~website</li></ul>You can obtain source code for %5 from its website.<br><br><br>Copyright (C) 2011-%3 %4</body><body>%5 är en (mycket) liten flödesläsare.<br><br>Mjukvaran distribueras under GNU General Public License, version 3.<br><br>Kontakt:<ul><li><a href="mailto://%1">%1</a> ~e-post</li><li><a href="%2">%2</a> ~webbsida</li></ul>Du kan hämta källkod för %5 från webbsidan.<br><br><br>Copyright (C) 2011-%3 %4</body>
+
+ <b>%8</b><br><b>Version:</b> %1<br><b>Build date:</b> %2<br><b>Qt:</b> %3 (compiled against %4)<br>
+
+ FormAddAccount
diff --git a/resources/nsis/NSIS.template.in b/resources/nsis/NSIS.template.in
index 9255d72fc..a7d2821b1 100755
--- a/resources/nsis/NSIS.template.in
+++ b/resources/nsis/NSIS.template.in
@@ -145,38 +145,6 @@ NotInstalled:
; Create uninstaller.
WriteUninstaller "$INSTDIR\Uninstall.exe"
-
- ; Create entry in Windows "Add/Remove programs" panel.
- ;Push "DisplayName"
- ;Push "${APP_NAME}"
- ;Call ConditionalAddToRegisty
- ;Push "DisplayVersion"
- ;Push "${APP_VERSION}"
- ;Call ConditionalAddToRegisty
- ;Push "Publisher"
- ;Push "@CPACK_PACKAGE_VENDOR@"
- ; ConditionalAddToRegisty
- ;Push "UninstallString"
- ;Push "$INSTDIR\Uninstall.exe"
- ;Call ConditionalAddToRegisty
- ;Push "NoRepair"
- ;Push "1"
- ;Call ConditionalAddToRegisty
- ;Push "NoModify"
- ;Push "1"
- ;Call ConditionalAddToRegisty
- ;Push "DisplayIcon"
- ;Push "$INSTDIR\@CPACK_NSIS_INSTALLED_ICON_NAME@"
- ;Call ConditionalAddToRegisty
- ;Push "HelpLink"
- ;Push "@CPACK_NSIS_HELP_LINK@"
- ;Call ConditionalAddToRegisty
- ;Push "URLInfoAbout"
- ;Push "@CPACK_NSIS_URL_INFO_ABOUT@"
- ;Call ConditionalAddToRegisty
- ;Push "Contact"
- ;Push "@CPACK_NSIS_CONTACT@"
- ;Call ConditionalAddToRegisty
SectionEnd
Section "Desktop Icon" DesktopIcon
diff --git a/rssguard.pro b/rssguard.pro
index 105f173ae..28d0d4397 100644
--- a/rssguard.pro
+++ b/rssguard.pro
@@ -64,6 +64,7 @@ message(rssguard: Install directory: '$$PREFIX'.)
QT += core gui widgets sql network xml printsupport
+CONFIG += c++11
HEADERS += src/core/feeddownloader.h \
src/core/feedsmodel.h \
@@ -326,6 +327,21 @@ TRANSLATIONS += localization/qtbase-cs_CZ.ts \
localization/rssguard-pt_BR.ts \
localization/rssguard-sv_SE.ts
+TRANSLATIONS_WO_QT += $$PWD/localization/rssguard-cs_CZ.ts \
+ $$PWD/localization/rssguard-da_DK.ts \
+ $$PWD/localization/rssguard-de_DE.ts \
+ $$PWD/localization/rssguard-en_GB.ts \
+ $$PWD/localization/rssguard-en_US.ts \
+ $$PWD/localization/rssguard-fr_FR.ts \
+ $$PWD/localization/rssguard-he_IL.ts \
+ $$PWD/localization/rssguard-id_ID.ts \
+ $$PWD/localization/rssguard-it_IT.ts \
+ $$PWD/localization/rssguard-ja_JP.ts \
+ $$PWD/localization/rssguard-lt_LT.ts \
+ $$PWD/localization/rssguard-nl_NL.ts \
+ $$PWD/localization/rssguard-pt_BR.ts \
+ $$PWD/localization/rssguard-sv_SE.ts
+
INCLUDEPATH += $$PWD/. \
$$PWD/src \
$$PWD/src/gui \
@@ -335,6 +351,20 @@ INCLUDEPATH += $$PWD/. \
TEXTS = resources/text/CHANGELOG \
resources/text/COPYING_BSD
+# Make sure QM translations are generated.
+lrelease.input = TRANSLATIONS
+lrelease.output = ${QMAKE_FILE_BASE}.qm
+lrelease.commands = lrelease -compress ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_BASE}.qm
+lrelease.CONFIG += no_link target_predeps
+
+# Create new "make lupdate" target.
+lupdate.target = lupdate
+lupdate.commands = lupdate -no-obsolete $$shell_path($$PWD/rssguard.pro) -ts $$shell_path($$TRANSLATIONS_WO_QT)
+
+QMAKE_EXTRA_TARGETS += lupdate
+QMAKE_EXTRA_COMPILERS += lrelease
+
+
# Install all files on Windows.
win32 {
target.path = $$PREFIX
@@ -372,16 +402,14 @@ unix:!mac {
misc_texts.files = $$TEXTS
misc_texts.path = $$quote($$PREFIX/usr/share/$$TARGET/information/)
- updateqm.input = TRANSLATIONS
- updateqm.output = ${QMAKE_FILE_BASE}.qm
- updateqm.commands = lrelease ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_BASE}.qm
- updateqm.CONFIG += no_link target_predeps
- QMAKE_EXTRA_COMPILERS += updateqm
+ desktop_file.files = resources/desktop/$${TARGET}.desktop
+ desktop_file.path = $$quote($$PREFIX/usr/share/$$TARGET/information/)
translations.files = $$OUT_PWD/*.qm
- translations.path = $$quote($$PREFIX/usr/share/$$TARGET/l10n/)
+ translations.path = $$quote($$PREFIX/usr/share/applications/)
- INSTALLS += target misc_sql misc_icons misc_flags misc_feeds misc_icon misc_plain_icon misc_texts translations
+ INSTALLS += target misc_sql misc_icons misc_flags misc_feeds \
+ misc_icon misc_plain_icon misc_texts desktop_file translations
}
# Install all files on Mac OS X.