gnome-control-center

Merge lp:~cjcurran/gnome-control-center/tuesday-fixes into lp:~ken-vandine/gnome-control-center/make-new-panel

  1. tuesday-fixes
  2. Merge into make-new-panel
Proposed by Conor Curran
Status: Merged
Merge reported by: Conor Curran
Merged at revision: not available
Proposed branch: lp:~cjcurran/gnome-control-center/tuesday-fixes
Merge into: lp:~ken-vandine/gnome-control-center/make-new-panel
Diff against target: 2189 lines (+584/-58)
84 files modified
Makefile.in (+10/-8)
configure (+46/-20)
help/Makefile.in (+6/-0)
libgnome-control-center/Makefile.in (+6/-0)
m4/intltool.m4 (+39/-20)
panels/Makefile.in (+6/-0)
panels/background/Makefile.in (+6/-0)
panels/color/Makefile.in (+6/-0)
panels/color/icons/16x16/Makefile.in (+6/-0)
panels/color/icons/22x22/Makefile.in (+6/-0)
panels/color/icons/24x24/Makefile.in (+6/-0)
panels/color/icons/256x256/Makefile.in (+6/-0)
panels/color/icons/32x32/Makefile.in (+6/-0)
panels/color/icons/48x48/Makefile.in (+6/-0)
panels/color/icons/64x64/Makefile.in (+6/-0)
panels/color/icons/Makefile.in (+6/-0)
panels/color/icons/scalable/Makefile.in (+6/-0)
panels/common/Makefile.in (+6/-0)
panels/datetime/Makefile.in (+6/-0)
panels/datetime/po-timezones/Makefile.in (+6/-0)
panels/display/Makefile.in (+6/-0)
panels/info/Makefile.in (+6/-0)
panels/keyboard/Makefile.in (+6/-0)
panels/media/Makefile.in (+6/-0)
panels/mouse/Makefile.in (+6/-0)
panels/network/Makefile.in (+6/-0)
panels/online-accounts/Makefile.in (+6/-0)
panels/online-accounts/icons/16x16/Makefile.in (+6/-0)
panels/online-accounts/icons/22x22/Makefile.in (+6/-0)
panels/online-accounts/icons/24x24/Makefile.in (+6/-0)
panels/online-accounts/icons/256x256/Makefile.in (+6/-0)
panels/online-accounts/icons/32x32/Makefile.in (+6/-0)
panels/online-accounts/icons/48x48/Makefile.in (+6/-0)
panels/online-accounts/icons/Makefile.in (+6/-0)
panels/power/Makefile.in (+6/-0)
panels/power/icons/16x16/Makefile.in (+6/-0)
panels/power/icons/22x22/Makefile.in (+6/-0)
panels/power/icons/24x24/Makefile.in (+6/-0)
panels/power/icons/256x256/Makefile.in (+6/-0)
panels/power/icons/32x32/Makefile.in (+6/-0)
panels/power/icons/48x48/Makefile.in (+6/-0)
panels/power/icons/Makefile.in (+6/-0)
panels/printers/Makefile.in (+6/-0)
panels/region/Makefile.in (+6/-0)
panels/screen/Makefile.in (+6/-0)
panels/sound-nua/Makefile.in (+6/-0)
panels/sound-nua/data/Makefile.in (+6/-0)
panels/sound-nua/gvc-mixer-control.c (+6/-6)
panels/sound/Makefile.in (+6/-0)
panels/sound/data/Makefile.in (+6/-0)
panels/sound/data/icons/16x16/Makefile.in (+6/-0)
panels/sound/data/icons/16x16/apps/Makefile.in (+6/-0)
panels/sound/data/icons/16x16/devices/Makefile.in (+6/-0)
panels/sound/data/icons/16x16/status/Makefile.in (+6/-0)
panels/sound/data/icons/22x22/Makefile.in (+6/-0)
panels/sound/data/icons/22x22/apps/Makefile.in (+6/-0)
panels/sound/data/icons/22x22/status/Makefile.in (+6/-0)
panels/sound/data/icons/24x24/Makefile.in (+6/-0)
panels/sound/data/icons/24x24/apps/Makefile.in (+6/-0)
panels/sound/data/icons/24x24/devices/Makefile.in (+6/-0)
panels/sound/data/icons/24x24/status/Makefile.in (+6/-0)
panels/sound/data/icons/32x32/Makefile.in (+6/-0)
panels/sound/data/icons/32x32/apps/Makefile.in (+6/-0)
panels/sound/data/icons/32x32/devices/Makefile.in (+6/-0)
panels/sound/data/icons/32x32/status/Makefile.in (+6/-0)
panels/sound/data/icons/48x48/Makefile.in (+6/-0)
panels/sound/data/icons/48x48/apps/Makefile.in (+6/-0)
panels/sound/data/icons/48x48/devices/Makefile.in (+6/-0)
panels/sound/data/icons/Makefile.in (+6/-0)
panels/sound/data/icons/scalable/Makefile.in (+6/-0)
panels/sound/data/icons/scalable/apps/Makefile.in (+6/-0)
panels/sound/data/icons/scalable/devices/Makefile.in (+6/-0)
panels/sound/data/sounds/Makefile.in (+6/-0)
panels/sound/data/symbolic-icons/Makefile.in (+6/-0)
panels/sound/data/symbolic-icons/scalable/Makefile.in (+6/-0)
panels/sound/data/symbolic-icons/scalable/status/Makefile.in (+6/-0)
panels/universal-access/Makefile.in (+6/-0)
panels/user-accounts/Makefile.in (+6/-0)
panels/user-accounts/data/Makefile.in (+6/-0)
panels/user-accounts/data/faces/Makefile.in (+6/-0)
panels/user-accounts/data/icons/Makefile.in (+6/-0)
panels/wacom/Makefile.in (+6/-0)
po/Makefile.in.in (+9/-4)
shell/Makefile.in (+6/-0)
To merge this branch: bzr merge lp:~cjcurran/gnome-control-center/tuesday-fixes
Reviewer Review Type Date Requested Status
Conor Curran Pending
Review via email: mp+91893@code.launchpad.net

Description of the change

