[Fmsystem-commits] [8226] Merge 8223:8225 from trunk

[Sigurd Nes]

Revision: 8226
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8226
Author:   sigurdne
Date:     2011-11-30 19:07:49 +0000 (Wed, 30 Nov 2011)
Log Message:
-----------
Merge 8223:8225 from trunk

Modified Paths:
--------------
    branches/Version-1_0-branch/booking/setup/phpgw_no.lang
    branches/Version-1_0-branch/booking/templates/base/booking_delete.xsl
    branches/Version-1_0-branch/bookingfrontend/setup/phpgw_no.lang
    
branches/Version-1_0-branch/bookingfrontend/templates/base/allocation_cancel.xsl
    
branches/Version-1_0-branch/bookingfrontend/templates/base/allocation_delete.xsl
    
branches/Version-1_0-branch/bookingfrontend/templates/base/booking_cancel.xsl
    
branches/Version-1_0-branch/bookingfrontend/templates/base/booking_delete.xsl

Property Changed:
----------------
    branches/Version-1_0-branch/


Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222
   + 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225

Modified: branches/Version-1_0-branch/booking/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/booking/setup/phpgw_no.lang     2011-11-30 
14:25:10 UTC (rev 8225)
+++ branches/Version-1_0-branch/booking/setup/phpgw_no.lang     2011-11-30 
19:07:49 UTC (rev 8226)
@@ -535,8 +535,10 @@
 Booking system settings        booking no      Bookingmodul systeminnstillinger
 Frontend users can delete bookings and allocations     booking no      Brukere 
av frontend kan slette bookinger og tildelinger direkte
 All that borrow premises from Bergen Kommune must verify that they have read 
the terms and conditions, this is usually fire regulations and house rules.     
  booking no      Alle som leier lokaler hos Bergen kommune må bekrefte at de 
har lest betingelsene, dette gjelder som regel brannforskrifter og husreglement.
-Delete information     booking no      Hvis du kun skal slette tildeling på 
valgt dato, velg Slett-knappen nederst og tiden blir vist som ledig i 
kalenderen, og kan tildeles andre klubber/org. 
-Delete information2    booking no      Skal du slette flere kan du velge Ut 
sesong eller Slett til og velg en dato, du kan også velge intervall (f.eks. 
annen hver uke).
+Delete information     bookingfrontend no      Hvis du kun skal slette 
tildeling på valgt dato, velg Slett-knappen nederst og tiden blir vist som 
ledig i kalenderen, og kan tildeles andre klubber/org.
+Delete information2    bookingfrontend no      Skal du slette flere kan du 
velge Ut sesong eller Slett til og velg en dato, du kan også velge intervall 
(f.eks. annen hver uke).
+Booking Delete information     bookingfrontend no      Hvis du skal slette 
booking på valgt dato, velg Slett-knappen nederst. Skal tiden bli vist som 
ledig i kalenderen krysser du av for slett tildeling.
+Booking  Delete information2   bookingfrontend no      Skal du slette flere 
kan du velge Ut sesong eller Slett til og velg en dato, du kan også velge 
intervall (f.eks. annen hver uke).
 There is a cost of %1 assosiated with the allocation you are useing    booking 
no      Det er en kostnad på %1kr knyttet til den tildelingen du bruker.
 Export booking no      Eksport
 Upload booking no      Last opp

Modified: branches/Version-1_0-branch/booking/templates/base/booking_delete.xsl
===================================================================
--- branches/Version-1_0-branch/booking/templates/base/booking_delete.xsl       
2011-11-30 14:25:10 UTC (rev 8225)
+++ branches/Version-1_0-branch/booking/templates/base/booking_delete.xsl       
2011-11-30 19:07:49 UTC (rev 8226)
@@ -6,6 +6,10 @@
        </dl>
     <xsl:call-template name="msgbox"/>
        <xsl:call-template name="yui_booking_i18n"/>
+       <dl class="form">
+       <dd><xsl:value-of select="php:function('lang', 'Booking Delete 
Information')"/></dd>
+       <dd><xsl:value-of select="php:function('lang', 'Booking Delete 
Information2')"/></dd>
+       </dl>
 
     <form action="" method="POST">
                <input type="hidden" name="application_id" 
value="{booking/application_id}"/>

Modified: branches/Version-1_0-branch/bookingfrontend/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/bookingfrontend/setup/phpgw_no.lang     
2011-11-30 14:25:10 UTC (rev 8225)
+++ branches/Version-1_0-branch/bookingfrontend/setup/phpgw_no.lang     
2011-11-30 19:07:49 UTC (rev 8226)
@@ -347,3 +347,12 @@
 Cancelation of bookings and allocations from   bookingfrontend no      
Avbestilling av bookinger og tildelinger fra
 Cancelation of bookings from   bookingfrontend no      Avbestilling av 
bookinger fra
 Layout bookingfrontend no      Frontend design
