Merge remote-tracking branch 'origin/3.6' into develop

Dolibarr · Aug 1, 2014 · e18cacc · e18cacc
2 parents f58da0f + 6917b97
commit e18cacc
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/.tx/config b/.tx/config
@@ -164,6 +164,12 @@ source_file = htdocs/langs/en_US/ldap.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.link]
+file_filter = htdocs/langs/<lang>/link.lang
+source_file = htdocs/langs/en_US/link.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.mailmanspip]
 file_filter = htdocs/langs/<lang>/mailmanspip.lang
 source_file = htdocs/langs/en_US/mailmanspip.lang