# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: lists.ban@herbesfolles.org-20160202165641-\
#   0hgz3vq7jodeu7lj
# target_branch: http://bazaar.launchpad.net/~intltool/intltool/trunk/
# testament_sha1: 43c364acc414aa121338a99ee3d321613ff395e8
# timestamp: 2016-02-02 18:01:41 +0100
# base_revision_id: lists.ban@herbesfolles.org-20160202162154-\
#   lrg99fahc0vxoikx
# 
# Begin patch
=== modified file 'intltool-merge.in'
--- intltool-merge.in	2016-02-02 16:21:54 +0000
+++ intltool-merge.in	2016-02-02 16:56:41 +0000
@@ -1200,7 +1200,7 @@
                 next if !$translation;
 
                 $_ = $non_translated_line;
-                s/(\w+)\s*=\s*.*/${1}[$lang]=$translation/;
+                s/\s*=.*$/[$lang]=$translation/;
                 print OUTPUT;
             }
 	} 

=== modified file 'tests/cases/extract13.desktop.in'
--- tests/cases/extract13.desktop.in	2016-02-02 16:21:54 +0000
+++ tests/cases/extract13.desktop.in	2016-02-02 16:56:41 +0000
@@ -28,3 +28,4 @@
 _X-Color3= Green
 _X-Color4 =Yellow
 _X_Color5=Lime
+_X-Color6-=White

=== modified file 'tests/cases/fr.po'
--- tests/cases/fr.po	2008-07-25 17:55:03 +0000
+++ tests/cases/fr.po	2016-02-02 16:56:41 +0000
@@ -7,8 +7,8 @@
 "Project-Id-Version: Test file - DON'T CHANGE\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-01-06 23:16+0200\n"
-"PO-Revision-Date: 2002-08-16 22:17+0200\n"
-"Last-Translator: Denis Barbier <barbier@linuxfr.org>\n"
+"PO-Revision-Date: 2016-02-02 17:50+0100\n"
+"Last-Translator: Colomban Wendling <lists.ban@herbesfolles.org>\n"
 "Language-Team: NONE <kenneth@gnu.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
@@ -60,6 +60,18 @@
 msgid "Current month?"
 msgstr "Mois en cours ?"
 
+#: cases/extract13.desktop:26
+msgid "Blue"
+msgstr "Bleu"
+
+#: cases/extract13.desktop:30
+msgid "Lime"
+msgstr "Vert citron"
+
+#: cases/extract13.desktop:31
+msgid "White"
+msgstr "Blanc"
+
 #: cases/context.xml.in.h:2
 msgctxt "1"
 msgid "Bar"

=== modified file 'tests/results/extract13.desktop'
--- tests/results/extract13.desktop	2016-02-02 16:21:54 +0000
+++ tests/results/extract13.desktop	2016-02-02 16:56:41 +0000
@@ -24,7 +24,11 @@
 X-GNOME-Bugzilla-Product=gnome-utils
 X-GNOME-Bugzilla-Component=gsearchtool
 X-Color=Blue
+X-Color[fr]=Bleu
 X-Color2 = Red
 X-Color3= Green
 X-Color4 =Yellow
 X_Color5=Lime
+X_Color5[fr]=Vert citron
+X-Color6-=White
+X-Color6-[fr]=Blanc

=== modified file 'tests/results/extract13.desktop.in.h'
--- tests/results/extract13.desktop.in.h	2016-02-02 16:21:54 +0000
+++ tests/results/extract13.desktop.in.h	2016-02-02 16:56:41 +0000
@@ -7,3 +7,4 @@
 char *s = N_("Green");
 char *s = N_("Yellow");
 char *s = N_("Lime");
