Merge lp:~amigadave/account-plugins/i18n-support into lp:account-plugins

Proposed by David King
Status: Merged
Approved by: Alberto Mardegan
Approved revision: 73
Merged at revision: 70
Proposed branch: lp:~amigadave/account-plugins/i18n-support
Merge into: lp:account-plugins
Diff against target: 678 lines (+101/-249)
32 files modified
.bzrignore (+6/-1)
Makefile.am (+7/-0)
autogen.sh (+1/-2)
configure.ac (+6/-2)
data/providers/Makefile.am (+23/-10)
data/providers/facebook.provider.in (+1/-0)
data/providers/flickr.provider.in (+1/-0)
data/providers/foursquare.provider.in (+1/-0)
data/providers/google.provider.in (+2/-1)
data/providers/identica.provider.in (+1/-0)
data/providers/sina.provider.in (+1/-0)
data/providers/sohu.provider.in (+1/-0)
data/providers/twitter.provider.in (+1/-0)
data/providers/windows-live.provider.in (+1/-0)
data/services/Makefile.am (+28/-15)
data/services/facebook-im.service.in (+1/-0)
data/services/facebook-microblog.service.in (+1/-0)
data/services/facebook-sharing.service.in (+2/-1)
data/services/flickr-microblog.service.in (+1/-0)
data/services/flickr-sharing.service.in (+1/-0)
data/services/foursquare-microblog.service.in (+1/-0)
data/services/google-docs.service.in (+1/-0)
data/services/google-im.service.in (+1/-0)
data/services/identica-microblog.service.in (+1/-0)
data/services/picasa.service.in (+1/-0)
data/services/sina-microblog.service.in (+1/-0)
data/services/sohu-microblog.service.in (+1/-0)
data/services/twitter-microblog.service.in (+1/-0)
data/services/wlm.service.in (+1/-0)
po/Makefile.in.in (+0/-217)
po/POTFILES.in (+1/-0)
po/POTFILES.skip (+4/-0)
To merge this branch: bzr merge lp:~amigadave/account-plugins/i18n-support
Reviewer Review Type Date Requested Status
Alberto Mardegan (community) Approve
jenkins (community) continuous-integration Needs Fixing
Review via email: mp+128039@code.launchpad.net

This proposal supersedes a proposal from 2012-10-04.

Description of the change

Use intltool for i18n support

* Correct project URLs in configure.ac
* Add intltool support to build system
* Extract strings from provider and service files
* Skip service files without translations

To post a comment you must log in.
Revision history for this message
jenkins (martin-mrazik+qa) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Revision history for this message
VĂ­ctor R. Ruiz (vrruiz) wrote : Posted in a previous version of this proposal

Problem with the packaging branch. Would you please resubmit?

Revision history for this message
jenkins (martin-mrazik+qa) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Alberto Mardegan (mardy) wrote :

Hi David, thanks for taking care of this!

You need to commit the empty m4/ directory, or autogen.sh fails.
When updating the translations, for some reason intltool believes that the service files contain some translations:

===============
The following files contain translations and are currently not in use. Please
consider adding these to the POTFILES.in file, located in the po/ directory.

data/services/facebook-microblog.service.in
data/services/identica-microblog.service.in
data/services/twitter-microblog.service.in

If some of these files are left out on purpose then please add them to
POTFILES.skip instead of POTFILES.in. A file 'missing' containing this list
of left out files has been written in the current directory.
===============

I don't understand why -- unless you have an idea, just add them to POTFILES.skip

review: Needs Fixing
73. By David King

Skip service files without translations

Revision history for this message
David King (amigadave) wrote :

Should be all fixed now.

Revision history for this message
Alberto Mardegan (mardy) wrote :

Excellent, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2012-07-25 11:09:39 +0000
3+++ .bzrignore 2012-10-05 07:42:21 +0000
4@@ -1,5 +1,7 @@
5 *.la
6 *.lo
7+*.provider
8+*.service
9 *.stamp
10 COPYING
11 INSTALL
12@@ -19,8 +21,11 @@
13 install-sh
14 libtool
15 ltmain.sh
16-m4
17+/m4/*.m4
18 missing
19+/po/Makefile.in.in
20+/po/POTFILES
21+/po/stamp-it
22 stamp-h1
23 .deps
24 .dirstamp
25
26=== modified file 'Makefile.am'
27--- Makefile.am 2012-07-19 17:18:08 +0000
28+++ Makefile.am 2012-10-05 07:42:21 +0000
29@@ -1,5 +1,6 @@
30 SUBDIRS = \
31 data \
32+ po \
33 tools
34
35 # Plugins.
36@@ -99,3 +100,9 @@
37 src/accounts.vapi \
38 src/signon.vapi \
39 src/AccountPlugin.vapi
40+
41+DISTCLEANFILES = \
42+ intltool-extract \
43+ intltool-merge \
44+ intltool-update \
45+ po/.intltool-merge-cache
46
47=== modified file 'autogen.sh'
48--- autogen.sh 2011-12-23 14:28:12 +0000
49+++ autogen.sh 2012-10-05 07:42:21 +0000
50@@ -1,2 +1,1 @@
51-autoreconf -i && ./configure "$@"
52-
53+intltoolize --copy --force --automake && autoreconf -i && ./configure "$@"
54
55=== modified file 'configure.ac'
56--- configure.ac 2012-09-19 19:24:48 +0000
57+++ configure.ac 2012-10-05 07:42:21 +0000
58@@ -2,9 +2,9 @@
59
60 AC_INIT([account-plugins],
61 [0.8],
62- [https://bugs.launchpad.net/opensesame-account-plugins/+filebug],
63+ [https://bugs.launchpad.net/online-accounts-account-plugins/+filebug],
64 [account-plugins],
65- [https://launchpad.net/opensesame-account-plugins])
66+ [https://launchpad.net/online-accounts-account-plugins])
67
68 AM_INIT_AUTOMAKE([1.10 -Wall -Wno-portability subdir-objects])
69 AM_CONFIG_HEADER(config.h)
70@@ -21,6 +21,9 @@
71 LT_PREREQ([2.2])
72 LT_INIT([disable-static])
73
74+IT_PROG_INTLTOOL([0.50.0])
75+AC_SUBST([GETTEXT_PACKAGE], [$PACKAGE_TARNAME])
76+
77 PKG_CHECK_MODULES(ACCOUNT_PLUGINS,
78 account-plugin)
79 AC_SUBST(ACCOUNT_PLUGINS_CFLAGS)
80@@ -150,6 +153,7 @@
81 data/providers/Makefile
82 data/services/Makefile
83 data/webkit-options/Makefile
84+ po/Makefile.in
85 tools/Makefile
86 ])
87 AC_OUTPUT
88
89=== modified file 'data/providers/Makefile.am'
90--- data/providers/Makefile.am 2012-07-19 17:18:08 +0000
91+++ data/providers/Makefile.am 2012-10-05 07:42:21 +0000
92@@ -1,10 +1,23 @@
93-dist_providers_DATA = \
94- facebook.provider \
95- flickr.provider \
96- foursquare.provider \
97- google.provider \
98- identica.provider \
99- sina.provider \
100- sohu.provider \
101- twitter.provider \
102- windows-live.provider
103+# Extract transatable strings from .provider files
104+%.provider: %.provider.in $(INTLTOOL_MERGE)
105+ $(INTLTOOL_V_MERGE) LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_MERGE_V_OPTIONS) --no-translations -x -u $< $@
106+
107+providers_in_files = \
108+ facebook.provider.in \
109+ flickr.provider.in \
110+ foursquare.provider.in \
111+ google.provider.in \
112+ identica.provider.in \
113+ sina.provider.in \
114+ sohu.provider.in \
115+ twitter.provider.in \
116+ windows-live.provider.in
117+
118+providers_DATA = \
119+ $(providers_in_files:.provider.in=.provider)
120+
121+dist_noinst_DATA = \
122+ $(providers_in_files)
123+
124+CLEANFILES = \
125+ $(services_DATA)
126
127=== renamed file 'data/providers/facebook.provider' => 'data/providers/facebook.provider.in'
128--- data/providers/facebook.provider 2012-06-06 08:56:59 +0000
129+++ data/providers/facebook.provider.in 2012-10-05 07:42:21 +0000
130@@ -2,5 +2,6 @@
131 <provider id="facebook">
132 <name>Facebook</name>
133 <icon>facebook</icon>
134+ <translations>account-plugins</translations>
135 <domains>.*facebook\.com</domains>
136 </provider>
137
138=== renamed file 'data/providers/flickr.provider' => 'data/providers/flickr.provider.in'
139--- data/providers/flickr.provider 2012-06-06 12:56:03 +0000
140+++ data/providers/flickr.provider.in 2012-10-05 07:42:21 +0000
141@@ -2,5 +2,6 @@
142 <provider id="flickr">
143 <name>Flickr</name>
144 <icon>flickr</icon>
145+ <translations>account-plugins</translations>
146 <domains>.*flickr\.com</domains>
147 </provider>
148
149=== renamed file 'data/providers/foursquare.provider' => 'data/providers/foursquare.provider.in'
150--- data/providers/foursquare.provider 2012-06-26 10:05:06 +0000
151+++ data/providers/foursquare.provider.in 2012-10-05 07:42:21 +0000
152@@ -2,5 +2,6 @@
153 <provider id="foursquare">
154 <name>Foursquare</name>
155 <icon>foursquare</icon>
156+ <translations>account-plugins</translations>
157 <domains>.*foursquare\.com</domains>
158 </provider>
159
160=== renamed file 'data/providers/google.provider' => 'data/providers/google.provider.in'
161--- data/providers/google.provider 2012-06-13 11:33:24 +0000
162+++ data/providers/google.provider.in 2012-10-05 07:42:21 +0000
163@@ -1,7 +1,8 @@
164 <?xml version="1.0" encoding="UTF-8" ?>
165 <provider id="google">
166 <name>Google</name>
167- <description>Includes Gmail, Google Docs, Google+, YouTube and Picasa</description>
168+ <_description>Includes Gmail, Google Docs, Google+, YouTube and Picasa</_description>
169 <icon>google</icon>
170+ <translations>account-plugins</translations>
171 <domains>.*google\.com</domains>
172 </provider>
173
174=== renamed file 'data/providers/identica.provider' => 'data/providers/identica.provider.in'
175--- data/providers/identica.provider 2012-06-26 10:15:24 +0000
176+++ data/providers/identica.provider.in 2012-10-05 07:42:21 +0000
177@@ -2,5 +2,6 @@
178 <provider id="identica">
179 <name>identi.ca</name>
180 <icon>identica</icon>
181+ <translations>account-plugins</translations>
182 <domains>.*identi\.ca</domains>
183 </provider>
184
185=== renamed file 'data/providers/sina.provider' => 'data/providers/sina.provider.in'
186--- data/providers/sina.provider 2012-06-27 11:41:09 +0000
187+++ data/providers/sina.provider.in 2012-10-05 07:42:21 +0000
188@@ -2,5 +2,6 @@
189 <provider id="sina">
190 <name>Sina</name>
191 <icon>sina</icon>
192+ <translations>account-plugins</translations>
193 <domains>.*t\.sina\.com\.cn</domains>
194 </provider>
195
196=== renamed file 'data/providers/sohu.provider' => 'data/providers/sohu.provider.in'
197--- data/providers/sohu.provider 2012-06-27 11:41:43 +0000
198+++ data/providers/sohu.provider.in 2012-10-05 07:42:21 +0000
199@@ -2,5 +2,6 @@
200 <provider id="sohu">
201 <name>Sohu</name>
202 <icon>sohu</icon>
203+ <translations>account-plugins</translations>
204 <domains>.*t\.sohu\.com</domains>
205 </provider>
206
207=== renamed file 'data/providers/twitter.provider' => 'data/providers/twitter.provider.in'
208--- data/providers/twitter.provider 2012-06-14 07:10:53 +0000
209+++ data/providers/twitter.provider.in 2012-10-05 07:42:21 +0000
210@@ -2,5 +2,6 @@
211 <provider id="twitter">
212 <name>Twitter</name>
213 <icon>twitter</icon>
214+ <translations>account-plugins</translations>
215 <domains>.*twitter\.com</domains>
216 </provider>
217
218=== renamed file 'data/providers/windows-live.provider' => 'data/providers/windows-live.provider.in'
219--- data/providers/windows-live.provider 2012-07-19 17:18:08 +0000
220+++ data/providers/windows-live.provider.in 2012-10-05 07:42:21 +0000
221@@ -2,5 +2,6 @@
222 <provider id="windows-live">
223 <name>Windows Live</name>
224 <icon>live</icon>
225+ <translations>account-plugins</translations>
226 <domains>.*live\.com</domains>
227 </provider>
228
229=== modified file 'data/services/Makefile.am'
230--- data/services/Makefile.am 2012-07-19 17:18:08 +0000
231+++ data/services/Makefile.am 2012-10-05 07:42:21 +0000
232@@ -1,15 +1,28 @@
233-dist_services_DATA = \
234- facebook-im.service \
235- facebook-microblog.service \
236- facebook-sharing.service \
237- flickr-microblog.service \
238- flickr-sharing.service \
239- foursquare-microblog.service \
240- google-docs.service \
241- google-im.service \
242- identica-microblog.service \
243- picasa.service \
244- sina-microblog.service \
245- sohu-microblog.service \
246- twitter-microblog.service \
247- wlm.service
248+# Extract translatable strings from .service files
249+%.service: %.service.in $(INTLTOOL_MERGE)
250+ $(INTLTOOL_V_MERGE) LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_MERGE_V_OPTIONS) --no-translations -x -u $< $@
251+
252+services_in_files = \
253+ facebook-im.service.in \
254+ facebook-microblog.service.in \
255+ facebook-sharing.service.in \
256+ flickr-microblog.service.in \
257+ flickr-sharing.service.in \
258+ foursquare-microblog.service.in \
259+ google-docs.service.in \
260+ google-im.service.in \
261+ identica-microblog.service.in \
262+ picasa.service.in \
263+ sina-microblog.service.in \
264+ sohu-microblog.service.in \
265+ twitter-microblog.service.in \
266+ wlm.service.in
267+
268+services_DATA = \
269+ $(services_in_files:.service.in=.service)
270+
271+dist_noinst_DATA = \
272+ $(services_in_files)
273+
274+CLEANFILES = \
275+ $(services_DATA)
276
277=== renamed file 'data/services/facebook-im.service' => 'data/services/facebook-im.service.in'
278--- data/services/facebook-im.service 2012-07-25 08:39:12 +0000
279+++ data/services/facebook-im.service.in 2012-10-05 07:42:21 +0000
280@@ -4,6 +4,7 @@
281 <name>Facebook</name>
282 <icon>facebook</icon>
283 <provider>facebook</provider>
284+ <translations>account-plugins</translations>
285
286 <!-- default settings (account settings have precedence over these) -->
287 <template>
288
289=== renamed file 'data/services/facebook-microblog.service' => 'data/services/facebook-microblog.service.in'
290--- data/services/facebook-microblog.service 2012-06-26 19:38:23 +0000
291+++ data/services/facebook-microblog.service.in 2012-10-05 07:42:21 +0000
292@@ -4,6 +4,7 @@
293 <name>Facebook</name>
294 <icon>facebook</icon>
295 <provider>facebook</provider>
296+ <translations>account-plugins</translations>
297
298 <!-- default settings (account settings have precedence over these) -->
299 <template>
300
301=== renamed file 'data/services/facebook-sharing.service' => 'data/services/facebook-sharing.service.in'
302--- data/services/facebook-sharing.service 2011-12-23 14:28:12 +0000
303+++ data/services/facebook-sharing.service.in 2012-10-05 07:42:21 +0000
304@@ -2,8 +2,9 @@
305 <service id="service">
306 <type>sharing</type>
307 <name>Facebook</name>
308- <icon>icon_facebook</icon>
309+ <icon>facebook</icon>
310 <provider>facebook</provider>
311+ <translations>account-plugins</translations>
312
313 <!-- default settings (account settings have precedence over these) -->
314 <template>
315
316=== renamed file 'data/services/flickr-microblog.service' => 'data/services/flickr-microblog.service.in'
317--- data/services/flickr-microblog.service 2012-06-26 19:38:23 +0000
318+++ data/services/flickr-microblog.service.in 2012-10-05 07:42:21 +0000
319@@ -4,6 +4,7 @@
320 <name>Flickr</name>
321 <icon>flickr</icon>
322 <provider>flickr</provider>
323+ <translations>account-plugins</translations>
324
325 <!-- default settings (account settings have precedence over these) -->
326 <template>
327
328=== renamed file 'data/services/flickr-sharing.service' => 'data/services/flickr-sharing.service.in'
329--- data/services/flickr-sharing.service 2012-07-04 04:55:03 +0000
330+++ data/services/flickr-sharing.service.in 2012-10-05 07:42:21 +0000
331@@ -4,4 +4,5 @@
332 <name>Flickr</name>
333 <icon>flickr</icon>
334 <provider>flickr</provider>
335+ <translations>account-plugins</translations>
336 </service>
337
338=== renamed file 'data/services/foursquare-microblog.service' => 'data/services/foursquare-microblog.service.in'
339--- data/services/foursquare-microblog.service 2012-07-03 16:31:41 +0000
340+++ data/services/foursquare-microblog.service.in 2012-10-05 07:42:21 +0000
341@@ -4,6 +4,7 @@
342 <name>Foursquare</name>
343 <icon>foursquare</icon>
344 <provider>foursquare</provider>
345+ <translations>account-plugins</translations>
346
347 <!-- default settings (account settings have precedence over these) -->
348 <template>
349
350=== renamed file 'data/services/google-docs.service' => 'data/services/google-docs.service.in'
351--- data/services/google-docs.service 2012-03-14 12:03:35 +0000
352+++ data/services/google-docs.service.in 2012-10-05 07:42:21 +0000
353@@ -4,6 +4,7 @@
354 <name>GoogleDocs</name>
355 <icon>icon_google_docs</icon>
356 <provider>google</provider>
357+ <translations>account-plugins</translations>
358
359 <!-- default settings (account settings have precedence over these) -->
360 <template>
361
362=== renamed file 'data/services/google-im.service' => 'data/services/google-im.service.in'
363--- data/services/google-im.service 2012-07-25 08:39:12 +0000
364+++ data/services/google-im.service.in 2012-10-05 07:42:21 +0000
365@@ -4,6 +4,7 @@
366 <name>GoogleTalk</name>
367 <icon>im-google-talk</icon>
368 <provider>google</provider>
369+ <translations>account-plugins</translations>
370
371 <!-- default settings (account settings have precedence over these) -->
372 <template>
373
374=== renamed file 'data/services/identica-microblog.service' => 'data/services/identica-microblog.service.in'
375--- data/services/identica-microblog.service 2012-07-03 16:31:58 +0000
376+++ data/services/identica-microblog.service.in 2012-10-05 07:42:21 +0000
377@@ -4,6 +4,7 @@
378 <name>identi.ca</name>
379 <icon>identica</icon>
380 <provider>identica</provider>
381+ <translations>account-plugins</translations>
382
383 <!-- default settings (account settings have precedence over these) -->
384 <template>
385
386=== renamed file 'data/services/picasa.service' => 'data/services/picasa.service.in'
387--- data/services/picasa.service 2012-03-14 12:03:35 +0000
388+++ data/services/picasa.service.in 2012-10-05 07:42:21 +0000
389@@ -4,6 +4,7 @@
390 <name>Picasa</name>
391 <icon>icon_picasa</icon>
392 <provider>google</provider>
393+ <translations>account-plugins</translations>
394
395 <!-- default settings (account settings have precedence over these) -->
396 <template>
397
398=== renamed file 'data/services/sina-microblog.service' => 'data/services/sina-microblog.service.in'
399--- data/services/sina-microblog.service 2012-06-27 11:41:09 +0000
400+++ data/services/sina-microblog.service.in 2012-10-05 07:42:21 +0000
401@@ -4,4 +4,5 @@
402 <name>Sina</name>
403 <icon>sina</icon>
404 <provider>sina</provider>
405+ <translations>account-plugins</translations>
406 </service>
407
408=== renamed file 'data/services/sohu-microblog.service' => 'data/services/sohu-microblog.service.in'
409--- data/services/sohu-microblog.service 2012-06-27 11:41:43 +0000
410+++ data/services/sohu-microblog.service.in 2012-10-05 07:42:21 +0000
411@@ -4,4 +4,5 @@
412 <name>Sohu</name>
413 <icon>sohu</icon>
414 <provider>sohu</provider>
415+ <translations>account-plugins</translations>
416 </service>
417
418=== renamed file 'data/services/twitter-microblog.service' => 'data/services/twitter-microblog.service.in'
419--- data/services/twitter-microblog.service 2012-06-26 19:38:23 +0000
420+++ data/services/twitter-microblog.service.in 2012-10-05 07:42:21 +0000
421@@ -4,6 +4,7 @@
422 <name>Twitter</name>
423 <icon>twitter</icon>
424 <provider>twitter</provider>
425+ <translations>account-plugins</translations>
426
427 <!-- default settings (account settings have precedence over these) -->
428 <template>
429
430=== renamed file 'data/services/wlm.service' => 'data/services/wlm.service.in'
431--- data/services/wlm.service 2012-08-03 09:06:29 +0000
432+++ data/services/wlm.service.in 2012-10-05 07:42:21 +0000
433@@ -4,6 +4,7 @@
434 <name>Windows Live Messenger</name>
435 <icon>msn</icon>
436 <provider>windows-live</provider>
437+ <translations>account-plugins</translations>
438
439 <!-- default settings (account settings have precedence over these) -->
440 <template>
441
442=== added directory 'm4'
443=== removed file 'po/Makefile.in.in'
444--- po/Makefile.in.in 2011-12-23 14:28:12 +0000
445+++ po/Makefile.in.in 1970-01-01 00:00:00 +0000
446@@ -1,217 +0,0 @@
447-# Makefile for program source directory in GNU NLS utilities package.
448-# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
449-# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns@gmail.com>
450-#
451-# This file may be copied and used freely without restrictions. It may
452-# be used in projects which are not available under a GNU Public License,
453-# but which still want to provide support for the GNU gettext functionality.
454-#
455-# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE
456-# instead of PACKAGE and to look for po2tbl in ./ not in intl/
457-#
458-# - Modified by jacob berkman <jacob@ximian.com> to install
459-# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
460-#
461-# - Modified by Rodney Dawes <dobey.pwns@gmail.com> for use with intltool
462-#
463-# We have the following line for use by intltoolize:
464-# INTLTOOL_MAKEFILE
465-
466-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
467-PACKAGE = @PACKAGE@
468-VERSION = @VERSION@
469-
470-SHELL = @SHELL@
471-
472-srcdir = @srcdir@
473-top_srcdir = @top_srcdir@
474-top_builddir = @top_builddir@
475-VPATH = @srcdir@
476-
477-prefix = @prefix@
478-exec_prefix = @exec_prefix@
479-datadir = @datadir@
480-datarootdir = @datarootdir@
481-libdir = @libdir@
482-DATADIRNAME = @DATADIRNAME@
483-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
484-subdir = po
485-install_sh = @install_sh@
486-# Automake >= 1.8 provides @mkdir_p@.
487-# Until it can be supposed, use the safe fallback:
488-mkdir_p = $(install_sh) -d
489-
490-INSTALL = @INSTALL@
491-INSTALL_DATA = @INSTALL_DATA@
492-
493-GMSGFMT = @GMSGFMT@
494-MSGFMT = @MSGFMT@
495-XGETTEXT = @XGETTEXT@
496-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
497-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
498-MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
499-GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
500-
501-ALL_LINGUAS = @ALL_LINGUAS@
502-
503-PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
504-
505-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
506-
507-USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
508-
509-POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
510-
511-DISTFILES = Makefile.in.in POTFILES.in $(POFILES)
512-EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS
513-
514-POTFILES = \
515-# This comment gets stripped out
516-
517-CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
518-
519-.SUFFIXES:
520-.SUFFIXES: .po .pox .gmo .mo .msg .cat
521-
522-.po.pox:
523- $(MAKE) $(GETTEXT_PACKAGE).pot
524- $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
525-
526-.po.mo:
527- $(MSGFMT) -o $@ $<
528-
529-.po.gmo:
530- file=`echo $* | sed 's,.*/,,'`.gmo \
531- && rm -f $$file && $(GMSGFMT) -o $$file $<
532-
533-.po.cat:
534- sed -f ../intl/po2msg.sed < $< > $*.msg \
535- && rm -f $@ && gencat $@ $*.msg
536-
537-
538-all: all-@USE_NLS@
539-
540-all-yes: $(CATALOGS)
541-all-no:
542-
543-$(GETTEXT_PACKAGE).pot: $(POTFILES)
544- $(GENPOT)
545-
546-install: install-data
547-install-data: install-data-@USE_NLS@
548-install-data-no: all
549-install-data-yes: all
550- linguas="$(USE_LINGUAS)"; \
551- for lang in $$linguas; do \
552- dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
553- $(mkdir_p) $$dir; \
554- if test -r $$lang.gmo; then \
555- $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
556- echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
557- else \
558- $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
559- echo "installing $(srcdir)/$$lang.gmo as" \
560- "$$dir/$(GETTEXT_PACKAGE).mo"; \
561- fi; \
562- if test -r $$lang.gmo.m; then \
563- $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
564- echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
565- else \
566- if test -r $(srcdir)/$$lang.gmo.m ; then \
567- $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
568- $$dir/$(GETTEXT_PACKAGE).mo.m; \
569- echo "installing $(srcdir)/$$lang.gmo.m as" \
570- "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
571- else \
572- true; \
573- fi; \
574- fi; \
575- done
576-
577-# Empty stubs to satisfy archaic automake needs
578-dvi info ctags tags CTAGS TAGS ID:
579-
580-# Define this as empty until I found a useful application.
581-install-exec installcheck:
582-
583-uninstall:
584- linguas="$(USE_LINGUAS)"; \
585- for lang in $$linguas; do \
586- rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
587- rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
588- done
589-
590-check: all $(GETTEXT_PACKAGE).pot
591- rm -f missing notexist
592- srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
593- if [ -r missing -o -r notexist ]; then \
594- exit 1; \
595- fi
596-
597-mostlyclean:
598- rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
599- rm -f .intltool-merge-cache
600-
601-clean: mostlyclean
602-
603-distclean: clean
604- rm -f Makefile Makefile.in POTFILES stamp-it
605- rm -f *.mo *.msg *.cat *.cat.m *.gmo
606-
607-maintainer-clean: distclean
608- @echo "This command is intended for maintainers to use;"
609- @echo "it deletes files that may require special tools to rebuild."
610- rm -f Makefile.in.in
611-
612-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
613-dist distdir: $(DISTFILES)
614- dists="$(DISTFILES)"; \
615- extra_dists="$(EXTRA_DISTFILES)"; \
616- for file in $$extra_dists; do \
617- test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
618- done; \
619- for file in $$dists; do \
620- test -f $$file || file="$(srcdir)/$$file"; \
621- ln $$file $(distdir) 2> /dev/null \
622- || cp -p $$file $(distdir); \
623- done
624-
625-update-po: Makefile
626- $(MAKE) $(GETTEXT_PACKAGE).pot
627- tmpdir=`pwd`; \
628- linguas="$(USE_LINGUAS)"; \
629- for lang in $$linguas; do \
630- echo "$$lang:"; \
631- result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
632- if $$result; then \
633- if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
634- rm -f $$tmpdir/$$lang.new.po; \
635- else \
636- if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
637- :; \
638- else \
639- echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
640- rm -f $$tmpdir/$$lang.new.po; \
641- exit 1; \
642- fi; \
643- fi; \
644- else \
645- echo "msgmerge for $$lang.gmo failed!"; \
646- rm -f $$tmpdir/$$lang.new.po; \
647- fi; \
648- done
649-
650-Makefile POTFILES: stamp-it
651- @if test ! -f $@; then \
652- rm -f stamp-it; \
653- $(MAKE) stamp-it; \
654- fi
655-
656-stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
657- cd $(top_builddir) \
658- && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
659- $(SHELL) ./config.status
660-
661-# Tell versions [3.59,3.63) of GNU make not to export all variables.
662-# Otherwise a system limit (for SysV at least) may be exceeded.
663-.NOEXPORT:
664
665=== modified file 'po/POTFILES.in'
666--- po/POTFILES.in 2011-12-23 14:28:12 +0000
667+++ po/POTFILES.in 2012-10-05 07:42:21 +0000
668@@ -0,0 +1,1 @@
669+[type: gettext/xml]data/providers/google.provider.in
670
671=== added file 'po/POTFILES.skip'
672--- po/POTFILES.skip 1970-01-01 00:00:00 +0000
673+++ po/POTFILES.skip 2012-10-05 07:42:21 +0000
674@@ -0,0 +1,4 @@
675+data/services/facebook-microblog.service.in
676+data/services/identica-microblog.service.in
677+data/services/twitter-microblog.service.in
678+

Subscribers

People subscribed via source and target branches