# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: lists.ban@herbesfolles.org-20160202162154-\
#   lrg99fahc0vxoikx
# target_branch: http://bazaar.launchpad.net/~intltool/intltool/trunk/
# testament_sha1: 6ee9f454e31cff81ddb899e4eb4a0198e07fd0ff
# timestamp: 2016-02-02 17:30:37 +0100
# base_revision_id: dobey@wayofthemonkey.com-20150309014358-\
#   vqm9e7mmkt6qy6rh
# 
# Begin patch
=== modified file 'intltool-extract.in'
--- intltool-extract.in	2014-11-24 02:37:01 +0000
+++ intltool-extract.in	2016-02-02 16:21:54 +0000
@@ -276,7 +276,7 @@
 
 sub type_ini {
     ### For generic translatable desktop files ###
-    while ($input =~ /^(#(.+)\n)?^_[A-Za-z0-9\-]+\s*=\s*(.*)$/mg) {
+    while ($input =~ /^(#(.+)\n)?^_[A-Za-z0-9_\-]+\s*=\s*(.*)$/mg) {
         if (defined($2))  {
             $comments{$3} = $2;
         }

=== modified file 'intltool-merge.in'
--- intltool-merge.in	2014-11-24 02:37:01 +0000
+++ intltool-merge.in	2016-02-02 16:21:54 +0000
@@ -1186,7 +1186,7 @@
 
     while (<INPUT>) 
     {
-        if (s/^(\s*)_([A-Za-z0-9\-]+\s*=\s*(.*))/$1$2/)  
+        if (s/^(\s*)_([A-Za-z0-9_\-]+\s*=\s*(.*))/$1$2/)
         {
 	    my $string = $3;
 

=== modified file 'tests/cases/extract13.desktop.in'
--- tests/cases/extract13.desktop.in	2014-12-03 23:12:57 +0000
+++ tests/cases/extract13.desktop.in	2016-02-02 16:21:54 +0000
@@ -27,3 +27,4 @@
 _X-Color2 = Red
 _X-Color3= Green
 _X-Color4 =Yellow
+_X_Color5=Lime

=== modified file 'tests/results/extract13.desktop'
--- tests/results/extract13.desktop	2014-12-03 23:12:57 +0000
+++ tests/results/extract13.desktop	2016-02-02 16:21:54 +0000
@@ -27,3 +27,4 @@
 X-Color2 = Red
 X-Color3= Green
 X-Color4 =Yellow
+X_Color5=Lime

=== modified file 'tests/results/extract13.desktop.in.h'
--- tests/results/extract13.desktop.in.h	2014-12-03 23:12:57 +0000
+++ tests/results/extract13.desktop.in.h	2016-02-02 16:21:54 +0000
@@ -6,3 +6,4 @@
 char *s = N_("Red");
 char *s = N_("Green");
 char *s = N_("Yellow");
+char *s = N_("Lime");

# Begin bundle
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