Merge lp:~gunnarhj/gnome-shell/gettext-workaround into lp:~ubuntu-desktop/gnome-shell/ubuntu

[Gunnar Hjalmarsson]

[Jeremy Bícha (jbicha)]

Thanks!

I'm uploading now. Since we're near the end of the release cycle, all uploads for seeded packages will need to be manually approved by the Ubuntu Release team.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2018-04-04 14:04:54 +0000
+++ debian/changelog	2018-04-06 14:03:55 +0000
@@ -1,3 +1,13 @@
+gnome-shell (3.28.0-0ubuntu4) bionic; urgency=medium
+
+  * debian/rules:
+    - Drop javascript comments in gnome-shell.pot so the currently used
+      version of gettext in LP gets more permissive wrt cases where
+      the number of %d modifiers in a translation differs from what's
+      in msgid (LP: #1756547).
+
+ -- Gunnar Hjalmarsson <[e-mail]>  Fri, 06 Apr 2018 15:58:00 +0200
+
 gnome-shell (3.28.0-0ubuntu3) bionic; urgency=medium
 
   * Recommend bolt for Thunderbolt 3 support (LP: #1759538)

=== modified file 'debian/rules'
--- debian/rules	2018-03-02 11:19:41 +0000
+++ debian/rules	2018-04-06 14:03:55 +0000
@@ -23,6 +23,8 @@
 
 override_dh_translations:
 	ninja -C obj-$(DEB_HOST_GNU_TYPE) gnome-shell-pot
+	# work around https://launchpad.net/bugs/1756547
+	sed -i '/^#, javascript-format/d' po/gnome-shell.pot
 	dh_translations
 
 override_dh_install: