diff options
| author | Iñigo Martínez <inigomartinez@gmail.com> | 2017-08-02 18:03:26 +0200 |
|---|---|---|
| committer | Iñigo Martínez <inigomartinez@gmail.com> | 2017-08-07 10:36:59 +0200 |
| commit | 270e385a728b5a68824e15498b840ff18b0393e6 (patch) | |
| tree | a528d1b0112a253b0a404c5ce436ddd0e015bc43 | |
| parent | cea79d33a911ed1acb26a480e6941613855cc67f (diff) | |
| download | gnome-bluetooth-wip/inigomartinez/meson.tar.gz | |
build: Migrated from Intltool to Gettextwip/inigomartinez/meson
| -rw-r--r-- | meson.build | 3 | ||||
| -rw-r--r-- | po/POTFILES.in | 4 | ||||
| -rw-r--r-- | sendto/bluetooth-sendto.desktop.in.in | 4 | ||||
| -rw-r--r-- | sendto/meson.build | 15 |
4 files changed, 12 insertions, 14 deletions
diff --git a/meson.build b/meson.build index 78880ab8..496a2672 100644 --- a/meson.build +++ b/meson.build @@ -163,9 +163,6 @@ pkg = import('pkgconfig') po_dir = join_paths(meson.source_root(), 'po') -intltool_merge = find_program('intltool-merge') -intltool_cache = join_paths(po_dir, '.intltool-merge-cache') - top_inc = include_directories('.') subdir('icons') diff --git a/po/POTFILES.in b/po/POTFILES.in index ca0b6e3e..ffdf6a16 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -5,10 +5,10 @@ lib/bluetooth-client.c lib/bluetooth-filter-widget.c lib/bluetooth-pairing-dialog.c lib/bluetooth-settings-row.c -[type: gettext/glade]lib/bluetooth-settings-row.ui +lib/bluetooth-settings-row.ui lib/bluetooth-settings-widget.c lib/bluetooth-settings-obexpush.c lib/bluetooth-utils.c -[type: gettext/glade]lib/settings.ui +lib/settings.ui sendto/bluetooth-sendto.desktop.in.in sendto/main.c diff --git a/sendto/bluetooth-sendto.desktop.in.in b/sendto/bluetooth-sendto.desktop.in.in index 810de893..a4ae0021 100644 --- a/sendto/bluetooth-sendto.desktop.in.in +++ b/sendto/bluetooth-sendto.desktop.in.in @@ -1,6 +1,6 @@ [Desktop Entry] -_Name=Bluetooth Transfer -_Comment=Send files via Bluetooth +Name=Bluetooth Transfer +Comment=Send files via Bluetooth Icon=bluetooth Exec=bluetooth-sendto Terminal=false diff --git a/sendto/meson.build b/sendto/meson.build index de65c2aa..bf4f8165 100644 --- a/sendto/meson.build +++ b/sendto/meson.build @@ -33,19 +33,20 @@ install_man( desktop_conf = configuration_data() desktop_conf.set('VERSION', gnomebt_version) -desktop_name = name + '.desktop' +desktop = name + '.desktop' desktop_in = configure_file( - input: desktop_name + '.in.in', - output: desktop_name + '.in', + input: desktop + '.in.in', + output: desktop + '.in', configuration: desktop_conf ) -custom_target( - desktop_name, +i18n.merge_file ( + desktop, + type: 'desktop', input: desktop_in, - output: desktop_name, - command: [intltool_merge, '-d', '-u', '-c', intltool_cache, po_dir, '@INPUT@', '@OUTPUT@'], + output: desktop, + po_dir: po_dir, install: true, install_dir: join_paths(gnomebt_datadir, 'applications') ) |