+Delete information     bookingfrontend no      Hvis du kun skal slette 
tildeling på valgt dato, velg Slett-knappen nederst og tiden blir vist som 
ledig i kalenderen, og kan tildeles andre klubber/org.
+Delete information2    bookingfrontend no      Skal du slette flere kan du 
velge Ut sesong eller Slett til og velg en dato, du kan også velge intervall 
(f.eks. annen hver uke).
+Booking Delete information     bookingfrontend no      Hvis du skal slette 
booking på valgt dato, velg Slett-knappen nederst. Skal tiden bli vist som 
ledig i kalenderen krysser du av for slett tildeling.
+Booking  Delete information2   bookingfrontend no      Skal du slette flere 
kan du velge Ut sesong eller Slett til og velg en dato, du kan også velge 
intervall (f.eks. annen hver uke).
+Cancel information     bookingfrontend no      Hvis du kun skal avbestille 
tildeling på valgt dato, velg Avbestill-knappen nederst og tiden blir vist som 
ledig i kalenderen, og kan tildeles andre klubber/org. 
+Cancel information2    bookingfrontend no      Skal du Avbestille flere kan du 
velge Ut sesong eller Slett til og velg en dato, du kan også velge intervall 
(f.eks. annen hver uke).
+Booking Cancel information     bookingfrontend no      Hvis du skal avbestille 
booking på valgt dato, velg Avbestill-knappen nederst. Skal tiden bli vist som 
ledig i kalenderen krysser du av for slett tildeling.
+Booking Cancel information2    bookingfrontend no      Skal du avbestille 
flere kan du velge Ut sesong eller Avbestill til og velg en dato, du kan også 
velge intervall (f.eks. annen hver uke).
+

Modified: 
branches/Version-1_0-branch/bookingfrontend/templates/base/allocation_cancel.xsl
===================================================================
--- 
branches/Version-1_0-branch/bookingfrontend/templates/base/allocation_cancel.xsl
    2011-11-30 14:25:10 UTC (rev 8225)
+++ 
branches/Version-1_0-branch/bookingfrontend/templates/base/allocation_cancel.xsl
    2011-11-30 19:07:49 UTC (rev 8226)
@@ -6,7 +6,11 @@
        </dl>
     <xsl:call-template name="msgbox"/>
        <xsl:call-template name="yui_booking_i18n"/>
-
+       <dl class="form">
+       <dd><xsl:value-of select="php:function('lang', 'Cancel 
Information')"/></dd>
+       <dd><xsl:value-of select="php:function('lang', 'Cancel 
Information2')"/></dd>
+       </dl>
+    <div class="clr"/>
     <form action="" method="POST">
                <input type="hidden" name="application_id" 
value="{allocation/application_id}"/>
         <input id="field_org_id" name="organization_id" type="hidden" 
value="{allocation/organization_id}" />

Modified: 
branches/Version-1_0-branch/bookingfrontend/templates/base/allocation_delete.xsl
===================================================================
--- 
branches/Version-1_0-branch/bookingfrontend/templates/base/allocation_delete.xsl
    2011-11-30 14:25:10 UTC (rev 8225)
+++ 
branches/Version-1_0-branch/bookingfrontend/templates/base/allocation_delete.xsl
    2011-11-30 19:07:49 UTC (rev 8226)
@@ -6,7 +6,11 @@
        </dl>
     <xsl:call-template name="msgbox"/>
        <xsl:call-template name="yui_booking_i18n"/>
-
+       <dl class="form">
+       <dd><xsl:value-of select="php:function('lang', 'Delete 
Information')"/></dd>
+       <dd><xsl:value-of select="php:function('lang', 'Delete 
Information2')"/></dd>
+       </dl>
+    <div class="clr"/>
     <form action="" method="POST">
                <input type="hidden" name="application_id" 
value="{allocation/application_id}"/>
         <input id="field_org_id" name="organization_id" type="hidden" 
value="{allocation/organization_id}" />

Modified: 
branches/Version-1_0-branch/bookingfrontend/templates/base/booking_cancel.xsl
===================================================================
--- 
branches/Version-1_0-branch/bookingfrontend/templates/base/booking_cancel.xsl   
    2011-11-30 14:25:10 UTC (rev 8225)
+++ 
branches/Version-1_0-branch/bookingfrontend/templates/base/booking_cancel.xsl   
    2011-11-30 19:07:49 UTC (rev 8226)
@@ -6,7 +6,11 @@
        </dl>
     <xsl:call-template name="msgbox"/>
        <xsl:call-template name="yui_booking_i18n"/>
-
+       <dl class="form">
+       <dd><xsl:value-of select="php:function('lang', 'Booking Cancel 
Information')"/></dd>
+       <dd><xsl:value-of select="php:function('lang', 'Booking Cancel 
Information2')"/></dd>
+       </dl>
+    <div class="clr"/>
     <form action="" method="POST">
                <input type="hidden" name="application_id" 
value="{booking/application_id}"/>
         <input type="hidden" name="group_id" value="{booking/group_id}" />

Modified: 
branches/Version-1_0-branch/bookingfrontend/templates/base/booking_delete.xsl
===================================================================
--- 
branches/Version-1_0-branch/bookingfrontend/templates/base/booking_delete.xsl   
    2011-11-30 14:25:10 UTC (rev 8225)
+++ 
branches/Version-1_0-branch/bookingfrontend/templates/base/booking_delete.xsl   
    2011-11-30 19:07:49 UTC (rev 8226)
@@ -6,7 +6,11 @@
        </dl>
     <xsl:call-template name="msgbox"/>
        <xsl:call-template name="yui_booking_i18n"/>
-
+       <dl class="form">
+       <dd><xsl:value-of select="php:function('lang', 'Booking Delete 
Information')"/></dd>
+       <dd><xsl:value-of select="php:function('lang', 'Booking Delete 
Information2')"/></dd>
+       </dl>
+    <div class="clr"/>
     <form action="" method="POST">
                <input type="hidden" name="application_id" 
value="{booking/application_id}"/>
         <input type="hidden" name="group_id" value="{booking/group_id}" />