[Mpuls-commits] r4201 - waska/trunk

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-11-16 17:55:19 +0100 (Tue, 16 Nov 2010)
New Revision: 4201

Modified:
   waska/trunk/ChangeLog
   waska/trunk/development_waska.ini
Log:
Updated ChangeLog


Modified: waska/trunk/ChangeLog
===================================================================
--- waska/trunk/ChangeLog	2010-11-16 16:54:31 UTC (rev 4200)
+++ waska/trunk/ChangeLog	2010-11-16 16:55:19 UTC (rev 4201)
@@ -1,3 +1,8 @@
+2010-11-16  Torsten Irlaender <torsten at intevation.de>
+
+	* waskaweb/i18n/specific_translations_in_base.txt: Added word
+	"Markierungen"
+
 2010-11-16  Bernhard Herzog  <bh at intevation.de>
 
 	Implement the WASKA part of mpuls/issue1264

Modified: waska/trunk/development_waska.ini
===================================================================
--- waska/trunk/development_waska.ini	2010-11-16 16:54:31 UTC (rev 4200)
+++ waska/trunk/development_waska.ini	2010-11-16 16:55:19 UTC (rev 4201)
@@ -41,15 +41,17 @@
 mpuls.app.path.controllers=%(mpuls.app.path)s/controllers
 mpuls.app.path.templates=%(mpuls.app.path)s/templates
 mpuls.app.path.formed=%(mpuls.app.path.public)s/formed
-#mpuls.app.path.i18n = 
+mpuls.app.path.i18n=%(mpuls.app.path)s/i18n
 #mpuls.app.path.addons = 
 
 # for connections to PostgeSQL database
 mpuls.db.host     = 192.168.193.6
+#mpuls.db.port     = 15432 
 mpuls.db.port     = 5438
 # Define name of the database if fetching name from
 # SSL_CLIENT_S_DN_CN in ssl certificte fails. 
-mpuls.db.name     = waska0010 
+mpuls.db.name     = waska0014 
+#mpuls.db.name     = aschaefer00001
 mpuls.db.database = ka_%s_db
 # db_user:     first %s -> database name, second %s -> user
 mpuls.db.user     = ka_%s_%s
@@ -57,7 +59,7 @@
 [server:main]
 use = egg:Paste#http
 host = 0.0.0.0
-port = 5001
+port = 5000
 #ssl_pem = *
 
 [app:main]