+char *s = N_("White");

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcKxGisAB6xfgEQUXP////8F
1d+////5YAwu6FZ74AA9PQBQred3oFmGRVDVAopqEohKfqPSIGh7UIyZoTRoADQDQDR6gaDgGEYT
TEMAgGQAwjTJkwjAQ0GUAaRpGp6mmhpoDQAANAAAA0ASJCZJtVJ+1NHpT1TT21JpPSNDamh6gyAN
A2owIEVIEeqn5U80U/VPU8NSP0p6m0jJ6TIAwjQA0PUPQRSJkEZMQmI0mCp+qepPT9ITT1GepCep
o0MEG9RxInT12lF9yNiNeux2vsSXSprStKMzErKZfwqemeLoVWqrGdXVnJZ4Fx3mDIIPBupJk5Ri
zdODt31NrJoCoKJKBCJi4oVCWmXQDp21QVJVDmxWpXzNAxErPhe+fwCMVyXKjd9n8TMhH/cRHvCG
m22020waZf0JL1zMRtm2cHNy6TDx1NCrGmyzKO0g0wUxygi0SYxnoXSXy7k+VeQkuGBXf2139eS6
bBc90dthEPLKX+4EqTyvFTCLvZ6y/h4iLGWUhGEoBVyk4JNrwCITjQx6TW9q6J0Rm16M0r+rMvOV
dzV4MC74lBQZq9TFHJw0H5+jpcMiHsN/xtjGPXdntx5M8W95cRApwuJgXhZIjRrBBBWpxWOWWT2f
NQUSwORznENOd5VwEOd2/eFFCAyagw3Np8+zERLdlUXeEFCkVAnC+tY7ZQgBYoF9dYVmp7Z1hH7Y
vgT/s2xHI33lxn7IlEC09j7TTwfqKX3nr8XEMtuNRQuHa1QyMU2fUfIkSCRcKH2vr4XeYn76ygPl
5xTLYkpSS2lIIiMu8gvRTWZB+rw+hUa/buBbfgXk/9LaCGFiWsKhOPyLlAkoHQzKHfYZBCE+74Dl
tMTG8vC5AkWULkChd/8SsPc2FVKhalA/DaWmQu1LqlC82l5ZUh/SWkzQXEaIk630Y3b0NkDdWTbB
OUNm7G8vIvx5UF+AGRsQIv+slgga/ykWYoHmG/HXzNu8vQMNxbpqbsMS9zxMiYYIWoGJxL2eWJWd
Z8q5baWEG9HiZHCy8XADUsMSQnmaFHVE5l9bAQsRJQLM38ANDK4s6b/ahc9npLedxsxsDgJvNsja
bDI6S2Hub+3eb8YcChtoS6yBd0AVhQLaKBCmR16YdaIGptRLlA613l+vL0d2pawXk3aTDEMZmhDI
puhKlMy4su4ES6QVvNi61oV1uOmSszM2l4RgbdHpmbiCXSyjKuzdZeT0yCc0e19lgM7QbIRMRGNV
x5pW8RMkIFqIlXYjFh8DULpyzXcXQRjPEqGwwywOZ8oNC43EuJmWnA8RdHOnKmCJjUgXSwWSbhts
z7OZeE5xEyha6ERUtLTQXduBCOBQqZYdKAwC4K5csSLHMZk6BwMy7xHkH+OyynDiGmWbMMzH7B7E
0KZlxrzp1M7OBcYolwaFbqEUKhoL5M9lWiBbTVhdhMmZF1EodHcbjAkam0kdC2RmbyZZV7rahdGk
SHc5YsiSgdaZzFLgyCOAt7YLbYTNxfvMrCuIW7TB1NEeF4xqbTeZmZ0fV+xArrTJOGe/QiGgWmNx
qWBJAqVQIoWFiWm4v4Eit1ut1xBoYSLDEm1MCN5QW+zv7by7iYnRmYk9xLnycz/Av4i4O8e8PVvH
n2bd3Kyy+OLqpsN1JTDQu1HYcS067cN9HFuodJlGOZqZoT6G4012lxgSMx25Sh4CpapaRUlkbjmI
Oc3nKG8y24wRUlI4BhnsbbeJSwtw7MzXu0J2mRZQpW4tNBruLCmYYbimG3Oh1RL8ew1SDxLKkGbx
M+/dzMDEyOB4Pcgb8UTo5vP4fe79kXkfFhNsGHAiXYQyJpqRBaQhUsSwGhMWCpFQblbbSCv6T9nu
D1TqM7sTQ0+KagRC60NoaS+z7Wd4e8kY8S4ni5e0k2Ch6PueWuZEQJCEQxH9P17Ygxqfi2yGGBxG
JejhFAoLGKB5y3qNJpaWlGIxAFhYe4FWQrNxtvRcZLsZSlTxkCMqOMv2U+9Jk0TJfJ0spaGIxFBU
QLfc0EK8cOYffOY4zEqva+ACNDEKZxFSR8piSNRhiZyLWoTPHB+MzrodhU2l2eTUB3/MzuLjeYF5
2F6tUSCPnaP3++3tE7T03IJ95SUE5LEZnQZ8pYI2QoBlP7XepkNsCl3PPlCsyO4/cTPEsaHedbCZ
M6kUPAnMLTqGT/sKHkYmJ2GJkeJBibC07RQ/J+773y6GNDy+KDHI5HI1Mj4Eifg/BE0Ol/bzLyC6
RzoYVLczhwvOw5cy/Utt9B/9H1ejA3m0vLb3ZPfjy7cylhY5dCEycJEu4eqGJPM/1rag+Um78x27
ZRPmY4EjM6Gw4F8HEob+7I+BOwyRpzMhZkipj1OmApzMTEyMypBSZCUqKj64cd4zIXC3A6WZtajG
UToGuBDq3tSYLjKXPSJx367pR4hYiNSnnxoTNShww3tMf5yt75BwMbkviOc2HfLKRBQgz+YRYRiT
YExkBoJorpMys9OMbPMgzOBHpyIsN5h2SNhvMNnBAw7zO/+WhdjIp6+5MNwfRhNgP6BgXKLe3oVF
DpLtW2p9D8xb2YRV8rJihN8yA6ihB9aYIW7A2omAN5QX8pgHjCBQU96mAP1j7vxcmCowymcNV1ps
4zgIECQ46xnN88ZORIonFEpKPFqL5OTk5KXI5YYgb1of4ThEqB8hnFCQdhwO6w/3b3CpsvA7clAo
gQAzHCQ6oFmDOH0F18H7CTYAwfruRKJaYxILU+4ULj7Bb0v9v4wE6faHQOaJ+dA36Jk6niaUGOKS
LeByHUKQIm3iBo0lqJgKwA0HsCIWU3NqM/qV7MXSDuv3pf/ODzfE9pQQfx9Sw2mThAsaz4YHoQMI
oSE0GYMLcWkdxSJFD1jAc46dgswv/QeDI0t5uZ5K7nEW9Eq/hcOIFADaSA/E7rGtwPvAJlgSLxQu
Jnqgen7dW08DwGE7wIJDCS+DryF3B3mKoaFJC5+iJP8ZnepUHfO1Dx7/6PfySj8HFA4h8TcJM2Bd
wKhpCNUbDRarYUBVI0FgSJKkS/whGsQKSY0aChBsEkT4yCSsEi1o2C2RIcjNJLVEdiwFbJ2KzWAK
QJibEmLXgu5q2Zi1XzOgvOZUO9+SJ5D+fNcVQgPoJYh1YMN8aCH7yzkPVs4KVgWDYXjOIVtMUD2F
CicQoODluvkptIcu8gSBY/a2A2EbHAlHe2nYGw80D8Hcd2b1OOUosowdQgmOUFjaAyVg9yD51FDq
N5WfscbFGygOh4lAbEC2FA5IkMlzY9uqBYmLPkVQKm2CsEJWAjo7TSTb7rn4RTCodEECQMSD3fRC
7ymaDQaFh3suzMGgFAU7h+JQHiJU5OiBMS0W49YWITez5nMP3DQGwwgwO/ar9ziKFETKsgYKW6VN
CPpE59xQnLnTjqSmA+4/sbigjxAioVMWUmbjDsXzjG0MYxmYI7pZQj1YvN2ZqETMtilW9TcLSitB
hyAa+nzlTEleFooYEISAoLIGhviXEA1l3W6aQWA5qiRg6CW/5mTyhAyuSscCB7egXebUTncG7HI+
Qd5yNklIQIAzD5InNAsFTn2nSGbB6k1jK05vcGlmLDfFlrUmMXX2C7kinChIYViNFYA=