Unity

Merge lp:~kelemeng/unity/bug923762 into lp:unity

  1. bug923762
  2. Merge into trunk
Proposed by Gabor Kelemen
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: no longer in the source branch.
Merged at revision: 2103
Proposed branch: lp:~kelemeng/unity/bug923762
Merge into: lp:unity
Diff against target: 56 lines (+25/-7)
2 files modified
po/POTFILES.in (+21/-7)
po/POTFILES.skip (+4/-0)
To merge this branch: bzr merge lp:~kelemeng/unity/bug923762
Reviewer Review Type Date Requested Status
Thomi Richards (community) Approve
Michal Hruby (community) Approve
Marco Biscaro Pending
Review via email: mp+93398@code.launchpad.net

This proposal supersedes a proposal from 2012-01-30.

Commit message

Added missing files to POTFILES.in

To post a comment you must log in.
Revision history for this message
Marco Biscaro (marcobiscaro2112) wrote : Posted in a previous version of this proposal

It looks good!

review: Approve
Revision history for this message
Thomi Richards (thomir-deactivatedaccount) wrote : Posted in a previous version of this proposal

Looks good to me too.

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote : Posted in a previous version of this proposal

Attempt to merge into lp:unity failed due to conflicts:

text conflict in po/POTFILES.in

Revision history for this message
Michal Hruby (mhr3) wrote : Posted in a previous version of this proposal

Can you re-sync with trunk please?

review: Needs Fixing
Revision history for this message
Gabor Kelemen (kelemeng) wrote :

Updated again to merge cleanly.

Revision history for this message
Michal Hruby (mhr3) wrote :

Looks good to me.

review: Approve
Revision history for this message
Thomi Richards (thomir-deactivatedaccount) :
review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/434/console reported an error when processing this lp:~kelemeng/unity/bug923762 branch.
Not merging it.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/POTFILES.in'
2--- po/POTFILES.in 2012-02-18 11:47:22 +0000
3+++ po/POTFILES.in 2012-03-05 15:22:21 +0000
4@@ -1,22 +1,36 @@
5+plugins/gtkloader/gtkloader.xml.in
6+plugins/networkarearegion/networkarearegion.xml.in
7+plugins/unitydialog/unitydialog.xml.in
8+plugins/unity-mt-grab-handles/unitymtgrabhandles.xml.in
9 plugins/unityshell/src/BamfLauncherIcon.cpp
10-plugins/unityshell/src/DeviceLauncherIcon.cpp
11-plugins/unityshell/src/LauncherController.cpp
12-plugins/unityshell/src/PanelMenuView.cpp
13-plugins/unityshell/src/PlacesGroup.cpp
14-plugins/unityshell/src/SpacerLauncherIcon.cpp
15-plugins/unityshell/src/TrashLauncherIcon.cpp
16 plugins/unityshell/src/BFBLauncherIcon.cpp
17-plugins/unityshell/src/SearchBar.cpp
18+plugins/unityshell/src/DashStyle.cpp
19 plugins/unityshell/src/DashView.cpp
20 plugins/unityshell/src/DesktopLauncherIcon.cpp
21+plugins/unityshell/src/DeviceLauncherIcon.cpp
22+plugins/unityshell/src/FilterAllButton.cpp
23 plugins/unityshell/src/FilterExpanderLabel.cpp
24 plugins/unityshell/src/FilterGenreWidget.cpp
25 plugins/unityshell/src/FilterMultiRangeWidget.cpp
26 plugins/unityshell/src/FilterRatingsWidget.cpp
27+plugins/unityshell/src/HudController.cpp
28+plugins/unityshell/src/HudView.cpp
29+plugins/unityshell/src/LauncherController.cpp
30+plugins/unityshell/src/PanelMenuView.cpp
31+plugins/unityshell/src/PlacesGroup.cpp
32 plugins/unityshell/src/PreviewMusic.cpp
33 plugins/unityshell/src/PreviewMusicTrack.cpp
34+plugins/unityshell/src/SearchBar.cpp
35 plugins/unityshell/src/ShortcutHintPrivate.cpp
36+plugins/unityshell/src/ShortcutView.cpp
37+plugins/unityshell/src/SoftwareCenterLauncherIcon.cpp
38+plugins/unityshell/src/SpacerLauncherIcon.cpp
39+plugins/unityshell/src/TrashLauncherIcon.cpp
40+plugins/unityshell/src/unity-dash-view-accessible.cpp
41 plugins/unityshell/src/unity-launcher-accessible.cpp
42+plugins/unityshell/src/unity-quicklist-menu-accessible.cpp
43 plugins/unityshell/src/unity-search-bar-accessible.cpp
44 plugins/unityshell/src/unityshell.cpp
45+plugins/unityshell/src/unity-switcher-accessible.cpp
46 plugins/unityshell/unityshell.xml.in
47+
48
49=== modified file 'po/POTFILES.skip'
50--- po/POTFILES.skip 2011-06-21 12:10:09 +0000
51+++ po/POTFILES.skip 2012-03-05 15:22:21 +0000
52@@ -1,1 +1,5 @@
53+standalone-clients/StandaloneHud.cpp
54+standalone-clients/TestShortcut.cpp
55+tests/test_glib_signals.cpp
56+tests/test_home_lens.cpp
57