Please cherry-pick:

[jjobs.git] / INSTALL.txt

diff --git a/INSTALL.txt b/INSTALL.txt
index eadff3d5712949ada2ca6305032e73f448f23d61..f44f8ab23ef1ebdc78876c122a393b0e673e115a 100644 (file)
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -58,3 +58,9 @@ mail.smtp.auth : true
 JNDI name: jms/jjobs-user-activity-log
 Physical destination name: jjobsUserActivityLog
 Resource type: javax.jms.Queue
+
+9) In WAR project, copy local_xx_XX.properties-dist to local_de_DE.properties
+   and local_en_US.properties. If for example your application uses
+   product_categories from jproduct-core, you may want to add your custom i18n
+   strings to the local properties files as this doesn't cause any later merge
+   conflicts as they are ignored by default.