Merge lp://qastaging/~charlesk/indicator-transfer-buteo/fix-i18n-lib into lp://qastaging/indicator-transfer-buteo

Proposed by Charles Kerr
Status: Merged
Approved by: Renato Araujo Oliveira Filho
Approved revision: 6
Merged at revision: 5
Proposed branch: lp://qastaging/~charlesk/indicator-transfer-buteo/fix-i18n-lib
Merge into: lp://qastaging/indicator-transfer-buteo
Diff against target: 37 lines (+1/-9)
2 files modified
src/buteo-plugin.cpp (+0/-8)
src/buteo-transfer.cpp (+1/-1)
To merge this branch: bzr merge lp://qastaging/~charlesk/indicator-transfer-buteo/fix-i18n-lib
Reviewer Review Type Date Requested Status
Renato Araujo Oliveira Filho (community) Approve
Review via email: mp+273607@code.qastaging.launchpad.net

Commit message

Fix i18n conflict with indicator-transfer

Description of the change

Make the plugin's i18n behave like a library instead of an app so that indicator-transfer's text domain doesn't get overwritten, breaking its i18n (e.g. the "Files" title).

Background information on i18n for libs vs apps in glib: https://developer.gnome.org/glib/unstable/glib-I18N.html#glib-I18N.description

To post a comment you must log in.
Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

looks good.

review: Approve
Revision history for this message
Sebastien Bacher (seb128) wrote :

since you drop the only usage of GNOMELOCALEDIR you could maybe also clean out the definition from the cmake (which seems buggy any, current build logs have -DGNOMELOCALEDIR=\"\")

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches