Mercurial > pidgin3 / changeset

--- a/.hgignore	Fri May 25 18:46:42 2018 -0500
+++ b/.hgignore	Thu May 31 01:04:18 2018 +0000
@@ -13,7 +13,6 @@
 
 syntax: regexp
 ^build(.+)?\/
-po/Makefile.in.in
 po/POTFILES$
 po/missing
 po/notexist

--- a/libpurple/data/purple-url-handler.desktop.in.in	Fri May 25 18:46:42 2018 -0500
+++ b/libpurple/data/purple-url-handler.desktop.in.in	Thu May 31 01:04:18 2018 +0000
@@ -1,7 +1,7 @@
 [Desktop Entry]
-_Name=Pidgin
-_GenericName=Internet Messenger
-_Comment=Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, and more
+Name=Pidgin
+GenericName=Internet Messenger
+Comment=Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, and more
 Exec=purple-url-handler %u
 TryExec=purple-url-handler
 Icon=pidgin

--- a/libpurple/meson.build	Fri May 25 18:46:42 2018 -0500
+++ b/libpurple/meson.build	Thu May 31 01:04:18 2018 +0000
@@ -440,12 +440,11 @@
 	    input : 'data/' + DESKTOP_FILE + '.in.in',
 	    output : DESKTOP_FILE + '.in',
 	    configuration : conf)
-	desktop_file = custom_target(DESKTOP_FILE,
+	desktop_file = i18n.merge_file(
 	    input : desktop_file_in,
 	    output : DESKTOP_FILE,
-	    command : [intltool_merge, '--desktop-style', '-u',
-	               '-c', '@BUILD_DIR@/po/.intltool-merge-cache',
-	               meson.source_root() + '/po', '@INPUT@', '@OUTPUT@'],
+	    po_dir : meson.source_root() + '/po',
+	    type : 'desktop',
 	    install : true,
 	    install_dir : get_option('datadir') + '/applications')
 endif  # INSTALL_I18N

--- a/meson.build	Fri May 25 18:46:42 2018 -0500
+++ b/meson.build	Thu May 31 01:04:18 2018 +0000
@@ -267,9 +267,9 @@
 if INSTALL_I18N
 	conf.set('ENABLE_NLS', true)
 
-	subdir('po')
+	i18n = import('i18n')
 
-	intltool_merge = find_program('intltool-merge')
+	subdir('po')
 endif
 
 # #######################################################################

--- a/pidgin/data/im.pidgin.Pidgin.appdata.xml.in	Fri May 25 18:46:42 2018 -0500
+++ b/pidgin/data/im.pidgin.Pidgin.appdata.xml.in	Thu May 31 01:04:18 2018 +0000
@@ -7,15 +7,15 @@
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0</project_license>
   <description>
-    <_p>
+    <p>
       Pidgin is a chat program which lets you log in to accounts on multiple
       chat networks simultaneously.
-    </_p>
-    <_p>
+    </p>
+    <p>
       This means that you can be chatting with friends on AIM, talking to a
       friend on Google Talk, and sitting in an IRC chat room all at the same
       time.
-    </_p>
+    </p>
   </description>
 
   <launchable type="desktop-id">im.pidgin.Pidgin.desktop</launchable>
@@ -26,7 +26,7 @@
   <screenshots>
     <screenshot type="default">
       <image>https://www.pidgin.im/shared/img/contact_window.png</image>
-      <_caption>Buddy list showing friends on different networks</_caption>
+      <caption>Buddy list showing friends on different networks</caption>
     </screenshot>
   </screenshots>
 

--- a/pidgin/data/im.pidgin.Pidgin.desktop.in.in	Fri May 25 18:46:42 2018 -0500
+++ b/pidgin/data/im.pidgin.Pidgin.desktop.in.in	Thu May 31 01:04:18 2018 +0000
@@ -1,7 +1,7 @@
 [Desktop Entry]
-_Name=Pidgin
-_GenericName=Internet Messenger
-_Comment=Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, and more
+Name=Pidgin
+GenericName=Internet Messenger
+Comment=Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, and more
 Exec=pidgin
 Icon=pidgin
 StartupNotify=true

--- a/pidgin/meson.build	Fri May 25 18:46:42 2018 -0500
+++ b/pidgin/meson.build	Thu May 31 01:04:18 2018 +0000
@@ -203,21 +203,18 @@
 		    input : 'data/' + DESKTOP_FILE + '.in.in',
 		    output : DESKTOP_FILE + '.in',
 		    configuration : conf)