Fix a crash I noticed early. A real edge case but definitely possible.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.in'
2--- Makefile.in 2012-02-03 17:46:34 +0000
3+++ Makefile.in 2012-02-07 18:18:19 +0000
4@@ -36,10 +36,9 @@
5 subdir = .
6 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
7 $(srcdir)/Makefile.in $(srcdir)/config.h.in \
8- $(top_srcdir)/configure \
9- $(top_srcdir)/panels/sound-nua/data/gnome-sound-nua-panel.desktop.in.in \
10- AUTHORS COPYING ChangeLog INSTALL NEWS TODO compile \
11- config.guess config.sub depcomp install-sh ltmain.sh missing
12+ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
13+ TODO compile config.guess config.sub depcomp install-sh \
14+ ltmain.sh missing
15 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
16 am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
17 $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
18@@ -52,8 +51,7 @@
19 configure.lineno config.status.lineno
20 mkinstalldirs = $(install_sh) -d
21 CONFIG_HEADER = config.h
22-CONFIG_CLEAN_FILES = \
23- panels/sound-nua/data/gnome-sound-nua-panel.desktop.in
24+CONFIG_CLEAN_FILES =
25 CONFIG_CLEAN_VPATH_FILES =
26 AM_V_GEN = $(am__v_GEN_$(V))
27 am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
28@@ -175,6 +173,10 @@
29 INTLTOOL_MERGE = @INTLTOOL_MERGE@
30 INTLTOOL_PERL = @INTLTOOL_PERL@
31 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
32+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
33+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
34+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
35+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
36 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
37 ISOCODES_LIBS = @ISOCODES_LIBS@
38 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
39@@ -303,6 +305,8 @@
40 includedir = @includedir@
41 infodir = @infodir@
42 install_sh = @install_sh@
43+intltool__v_merge_options_ = @intltool__v_merge_options_@
44+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
45 libdir = @libdir@
46 libexecdir = @libexecdir@
47 localedir = @localedir@
48@@ -407,8 +411,6 @@
49
50 distclean-hdr:
51 -rm -f config.h stamp-h1
52-panels/sound-nua/data/gnome-sound-nua-panel.desktop.in: $(top_builddir)/config.status $(top_srcdir)/panels/sound-nua/data/gnome-sound-nua-panel.desktop.in.in
53- cd $(top_builddir) && $(SHELL) ./config.status $@
54
55 mostlyclean-libtool:
56 -rm -f *.lo
57
58=== modified file 'configure'
59--- configure 2012-02-03 17:46:34 +0000
60+++ configure 2012-02-07 18:18:19 +0000
61@@ -726,6 +726,12 @@
62 INTLTOOL_KEYS_RULE
63 INTLTOOL_DIRECTORY_RULE
64 INTLTOOL_DESKTOP_RULE
65+intltool__v_merge_options_0
66+intltool__v_merge_options_
67+INTLTOOL_V_MERGE_OPTIONS
68+INTLTOOL__v_MERGE_0
69+INTLTOOL__v_MERGE_
70+INTLTOOL_V_MERGE
71 INTLTOOL_EXTRACT
72 INTLTOOL_MERGE
73 INTLTOOL_UPDATE
74@@ -12236,25 +12242,44 @@
75 as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5
76 fi
77
78- INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
79-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
80- INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
81- INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
82- INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@'
83- INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
84- INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
85- INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
86-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
87- INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
88- INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
89- INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u --no-translations $< $@'
90- INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
91- INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
92- INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
93- INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
94- INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
95- INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
96- INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
97+if test -z "$AM_DEFAULT_VERBOSITY"; then
98+ AM_DEFAULT_VERBOSITY=1
99+fi
100+
101+
102+INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
103+INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
104+INTLTOOL__v_MERGE_0='@echo " ITMRG " $@;'
105+
106+
107+
108+
109+INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
110+intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
111+intltool__v_merge_options_0='-q'
112+
113+
114+
115+
116+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
117+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
118+ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
119+ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
120+ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< $@'
121+ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
122+ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
123+ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
124+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
125+ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
126+ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
127+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@'
128+ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
129+ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
130+ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
131+ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
132+ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
133+ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
134+ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
135
136
137
138@@ -16597,7 +16622,7 @@
139 fi
140
141
142-ac_config_files="$ac_config_files Makefile help/Makefile libgnome-control-center/Makefile libgnome-control-center/libgnome-control-center.pc panels/Makefile panels/common/Makefile panels/background/Makefile panels/background/gnome-background-panel.desktop.in panels/datetime/Makefile panels/datetime/gnome-datetime-panel.desktop.in panels/datetime/po-timezones/Makefile panels/display/Makefile panels/display/gnome-display-panel.desktop.in panels/keyboard/Makefile panels/keyboard/gnome-keyboard-panel.desktop.in panels/keyboard/gnome-keybindings.pc panels/region/Makefile panels/region/gnome-region-panel.desktop.in panels/media/Makefile panels/media/gnome-media-panel.desktop.in panels/mouse/Makefile panels/mouse/gnome-mouse-panel.desktop.in panels/online-accounts/Makefile panels/online-accounts/gnome-online-accounts-panel.desktop.in panels/online-accounts/icons/Makefile panels/online-accounts/icons/16x16/Makefile panels/online-accounts/icons/22x22/Makefile panels/online-accounts/icons/24x24/Makefile panels/online-accounts/icons/32x32/Makefile panels/online-accounts/icons/48x48/Makefile panels/online-accounts/icons/256x256/Makefile panels/sound-nua/Makefile panels/sound-nua/data/gnome-sound-nua-panel.desktop.in panels/sound/Makefile panels/sound/data/Makefile panels/sound/data/gnome-sound-panel.desktop.in panels/sound/data/symbolic-icons/Makefile panels/sound/data/symbolic-icons/scalable/Makefile panels/sound/data/symbolic-icons/scalable/status/Makefile panels/sound/data/icons/Makefile panels/sound/data/icons/16x16/Makefile panels/sound/data/icons/16x16/apps/Makefile panels/sound/data/icons/16x16/devices/Makefile panels/sound/data/icons/16x16/status/Makefile panels/sound/data/icons/22x22/Makefile panels/sound/data/icons/22x22/apps/Makefile panels/sound/data/icons/22x22/status/Makefile panels/sound/data/icons/24x24/Makefile panels/sound/data/icons/24x24/apps/Makefile panels/sound/data/icons/24x24/devices/Makefile panels/sound/data/icons/24x24/status/Makefile panels/sound/data/icons/32x32/Makefile panels/sound/data/icons/32x32/apps/Makefile panels/sound/data/icons/32x32/devices/Makefile panels/sound/data/icons/32x32/status/Makefile panels/sound/data/icons/48x48/Makefile panels/sound/data/icons/48x48/apps/Makefile panels/sound/data/icons/48x48/devices/Makefile panels/sound/data/icons/scalable/Makefile panels/sound/data/icons/scalable/apps/Makefile panels/sound/data/icons/scalable/devices/Makefile panels/sound/data/sounds/Makefile panels/screen/Makefile panels/screen/gnome-screen-panel.desktop.in panels/info/Makefile panels/info/gnome-info-panel.desktop.in panels/power/Makefile panels/power/gnome-power-panel.desktop.in panels/power/icons/Makefile panels/power/icons/16x16/Makefile panels/power/icons/22x22/Makefile panels/power/icons/24x24/Makefile panels/power/icons/32x32/Makefile panels/power/icons/48x48/Makefile panels/power/icons/256x256/Makefile panels/color/Makefile panels/color/gnome-color-panel.desktop.in panels/color/icons/Makefile panels/color/icons/16x16/Makefile panels/color/icons/22x22/Makefile panels/color/icons/24x24/Makefile panels/color/icons/32x32/Makefile panels/color/icons/48x48/Makefile panels/color/icons/64x64/Makefile panels/color/icons/256x256/Makefile panels/color/icons/scalable/Makefile panels/printers/Makefile panels/printers/gnome-printers-panel.desktop.in panels/network/Makefile panels/network/gnome-network-panel.desktop.in panels/universal-access/Makefile panels/universal-access/gnome-universal-access-panel.desktop.in panels/user-accounts/Makefile panels/user-accounts/data/Makefile panels/user-accounts/data/gnome-user-accounts-panel.desktop.in panels/user-accounts/data/faces/Makefile panels/user-accounts/data/icons/Makefile panels/wacom/Makefile panels/wacom/gnome-wacom-panel.desktop.in po/Makefile.in shell/Makefile shell/gnome-control-center.desktop.in"
143+ac_config_files="$ac_config_files Makefile help/Makefile libgnome-control-center/Makefile libgnome-control-center/libgnome-control-center.pc panels/Makefile panels/common/Makefile panels/background/Makefile panels/background/gnome-background-panel.desktop.in panels/datetime/Makefile panels/datetime/gnome-datetime-panel.desktop.in panels/datetime/po-timezones/Makefile panels/display/Makefile panels/display/gnome-display-panel.desktop.in panels/keyboard/Makefile panels/keyboard/gnome-keyboard-panel.desktop.in panels/keyboard/gnome-keybindings.pc panels/region/Makefile panels/region/gnome-region-panel.desktop.in panels/media/Makefile panels/media/gnome-media-panel.desktop.in panels/mouse/Makefile panels/mouse/gnome-mouse-panel.desktop.in panels/online-accounts/Makefile panels/online-accounts/gnome-online-accounts-panel.desktop.in panels/online-accounts/icons/Makefile panels/online-accounts/icons/16x16/Makefile panels/online-accounts/icons/22x22/Makefile panels/online-accounts/icons/24x24/Makefile panels/online-accounts/icons/32x32/Makefile panels/online-accounts/icons/48x48/Makefile panels/online-accounts/icons/256x256/Makefile panels/sound-nua/Makefile panels/sound-nua/data/Makefile panels/sound-nua/data/gnome-sound-nua-panel.desktop.in panels/sound/Makefile panels/sound/data/Makefile panels/sound/data/gnome-sound-panel.desktop.in panels/sound/data/symbolic-icons/Makefile panels/sound/data/symbolic-icons/scalable/Makefile panels/sound/data/symbolic-icons/scalable/status/Makefile panels/sound/data/icons/Makefile panels/sound/data/icons/16x16/Makefile panels/sound/data/icons/16x16/apps/Makefile panels/sound/data/icons/16x16/devices/Makefile panels/sound/data/icons/16x16/status/Makefile panels/sound/data/icons/22x22/Makefile panels/sound/data/icons/22x22/apps/Makefile panels/sound/data/icons/22x22/status/Makefile panels/sound/data/icons/24x24/Makefile panels/sound/data/icons/24x24/apps/Makefile panels/sound/data/icons/24x24/devices/Makefile panels/sound/data/icons/24x24/status/Makefile panels/sound/data/icons/32x32/Makefile panels/sound/data/icons/32x32/apps/Makefile panels/sound/data/icons/32x32/devices/Makefile panels/sound/data/icons/32x32/status/Makefile panels/sound/data/icons/48x48/Makefile panels/sound/data/icons/48x48/apps/Makefile panels/sound/data/icons/48x48/devices/Makefile panels/sound/data/icons/scalable/Makefile panels/sound/data/icons/scalable/apps/Makefile panels/sound/data/icons/scalable/devices/Makefile panels/sound/data/sounds/Makefile panels/screen/Makefile panels/screen/gnome-screen-panel.desktop.in panels/info/Makefile panels/info/gnome-info-panel.desktop.in panels/power/Makefile panels/power/gnome-power-panel.desktop.in panels/power/icons/Makefile panels/power/icons/16x16/Makefile panels/power/icons/22x22/Makefile panels/power/icons/24x24/Makefile panels/power/icons/32x32/Makefile panels/power/icons/48x48/Makefile panels/power/icons/256x256/Makefile panels/color/Makefile panels/color/gnome-color-panel.desktop.in panels/color/icons/Makefile panels/color/icons/16x16/Makefile panels/color/icons/22x22/Makefile panels/color/icons/24x24/Makefile panels/color/icons/32x32/Makefile panels/color/icons/48x48/Makefile panels/color/icons/64x64/Makefile panels/color/icons/256x256/Makefile panels/color/icons/scalable/Makefile panels/printers/Makefile panels/printers/gnome-printers-panel.desktop.in panels/network/Makefile panels/network/gnome-network-panel.desktop.in panels/universal-access/Makefile panels/universal-access/gnome-universal-access-panel.desktop.in panels/user-accounts/Makefile panels/user-accounts/data/Makefile panels/user-accounts/data/gnome-user-accounts-panel.desktop.in panels/user-accounts/data/faces/Makefile panels/user-accounts/data/icons/Makefile panels/wacom/Makefile panels/wacom/gnome-wacom-panel.desktop.in po/Makefile.in shell/Makefile shell/gnome-control-center.desktop.in"
144
145
146 cat >confcache <<\_ACEOF
147@@ -17677,6 +17702,7 @@
148 "panels/online-accounts/icons/48x48/Makefile") CONFIG_FILES="$CONFIG_FILES panels/online-accounts/icons/48x48/Makefile" ;;
149 "panels/online-accounts/icons/256x256/Makefile") CONFIG_FILES="$CONFIG_FILES panels/online-accounts/icons/256x256/Makefile" ;;
150 "panels/sound-nua/Makefile") CONFIG_FILES="$CONFIG_FILES panels/sound-nua/Makefile" ;;
151+ "panels/sound-nua/data/Makefile") CONFIG_FILES="$CONFIG_FILES panels/sound-nua/data/Makefile" ;;
152 "panels/sound-nua/data/gnome-sound-nua-panel.desktop.in") CONFIG_FILES="$CONFIG_FILES panels/sound-nua/data/gnome-sound-nua-panel.desktop.in" ;;
153 "panels/sound/Makefile") CONFIG_FILES="$CONFIG_FILES panels/sound/Makefile" ;;
154 "panels/sound/data/Makefile") CONFIG_FILES="$CONFIG_FILES panels/sound/data/Makefile" ;;
155
156=== modified file 'help/Makefile.in'
157--- help/Makefile.in 2012-01-15 13:55:05 +0000
158+++ help/Makefile.in 2012-02-07 18:18:19 +0000
159@@ -143,6 +143,10 @@
160 INTLTOOL_MERGE = @INTLTOOL_MERGE@
161 INTLTOOL_PERL = @INTLTOOL_PERL@
162 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
163+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
164+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
165+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
166+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
167 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
168 ISOCODES_LIBS = @ISOCODES_LIBS@
169 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
170@@ -271,6 +275,8 @@
171 includedir = @includedir@
172 infodir = @infodir@
173 install_sh = @install_sh@
174+intltool__v_merge_options_ = @intltool__v_merge_options_@
175+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
176 libdir = @libdir@
177 libexecdir = @libexecdir@
178 localedir = @localedir@
179
180=== modified file 'libgnome-control-center/Makefile.in'
181--- libgnome-control-center/Makefile.in 2012-02-02 22:58:44 +0000
182+++ libgnome-control-center/Makefile.in 2012-02-07 18:18:19 +0000
183@@ -189,6 +189,10 @@
184 INTLTOOL_MERGE = @INTLTOOL_MERGE@
185 INTLTOOL_PERL = @INTLTOOL_PERL@
186 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
187+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
188+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
189+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
190+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
191 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
192 ISOCODES_LIBS = @ISOCODES_LIBS@
193 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
194@@ -317,6 +321,8 @@
195 includedir = @includedir@
196 infodir = @infodir@
197 install_sh = @install_sh@
198+intltool__v_merge_options_ = @intltool__v_merge_options_@
199+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
200 libdir = @libdir@
201 libexecdir = @libexecdir@
202 localedir = @localedir@
203
204=== modified file 'm4/intltool.m4'
205--- m4/intltool.m4 2012-02-03 17:42:04 +0000
206+++ m4/intltool.m4 2012-02-07 18:18:19 +0000
207@@ -23,7 +23,7 @@
208 ## the same distribution terms that you use for the rest of that program.
209
210 dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
211-# serial 40 IT_PROG_INTLTOOL
212+# serial 41 IT_PROG_INTLTOOL
213 AC_DEFUN([IT_PROG_INTLTOOL], [
214 AC_PREREQ([2.50])dnl
215 AC_REQUIRE([AM_NLS])dnl
216@@ -55,25 +55,44 @@
217 AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
218 fi
219
220- INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
221-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
222- INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
223- INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
224- INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
225- INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
226- INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
227- INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
228-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
229- INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
230- INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
231- INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u --no-translations $< [$]@'
232- INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
233- INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
234- INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
235- INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
236- INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
237- INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
238- INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
239+if test -z "$AM_DEFAULT_VERBOSITY"; then
240+ AM_DEFAULT_VERBOSITY=1
241+fi
242+AC_SUBST([AM_DEFAULT_VERBOSITY])
243+
244+INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
245+INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
246+INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;'
247+AC_SUBST(INTLTOOL_V_MERGE)
248+AC_SUBST(INTLTOOL__v_MERGE_)
249+AC_SUBST(INTLTOOL__v_MERGE_0)
250+
251+INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
252+intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
253+intltool__v_merge_options_0='-q'
254+AC_SUBST(INTLTOOL_V_MERGE_OPTIONS)
255+AC_SUBST(intltool__v_merge_options_)
256+AC_SUBST(intltool__v_merge_options_0)
257+
258+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
259+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
260+ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
261+ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
262+ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@'
263+ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
264+ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
265+ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
266+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
267+ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
268+ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
269+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@'
270+ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
271+ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
272+ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
273+ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
274+ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
275+ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
276+ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
277
278 _IT_SUBST(INTLTOOL_DESKTOP_RULE)
279 _IT_SUBST(INTLTOOL_DIRECTORY_RULE)
280
281=== modified file 'panels/Makefile.in'
282--- panels/Makefile.in 2012-02-02 22:58:44 +0000
283+++ panels/Makefile.in 2012-02-07 18:18:19 +0000
284@@ -162,6 +162,10 @@
285 INTLTOOL_MERGE = @INTLTOOL_MERGE@
286 INTLTOOL_PERL = @INTLTOOL_PERL@
287 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
288+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
289+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
290+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
291+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
292 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
293 ISOCODES_LIBS = @ISOCODES_LIBS@
294 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
295@@ -290,6 +294,8 @@
296 includedir = @includedir@
297 infodir = @infodir@
298 install_sh = @install_sh@
299+intltool__v_merge_options_ = @intltool__v_merge_options_@
300+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
301 libdir = @libdir@
302 libexecdir = @libexecdir@
303 localedir = @localedir@
304
305=== modified file 'panels/background/Makefile.in'
306--- panels/background/Makefile.in 2012-01-15 13:55:05 +0000
307+++ panels/background/Makefile.in 2012-02-07 18:18:19 +0000
308@@ -201,6 +201,10 @@
309 INTLTOOL_MERGE = @INTLTOOL_MERGE@
310 INTLTOOL_PERL = @INTLTOOL_PERL@
311 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
312+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
313+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
314+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
315+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
316 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
317 ISOCODES_LIBS = @ISOCODES_LIBS@
318 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
319@@ -329,6 +333,8 @@
320 includedir = @includedir@
321 infodir = @infodir@
322 install_sh = @install_sh@
323+intltool__v_merge_options_ = @intltool__v_merge_options_@
324+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
325 libdir = @libdir@
326 libexecdir = @libexecdir@
327 localedir = @localedir@
328
329=== modified file 'panels/color/Makefile.in'
330--- panels/color/Makefile.in 2012-01-15 13:55:05 +0000
331+++ panels/color/Makefile.in 2012-02-07 18:18:19 +0000
332@@ -217,6 +217,10 @@
333 INTLTOOL_MERGE = @INTLTOOL_MERGE@
334 INTLTOOL_PERL = @INTLTOOL_PERL@
335 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
336+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
337+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
338+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
339+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
340 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
341 ISOCODES_LIBS = @ISOCODES_LIBS@
342 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
343@@ -345,6 +349,8 @@
344 includedir = @includedir@
345 infodir = @infodir@
346 install_sh = @install_sh@
347+intltool__v_merge_options_ = @intltool__v_merge_options_@
348+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
349 libdir = @libdir@
350 libexecdir = @libexecdir@
351 localedir = @localedir@
352
353=== modified file 'panels/color/icons/16x16/Makefile.in'
354--- panels/color/icons/16x16/Makefile.in 2012-01-15 13:55:05 +0000
355+++ panels/color/icons/16x16/Makefile.in 2012-02-07 18:18:19 +0000
356@@ -142,6 +142,10 @@
357 INTLTOOL_MERGE = @INTLTOOL_MERGE@
358 INTLTOOL_PERL = @INTLTOOL_PERL@
359 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
360+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
361+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
362+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
363+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
364 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
365 ISOCODES_LIBS = @ISOCODES_LIBS@
366 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
367@@ -270,6 +274,8 @@
368 includedir = @includedir@
369 infodir = @infodir@
370 install_sh = @install_sh@
371+intltool__v_merge_options_ = @intltool__v_merge_options_@
372+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
373 libdir = @libdir@
374 libexecdir = @libexecdir@
375 localedir = @localedir@
376
377=== modified file 'panels/color/icons/22x22/Makefile.in'
378--- panels/color/icons/22x22/Makefile.in 2012-01-15 13:55:05 +0000
379+++ panels/color/icons/22x22/Makefile.in 2012-02-07 18:18:19 +0000
380@@ -142,6 +142,10 @@
381 INTLTOOL_MERGE = @INTLTOOL_MERGE@
382 INTLTOOL_PERL = @INTLTOOL_PERL@
383 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
384+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
385+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
386+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
387+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
388 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
389 ISOCODES_LIBS = @ISOCODES_LIBS@
390 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
391@@ -270,6 +274,8 @@
392 includedir = @includedir@
393 infodir = @infodir@
394 install_sh = @install_sh@
395+intltool__v_merge_options_ = @intltool__v_merge_options_@
396+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
397 libdir = @libdir@
398 libexecdir = @libexecdir@
399 localedir = @localedir@
400
401=== modified file 'panels/color/icons/24x24/Makefile.in'
402--- panels/color/icons/24x24/Makefile.in 2012-01-15 13:55:05 +0000
403+++ panels/color/icons/24x24/Makefile.in 2012-02-07 18:18:19 +0000
404@@ -142,6 +142,10 @@
405 INTLTOOL_MERGE = @INTLTOOL_MERGE@
406 INTLTOOL_PERL = @INTLTOOL_PERL@
407 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
408+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
409+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
410+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
411+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
412 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
413 ISOCODES_LIBS = @ISOCODES_LIBS@
414 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
415@@ -270,6 +274,8 @@
416 includedir = @includedir@
417 infodir = @infodir@
418 install_sh = @install_sh@
419+intltool__v_merge_options_ = @intltool__v_merge_options_@
420+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
421 libdir = @libdir@
422 libexecdir = @libexecdir@
423 localedir = @localedir@
424
425=== modified file 'panels/color/icons/256x256/Makefile.in'
426--- panels/color/icons/256x256/Makefile.in 2012-01-15 13:55:05 +0000
427+++ panels/color/icons/256x256/Makefile.in 2012-02-07 18:18:19 +0000
428@@ -142,6 +142,10 @@
429 INTLTOOL_MERGE = @INTLTOOL_MERGE@
430 INTLTOOL_PERL = @INTLTOOL_PERL@
431 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
432+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
433+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
434+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
435+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
436 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
437 ISOCODES_LIBS = @ISOCODES_LIBS@
438 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
439@@ -270,6 +274,8 @@
440 includedir = @includedir@
441 infodir = @infodir@
442 install_sh = @install_sh@
443+intltool__v_merge_options_ = @intltool__v_merge_options_@
444+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
445 libdir = @libdir@
446 libexecdir = @libexecdir@
447 localedir = @localedir@
448
449=== modified file 'panels/color/icons/32x32/Makefile.in'
450--- panels/color/icons/32x32/Makefile.in 2012-01-15 13:55:05 +0000
451+++ panels/color/icons/32x32/Makefile.in 2012-02-07 18:18:19 +0000
452@@ -142,6 +142,10 @@
453 INTLTOOL_MERGE = @INTLTOOL_MERGE@
454 INTLTOOL_PERL = @INTLTOOL_PERL@
455 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
456+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
457+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
458+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
459+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
460 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
461 ISOCODES_LIBS = @ISOCODES_LIBS@
462 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
463@@ -270,6 +274,8 @@
464 includedir = @includedir@
465 infodir = @infodir@
466 install_sh = @install_sh@
467+intltool__v_merge_options_ = @intltool__v_merge_options_@
468+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
469 libdir = @libdir@
470 libexecdir = @libexecdir@
471 localedir = @localedir@
472
473=== modified file 'panels/color/icons/48x48/Makefile.in'
474--- panels/color/icons/48x48/Makefile.in 2012-01-15 13:55:05 +0000
475+++ panels/color/icons/48x48/Makefile.in 2012-02-07 18:18:19 +0000
476@@ -142,6 +142,10 @@
477 INTLTOOL_MERGE = @INTLTOOL_MERGE@
478 INTLTOOL_PERL = @INTLTOOL_PERL@
479 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
480+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
481+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
482+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
483+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
484 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
485 ISOCODES_LIBS = @ISOCODES_LIBS@
486 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
487@@ -270,6 +274,8 @@
488 includedir = @includedir@
489 infodir = @infodir@
490 install_sh = @install_sh@
491+intltool__v_merge_options_ = @intltool__v_merge_options_@
492+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
493 libdir = @libdir@
494 libexecdir = @libexecdir@
495 localedir = @localedir@
496
497=== modified file 'panels/color/icons/64x64/Makefile.in'
498--- panels/color/icons/64x64/Makefile.in 2012-01-15 13:55:05 +0000
499+++ panels/color/icons/64x64/Makefile.in 2012-02-07 18:18:19 +0000
500@@ -142,6 +142,10 @@
501 INTLTOOL_MERGE = @INTLTOOL_MERGE@
502 INTLTOOL_PERL = @INTLTOOL_PERL@
503 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
504+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
505+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
506+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
507+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
508 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
509 ISOCODES_LIBS = @ISOCODES_LIBS@
510 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
511@@ -270,6 +274,8 @@
512 includedir = @includedir@
513 infodir = @infodir@
514 install_sh = @install_sh@
515+intltool__v_merge_options_ = @intltool__v_merge_options_@
516+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
517 libdir = @libdir@
518 libexecdir = @libexecdir@
519 localedir = @localedir@
520
521=== modified file 'panels/color/icons/Makefile.in'
522--- panels/color/icons/Makefile.in 2012-01-15 13:55:05 +0000
523+++ panels/color/icons/Makefile.in 2012-02-07 18:18:19 +0000
524@@ -158,6 +158,10 @@
525 INTLTOOL_MERGE = @INTLTOOL_MERGE@
526 INTLTOOL_PERL = @INTLTOOL_PERL@
527 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
528+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
529+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
530+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
531+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
532 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
533 ISOCODES_LIBS = @ISOCODES_LIBS@
534 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
535@@ -286,6 +290,8 @@
536 includedir = @includedir@
537 infodir = @infodir@
538 install_sh = @install_sh@
539+intltool__v_merge_options_ = @intltool__v_merge_options_@
540+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
541 libdir = @libdir@
542 libexecdir = @libexecdir@
543 localedir = @localedir@
544
545=== modified file 'panels/color/icons/scalable/Makefile.in'
546--- panels/color/icons/scalable/Makefile.in 2012-01-15 13:55:05 +0000
547+++ panels/color/icons/scalable/Makefile.in 2012-02-07 18:18:19 +0000
548@@ -142,6 +142,10 @@
549 INTLTOOL_MERGE = @INTLTOOL_MERGE@
550 INTLTOOL_PERL = @INTLTOOL_PERL@
551 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
552+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
553+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
554+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
555+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
556 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
557 ISOCODES_LIBS = @ISOCODES_LIBS@
558 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
559@@ -270,6 +274,8 @@
560 includedir = @includedir@
561 infodir = @infodir@
562 install_sh = @install_sh@
563+intltool__v_merge_options_ = @intltool__v_merge_options_@
564+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
565 libdir = @libdir@
566 libexecdir = @libexecdir@
567 localedir = @localedir@
568
569=== modified file 'panels/common/Makefile.in'
570--- panels/common/Makefile.in 2012-01-15 13:55:05 +0000
571+++ panels/common/Makefile.in 2012-02-07 18:18:19 +0000
572@@ -200,6 +200,10 @@
573 INTLTOOL_MERGE = @INTLTOOL_MERGE@
574 INTLTOOL_PERL = @INTLTOOL_PERL@
575 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
576+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
577+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
578+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
579+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
580 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
581 ISOCODES_LIBS = @ISOCODES_LIBS@
582 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
583@@ -328,6 +332,8 @@
584 includedir = @includedir@
585 infodir = @infodir@
586 install_sh = @install_sh@
587+intltool__v_merge_options_ = @intltool__v_merge_options_@
588+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
589 libdir = @libdir@
590 libexecdir = @libexecdir@
591 localedir = @localedir@
592
593=== modified file 'panels/datetime/Makefile.in'
594--- panels/datetime/Makefile.in 2012-01-15 13:55:05 +0000
595+++ panels/datetime/Makefile.in 2012-02-07 18:18:19 +0000
596@@ -260,6 +260,10 @@
597 INTLTOOL_MERGE = @INTLTOOL_MERGE@
598 INTLTOOL_PERL = @INTLTOOL_PERL@
599 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
600+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
601+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
602+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
603+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
604 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
605 ISOCODES_LIBS = @ISOCODES_LIBS@
606 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
607@@ -388,6 +392,8 @@
608 includedir = @includedir@
609 infodir = @infodir@
610 install_sh = @install_sh@
611+intltool__v_merge_options_ = @intltool__v_merge_options_@
612+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
613 libdir = @libdir@
614 libexecdir = @libexecdir@
615 localedir = @localedir@
616
617=== modified file 'panels/datetime/po-timezones/Makefile.in'
618--- panels/datetime/po-timezones/Makefile.in 2012-01-15 13:55:05 +0000
619+++ panels/datetime/po-timezones/Makefile.in 2012-02-07 18:18:19 +0000
620@@ -118,6 +118,10 @@
621 INTLTOOL_MERGE = @INTLTOOL_MERGE@
622 INTLTOOL_PERL = @INTLTOOL_PERL@
623 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
624+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
625+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
626+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
627+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
628 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
629 ISOCODES_LIBS = @ISOCODES_LIBS@
630 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
631@@ -246,6 +250,8 @@
632 includedir = @includedir@
633 infodir = @infodir@
634 install_sh = @install_sh@
635+intltool__v_merge_options_ = @intltool__v_merge_options_@
636+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
637 libdir = @libdir@
638 libexecdir = @libexecdir@
639 localedir = @localedir@
640
641=== modified file 'panels/display/Makefile.in'
642--- panels/display/Makefile.in 2012-01-15 13:55:05 +0000
643+++ panels/display/Makefile.in 2012-02-07 18:18:19 +0000
644@@ -188,6 +188,10 @@
645 INTLTOOL_MERGE = @INTLTOOL_MERGE@
646 INTLTOOL_PERL = @INTLTOOL_PERL@
647 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
648+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
649+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
650+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
651+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
652 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
653 ISOCODES_LIBS = @ISOCODES_LIBS@
654 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
655@@ -316,6 +320,8 @@
656 includedir = @includedir@
657 infodir = @infodir@
658 install_sh = @install_sh@
659+intltool__v_merge_options_ = @intltool__v_merge_options_@
660+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
661 libdir = @libdir@
662 libexecdir = @libexecdir@
663 localedir = @localedir@
664
665=== modified file 'panels/info/Makefile.in'
666--- panels/info/Makefile.in 2012-01-15 13:55:05 +0000
667+++ panels/info/Makefile.in 2012-02-07 18:18:19 +0000
668@@ -190,6 +190,10 @@
669 INTLTOOL_MERGE = @INTLTOOL_MERGE@
670 INTLTOOL_PERL = @INTLTOOL_PERL@
671 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
672+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
673+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
674+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
675+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
676 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
677 ISOCODES_LIBS = @ISOCODES_LIBS@
678 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
679@@ -318,6 +322,8 @@
680 includedir = @includedir@
681 infodir = @infodir@
682 install_sh = @install_sh@
683+intltool__v_merge_options_ = @intltool__v_merge_options_@
684+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
685 libdir = @libdir@
686 libexecdir = @libexecdir@
687 localedir = @localedir@
688
689=== modified file 'panels/keyboard/Makefile.in'
690--- panels/keyboard/Makefile.in 2012-01-15 13:55:05 +0000
691+++ panels/keyboard/Makefile.in 2012-02-07 18:18:19 +0000
692@@ -189,6 +189,10 @@
693 INTLTOOL_MERGE = @INTLTOOL_MERGE@
694 INTLTOOL_PERL = @INTLTOOL_PERL@
695 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
696+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
697+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
698+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
699+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
700 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
701 ISOCODES_LIBS = @ISOCODES_LIBS@
702 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
703@@ -317,6 +321,8 @@
704 includedir = @includedir@
705 infodir = @infodir@
706 install_sh = @install_sh@
707+intltool__v_merge_options_ = @intltool__v_merge_options_@
708+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
709 libdir = @libdir@
710 libexecdir = @libexecdir@
711 localedir = @localedir@
712
713=== modified file 'panels/media/Makefile.in'
714--- panels/media/Makefile.in 2012-01-15 13:55:05 +0000
715+++ panels/media/Makefile.in 2012-02-07 18:18:19 +0000
716@@ -179,6 +179,10 @@
717 INTLTOOL_MERGE = @INTLTOOL_MERGE@
718 INTLTOOL_PERL = @INTLTOOL_PERL@
719 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
720+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
721+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
722+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
723+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
724 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
725 ISOCODES_LIBS = @ISOCODES_LIBS@
726 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
727@@ -307,6 +311,8 @@
728 includedir = @includedir@
729 infodir = @infodir@
730 install_sh = @install_sh@
731+intltool__v_merge_options_ = @intltool__v_merge_options_@
732+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
733 libdir = @libdir@
734 libexecdir = @libexecdir@
735 localedir = @localedir@
736
737=== modified file 'panels/mouse/Makefile.in'
738--- panels/mouse/Makefile.in 2012-01-15 13:55:05 +0000
739+++ panels/mouse/Makefile.in 2012-02-07 18:18:19 +0000
740@@ -181,6 +181,10 @@
741 INTLTOOL_MERGE = @INTLTOOL_MERGE@
742 INTLTOOL_PERL = @INTLTOOL_PERL@
743 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
744+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
745+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
746+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
747+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
748 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
749 ISOCODES_LIBS = @ISOCODES_LIBS@
750 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
751@@ -309,6 +313,8 @@
752 includedir = @includedir@
753 infodir = @infodir@
754 install_sh = @install_sh@
755+intltool__v_merge_options_ = @intltool__v_merge_options_@
756+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
757 libdir = @libdir@
758 libexecdir = @libexecdir@
759 localedir = @localedir@
760
761=== modified file 'panels/network/Makefile.in'
762--- panels/network/Makefile.in 2012-01-15 13:55:05 +0000
763+++ panels/network/Makefile.in 2012-02-07 18:18:19 +0000
764@@ -184,6 +184,10 @@
765 INTLTOOL_MERGE = @INTLTOOL_MERGE@
766 INTLTOOL_PERL = @INTLTOOL_PERL@
767 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
768+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
769+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
770+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
771+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
772 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
773 ISOCODES_LIBS = @ISOCODES_LIBS@
774 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
775@@ -312,6 +316,8 @@
776 includedir = @includedir@
777 infodir = @infodir@
778 install_sh = @install_sh@
779+intltool__v_merge_options_ = @intltool__v_merge_options_@
780+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
781 libdir = @libdir@
782 libexecdir = @libexecdir@
783 localedir = @localedir@
784
785=== modified file 'panels/online-accounts/Makefile.in'
786--- panels/online-accounts/Makefile.in 2012-01-15 13:55:05 +0000
787+++ panels/online-accounts/Makefile.in 2012-02-07 18:18:19 +0000
788@@ -220,6 +220,10 @@
789 INTLTOOL_MERGE = @INTLTOOL_MERGE@
790 INTLTOOL_PERL = @INTLTOOL_PERL@
791 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
792+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
793+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
794+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
795+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
796 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
797 ISOCODES_LIBS = @ISOCODES_LIBS@
798 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
799@@ -348,6 +352,8 @@
800 includedir = @includedir@
801 infodir = @infodir@
802 install_sh = @install_sh@
803+intltool__v_merge_options_ = @intltool__v_merge_options_@
804+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
805 libdir = @libdir@
806 libexecdir = @libexecdir@
807 localedir = @localedir@
808
809=== modified file 'panels/online-accounts/icons/16x16/Makefile.in'
810--- panels/online-accounts/icons/16x16/Makefile.in 2012-01-15 13:55:05 +0000
811+++ panels/online-accounts/icons/16x16/Makefile.in 2012-02-07 18:18:19 +0000
812@@ -142,6 +142,10 @@
813 INTLTOOL_MERGE = @INTLTOOL_MERGE@
814 INTLTOOL_PERL = @INTLTOOL_PERL@
815 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
816+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
817+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
818+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
819+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
820 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
821 ISOCODES_LIBS = @ISOCODES_LIBS@
822 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
823@@ -270,6 +274,8 @@
824 includedir = @includedir@
825 infodir = @infodir@
826 install_sh = @install_sh@
827+intltool__v_merge_options_ = @intltool__v_merge_options_@
828+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
829 libdir = @libdir@
830 libexecdir = @libexecdir@
831 localedir = @localedir@
832
833=== modified file 'panels/online-accounts/icons/22x22/Makefile.in'
834--- panels/online-accounts/icons/22x22/Makefile.in 2012-01-15 13:55:05 +0000
835+++ panels/online-accounts/icons/22x22/Makefile.in 2012-02-07 18:18:19 +0000
836@@ -142,6 +142,10 @@
837 INTLTOOL_MERGE = @INTLTOOL_MERGE@
838 INTLTOOL_PERL = @INTLTOOL_PERL@
839 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
840+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
841+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
842+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
843+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
844 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
845 ISOCODES_LIBS = @ISOCODES_LIBS@
846 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
847@@ -270,6 +274,8 @@
848 includedir = @includedir@
849 infodir = @infodir@
850 install_sh = @install_sh@
851+intltool__v_merge_options_ = @intltool__v_merge_options_@
852+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
853 libdir = @libdir@
854 libexecdir = @libexecdir@
855 localedir = @localedir@
856
857=== modified file 'panels/online-accounts/icons/24x24/Makefile.in'
858--- panels/online-accounts/icons/24x24/Makefile.in 2012-01-15 13:55:05 +0000
859+++ panels/online-accounts/icons/24x24/Makefile.in 2012-02-07 18:18:19 +0000
860@@ -142,6 +142,10 @@
861 INTLTOOL_MERGE = @INTLTOOL_MERGE@
862 INTLTOOL_PERL = @INTLTOOL_PERL@
863 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
864+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
865+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
866+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
867+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
868 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
869 ISOCODES_LIBS = @ISOCODES_LIBS@
870 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
871@@ -270,6 +274,8 @@
872 includedir = @includedir@
873 infodir = @infodir@
874 install_sh = @install_sh@
875+intltool__v_merge_options_ = @intltool__v_merge_options_@
876+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
877 libdir = @libdir@
878 libexecdir = @libexecdir@
879 localedir = @localedir@
880
881=== modified file 'panels/online-accounts/icons/256x256/Makefile.in'
882--- panels/online-accounts/icons/256x256/Makefile.in 2012-01-15 13:55:05 +0000
883+++ panels/online-accounts/icons/256x256/Makefile.in 2012-02-07 18:18:19 +0000
884@@ -142,6 +142,10 @@
885 INTLTOOL_MERGE = @INTLTOOL_MERGE@
886 INTLTOOL_PERL = @INTLTOOL_PERL@
887 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
888+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
889+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
890+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
891+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
892 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
893 ISOCODES_LIBS = @ISOCODES_LIBS@
894 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
895@@ -270,6 +274,8 @@
896 includedir = @includedir@
897 infodir = @infodir@
898 install_sh = @install_sh@
899+intltool__v_merge_options_ = @intltool__v_merge_options_@
900+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
901 libdir = @libdir@
902 libexecdir = @libexecdir@
903 localedir = @localedir@
904
905=== modified file 'panels/online-accounts/icons/32x32/Makefile.in'
906--- panels/online-accounts/icons/32x32/Makefile.in 2012-01-15 13:55:05 +0000
907+++ panels/online-accounts/icons/32x32/Makefile.in 2012-02-07 18:18:19 +0000
908@@ -142,6 +142,10 @@
909 INTLTOOL_MERGE = @INTLTOOL_MERGE@
910 INTLTOOL_PERL = @INTLTOOL_PERL@
911 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
912+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
913+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
914+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
915+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
916 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
917 ISOCODES_LIBS = @ISOCODES_LIBS@
918 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
919@@ -270,6 +274,8 @@
920 includedir = @includedir@
921 infodir = @infodir@
922 install_sh = @install_sh@
923+intltool__v_merge_options_ = @intltool__v_merge_options_@
924+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
925 libdir = @libdir@
926 libexecdir = @libexecdir@
927 localedir = @localedir@
928
929=== modified file 'panels/online-accounts/icons/48x48/Makefile.in'
930--- panels/online-accounts/icons/48x48/Makefile.in 2012-01-15 13:55:05 +0000
931+++ panels/online-accounts/icons/48x48/Makefile.in 2012-02-07 18:18:19 +0000
932@@ -142,6 +142,10 @@
933 INTLTOOL_MERGE = @INTLTOOL_MERGE@
934 INTLTOOL_PERL = @INTLTOOL_PERL@
935 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
936+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
937+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
938+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
939+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
940 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
941 ISOCODES_LIBS = @ISOCODES_LIBS@
942 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
943@@ -270,6 +274,8 @@
944 includedir = @includedir@
945 infodir = @infodir@
946 install_sh = @install_sh@
947+intltool__v_merge_options_ = @intltool__v_merge_options_@
948+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
949 libdir = @libdir@
950 libexecdir = @libexecdir@
951 localedir = @localedir@
952
953=== modified file 'panels/online-accounts/icons/Makefile.in'
954--- panels/online-accounts/icons/Makefile.in 2012-01-15 13:55:05 +0000
955+++ panels/online-accounts/icons/Makefile.in 2012-02-07 18:18:19 +0000
956@@ -158,6 +158,10 @@
957 INTLTOOL_MERGE = @INTLTOOL_MERGE@
958 INTLTOOL_PERL = @INTLTOOL_PERL@
959 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
960+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
961+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
962+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
963+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
964 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
965 ISOCODES_LIBS = @ISOCODES_LIBS@
966 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
967@@ -286,6 +290,8 @@
968 includedir = @includedir@
969 infodir = @infodir@
970 install_sh = @install_sh@
971+intltool__v_merge_options_ = @intltool__v_merge_options_@
972+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
973 libdir = @libdir@
974 libexecdir = @libexecdir@
975 localedir = @localedir@
976
977=== modified file 'panels/power/Makefile.in'
978--- panels/power/Makefile.in 2012-01-15 13:55:05 +0000
979+++ panels/power/Makefile.in 2012-02-07 18:18:19 +0000
980@@ -217,6 +217,10 @@
981 INTLTOOL_MERGE = @INTLTOOL_MERGE@
982 INTLTOOL_PERL = @INTLTOOL_PERL@
983 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
984+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
985+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
986+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
987+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
988 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
989 ISOCODES_LIBS = @ISOCODES_LIBS@
990 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
991@@ -345,6 +349,8 @@
992 includedir = @includedir@
993 infodir = @infodir@
994 install_sh = @install_sh@
995+intltool__v_merge_options_ = @intltool__v_merge_options_@
996+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
997 libdir = @libdir@
998 libexecdir = @libexecdir@
999 localedir = @localedir@
1000
1001=== modified file 'panels/power/icons/16x16/Makefile.in'
1002--- panels/power/icons/16x16/Makefile.in 2012-01-15 13:55:05 +0000
1003+++ panels/power/icons/16x16/Makefile.in 2012-02-07 18:18:19 +0000
1004@@ -142,6 +142,10 @@
1005 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1006 INTLTOOL_PERL = @INTLTOOL_PERL@
1007 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1008+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1009+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1010+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1011+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1012 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1013 ISOCODES_LIBS = @ISOCODES_LIBS@
1014 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1015@@ -270,6 +274,8 @@
1016 includedir = @includedir@
1017 infodir = @infodir@
1018 install_sh = @install_sh@
1019+intltool__v_merge_options_ = @intltool__v_merge_options_@
1020+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1021 libdir = @libdir@
1022 libexecdir = @libexecdir@
1023 localedir = @localedir@
1024
1025=== modified file 'panels/power/icons/22x22/Makefile.in'
1026--- panels/power/icons/22x22/Makefile.in 2012-01-15 13:55:05 +0000
1027+++ panels/power/icons/22x22/Makefile.in 2012-02-07 18:18:19 +0000
1028@@ -142,6 +142,10 @@
1029 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1030 INTLTOOL_PERL = @INTLTOOL_PERL@
1031 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1032+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1033+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1034+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1035+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1036 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1037 ISOCODES_LIBS = @ISOCODES_LIBS@
1038 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1039@@ -270,6 +274,8 @@
1040 includedir = @includedir@
1041 infodir = @infodir@
1042 install_sh = @install_sh@
1043+intltool__v_merge_options_ = @intltool__v_merge_options_@
1044+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1045 libdir = @libdir@
1046 libexecdir = @libexecdir@
1047 localedir = @localedir@
1048
1049=== modified file 'panels/power/icons/24x24/Makefile.in'
1050--- panels/power/icons/24x24/Makefile.in 2012-01-15 13:55:05 +0000
1051+++ panels/power/icons/24x24/Makefile.in 2012-02-07 18:18:19 +0000
1052@@ -142,6 +142,10 @@
1053 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1054 INTLTOOL_PERL = @INTLTOOL_PERL@
1055 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1056+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1057+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1058+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1059+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1060 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1061 ISOCODES_LIBS = @ISOCODES_LIBS@
1062 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1063@@ -270,6 +274,8 @@
1064 includedir = @includedir@
1065 infodir = @infodir@
1066 install_sh = @install_sh@
1067+intltool__v_merge_options_ = @intltool__v_merge_options_@
1068+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1069 libdir = @libdir@
1070 libexecdir = @libexecdir@
1071 localedir = @localedir@
1072
1073=== modified file 'panels/power/icons/256x256/Makefile.in'
1074--- panels/power/icons/256x256/Makefile.in 2012-01-15 13:55:05 +0000
1075+++ panels/power/icons/256x256/Makefile.in 2012-02-07 18:18:19 +0000
1076@@ -142,6 +142,10 @@
1077 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1078 INTLTOOL_PERL = @INTLTOOL_PERL@
1079 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1080+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1081+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1082+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1083+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1084 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1085 ISOCODES_LIBS = @ISOCODES_LIBS@
1086 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1087@@ -270,6 +274,8 @@
1088 includedir = @includedir@
1089 infodir = @infodir@
1090 install_sh = @install_sh@
1091+intltool__v_merge_options_ = @intltool__v_merge_options_@
1092+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1093 libdir = @libdir@
1094 libexecdir = @libexecdir@
1095 localedir = @localedir@
1096
1097=== modified file 'panels/power/icons/32x32/Makefile.in'
1098--- panels/power/icons/32x32/Makefile.in 2012-01-15 13:55:05 +0000
1099+++ panels/power/icons/32x32/Makefile.in 2012-02-07 18:18:19 +0000
1100@@ -142,6 +142,10 @@
1101 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1102 INTLTOOL_PERL = @INTLTOOL_PERL@
1103 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1104+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1105+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1106+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1107+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1108 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1109 ISOCODES_LIBS = @ISOCODES_LIBS@
1110 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1111@@ -270,6 +274,8 @@
1112 includedir = @includedir@
1113 infodir = @infodir@
1114 install_sh = @install_sh@
1115+intltool__v_merge_options_ = @intltool__v_merge_options_@
1116+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1117 libdir = @libdir@
1118 libexecdir = @libexecdir@
1119 localedir = @localedir@
1120
1121=== modified file 'panels/power/icons/48x48/Makefile.in'
1122--- panels/power/icons/48x48/Makefile.in 2012-01-15 13:55:05 +0000
1123+++ panels/power/icons/48x48/Makefile.in 2012-02-07 18:18:19 +0000
1124@@ -142,6 +142,10 @@
1125 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1126 INTLTOOL_PERL = @INTLTOOL_PERL@
1127 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1128+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1129+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1130+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1131+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1132 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1133 ISOCODES_LIBS = @ISOCODES_LIBS@
1134 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1135@@ -270,6 +274,8 @@
1136 includedir = @includedir@
1137 infodir = @infodir@
1138 install_sh = @install_sh@
1139+intltool__v_merge_options_ = @intltool__v_merge_options_@
1140+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1141 libdir = @libdir@
1142 libexecdir = @libexecdir@
1143 localedir = @localedir@
1144
1145=== modified file 'panels/power/icons/Makefile.in'
1146--- panels/power/icons/Makefile.in 2012-01-15 13:55:05 +0000
1147+++ panels/power/icons/Makefile.in 2012-02-07 18:18:19 +0000
1148@@ -158,6 +158,10 @@
1149 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1150 INTLTOOL_PERL = @INTLTOOL_PERL@
1151 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1152+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1153+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1154+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1155+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1156 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1157 ISOCODES_LIBS = @ISOCODES_LIBS@
1158 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1159@@ -286,6 +290,8 @@
1160 includedir = @includedir@
1161 infodir = @infodir@
1162 install_sh = @install_sh@
1163+intltool__v_merge_options_ = @intltool__v_merge_options_@
1164+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1165 libdir = @libdir@
1166 libexecdir = @libexecdir@
1167 localedir = @localedir@
1168
1169=== modified file 'panels/printers/Makefile.in'
1170--- panels/printers/Makefile.in 2012-01-15 13:55:05 +0000
1171+++ panels/printers/Makefile.in 2012-02-07 18:18:19 +0000
1172@@ -182,6 +182,10 @@
1173 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1174 INTLTOOL_PERL = @INTLTOOL_PERL@
1175 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1176+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1177+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1178+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1179+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1180 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1181 ISOCODES_LIBS = @ISOCODES_LIBS@
1182 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1183@@ -310,6 +314,8 @@
1184 includedir = @includedir@
1185 infodir = @infodir@
1186 install_sh = @install_sh@
1187+intltool__v_merge_options_ = @intltool__v_merge_options_@
1188+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1189 libdir = @libdir@
1190 libexecdir = @libexecdir@
1191 localedir = @localedir@
1192
1193=== modified file 'panels/region/Makefile.in'
1194--- panels/region/Makefile.in 2012-01-15 13:55:05 +0000
1195+++ panels/region/Makefile.in 2012-02-07 18:18:19 +0000
1196@@ -183,6 +183,10 @@
1197 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1198 INTLTOOL_PERL = @INTLTOOL_PERL@
1199 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1200+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1201+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1202+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1203+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1204 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1205 ISOCODES_LIBS = @ISOCODES_LIBS@
1206 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1207@@ -311,6 +315,8 @@
1208 includedir = @includedir@
1209 infodir = @infodir@
1210 install_sh = @install_sh@
1211+intltool__v_merge_options_ = @intltool__v_merge_options_@
1212+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1213 libdir = @libdir@
1214 libexecdir = @libexecdir@
1215 localedir = @localedir@
1216
1217=== modified file 'panels/screen/Makefile.in'
1218--- panels/screen/Makefile.in 2012-01-15 13:55:05 +0000
1219+++ panels/screen/Makefile.in 2012-02-07 18:18:19 +0000
1220@@ -180,6 +180,10 @@
1221 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1222 INTLTOOL_PERL = @INTLTOOL_PERL@
1223 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1224+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1225+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1226+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1227+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1228 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1229 ISOCODES_LIBS = @ISOCODES_LIBS@
1230 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1231@@ -308,6 +312,8 @@
1232 includedir = @includedir@
1233 infodir = @infodir@
1234 install_sh = @install_sh@
1235+intltool__v_merge_options_ = @intltool__v_merge_options_@
1236+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1237 libdir = @libdir@
1238 libexecdir = @libexecdir@
1239 localedir = @localedir@
1240
1241=== modified file 'panels/sound-nua/Makefile.in'
1242--- panels/sound-nua/Makefile.in 2012-02-03 17:46:34 +0000
1243+++ panels/sound-nua/Makefile.in 2012-02-07 18:18:19 +0000
1244@@ -229,6 +229,10 @@
1245 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1246 INTLTOOL_PERL = @INTLTOOL_PERL@
1247 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1248+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1249+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1250+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1251+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1252 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1253 ISOCODES_LIBS = @ISOCODES_LIBS@
1254 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1255@@ -357,6 +361,8 @@
1256 includedir = @includedir@
1257 infodir = @infodir@
1258 install_sh = @install_sh@
1259+intltool__v_merge_options_ = @intltool__v_merge_options_@
1260+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1261 libdir = @libdir@
1262 libexecdir = @libexecdir@
1263 localedir = @localedir@
1264
1265=== modified file 'panels/sound-nua/data/Makefile.in'
1266--- panels/sound-nua/data/Makefile.in 2012-02-03 15:57:00 +0000
1267+++ panels/sound-nua/data/Makefile.in 2012-02-07 18:18:19 +0000
1268@@ -143,6 +143,10 @@
1269 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1270 INTLTOOL_PERL = @INTLTOOL_PERL@
1271 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1272+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1273+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1274+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1275+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1276 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1277 ISOCODES_LIBS = @ISOCODES_LIBS@
1278 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1279@@ -271,6 +275,8 @@
1280 includedir = @includedir@
1281 infodir = @infodir@
1282 install_sh = @install_sh@
1283+intltool__v_merge_options_ = @intltool__v_merge_options_@
1284+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1285 libdir = @libdir@
1286 libexecdir = @libexecdir@
1287 localedir = @localedir@
1288
1289=== modified file 'panels/sound-nua/gvc-mixer-control.c'
1290--- panels/sound-nua/gvc-mixer-control.c 2012-02-06 14:59:28 +0000
1291+++ panels/sound-nua/gvc-mixer-control.c 2012-02-07 18:18:19 +0000
1292@@ -1424,13 +1424,13 @@
1293 // At this point catch the stream, if necessary swap the port and return.
1294 // anticipating another update sink call from the port change to finish the volume mapping.
1295 if (control->priv->cached_desired_output_id != GVC_MIXER_UI_DEVICE_INVALID){
1296- GvcMixerUIDevice *output = gvc_mixer_control_lookup_output_id (control,
1297- control->priv->cached_desired_output_id);
1298- g_print ("\n Apparently we have a cached desired output, \n we should be on port %s \n",
1299- gvc_mixer_ui_device_get_port (output));
1300-
1301- if (gvc_mixer_stream_get_ports (stream) != NULL){
1302+ GvcMixerUIDevice *output = NULL;
1303+ output = gvc_mixer_control_lookup_output_id (control,
1304+ control->priv->cached_desired_output_id);
1305+ if (gvc_mixer_stream_get_ports (stream) != NULL && output != NULL){
1306
1307+ g_print ("\n Apparently we have a cached desired output, \n we should be on port %s \n",
1308+ gvc_mixer_ui_device_get_port (output));
1309 GvcMixerStreamPort* active_port = gvc_mixer_stream_get_port (stream);
1310
1311 if (g_strcmp0(active_port->port, gvc_mixer_ui_device_get_port (output)) == 0){
1312
1313=== modified file 'panels/sound/Makefile.in'
1314--- panels/sound/Makefile.in 2012-02-02 23:14:14 +0000
1315+++ panels/sound/Makefile.in 2012-02-07 18:18:19 +0000
1316@@ -238,6 +238,10 @@
1317 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1318 INTLTOOL_PERL = @INTLTOOL_PERL@
1319 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1320+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1321+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1322+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1323+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1324 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1325 ISOCODES_LIBS = @ISOCODES_LIBS@
1326 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1327@@ -366,6 +370,8 @@
1328 includedir = @includedir@
1329 infodir = @infodir@
1330 install_sh = @install_sh@
1331+intltool__v_merge_options_ = @intltool__v_merge_options_@
1332+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1333 libdir = @libdir@
1334 libexecdir = @libexecdir@
1335 localedir = @localedir@
1336
1337=== modified file 'panels/sound/data/Makefile.in'
1338--- panels/sound/data/Makefile.in 2012-01-15 13:55:05 +0000
1339+++ panels/sound/data/Makefile.in 2012-02-07 18:18:19 +0000
1340@@ -183,6 +183,10 @@
1341 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1342 INTLTOOL_PERL = @INTLTOOL_PERL@
1343 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1344+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1345+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1346+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1347+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1348 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1349 ISOCODES_LIBS = @ISOCODES_LIBS@
1350 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1351@@ -311,6 +315,8 @@
1352 includedir = @includedir@
1353 infodir = @infodir@
1354 install_sh = @install_sh@
1355+intltool__v_merge_options_ = @intltool__v_merge_options_@
1356+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1357 libdir = @libdir@
1358 libexecdir = @libexecdir@
1359 localedir = @localedir@
1360
1361=== modified file 'panels/sound/data/icons/16x16/Makefile.in'
1362--- panels/sound/data/icons/16x16/Makefile.in 2012-01-15 13:55:05 +0000
1363+++ panels/sound/data/icons/16x16/Makefile.in 2012-02-07 18:18:19 +0000
1364@@ -158,6 +158,10 @@
1365 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1366 INTLTOOL_PERL = @INTLTOOL_PERL@
1367 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1368+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1369+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1370+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1371+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1372 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1373 ISOCODES_LIBS = @ISOCODES_LIBS@
1374 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1375@@ -286,6 +290,8 @@
1376 includedir = @includedir@
1377 infodir = @infodir@
1378 install_sh = @install_sh@
1379+intltool__v_merge_options_ = @intltool__v_merge_options_@
1380+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1381 libdir = @libdir@
1382 libexecdir = @libexecdir@
1383 localedir = @localedir@
1384
1385=== modified file 'panels/sound/data/icons/16x16/apps/Makefile.in'
1386--- panels/sound/data/icons/16x16/apps/Makefile.in 2012-01-15 13:55:05 +0000
1387+++ panels/sound/data/icons/16x16/apps/Makefile.in 2012-02-07 18:18:19 +0000
1388@@ -142,6 +142,10 @@
1389 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1390 INTLTOOL_PERL = @INTLTOOL_PERL@
1391 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1392+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1393+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1394+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1395+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1396 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1397 ISOCODES_LIBS = @ISOCODES_LIBS@
1398 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1399@@ -270,6 +274,8 @@
1400 includedir = @includedir@
1401 infodir = @infodir@
1402 install_sh = @install_sh@
1403+intltool__v_merge_options_ = @intltool__v_merge_options_@
1404+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1405 libdir = @libdir@
1406 libexecdir = @libexecdir@
1407 localedir = @localedir@
1408
1409=== modified file 'panels/sound/data/icons/16x16/devices/Makefile.in'
1410--- panels/sound/data/icons/16x16/devices/Makefile.in 2012-01-15 13:55:05 +0000
1411+++ panels/sound/data/icons/16x16/devices/Makefile.in 2012-02-07 18:18:19 +0000
1412@@ -142,6 +142,10 @@
1413 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1414 INTLTOOL_PERL = @INTLTOOL_PERL@
1415 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1416+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1417+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1418+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1419+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1420 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1421 ISOCODES_LIBS = @ISOCODES_LIBS@
1422 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1423@@ -270,6 +274,8 @@
1424 includedir = @includedir@
1425 infodir = @infodir@
1426 install_sh = @install_sh@
1427+intltool__v_merge_options_ = @intltool__v_merge_options_@
1428+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1429 libdir = @libdir@
1430 libexecdir = @libexecdir@
1431 localedir = @localedir@
1432
1433=== modified file 'panels/sound/data/icons/16x16/status/Makefile.in'
1434--- panels/sound/data/icons/16x16/status/Makefile.in 2012-01-15 13:55:05 +0000
1435+++ panels/sound/data/icons/16x16/status/Makefile.in 2012-02-07 18:18:19 +0000
1436@@ -142,6 +142,10 @@
1437 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1438 INTLTOOL_PERL = @INTLTOOL_PERL@
1439 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1440+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1441+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1442+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1443+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1444 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1445 ISOCODES_LIBS = @ISOCODES_LIBS@
1446 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1447@@ -270,6 +274,8 @@
1448 includedir = @includedir@
1449 infodir = @infodir@
1450 install_sh = @install_sh@
1451+intltool__v_merge_options_ = @intltool__v_merge_options_@
1452+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1453 libdir = @libdir@
1454 libexecdir = @libexecdir@
1455 localedir = @localedir@
1456
1457=== modified file 'panels/sound/data/icons/22x22/Makefile.in'
1458--- panels/sound/data/icons/22x22/Makefile.in 2012-01-15 13:55:05 +0000
1459+++ panels/sound/data/icons/22x22/Makefile.in 2012-02-07 18:18:19 +0000
1460@@ -158,6 +158,10 @@
1461 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1462 INTLTOOL_PERL = @INTLTOOL_PERL@
1463 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1464+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1465+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1466+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1467+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1468 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1469 ISOCODES_LIBS = @ISOCODES_LIBS@
1470 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1471@@ -286,6 +290,8 @@
1472 includedir = @includedir@
1473 infodir = @infodir@
1474 install_sh = @install_sh@
1475+intltool__v_merge_options_ = @intltool__v_merge_options_@
1476+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1477 libdir = @libdir@
1478 libexecdir = @libexecdir@
1479 localedir = @localedir@
1480
1481=== modified file 'panels/sound/data/icons/22x22/apps/Makefile.in'
1482--- panels/sound/data/icons/22x22/apps/Makefile.in 2012-01-15 13:55:05 +0000
1483+++ panels/sound/data/icons/22x22/apps/Makefile.in 2012-02-07 18:18:19 +0000
1484@@ -142,6 +142,10 @@
1485 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1486 INTLTOOL_PERL = @INTLTOOL_PERL@
1487 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1488+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1489+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1490+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1491+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1492 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1493 ISOCODES_LIBS = @ISOCODES_LIBS@
1494 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1495@@ -270,6 +274,8 @@
1496 includedir = @includedir@
1497 infodir = @infodir@
1498 install_sh = @install_sh@
1499+intltool__v_merge_options_ = @intltool__v_merge_options_@
1500+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1501 libdir = @libdir@
1502 libexecdir = @libexecdir@
1503 localedir = @localedir@
1504
1505=== modified file 'panels/sound/data/icons/22x22/status/Makefile.in'
1506--- panels/sound/data/icons/22x22/status/Makefile.in 2012-01-15 13:55:05 +0000
1507+++ panels/sound/data/icons/22x22/status/Makefile.in 2012-02-07 18:18:19 +0000
1508@@ -142,6 +142,10 @@
1509 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1510 INTLTOOL_PERL = @INTLTOOL_PERL@
1511 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1512+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1513+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1514+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1515+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1516 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1517 ISOCODES_LIBS = @ISOCODES_LIBS@
1518 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1519@@ -270,6 +274,8 @@
1520 includedir = @includedir@
1521 infodir = @infodir@
1522 install_sh = @install_sh@
1523+intltool__v_merge_options_ = @intltool__v_merge_options_@
1524+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1525 libdir = @libdir@
1526 libexecdir = @libexecdir@
1527 localedir = @localedir@
1528
1529=== modified file 'panels/sound/data/icons/24x24/Makefile.in'
1530--- panels/sound/data/icons/24x24/Makefile.in 2012-01-15 13:55:05 +0000
1531+++ panels/sound/data/icons/24x24/Makefile.in 2012-02-07 18:18:19 +0000
1532@@ -158,6 +158,10 @@
1533 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1534 INTLTOOL_PERL = @INTLTOOL_PERL@
1535 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1536+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1537+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1538+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1539+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1540 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1541 ISOCODES_LIBS = @ISOCODES_LIBS@
1542 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1543@@ -286,6 +290,8 @@
1544 includedir = @includedir@
1545 infodir = @infodir@
1546 install_sh = @install_sh@
1547+intltool__v_merge_options_ = @intltool__v_merge_options_@
1548+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1549 libdir = @libdir@
1550 libexecdir = @libexecdir@
1551 localedir = @localedir@
1552
1553=== modified file 'panels/sound/data/icons/24x24/apps/Makefile.in'
1554--- panels/sound/data/icons/24x24/apps/Makefile.in 2012-01-15 13:55:05 +0000
1555+++ panels/sound/data/icons/24x24/apps/Makefile.in 2012-02-07 18:18:19 +0000
1556@@ -142,6 +142,10 @@
1557 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1558 INTLTOOL_PERL = @INTLTOOL_PERL@
1559 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1560+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1561+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1562+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1563+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1564 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1565 ISOCODES_LIBS = @ISOCODES_LIBS@
1566 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1567@@ -270,6 +274,8 @@
1568 includedir = @includedir@
1569 infodir = @infodir@
1570 install_sh = @install_sh@
1571+intltool__v_merge_options_ = @intltool__v_merge_options_@
1572+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1573 libdir = @libdir@
1574 libexecdir = @libexecdir@
1575 localedir = @localedir@
1576
1577=== modified file 'panels/sound/data/icons/24x24/devices/Makefile.in'
1578--- panels/sound/data/icons/24x24/devices/Makefile.in 2012-01-15 13:55:05 +0000
1579+++ panels/sound/data/icons/24x24/devices/Makefile.in 2012-02-07 18:18:19 +0000
1580@@ -142,6 +142,10 @@
1581 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1582 INTLTOOL_PERL = @INTLTOOL_PERL@
1583 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1584+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1585+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1586+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1587+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1588 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1589 ISOCODES_LIBS = @ISOCODES_LIBS@
1590 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1591@@ -270,6 +274,8 @@
1592 includedir = @includedir@
1593 infodir = @infodir@
1594 install_sh = @install_sh@
1595+intltool__v_merge_options_ = @intltool__v_merge_options_@
1596+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1597 libdir = @libdir@
1598 libexecdir = @libexecdir@
1599 localedir = @localedir@
1600
1601=== modified file 'panels/sound/data/icons/24x24/status/Makefile.in'
1602--- panels/sound/data/icons/24x24/status/Makefile.in 2012-01-15 13:55:05 +0000
1603+++ panels/sound/data/icons/24x24/status/Makefile.in 2012-02-07 18:18:19 +0000
1604@@ -142,6 +142,10 @@
1605 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1606 INTLTOOL_PERL = @INTLTOOL_PERL@
1607 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1608+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1609+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1610+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1611+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1612 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1613 ISOCODES_LIBS = @ISOCODES_LIBS@
1614 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1615@@ -270,6 +274,8 @@
1616 includedir = @includedir@
1617 infodir = @infodir@
1618 install_sh = @install_sh@
1619+intltool__v_merge_options_ = @intltool__v_merge_options_@
1620+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1621 libdir = @libdir@
1622 libexecdir = @libexecdir@
1623 localedir = @localedir@
1624
1625=== modified file 'panels/sound/data/icons/32x32/Makefile.in'
1626--- panels/sound/data/icons/32x32/Makefile.in 2012-01-15 13:55:05 +0000
1627+++ panels/sound/data/icons/32x32/Makefile.in 2012-02-07 18:18:19 +0000
1628@@ -158,6 +158,10 @@
1629 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1630 INTLTOOL_PERL = @INTLTOOL_PERL@
1631 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1632+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1633+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1634+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1635+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1636 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1637 ISOCODES_LIBS = @ISOCODES_LIBS@
1638 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1639@@ -286,6 +290,8 @@
1640 includedir = @includedir@
1641 infodir = @infodir@
1642 install_sh = @install_sh@
1643+intltool__v_merge_options_ = @intltool__v_merge_options_@
1644+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1645 libdir = @libdir@
1646 libexecdir = @libexecdir@
1647 localedir = @localedir@
1648
1649=== modified file 'panels/sound/data/icons/32x32/apps/Makefile.in'
1650--- panels/sound/data/icons/32x32/apps/Makefile.in 2012-01-15 13:55:05 +0000
1651+++ panels/sound/data/icons/32x32/apps/Makefile.in 2012-02-07 18:18:19 +0000
1652@@ -142,6 +142,10 @@
1653 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1654 INTLTOOL_PERL = @INTLTOOL_PERL@
1655 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1656+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1657+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1658+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1659+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1660 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1661 ISOCODES_LIBS = @ISOCODES_LIBS@
1662 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1663@@ -270,6 +274,8 @@
1664 includedir = @includedir@
1665 infodir = @infodir@
1666 install_sh = @install_sh@
1667+intltool__v_merge_options_ = @intltool__v_merge_options_@
1668+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1669 libdir = @libdir@
1670 libexecdir = @libexecdir@
1671 localedir = @localedir@
1672
1673=== modified file 'panels/sound/data/icons/32x32/devices/Makefile.in'
1674--- panels/sound/data/icons/32x32/devices/Makefile.in 2012-01-15 13:55:05 +0000
1675+++ panels/sound/data/icons/32x32/devices/Makefile.in 2012-02-07 18:18:19 +0000
1676@@ -142,6 +142,10 @@
1677 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1678 INTLTOOL_PERL = @INTLTOOL_PERL@
1679 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1680+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1681+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1682+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1683+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1684 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1685 ISOCODES_LIBS = @ISOCODES_LIBS@
1686 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1687@@ -270,6 +274,8 @@
1688 includedir = @includedir@
1689 infodir = @infodir@
1690 install_sh = @install_sh@
1691+intltool__v_merge_options_ = @intltool__v_merge_options_@
1692+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1693 libdir = @libdir@
1694 libexecdir = @libexecdir@
1695 localedir = @localedir@
1696
1697=== modified file 'panels/sound/data/icons/32x32/status/Makefile.in'
1698--- panels/sound/data/icons/32x32/status/Makefile.in 2012-01-15 13:55:05 +0000
1699+++ panels/sound/data/icons/32x32/status/Makefile.in 2012-02-07 18:18:19 +0000
1700@@ -142,6 +142,10 @@
1701 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1702 INTLTOOL_PERL = @INTLTOOL_PERL@
1703 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1704+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1705+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1706+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1707+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1708 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1709 ISOCODES_LIBS = @ISOCODES_LIBS@
1710 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1711@@ -270,6 +274,8 @@
1712 includedir = @includedir@
1713 infodir = @infodir@
1714 install_sh = @install_sh@
1715+intltool__v_merge_options_ = @intltool__v_merge_options_@
1716+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1717 libdir = @libdir@
1718 libexecdir = @libexecdir@
1719 localedir = @localedir@
1720
1721=== modified file 'panels/sound/data/icons/48x48/Makefile.in'
1722--- panels/sound/data/icons/48x48/Makefile.in 2012-01-15 13:55:05 +0000
1723+++ panels/sound/data/icons/48x48/Makefile.in 2012-02-07 18:18:19 +0000
1724@@ -158,6 +158,10 @@
1725 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1726 INTLTOOL_PERL = @INTLTOOL_PERL@
1727 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1728+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1729+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1730+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1731+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1732 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1733 ISOCODES_LIBS = @ISOCODES_LIBS@
1734 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1735@@ -286,6 +290,8 @@
1736 includedir = @includedir@
1737 infodir = @infodir@
1738 install_sh = @install_sh@
1739+intltool__v_merge_options_ = @intltool__v_merge_options_@
1740+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1741 libdir = @libdir@
1742 libexecdir = @libexecdir@
1743 localedir = @localedir@
1744
1745=== modified file 'panels/sound/data/icons/48x48/apps/Makefile.in'
1746--- panels/sound/data/icons/48x48/apps/Makefile.in 2012-01-15 13:55:05 +0000
1747+++ panels/sound/data/icons/48x48/apps/Makefile.in 2012-02-07 18:18:19 +0000
1748@@ -142,6 +142,10 @@
1749 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1750 INTLTOOL_PERL = @INTLTOOL_PERL@
1751 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1752+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1753+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1754+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1755+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1756 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1757 ISOCODES_LIBS = @ISOCODES_LIBS@
1758 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1759@@ -270,6 +274,8 @@
1760 includedir = @includedir@
1761 infodir = @infodir@
1762 install_sh = @install_sh@
1763+intltool__v_merge_options_ = @intltool__v_merge_options_@
1764+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1765 libdir = @libdir@
1766 libexecdir = @libexecdir@
1767 localedir = @localedir@
1768
1769=== modified file 'panels/sound/data/icons/48x48/devices/Makefile.in'
1770--- panels/sound/data/icons/48x48/devices/Makefile.in 2012-01-15 13:55:05 +0000
1771+++ panels/sound/data/icons/48x48/devices/Makefile.in 2012-02-07 18:18:19 +0000
1772@@ -142,6 +142,10 @@
1773 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1774 INTLTOOL_PERL = @INTLTOOL_PERL@
1775 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1776+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1777+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1778+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1779+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1780 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1781 ISOCODES_LIBS = @ISOCODES_LIBS@
1782 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1783@@ -270,6 +274,8 @@
1784 includedir = @includedir@
1785 infodir = @infodir@
1786 install_sh = @install_sh@
1787+intltool__v_merge_options_ = @intltool__v_merge_options_@
1788+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1789 libdir = @libdir@
1790 libexecdir = @libexecdir@
1791 localedir = @localedir@
1792
1793=== modified file 'panels/sound/data/icons/Makefile.in'
1794--- panels/sound/data/icons/Makefile.in 2012-01-15 13:55:05 +0000
1795+++ panels/sound/data/icons/Makefile.in 2012-02-07 18:18:19 +0000
1796@@ -158,6 +158,10 @@
1797 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1798 INTLTOOL_PERL = @INTLTOOL_PERL@
1799 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1800+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1801+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1802+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1803+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1804 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1805 ISOCODES_LIBS = @ISOCODES_LIBS@
1806 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1807@@ -286,6 +290,8 @@
1808 includedir = @includedir@
1809 infodir = @infodir@
1810 install_sh = @install_sh@
1811+intltool__v_merge_options_ = @intltool__v_merge_options_@
1812+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1813 libdir = @libdir@
1814 libexecdir = @libexecdir@
1815 localedir = @localedir@
1816
1817=== modified file 'panels/sound/data/icons/scalable/Makefile.in'
1818--- panels/sound/data/icons/scalable/Makefile.in 2012-01-15 13:55:05 +0000
1819+++ panels/sound/data/icons/scalable/Makefile.in 2012-02-07 18:18:19 +0000
1820@@ -158,6 +158,10 @@
1821 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1822 INTLTOOL_PERL = @INTLTOOL_PERL@
1823 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1824+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1825+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1826+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1827+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1828 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1829 ISOCODES_LIBS = @ISOCODES_LIBS@
1830 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1831@@ -286,6 +290,8 @@
1832 includedir = @includedir@
1833 infodir = @infodir@
1834 install_sh = @install_sh@
1835+intltool__v_merge_options_ = @intltool__v_merge_options_@
1836+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1837 libdir = @libdir@
1838 libexecdir = @libexecdir@
1839 localedir = @localedir@
1840
1841=== modified file 'panels/sound/data/icons/scalable/apps/Makefile.in'
1842--- panels/sound/data/icons/scalable/apps/Makefile.in 2012-01-15 13:55:05 +0000
1843+++ panels/sound/data/icons/scalable/apps/Makefile.in 2012-02-07 18:18:19 +0000
1844@@ -142,6 +142,10 @@
1845 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1846 INTLTOOL_PERL = @INTLTOOL_PERL@
1847 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1848+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1849+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1850+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1851+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1852 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1853 ISOCODES_LIBS = @ISOCODES_LIBS@
1854 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1855@@ -270,6 +274,8 @@
1856 includedir = @includedir@
1857 infodir = @infodir@
1858 install_sh = @install_sh@
1859+intltool__v_merge_options_ = @intltool__v_merge_options_@
1860+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1861 libdir = @libdir@
1862 libexecdir = @libexecdir@
1863 localedir = @localedir@
1864
1865=== modified file 'panels/sound/data/icons/scalable/devices/Makefile.in'
1866--- panels/sound/data/icons/scalable/devices/Makefile.in 2012-01-15 13:55:05 +0000
1867+++ panels/sound/data/icons/scalable/devices/Makefile.in 2012-02-07 18:18:19 +0000
1868@@ -142,6 +142,10 @@
1869 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1870 INTLTOOL_PERL = @INTLTOOL_PERL@
1871 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1872+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1873+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1874+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1875+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1876 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1877 ISOCODES_LIBS = @ISOCODES_LIBS@
1878 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1879@@ -270,6 +274,8 @@
1880 includedir = @includedir@
1881 infodir = @infodir@
1882 install_sh = @install_sh@
1883+intltool__v_merge_options_ = @intltool__v_merge_options_@
1884+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1885 libdir = @libdir@
1886 libexecdir = @libexecdir@
1887 localedir = @localedir@
1888
1889=== modified file 'panels/sound/data/sounds/Makefile.in'
1890--- panels/sound/data/sounds/Makefile.in 2012-01-15 13:55:05 +0000
1891+++ panels/sound/data/sounds/Makefile.in 2012-02-07 18:18:19 +0000
1892@@ -142,6 +142,10 @@
1893 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1894 INTLTOOL_PERL = @INTLTOOL_PERL@
1895 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1896+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1897+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1898+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1899+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1900 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1901 ISOCODES_LIBS = @ISOCODES_LIBS@
1902 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1903@@ -270,6 +274,8 @@
1904 includedir = @includedir@
1905 infodir = @infodir@
1906 install_sh = @install_sh@
1907+intltool__v_merge_options_ = @intltool__v_merge_options_@
1908+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1909 libdir = @libdir@
1910 libexecdir = @libexecdir@
1911 localedir = @localedir@
1912
1913=== modified file 'panels/sound/data/symbolic-icons/Makefile.in'
1914--- panels/sound/data/symbolic-icons/Makefile.in 2012-01-15 13:55:05 +0000
1915+++ panels/sound/data/symbolic-icons/Makefile.in 2012-02-07 18:18:19 +0000
1916@@ -158,6 +158,10 @@
1917 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1918 INTLTOOL_PERL = @INTLTOOL_PERL@
1919 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1920+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1921+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1922+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1923+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1924 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1925 ISOCODES_LIBS = @ISOCODES_LIBS@
1926 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1927@@ -286,6 +290,8 @@
1928 includedir = @includedir@
1929 infodir = @infodir@
1930 install_sh = @install_sh@
1931+intltool__v_merge_options_ = @intltool__v_merge_options_@
1932+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1933 libdir = @libdir@
1934 libexecdir = @libexecdir@
1935 localedir = @localedir@
1936
1937=== modified file 'panels/sound/data/symbolic-icons/scalable/Makefile.in'
1938--- panels/sound/data/symbolic-icons/scalable/Makefile.in 2012-01-15 13:55:05 +0000
1939+++ panels/sound/data/symbolic-icons/scalable/Makefile.in 2012-02-07 18:18:19 +0000
1940@@ -158,6 +158,10 @@
1941 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1942 INTLTOOL_PERL = @INTLTOOL_PERL@
1943 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1944+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1945+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1946+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1947+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1948 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1949 ISOCODES_LIBS = @ISOCODES_LIBS@
1950 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1951@@ -286,6 +290,8 @@
1952 includedir = @includedir@
1953 infodir = @infodir@
1954 install_sh = @install_sh@
1955+intltool__v_merge_options_ = @intltool__v_merge_options_@
1956+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1957 libdir = @libdir@
1958 libexecdir = @libexecdir@
1959 localedir = @localedir@
1960
1961=== modified file 'panels/sound/data/symbolic-icons/scalable/status/Makefile.in'
1962--- panels/sound/data/symbolic-icons/scalable/status/Makefile.in 2012-01-15 13:55:05 +0000
1963+++ panels/sound/data/symbolic-icons/scalable/status/Makefile.in 2012-02-07 18:18:19 +0000
1964@@ -142,6 +142,10 @@
1965 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1966 INTLTOOL_PERL = @INTLTOOL_PERL@
1967 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1968+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1969+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1970+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1971+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1972 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1973 ISOCODES_LIBS = @ISOCODES_LIBS@
1974 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1975@@ -270,6 +274,8 @@
1976 includedir = @includedir@
1977 infodir = @infodir@
1978 install_sh = @install_sh@
1979+intltool__v_merge_options_ = @intltool__v_merge_options_@
1980+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
1981 libdir = @libdir@
1982 libexecdir = @libexecdir@
1983 localedir = @localedir@
1984
1985=== modified file 'panels/universal-access/Makefile.in'
1986--- panels/universal-access/Makefile.in 2012-01-15 13:55:05 +0000
1987+++ panels/universal-access/Makefile.in 2012-02-07 18:18:19 +0000
1988@@ -183,6 +183,10 @@
1989 INTLTOOL_MERGE = @INTLTOOL_MERGE@
1990 INTLTOOL_PERL = @INTLTOOL_PERL@
1991 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1992+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
1993+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
1994+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
1995+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
1996 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
1997 ISOCODES_LIBS = @ISOCODES_LIBS@
1998 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
1999@@ -311,6 +315,8 @@
2000 includedir = @includedir@
2001 infodir = @infodir@
2002 install_sh = @install_sh@
2003+intltool__v_merge_options_ = @intltool__v_merge_options_@
2004+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
2005 libdir = @libdir@
2006 libexecdir = @libexecdir@
2007 localedir = @localedir@
2008
2009=== modified file 'panels/user-accounts/Makefile.in'
2010--- panels/user-accounts/Makefile.in 2012-01-15 13:55:05 +0000
2011+++ panels/user-accounts/Makefile.in 2012-02-07 18:18:19 +0000
2012@@ -225,6 +225,10 @@
2013 INTLTOOL_MERGE = @INTLTOOL_MERGE@
2014 INTLTOOL_PERL = @INTLTOOL_PERL@
2015 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
2016+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
2017+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
2018+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
2019+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
2020 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
2021 ISOCODES_LIBS = @ISOCODES_LIBS@
2022 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
2023@@ -353,6 +357,8 @@
2024 includedir = @includedir@
2025 infodir = @infodir@
2026 install_sh = @install_sh@
2027+intltool__v_merge_options_ = @intltool__v_merge_options_@
2028+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
2029 libdir = @libdir@
2030 libexecdir = @libexecdir@
2031 localedir = @localedir@
2032
2033=== modified file 'panels/user-accounts/data/Makefile.in'
2034--- panels/user-accounts/data/Makefile.in 2012-01-15 13:55:05 +0000
2035+++ panels/user-accounts/data/Makefile.in 2012-02-07 18:18:19 +0000
2036@@ -183,6 +183,10 @@
2037 INTLTOOL_MERGE = @INTLTOOL_MERGE@
2038 INTLTOOL_PERL = @INTLTOOL_PERL@
2039 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
2040+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
2041+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
2042+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
2043+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
2044 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
2045 ISOCODES_LIBS = @ISOCODES_LIBS@
2046 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
2047@@ -311,6 +315,8 @@
2048 includedir = @includedir@
2049 infodir = @infodir@
2050 install_sh = @install_sh@
2051+intltool__v_merge_options_ = @intltool__v_merge_options_@
2052+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
2053 libdir = @libdir@
2054 libexecdir = @libexecdir@
2055 localedir = @localedir@
2056
2057=== modified file 'panels/user-accounts/data/faces/Makefile.in'
2058--- panels/user-accounts/data/faces/Makefile.in 2012-01-15 13:55:05 +0000
2059+++ panels/user-accounts/data/faces/Makefile.in 2012-02-07 18:18:19 +0000
2060@@ -142,6 +142,10 @@
2061 INTLTOOL_MERGE = @INTLTOOL_MERGE@
2062 INTLTOOL_PERL = @INTLTOOL_PERL@
2063 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
2064+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
2065+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
2066+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
2067+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
2068 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
2069 ISOCODES_LIBS = @ISOCODES_LIBS@
2070 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
2071@@ -270,6 +274,8 @@
2072 includedir = @includedir@
2073 infodir = @infodir@
2074 install_sh = @install_sh@
2075+intltool__v_merge_options_ = @intltool__v_merge_options_@
2076+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
2077 libdir = @libdir@
2078 libexecdir = @libexecdir@
2079 localedir = @localedir@
2080
2081=== modified file 'panels/user-accounts/data/icons/Makefile.in'
2082--- panels/user-accounts/data/icons/Makefile.in 2012-01-15 13:55:05 +0000
2083+++ panels/user-accounts/data/icons/Makefile.in 2012-02-07 18:18:19 +0000
2084@@ -142,6 +142,10 @@
2085 INTLTOOL_MERGE = @INTLTOOL_MERGE@
2086 INTLTOOL_PERL = @INTLTOOL_PERL@
2087 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
2088+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
2089+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
2090+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
2091+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
2092 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
2093 ISOCODES_LIBS = @ISOCODES_LIBS@
2094 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
2095@@ -270,6 +274,8 @@
2096 includedir = @includedir@
2097 infodir = @infodir@
2098 install_sh = @install_sh@
2099+intltool__v_merge_options_ = @intltool__v_merge_options_@
2100+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
2101 libdir = @libdir@
2102 libexecdir = @libexecdir@
2103 localedir = @localedir@
2104
2105=== modified file 'panels/wacom/Makefile.in'
2106--- panels/wacom/Makefile.in 2012-01-15 13:55:05 +0000
2107+++ panels/wacom/Makefile.in 2012-02-07 18:18:19 +0000
2108@@ -180,6 +180,10 @@
2109 INTLTOOL_MERGE = @INTLTOOL_MERGE@
2110 INTLTOOL_PERL = @INTLTOOL_PERL@
2111 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
2112+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
2113+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
2114+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
2115+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
2116 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
2117 ISOCODES_LIBS = @ISOCODES_LIBS@
2118 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
2119@@ -308,6 +312,8 @@
2120 includedir = @includedir@
2121 infodir = @infodir@
2122 install_sh = @install_sh@
2123+intltool__v_merge_options_ = @intltool__v_merge_options_@
2124+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
2125 libdir = @libdir@
2126 libexecdir = @libexecdir@
2127 localedir = @localedir@
2128
2129=== modified file 'po/Makefile.in.in'
2130--- po/Makefile.in.in 2012-02-03 17:42:04 +0000
2131+++ po/Makefile.in.in 2012-02-07 18:18:19 +0000
2132@@ -49,8 +49,8 @@
2133 XGETTEXT = @XGETTEXT@
2134 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
2135 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
2136-MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
2137-GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
2138+MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
2139+GENPOT = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
2140
2141 ALL_LINGUAS = @ALL_LINGUAS@
2142
2143@@ -73,15 +73,20 @@
2144 .SUFFIXES:
2145 .SUFFIXES: .po .pox .gmo .mo .msg .cat
2146
2147+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
2148+INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V))
2149+INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY))
2150+INTLTOOL__v_MSGFMT_0 = @echo " MSGFMT" $@;
2151+
2152 .po.pox:
2153 $(MAKE) $(GETTEXT_PACKAGE).pot
2154 $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
2155
2156 .po.mo:
2157- $(MSGFMT) -o $@ $<
2158+ $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $<
2159
2160 .po.gmo:
2161- file=`echo $* | sed 's,.*/,,'`.gmo \
2162+ $(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \
2163 && rm -f $$file && $(GMSGFMT) -o $$file $<
2164
2165 .po.cat:
2166
2167=== modified file 'shell/Makefile.in'
2168--- shell/Makefile.in 2012-01-15 13:55:05 +0000
2169+++ shell/Makefile.in 2012-02-07 18:18:19 +0000
2170@@ -187,6 +187,10 @@
2171 INTLTOOL_MERGE = @INTLTOOL_MERGE@
2172 INTLTOOL_PERL = @INTLTOOL_PERL@
2173 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
2174+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
2175+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
2176+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
2177+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
2178 ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
2179 ISOCODES_LIBS = @ISOCODES_LIBS@
2180 KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
2181@@ -315,6 +319,8 @@
2182 includedir = @includedir@
2183 infodir = @infodir@
2184 install_sh = @install_sh@
2185+intltool__v_merge_options_ = @intltool__v_merge_options_@
2186+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
2187 libdir = @libdir@
2188 libexecdir = @libexecdir@
2189 localedir = @localedir@

Subscribers

People subscribed via source and target branches

to all changes: