[Mapbender-commits] r4630 - in branches/2.6/resources/db: . mysql/ISO-8859-1/update mysql/UTF-8/update pgsql/ISO-8859-1/update pgsql/UTF-8/update

Tue Sep 15 07:16:44 EDT 2009

Author: tbaschetti
Date: 2009-09-15 07:16:43 -0400 (Tue, 15 Sep 2009)
New Revision: 4630

Added:
   branches/2.6/resources/db/mysql/ISO-8859-1/update/update_2.6rc1_to_2.6_mysql_ISO-8859-1.sql
   branches/2.6/resources/db/mysql/UTF-8/update/update_2.6rc1_to_2.6_mysql_UTF-8.sql
   branches/2.6/resources/db/pgsql/ISO-8859-1/update/update_2.6rc1_to_2.6_pgsql_ISO-8859-1.sql
Removed:
   branches/2.6/resources/db/mysql/ISO-8859-1/update/update_2.6rc1_to_2.6rc2_mysql_ISO-8859-1.sql
   branches/2.6/resources/db/mysql/UTF-8/update/update_2.6rc1_to_2.6rc2_mysql_UTF-8.sql
   branches/2.6/resources/db/pgsql/ISO-8859-1/update/update_2.6rc1_to_2.6rc2_pgsql_ISO-8859-1.sql
Modified:
   branches/2.6/resources/db/install_2.6.bat
   branches/2.6/resources/db/install_2.6.sh
   branches/2.6/resources/db/pgsql/UTF-8/update/update_2.6rc1_to_2.6_pgsql_UTF-8.sql
Log:
updated scripts for mysql (iso,utf), pgsql(iso) 
added entries for translation table (I18N)
synced filenames and installscript


Modified: branches/2.6/resources/db/install_2.6.bat
===================================================================

--- branches/2.6/resources/db/install_2.6.bat	2009-09-15 10:47:14 UTC (rev 4629)
+++ branches/2.6/resources/db/install_2.6.bat	2009-09-15 11:16:43 UTC (rev 4630)
@@ -157,8 +157,8 @@
 mysql %DBNAME% -p -h %DBHOST% -P %DBPORT% -u %DBUSER% < mysql/%USEDBENC%/update/update_2.5.1rc1_to_2.5.1_mysql_%USEDBENC%.sql >> log_update.txt 2>> err_update.txt
 echo update to 2.6rc1
 mysql %DBNAME% -p -h %DBHOST% -P %DBPORT% -u %DBUSER% < mysql/%USEDBENC%/update/update_2.5.1_to_2.6rc1_mysql_%USEDBENC%.sql >> log_update.txt 2>> err_update.txt
-echo update to 2.6rc2
-mysql %DBNAME% -p -h %DBHOST% -P %DBPORT% -u %DBUSER% < mysql/%USEDBENC%/update/update_2.6rc1_to_2.6rc2_mysql_%USEDBENC%.sql >> log_update.txt 2>> err_update.txt
+echo update to 2.6
+mysql %DBNAME% -p -h %DBHOST% -P %DBPORT% -u %DBUSER% < mysql/%USEDBENC%/update/update_2.6rc1_to_2.6_mysql_%USEDBENC%.sql >> log_update.txt 2>> err_update.txt
 
 
 GOTO POFILES

Modified: branches/2.6/resources/db/install_2.6.sh
===================================================================
--- branches/2.6/resources/db/install_2.6.sh	2009-09-15 10:47:14 UTC (rev 4629)
+++ branches/2.6/resources/db/install_2.6.sh	2009-09-15 11:16:43 UTC (rev 4630)
@@ -145,8 +145,8 @@
 	mysql $DBNAME -p$DBPASSWORD -u $DBUSER -h $DBHOST -P $DBPORT < mysql/$DBENCODING/update/update_2.5.1rc1_to_2.5.1_mysql_$DBENCODING.sql >> log_update.txt 2>> err_update.txt
 	echo "update to 2.6rc1"
 	mysql $DBNAME -p$DBPASSWORD -u $DBUSER -h $DBHOST -P $DBPORT < mysql/$DBENCODING/update/update_2.5.1_to_2.6rc1_mysql_$DBENCODING.sql >> log_update.txt 2>> err_update.txt
-	echo "update to 2.6rc2"
-	mysql $DBNAME -p$DBPASSWORD -u $DBUSER -h $DBHOST -P $DBPORT < mysql/$DBENCODING/update/update_2.6rc1_to_2.6rc2_mysql_$DBENCODING.sql >> log_update.txt 2>> err_update.txt
+	echo "update to 2.6"
+	mysql $DBNAME -p$DBPASSWORD -u $DBUSER -h $DBHOST -P $DBPORT < mysql/$DBENCODING/update/update_2.6rc1_to_2.6_mysql_$DBENCODING.sql >> log_update.txt 2>> err_update.txt
 
 	
 }
@@ -176,7 +176,7 @@
 	psql -U $DBUSER  -h $DBHOST -p $DBPORT -f pgsql/$DBENCODING/update/update_2.5.1rc1_to_2.5.1_pgsql_$DBENCODING.sql $DBNAME >> log_update.txt 2>> err_update.txt
 	echo "update to 2.6rc1"
 	psql -U $DBUSER  -h $DBHOST -p $DBPORT -f pgsql/$DBENCODING/update/update_2.5.1_to_2.6rc1_pgsql_$DBENCODING.sql $DBNAME >> log_update.txt 2>> err_update.txt
-	echo "update to 2.6rc2"
+	echo "update to 2.6"
 	psql -U $DBUSER  -h $DBHOST -p $DBPORT -f pgsql/$DBENCODING/update/update_2.6rc1_to_2.6_pgsql_$DBENCODING.sql $DBNAME >> log_update.txt 2>> err_update.txt
 
 

