Merge lp:~seb128/sync-monitor/template into lp:sync-monitor

Proposed by Sebastien Bacher
Status: Merged
Approved by: Ken VanDine
Approved revision: 33
Merged at revision: 34
Proposed branch: lp:~seb128/sync-monitor/template
Merge into: lp:sync-monitor
Prerequisite: lp:~seb128/sync-monitor/synchronization-typo
Diff against target: 19 lines (+4/-0)
2 files modified
debian/control (+1/-0)
po/POTFILES.in (+3/-0)
To merge this branch: bzr merge lp:~seb128/sync-monitor/template
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ken VanDine Approve
Review via email: mp+233501@code.launchpad.net

Commit message

Tweak translation setup so the template is correctly generated

Description of the change

Tweak translation setup so the template is correctly generated

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Looks good

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2014-04-25 14:09:18 +0000
+++ debian/control 2014-09-05 11:57:25 +0000
@@ -19,6 +19,7 @@
19# directly to Ubuntu, don't worry: your changes will be merged back into the19# directly to Ubuntu, don't worry: your changes will be merged back into the
20# upstream branch20# upstream branch
21Vcs-Bzr: lp:sync-monitor21Vcs-Bzr: lp:sync-monitor
22X-Ubuntu-Use-Langpack: yes
2223
23Package: sync-monitor24Package: sync-monitor
24Architecture: any25Architecture: any
2526
=== added file 'po/POTFILES.in'
--- po/POTFILES.in 1970-01-01 00:00:00 +0000
+++ po/POTFILES.in 2014-09-05 11:57:25 +0000
@@ -0,0 +1,3 @@
1src/sync-account.cpp
2src/sync-daemon.cpp
3

Subscribers

People subscribed via source and target branches