indicator-power

Merge lp:~kelemeng/indicator-power/bug957542 into lp:indicator-power/1.0

  1. bug957542
  2. Merge into trunk.2.0
Proposed by Gabor Kelemen
Status: Merged
Approved by: Charles Kerr
Approved revision: 132
Merged at revision: 132
Proposed branch: lp:~kelemeng/indicator-power/bug957542
Merge into: lp:indicator-power/1.0
Diff against target: 12 lines (+1/-1)
1 file modified
po/Makevars (+1/-1)
To merge this branch: bzr merge lp:~kelemeng/indicator-power/bug957542
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
Review via email: mp+98027@code.launchpad.net

Description of the change

The safer solution - I don't want to break anything I don't know much about.

To post a comment you must log in.
Revision history for this message
Charles Kerr (charlesk) wrote :

Looks ok

review: Approve
Revision history for this message
Charles Kerr (charlesk) wrote :

Merged. Thanks for yesterday's set of patches, Gabor!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/Makevars'
2--- po/Makevars 2011-07-05 13:44:26 +0000
3+++ po/Makevars 2012-03-16 23:45:23 +0000
4@@ -8,7 +8,7 @@
5 top_builddir = ..
6
7 # These options get passed to xgettext.
8-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
9+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=g_dngettext:2,3
10
11 # This is the copyright holder that gets inserted into the header of the
12 # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding

Subscribers

People subscribed via source and target branches