Copied: branches/2.6/resources/db/mysql/ISO-8859-1/update/update_2.6rc1_to_2.6_mysql_ISO-8859-1.sql (from rev 4628, branches/2.6/resources/db/mysql/ISO-8859-1/update/update_2.6rc1_to_2.6rc2_mysql_ISO-8859-1.sql)
===================================================================
--- branches/2.6/resources/db/mysql/ISO-8859-1/update/update_2.6rc1_to_2.6_mysql_ISO-8859-1.sql	                        (rev 0)
+++ branches/2.6/resources/db/mysql/ISO-8859-1/update/update_2.6rc1_to_2.6_mysql_ISO-8859-1.sql	2009-09-15 11:16:43 UTC (rev 4630)
@@ -0,0 +1,211 @@
+Update gui_element set e_top = 10 where fkey_gui_id = 'gui' and e_id = 'setBackground';
+
+-- new language fr, es pt
+Update gui_element_vars set var_value = 'de,en,bg,gr,nl,hu,it,fr,es,pt' where fkey_gui_id = 'gui' AND fkey_e_id = 'switchLocale_noreload';
+
+
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Pan', 'Nézetet mozgat');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Display complete map', 'Teljes nézet');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Zoom in', 'Nagyít');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Zoom out', 'Kicsnyít');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Back', 'Vissza');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Forward', 'El"ore');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Coordinates', 'Koordináták kijelzése');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Zoom by rectangle', 'Kijelölt területre nagyít');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Redraw', 'Újrarajzol');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Query', 'Adatok lekérése');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Logout', 'Kijelentkezés');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'WMS preferences', 'WMS beállítások');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Adding WMS from filtered list', 'WMS hozzáadása sz"urt listából');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Set map center', 'Nézet középpontja');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Help', 'Segítség');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Show WMS infos', 'WMS adatok megjelenítése');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Save workspace as web map context document', 'Nézet mentése Web Map Context formában');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Resize Mapsize', 'Térkép átméretezése');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Rubber', 'Törlés');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Get Area', 'Területszámítás');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Close Polygon', 'Sokszög bezárása');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Move back to your GUI list', 'Vissza a GUI listához');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Legend', 'Jelmagyarázat');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Print', 'Nyomtat');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Imprint', 'Impresszum');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Maps', 'Térképek');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Search', 'Keres');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Meetingpoint', 'Találkozási pont');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Metadatasearch', 'Metaadat keresés');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Adding WMS', 'WMS hozzáadása');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Adding WMS from List', 'WMS hozzáadása listából');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Info', 'Információ');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Change Projection', 'Más vetület választása');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Copyright', 'Copyright');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Digitize', 'Digitalizálás');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Overview', 'Átnézeti térkép');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Drag Mapsize', 'Térkép átméretezése');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Mapframe', 'Térképablak');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Navigation Frame', 'Navigációs ablak');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Scale Select', 'Lépték választása');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Scale Text', 'Lépték megadása');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Scalebar', 'Aránymérték');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Set Background', 'Háttér beállítása');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Zoom to Coordinates', 'Ugrás adott koordinátákra');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Change Password', 'Jelszó módosítása');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Load a web map context document', 'Web Map Context dokumentum betöltése');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Logo', 'Logó');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Measure distance', 'Távolságmérés'); 
+
+-- Bugfix for treegde in gui (tabs wideout)
+UPDATE gui_element SET e_more_styles='visibility:hidden; background-color:#ffffff;border: 1px solid #a19c8f;overflow:auto;' WHERE fkey_gui_id='gui' AND e_id='treeGDE';
+
+-- remove treeGDE-css statement from 'treeGDE' because its handled in 'body' element 
+DELETE  from gui_element_vars WHERE fkey_gui_id IN ('gui','gui2','gui1','gui_digitize') AND fkey_e_id= 'treeGDE' AND var_name='cssfile';
+
+-- http://trac.osgeo.org/mapbender/ticket/442
+DELETE FROM gui_element_vars WHERE fkey_gui_id = 'gui2' AND fkey_e_id = 'tooltip' AND var_name = 'tooltip_noResultArray';
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('gui2', 'tooltip', 'tooltip_noResultArray', '["Kein Ergebnis.","<body onload=\'javascript:window.close()\'>"]', '', 'var');
+
+-- new element vars for module tooltip to control whether user likes to have wfs getFeature request and/or whether user likes to have wms getfeatureInfo requests
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('gui2', 'tooltip', 'tooltip_disableWfs', '0', 'disable WFS getFeature Request', 'var');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('gui2', 'tooltip', 'tooltip_disableWms', '1', 'disable WMS getFeatureInfo Request', 'var');
+
+-- update style of wfs_conf myPolygons (coloured buttons, background)
+UPDATE wfs_conf SET g_style = 'body{
+ font-family:Verdana,Arial,sans-serif;
+ font-size: 12px;
+ line-height:2;
+ background-color:#CFD2D4;
+}
+.a{
+ font-weight:bold;
+}
+.b{
+ font-family:Verdana,Arial,sans-serif;
+ font-size: 12px;
+ font-weight: bold;
+ width:40px;
+ color: #FFFFFF;
+ -moz-border-radius:5px;
+ -khtml-border-radius:5px;
+ background-color: #1874CD;
+ border-color: #1874CD;
+}
+.d{
+ color:#000000;
+}
+.hidden{
+ visibility: hidden;
+}
+.buttonDelFilter{
+ font-family:Verdana,Arial,sans-serif;
+ font-size: 12px;
+ font-weight: bold;
+ width:40px;
+ color:#FFFFFF;
+ -moz-border-radius:5px;
+ -khtml-border-radius:5px;
+ background-color: #8B0000;
+ border-color: #8B0000;
+}
+' WHERE wfs_conf_id = 2;
+
+
+
+-- insert statement for switchWMS is in template Guis was missing.
+-- http://trac.osgeo.org/mapbender/ticket/472
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui', 'treeGDE', 'switchwms', 'true', 'enables/disables all layer of a wms' ,'var');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui1', 'treeGDE', 'switchwms', 'true', 'enables/disables all layer of a wms' ,'var');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui2', 'treeGDE', 'switchwms', 'true', 'enables/disables all layer of a wms' ,'var');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui_digitize', 'treeGDE', 'switchwms', 'true', 'enables/disables all layer of a wms' ,'var');
+
+
+ALTER TABLE gui_element ALTER COLUMN e_pos SET DEFAULT 2;
+ALTER TABLE gui_element MODIFY COLUMN e_pos tinyint(4) NOT NULL;
+
+ALTER TABLE gui_element ALTER COLUMN e_public SET DEFAULT 1;
+ALTER TABLE gui_element MODIFY COLUMN e_public tinyint(1) NOT NULL;
+
+-- new columns for table mb_user (more information fields + validity date fields)
+ALTER TABLE mb_user ADD COLUMN mb_user_realname varchar(100);
+ALTER TABLE mb_user ADD COLUMN mb_user_street varchar(100);
+ALTER TABLE mb_user ADD COLUMN mb_user_housenumber varchar(50);
+ALTER TABLE mb_user ADD COLUMN mb_user_reference varchar(100);
+ALTER TABLE mb_user ADD COLUMN mb_user_for_attention_of varchar(100);
+ALTER TABLE mb_user ADD COLUMN mb_user_valid_from date;
+ALTER TABLE mb_user ADD COLUMN mb_user_valid_to date;
+ALTER TABLE mb_user ADD COLUMN mb_user_password_ticket varchar(100);
+
+-- enable favicon per gui using element_var
+-- http://trac.osgeo.org/mapbender/ticket/514
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui', 'body', 'favicon', '../img/favicon.png', 'favicon' ,'php_var');
+
+
+-- pt update entries for translations table
+update translations set msgid = 'Set language' where msgid = 'languaje' and locale = 'pt';
+update translations set msgstr = 'Selecionar Linguagem' where msgstr = 'Selecionar Linguajem' and locale = 'pt';
+update translations set msgstr = 'Marco de navegação' where msgstr = 'Marco de navegacion' and locale = 'pt';
+update translations set msgstr = 'Zoom seguinte' where msgid = 'Forward' and locale = 'pt';
+update translations set msgstr = 'Zoom para coordinadas' where msgid = 'Zoom to Coordinates' and locale = 'pt';
+
+update translations set msgid = 'Drag Mapsize' where msgid = 'dragMapSize' and locale = 'pt';
+update translations set msgid = 'Navigation Frame' where msgid = 'navFrame' and locale = 'pt';
+update translations set msgid = 'Scale Select' where msgid = 'scaleSelect' and locale = 'pt';
+
+-- polish entries for translations table
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Pan', 'Przesu´n');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Display complete map', 'Pokaz cala mape');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Zoom in', 'Powieksz');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Zoom out', 'Pomniejsz');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Back', 'Wró´c');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Forward', 'Do przodu');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Coordinates', 'Wspólrzedne');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Zoom by rectangle', 'Wybierz fragment mapy');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Redraw', 'Zaladuj ponownie');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Query', 'Szukaj danych');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Logout', 'Wymelduj');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'WMS preferences', 'Ustawienia WMS');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Adding WMS from filtered list', 'Dodaj WMS z listy');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Set map center', 'Zaznacz ´srodek mapy');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Help', 'Pomoc');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Show WMS infos', 'Informacje WMS');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Save workspace as web map context document', 'Zapisz widok jako web map context dokument');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Resize Mapsize', 'Zmie´n rozmiar mapy');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Rubber', 'Usu´n szkic');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Get Area', 'Oblicz powierzchnie');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Close Polygon', 'Zamknij poligon');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Move back to your GUI list', 'Z powrotem do listy GUI');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Legend', 'Legenda');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Print', 'Drukuj');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Imprint', 'Imprint');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Maps', 'Mapy');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Search', 'Szukaj');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Meetingpoint', 'Miejsce spotka´n');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Metadatasearch', 'Wyszukiwanie metadanych');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Adding WMS', 'Dodaj WMS');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Adding WMS from List', 'Dodaj WMS z listy');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Info', 'Informacja');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Change Projection', 'Zmie´n uklad wspólrzednych');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Copyright', 'Copyright');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Digitize', 'Dygitalizacja');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Overview', 'Mapa przegladowa');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Drag Mapsize', 'Powieksz');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Mapframe', 'Okno mapy');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Navigation Frame', 'Pasek narzedzi');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Scale Select', 'Wybierz skale');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Scale Text', 'Wpisz skale');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Scalebar', 'Podzialka');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Set Background', 'Wybierz mape tematyczna jako tlo');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Zoom to Coordinates', 'Powieksz wedlug wspólrzednych');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Change Password', 'Zmie´n haslo');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Load a web map context document', 'Zaladuj web map context dokument');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Logo', 'Logo');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Measure distance', 'Zmierz odleglo´s´c');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Set language', 'Wybierz jezyk');
+
+
+-- hungarian entry for translations table
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Set language', 'Másik nyelv...');
+
+-- italian entry for translations table
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('it', 'Set language', 'Assegnare linguaggio'); 
+
+-- dutch entry for translations table
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('nl', 'Set language', 'Taal instellen');


Property changes on: branches/2.6/resources/db/mysql/ISO-8859-1/update/update_2.6rc1_to_2.6_mysql_ISO-8859-1.sql
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:mergeinfo
   + 

