After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 786944 - Use upstream gettext instead of intltool
Use upstream gettext instead of intltool
Status: RESOLVED FIXED
Product: system-monitor
Classification: Core
Component: general
git master
Other Linux
: Normal normal
: ---
Assigned To: System-monitor maintainers
System-monitor maintainers
Depends on:
Blocks:
 
 
Reported: 2017-08-28 21:04 UTC by Robert Roth
Modified: 2017-11-01 19:02 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
Migrate from gnome-common (2.19 KB, patch)
2017-08-28 21:14 UTC, Robert Roth
none Details | Review
Migrate from intltool (36.77 KB, patch)
2017-08-28 21:47 UTC, Robert Roth
none Details | Review
Migrate from intltool (37.36 KB, patch)
2017-08-28 21:54 UTC, Robert Roth
none Details | Review

Description Robert Roth 2017-08-28 21:04:34 UTC
According to https://wiki.gnome.org/Initiatives/GnomeGoals/GettextMigration system monitor should be using gettext instead of intltool.
Comment 1 Robert Roth 2017-08-28 21:14:49 UTC
Created attachment 358635 [details] [review]
Migrate from gnome-common
Comment 2 Robert Roth 2017-08-28 21:47:36 UTC
Created attachment 358638 [details] [review]
Migrate from intltool
Comment 3 Robert Roth 2017-08-28 21:54:46 UTC
Created attachment 358639 [details] [review]
Migrate from intltool
Comment 4 Benoît Dejean 2017-08-29 15:11:34 UTC
Hi, I don't see any regression on the *.po statistics, so it should be safe.
Comment 5 Robert Roth 2017-08-29 15:21:59 UTC
(In reply to Benoît Dejean from comment #4)
> Hi, I don't see any regression on the *.po statistics, so it should be safe.

Thanks for the review. I'm not sure how to test this kind of change, someone who is familiar with the i18n processes or with the gettext migration probably should also take a look. I made the changes based on similar commits on other projects, but... every project is different, so I am hoping I didn't miss anything.
Comment 6 Piotr Drąg 2017-08-29 15:36:53 UTC
Review of attachment 358639 [details] [review]:

I didn’t test it yet, but here are some minor improvement suggestions.

::: gnome-system-monitor.desktop.in.in
@@ +4,3 @@
 TryExec=gnome-system-monitor
 Exec=gnome-system-monitor
 Icon=utilities-system-monitor

I would add a comment above Icon:

# Translators: Do NOT translate or transliterate this text (this is an icon file name)!

(For why, see https://savannah.gnu.org/support/?108887)

@@ +14,3 @@
 X-GNOME-Bugzilla-Component=general
 X-GNOME-Bugzilla-Version=@VERSION@
+Keywords=Monitor;System;Process;CPU;Memory;Network;History;Usage;Performance;Task;Manager;Activity;

And here as well:

# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!

::: po/Makevars
@@ +19,3 @@
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = System Monitor contributors

I’ve seen that many projects prefer “authors” over “contributors”.

@@ +42,3 @@
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS = https://bugzilla.gnome.org/enter_bug.cgi?product=system-monitor&keywords=I18N+L10N&component=Internationalization (i18n)

There is no such component under this product. You probably want “general” here.
Comment 7 Robert Roth 2017-11-01 13:39:41 UTC
Thanks for the reviews and suggestions, made the changes and pushed to master.

Attachment 358635 [details] pushed as c6ac01e - Migrate from gnome-common
Attachment 358639 [details] pushed as 9185b9c - Migrate from intltool
Comment 8 Benoît Dejean 2017-11-01 15:57:58 UTC
Robert, you confirm that we can drop the intltool dep in jhbuild ?
Do you want to branch system-monitor for 3.26 anyway ?
Comment 9 Robert Roth 2017-11-01 18:40:15 UTC
(In reply to Benoît Dejean from comment #8)
> Robert, you confirm that we can drop the intltool dep in jhbuild ?
I hope so, but haven't tried that.
> Do you want to branch system-monitor for 3.26 anyway ?
I'm not sure if it's worth it, as 3.26.2 is already out, but I made a branch gnome-3-26 with the revision before these changes, if we need a hotfix release for 3.26.x.
Comment 10 Piotr Drąg 2017-11-01 18:44:42 UTC
(In reply to Robert Roth from comment #9)
> (In reply to Benoît Dejean from comment #8)
> > Do you want to branch system-monitor for 3.26 anyway ?
> I'm not sure if it's worth it, as 3.26.2 is already out, but I made a branch
> gnome-3-26 with the revision before these changes, if we need a hotfix
> release for 3.26.x.

Branching for stable is always appreciated by the i18n team.
Comment 11 Robert Roth 2017-11-01 19:02:04 UTC
(In reply to Piotr Drąg from comment #10)
> Branching for stable is always appreciated by the i18n team.
Ok, I'll take that into account from now on. I thought it's only needed to have hotfixes. So, I have created gnome-3-26 from the correct revision, and pushed it. Thanks for letting me know.