Index: branches/2015Q4/databases/qof/pkg-plist
===================================================================
--- branches/2015Q4/databases/qof/pkg-plist	(revision 399680)
+++ branches/2015Q4/databases/qof/pkg-plist	(revision 399681)
@@ -1,60 +1,60 @@
 include/qof/guid.h
 include/qof/kvpframe.h
 include/qof/kvputil.h
 include/qof/qof-backend-qsf.h
 include/qof/qof.h
 include/qof/qofbackend-p.h
 include/qof/qofbackend.h
 include/qof/qofbook.h
 include/qof/qofbookmerge.h
 include/qof/qofchoice.h
 include/qof/qofclass.h
 include/qof/qofdate.h
 include/qof/qoferror.h
 include/qof/qofevent.h
 include/qof/qofgobj.h
 include/qof/qofid-p.h
 include/qof/qofid.h
 include/qof/qofinstance-p.h
 include/qof/qofinstance.h
 include/qof/qoflog.h
 include/qof/qofnumeric.h
 include/qof/qofobject.h
 include/qof/qofquery-p.h
 include/qof/qofquery.h
 include/qof/qofquerycore-p.h
 include/qof/qofquerycore.h
 include/qof/qofreference.h
 include/qof/qofsession.h
 include/qof/qofsql.h
 include/qof/qoftime.h
 include/qof/qofundo.h
 include/qof/qofutil.h
 include/qof/sql_parser.h
 lib/libqof.a
 lib/libqof.so
 lib/libqof.so.2
 lib/libqof.so.2.0.5
 lib/libqofsql.a
 lib/libqofsql.so
 lib/libqofsql.so.1
 lib/libqofsql.so.1.0.2
 lib/qof2/libqof-backend-qsf.a
 lib/qof2/libqof-backend-qsf.so
 libdata/pkgconfig/qof.pc
-share/locale/cs/LC_MESSAGES/qof.mo
-share/locale/de/LC_MESSAGES/qof.mo
-share/locale/fr/LC_MESSAGES/qof.mo
-share/locale/id/LC_MESSAGES/qof.mo
-share/locale/it/LC_MESSAGES/qof.mo
-share/locale/pt/LC_MESSAGES/qof.mo
-share/locale/pt_BR/LC_MESSAGES/qof.mo
-share/locale/ro/LC_MESSAGES/qof.mo
-share/locale/ru/LC_MESSAGES/qof.mo
-share/locale/sv/LC_MESSAGES/qof.mo
-share/locale/vi/LC_MESSAGES/qof.mo
-share/locale/zh_CN/LC_MESSAGES/qof.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/qof.mo
+%%NLS%%share/locale/de/LC_MESSAGES/qof.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/qof.mo
+%%NLS%%share/locale/id/LC_MESSAGES/qof.mo
+%%NLS%%share/locale/it/LC_MESSAGES/qof.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/qof.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/qof.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/qof.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/qof.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/qof.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/qof.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/qof.mo
 share/xml/qof/qsf/pilot-qsf-GnuCashInvoice.xml
 share/xml/qof/qsf/pilot-qsf-gncCustomer.xml
 share/xml/qof/qsf/qsf-map.xsd.xml
 share/xml/qof/qsf/qsf-object.xsd.xml
Index: branches/2015Q4
===================================================================
--- branches/2015Q4	(revision 399680)
+++ branches/2015Q4	(revision 399681)

Property changes on: branches/2015Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r399678