Deleted: branches/2.6/resources/db/mysql/ISO-8859-1/update/update_2.6rc1_to_2.6rc2_mysql_ISO-8859-1.sql
===================================================================
--- branches/2.6/resources/db/mysql/ISO-8859-1/update/update_2.6rc1_to_2.6rc2_mysql_ISO-8859-1.sql	2009-09-15 10:47:14 UTC (rev 4629)
+++ branches/2.6/resources/db/mysql/ISO-8859-1/update/update_2.6rc1_to_2.6rc2_mysql_ISO-8859-1.sql	2009-09-15 11:16:43 UTC (rev 4630)
@@ -1,139 +0,0 @@
-Update gui_element set e_top = 10 where fkey_gui_id = 'gui' and e_id = 'setBackground';
-
--- new language fr, es pt
-Update gui_element_vars set var_value = 'de,en,bg,gr,nl,hu,it,fr,es,pt' where fkey_gui_id = 'gui' AND fkey_e_id = 'switchLocale_noreload';
-
-
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Pan', 'Nézetet mozgat');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Display complete map', 'Teljes nézet');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Zoom in', 'Nagyít');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Zoom out', 'Kicsnyít');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Back', 'Vissza');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Forward', 'El"ore');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Coordinates', 'Koordináták kijelzése');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Zoom by rectangle', 'Kijelölt területre nagyít');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Redraw', 'Újrarajzol');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Query', 'Adatok lekérése');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Logout', 'Kijelentkezés');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'WMS preferences', 'WMS beállítások');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Adding WMS from filtered list', 'WMS hozzáadása sz"urt listából');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Set map center', 'Nézet középpontja');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Help', 'Segítség');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Show WMS infos', 'WMS adatok megjelenítése');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Save workspace as web map context document', 'Nézet mentése Web Map Context formában');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Resize Mapsize', 'Térkép átméretezése');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Rubber', 'Törlés');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Get Area', 'Területszámítás');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Close Polygon', 'Sokszög bezárása');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Move back to your GUI list', 'Vissza a GUI listához');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Legend', 'Jelmagyarázat');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Print', 'Nyomtat');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Imprint', 'Impresszum');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Maps', 'Térképek');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Search', 'Keres');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Meetingpoint', 'Találkozási pont');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Metadatasearch', 'Metaadat keresés');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Adding WMS', 'WMS hozzáadása');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Adding WMS from List', 'WMS hozzáadása listából');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Info', 'Információ');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Change Projection', 'Más vetület választása');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Copyright', 'Copyright');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Digitize', 'Digitalizálás');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Overview', 'Átnézeti térkép');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Drag Mapsize', 'Térkép átméretezése');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Mapframe', 'Térképablak');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Navigation Frame', 'Navigációs ablak');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Scale Select', 'Lépték választása');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Scale Text', 'Lépték megadása');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Scalebar', 'Aránymérték');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Set Background', 'Háttér beállítása');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Zoom to Coordinates', 'Ugrás adott koordinátákra');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Change Password', 'Jelszó módosítása');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Load a web map context document', 'Web Map Context dokumentum betöltése');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Logo', 'Logó');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Measure distance', 'Távolságmérés'); 
-
--- Bugfix for treegde in gui (tabs wideout)
-UPDATE gui_element SET e_more_styles='visibility:hidden; background-color:#ffffff;border: 1px solid #a19c8f;overflow:auto;' WHERE fkey_gui_id='gui' AND e_id='treeGDE';
-
--- remove treeGDE-css statement from 'treeGDE' because its handled in 'body' element 
-DELETE  from gui_element_vars WHERE fkey_gui_id IN ('gui','gui2','gui1','gui_digitize') AND fkey_e_id= 'treeGDE' AND var_name='cssfile';
-
--- http://trac.osgeo.org/mapbender/ticket/442
-DELETE FROM gui_element_vars WHERE fkey_gui_id = 'gui2' AND fkey_e_id = 'tooltip' AND var_name = 'tooltip_noResultArray';
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('gui2', 'tooltip', 'tooltip_noResultArray', '["Kein Ergebnis.","<body onload=\'javascript:window.close()\'>"]', '', 'var');
-
--- new element vars for module tooltip to control whether user likes to have wfs getFeature request and/or whether user likes to have wms getfeatureInfo requests
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('gui2', 'tooltip', 'tooltip_disableWfs', '0', 'disable WFS getFeature Request', 'var');
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('gui2', 'tooltip', 'tooltip_disableWms', '1', 'disable WMS getFeatureInfo Request', 'var');
-
--- update style of wfs_conf myPolygons (coloured buttons, background)
-UPDATE wfs_conf SET g_style = 'body{
- font-family:Verdana,Arial,sans-serif;
- font-size: 12px;
- line-height:2;
- background-color:#CFD2D4;
-}
-.a{
- font-weight:bold;
-}
-.b{
- font-family:Verdana,Arial,sans-serif;
- font-size: 12px;
- font-weight: bold;
- width:40px;
- color: #FFFFFF;
- -moz-border-radius:5px;
- -khtml-border-radius:5px;
- background-color: #1874CD;
- border-color: #1874CD;
-}
-.d{
- color:#000000;
-}
-.hidden{
- visibility: hidden;
-}
-.buttonDelFilter{
- font-family:Verdana,Arial,sans-serif;
- font-size: 12px;
- font-weight: bold;
- width:40px;
- color:#FFFFFF;
- -moz-border-radius:5px;
- -khtml-border-radius:5px;
- background-color: #8B0000;
- border-color: #8B0000;
-}
-' WHERE wfs_conf_id = 2;
-
-
-
--- insert statement for switchWMS is in template Guis was missing.
--- http://trac.osgeo.org/mapbender/ticket/472
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui', 'treeGDE', 'switchwms', 'true', 'enables/disables all layer of a wms' ,'var');
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui1', 'treeGDE', 'switchwms', 'true', 'enables/disables all layer of a wms' ,'var');
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui2', 'treeGDE', 'switchwms', 'true', 'enables/disables all layer of a wms' ,'var');
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui_digitize', 'treeGDE', 'switchwms', 'true', 'enables/disables all layer of a wms' ,'var');
-
-
-ALTER TABLE gui_element ALTER COLUMN e_pos SET DEFAULT 2;
-ALTER TABLE gui_element MODIFY COLUMN e_pos tinyint(4) NOT NULL;
-
-ALTER TABLE gui_element ALTER COLUMN e_public SET DEFAULT 1;
-ALTER TABLE gui_element MODIFY COLUMN e_public tinyint(1) NOT NULL;
-
--- new columns for table mb_user (more information fields + validity date fields)
-ALTER TABLE mb_user ADD COLUMN mb_user_realname varchar(100);
-ALTER TABLE mb_user ADD COLUMN mb_user_street varchar(100);
-ALTER TABLE mb_user ADD COLUMN mb_user_housenumber varchar(50);
-ALTER TABLE mb_user ADD COLUMN mb_user_reference varchar(100);
-ALTER TABLE mb_user ADD COLUMN mb_user_for_attention_of varchar(100);
-ALTER TABLE mb_user ADD COLUMN mb_user_valid_from date;
-ALTER TABLE mb_user ADD COLUMN mb_user_valid_to date;
-ALTER TABLE mb_user ADD COLUMN mb_user_password_ticket varchar(100);
-
--- enable favicon per gui using element_var
--- http://trac.osgeo.org/mapbender/ticket/514
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui', 'body', 'favicon', '../img/favicon.png', 'favicon' ,'php_var');
-

Copied: branches/2.6/resources/db/mysql/UTF-8/update/update_2.6rc1_to_2.6_mysql_UTF-8.sql (from rev 4628, branches/2.6/resources/db/mysql/UTF-8/update/update_2.6rc1_to_2.6rc2_mysql_UTF-8.sql)
===================================================================
--- branches/2.6/resources/db/mysql/UTF-8/update/update_2.6rc1_to_2.6_mysql_UTF-8.sql	                        (rev 0)
+++ branches/2.6/resources/db/mysql/UTF-8/update/update_2.6rc1_to_2.6_mysql_UTF-8.sql	2009-09-15 11:16:43 UTC (rev 4630)
@@ -0,0 +1,210 @@
+Update gui_element set e_top = 10 where fkey_gui_id = 'gui' and e_id = 'setBackground';
+
+-- new language fr, es pt
+Update gui_element_vars set var_value = 'de,en,bg,gr,nl,hu,it,fr,es,pt' where fkey_gui_id = 'gui' AND fkey_e_id = 'switchLocale_noreload';
+
+
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Pan', 'NÃ©zetet mozgat');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Display complete map', 'Teljes nÃ©zet');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Zoom in', 'NagyÃt');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Zoom out', 'KicsnyÃt');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Back', 'Vissza');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Forward', 'ElÅ‘re');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Coordinates', 'KoordinÃ¡tÃ¡k kijelzÃ©se');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Zoom by rectangle', 'KijelÃ¶lt terÃ¼letre nagyÃt');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Redraw', 'Ãšjrarajzol');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Query', 'Adatok lekÃ©rÃ©se');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Logout', 'KijelentkezÃ©s');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'WMS preferences', 'WMS beÃ¡llÃtÃ¡sok');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Adding WMS from filtered list', 'WMS hozzÃ¡adÃ¡sa szÅ±rt listÃ¡bÃ³l');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Set map center', 'NÃ©zet kÃ¶zÃ©ppontja');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Help', 'SegÃtsÃ©g');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Show WMS infos', 'WMS adatok megjelenÃtÃ©se');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Save workspace as web map context document', 'NÃ©zet mentÃ©se Web Map Context formÃ¡ban');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Resize Mapsize', 'TÃ©rkÃ©p Ã¡tmÃ©retezÃ©se');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Rubber', 'TÃ¶rlÃ©s');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Get Area', 'TerÃ¼letszÃ¡mÃtÃ¡s');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Close Polygon', 'SokszÃ¶g bezÃ¡rÃ¡sa');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Move back to your GUI list', 'Vissza a GUI listÃ¡hoz');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Legend', 'JelmagyarÃ¡zat');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Print', 'Nyomtat');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Imprint', 'Impresszum');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Maps', 'TÃ©rkÃ©pek');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Search', 'Keres');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Meetingpoint', 'TalÃ¡lkozÃ¡si pont');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Metadatasearch', 'Metaadat keresÃ©s');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Adding WMS', 'WMS hozzÃ¡adÃ¡sa');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Adding WMS from List', 'WMS hozzÃ¡adÃ¡sa listÃ¡bÃ³l');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Info', 'InformÃ¡ciÃ³');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Change Projection', 'MÃ¡s vetÃ¼let vÃ¡lasztÃ¡sa');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Copyright', 'Copyright');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Digitize', 'DigitalizÃ¡lÃ¡s');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Overview', 'ÃtnÃ©zeti tÃ©rkÃ©p');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Drag Mapsize', 'TÃ©rkÃ©p Ã¡tmÃ©retezÃ©se');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Mapframe', 'TÃ©rkÃ©pablak');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Navigation Frame', 'NavigÃ¡ciÃ³s ablak');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Scale Select', 'LÃ©ptÃ©k vÃ¡lasztÃ¡sa');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Scale Text', 'LÃ©ptÃ©k megadÃ¡sa');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Scalebar', 'ArÃ¡nymÃ©rtÃ©k');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Set Background', 'HÃ¡ttÃ©r beÃ¡llÃtÃ¡sa');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Zoom to Coordinates', 'UgrÃ¡s adott koordinÃ¡tÃ¡kra');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Change Password', 'JelszÃ³ mÃ³dosÃtÃ¡sa');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Load a web map context document', 'Web Map Context dokumentum betÃ¶ltÃ©se');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Logo', 'LogÃ³');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Measure distance', 'TÃ¡volsÃ¡gmÃ©rÃ©s'); 
+
+-- Bugfix for treegde in gui (tabs wideout)
+UPDATE gui_element SET e_more_styles='visibility:hidden; background-color:#ffffff;border: 1px solid #a19c8f;overflow:auto;' WHERE fkey_gui_id='gui' AND e_id='treeGDE';
+
+-- remove treeGDE-css statement from 'treeGDE' because its handled in 'body' element 
+DELETE  from gui_element_vars WHERE fkey_gui_id IN ('gui','gui2','gui1','gui_digitize') AND fkey_e_id= 'treeGDE' AND var_name='cssfile';
+
+-- http://trac.osgeo.org/mapbender/ticket/442
+DELETE FROM gui_element_vars WHERE fkey_gui_id = 'gui2' AND fkey_e_id = 'tooltip' AND var_name = 'tooltip_noResultArray';
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('gui2', 'tooltip', 'tooltip_noResultArray', '["Kein Ergebnis.","<body onload=\'javascript:window.close()\'>"]', '', 'var');
+
+-- new element vars for module tooltip to control whether user likes to have wfs getFeature request and/or whether user likes to have wms getfeatureInfo requests
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('gui2', 'tooltip', 'tooltip_disableWfs', '0', 'disable WFS getFeature Request', 'var');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('gui2', 'tooltip', 'tooltip_disableWms', '1', 'disable WMS getFeatureInfo Request', 'var');
+
+-- update style of wfs_conf myPolygons (coloured buttons, background)
+UPDATE wfs_conf SET g_style = 'body{
+ font-family:Verdana,Arial,sans-serif;
+ font-size: 12px;
+ line-height:2;
+ background-color:#CFD2D4;
+}
+.a{
+ font-weight:bold;
+}
+.b{
+ font-family:Verdana,Arial,sans-serif;
+ font-size: 12px;
+ font-weight: bold;
+ width:40px;
+ color: #FFFFFF;
+ -moz-border-radius:5px;
+ -khtml-border-radius:5px;
+ background-color: #1874CD;
+ border-color: #1874CD;
+}
+.d{
+ color:#000000;
+}
+.hidden{
+ visibility: hidden;
+}
+.buttonDelFilter{
+ font-family:Verdana,Arial,sans-serif;
+ font-size: 12px;
+ font-weight: bold;
+ width:40px;
+ color:#FFFFFF;
+ -moz-border-radius:5px;
+ -khtml-border-radius:5px;
+ background-color: #8B0000;
+ border-color: #8B0000;
+}
+' WHERE wfs_conf_id = 2;
+
+
+
+-- insert statement for switchWMS is in template Guis was missing.
+-- http://trac.osgeo.org/mapbender/ticket/472
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui', 'treeGDE', 'switchwms', 'true', 'enables/disables all layer of a wms' ,'var');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui1', 'treeGDE', 'switchwms', 'true', 'enables/disables all layer of a wms' ,'var');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui2', 'treeGDE', 'switchwms', 'true', 'enables/disables all layer of a wms' ,'var');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui_digitize', 'treeGDE', 'switchwms', 'true', 'enables/disables all layer of a wms' ,'var');
+
+
+ALTER TABLE gui_element ALTER COLUMN e_pos SET DEFAULT 2;
+ALTER TABLE gui_element MODIFY COLUMN e_pos tinyint(4) NOT NULL;
+
+ALTER TABLE gui_element ALTER COLUMN e_public SET DEFAULT 1;
+ALTER TABLE gui_element MODIFY COLUMN e_public tinyint(1) NOT NULL;
+
+-- new columns for table mb_user (more information fields + validity date fields)
+ALTER TABLE mb_user ADD COLUMN mb_user_realname varchar(100);
+ALTER TABLE mb_user ADD COLUMN mb_user_street varchar(100);
+ALTER TABLE mb_user ADD COLUMN mb_user_housenumber varchar(50);
+ALTER TABLE mb_user ADD COLUMN mb_user_reference varchar(100);
+ALTER TABLE mb_user ADD COLUMN mb_user_for_attention_of varchar(100);
+ALTER TABLE mb_user ADD COLUMN mb_user_valid_from date;
+ALTER TABLE mb_user ADD COLUMN mb_user_valid_to date;
+ALTER TABLE mb_user ADD COLUMN mb_user_password_ticket varchar(100);
+
+-- enable favicon per gui using element_var
+-- http://trac.osgeo.org/mapbender/ticket/514
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui', 'body', 'favicon', '../img/favicon.png', 'favicon' ,'php_var');
+
+
+-- pt update entries for translations table
+update translations set msgid = 'Set language' where msgid = 'languaje' and locale = 'pt';
+update translations set msgstr = 'Selecionar Linguagem' where msgstr = 'Selecionar Linguajem' and locale = 'pt';
+update translations set msgstr = 'Marco de navegaÃ§Ã£o' where msgstr = 'Marco de navegacion' and locale = 'pt';
+update translations set msgstr = 'Zoom seguinte' where msgid = 'Forward' and locale = 'pt';
+update translations set msgstr = 'Zoom para coordinadas' where msgid = 'Zoom to Coordinates' and locale = 'pt';
+update translations set msgid = 'Drag Mapsize' where msgid = 'dragMapSize' and locale = 'pt';
+update translations set msgid = 'Navigation Frame' where msgid = 'navFrame' and locale = 'pt';
+update translations set msgid = 'Scale Select' where msgid = 'scaleSelect' and locale = 'pt';
+
+-- polish entries for translations table
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Pan', 'PrzesuÅ„');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Display complete map', 'PokaÅ¼ calÄ… mapÄ™');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Zoom in', 'PowiÄ™ksz');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Zoom out', 'Pomniejsz');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Back', 'WrÃ³Ä‡');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Forward', 'Do przodu');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Coordinates', 'WspÃ³Å‚rzÄ™dne');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Zoom by rectangle', 'Wybierz fragment mapy');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Redraw', 'ZaÅ‚aduj ponownie');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Query', 'Szukaj danych');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Logout', 'Wymelduj');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'WMS preferences', 'Ustawienia WMS');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Adding WMS from filtered list', 'Dodaj WMS z listy');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Set map center', 'Zaznacz Å›rodek mapy');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Help', 'Pomoc');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Show WMS infos', 'Informacje WMS');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Save workspace as web map context document', 'Zapisz widok jako web map context dokument');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Resize Mapsize', 'ZmieÅ„ rozmiar mapy');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Rubber', 'UsuÅ„ szkic');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Get Area', 'Oblicz powierzchniÄ™');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Close Polygon', 'Zamknij poligon');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Move back to your GUI list', 'Z powrotem do listy GUI');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Legend', 'Legenda');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Print', 'Drukuj');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Imprint', 'Imprint');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Maps', 'Mapy');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Search', 'Szukaj');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Meetingpoint', 'Miejsce spotkaÅ„');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Metadatasearch', 'Wyszukiwanie metadanych');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Adding WMS', 'Dodaj WMS');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Adding WMS from List', 'Dodaj WMS z listy');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Info', 'Informacja');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Change Projection', 'ZmieÅ„ ukÅ‚ad wspÃ³Å‚rzÄ™dnych');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Copyright', 'Copyright');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Digitize', 'Dygitalizacja');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Overview', 'Mapa przeglÄ…dowa');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Drag Mapsize', 'PowiÄ™ksz');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Mapframe', 'Okno mapy');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Navigation Frame', 'Pasek narzÄ™dzi');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Scale Select', 'Wybierz skalÄ™');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Scale Text', 'Wpisz skalÄ™');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Scalebar', 'PodziaÅ‚ka');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Set Background', 'Wybierz mapÄ™ tematycznÄ… jako tÅ‚o');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Zoom to Coordinates', 'PowiÄ™ksz wedÅ‚ug wspÃ³Å‚rzÄ™dnych');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Change Password', 'ZmieÅ„ hasÅ‚o');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Load a web map context document', 'ZaÅ‚aduj web map context dokument');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Logo', 'Logo');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Measure distance', 'Zmierz odlegÅ‚oÅ›Ä‡');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Set language', 'Wybierz jÄ™zyk');
+
+
+-- hungarian entry for translations table
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Set language', 'MÃ¡sik nyelv...');
+
+-- italian entry for translations table
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('it', 'Set language', 'Assegnare linguaggio'); 
+
+-- dutch entry for translations table
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('nl', 'Set language', 'Taal instellen');


Property changes on: branches/2.6/resources/db/mysql/UTF-8/update/update_2.6rc1_to_2.6_mysql_UTF-8.sql
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:mergeinfo
   + 

Deleted: branches/2.6/resources/db/mysql/UTF-8/update/update_2.6rc1_to_2.6rc2_mysql_UTF-8.sql
===================================================================
--- branches/2.6/resources/db/mysql/UTF-8/update/update_2.6rc1_to_2.6rc2_mysql_UTF-8.sql	2009-09-15 10:47:14 UTC (rev 4629)
+++ branches/2.6/resources/db/mysql/UTF-8/update/update_2.6rc1_to_2.6rc2_mysql_UTF-8.sql	2009-09-15 11:16:43 UTC (rev 4630)
@@ -1,139 +0,0 @@
-Update gui_element set e_top = 10 where fkey_gui_id = 'gui' and e_id = 'setBackground';
-
--- new language fr, es pt
-Update gui_element_vars set var_value = 'de,en,bg,gr,nl,hu,it,fr,es,pt' where fkey_gui_id = 'gui' AND fkey_e_id = 'switchLocale_noreload';
-
-
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Pan', 'NÃ©zetet mozgat');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Display complete map', 'Teljes nÃ©zet');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Zoom in', 'NagyÃt');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Zoom out', 'KicsnyÃt');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Back', 'Vissza');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Forward', 'ElÅ‘re');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Coordinates', 'KoordinÃ¡tÃ¡k kijelzÃ©se');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Zoom by rectangle', 'KijelÃ¶lt terÃ¼letre nagyÃt');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Redraw', 'Ãšjrarajzol');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Query', 'Adatok lekÃ©rÃ©se');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Logout', 'KijelentkezÃ©s');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'WMS preferences', 'WMS beÃ¡llÃtÃ¡sok');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Adding WMS from filtered list', 'WMS hozzÃ¡adÃ¡sa szÅ±rt listÃ¡bÃ³l');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Set map center', 'NÃ©zet kÃ¶zÃ©ppontja');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Help', 'SegÃtsÃ©g');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Show WMS infos', 'WMS adatok megjelenÃtÃ©se');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Save workspace as web map context document', 'NÃ©zet mentÃ©se Web Map Context formÃ¡ban');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Resize Mapsize', 'TÃ©rkÃ©p Ã¡tmÃ©retezÃ©se');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Rubber', 'TÃ¶rlÃ©s');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Get Area', 'TerÃ¼letszÃ¡mÃtÃ¡s');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Close Polygon', 'SokszÃ¶g bezÃ¡rÃ¡sa');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Move back to your GUI list', 'Vissza a GUI listÃ¡hoz');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Legend', 'JelmagyarÃ¡zat');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Print', 'Nyomtat');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Imprint', 'Impresszum');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Maps', 'TÃ©rkÃ©pek');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Search', 'Keres');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Meetingpoint', 'TalÃ¡lkozÃ¡si pont');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Metadatasearch', 'Metaadat keresÃ©s');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Adding WMS', 'WMS hozzÃ¡adÃ¡sa');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Adding WMS from List', 'WMS hozzÃ¡adÃ¡sa listÃ¡bÃ³l');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Info', 'InformÃ¡ciÃ³');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Change Projection', 'MÃ¡s vetÃ¼let vÃ¡lasztÃ¡sa');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Copyright', 'Copyright');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Digitize', 'DigitalizÃ¡lÃ¡s');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Overview', 'ÃtnÃ©zeti tÃ©rkÃ©p');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Drag Mapsize', 'TÃ©rkÃ©p Ã¡tmÃ©retezÃ©se');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Mapframe', 'TÃ©rkÃ©pablak');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Navigation Frame', 'NavigÃ¡ciÃ³s ablak');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Scale Select', 'LÃ©ptÃ©k vÃ¡lasztÃ¡sa');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Scale Text', 'LÃ©ptÃ©k megadÃ¡sa');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Scalebar', 'ArÃ¡nymÃ©rtÃ©k');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Set Background', 'HÃ¡ttÃ©r beÃ¡llÃtÃ¡sa');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Zoom to Coordinates', 'UgrÃ¡s adott koordinÃ¡tÃ¡kra');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Change Password', 'JelszÃ³ mÃ³dosÃtÃ¡sa');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Load a web map context document', 'Web Map Context dokumentum betÃ¶ltÃ©se');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Logo', 'LogÃ³');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Measure distance', 'TÃ¡volsÃ¡gmÃ©rÃ©s'); 
-
--- Bugfix for treegde in gui (tabs wideout)
-UPDATE gui_element SET e_more_styles='visibility:hidden; background-color:#ffffff;border: 1px solid #a19c8f;overflow:auto;' WHERE fkey_gui_id='gui' AND e_id='treeGDE';
-
--- remove treeGDE-css statement from 'treeGDE' because its handled in 'body' element 
-DELETE  from gui_element_vars WHERE fkey_gui_id IN ('gui','gui2','gui1','gui_digitize') AND fkey_e_id= 'treeGDE' AND var_name='cssfile';
-
--- http://trac.osgeo.org/mapbender/ticket/442
-DELETE FROM gui_element_vars WHERE fkey_gui_id = 'gui2' AND fkey_e_id = 'tooltip' AND var_name = 'tooltip_noResultArray';
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('gui2', 'tooltip', 'tooltip_noResultArray', '["Kein Ergebnis.","<body onload=\'javascript:window.close()\'>"]', '', 'var');
-
--- new element vars for module tooltip to control whether user likes to have wfs getFeature request and/or whether user likes to have wms getfeatureInfo requests
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('gui2', 'tooltip', 'tooltip_disableWfs', '0', 'disable WFS getFeature Request', 'var');
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('gui2', 'tooltip', 'tooltip_disableWms', '1', 'disable WMS getFeatureInfo Request', 'var');
-
--- update style of wfs_conf myPolygons (coloured buttons, background)
-UPDATE wfs_conf SET g_style = 'body{
- font-family:Verdana,Arial,sans-serif;
- font-size: 12px;
- line-height:2;
- background-color:#CFD2D4;
-}
-.a{
- font-weight:bold;
-}
-.b{
- font-family:Verdana,Arial,sans-serif;
- font-size: 12px;
- font-weight: bold;
- width:40px;
- color: #FFFFFF;
- -moz-border-radius:5px;
- -khtml-border-radius:5px;
- background-color: #1874CD;
- border-color: #1874CD;
-}
-.d{
- color:#000000;
-}
-.hidden{
- visibility: hidden;
-}
-.buttonDelFilter{
- font-family:Verdana,Arial,sans-serif;
- font-size: 12px;
- font-weight: bold;
- width:40px;
- color:#FFFFFF;
- -moz-border-radius:5px;
- -khtml-border-radius:5px;
- background-color: #8B0000;
- border-color: #8B0000;
-}
-' WHERE wfs_conf_id = 2;
-
-
-
--- insert statement for switchWMS is in template Guis was missing.
--- http://trac.osgeo.org/mapbender/ticket/472
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui', 'treeGDE', 'switchwms', 'true', 'enables/disables all layer of a wms' ,'var');
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui1', 'treeGDE', 'switchwms', 'true', 'enables/disables all layer of a wms' ,'var');
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui2', 'treeGDE', 'switchwms', 'true', 'enables/disables all layer of a wms' ,'var');
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui_digitize', 'treeGDE', 'switchwms', 'true', 'enables/disables all layer of a wms' ,'var');
-
-
-ALTER TABLE gui_element ALTER COLUMN e_pos SET DEFAULT 2;
-ALTER TABLE gui_element MODIFY COLUMN e_pos tinyint(4) NOT NULL;
-
-ALTER TABLE gui_element ALTER COLUMN e_public SET DEFAULT 1;
-ALTER TABLE gui_element MODIFY COLUMN e_public tinyint(1) NOT NULL;
-
--- new columns for table mb_user (more information fields + validity date fields)
-ALTER TABLE mb_user ADD COLUMN mb_user_realname varchar(100);
-ALTER TABLE mb_user ADD COLUMN mb_user_street varchar(100);
-ALTER TABLE mb_user ADD COLUMN mb_user_housenumber varchar(50);
-ALTER TABLE mb_user ADD COLUMN mb_user_reference varchar(100);
-ALTER TABLE mb_user ADD COLUMN mb_user_for_attention_of varchar(100);
-ALTER TABLE mb_user ADD COLUMN mb_user_valid_from date;
-ALTER TABLE mb_user ADD COLUMN mb_user_valid_to date;
-ALTER TABLE mb_user ADD COLUMN mb_user_password_ticket varchar(100);
-
--- enable favicon per gui using element_var
--- http://trac.osgeo.org/mapbender/ticket/514
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui', 'body', 'favicon', '../img/favicon.png', 'favicon' ,'php_var');
-

