[Mpuls-commits] r3288 - waska/trunk/waskaweb/public/formed
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Mon Aug 2 12:11:43 CEST 2010
Author: torsten
Date: 2010-08-02 12:11:42 +0200 (Mon, 02 Aug 2010)
New Revision: 3288
Modified:
waska/trunk/waskaweb/public/formed/formedtree.xml
waska/trunk/waskaweb/public/formed/laender.xml
waska/trunk/waskaweb/public/formed/sprachen.xml
waska/trunk/waskaweb/public/formed/staatsangehoerigkeit.xml
Log:
New formed and external choice lists
Modified: waska/trunk/waskaweb/public/formed/formedtree.xml
===================================================================
--- waska/trunk/waskaweb/public/formed/formedtree.xml 2010-08-02 09:41:03 UTC (rev 3287)
+++ waska/trunk/waskaweb/public/formed/formedtree.xml 2010-08-02 10:11:42 UTC (rev 3288)
@@ -266,6 +266,7 @@
<bool checked="true" description="Keine Angabe" name="keineangabe" value="-1"/>
<bool description="Unbekannt" name="unbekannt" value="-3"/>
<bool description="Sonstiges" name="sonstiges" value="-2"/>
+ <bool description="Deutschland" value="29"/>
<external-choice name="external-choice-1" value="laender.xml"/>
</choice>
<text description="Nennung sonstiges Geburtsland" formularname="Geburtsland_sonstige_nennung" function="suppress_value2" maxlength="60" modes="default" name="geburtsland_sonstige_nennung" size="40" target="b:50"/>
@@ -273,6 +274,7 @@
<bool checked="true" description="Keine Angabe" name="keineangabe" value="-1"/>
<bool description="Unbekannt" name="unbekannt" value="-3"/>
<bool description="Sonstige" name="sonstige" value="-2"/>
+ <bool description="Deutsch" value="18"/>
<external-choice name="external-choice-0" value="sprachen.xml"/>
</choice>
<text description="Nennung sonstige Muttersprache" formularname="Muttersprache_sonstige_nennung" function="suppress_value2" maxlength="60" modes="default" name="muttersprache_sonstige_nennung" size="40" target="c:50"/>
@@ -280,6 +282,7 @@
<bool checked="true" description="Keine Angabe" name="keineangabe" value="-1"/>
<bool description="Unbekannt" name="unbekannt" value="-3"/>
<bool description="Sonstige" name="sonstige" value="-2"/>
+ <bool description="Deutschland" value="29"/>
<external-choice name="external-choice-9" value="staatsangehoerigkeit.xml"/>
</choice>
<text description="Nennung sonstige Staatsangehörigkeit" formularname="Staatsangehörigkeit_sonstige_nennung" function="suppress_value2" maxlength="60" modes="default" name="staatsangehoerigkeit_sonstige_nennung" size="40" target="d:50"/>
@@ -482,6 +485,7 @@
<bool description="Keine Angabe" name="keineangabe" value="-1"/>
<bool description="Unbekannt" name="unbekannt" value="-3"/>
<bool description="Sonstiges" name="sonstiges" value="-2"/>
+ <bool description="Deutschland" value="29"/>
<external-choice name="external-choice-2-0" value="laender.xml"/>
</choice>
<text description="Nennung sonstiges Erwerbsland" formularname="Schulabschlusserwerbsland_sonstige_nennung" maxlength="60" name="schulabschlusserwerbsland_sonstige_nennung" size="40" target="b"/>
@@ -1085,6 +1089,7 @@
<bool description="Keine Angabe" name="keineangabe" value="-1"/>
<bool description="Unbekannt" name="unbekannt" value="-3"/>
<bool description="Sonstige" name="sonstige" value="-2"/>
+ <bool description="Deutsch" value="18"/>
<external-choice name="external-choice-3" value="sprachen.xml"/>
</choice>
<text description="Nennung Sonstige" formularname="Sprache1_sonstige_nennung" maxlength="60" name="sprache1_sonstige_nennung" size="40" value="a"/>
@@ -1102,6 +1107,7 @@
<bool description="Keine Angabe" name="keineangabe" value="-1"/>
<bool description="Unbekannt" name="unbekannt" value="-3"/>
<bool description="Sonstige" name="sonstige" value="-2"/>
+ <bool description="Deutsch" value="18"/>
<external-choice name="external-choice-3" value="sprachen.xml"/>
</choice>
<text description="Nennung Sonstige" formularname="Sprache2_sonstige_nennung" maxlength="60" name="sprache2_sonstige_nennung" size="40" value="a"/>
@@ -1119,6 +1125,7 @@
<bool description="Keine Angabe" name="keineangabe" value="-1"/>
<bool description="Unbekannt" name="unbekannt" value="-3"/>
<bool description="Sonstige" name="sonstige" value="-2"/>
+ <bool description="Deutsch" value="18"/>
<external-choice name="external-choice-3" value="sprachen.xml"/>
</choice>
<text description="Nennung Sonstige" formularname="Sprache3_sonstige_nennung" maxlength="60" name="sprache3_sonstige_nennung" size="40" value="a"/>
Modified: waska/trunk/waskaweb/public/formed/laender.xml
===================================================================
--- waska/trunk/waskaweb/public/formed/laender.xml 2010-08-02 09:41:03 UTC (rev 3287)
+++ waska/trunk/waskaweb/public/formed/laender.xml 2010-08-02 10:11:42 UTC (rev 3288)
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document xmlns:tmp="http://www.xfa.org/schema/xfa-template/2.5/">
<choice name="external-laender">
+ <bool value="189" description="Ägypten"/>
+ <bool value="190" description="Äquatorialguinea"/>
+ <bool value="191" description="Äthiopien"/>
<bool value="0" description="Afghanistan"/>
<bool value="1" description="Albanien"/>
<bool value="2" description="Algerien"/>
@@ -23,21 +26,22 @@
<bool value="19" description="Bosnien und Herzegowina"/>
<bool value="20" description="Botsuana"/>
<bool value="21" description="Brasilien"/>
- <bool value="22" description="Brunei"/>
+ <bool value="22" description="Brunei Darussalam"/>
<bool value="23" description="Bulgarien"/>
<bool value="24" description="Burkina Faso"/>
<bool value="25" description="Burundi"/>
<bool value="26" description="Chile"/>
<bool value="27" description="China"/>
<bool value="28" description="Costa Rica"/>
- <bool value="29" description="Deutschland" target="10"/>
+ <bool value="36" description="Côte d'Ivoire"/>
+ <bool value="193" description="Cookinseln"/>
+ <bool value="33" description="Dänemark"/>
+ <bool value="29" description="Deutschland"/>
<bool value="30" description="Dominica"/>
<bool value="31" description="Dominikanische Republik"/>
<bool value="32" description="Dschibuti"/>
- <bool value="33" description="Dänemark"/>
<bool value="34" description="Ecuador"/>
<bool value="35" description="El Salvador"/>
- <bool value="36" description="Elfenbeinküste"/>
<bool value="37" description="Eritrea"/>
<bool value="38" description="Estland"/>
<bool value="39" description="Fidschi"/>
@@ -49,13 +53,14 @@
<bool value="45" description="Ghana"/>
<bool value="46" description="Grenada"/>
<bool value="47" description="Griechenland"/>
- <bool value="48" description="Großbritannien"/>
+ <bool value="48" description="Großbritannien / Vereinigtes Königreich"/>
<bool value="49" description="Guatemala"/>
<bool value="50" description="Guinea"/>
<bool value="51" description="Guinea-Bissau"/>
<bool value="52" description="Guyana"/>
<bool value="53" description="Haiti"/>
<bool value="54" description="Honduras"/>
+ <bool value="194" description="Hongkong"/>
<bool value="55" description="Indien"/>
<bool value="56" description="Indonesien"/>
<bool value="57" description="Irak"/>
@@ -79,10 +84,11 @@
<bool value="75" description="Kiribati"/>
<bool value="76" description="Kolumbien"/>
<bool value="77" description="Komoren"/>
- <bool value="78" description="Kongo, Demokratische Republik"/>
- <bool value="79" description="Kongo, Republik"/>
- <bool value="80" description="Korea, Demokratische Volksrepublik"/>
- <bool value="81" description="Korea, Republik"/>
+ <bool value="78" description="Kongo (Demokratische Republik Kongo)"/>
+ <bool value="79" description="Kongo (Republik Kongo)"/>
+ <bool value="195" description="Kosovo"/>
+ <bool value="80" description="Korea (Demokratische Volksrepublik, Nordkorea)"/>
+ <bool value="81" description="Korea, (Republik Korea, Südkorea)"/>
<bool value="82" description="Kroatien"/>
<bool value="83" description="Kuba"/>
<bool value="84" description="Kuwait"/>
@@ -96,6 +102,7 @@
<bool value="92" description="Litauen"/>
<bool value="93" description="Luxemburg"/>
<bool value="94" description="Madagaskar"/>
+ <bool value="196" description="Macau"/>
<bool value="95" description="Malawi"/>
<bool value="96" description="Malaysia"/>
<bool value="97" description="Malediven"/>
@@ -105,10 +112,10 @@
<bool value="101" description="Marshallinseln"/>
<bool value="102" description="Mauretanien"/>
<bool value="103" description="Mauritius"/>
- <bool value="104" description="Mazedonien"/>
+ <bool value="104" description="Ehemalige jugoslawische Republik Mazedonien"/>
<bool value="105" description="Mexiko"/>
<bool value="106" description="Mikronesien"/>
- <bool value="107" description="Moldawien"/>
+ <bool value="107" description="Republik Moldau"/>
<bool value="108" description="Monaco"/>
<bool value="109" description="Mongolei"/>
<bool value="110" description="Montenegro"/>
@@ -123,9 +130,11 @@
<bool value="119" description="Niger"/>
<bool value="120" description="Nigeria"/>
<bool value="121" description="Norwegen"/>
+ <bool value="192" description="Österreich"/>
<bool value="122" description="Oman"/>
- <bool value="123" description="Osttimor"/>
+ <bool value="123" description="Timor-Leste"/>
<bool value="124" description="Pakistan"/>
+ <bool value="197" description="Palästinensische Gebiete"/>
<bool value="125" description="Palau"/>
<bool value="126" description="Panama"/>
<bool value="127" description="Papua-Neuguinea"/>
@@ -136,7 +145,8 @@
<bool value="132" description="Portugal"/>
<bool value="133" description="Ruanda"/>
<bool value="134" description="Rumänien"/>
- <bool value="135" description="Russland"/>
+ <bool value="135" description="Russische Föderation"/>
+ <bool value="162" description="Südafrika"/>
<bool value="136" description="Salomonen"/>
<bool value="137" description="Sambia"/>
<bool value="138" description="Samoa"/>
@@ -163,36 +173,32 @@
<bool value="159" description="Swasiland"/>
<bool value="160" description="Syrien"/>
<bool value="161" description="São Tomé und Príncipe"/>
- <bool value="162" description="Südafrika"/>
<bool value="163" description="Tadschikistan"/>
<bool value="164" description="Tansania"/>
+ <bool value="198" description="Taiwan"/>
<bool value="165" description="Thailand"/>
<bool value="166" description="Togo"/>
<bool value="167" description="Tonga"/>
<bool value="168" description="Trinidad und Tobago"/>
<bool value="169" description="Tschad"/>
- <bool value="170" description="Tschechien"/>
+ <bool value="170" description="Tschechische Republik"/>
+ <bool value="174" description="Türkei"/>
<bool value="171" description="Tunesien"/>
<bool value="172" description="Turkmenistan"/>
<bool value="173" description="Tuvalu"/>
- <bool value="174" description="Türkei"/>
<bool value="175" description="Uganda"/>
<bool value="176" description="Ukraine"/>
<bool value="177" description="Ungarn"/>
<bool value="178" description="Uruguay"/>
<bool value="179" description="Usbekistan"/>
<bool value="180" description="Vanuatu"/>
- <bool value="181" description="Vatikanstadt"/>
+ <bool value="181" description="Vatikan / Heiliger Stuhl"/>
<bool value="182" description="Venezuela"/>
<bool value="183" description="Vereinigte Arabische Emirate"/>
<bool value="184" description="Vereinigte Staaten von Amerika"/>
<bool value="185" description="Vietnam"/>
- <bool value="186" description="Weißrussland"/>
+ <bool value="186" description="Weißrussland / Belarus"/>
<bool value="187" description="Zentralafrikanische Republik"/>
<bool value="188" description="Zypern"/>
- <bool value="189" description="Ägypten"/>
- <bool value="190" description="Äquatorialguinea"/>
- <bool value="191" description="Äthiopien"/>
- <bool value="192" description="Österreich"/>
</choice>
</document>
Modified: waska/trunk/waskaweb/public/formed/sprachen.xml
===================================================================
--- waska/trunk/waskaweb/public/formed/sprachen.xml 2010-08-02 09:41:03 UTC (rev 3287)
+++ waska/trunk/waskaweb/public/formed/sprachen.xml 2010-08-02 10:11:42 UTC (rev 3288)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<document xmlns:tmp="http://www.xfa.org/schema/xfa-template/2.5/">
<choice name="external-sprachen">
+ <bool value="8" description="Äthiopisch"/>
<bool value="0" description="Afrikaans"/>
<bool value="1" description="Albanisch"/>
<bool value="2" description="Amharisch"/>
@@ -9,7 +10,6 @@
<bool value="5" description="Armenisch"/>
<bool value="6" description="Aserbaidschanisch"/>
<bool value="7" description="Assami"/>
- <bool value="8" description="Äthiopisch"/>
<bool value="9" description="Azeri"/>
<bool value="10" description="Baskisch"/>
<bool value="11" description="Bengali"/>
@@ -20,7 +20,7 @@
<bool value="15" description="Dänisch"/>
<bool value="16" description="Darginisch"/>
<bool value="17" description="Dari"/>
- <bool value="18" description="Deutsch" target="10"/>
+ <bool value="18" description="Deutsch"/>
<bool value="19" description="Englisch"/>
<bool value="20" description="Estnisch"/>
<bool value="21" description="Farsi"/>
@@ -85,6 +85,7 @@
<bool value="79" description="Rätoromanisch"/>
<bool value="80" description="Rumänisch"/>
<bool value="81" description="Russisch"/>
+ <bool value="94" description="Südarabisch"/>
<bool value="82" description="Safatenisch"/>
<bool value="83" description="Samoanisch"/>
<bool value="84" description="Sanskrit"/>
@@ -97,7 +98,7 @@
<bool value="91" description="Spanisch"/>
<bool value="92" description="Swahili"/>
<bool value="93" description="Syrisch"/>
- <bool value="94" description="Südarabisch"/>
+ <bool value="104" description="Türkisch"/>
<bool value="95" description="Tagalog"/>
<bool value="96" description="Tamil"/>
<bool value="97" description="Tamudisch"/>
@@ -107,7 +108,6 @@
<bool value="101" description="Tigre"/>
<bool value="102" description="Tigrina"/>
<bool value="103" description="Tschechisch"/>
- <bool value="104" description="Türkisch"/>
<bool value="105" description="Ugaritisch"/>
<bool value="106" description="Uigurisch"/>
<bool value="107" description="Ukrainisch"/>
Modified: waska/trunk/waskaweb/public/formed/staatsangehoerigkeit.xml
===================================================================
--- waska/trunk/waskaweb/public/formed/staatsangehoerigkeit.xml 2010-08-02 09:41:03 UTC (rev 3287)
+++ waska/trunk/waskaweb/public/formed/staatsangehoerigkeit.xml 2010-08-02 10:11:42 UTC (rev 3288)
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document>
+<document xmlns:tmp="http://www.xfa.org/schema/xfa-template/2.5/">
<choice name="external-staaten">
+ <bool value="189" description="Ägypten"/>
+ <bool value="190" description="Äquatorialguinea"/>
+ <bool value="191" description="Äthiopien"/>
<bool value="0" description="Afghanistan"/>
<bool value="1" description="Albanien"/>
<bool value="2" description="Algerien"/>
@@ -23,21 +26,22 @@
<bool value="19" description="Bosnien und Herzegowina"/>
<bool value="20" description="Botsuana"/>
<bool value="21" description="Brasilien"/>
- <bool value="22" description="Brunei"/>
+ <bool value="22" description="Brunei Darussalam"/>
<bool value="23" description="Bulgarien"/>
<bool value="24" description="Burkina Faso"/>
<bool value="25" description="Burundi"/>
<bool value="26" description="Chile"/>
<bool value="27" description="China"/>
<bool value="28" description="Costa Rica"/>
- <bool value="29" description="Deutschland" alternative="deutsch" target="50"/>
+ <bool value="36" description="Côte d'Ivoire"/>
+ <bool value="193" description="Cookinseln"/>
+ <bool value="33" description="Dänemark"/>
+ <bool value="29" description="Deutschland" alternative="deutsch"/>
<bool value="30" description="Dominica"/>
<bool value="31" description="Dominikanische Republik"/>
<bool value="32" description="Dschibuti"/>
- <bool value="33" description="Dänemark"/>
<bool value="34" description="Ecuador"/>
<bool value="35" description="El Salvador"/>
- <bool value="36" description="Elfenbeinküste"/>
<bool value="37" description="Eritrea"/>
<bool value="38" description="Estland"/>
<bool value="39" description="Fidschi"/>
@@ -49,13 +53,14 @@
<bool value="45" description="Ghana"/>
<bool value="46" description="Grenada"/>
<bool value="47" description="Griechenland"/>
- <bool value="48" description="Großbritannien"/>
+ <bool value="48" description="Großbritannien / Vereinigtes Königreich"/>
<bool value="49" description="Guatemala"/>
<bool value="50" description="Guinea"/>
<bool value="51" description="Guinea-Bissau"/>
<bool value="52" description="Guyana"/>
<bool value="53" description="Haiti"/>
<bool value="54" description="Honduras"/>
+ <bool value="194" description="Hongkong"/>
<bool value="55" description="Indien"/>
<bool value="56" description="Indonesien"/>
<bool value="57" description="Irak"/>
@@ -79,10 +84,11 @@
<bool value="75" description="Kiribati"/>
<bool value="76" description="Kolumbien"/>
<bool value="77" description="Komoren"/>
- <bool value="78" description="Kongo, Demokratische Republik"/>
- <bool value="79" description="Kongo, Republik"/>
- <bool value="80" description="Korea, Demokratische Volksrepublik"/>
- <bool value="81" description="Korea, Republik"/>
+ <bool value="78" description="Kongo (Demokratische Republik Kongo)"/>
+ <bool value="79" description="Kongo (Republik Kongo)"/>
+ <bool value="195" description="Kosovo"/>
+ <bool value="80" description="Korea (Demokratische Volksrepublik, Nordkorea)"/>
+ <bool value="81" description="Korea, (Republik Korea, Südkorea)"/>
<bool value="82" description="Kroatien"/>
<bool value="83" description="Kuba"/>
<bool value="84" description="Kuwait"/>
@@ -96,6 +102,7 @@
<bool value="92" description="Litauen"/>
<bool value="93" description="Luxemburg"/>
<bool value="94" description="Madagaskar"/>
+ <bool value="196" description="Macau"/>
<bool value="95" description="Malawi"/>
<bool value="96" description="Malaysia"/>
<bool value="97" description="Malediven"/>
@@ -105,10 +112,10 @@
<bool value="101" description="Marshallinseln"/>
<bool value="102" description="Mauretanien"/>
<bool value="103" description="Mauritius"/>
- <bool value="104" description="Mazedonien"/>
+ <bool value="104" description="Ehemalige jugoslawische Republik Mazedonien"/>
<bool value="105" description="Mexiko"/>
<bool value="106" description="Mikronesien"/>
- <bool value="107" description="Moldawien"/>
+ <bool value="107" description="Republik Moldau"/>
<bool value="108" description="Monaco"/>
<bool value="109" description="Mongolei"/>
<bool value="110" description="Montenegro"/>
@@ -123,9 +130,11 @@
<bool value="119" description="Niger"/>
<bool value="120" description="Nigeria"/>
<bool value="121" description="Norwegen"/>
+ <bool value="192" description="Österreich"/>
<bool value="122" description="Oman"/>
- <bool value="123" description="Osttimor"/>
+ <bool value="123" description="Timor-Leste"/>
<bool value="124" description="Pakistan"/>
+ <bool value="197" description="Palästinensische Gebiete"/>
<bool value="125" description="Palau"/>
<bool value="126" description="Panama"/>
<bool value="127" description="Papua-Neuguinea"/>
@@ -136,7 +145,8 @@
<bool value="132" description="Portugal"/>
<bool value="133" description="Ruanda"/>
<bool value="134" description="Rumänien"/>
- <bool value="135" description="Russland"/>
+ <bool value="135" description="Russische Föderation"/>
+ <bool value="162" description="Südafrika"/>
<bool value="136" description="Salomonen"/>
<bool value="137" description="Sambia"/>
<bool value="138" description="Samoa"/>
@@ -163,36 +173,32 @@
<bool value="159" description="Swasiland"/>
<bool value="160" description="Syrien"/>
<bool value="161" description="São Tomé und Príncipe"/>
- <bool value="162" description="Südafrika"/>
<bool value="163" description="Tadschikistan"/>
<bool value="164" description="Tansania"/>
+ <bool value="198" description="Taiwan"/>
<bool value="165" description="Thailand"/>
<bool value="166" description="Togo"/>
<bool value="167" description="Tonga"/>
<bool value="168" description="Trinidad und Tobago"/>
<bool value="169" description="Tschad"/>
- <bool value="170" description="Tschechien"/>
+ <bool value="170" description="Tschechische Republik"/>
+ <bool value="174" description="Türkei"/>
<bool value="171" description="Tunesien"/>
<bool value="172" description="Turkmenistan"/>
<bool value="173" description="Tuvalu"/>
- <bool value="174" description="Türkei"/>
<bool value="175" description="Uganda"/>
<bool value="176" description="Ukraine"/>
<bool value="177" description="Ungarn"/>
<bool value="178" description="Uruguay"/>
<bool value="179" description="Usbekistan"/>
<bool value="180" description="Vanuatu"/>
- <bool value="181" description="Vatikanstadt"/>
+ <bool value="181" description="Vatikan / Heiliger Stuhl"/>
<bool value="182" description="Venezuela"/>
<bool value="183" description="Vereinigte Arabische Emirate"/>
<bool value="184" description="Vereinigte Staaten von Amerika"/>
<bool value="185" description="Vietnam"/>
- <bool value="186" description="Weißrussland"/>
+ <bool value="186" description="Weißrussland / Belarus"/>
<bool value="187" description="Zentralafrikanische Republik"/>
<bool value="188" description="Zypern"/>
- <bool value="189" description="Ägypten"/>
- <bool value="190" description="Äquatorialguinea"/>
- <bool value="191" description="Äthiopien"/>
- <bool value="192" description="Österreich"/>
</choice>
</document>
More information about the Mpuls-commits
mailing list