release 24.5.1724.5.17release-builds

9 files changed, 45 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 652e51c..2bb94ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,26 @@
+2024-05-17 Mike Gabriel
+
+        * release 24.5.17 (HEAD -> main, tag: 24.5.17)
+
+2024-05-15 Robert Tari
+
+        * Merge branch 'sunweaver-pr/desktop-in-plus-translation-fixes'
+          (26278e2a)
+
 2024-05-15 Mike Gabriel
 
-        * release 24.5.15 (HEAD -> main, tag: 24.5.15)
+        * d/rules: Add fixes/improvements from official DEB package.
+          (315cf2cd)
+        * po: Update all translation languages. (8c632a02)
+        * po/ayatanawebmail.pot: Update translation template file. (4831fa4a)
+        * po/LINGUAS: Use nb_NO.po, not nb.po. (d09c2f12)
+        * po/POTFILES.in: Add .desktop(.in) files. (5c05cb3b)
+        * update-po{,t}.sh: Adjust to .desktop -> .desktop.in renamings.
+          (5c8a24d8)
+        * .desktop files: Stop in-place adding translations to .desktop
+          files. Use non-changed .desktop.in files as input
+          templates instead. (95b868ad)
+        * release 24.5.15 (8c9af110) (tag: 24.5.15)
 
 2024-05-13 Robert Tari
 
diff --git a/NEWS b/NEWS
index 24fadfc..331041b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+Overview of changes in ayatana-webmail 24.5.17
+
+  - .desktop files: Stop in-place adding translations to .desktop
+    files. Use non-changed .desktop.in files as input templates
+    instead.
+  - update-po{,t}.sh: Adjust to .desktop -> .desktop.in renamings.
+  - po/POTFILES.in: Add .desktop(.in) files.
+  - po/LINGUAS: Use nb_NO.po, not nb.po.
+  - po/ayatanawebmail.pot: Update translation template file.
+  - po: Update all translation languages.
+
 Overview of changes in ayatana-webmail 24.5.15
 
   - ayatanawebmail/imaplib2.py: Fix Python 3.12 bug and drop unused
diff --git a/ayatanawebmail/appdata.py b/ayatanawebmail/appdata.py
index 4a358c7..5172f58 100755
--- a/ayatanawebmail/appdata.py
+++ b/ayatanawebmail/appdata.py
@@ -4,7 +4,7 @@
 APPNAME = 'ayatanawebmail'
 APPEXECUTABLE='/usr/bin/ayatana-webmail'
 APPDEPENDENCIES = ['gir1.2-messagingmenu-1.0', 'python3-gi', 'gir1.2-gtk-3.0', 'gir1.2-notify-0.7', 'python3-secretstorage', 'gnome-session-canberra', 'python3-psutil', 'python3-babel', 'python3-urllib3']
-APPVERSION = '24.5.15'
+APPVERSION = '24.5.17'
 APPSHOWSETTINGS = 180603
 APPYEAR = '2016'
 APPTITLE = 'Ayatana Webmail'
diff --git a/debian/changelog b/debian/changelog
index 8fd74c6..f9ff360 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ayatana-webmail (24.5.17) unstable; urgency=medium
+
+  * Upstream-provided Debian package for ayatana-webmail.
+    See upstream ChangeLog for recent changes.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Fri, 17 May 2024 11:15:54 +0200
+
 ayatana-webmail (24.5.15) unstable; urgency=medium
 
   * Upstream-provided Debian package for ayatana-webmail.
diff --git a/man/ayatana-webmail-clear.1 b/man/ayatana-webmail-clear.1
index 29f2c06..f218cf9 100644
--- a/man/ayatana-webmail-clear.1
+++ b/man/ayatana-webmail-clear.1
@@ -6,7 +6,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH ayatana-webmail-clear 1 "May 2024" "Version 24.5.15" "Ayatana Webmail"
+.TH ayatana-webmail-clear 1 "May 2024" "Version 24.5.17" "Ayatana Webmail"
 .SH NAME
 ayatana-webmail-clear \- Webmail Integration into your Desktop
 .SH SYNOPSIS
diff --git a/man/ayatana-webmail-reset.1 b/man/ayatana-webmail-reset.1
index 7eb7c2f..5680c05 100644
--- a/man/ayatana-webmail-reset.1
+++ b/man/ayatana-webmail-reset.1
@@ -6,7 +6,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH ayatana-webmail-reset 1 "May 2024" "Version 24.5.15" "Ayatana Webmail"
+.TH ayatana-webmail-reset 1 "May 2024" "Version 24.5.17" "Ayatana Webmail"
 .SH NAME
 ayatana-webmail-reset \- Webmail Integration into your Desktop
 .SH SYNOPSIS
diff --git a/man/ayatana-webmail-settings.1 b/man/ayatana-webmail-settings.1
index 58886ab..23a618e 100644
--- a/man/ayatana-webmail-settings.1
+++ b/man/ayatana-webmail-settings.1
@@ -6,7 +6,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH ayatana-webmail-settings 1 "May 2024" "Version 24.5.15" "Ayatana Webmail"
+.TH ayatana-webmail-settings 1 "May 2024" "Version 24.5.17" "Ayatana Webmail"
 .SH NAME
 ayatana-webmail-settings \- Webmail Integration into your Desktop
 .SH SYNOPSIS
diff --git a/man/ayatana-webmail-url.1 b/man/ayatana-webmail-url.1
index 863038c..ab3bb54 100644
--- a/man/ayatana-webmail-url.1
+++ b/man/ayatana-webmail-url.1
@@ -6,7 +6,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH ayatana-webmail-url 1 "May 2024" "Version 24.5.15" "Ayatana Webmail"
+.TH ayatana-webmail-url 1 "May 2024" "Version 24.5.17" "Ayatana Webmail"
 .SH NAME
 ayatana-webmail-url \- Webmail Integration into your Desktop (URL launcher)
 .SH SYNOPSIS
diff --git a/man/ayatana-webmail.1 b/man/ayatana-webmail.1
index ccc3217..e3e7d63 100644
--- a/man/ayatana-webmail.1
+++ b/man/ayatana-webmail.1
@@ -6,7 +6,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH ayatana-webmail 1 "May 2024" "Version 24.5.15" "Ayatana Webmail"
+.TH ayatana-webmail 1 "May 2024" "Version 24.5.17" "Ayatana Webmail"
 .SH NAME
 ayatana-webmail \- Webmail Integration into your Desktop
 .SH SYNOPSIS