Copied: branches/2.6/resources/db/pgsql/ISO-8859-1/update/update_2.6rc1_to_2.6_pgsql_ISO-8859-1.sql (from rev 4628, branches/2.6/resources/db/pgsql/ISO-8859-1/update/update_2.6rc1_to_2.6rc2_pgsql_ISO-8859-1.sql)
===================================================================
--- branches/2.6/resources/db/pgsql/ISO-8859-1/update/update_2.6rc1_to_2.6_pgsql_ISO-8859-1.sql	                        (rev 0)
+++ branches/2.6/resources/db/pgsql/ISO-8859-1/update/update_2.6rc1_to_2.6_pgsql_ISO-8859-1.sql	2009-09-15 11:16:43 UTC (rev 4630)
@@ -0,0 +1,209 @@
+Update gui_element set e_top = 10 where fkey_gui_id = 'gui' and e_id = 'setBackground';
+
+-- new language fr, es pt
+Update gui_element_vars set var_value = 'de,en,bg,gr,nl,hu,it,fr,es,pt' where fkey_gui_id = 'gui' AND fkey_e_id = 'switchLocale_noreload';
+
+
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Pan', 'Nézetet mozgat');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Display complete map', 'Teljes nézet');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Zoom in', 'Nagyít');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Zoom out', 'Kicsnyít');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Back', 'Vissza');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Forward', 'El"ore');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Coordinates', 'Koordináták kijelzése');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Zoom by rectangle', 'Kijelölt területre nagyít');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Redraw', 'Újrarajzol');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Query', 'Adatok lekérése');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Logout', 'Kijelentkezés');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'WMS preferences', 'WMS beállítások');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Adding WMS from filtered list', 'WMS hozzáadása sz"urt listából');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Set map center', 'Nézet középpontja');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Help', 'Segítség');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Show WMS infos', 'WMS adatok megjelenítése');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Save workspace as web map context document', 'Nézet mentése Web Map Context formában');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Resize Mapsize', 'Térkép átméretezése');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Rubber', 'Törlés');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Get Area', 'Területszámítás');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Close Polygon', 'Sokszög bezárása');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Move back to your GUI list', 'Vissza a GUI listához');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Legend', 'Jelmagyarázat');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Print', 'Nyomtat');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Imprint', 'Impresszum');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Maps', 'Térképek');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Search', 'Keres');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Meetingpoint', 'Találkozási pont');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Metadatasearch', 'Metaadat keresés');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Adding WMS', 'WMS hozzáadása');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Adding WMS from List', 'WMS hozzáadása listából');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Info', 'Információ');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Change Projection', 'Más vetület választása');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Copyright', 'Copyright');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Digitize', 'Digitalizálás');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Overview', 'Átnézeti térkép');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Drag Mapsize', 'Térkép átméretezése');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Mapframe', 'Térképablak');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Navigation Frame', 'Navigációs ablak');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Scale Select', 'Lépték választása');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Scale Text', 'Lépték megadása');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Scalebar', 'Aránymérték');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Set Background', 'Háttér beállítása');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Zoom to Coordinates', 'Ugrás adott koordinátákra');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Change Password', 'Jelszó módosítása');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Load a web map context document', 'Web Map Context dokumentum betöltése');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Logo', 'Logó');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Measure distance', 'Távolságmérés'); 
+
+--Bugfix for treegde in gui (tabs wideout)
+UPDATE gui_element SET e_more_styles='visibility:hidden; background-color:#ffffff;border: 1px solid #a19c8f;overflow:auto;' WHERE fkey_gui_id='gui' AND e_id='treeGDE';
+
+--remove treeGDE-css statement from 'treeGDE' because its handled in 'body' element 
+DELETE  from gui_element_vars WHERE fkey_gui_id IN ('gui','gui2','gui1','gui_digitize') AND fkey_e_id= 'treeGDE' AND var_name='cssfile';
+
+-- http://trac.osgeo.org/mapbender/ticket/442
+DELETE FROM gui_element_vars WHERE fkey_gui_id = 'gui2' AND fkey_e_id = 'tooltip' AND var_name = 'tooltip_noResultArray';
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('gui2', 'tooltip', 'tooltip_noResultArray', E'["Kein Ergebnis.","<body onload=\'javascript:window.close()\'>"]', '', 'var');
+
+--new element vars for module tooltip to control whether user likes to have wfs getFeature request and/or whether user likes to have wms getfeatureInfo requests
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('gui2', 'tooltip', 'tooltip_disableWfs', '0', 'disable WFS getFeature Request', 'var');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('gui2', 'tooltip', 'tooltip_disableWms', '1', 'disable WMS getFeatureInfo Request', 'var');
+
+--update style of wfs_conf myPolygons (coloured buttons, background)
+UPDATE wfs_conf SET g_style = 'body{
+ font-family:Verdana,Arial,sans-serif;
+ font-size: 12px;
+ line-height:2;
+ background-color:#CFD2D4;
+}
+.a{
+ font-weight:bold;
+}
+.b{
+ font-family:Verdana,Arial,sans-serif;
+ font-size: 12px;
+ font-weight: bold;
+ width:40px;
+ color: #FFFFFF;
+ -moz-border-radius:5px;
+ -khtml-border-radius:5px;
+ background-color: #1874CD;
+ border-color: #1874CD;
+}
+.d{
+ color:#000000;
+}
+.hidden{
+ visibility: hidden;
+}
+.buttonDelFilter{
+ font-family:Verdana,Arial,sans-serif;
+ font-size: 12px;
+ font-weight: bold;
+ width:40px;
+ color:#FFFFFF;
+ -moz-border-radius:5px;
+ -khtml-border-radius:5px;
+ background-color: #8B0000;
+ border-color: #8B0000;
+}
+' WHERE wfs_conf_id = 2;
+
+
+
+-- insert statement for switchWMS is in template Guis was missing.
+-- http://trac.osgeo.org/mapbender/ticket/472
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui', 'treeGDE', 'switchwms', 'true', 'enables/disables all layer of a wms' ,'var');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui1', 'treeGDE', 'switchwms', 'true', 'enables/disables all layer of a wms' ,'var');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui2', 'treeGDE', 'switchwms', 'true', 'enables/disables all layer of a wms' ,'var');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui_digitize', 'treeGDE', 'switchwms', 'true', 'enables/disables all layer of a wms' ,'var');
+
+
+ALTER TABLE gui_element ALTER COLUMN e_pos SET DEFAULT 2;
+ALTER TABLE gui_element ALTER COLUMN e_pos SET NOT NULL;
+
+ALTER TABLE gui_element ALTER COLUMN e_public SET DEFAULT 1;
+ALTER TABLE gui_element ALTER COLUMN e_public SET NOT NULL;
+
+-- new columns for table mb_user (more information fields + validity date fields)
+ALTER TABLE mb_user ADD COLUMN mb_user_realname varchar(100);
+ALTER TABLE mb_user ADD COLUMN mb_user_street varchar(100);
+ALTER TABLE mb_user ADD COLUMN mb_user_housenumber varchar(50);
+ALTER TABLE mb_user ADD COLUMN mb_user_reference varchar(100);
+ALTER TABLE mb_user ADD COLUMN mb_user_for_attention_of varchar(100);
+ALTER TABLE mb_user ADD COLUMN mb_user_valid_from date;
+ALTER TABLE mb_user ADD COLUMN mb_user_valid_to date;
+ALTER TABLE mb_user ADD COLUMN mb_user_password_ticket varchar(100);
+
+-- enable favicon per gui using element_var
+-- http://trac.osgeo.org/mapbender/ticket/514
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui', 'body', 'favicon', '../img/favicon.png', 'favicon' ,'php_var');
+
+-- pt update entries for translations table
+update translations set msgid = 'Set language' where msgid = 'languaje' and locale = 'pt';
+update translations set msgstr = 'Selecionar Linguagem' where msgstr = 'Selecionar Linguajem' and locale = 'pt';
+update translations set msgstr = 'Marco de navegação' where msgstr = 'Marco de navegacion' and locale = 'pt';
+update translations set msgstr = 'Zoom seguinte' where msgid = 'Forward' and locale = 'pt';
+update translations set msgstr = 'Zoom para coordinadas' where msgid = 'Zoom to Coordinates' and locale = 'pt';
+update translations set msgid = 'Drag Mapsize' where msgid = 'dragMapSize' and locale = 'pt';
+update translations set msgid = 'Navigation Frame' where msgid = 'navFrame' and locale = 'pt';
+update translations set msgid = 'Scale Select' where msgid = 'scaleSelect' and locale = 'pt';
+
+-- polish entries for translations table
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Pan', 'Przesu´n');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Display complete map', 'Pokaz cala mape');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Zoom in', 'Powieksz');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Zoom out', 'Pomniejsz');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Back', 'Wró´c');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Forward', 'Do przodu');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Coordinates', 'Wspólrzedne');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Zoom by rectangle', 'Wybierz fragment mapy');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Redraw', 'Zaladuj ponownie');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Query', 'Szukaj danych');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Logout', 'Wymelduj');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'WMS preferences', 'Ustawienia WMS');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Adding WMS from filtered list', 'Dodaj WMS z listy');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Set map center', 'Zaznacz ´srodek mapy');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Help', 'Pomoc');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Show WMS infos', 'Informacje WMS');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Save workspace as web map context document', 'Zapisz widok jako web map context dokument');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Resize Mapsize', 'Zmie´n rozmiar mapy');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Rubber', 'Usu´n szkic');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Get Area', 'Oblicz powierzchnie');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Close Polygon', 'Zamknij poligon');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Move back to your GUI list', 'Z powrotem do listy GUI');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Legend', 'Legenda');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Print', 'Drukuj');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Imprint', 'Imprint');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Maps', 'Mapy');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Search', 'Szukaj');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Meetingpoint', 'Miejsce spotka´n');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Metadatasearch', 'Wyszukiwanie metadanych');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Adding WMS', 'Dodaj WMS');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Adding WMS from List', 'Dodaj WMS z listy');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Info', 'Informacja');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Change Projection', 'Zmie´n uklad wspólrzednych');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Copyright', 'Copyright');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Digitize', 'Dygitalizacja');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Overview', 'Mapa przegladowa');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Drag Mapsize', 'Powieksz');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Mapframe', 'Okno mapy');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Navigation Frame', 'Pasek narzedzi');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Scale Select', 'Wybierz skale');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Scale Text', 'Wpisz skale');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Scalebar', 'Podzialka');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Set Background', 'Wybierz mape tematyczna jako tlo');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Zoom to Coordinates', 'Powieksz wedlug wspólrzednych');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Change Password', 'Zmie´n haslo');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Load a web map context document', 'Zaladuj web map context dokument');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Logo', 'Logo');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Measure distance', 'Zmierz odleglo´s´c');
+INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Set language', 'Wybierz jezyk');
+
+
+-- hungarian entry for translations table
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Set language', 'Másik nyelv...');
+
+-- italian entry for translations table
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('it', 'Set language', 'Assegnare linguaggio'); 
+
+-- dutch entry for translations table
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('nl', 'Set language', 'Taal instellen');