-		desktop_file = custom_target(DESKTOP_FILE,
+		desktop_file = i18n.merge_file(
 		    input : desktop_file_in,
 		    output : DESKTOP_FILE,
-		    command : [intltool_merge, '--desktop-style', '-u',
-		               '-c', '@BUILD_DIR@/po/.intltool-merge-cache',
-		               meson.source_root() + '/po', '@INPUT@', '@OUTPUT@'],
+		    po_dir : meson.source_root() + '/po',
+		    type : 'desktop',
 		    install : true,
 		    install_dir : get_option('datadir') + '/applications')
 
-		appdata = custom_target('im.pidgin.Pidgin.appdata.xml',
+		appdata = i18n.merge_file(
 		    input : 'data/im.pidgin.Pidgin.appdata.xml.in',
 		    output : 'im.pidgin.Pidgin.appdata.xml',
-			command : [intltool_merge, '--xml-style', '-u',
-		               '-c', '@BUILD_DIR@/po/.intltool-merge-cache',
-		               meson.source_root() + '/po', '@INPUT@', '@OUTPUT@'],
+		    po_dir : meson.source_root() + '/po',
 		    install : true,
 		    install_dir : get_option('datadir') + '/metainfo')
 	endif  # INSTALL_I18N

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/po/LINGUAS	Thu May 31 01:04:18 2018 +0000
@@ -0,0 +1,94 @@
+af
+am
+ar
+as
+ast
+az
+be@latin
+bg
+bn_IN
+bn
+br
+brx
+bs
+ca
+ca@valencia
+cs
+da
+de
+dz
+el
+en_AU
+en_CA
+en_GB
+eo
+es_AR
+es
+et
+eu
+fa
+fi
+fr
+ga
+gl
+gu
+he
+hi
+hr
+hu
+id
+it
+ja
+ka
+kk
+km
+kn
+ko
+ks
+ku_IQ
+ku
+lt
+lv
+mai
+mhr
+mk
+ml
+mn
+mr
+ms_MY
+my_MM
+nb
+ne
+nl
+nn
+oc
+or
+pa
+pl
+ps
+pt_BR
+pt
+ro
+ru
+sd
+si
+sk
+sl
+sq
+sr@latin
+sr
+sv
+sw
+ta
+te
+th
+tr
+tt
+uk
+ur
+uz
+vi
+xh
+zh_CN
+zh_HK
+zh_TW

--- a/po/meson.build	Fri May 25 18:46:42 2018 -0500
+++ b/po/meson.build	Thu May 31 01:04:18 2018 +0000
@@ -1,5 +1,1 @@
-i18n = import('i18n')
-
-ALL_LINGUAS='af am ar as ast az be@latin bg bn_IN bn br brx bs ca ca@valencia cs da de dz el en_AU en_CA en_GB eo es_AR es et eu fa fi fr ga gl gu he hi hr hu id it ja ka kk km kn ko ks ku_IQ ku lt lv mai mhr mk ml mn mr ms_MY my_MM nb ne nl nn oc or pa pl ps pt_BR pt ro ru sd si sk sl sq sr@latin sr sv sw ta te th tr tt uk ur uz vi xh zh_CN zh_HK zh_TW'.split()
-
-i18n.gettext('pidgin', languages : ALL_LINGUAS)
+i18n.gettext('pidgin')