telephony-service

Merge lp:~boiko/telephony-service/no_auto_pot_update into lp:telephony-service/rtm-15.04

  1. no_auto_pot_update
  2. Merge into rtm-15.04
Proposed by Gustavo Pichorim Boiko
Status: Merged
Approved by: Gustavo Pichorim Boiko
Approved revision: 1082
Merged at revision: 1103
Proposed branch: lp:~boiko/telephony-service/no_auto_pot_update
Merge into: lp:telephony-service/rtm-15.04
Diff against target: 12 lines (+1/-1)
1 file modified
po/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~boiko/telephony-service/no_auto_pot_update
Reviewer Review Type Date Requested Status
Tiago Salem Herrmann Pending
Review via email: mp+263932@code.launchpad.net

This proposal supersedes a proposal from 2015-06-10.

Commit message

Do not update the pot file automatically on builds, it causes conflicts when multiple changes are applied together.

Description of the change

Do not update the pot file automatically on builds, it causes conflicts when multiple changes are applied together.

To post a comment you must log in.
Revision history for this message
Tiago Salem Herrmann (tiagosh) wrote : Posted in a previous version of this proposal

looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/CMakeLists.txt'
2--- po/CMakeLists.txt 2014-08-20 09:35:55 +0000
3+++ po/CMakeLists.txt 2015-07-06 16:22:10 +0000
4@@ -28,7 +28,7 @@
5
6 find_program(XGETTEXT_EXECUTABLE xgettext)
7 if(XGETTEXT_EXECUTABLE)
8- add_custom_target(${POT_FILE} ALL
9+ add_custom_target(${POT_FILE}
10 COMMENT "Generating translation template"
11 COMMAND ${XGETTEXT_EXECUTABLE} --c++ --qt --add-comments=TRANSLATORS --keyword=GettextMarkExtraction --keyword=tr --keyword=tr:1,2 -D ${CMAKE_SOURCE_DIR} -s -p ${CMAKE_CURRENT_SOURCE_DIR} -o ${POT_FILE} ${I18N_SRCS}
12 )

Subscribers

People subscribed via source and target branches