Property changes on: branches/2.6/resources/db/pgsql/ISO-8859-1/update/update_2.6rc1_to_2.6_pgsql_ISO-8859-1.sql
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:mergeinfo
   + 

Deleted: branches/2.6/resources/db/pgsql/ISO-8859-1/update/update_2.6rc1_to_2.6rc2_pgsql_ISO-8859-1.sql
===================================================================
--- branches/2.6/resources/db/pgsql/ISO-8859-1/update/update_2.6rc1_to_2.6rc2_pgsql_ISO-8859-1.sql	2009-09-15 10:47:14 UTC (rev 4629)
+++ branches/2.6/resources/db/pgsql/ISO-8859-1/update/update_2.6rc1_to_2.6rc2_pgsql_ISO-8859-1.sql	2009-09-15 11:16:43 UTC (rev 4630)
@@ -1,139 +0,0 @@
-Update gui_element set e_top = 10 where fkey_gui_id = 'gui' and e_id = 'setBackground';
-
--- new language fr, es pt
-Update gui_element_vars set var_value = 'de,en,bg,gr,nl,hu,it,fr,es,pt' where fkey_gui_id = 'gui' AND fkey_e_id = 'switchLocale_noreload';
-
-
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Pan', 'Nézetet mozgat');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Display complete map', 'Teljes nézet');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Zoom in', 'Nagyít');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Zoom out', 'Kicsnyít');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Back', 'Vissza');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Forward', 'El"ore');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Coordinates', 'Koordináták kijelzése');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Zoom by rectangle', 'Kijelölt területre nagyít');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Redraw', 'Újrarajzol');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Query', 'Adatok lekérése');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Logout', 'Kijelentkezés');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'WMS preferences', 'WMS beállítások');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Adding WMS from filtered list', 'WMS hozzáadása sz"urt listából');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Set map center', 'Nézet középpontja');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Help', 'Segítség');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Show WMS infos', 'WMS adatok megjelenítése');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Save workspace as web map context document', 'Nézet mentése Web Map Context formában');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Resize Mapsize', 'Térkép átméretezése');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Rubber', 'Törlés');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Get Area', 'Területszámítás');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Close Polygon', 'Sokszög bezárása');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Move back to your GUI list', 'Vissza a GUI listához');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Legend', 'Jelmagyarázat');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Print', 'Nyomtat');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Imprint', 'Impresszum');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Maps', 'Térképek');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Search', 'Keres');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Meetingpoint', 'Találkozási pont');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Metadatasearch', 'Metaadat keresés');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Adding WMS', 'WMS hozzáadása');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Adding WMS from List', 'WMS hozzáadása listából');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Info', 'Információ');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Change Projection', 'Más vetület választása');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Copyright', 'Copyright');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Digitize', 'Digitalizálás');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Overview', 'Átnézeti térkép');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Drag Mapsize', 'Térkép átméretezése');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Mapframe', 'Térképablak');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Navigation Frame', 'Navigációs ablak');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Scale Select', 'Lépték választása');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Scale Text', 'Lépték megadása');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Scalebar', 'Aránymérték');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Set Background', 'Háttér beállítása');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Zoom to Coordinates', 'Ugrás adott koordinátákra');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Change Password', 'Jelszó módosítása');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Load a web map context document', 'Web Map Context dokumentum betöltése');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Logo', 'Logó');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('hu', 'Measure distance', 'Távolságmérés'); 
-
---Bugfix for treegde in gui (tabs wideout)
-UPDATE gui_element SET e_more_styles='visibility:hidden; background-color:#ffffff;border: 1px solid #a19c8f;overflow:auto;' WHERE fkey_gui_id='gui' AND e_id='treeGDE';
-
---remove treeGDE-css statement from 'treeGDE' because its handled in 'body' element 
-DELETE  from gui_element_vars WHERE fkey_gui_id IN ('gui','gui2','gui1','gui_digitize') AND fkey_e_id= 'treeGDE' AND var_name='cssfile';
-
--- http://trac.osgeo.org/mapbender/ticket/442
-DELETE FROM gui_element_vars WHERE fkey_gui_id = 'gui2' AND fkey_e_id = 'tooltip' AND var_name = 'tooltip_noResultArray';
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('gui2', 'tooltip', 'tooltip_noResultArray', E'["Kein Ergebnis.","<body onload=\'javascript:window.close()\'>"]', '', 'var');
-
---new element vars for module tooltip to control whether user likes to have wfs getFeature request and/or whether user likes to have wms getfeatureInfo requests
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('gui2', 'tooltip', 'tooltip_disableWfs', '0', 'disable WFS getFeature Request', 'var');
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('gui2', 'tooltip', 'tooltip_disableWms', '1', 'disable WMS getFeatureInfo Request', 'var');
-
---update style of wfs_conf myPolygons (coloured buttons, background)
-UPDATE wfs_conf SET g_style = 'body{
- font-family:Verdana,Arial,sans-serif;
- font-size: 12px;
- line-height:2;
- background-color:#CFD2D4;
-}
-.a{
- font-weight:bold;
-}
-.b{
- font-family:Verdana,Arial,sans-serif;
- font-size: 12px;
- font-weight: bold;
- width:40px;
- color: #FFFFFF;
- -moz-border-radius:5px;
- -khtml-border-radius:5px;
- background-color: #1874CD;
- border-color: #1874CD;
-}
-.d{
- color:#000000;
-}
-.hidden{
- visibility: hidden;
-}
-.buttonDelFilter{
- font-family:Verdana,Arial,sans-serif;
- font-size: 12px;
- font-weight: bold;
- width:40px;
- color:#FFFFFF;
- -moz-border-radius:5px;
- -khtml-border-radius:5px;
- background-color: #8B0000;
- border-color: #8B0000;
-}
-' WHERE wfs_conf_id = 2;
-
-
-
---insert statement for switchWMS is in template Guis was missing.
---http://trac.osgeo.org/mapbender/ticket/472
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui', 'treeGDE', 'switchwms', 'true', 'enables/disables all layer of a wms' ,'var');
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui1', 'treeGDE', 'switchwms', 'true', 'enables/disables all layer of a wms' ,'var');
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui2', 'treeGDE', 'switchwms', 'true', 'enables/disables all layer of a wms' ,'var');
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui_digitize', 'treeGDE', 'switchwms', 'true', 'enables/disables all layer of a wms' ,'var');
-
-
-ALTER TABLE gui_element ALTER COLUMN e_pos SET DEFAULT 2;
-ALTER TABLE gui_element ALTER COLUMN e_pos SET NOT NULL;
-
-ALTER TABLE gui_element ALTER COLUMN e_public SET DEFAULT 1;
-ALTER TABLE gui_element ALTER COLUMN e_public SET NOT NULL;
-
--- new columns for table mb_user (more information fields + validity date fields)
-ALTER TABLE mb_user ADD COLUMN mb_user_realname varchar(100);
-ALTER TABLE mb_user ADD COLUMN mb_user_street varchar(100);
-ALTER TABLE mb_user ADD COLUMN mb_user_housenumber varchar(50);
-ALTER TABLE mb_user ADD COLUMN mb_user_reference varchar(100);
-ALTER TABLE mb_user ADD COLUMN mb_user_for_attention_of varchar(100);
-ALTER TABLE mb_user ADD COLUMN mb_user_valid_from date;
-ALTER TABLE mb_user ADD COLUMN mb_user_valid_to date;
-ALTER TABLE mb_user ADD COLUMN mb_user_password_ticket varchar(100);
-
--- enable favicon per gui using element_var
--- http://trac.osgeo.org/mapbender/ticket/514
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui', 'body', 'favicon', '../img/favicon.png', 'favicon' ,'php_var');
-

Modified: branches/2.6/resources/db/pgsql/UTF-8/update/update_2.6rc1_to_2.6_pgsql_UTF-8.sql
===================================================================
--- branches/2.6/resources/db/pgsql/UTF-8/update/update_2.6rc1_to_2.6_pgsql_UTF-8.sql	2009-09-15 10:47:14 UTC (rev 4629)
+++ branches/2.6/resources/db/pgsql/UTF-8/update/update_2.6rc1_to_2.6_pgsql_UTF-8.sql	2009-09-15 11:16:43 UTC (rev 4630)
@@ -109,8 +109,8 @@
 
 
 
---insert statement for switchWMS is in template Guis was missing.
---http://trac.osgeo.org/mapbender/ticket/472
+-- insert statement for switchWMS is in template Guis was missing.
+-- http://trac.osgeo.org/mapbender/ticket/472
 INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui', 'treeGDE', 'switchwms', 'true', 'enables/disables all layer of a wms' ,'var');
 INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui1', 'treeGDE', 'switchwms', 'true', 'enables/disables all layer of a wms' ,'var');
 INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui2', 'treeGDE', 'switchwms', 'true', 'enables/disables all layer of a wms' ,'var');
@@ -138,16 +138,15 @@
 INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui', 'body', 'favicon', '../img/favicon.png', 'favicon' ,'php_var');
 
 -- pt update entries for translations table
-update translations set msgid = 'Set language' where msgid = 'languaje' and locale = 'pt'
-update translations set msgstr = 'Selecionar Linguagem' where msgstr = 'Selecionar Linguajem' and locale = 'pt'
-update translations set msgstr = 'Marco de navegaÃ§Ã£o' where msgstr = 'Marco de navegacion' and locale = 'pt'
-update translations set msgstr = 'Zoom seguinte' where msgid = 'Forward' and locale = 'pt'
-update translations set msgstr = 'Zoom para coordinadas' where msgid = 'Zoom to Coordinates' and locale = 'pt'
+update translations set msgid = 'Set language' where msgid = 'languaje' and locale = 'pt';
+update translations set msgstr = 'Selecionar Linguagem' where msgstr = 'Selecionar Linguajem' and locale = 'pt';
+update translations set msgstr = 'Marco de navegaÃ§Ã£o' where msgstr = 'Marco de navegacion' and locale = 'pt';
+update translations set msgstr = 'Zoom seguinte' where msgid = 'Forward' and locale = 'pt';
+update translations set msgstr = 'Zoom para coordinadas' where msgid = 'Zoom to Coordinates' and locale = 'pt';
+update translations set msgid = 'Drag Mapsize' where msgid = 'dragMapSize' and locale = 'pt';
+update translations set msgid = 'Navigation Frame' where msgid = 'navFrame' and locale = 'pt';
+update translations set msgid = 'Scale Select' where msgid = 'scaleSelect' and locale = 'pt';
 
-update translations set msgid = 'Drag Mapsize' where msgid = 'dragMapSize' and locale = 'pt'
-update translations set msgid = 'Navigation Frame' where msgid = 'navFrame' and locale = 'pt'
-update translations set msgid = 'Scale Select' where msgid = 'scaleSelect' and locale = 'pt'
-
 -- polish entries for translations table
 INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Pan', 'PrzesuÅ„');
 INSERT INTO translations (locale, msgid, msgstr ) VALUES ('pl', 'Display complete map', 'PokaÅ¼ calÄ… mapÄ™');
@@ -207,4 +206,4 @@
 INSERT INTO translations (locale, msgid, msgstr) VALUES ('it', 'Set language', 'Assegnare linguaggio'); 
 
 -- dutch entry for translations table
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('nl', 'Set language', 'Taal instellen');
\ No newline at end of file
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('nl', 'Set language', 'Taal instellen');

