tutos-commits Mailing List for TUTOS

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12454

Modified Files:
	mail.pinc 
Log Message:
fix underscores in mail addresses


Index: mail.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mail.pinc,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- mail.pinc	4 Nov 2004 21:08:33 -0000	1.77
+++ mail.pinc	30 Nov 2004 21:48:02 -0000	1.78
@@ -605,7 +605,7 @@
     $em = "";
     $reg[1] = "";
     $reg[2] = "";
-    $madr = "[a-zA-Z0-9/.-]*@[a-zA-Z0-9._-]*";
+    $madr = "[a-zA-Z0-9/._+-]*@[a-zA-Z0-9._+-]*";
     if (ereg("(.*)[ ]*<(". $madr .")>",$str,$reg)) {
       $name = trim($reg[1],"\" ");
       $em = $reg[2];
@@ -700,7 +700,7 @@
     $contenttype = "";
     $fp = fopen($filename,"rb");
     if (!$fp) {
-      Fatal_Error("NIX");
+      Fatal_Error("missing file");
     }
 
     while (!feof($fp)) {

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12275

Modified Files:
      Tag: BRANCH-1-2
	mail.pinc 
Log Message:
fix underscores in mail addresses


Index: mail.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mail.pinc,v
retrieving revision 1.73.2.6
retrieving revision 1.73.2.7
diff -u -r1.73.2.6 -r1.73.2.7
--- mail.pinc	4 Nov 2004 21:07:38 -0000	1.73.2.6
+++ mail.pinc	30 Nov 2004 21:47:22 -0000	1.73.2.7
@@ -605,7 +605,7 @@
     $em = "";
     $reg[1] = "";
     $reg[2] = "";
-    $madr = "[a-zA-Z0-9/.-]*@[a-zA-Z0-9._-]*";
+    $madr = "[a-zA-Z0-9/._+-]*@[a-zA-Z0-9._+-]*";
     if (ereg("(.*)[ ]*<(". $madr .")>",$str,$reg)) {
       $name = trim($reg[1],"\" ");
       $em = $reg[2];

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23859/php

Modified Files:
      Tag: BRANCH-2-0
	timetrack.pinc webelements.p3 
Log Message:
* The migration script is now complete, the only lasting bug seems
  to be with solvedate management...
* The bug management module code is being adapted to new model
  bug_show links to timetrack entry, for instance
  bug_show allow for history re-ordering

For TUTOS2 users who may read this, please test the migration script
written here, and if possible debug it too ;)
It should work well even in multi languages environment... let me know
if it can't handle your data.

Or course, we don't plan to support old bugtracking module in TUTOS 2.
A mail will be sent on tutos-devel as soon as the whole module is ready
for public use!


Index: timetrack.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack.pinc,v
retrieving revision 1.64.2.7
retrieving revision 1.64.2.8
diff -u -r1.64.2.7 -r1.64.2.8
--- timetrack.pinc	5 Oct 2004 12:38:22 -0000	1.64.2.7
+++ timetrack.pinc	30 Nov 2004 18:26:32 -0000	1.64.2.8
@@ -304,7 +304,7 @@
     if( $this->ref->getType() == "task" )
       $q->addFV("volume_todo",$this->volume_todo,"FLOAT");
 
-    $q->addFV("description",$this->desc,"STRING",$table['timetrack']['description'][size]);
+    $q->addFV("description",$this->desc,"TEXT");
     $q->addFV("vtime",$this->wday,"DATETIME");
     $q->addFV("state",$this->state,"");
     $q->addFV("invoice",$this->inv_id,"");

Index: webelements.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/webelements.p3,v
retrieving revision 1.243.2.5
retrieving revision 1.243.2.6
diff -u -r1.243.2.5 -r1.243.2.6
--- webelements.p3	6 Oct 2004 16:38:59 -0000	1.243.2.5
+++ webelements.p3	30 Nov 2004 18:26:33 -0000	1.243.2.6
@@ -170,14 +170,13 @@
 Function Fatal_Error ($text1,$text2 = "") {
   global $current_user,$lang,$tutos,$dbconn,$HTTP_POST_FILES;
 
-  if ( ! headers_sent() ) {
-    // @ob_end_clean();
-
+  if( ! isset($l) ) {
     require_once 'layout/layout.pinc';
     $l = new layout($current_user);
     echo $l->PrintHeader("FATAL ERROR");
   }
-  else {
+
+  if ( headers_sent() ) {
     /* End possible Tables ... */
     echo "</table>";
     echo "</table>";
@@ -188,6 +187,8 @@
     echo "</a>";
   }
 
+  
+
   $l->assign('Error', $text1);
   $l->assign('Detail', $text2);
   $l->assign('PHPVersion', phpversion());

Update of /cvsroot/tutos/tutos/html/classic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23859/html/classic

Modified Files:
      Tag: BRANCH-2-0
	style.css 
Log Message:
* The migration script is now complete, the only lasting bug seems
  to be with solvedate management...
* The bug management module code is being adapted to new model
  bug_show links to timetrack entry, for instance
  bug_show allow for history re-ordering

For TUTOS2 users who may read this, please test the migration script
written here, and if possible debug it too ;)
It should work well even in multi languages environment... let me know
if it can't handle your data.

Or course, we don't plan to support old bugtracking module in TUTOS 2.
A mail will be sent on tutos-devel as soon as the whole module is ready
for public use!


Index: style.css
===================================================================
RCS file: /cvsroot/tutos/tutos/html/classic/Attic/style.css,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- style.css	4 Oct 2004 13:56:35 -0000	1.1.2.14
+++ style.css	30 Nov 2004 18:26:17 -0000	1.1.2.15
@@ -331,6 +331,34 @@
 	font-size: 10px;
 }
 
+/* Bug states and classes */
+.bugstate1 { 
+        color: red;
+}
+.bugstate2 { 
+        color: blue;
+}
+.bugstate3 { 
+        color: green;
+}
+.bugstate4 { 
+        color: gray;
+}
+
+.bugclass1 { 
+        color: blue;
+}
+.bugclass2 { 
+        color: #EE1111;
+}
+.bugclass3 { 
+        color: red;
+}
+.bugclass4 { 
+        color: green;
+}
+
+
 ADDRESS {
         font-size: x-small;
 }
@@ -552,7 +580,8 @@
 /* table.overview tbody a          { display: block; } */
 table.overview tbody td:hover a { text-decoration: underline; }
 
-table.overview tbody td.data {
+/* table.overview tbody td.data { */
+td.data {
   text-align: center;
   font-family: monospace;
 }

Update of /cvsroot/tutos/tutos/php/localization
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23859/php/localization

Modified Files:
      Tag: BRANCH-2-0
	fr.p3 
Log Message:
* The migration script is now complete, the only lasting bug seems
  to be with solvedate management...
* The bug management module code is being adapted to new model
  bug_show links to timetrack entry, for instance
  bug_show allow for history re-ordering

For TUTOS2 users who may read this, please test the migration script
written here, and if possible debug it too ;)
It should work well even in multi languages environment... let me know
if it can't handle your data.

Or course, we don't plan to support old bugtracking module in TUTOS 2.
A mail will be sent on tutos-devel as soon as the whole module is ready
for public use!


Index: fr.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/fr.p3,v
retrieving revision 1.40.2.14
retrieving revision 1.40.2.15
diff -u -r1.40.2.14 -r1.40.2.15
--- fr.p3	5 Oct 2004 13:32:46 -0000	1.40.2.14
+++ fr.p3	30 Nov 2004 18:26:35 -0000	1.40.2.15
@@ -326,7 +326,7 @@
 $lang['ProdCreator']     = "Crée par";
 $lang['ProdCreation']    = "Crée par %s le %s";
 $lang['ProdCreationS']   = "Crée le";
-$lang['ProdStart']       = "Démarage prévu";
+$lang['ProdStart']       = "Démarrage prévu";
 $lang['ProdEnd']         = "Fin prévue";
 $lang['ProdProb']        = "Probabilité";
 $lang['ProdModifyT']     = "Modifer ce produit / projet %s";

Update of /cvsroot/tutos/tutos/php/bugtracking
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23859/php/bugtracking

Modified Files:
      Tag: BRANCH-2-0
	bug.pinc bug_overview.php bug_show.php fr.p3 migration.php 
Log Message:
* The migration script is now complete, the only lasting bug seems
  to be with solvedate management...
* The bug management module code is being adapted to new model
  bug_show links to timetrack entry, for instance
  bug_show allow for history re-ordering

For TUTOS2 users who may read this, please test the migration script
written here, and if possible debug it too ;)
It should work well even in multi languages environment... let me know
if it can't handle your data.

Or course, we don't plan to support old bugtracking module in TUTOS 2.
A mail will be sent on tutos-devel as soon as the whole module is ready
for public use!


Index: bug.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug.pinc,v
retrieving revision 1.13.2.8
retrieving revision 1.13.2.9
diff -u -r1.13.2.8 -r1.13.2.9
--- bug.pinc	15 Oct 2004 15:56:29 -0000	1.13.2.8
+++ bug.pinc	30 Nov 2004 18:26:33 -0000	1.13.2.9
@@ -147,6 +147,9 @@
     $this->c_state[3] =  "green";
     $this->c_state[4] =  "gray";
 
+    $this->description = "";
+    $this->solver      = $current_user;
+    
     $this->state = BUG_STATE_OPEN;
     $this->class = BUG_CLASS_LIGHT;
 
@@ -160,6 +163,7 @@
     $this->bugid       = $r->get($pos, "bugid");
     $this->tt_id       = $r->get($pos, "tt_id");
     $this->creator     = getObject($this->dbconn,$r->get($pos, "creator"));
+    $this->solver      = getObject($this->dbconn,$r->get($pos, "solver"));
 
     $this->class       = $r->get($pos, "class");
     $this->state       = $r->get($pos, "state");
@@ -177,21 +181,34 @@
     $msg = "";
 
     $now = new DateTime();
+
     $q = new query($this->dbconn);
     $q->setTable($this->tablename);
     $this->id = $q->addFV("id",-1,"NEXTID");
     $q->addFV("bugid",$this->bugid,"INT");
-    $q->addFV("description",$this->description,"TEXT");
+
+    /**
+     * The description field is now stored in the associated timetrack
+     *
+     * $q->addFV("description", $this->description, "TEXT");
+     */
 
     $q->addFV("state",$this->state,"INT");
     $q->addFV("class",$this->class,"INT");
 
+    if( isset($this->creation) )
+      // Mainly used while in migration script
+      $q->addFV("creation", $this->creation, "DATETIME");
+    else
+      $q->addFV("creation", $now, "DATETIME");
+
     /*
     $q->addFV("creator",$this->creator,"OBJ");
     $q->addFV("creation",$now,"DATETIME");
     $q->addFV("description",$this->bughist[0]->description,"TEXT");
     */
 
+    /*
     if ( ($this->state == BUG_STATE_SOLVED) ||
 	 ( $this->state == BUG_STATE_CLOSED) ) {
       $q->addFV("solvedate",$this->solvedate,"DATETIME");
@@ -200,8 +217,32 @@
       $this->solvedate = new DateTime(0);
       $q->addFV("solvedate",$this->solvedate,"DATETIME");
     }
+    */
+
+    /**
+     * Save a new timetrack for each bug history entry.
+     *
+     * The timetrack will contain description and volume, and solver
+     * and solverdate will be $tt->creator and $tt->creation.
+     */
+    $tt = new timetrack($this->dbconn);
+
+    if( isset($this->creation) )
+      $tt->creation = $this->creation;
+
+    $tt->creator = $this->creator;
+    $tt->worker  = $this->creator;
+    $tt->link_id = $this->bugid;
+    $tt->ref     = $this;
+    $tt->volume  = $this->volume;
+    $tt->desc    = $this->description;
+    $ttmsg = $tt->save($norec=1);
+    $msg .= $ttmsg;
 
+    echo $ttmsg;
 
+    // Now add the timetrack id to the bug history
+    $q->addFV("tt_id", $tt->id, "INT");
 
     $query = $q->getInsert();
     $r = $this->dbconn->Exec($query);
@@ -296,16 +337,21 @@
     }
     */
 
-    $q = "SELECT * from ". $obj->tablename3 ." where bugid = ". $obj->id ." order by creation";
+    $q = "SELECT h.*, tt.creator, tt.adr_id as solver, tt.description ".
+       "from ". $obj->tablename3 ." h, timetrack tt ".
+       "where h.bugid = ". $obj->id .
+       " and tt.id = h.tt_id order by h.creation DESC";
+
     $result = $obj->dbconn->Exec($q);
     $n = $result->numrows();
-    $a = 0;
-    while ( $a < $n ) {
+
+    for($a=0; $a < $n; $a++ ) {
       $x = new bugdata($obj->dbconn);
-      $x->read_result($result,$a);
+
+      $x->read_result($result, $a);
       $obj->bughist[] = $x;
+
       unset($x);
-      $a++;
     }
     $result->free();
     return;
@@ -339,6 +385,7 @@
     $this->tablename3 = $this->dbconn->prefix .$table['bug3'][name];
     $this->acl[$current_user->id] = $tutos[modok];
   }
+
   /**
    * fill the object data with a given resultset
    *
@@ -361,7 +408,8 @@
 
     // $this->solvedate   = $r->getDateTime($pos, "solvedate");
 
-    $this->creator =  getObject($this->dbconn,$r->get($pos, "creator"));
+    $this->creator  = getObject($this->dbconn,$r->get($pos, "creator"));
+    $this->creation = $r->getDateTime($pos, "creation");
 
     // First History Entry
     /*
@@ -406,9 +454,13 @@
   function read_bugHistory ( ) {
     bugdata::obj_read($this);
 
-    foreach( $this->bughist as $i => $h ) {
-      echo $h->state;
-    }
+    // Then assign last state, class, solver... to this bug
+    // for compatibility
+
+    $this->state  = $this->bughist[0]->state;
+    $this->class  = $this->bughist[0]->class;
+    $this->solver = $this->bughist[0]->solver;
+    $this->solvedate = $this->bughist[0]->creation;
   }
 
   /**
@@ -687,27 +739,21 @@
     // $q->addFV("solver",$this->solver,"OBJ");
 
     $q->addFV("product_id",$this->parent,"OBJ");
-    $mail = new mail($current_user);
-    $mail->setFrom($current_user);
-    $mail->addHeader("Sensitivity","Company-Confidential");
-    $body = "";
-
-    $bugmailtxt = "";
 
     if ( $this->id < 0) {
       unset ($this->modified);
       if ( isset($this->newid) ) {
-        /* Get an new bug ID */
+        // Get an new bug ID
         $this->id = $this->newid;
         $q->addFV("id",$this->id,"");
       } else {
         $this->id = $q->addFV("id",-1,"NEXTID");
 
-        # Defaut Access Control inherit from parent
+        // Defaut Access Control inherit from parent
         $this->acl = $this->parent->acl;
         acl_raise($this,$this->solver->id,$tutos[modok]);
         acl_default($this,$current_user);
-        # Prepare the history
+        // Prepare the history
         $this->modified[] = array ( "field" => "BugCreate" ,
                                     "old" => "" ,
                                     "new" => $this->id,
@@ -723,26 +769,8 @@
       $q->addFV("creation",$this->creation,"DATETIME");
 
       $query = $q->getInsert();
-
-      # Prepare the mail
-      $mail->setSubject(sprintf($lang['EmailNewBug'], $this->parent->getFullName()));
-      $mail->addHeader("X-PRIORITY","1");
-      $mail->addHeader("priority","urgent");
-
-      $bugmailtxt = "bug_new.proto";
-
-      # Prepare the mail list
-      if ( $this->parent->getType() == "product" ) {
-        $this->parent->readroles();
-        foreach($tutos['bugnew_prod_mail'] as $r) {
-          if ( count($this->parent->role[$r]) > 0 ) {
-            foreach($this->parent->role[$r] as $i => $o) {
-              $ml[$o->id] = $o;
-            }
-          }
-        }
-      }
-    } else {
+    }
+    else {
       $q->addWC("id",$this->id,"");
       $query = $q->getUpdate();
 
@@ -750,7 +778,7 @@
 
       if ( $this->parent->getType() == "product" ) {
         $this->parent->readroles();
-        # Set the permissions
+        // Set the permissions
         if ( count($this->parent->role[PROD_ROLE_MANAGER]) > 0 ) {
           foreach($this->parent->role[PROD_ROLE_MANAGER] as $i => $o) {
             acl_raise($this,$o->id,$tutos[modok]);
@@ -768,7 +796,7 @@
         }
       }
 
-      # Save the additional desc
+      // Save the additional desc
       if ($this->newdesc != "") {
         $bd = new bugdata($this->dbconn);
         $bd->bugid = $this->id;
@@ -783,10 +811,45 @@
         // add the new bugdesc to the list
         $this->bughist[] = &$bd;
       }
+    }
+
+    /**
+     * TEMP: skip the mailing
+     *
+     * TO BE REWRITTEN
+     */
+    
+    /*
+    $mail = new mail($current_user);
+    $mail->setFrom($current_user);
+    $mail->addHeader("Sensitivity","Company-Confidential");
+    $body = "";
+
+    $bugmailtxt = "";
+
+
+      // Prepare the mail
+      $mail->setSubject(sprintf($lang['EmailNewBug'], $this->parent->getFullName()));
+      $mail->addHeader("X-PRIORITY","1");
+      $mail->addHeader("priority","urgent");
+
+      $bugmailtxt = "bug_new.proto";
+
+      // Prepare the mail list
+      if ( $this->parent->getType() == "product" ) {
+        $this->parent->readroles();
+        foreach($tutos['bugnew_prod_mail'] as $r) {
+          if ( count($this->parent->role[$r]) > 0 ) {
+            foreach($this->parent->role[$r] as $i => $o) {
+              $ml[$o->id] = $o;
+            }
+          }
+        }
+      }
 
       $mail->setSubject(sprintf($lang['EmailChangesBug'], $this->getFullName()) ." ".  $this->parent->getFullName() );
       $bugmailtxt = "bug_mod.proto";
-      # Prepare the mail list
+      // Prepare the mail list
       if ( $this->parent->getType() == "product" ) {
         $this->parent->readroles();
         foreach($tutos['bugmod_prod_mail'] as $r) {
@@ -799,7 +862,7 @@
       }
     }
 
-    # solver and creator will be ingformed automatically
+    // solver and creator will be ingformed automatically
     $ml[$this->solver->id] = $this->solver;
     $ml[$this->creator->id] = $this->creator;
 
@@ -825,9 +888,9 @@
         }
       }
     }
+    */
 
-
-    # Make the DB access
+      // Make the DB access
     $r = $this->dbconn->Exec($query);
     $msg .= parent::save();
 
@@ -1108,7 +1171,7 @@
       return;
     }
 
-    $q = "SELECT * from ". $user->dbconn->prefix ."bugs where (creator = ". $user->id ." or solver = ". $user->id .") and state <> ". BUG_STATE_CLOSED." and state <> ". BUG_STATE_SOLVED ." order by creation DESC";
+    $q = "SELECT * from ". $user->dbconn->prefix ."bugs b where (creator = ". $user->id ." or ". $user->id ." in (select t.adr_id from timetrack t, bugchanges c where t.id = c.tt_id and c.bugid = b.id and c.state <> ". BUG_STATE_CLOSED." and c.state <> ". BUG_STATE_SOLVED .")) order by creation DESC";
     $res = $user->dbconn->Exec($q);
     $n = $res->numrows();
     $a = 0;

Index: bug_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_overview.php,v
retrieving revision 1.8.2.16
retrieving revision 1.8.2.17
diff -u -r1.8.2.16 -r1.8.2.17
--- bug_overview.php	30 Sep 2004 17:09:33 -0000	1.8.2.16
+++ bug_overview.php	30 Nov 2004 18:26:34 -0000	1.8.2.17
@@ -92,7 +92,7 @@
 
        if( $b->parent->id > 0 )
          $parent = array('label' => $b->parent->getFullName(),
-			 'link'  => $tutos[base]."/php/".$b->parent->getUrl(),
+			 'link'  => $b->parent->getUrl(),
 			 'title' => sprintf($lang['ProdLinkInfo'],
 					    $b->parent->getFullName()));
        else
@@ -100,13 +100,13 @@
 
        if( $b->creator->id > 0 )
          $creator = array('label' => $b->creator->getShortName(),
-			  'link'  => $tutos[base]."/php/".$b->creator->getUrl());
+			  'link'  => $b->creator->getUrl());
        else
          $creator = $lang['HistoryDeleted'];
 
        if( $b->solver->id > 0 )
 	 $solver = array('label' => $b->solver->getShortName(),
-			 'link'  => $tutos[base]."/php/".$b->solver->getUrl());
+			 'link'  => $b->solver->getUrl());
        else
          $solver = $lang['HistoryDeleted'];
 
@@ -121,7 +121,7 @@
 
        $bugs[] = array('id'       => $b->id,
 		       'name'     => $b->getFullName(),
-		       'link'     => $tutos[base]."/php/".$b->getUrl(),
+		       'link'     => $b->getUrl(),
 		       'title'    => myentities($b->short),
 		       'creation' => $b->creation->getDate(),
 		       'lasth'    => $last->getDate(),
@@ -745,7 +745,8 @@
      # sorting
      $xxx = "";
      $this->link2 = $this->link1;
-     order_parse($q1,$this->link1,$xxx,$hidden,"state,creation");
+     // order_parse($q1,$this->link1,$xxx,$hidden,"state,creation");
+     order_parse($q1,$this->link1,$xxx,$hidden,"creation");
 
      $this->result1 = $this->dbconn->Exec($q1);
      $this->result2 = $this->dbconn->Exec($q2);

Index: bug_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_show.php,v
retrieving revision 1.4.2.6
retrieving revision 1.4.2.7
diff -u -r1.4.2.6 -r1.4.2.7
--- bug_show.php	28 Sep 2004 16:20:07 -0000	1.4.2.6
+++ bug_show.php	30 Nov 2004 18:26:34 -0000	1.4.2.7
@@ -86,11 +86,17 @@
 
      $this->assign('state',
 		   array('label' => $lang['BugState'],
-			 'value' => $this->obj->getState()));
+			 'value' => 
+			 array('label' => $this->obj->state,
+			       'value' =>
+			       $lang['BugStates'][$this->obj->state])));
 
      $this->assign('class',
 		   array('label' => $lang['BugClass'],
-			 'value' => $this->obj->getClass()));
+			 'value' =>
+			 array('label' => $this->obj->class,
+			       'value' => 
+			       $lang['BugClasses'][$this->obj->class])));
 
      $this->assign('desc',
 		   array('label' => $lang['BugShort'],
@@ -110,9 +116,92 @@
        }
      }
 
+     // Bug History
+     $diff_to_check = array('class', 'state', 'solver');
+     $hist_count = count($this->obj->bughist);
+     $previous = null;
+     $history  = array();
+
+     for( $i = $hist_count - 1; $i >= 0 ; $i--) {
+       $h = &$this->obj->bughist[$i];
+       $diff = array();
+
+       if( $previous == null ) {
+	 $diff = 'null';
+       }
+       else {
+	 $nb_diff = 0;
+	 
+	 if( $previous['state']['value'] != $h->state ) {
+	   $diff['state'] = $previous['state'];
+	   $nb_diff++;
+	 }
+
+	 if( $previous['class']['value'] != $h->class ) {
+	   $diff['class'] = $previous['class'];
+	   $nb_diff++;
+	 }
+
+	 if( $previous['solver']['label'] != $h->solver->getFullName() ) {
+	   $diff['solver'] = $previous['solver'];
+	   $nb_diff++;
+	 }
+
+	 if( $nb_diff == 0 )
+	   $diff = 'null';
+       }
+
+       if( ! is_object($h->creator) ) {
+	 $this->debug($h->id);
+	 $this->debug($h->creator);
+       }
+
+       $tt = new timetrack($this->dbconn);
+       $tt->read($h->tt_id);
+
+       $history[$i] = array('tt'       => 
+			    array(
+				  'label' => $lang['Timetrack'],
+				  'title' => $tt->getFullName(),
+				  'link'  => $tt->getModUrl()),
+			    'class'    =>
+			    array('value' => $h->class,
+				  'label' => $lang['BugClasses'][$h->class]),
+			    'state'    =>
+			    array('value' => $h->state,
+				  'label' => $lang['BugStates'][$h->state]),
+			    'desc'     => myentities($h->description),
+
+			    'solver'   =>
+			    array('label' => $h->solver->getFullName(),
+				  'title' => $h->solver->getFullName(),
+				  'link'  => $h->solver->getUrl()),
+
+			    'creator'  => 
+			    array('label' => $h->creator->getFullName(),
+				  'title' => $h->creator->getFullName(),
+				  'link'  => $h->creator->getUrl()),
+			    'creation' => $h->creation->getDateTime(),
+			    'diff'     => $diff
+			    );
+
+       $previous = &$history[$i];
+     }
+     // PHP will keep the insert order, we want index order
+
+     if( $this->order == "reverse" )
+       ksort($history);
+
+     // $this->debug($history);
      $this->assign('history',
 		   array('label' => $lang['BugHistory'],
-			 'value' => $this->obj->getBugHistory(true)));
+			 'value' => $history));
+
+     $this->assign('BugClass',      $lang['BugClass']);
+     $this->assign('BugState',      $lang['BugState']);
+     $this->assign('BugAssignedTo', $lang['BugAssignedTo']);
+     $this->assign('BugCreator',    $lang['BugCreator']);
+     $this->assign('Date',          $lang['Date']);
 
      $this->template('bugtracking/bug_show');
 
@@ -137,20 +226,29 @@
      $this->name = $lang['BugsDetail'];
      $this->obj = new bug($this->dbconn);
 
+     $this->order = "reverse";
+     if( isset($_GET['order']) && $_GET['order'] == "chrono" )
+       $this->order = $_GET['order'];
+
      if ( isset($_GET['id']) ) {
        $this->obj->read($_GET['id']);
        $this->obj->read_bughistory();
-     } else {
+
+       $this->assign('bid', $_GET['id']);
+     }
+     else {
        $msg .= $lang['Err0048'] ."<br>";
        $this->stop = true;
      }
      if ( ! $this->obj->see_ok() ) {
        $msg .= sprintf($lang['Err0022'],$lang[$this->obj->getType()]);
        $this->stop = true;
-     } else if ( $this->obj->id < 0 ) {
+     }
+     else if ( $this->obj->id < 0 ) {
        $msg .= sprintf($lang['Err0040'],$lang[$this->obj->getType()]);
        $this->stop = true;
-     } else {
+     }
+     else {
        $this->name .=": ". $this->obj->getFullName();
      }
 

Index: fr.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/fr.p3,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- fr.p3	29 Oct 2003 08:58:13 -0000	1.1
+++ fr.p3	30 Nov 2004 18:26:34 -0000	1.1.2.1
@@ -22,8 +22,8 @@
 $lang['BugClass']        = "Type";
 $lang['BugShort']        = "Description";
 $lang['BugLong']         = "Détail";
-$lang['BugCreator']      = "Crée par";
-$lang['BugCreation']     = "Crée par %s sur %s";
+$lang['BugCreator']      = "Créé par";
+$lang['BugCreation']     = "Créé par %s sur %s";
 $lang['BugProduct']      = "Produit/Projet";
 $lang['BugReference']    = "Réferent";
 $lang['BugSolvedBy']     = "Résolu par";

Index: migration.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/Attic/migration.php,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- migration.php	20 Oct 2004 10:10:00 -0000	1.1.2.6
+++ migration.php	30 Nov 2004 18:26:34 -0000	1.1.2.7
@@ -26,21 +26,86 @@
 loadmodule("bugtracking");
 
 /**
- * As the SQL shema changes, we will create the new tables,
- * incorporate in there the data, then drop old tables and rename temp
- * ones.
+ * Migration plan : 
+ *  1. extend the timetrack table to provide TEXT description
+ *  2. rename existing bug and bugchanges tables
+ *  3. drop constraints on bugs and bugchanges tables (or rename them)
+ *  4. create new bug and bugchanges tables (with the new scheme)
+ *  5. read and parse old bugs data
+ *  6. write old data in new format in new tables
+ *
+ * The function create_temp_tables will do the points 2 and 3.
+ *
+ * ATTENTION:
+ *  . the first point has to be done manually !
+ *  . if you don't run postgresql, the 3rd point has also to be done manually
+ *
+ * Here's the PostgreSQL scenario to handle the change:
+ *
+ * > alter table timetrack add column new_desc text;
+ * > update timetrack set new_desc = description::text;
+ * > alter table timetrack drop description;
+ * > alter table timetrack rename new_desc to description;
+ *
+ * If you now how to handle the case with TUTOS database object,
+ * please contribute to this code for it to handle this update too.
+ *
+ * The script won't delete the old tables, letting the oportunity to
+ * TUTOS admin to check data or cancel the migration.
  */ 
 function create_temp_tables(&$dbconn) {
-  global $tutos, $table;
+  global $tutos, $table, $tableidx;
 
-  $bugs = $table['bug'];
-  $bugs['name'] = 'tmp_bugs';
+  $nb_errors = 0;
 
+  /**
+   * The pg_db.pinc renametable requires the old table definition to
+   * be passed in as a reference. As we obviously can't provide that,
+   * and it only uses $table['name'], we create then pass in an array.
+   *
+   * Don't forget to drop the constraints if any
+   */
+  $bugs_array = array(name => 'bugs');
+  $bugc_array = array(name => 'bugchanges');
+
+  // drop constraints if postgresql is used
+  if( $dbconn->openfunc == "pg_pconnect" ) {
+    $sql = array("alter table bugs drop constraint bugs_pkey",
+		 "alter table bugchanges drop constraint bugchanges_pkey");
+
+    foreach( $sql as $q )
+      $dbconn->exec($q, 1);
+  }
+
+  if( $dbconn->renametable($bugs_array, 'old_bugs') == -1 ) {
+    $nb_errors++;
+    echo "<tt>".$dbconn->lasterror."</tt><br>\n";
+  }
+
+  if( $dbconn->renametable($bugc_array, 'old_bugchanges') == -1 ) {
+    $nb_errors++;
+    echo "<tt>".$dbconn->lasterror."</tt><br>\n";
+  }
+
+  $bugs = $table['bug'];
   $bugchanges = $table['bug3'];
-  $bugchanges['name'] = 'tmp_bugchanges';
 
-  $dbconn->createtable($bugs);
-  $dbconn->createtable($bugchanges);
+  /*
+  echo "<pre>"; print_r($bugs); echo "</pre><br>\n";
+  echo "<pre>"; print_r($bugchanges); echo "</pre><br>\n";
+  */
+
+  if( $dbconn->createtable($bugs) == -1 ) {
+    $nb_errors++;
+    echo "<tt>".$dbconn->lasterror."</tt><br>\n";
+  }
+
+  if( $dbconn->createtable($bugchanges) == -1 ) {
+    $nb_errors++;
+    echo "<tt>".$dbconn->lasterror."</tt><br>\n";
+  }
+
+  return $nb_errors == 0;
 }
 
 /**
@@ -58,21 +123,28 @@
     $path     = getcwd();
 
     if( $debug )
-      echo 'find_label '.$path;
+      echo 'find_label <tt>'.$path."</tt><br>\n";
 
     if ($handle = opendir($path)) {
       while (false !== ($file = readdir($handle))) { 
 	if( preg_match("/^([a-z]{2}(?:-[a-z]*)?)\.p3$/", $file, $matches)  ) {
 	  if( $debug )
-	    echo $file." ".$matches[1]."<br>\n";
+	    echo $matches[1].": <tt>".$file."</tt><br>\n";
 
 	  $country = $matches[1];
-	  include_once($path."/".$file);
+	  // If you use include_once here, you won't get the current
+	  // user lang
+	  include($path."/".$file);
 
 	  $bug_i18n[$country] = array();
 	  $bug_i18n[$country]['BugStates']  = $lang['BugStates'];
 	  $bug_i18n[$country]['BugClasses'] = $lang['BugClasses'];
 
+	  $bug_i18n[$country]['BugState'] = $lang['BugState'];
+	  $bug_i18n[$country]['BugClass'] = $lang['BugClass'];
+	  $bug_i18n[$country]['BugAssignedTo'] = $lang['BugAssignedTo'];
+	  $bug_i18n[$country]['BugShort'] = $lang['BugShort'];
+
 	  unset($lang);
 	}
       }
@@ -86,6 +158,35 @@
 }
 
 /**
+ * Given a name or an id, find the address in the data base and return
+ * the associated TUTOS object.
+ */
+function getAddress(&$dbconn, $name) {
+  global $current_user;
+
+  if( is_numeric($name) ) {
+    $solver = getObject($dbconn, $name);
+  }
+  else {
+    /**
+     * Firsts name with accentuated letters make TUTOS
+     * webelements check_field function unable to find users.
+     *
+     * So we only take last name (in caps)...
+     */
+    $n = explode(" ", $name);
+    $solver = check_field($n[1], "solver", "solver", "at");
+  }
+  
+  if( ! is_object($solver) ) {
+    echo "TUTOS could not find user ".$name."<br>\n";
+    $solver = $current_user;
+  }
+
+  return $solver;
+}
+
+/**
  * Given the oject property name, returns the $lang field name
  */
 function getFieldName($field) {
@@ -98,6 +199,7 @@
     return $field;
 }
 
+
 /**
  * Find out the property value in the translated strings,
  * starting with current $lang of course...
@@ -128,17 +230,44 @@
  * And we have to find the modified column
  */
 function parse_field($field, $old, $new) {
-  $properties = array('State'            => 'state',
-		      'Class'            => 'class',
-		      'Solver'           => 'solver',
-		      'shortDescription' => 'short');
-  
-  if( array_key_exists($field, $properties) ) {
-    $oldv = find_label($properties[$field], $old);
-    $newv = find_label($properties[$field], $new);
+  /**
+   * Attention: we have to check i18n here
+   *
+   * We don't look in current (global) $lang, cause the translated
+   * string we have as the field name ($field) could be found
+   * associated with a non bug related key, as ProdState for example.
+   */
+  $bug_i18n = read_i18n(False);
+  $known_fields = array('BugState'      => 'state',
+			'BugClass'      => 'class',
+			'BugAssignedTo' => 'solver',
+			'BugShort'      => 'short');
+
+  // default value is given one
+  $real_field = $field;
+
+  /**
+   * We have to manage an hard-coded situation, where in old bugs you
+   * may find a 'Solver changed ...' sentence. The 'Solver' entry seems
+   * to have been hard-coded then, I can't find it in any translation
+   * file.
+   */
+  if( $field == "Solver" )
+    $real_field = 'solver';
+  else
+    foreach( $bug_i18n as $lg )
+      if( ($f = array_search($field, $lg)) !== False ) {
+	$real_field = $known_fields[$f];
+	break;
+      }
+
+  if( $real_field != $field ) {
+    $oldv = find_label($real_field, $old);
+    $newv = find_label($real_field, $new);
 
-    return array($properties[$field], $oldv, $newv);
+    return array($real_field, $oldv, $newv);
   }
+  echo 'parse_field FAILED on '.$field."<br>\n";
   return array($field, $old, $new);
 }
 
@@ -374,7 +503,7 @@
  * bugs. In the case of migration, those tables will be renamed at the
  * access time.
  */
-function parse_all_bugs($dbconn,
+function parse_all_bugs(&$dbconn,
 			$t_bugs = "bugs", $t_bugchanges = "bugchanges")
 {
   $q = "SELECT * FROM ".$t_bugs;
@@ -395,8 +524,8 @@
 		 'short'       => $r->get($a, 'short'),
 		 'description' => $desc,
 		 'product_id'  => $r->get($a, 'product_id'),
-		 'class'       => $lang['BugClasses'][$r->get($a, 'class')],
-		 'state'       => $lang['BugStates'][$r->get($a, 'state')],
+		 'class'       => $r->get($a, 'class'),
+		 'state'       => $r->get($a, 'state'),
 		 'solver'      => $r->get($a, 'solver'),
 		 'solvedate'   => $r->get($a, 'solvedate'),
 		 'creator'     => $r->get($a, 'creator'),
@@ -437,11 +566,13 @@
 	$desc = $rh->get($h, 'description');
 	$changeset = parse_bug_history($desc);
 
+	$date = new DateTime($rh->get($h, 'creation'));
+
 	$hist[] = array('id'          => $rh->get($h, 'id'),
 			'bugid'       => $rh->get($h, 'bugid'),
 			'description' => $desc,
 			'creator'     => $rh->get($h, 'creator'),
-			'creation'    => $rh->get($h, 'creation'),
+			'creation'    => $date->getDateTime(),
 			'changeset'   => $changeset
 			);
       }
@@ -464,8 +595,12 @@
   function see() {
     global $tutos, $lang;
 
-    $bugs = parse_all_bugs($this->dbconn);
-    $n    = count($bugs);
+    if( $this->old )
+      $bugs = parse_all_bugs($this->dbconn, "old_bugs", "old_bugchanges");
+    else
+      $bugs = parse_all_bugs($this->dbconn);
+
+    $n = count($bugs);
 
     $display_bugs = array();
 
@@ -499,6 +634,12 @@
     $i18n_fields  = array('state', 'class');
 
     for(; $a < $n && $a < $end; $a++ ) {
+      /**
+       * State and class i18n management
+       */ 
+      $bugs[$a]['class'] = $lang['BugClasses'][$bugs[$a]['class']];
+      $bugs[$a]['state'] = $lang['BugStates'][$bugs[$a]['state']];
+
       $bug  = $bugs[$a];
       $hist = $bug['hist'];
 
@@ -543,7 +684,172 @@
    * using new code for that.
    */
   function migrate() {
-    echo "not implemented yet";
+    global $current_user;
+
+    if( $this->scheme ) {
+      echo 'creating new tables sheme...'."<br>\n";
+
+      // First create the new table
+      if( ! create_temp_tables($this->dbconn) ) {
+	$this->error("Please correct above errors!");
+	return;
+      }
+    }
+    else
+      echo "ok, won't care about scheme"."<br>\n";
+
+    echo 'importing and parsing old bugs...'."<br>\n";
+    // Then get the bugs in old tables
+    $bugs = parse_all_bugs($this->dbconn, "old_bugs", "old_bugchanges");
+    
+    foreach( $bugs as $b ) {
+      $bug = new bug($this->dbconn);
+
+      // This will generate a LOT of output
+      $this->debug($b);
+
+      $solvedate = $b['solvedate'];
+      $creator   = getAddress($this->dbconn, $b['creator']);
+      echo 'creator: '.$creator->getFullName()." (".$b['creator'].")<br>\n";
+
+      $bug->id        = -1;
+      $bug->name      = $b['name'];
+      $bug->parent    = getObject($this->dbconn, $b['product_id']);
+      $bug->short     = $b['short'];
+      $bug->creator   = $creator;
+      $bug->creation  = new DateTime($b['creation']);
+
+      // Don't overwrite default solvedate if none is given
+      if( $solvedate != "" ) $bug->solvedate = new DateTime($solvedate);
+
+      $bug->state     = $b['state'];
+      $bug->class     = $b['class'];
+      $bug->solver    = getAddress($this->dbconn, $b['solver']);
+      $bug->save();
+
+      echo 'bug '.$b['id'].' -> '.$bug->id.'...'."<br>\n";
+      echo 'at '.
+	$bug->creation->getDateTime().' ['.$b['creation']." ]<br>\n";
+
+      $n = count($b['hist']);
+
+      /**
+       * Initial state, class and solver of a bug are to be found on
+       * the first changeset, or are the default ones (and have never
+       * been changed).
+       *
+       * So we have to run a first loop over history to find initial
+       * values.
+       */
+      $i_state  = -1;
+      $i_class  = -1;
+      $i_solver = "";
+
+      foreach( $b['hist'] as $hist ) {
+	if( $i_state == -1 && isset($hist['changeset']['state']) )
+	  $i_state = $hist['changeset']['state'][0];
+
+	if( $i_class == -1 && isset($hist['changeset']['class']) )
+	  $i_class = $hist['changeset']['class'][0];
+
+	if( $i_solver == "" && isset($hist['changeset']['solver']) )
+	  $i_solver = getAddress($this->dbconn,
+				 $hist['changeset']['solver'][0]);
+      }
+
+      /**
+       * If no change has been encountered, then the initial values
+       * are the same as the final ones, to be found in the bug
+       * definition...
+       */
+      if( $i_state  == -1 )  $i_state  = $bug->state;
+      if( $i_class  == -1 )  $i_class  = $bug->class;
+      if( $i_solver == "" )  $i_solver = $bug->solver;
+
+      /**
+       * After reading all the bug history entries, we are able to set
+       * the right state and class elements.
+       *
+       * And we have to create the first history entry, which is
+       * contains partly in bug itself and partly recomposed upon
+       * analysis.
+       */
+      $h = new bugdata($this->dbconn);
+      $h->bugid       = $bug->id;
+      $h->creator     = $bug->creator;
+      $h->creation    = $bug->creation;
+      $h->state       = $i_state;
+      $h->class       = $i_class;
+      $h->solver      = $i_solver;
+      $h->description = html_entity_decode($b['description'],
+					   ENT_QUOTES, 'ISO8859-15');
+
+      $h->save();
+      echo "initial bughistory element ".$h->id." [".$h->bugid."]<br>\n";
+      echo 'at '.$h->creation->getDateTime().' ['.$b['creation']." ]<br>\n";
+
+      // Prepare the previous element
+      $previous = $h;
+
+      /**
+       * In this loop, we create the bug history elements, which are
+       * to be found as rows in the bugchanges table, with links to
+       * timetracks elements (description, solver).
+       */
+      for($i = 0; $i < $n; $i++) {
+	$hist = &$b['hist'][$i];
+
+	$h = new bugdata($this->dbconn);
+	if( $hist['id'] != '?' )
+	  $h->id     = $hist['id'];
+	$h->bugid    = $bug->id;
+
+	// get creator
+	$creator = getAddress($this->dbconn, $hist['creator']);
+	$h->creator = $creator;
+	echo 'creator: '.$creator->id." ".$creator->getFullName()."<br>\n";
+
+	/**
+	 * We read the new class, state and solver from the changeset,
+	 * which contains an array of (old, new) values.
+	 *
+	 * When the value has not been changed, copy previous one.
+	 */
+	if( isset($hist['changeset']['state']) )
+	  $h->state  = $hist['changeset']['state'][1];
+	else
+	  $h->state = $previous->state;
+
+	if( isset($hist['changeset']['class']) )
+	  $h->class  = $hist['changeset']['class'][1];
+	else
+	  $h->class = $previous->class;
+
+	if( isset($hist['changeset']['solver']) ) {
+	  $solver = getAddress($this->dbconn, $hist['changeset']['solver'][1]);
+	  echo 'solver : '.$solver->id." ".$solver->getFullName()."<br>\n";
+	  $h->solver = $solver;
+	}
+	else
+	  $h->solver = $previous->solver;
+
+	// And we get creation time and description
+	$h->creation = new DateTime($hist['creation']);
+	$h->description =
+	   html_entity_decode($hist['changeset']['description'],
+			      ENT_QUOTES, 'ISO8859-15');
+
+	$h->save();
+	echo "new bughistory element ".$h->id." [".$h->bugid."]<br>\n";
+	echo
+	  'at '.$h->creation->getDateTime().' ['.$hist['creation']." ]<br>\n";
+
+	$previous = $h;
+	unset($h);
+      }
+      unset($h);
+      echo "<hr>\n";
+    }
   }
 
   function info() {
@@ -552,6 +858,22 @@
       $this->migrate();
       break;
 
+    case "test_parse_field":
+      {
+	$a = parse_field('Assigné a', 'toto', 'titi');
+	$b = parse_field('État', 'OUVERT', 'FERMÉ');
+	$c = parse_field('Type', 'Léger', 'Grave');
+	$d = parse_field('Solver', 'toto', 'titi');
+	$e = parse_field('Assigned to', 'toto', 'titi');
+	
+	echo "<pre>"; print_r($a); echo "</pre><br>\n";
+	echo "<pre>"; print_r($b); echo "</pre><br>\n";
+	echo "<pre>"; print_r($c); echo "</pre><br>\n";
+	echo "<pre>"; print_r($d); echo "</pre><br>\n";
+	echo "<pre>"; print_r($e); echo "</pre><br>\n";
+	break; 
+      }
+
     default:
       $this->see();
       break;
@@ -563,8 +885,9 @@
   }
 
   function prepare() {
-    $actions = array("see", "migrate");
+    $actions = array("see", "migrate", "test_parse_field");
     $this->action = "see";
+    $this->old    = false;
 
     if( isset($_GET['action']) && $_GET['action'] != "" )
       if( in_array($_GET['action'], $actions) ) {
@@ -574,13 +897,21 @@
 
     $this->assign('actions', $actions);
 
+    if( isset($_GET['old']) && $_GET['old'] != "" && $_GET['old'] == 'yes' )
+      $this->old == true;
+
     if( isset($_GET['start']) && $_GET['start'] != "" )
       $this->start = $_GET['start'];
     else
       $this->start = 0;
 
+    if( isset($_GET['scheme']) && $_GET['scheme'] != "" )
+      $this->scheme = in_array($_GET['scheme'], array('1', 'yes'));
+    else
+      $this->scheme = True;
+
     foreach( $actions as $action ) {
-      $x = array('url'   => "bugtracking/migrate.php?action=".$action,
+      $x = array('url'   => "bugtracking/migration.php?action=".$action,
 		 'text'  => $action,
 		 'info'  => $action,
 		 'image' => 'bugs',

Update of /cvsroot/tutos/tutos/templates/classic/bugtracking
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23859/templates/classic/bugtracking

Modified Files:
      Tag: BRANCH-2-0
	bug_overview.tpl bug_show.tpl 
Log Message:
* The migration script is now complete, the only lasting bug seems
  to be with solvedate management...
* The bug management module code is being adapted to new model
  bug_show links to timetrack entry, for instance
  bug_show allow for history re-ordering

For TUTOS2 users who may read this, please test the migration script
written here, and if possible debug it too ;)
It should work well even in multi languages environment... let me know
if it can't handle your data.

Or course, we don't plan to support old bugtracking module in TUTOS 2.
A mail will be sent on tutos-devel as soon as the whole module is ready
for public use!


Index: bug_overview.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/bugtracking/Attic/bug_overview.tpl,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- bug_overview.tpl	30 Sep 2004 17:09:34 -0000	1.1.2.10
+++ bug_overview.tpl	30 Nov 2004 18:26:35 -0000	1.1.2.11
@@ -56,7 +56,9 @@
 {section name=b loop=$bugs}
 <tr>
  <td class="data">
-  <a href="{$bugs[b].link}" title="{$bugs[b].title}">{$bugs[b].name}</a>
+  <a href="{$base}/php/{$bugs[b].link}" title="{$bugs[b].title}">
+   {$bugs[b].name}
+  </a>
  </td>
 
  <td class="data">{$bugs[b].creation}</td>
@@ -64,7 +66,7 @@
 
  {if $search.pid == "" }
  <td style="white-space: nowrap;">
-   <a href="{$bugs[b].parent.link}"
+   <a href="{$base}/php/{$bugs[b].parent.link}"
      title="{$bugs[b].parent.title}">{$bugs[b].parent.label}</a></td>
  {/if}
 
@@ -73,10 +75,10 @@
  <td class="data">{$bugs[b].state}</td>
 
  <td class="data">{$bugs[b].class}</td>
- <td><a href="{$bugs[b].creator.link}"
+ <td><a href="{$base}/php/{$bugs[b].creator.link}"
         title="{$bugs[b].creator.title}">{$bugs[b].creator.label}</a></td>
 
- <td><a href="{$bugs[b].solver.link}"
+ <td><a href="{$base}/php/{$bugs[b].solver.link}"
         title="{$bugs[b].solver.title}">{$bugs[b].solver.label}</a></td>
 
  <td align="center">

Index: bug_show.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/bugtracking/Attic/bug_show.tpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- bug_show.tpl	11 May 2004 13:43:44 -0000	1.1.2.3
+++ bug_show.tpl	30 Nov 2004 18:26:35 -0000	1.1.2.4
@@ -3,7 +3,7 @@
 
 <!-- bug_show start -->
 
-<table class="single">
+<table class="summary">
 <thead>
 <tr>
  <th colspan="4"><img src="{$base}/html/classic/bugs.png">{$title}</th>
@@ -23,7 +23,7 @@
 
 <tr>
 <td class="desc" valign="top">{$id.label}</td>
-<td colspan="3" class="data">{$id.value}</td>
+<td colspan="3" class="data" style="text-align: left;">{$id.value}</td>
 </tr>
 
 <tr>
@@ -43,9 +43,9 @@
 <tr>
 <td class="desc" valign="top">{$parent.label}</td>
 {if $parent.link == ""}
-<td class="data">{$parent.value}</td>
+<td style="text-align: left;" colspan="3" class="data">{$parent.value}</td>
 {else}
-<td class="data">
+<td style="text-align: left;" colspan="3" class="data">
   <a href="{$parent.link}" title="{$parent.title}">{$parent.value}</a>
 </td>
 {/if}
@@ -53,15 +53,18 @@
 
 <tr>
 <td class="desc" valign="top">{$state.label}</td>
-<td class="data">{$state.value}</td>
+<td class="data">
+  <span class="bugstate{$state.value.label}">{$state.value.value}</span>
+</td>
 
 <td class="desc" valign="top">{$class.label}</td>
-<td class="data">{$class.value}</td>
+<td class="data">
+  <span class="bugclass{$class.value.label}">{$class.value.value}</span>
 </tr>
 
 <tr>
 <td class="desc" valign="top">{$desc.label}</td>
-<td colspan="3" class="data">{$desc.value}</td>
+<td colspan="3" class="data" style="text-align: left;">{$desc.value}</td>
 </tr>
 
 {if $timetrack != ""}
@@ -72,17 +75,104 @@
 </td>
 </tr>
 {/if}
+</td>
+</tr>
 
+</tbody>
+</table>
+
+<table class="overview">
+<thead>
+ <tr>
+  <th colspan="2" align="center">
+   <a href="?id={$bid}&order=chrono"><img src="{$base}/html/classic/down.png"></a>
+    {$history.label}
+  <a href="?id={$bid}&order=reverse"><img src="{$base}/html/classic/up.png"></a>
+  </th>
+ </tr>
+ <tr>
+  <th>{$Date}&nbsp;/ {$BugCreator}</th>
+  <th>Changes</th>
+ </tr>
+</thead>
+
+<tbody>
+{foreach from=$history.value item=h}
 <tr>
-<td class="desc" valign="top">{$history.label}</td>
-<td class="pre" colspan="3">
+
+<td valign="top">
+<table>
+ <tr>
+  <td class="data">{$h.creation}</td>
+ </tr>
+ <tr>
+  <td class="data">
+    <a href="{$base}/php/{$h.creator.link}"
+      title="{$h.creator.title}">{$h.creator.label}</a>
+  </td>
+ </tr>
+ <tr>
+  <td class="data">
+    <a href="{$base}/php/{$h.tt.link}"
+      title="{$h.tt.title}">{$h.tt.label}</a>
+  </td>
+ </tr>
+</table>
+</td>
+
+<td valign="top">
+ {if $h.diff != "null"}
+  <table cellspacing="5" cellpadding="5">
+  <tbody>
+    {if $h.diff.state != ""}
+    <tr>
+      <td class="desc">{$BugState}</td>
+      <td>
+       <span class="bugstate{$h.diff.state.value}">{$h.diff.state.label}</span>
+      </td>
+      <td>
+       <span class="bugstate{$h.state.value}">{$h.state.label}</span>
+      </td>
+    </tr>
+    {/if}
+
+    {if $h.diff.class != ""} 
+    <tr>
+      <td class="desc">{$BugClass}</td>
+      <td>
+       <span class="bugclass{$h.diff.class.value}">{$h.diff.class.label}</span>
+      </td>
+      <td>
+       <span class="bugclass{$h.class.value}">{$h.class.label}</span>
+      </td>
+    </tr>
+    {/if}
+
+    {if $h.diff.solver != ""}
+    <tr>
+      <td class="desc">{$BugAssignedTo}</td>
+      <td class="data">
+       <a href="{$base}/php/{$h.diff.solver.link}"
+         title="{$h.diff.solver.title}">{$h.diff.solver.label}</a>
+      </td>
+      <td class="data">
+       <a href="{$base}/php/{$h.solver.link}"
+         title="{$h.solver.title}">{$h.solver.label}</a>
+      </td>
+    </tr>
+    {/if}
+  </tbody>
+  </table>
+ {/if}
 <pre>
-{$history.value}
+{$h.desc|wordwrap:80:"\n":true}
 </pre>
 </td>
+
 </tr>
-</tbody>
+{/foreach}
 
+</tbody>
 </table>
 
 <!-- bug_show stop -->
\ No newline at end of file

Update of /cvsroot/tutos/tutos/php/db
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23859/php/db

Modified Files:
      Tag: BRANCH-2-0
	db_pg.pinc 
Log Message:
* The migration script is now complete, the only lasting bug seems
  to be with solvedate management...
* The bug management module code is being adapted to new model
  bug_show links to timetrack entry, for instance
  bug_show allow for history re-ordering

For TUTOS2 users who may read this, please test the migration script
written here, and if possible debug it too ;)
It should work well even in multi languages environment... let me know
if it can't handle your data.

Or course, we don't plan to support old bugtracking module in TUTOS 2.
A mail will be sent on tutos-devel as soon as the whole module is ready
for public use!


Index: db_pg.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/db_pg.pinc,v
retrieving revision 1.27.2.1
retrieving revision 1.27.2.2
diff -u -r1.27.2.1 -r1.27.2.2
--- db_pg.pinc	14 Apr 2004 17:39:18 -0000	1.27.2.1
+++ db_pg.pinc	30 Nov 2004 18:26:34 -0000	1.27.2.2
@@ -475,7 +475,7 @@
    */
   function dropindex(&$idx) {
     $q = "DROP INDEX ". $this->prefix . $idx[name] ;
-    return $this->exec($q,0);    
+    return $this->exec($q,1);    
   }
   /**
    * tbl = array with table description

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31606

Modified Files:
	config_default.pinc 
Log Message:
l10n for CZE environment


Index: config_default.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/config_default.pinc,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- config_default.pinc	8 Nov 2004 20:29:04 -0000	1.93
+++ config_default.pinc	27 Nov 2004 10:24:05 -0000	1.94
@@ -451,20 +451,23 @@
 #
 # Currencies we know (first one will be default)
 # (4 Characters)
-# Here you can add whatever you want (default is the first one)
+# Here you can add whatever you want (default is the first one, sorted by
+# importance and alphabet)
+# You can find ISO currency code list at http://www.xe.com/iso4217.htm
 #
 $tutos[currencies] = array();
 $tutos[currencies][] = "EUR";
-$tutos[currencies][] = "DM";
 $tutos[currencies][] = "US$";
-$tutos[currencies][] = "Lit";
 $tutos[currencies][] = "AUS$";
-$tutos[currencies][] = "£";
+$tutos[currencies][] = "CHF";
+$tutos[currencies][] = "CZK";
+$tutos[currencies][] = "DM";
 $tutos[currencies][] = "FF";
-$tutos[currencies][] = "YEN";
 $tutos[currencies][] = "HK$"; 
-$tutos[currencies][] = "CHF"; 
 $tutos[currencies][] = "IRR"; 
+$tutos[currencies][] = "Lit";
+$tutos[currencies][] = "£";
+$tutos[currencies][] = "YEN";
 #
 # Sequence of (possible) fields in product overview.
 # (First field will appear in first column)
@@ -536,6 +539,7 @@
 $tutos[timezones][] = "Europe/London";
 $tutos[timezones][] = "Europe/Berlin";
 $tutos[timezones][] = "Europe/Warsaw";
+$tutos[timezones][] = "Europe/Prague";
 $tutos[timezones][] = "Europe/Rome";
 $tutos[timezones][] = "Europe/Paris";
 $tutos[timezones][] = "Europe/Moscow";

Update of /cvsroot/tutos/tutos/php/rate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8044

Modified Files:
      Tag: BRANCH-1-2
	cs.p3 
Log Message:
changes in translation


Index: cs.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/rate/cs.p3,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- cs.p3	16 Mar 2004 11:26:20 -0000	1.1
+++ cs.p3	26 Nov 2004 12:59:44 -0000	1.1.2.1
@@ -8,39 +8,41 @@
 # using the same format like here
 # =======================================================
 
+# Czech Texts for this module ('rate')
+
 # Rates
-$lang['Rate']               = "Rate";
-$lang['Rates']              = "Rates";
-$lang['RateCreate']         = "Create a rate";
-$lang['RateCreateInfo']     = "Create a new rate for %s";
-$lang['RateDelete']         = "Delete this rate";
-$lang['RateDelInfo']        = "Delete rate %s";
-$lang['RateDescription']    = "Description";
-$lang['RatePriority']       = "Priority";
-$lang['RateName']           = "Title";
-$lang['RateDetail']         = "Rate Display";
-$lang['RateInfo']           = "Display rate %s";
-$lang['RateOverview']       = "Rate Overview";
-$lang['RateCreation']       = "Rate Creation";
-$lang['RateMod']            = "Rate Modification";
-$lang['RateModInfo']        = "Modify rate %s";
+$lang['Rate']               = "Ocenìní";
+$lang['Rates']              = "Ocenìní";
+$lang['RateCreate']         = "Nové ocenìní";
+$lang['RateCreateInfo']     = "Nové ocenìní vázané k %s";
+$lang['RateDelete']         = "Odstraò hodnocení";
+$lang['RateDelInfo']        = "Odstraò hodnocení %s";
+$lang['RateDescription']    = "Popis";
+$lang['RatePriority']       = "Priorita";
+$lang['RateName']           = "Název";
+$lang['RateDetail']         = "Podrobnosti ocenìní";
+$lang['RateInfo']           = "Ocenìní %s";
+$lang['RateOverview']       = "Pøehled ocenìní";
+$lang['RateCreation']       = "Nové ocenìní";
+$lang['RateMod']            = "Úpravit ocenìní";
+$lang['RateModInfo']        = "Úpravit ocenìní %s";
 $lang['RateReference']      = "Reference";
-$lang['RateWorkerReference']= "True for:";
+$lang['RateWorkerReference']= "Platné pro";
 $lang['RateRole']           = "Role";
-$lang['RateVat']            = "VAT (%)";
-#$lang['ModOldRate']         = "Modify old rate";
-$lang['RateCreator']        = "created by";
-$lang['RateLinkInfo']       = "a rate from %s";
-$lang['RateSearch']         = "Rate Search";
-$lang['SearchForRate']      = "Search for a rate";
-$lang['SearchForRateExt']   = "extended Search for a rate";
-$lang['RateSelInfo']        = "(leave empty to see all rates)";
-#$lang['RateRefType']        = "Reference type";
-#$lang['RateRefName']        = "Reference name";
-#$lang['RateBetween']        = "created between";
-$lang['RatesOverview']      = "Rate Overview";
-#$lang['EmailRememberRate']  = "Remember: Rate: %s in TUTOS ";
+$lang['RateVat']            = "DPH (%)";
+#$lang['ModOldRate']        = "Upravit staré ohodnocení";
+$lang['RateCreator']        = "Vytvoøil";
+$lang['RateLinkInfo']       = "Ocenìno %s";
+$lang['RateSearch']         = "Ocenìní";
+$lang['SearchForRate']      = "Vyhledání ocenìní";
+$lang['SearchForRateExt']   = "Roz¹íøené vyhledávání ocenìní";
+$lang['RateSelInfo']        = "(nech prázdné pro zobrazení v¹ech ocenìní)";
+#$lang['RateRefType']       = "Typ reference:";
+#$lang['RateRefName']       = "Název reference";
+#$lang['RateBetween']       = "vytvoøeno mezi";
+$lang['RatesOverview']      = "Pøehled ocenìní";
+#$lang['EmailRememberRate'] = "Ocenìní %s v systému TUTOS";
 
-$lang['perm'][userates]     = "use rates";
+$lang['perm'][userates]     = "Pou¾ít správu ocenìní";
 $lang['rate']               = &$lang['Rate'];
 ?>

Update of /cvsroot/tutos/tutos/php/url
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8716

Modified Files:
      Tag: BRANCH-1-2
	cs.p3 
Log Message:
changes in translation


Index: cs.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/url/cs.p3,v
retrieving revision 1.4
retrieving revision 1.4.6.1
diff -u -r1.4 -r1.4.6.1
--- cs.p3	26 Feb 2003 18:36:29 -0000	1.4
+++ cs.p3	26 Nov 2004 13:02:10 -0000	1.4.6.1
@@ -8,18 +8,20 @@
 # using the same format like here
 # =======================================================
 
+# Czech texts for 'url' module
+
 # URL
 $lang['URLName']         = "Popis";
-$lang['URL']             = "URL";
-$lang['URLAdd']          = "Pøidat URL";
-$lang['URLDel']          = "Zru¹it URL link";
-$lang['URLMod']          = "modify URL";
-$lang['URLCreate']       = "create URL";
-$lang['URLOverview']     = "URL Overview";
-$lang['URLSearch']       = "URL Search";
-$lang['SearchForURL']    = "Search for URL";
+$lang['URL']             = "URL odkaz";
+$lang['URLAdd']          = "Nový URL odkaz";
+$lang['URLDel']          = "Odstranit URL odkaz";
+$lang['URLMod']          = "Upravit URL odkaz";
+$lang['URLCreate']       = "Nový URL odkaz";
+$lang['URLOverview']     = "Pøehled URL odkazù";
+$lang['URLSearch']       = "URL odkazy";
+$lang['SearchForURL']    = "Vyhledání URL odkazu";
 
-$lang['perm'][useurl]            = "pou¾ít databázi URL";
+$lang['perm'][useurl]    = "Pou¾ít správu URL odkazù";
 $lang['url'] = &$lang['URL'];
 
 ### Local Variables: ***

Update of /cvsroot/tutos/tutos/php/watchlist
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8789

Modified Files:
      Tag: BRANCH-1-2
	cs.p3 
Log Message:
changes in translation


Index: cs.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/watchlist/cs.p3,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -u -r1.5 -r1.5.4.1
--- cs.p3	3 May 2003 10:58:51 -0000	1.5
+++ cs.p3	26 Nov 2004 13:02:30 -0000	1.5.4.1
@@ -14,19 +14,19 @@
 
 # WatchList
 $lang['WatchAdd']          = "Pøidat do seznamu sledovaných cílù";
-$lang['WatchAddI']         = "Pøidat %s do tvého seznamu sledovaných cílù";
-$lang['WatchDel']          = "Smazat ze seznamu sledovaných cílù";
-$lang['WatchDelI']         = "Smazat %s ze seznamu sledovaných cílù";
-$lang['WatchOverview']     = "Sledované cíle";
+$lang['WatchAddI']         = "Pøidat %s do svého seznamu sledovaných cílù";
+$lang['WatchDel']          = "Odstranit ze seznamu sledovaných cílù";
+$lang['WatchDelI']         = "Odstranit %s ze seznamu sledovaných cílù";
+$lang['WatchOverview']     = "Pøehled sledovaných cílù";
 $lang['WatchOverviewI']    = "Zobrazit seznam sledovaných cílù pro %s";
 $lang['Watcher']           = "Pozorovatel";
-$lang['WatchLastCall']     = "last call";
-$lang['WatchMail']         = "Mail to Observers";
+$lang['WatchLastCall']     = "Poslední kontrola";
+$lang['WatchMail']         = "Poslat e-mail pozorovatelùm";
 
 #Email Subject Lines
-$lang['EmailChanged']      = "sledovaný cíl %s byl zmìnìn";
-$lang['EmailDeleted']      = "sledovaný cíl %s byl smazán";
-$lang['EmailBirthday']     = "Birthday Reminder for %s";
+$lang['EmailChanged']      = "Sledovaný cíl %s byl upraven";
+$lang['EmailDeleted']      = "Sledovaný cíl %s byl odstranìn";
+$lang['EmailBirthday']     = "Narozeninová upomínka: %s";
 
-$lang['perm'][usewatchlist]      = "pou¾ít sledované cíle";
+$lang['perm'][usewatchlist]= "Pou¾ít správu sledovaných cílù";
 ?>

Update of /cvsroot/tutos/tutos/php/xml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8991

Added Files:
      Tag: BRANCH-1-2
	cs.p3 
Log Message:
new translation


--- NEW FILE: cs.p3 ---
<?php
# $Id: cs.p3,v 1.1.2.1 2004/11/26 13:03:15 martinslouf Exp $
#
# ========================= NOTE ========================
# Please put site specific extensions and changes
# to TUTOS language files in a file called "en_custom.p3"
# or "lang_custom.p3" (for all languages)
# using the same format like here
# =======================================================

# XML
$lang['XMLimport']          = "XML import";
$lang['XMLFile']            = "XML soubor";
$lang['XMLUrl']             = "XML URL odkaz";
$lang['XMLData']            = "XML data";
$lang['XMLoutput']          = "Výstup posledního importu";
$lang['XMLtestonly']        = "Pouze test (neukládej do databáze)";
$lang['XMLanswer']          = "Vra» pouze XML";
$lang['perm'][usexmlimport] = "Pou¾ít XML import";
?>

Update of /cvsroot/tutos/tutos/php/reminder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8585

Added Files:
      Tag: BRANCH-1-2
	cs.p3 
Log Message:
new translation


--- NEW FILE: cs.p3 ---
<?php
# $Id: cs.p3,v 1.1.2.1 2004/11/26 13:01:49 martinslouf Exp $
#
# ========================= NOTE ========================
# Please put site specific extensions and changes
# to TUTOS language files in a file called "en_custom.p3"
# or "lang_custom.p3" (for all languages)
# using the same format like here
# =======================================================
#

# Czech Texts for 'reminder' module

# Reminder
$lang['Reminder']          = "Pøipomenutí";
$lang['Reminders']         = "Pøipomenutí";
$lang['ReminderShow']      = "Zobraz pøipomenutí";
$lang['ReminderShowI']     = "Zobraz pøipomenutí %s";
$lang['ReminderSearch']    = "Pøipomenutí";
$lang['ReminderOverview']  = "Pøehled pøipomenutí";
$lang['ReminderCreate']    = "Nové pøipomenutí";
$lang['ReminderCreateI']   = "Nové pøipomenutí vázané k %s";
$lang['ReminderModify']    = "Upravit pøipomenutí";
$lang['ReminderModI']      = "Upravit pøipomenutí %s";
$lang['ReminderDeleteI']   = "Odstranit pøipomenutí %s";
$lang['ReminderDetail']    = "Podrobnosti pøipomenutí";
$lang['ReminderReference'] = "Reference";
$lang['ReminderDesc']      = "Popis";
$lang['ReminderTo']        = "Pro koho";
$lang['ReminderAt']        = "Kdy";
$lang['ReminderDate']      = "Konkrétní datum";
$lang['ReminderEvent']     = "Událost";
$lang['ReminderUseMail']   = "Pøipomenout emailem";
$lang['ReminderType']      = "Typ pøipomnutí";
$lang['ReminderOffset']    = "Offset";
$lang['ReminderRepeat']    = "Opakování";
$lang['ReminderRepeatI']   = "(po prvním pøipomenutí)";
$lang['ReminderInHours']   = "(za %s hodin)";
$lang['ReminderAgoHours']  = "(pøed %s hodinami)";

#Email Subject Lines
$lang['EmailReminder']     = "Pøipomenutí: %s";

$lang['Reminder_Err001']   = "Vybraná událost nemù¾e být pøipomenuta s %s %s";

$lang['reminder']          = &$lang['Reminder'];
$lang['perm'][usereminder] = "Pou¾ít spávu pøipomenutí";
?>

Update of /cvsroot/tutos/tutos/php/resource
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8473

Modified Files:
      Tag: BRANCH-1-2
	cs.p3 
Log Message:
changes in translation


Index: cs.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/resource/cs.p3,v
retrieving revision 1.6
retrieving revision 1.6.6.1
diff -u -r1.6 -r1.6.6.1
--- cs.p3	28 Feb 2003 09:17:19 -0000	1.6
+++ cs.p3	26 Nov 2004 13:01:18 -0000	1.6.6.1
@@ -11,18 +11,18 @@
 # Resource
 $lang['Resource']          = "Zdroje";
 $lang['Resources']         = "Zdroje";
-$lang['ResDetail']         = "Podrobnosti zdrojù";
-$lang['ResCreate']         = "Vytvoøit zdroj";
+$lang['ResDetail']         = "Podrobnosti zdroje";
+$lang['ResCreate']         = "Nový zdroj";
 $lang['ResModify']         = "Upravit zdroj";
 $lang['ResModifyI']        = "Upravit zdroj %s";
 $lang['ResName']           = "Název";
 $lang['ResDesc']           = "Popis";
 $lang['ResShow']           = "Zobrazit zdroj %s";
-$lang['ResUsage']          = "Vyu¾ití zdroje";
-$lang['ResOverview']       = "Pøehled zdrojù";
-$lang['ResDelI']           = "zru¹it zdroje %s";
-$lang['ResConflict']       = "%s using %s conflict with %s";
+$lang['ResUsage']          = "Zobrazit vyu¾ití zdroje";
+$lang['ResOverview']       = "Zdroje";
+$lang['ResDelI']           = "Odstranit zdroj %s";
+$lang['ResConflict']       = "%s vyu¾ívá %s, co¾ je v konfliktu s %s";
 
-$lang['perm'][useresource]       = "pou¾ít zdroje";
-$lang['resource']    = &$lang['Resource'];
+$lang['perm'][useresource] = "Pou¾ít správu zdrojù";
+$lang['resource']          = &$lang['Resource'];
 ?>

Update of /cvsroot/tutos/tutos/php/note
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7864

Modified Files:
      Tag: BRANCH-1-2
	cs.p3 
Log Message:
changes in translation


Index: cs.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/cs.p3,v
retrieving revision 1.7
retrieving revision 1.7.6.1
diff -u -r1.7 -r1.7.6.1
--- cs.p3	4 Feb 2003 20:05:26 -0000	1.7
+++ cs.p3	26 Nov 2004 12:58:14 -0000	1.7.6.1
@@ -11,30 +11,30 @@
 # Notes
 $lang['Note']               = "Poznámka";
 $lang['Notes']              = "Poznámky";
-$lang['NoteCreate']         = "Vytvoøit poznámku";
-$lang['NoteCreateInfo']     = "Vytvoøit novou poznámku pro %s";
-$lang['NoteDelete']         = "Zru¹it poznámku";
+$lang['NoteCreate']         = "Nová poznámka";
+$lang['NoteCreateInfo']     = "Nová poznámka vázaná k %s";
+$lang['NoteDelete']         = "Odstranit poznámku";
 $lang['NoteDescription']    = "Popis";
-$lang['NoteRemember']       = "Pamatovat na:";
+$lang['NoteRemember']       = "Pøipomenout v";
 $lang['NoteName']           = "Titul";
 $lang['NoteDetail']         = "Podrobnosti poznámky";
-$lang['NoteOverview']       = "Pøehled poznámky";
-$lang['NoteCreation']       = "Vytvoøení poznámky";
+$lang['NoteOverview']       = "Pøehled poznámek";
+$lang['NoteCreation']       = "Nová poznámka";
 $lang['NoteMod']            = "Upravit poznámku";
-$lang['NoteReference']      = "Odkazy";
-$lang['ModOldNote']         = "Zmìnit starou poznámku";
-$lang['NoteCreator']        = "vytvoøil";
-$lang['NoteLinkInfo']       = "poznámka od %s";
-$lang['NoteSearch']         = "Vyhledání poznámky";
-$lang['SearchForNote']      = "Vyhledat poznámku";
-$lang['SearchForNoteExt']   = "Roz¹íøené vyhledání poznámky";
+$lang['NoteReference']      = "Reference";
+$lang['ModOldNote']         = "Upravit starou poznámku";
+$lang['NoteCreator']        = "Vytvoøil";
+$lang['NoteLinkInfo']       = "Poznámka od %s";
+$lang['NoteSearch']         = "Poznámky";
+$lang['SearchForNote']      = "Vyhledání poznámky";
+$lang['SearchForNoteExt']   = "Roz¹íøené vyhledávání poznámky";
 $lang['NoteSelInfo']        = "(nech prázdné pro zobrazení v¹ech poznámek)";
-$lang['NoteRefType']        = "Typ odkazu";
-$lang['NoteRefName']        = "Název odkazu";
-$lang['NoteBetween']        = "vytvoøeno mezi";
+$lang['NoteRefType']        = "Reference";
+$lang['NoteRefName']        = "Název reference";
+$lang['NoteBetween']        = "Vytvoøeno mezi";
 $lang['NotesOverview']      = "Pøehled poznámek";
-$lang['EmailRememberNote']  = "Pozor: Poznámka %s v systému TUTOS";
+$lang['EmailRememberNote']  = "Poznámka %s v systému TUTOS";
 
-$lang['perm'][usenotes]          = "pou¾ít poznámky";
-$lang['note']        = &$lang['Note'];
-?>
\ No newline at end of file
+$lang['perm'][usenotes]     = "Pou¾ít správu poznámek";
+$lang['note']               = &$lang['Note'];
+?>

Update of /cvsroot/tutos/tutos/php/mailbox
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7788

Modified Files:
      Tag: BRANCH-1-2
	cs.p3 
Log Message:
changes in translation


Index: cs.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mailbox/cs.p3,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- cs.p3	16 Mar 2004 11:10:29 -0000	1.5
+++ cs.p3	26 Nov 2004 12:57:52 -0000	1.5.2.1
@@ -10,52 +10,52 @@
 
 # Mailbox
 $lang['Mailbox']         = "Po¹tovní schránka";
-$lang['MailboxName']     = "Název po¹tovní schránky";
-$lang['MailboxHost']     = "Název stanice";
+$lang['MailboxName']     = "Název schránky";
+$lang['MailboxHost']     = "Název poèítaèe";
 $lang['MailboxPort']     = "Port";
 $lang['MailboxProt']     = "Protokol";
-$lang['MailboxUser']     = "U¾ivatel";
+$lang['MailboxUser']     = "U¾ivatelské jméno";
 $lang['MailboxPass']     = "Heslo";
 $lang['MailboxPath']     = "Cesta";
 $lang['MailboxSender']   = "Odesílatel";
 $lang['MailboxSubject']  = "Obsah";
 $lang['MailboxSDate']    = "Datum odeslání";
 $lang['MailboxFlags']    = "Pøíznaky";
-$lang['MailboxImport']   = "Import automatically?";
+$lang['MailboxImport']   = "Automaticky importovat?";
 $lang['MailboxOverview'] = "Pøehled po¹ty";
-$lang['MailboxSearch']   = "Vyhledat ve schránce";
+$lang['MailboxSearch']   = "Hledat ve schránce";
 $lang['MailboxDetail']   = "Zobrazit obsah schránky";
-$lang['MailboxModify']   = "Zmìnit po¹tovní schránku";
-$lang['MailboxCreate']   = "Vytvoøit po¹tovní schránku";
-$lang['MailboxModifyI']  = "Zmìnit po¹tovní schránku %s";
-$lang['MailboxCreateI']  = "Urèit po¹tovní schránku %s";
+$lang['MailboxModify']   = "Upravit schránku";
+$lang['MailboxCreate']   = "Nová po¹tovní schránka";
+$lang['MailboxModifyI']  = "Upravit schránku %s";
+$lang['MailboxCreateI']  = "Nová po¹tovní schránka %s";
 $lang['MailboxDelI']     = "Odstranit po¹tovní schránku %s";
-$lang['SearchForMail']   = "Prohledat po¹tovní schránku %s %s";
+$lang['SearchForMail']   = "Vyhledání ve schránce %s %s";
 $lang['MailboxSelInfo']  = "(nech prázdné pro zobrazení v¹eho)";
 
 $lang['Mail']            = "Dopis";
 $lang['Mails']           = "Dopisy";
-$lang['MailNewFolder']   = "vytvoøit nový adresáø";
-$lang['MailDelFolderI']  = "smazat adresáø %s";
-$lang['MailCountInfo']   = "Nalezeno dopisù:%d";
-$lang['MailCountInfoS']  = "Nalezeno dopisù:%d obsahující %s";
-$lang['MailCountInfo0']  = "Nebyl nalezen ¾ádný dopis v adresáøi %s";
-$lang['MailDeleteI']     = "smazat tento dopis";
+$lang['MailNewFolder']   = "Nová slo¾ka";
+$lang['MailDelFolderI']  = "Odstranit slo¾ku %s";
+$lang['MailCountInfo']   = "Nalezeno dopisù: %d";
+$lang['MailCountInfoS']  = "Nalezeno dopisù: %d obsahující %s";
+$lang['MailCountInfo0']  = "Ve slo¾ce %s nebyl nalezen ¾ádný dopis";
+$lang['MailDeleteI']     = "Odstranit tento dopis";
 $lang['MailAction']      = "oznaèené dopisy";
-$lang['MailActionCopy']  = "kopie do %s";
-$lang['MailActionMove']  = "pøesuò do %s";
-$lang['MailActionDel']   = "Smazat";
-$lang['MailActionGoto']  = "Zmìna k adresáøi:";
+$lang['MailActionCopy']  = "Kopie do %s";
+$lang['MailActionMove']  = "Pøesuò do %s";
+$lang['MailActionDel']   = "Odstranit";
+$lang['MailActionGoto']  = "Zmìnit adresáø";
 
 $lang['MailNoSubject']      = "NO SUBJECT";
-$lang['MailDeleted']        = "mail deleted";
-$lang['MailFolderDeleted']  = "Folder %s deleted";
-$lang['MailFolderCreated']  = "Folder %s created";
-$lang['MailShowHeaders']    = "Show Mail Headers";
-$lang['MailHideHeaders']    = "Hide Mail Headers";
-$lang['MailHeaders']        = "Mail Headers";
-$lang['MailDownload']       = "Download";
+$lang['MailDeleted']        = "E-mail byl smazán";
+$lang['MailFolderDeleted']  = "Slo¾ka %s byla smazána";
+$lang['MailFolderCreated']  = "Slo¾ka %s byla vytvoøena";
+$lang['MailShowHeaders']    = "Zobrazit hlavièky dopisu";
+$lang['MailHideHeaders']    = "Schovat hlavièky dopisu";
+$lang['MailHeaders']        = "Hlavièky dopisu";
+$lang['MailDownload']       = "Stáhnout zprávu";
 
-$lang['mailbox']     = &$lang['Mailbox'];
-$lang['perm'][usemailboxes]      = "pou¾ít po¹tovní schránky";
+$lang['mailbox']            = &$lang['Mailbox'];
+$lang['perm'][usemailboxes] = "Pou¾ít po¹tovního klienta";
 ?>

Update of /cvsroot/tutos/tutos/php/ldap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7617

Modified Files:
      Tag: BRANCH-1-2
	cs.p3 
Log Message:
changes in translation


Index: cs.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/ldap/cs.p3,v
retrieving revision 1.2
retrieving revision 1.2.6.1
diff -u -r1.2 -r1.2.6.1
--- cs.p3	27 Nov 2002 14:20:07 -0000	1.2
+++ cs.p3	26 Nov 2004 12:56:38 -0000	1.2.6.1
@@ -9,16 +9,16 @@
 # =======================================================
 
 # LDAP
-$lang['SearchLdapAdr']  = "Mrknout na Internet";
-$lang['LDAPOverview']   = "LDAP Searchresult";
-$lang['LDAPDetail']     = "LDAP Entry";
-$lang['LDAPSearchFor']  = "Searching for %s on %s";
-$lang['LDAPFound']      = "Entries returned: %s";
-$lang['LDAPServer']     = "Server";
-$lang['LDAPNotSynced']  = "Entry is not synced with TUTOS";
+$lang['SearchLdapAdr']  = "Vyhledat v Internetu";
+$lang['LDAPOverview']   = "Výsledky prohledávání LDAP adresáøe";
+$lang['LDAPDetail']     = "Podrobnosti LDAP záznamu";
+$lang['LDAPSearchFor']  = "Vyhledávám %s v %s";
+$lang['LDAPFound']      = "Poèet nalezených záznamù: %s";
+$lang['LDAPServer']     = "LDAP Server";
+$lang['LDAPNotSynced']  = "LDAP záznam není syncronzován v TUTOSu";
 $lang['LDAPImport']     = "Import";
-$lang['LDAPUpdate']     = "Update";
-$lang['LDAP_Err001']    = "LDAP Error: No Connection possible";
+$lang['LDAPUpdate']     = "Aktualizace";
+$lang['LDAP_Err001']    = "Chyba LDAP: Nelze vytvoøit spojení";
 
-$lang['perm'][useldap]  = "pou¾ít LDAP";
+$lang['perm'][useldap]  = "Pou¾ít LDAP";
 ?>

Update of /cvsroot/tutos/tutos/php/invoice
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7456

Modified Files:
      Tag: BRANCH-1-2
	cs.p3 
Log Message:
changes in translation


Index: cs.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/cs.p3,v
retrieving revision 1.5
retrieving revision 1.5.6.1
diff -u -r1.5 -r1.5.6.1
--- cs.p3	4 Feb 2003 20:04:55 -0000	1.5
+++ cs.p3	26 Nov 2004 12:55:39 -0000	1.5.6.1
@@ -13,18 +13,18 @@
 #
 
 # Invoice
-$lang['InvoiceStates'] = array();
-$lang['InvDateSent'] = array();
-$lang['InvDateDue'] = array();
-$lang['invoice']     = &$lang['Invoice'];
-$lang['perm'][useinvoice]        = "pou¾ít úètování";
+$lang['InvoiceStates']    = array();
+$lang['InvDateSent']      = array();
+$lang['InvDateDue']       = array();
+$lang['invoice']          = &$lang['Invoice'];
+$lang['perm'][useinvoice] = "Pou¾ít správu faktur";
 
-$lang['Invoice']           = "Úètování";
-$lang['Invoices']          = "Úètování";
-$lang['InvoiceCreate']     = "Vytvoøit úètování";
-$lang['InvoiceCreateI']    = "Vytvoøit úètování pro %s";
-$lang['InvoiceCreation']   = "vytvoøil %s %s";
-$lang['InvoiceName']       = "ID úètování";
+$lang['Invoice']           = "Faktura";
+$lang['Invoices']          = "Faktury";
+$lang['InvoiceCreate']     = "Vystavit fakturu";
+$lang['InvoiceCreateI']    = "Vystavit fakturu pro %s";
+$lang['InvoiceCreation']   = "Vytvoøil %s %s";
+$lang['InvoiceName']       = "ID faktury";
 $lang['InvoiceCustomer']   = "Zákazník";
 $lang['InvAnyUnpaid']      = "V¹e nezaplaceno";
 $lang['InvoiceState']      = "Stav";
@@ -37,35 +37,35 @@
 $lang['InvoiceStates'][7]  = "Zaplaceno";
 $lang['InvoiceStates'][8]  = "Zru¹eno";
 $lang['InvPosPos']         = "Dodatek";
-$lang['InvPosItems']       = "poèet";
+$lang['InvPosItems']       = "Poèet";
 $lang['InvPosIType']       = "-";
 $lang['InvPosDesc']        = "Popis";
 $lang['InvPosSingle']      = "a";
-$lang['InvPosTax']         = "% taxa";
+$lang['InvPosTax']         = "% daò";
 $lang['InvPosSum']         = "Souèet";
 $lang['InvPossiblePos']    = "Mo¾né dodatky";
 $lang['InvExistingPos']    = "Dodatek";
 $lang['InvAddPos']         = "Aktivovat dodatek";
 $lang['InvDelPos']         = "Odstranit dodatek";
-$lang['InvModInfo']        = "Upravit úèet %s";
-$lang['InvDelInfo']        = "Zru¹it úèet %s";
-$lang['InvOverview']       = "Pøehled úètu";
+$lang['InvModInfo']        = "Upravit fakturu %s";
+$lang['InvDelInfo']        = "Odstranit fakturu %s";
+$lang['InvOverview']       = "Pøehled faktur";
 $lang['InvDateSent'][0]    = "Poslat dne";
 $lang['InvDateDue'][0]     = "Splatnost";
-$lang['InvDateSent'][1]    = "1.upomínka poslána";
+$lang['InvDateSent'][1]    = "1. upomínka poslána";
 $lang['InvDateDue'][1]     = "Splatnost 1.upomínky";
-$lang['InvDateSent'][2]    = "2.upomínka poslána";
+$lang['InvDateSent'][2]    = "2. upomínka poslána";
 $lang['InvDateDue'][2]     = "Splatnost 2.upomínky";
 $lang['InvDatePayed']      = "Zaplaceno dne";
 $lang['InvDateCancel']     = "Zru¹eno dne";
-$lang['InvLinkInfo']       = "Zobrazit úètování %s";
-$lang['InvoiceSearch']     = "Vyhledat úètování";
-$lang['SearchForInv']      = "Vyhledat úètování";
-$lang['SearchForInvExt']   = "Roz¹íøené hledání úètování";
-$lang['InvSelInfo']        = "(nech prazdné pro zobrazení v¹ech úètù)";
-$lang['Accountant']        = "Úètoval";
+$lang['InvLinkInfo']       = "Zobrazit fakturu %s";
+$lang['InvoiceSearch']     = "Vyhledání faktury";
+$lang['SearchForInv']      = "Vyhledání faktury";
+$lang['SearchForInvExt']   = "Roz¹íøené vyhledávání úètování";
+$lang['InvSelInfo']        = "(nech prazdné pro zobrazení v¹ech faktur)";
+$lang['Accountant']        = "Fakturoval";
 $lang['InvDocument']       = "Zobrazit dokument";
-$lang['InvDocumentI']      = "Zobraz úèet jako PDF dokument";
+$lang['InvDocumentI']      = "Získat PDF";
 $lang['InvoiceReference']  = "Reference";
 
 ?>
\ No newline at end of file

Update of /cvsroot/tutos/tutos/php/installation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7414

Modified Files:
      Tag: BRANCH-1-2
	cs.p3 
Log Message:
changes in translation


Index: cs.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/cs.p3,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- cs.p3	21 Apr 2004 19:56:51 -0000	1.6
+++ cs.p3	26 Nov 2004 12:55:12 -0000	1.6.2.1
@@ -13,20 +13,20 @@
 $lang['Installations']   = "Instalace";
 $lang['InstDetail']      = "Podrobnosti instalace";
 $lang['InstModify']      = "Upravit instalaci";
-$lang['InstCreate']      = "Vytvoøit instalaci";
-$lang['InstOverview']    = "Pøehled instalace";
+$lang['InstCreate']      = "Nová instalace";
+$lang['InstOverview']    = "Instalace";
 $lang['InstVersion']     = &$lang['ProdVersion'];
-$lang['InstSerial']      = "Seriennummer";
-$lang['InstKey1']        = "Machine ID";
-$lang['InstKey2']        = "Release Code";
+$lang['InstSerial']      = "Sériové èíslo";
+$lang['InstKey1']        = "Instalaèní klíè 1";
+$lang['InstKey2']        = "Instalaèní klíè 2";
 $lang['InstalledBy']     = "Instaloval";
-$lang['SoldBy']          = "Prodal/koupil";
-$lang['Customer']        = "Klient/U¾ivatel";
+$lang['SoldBy']          = "Prodal";
+$lang['Customer']        = "Zákazník";
 $lang['InstLinkI']       = "Zobrazit instalace";
-$lang['InstCreateI']     = "vytvoøit novou instalaci %s";
-$lang['InstModifyI']     = "upravit tuto instalaci";
-$lang['InstDelI']        = "zru¹it instalaci %s";
+$lang['InstCreateI']     = "Nová instalace %s";
+$lang['InstModifyI']     = "Upravit instalaci";
+$lang['InstDelI']        = "Odstranit instalaci %s";
 
-$lang['perm'][useinstmanagement] = "pou¾ít instalace";
-$lang['installation']= &$lang['Installation'];
+$lang['perm'][useinstmanagement] = "Pou¾ít správu instalací";
+$lang['installation']    = &$lang['Installation'];
 ?>

Update of /cvsroot/tutos/tutos/php/group
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7285

Modified Files:
      Tag: BRANCH-1-2
	cs.p3 
Log Message:
changes in translation


Index: cs.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/group/cs.p3,v
retrieving revision 1.1
retrieving revision 1.1.8.1
diff -u -r1.1 -r1.1.8.1
--- cs.p3	27 Nov 2002 14:20:07 -0000	1.1
+++ cs.p3	26 Nov 2004 12:54:40 -0000	1.1.8.1
@@ -14,18 +14,18 @@
 
 $lang['Group']         = "CRM skupina";
 $lang['Groups']        = "CRM skupiny";
-$lang['GroupCreate']   = "Vytvoøit CRM skupinu";
-$lang['GroupModify']   = "Zmìnit CRM skupinu";
-$lang['GroupModifyI']  = "Zmìnit CRM skupinu %s";
+$lang['GroupCreate']   = "Nová CRM skupina";
+$lang['GroupModify']   = "Upravit CRM skupinu";
+$lang['GroupModifyI']  = "Upravit CRM skupinu %s";
 $lang['GroupName']     = "Název";
 $lang['GroupDesc']     = "Popis";
 $lang['GroupShow']     = "Zobrazit CRM skupinu %s";
 $lang['GroupDetail']   = "Podrobnosti CRM skupiny";
-$lang['GroupOverview'] = "Pøehled CRM skupiny";
-$lang['GroupMember']   = "Èlen";
-$lang['GroupMail']     = "Mail to Group";
-$lang['GroupMailI']    = "Mail to Group %s";
+$lang['GroupOverview'] = "CRM skupiny";
+$lang['GroupMember']   = "Èlenové";
+$lang['GroupMail']     = "Poslat e-mail CRM skupinì";
+$lang['GroupMailI']    = "Poslat e-mail CRM skupinì %s";
 
-$lang['perm'][usegroups] = "use CRM groups"; 
-$lang['group'] = &$lang['Group'];
+$lang['perm'][usegroups] = "Pou¾ít správu CRM skupin"; 
+$lang['group']         = &$lang['Group'];
 ?>

Update of /cvsroot/tutos/tutos/php/file
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4525

Modified Files:
      Tag: BRANCH-1-2
	cs.p3 
Log Message:
changes in translation


Index: cs.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/cs.p3,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- cs.p3	21 Mar 2004 21:44:24 -0000	1.4
+++ cs.p3	26 Nov 2004 12:37:21 -0000	1.4.2.1
@@ -12,7 +12,7 @@
 $lang['File']            = "Dokument";
 $lang['Files']           = "Dokumenty";
 $lang['FileDetail']      = "Podrobnosti dokumentu";
-$lang['FileOverview']    = "Pøehled dokumentu";
+$lang['FileOverview']    = "Pøehled dokumentù";
 $lang['FileMod']         = "Úprava dokumentu";
 $lang['FileModifyI']     = "Zmìna dokumentu %s";
 $lang['FileDeleteI']     = "Odstranit dokument %s";
@@ -32,28 +32,28 @@
 $lang['FileLockedBy']    = "uzamkl";
 $lang['FileOldVersion']  = "star¹í verze";
 $lang['FileLocking']     = "Uzamykání";
-$lang['FileUnlocked']    = "odemknuto";
-$lang['FileLocked']      = "dokument uzamkl %s";
-$lang['FileOverwrite']   = "pøepsat aktuální dokument %s";
-$lang['FileSave']        = "ulo¾it aktuální dokument %s jako verzi %s";
+$lang['FileUnlocked']    = "Odemknuto";
+$lang['FileLocked']      = "Dokument uzamkl %s";
+$lang['FileOverwrite']   = "Pøepsat aktuální dokument %s";
+$lang['FileSave']        = "Ulo¾it aktuální dokument %s jako verzi %s";
 $lang['FileShow']        = "Zobrazit dokument";
 $lang['FileShowI']       = "Zobrazit dokument %s";
-$lang['FileDownload']    = "Pøíjem";
-$lang['FileDownloadI']   = "Pøíjem dokumentu %s";
+$lang['FileDownload']    = "Stáhnout dokument";
+$lang['FileDownloadI']   = "Stáhnout dokument %s";
 $lang['FileVersionType'] = "Systém verzí";
-$lang['FileVersionTypeI']= "Pozdìji nebudete moci zmìnit systém verzí !";
-$lang['FileVersioning']  = "Stanoveni verze";
-$lang['FileVersioningI'] = "Jestli¾e je soubor urèen vý¹e.";
-$lang['FileSearch']      = "Vyhledat dokument";
-$lang['SearchForFile']   = "Vyhledat dokument";
-$lang['SearchForFileExt']= "Roz¹íøené vyhledání dokumentu";
-$lang['FileLockedByI']   = "Document locked by %s";
-$lang['FileUnlockedByI'] = "Document unlocked by %s";
-$lang['FileChanged']     = "Changed %s from %s to %s";
-$lang['FileDelSuccess']  = "File \"%s\" deleted";
-$lang['File_Err001']     = "Temporary file %s missing. Maybe too big";
+$lang['FileVersionTypeI']= "Pozdìji nebudete moci zmìnit systém verzí!";
+$lang['FileVersioning']  = "Stanovení verze";
+$lang['FileVersioningI'] = "(jestli¾e je soubor vybrán vý¹e)";
+$lang['FileSearch']      = "Dokumenty";
+$lang['SearchForFile']   = "Vyhledání dokumentu";
+$lang['SearchForFileExt']= "Roz¹íøené vyhledávání dokumentu";
+$lang['FileLockedByI']   = "Dokument uzamkl u¾ivatel %s";
+$lang['FileUnlockedByI'] = "Dokument odemkl u¾ivatel %s";
+$lang['FileChanged']     = "Zmìnìno: %s -- z %s na %s";
+$lang['FileDelSuccess']  = 'Dokument "%s" byl smazán';
+$lang['File_Err001']     = 'Doèasnì ulo¾ený dokument "%s" chybí.  Mo¾ná je pøíli¹ velký';
 
-$lang['perm'][usedocmanagement]  = "pou¾ít správu dokumentu";
+$lang['perm'][usedocmanagement]  = "Pou¾ít správu dokumentù";
 $lang['file']  = &$lang['File']
 
 ### Local Variables: ***

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3844

Modified Files:
      Tag: BRANCH-1-2
	minical.php 
Log Message:
proper use of $lang array


Index: minical.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/minical.php,v
retrieving revision 1.20
retrieving revision 1.20.4.1
diff -u -r1.20 -r1.20.4.1
--- minical.php	6 Jan 2004 19:35:23 -0000	1.20
+++ minical.php	26 Nov 2004 12:33:42 -0000	1.20.4.1
@@ -16,7 +16,7 @@
 $f = "default";
 
 $l = new layout($current_user);
-echo $l->PrintHeader("MiniCal");
+echo $l->PrintHeader($lang['MiniCalHeadline']);
 
 if (isset($_GET['f']) ) {
   $f = $_GET['f'];

Update of /cvsroot/tutos/tutos/php/localization
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3563

Modified Files:
      Tag: BRANCH-1-2
	en.p3 
Log Message:
added $lang['MiniCal...']


Index: en.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/en.p3,v
retrieving revision 1.59.2.1
retrieving revision 1.59.2.2
diff -u -r1.59.2.1 -r1.59.2.2
--- en.p3	7 Nov 2004 17:48:01 -0000	1.59.2.1
+++ en.p3	26 Nov 2004 12:31:39 -0000	1.59.2.2
@@ -241,6 +241,8 @@
 $lang['AppCheck']        = "check participants";
 $lang['AppCheckDesc']    = "(do not create on conflict)";
 $lang['AppConflict']     = "conflict for %s with %s";
+$lang['MiniCalHeadline'] = "MiniCal";
+$lang['MiniCalHref']     = "minical";
 
 # Personal Page
 $lang['PersonalPage']      = "My TUTOS";

Update of /cvsroot/tutos/tutos/php/localization
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3506

Modified Files:
      Tag: BRANCH-1-2
	ca.p3 
Log Message:
added $lang['MiniCal...']


Index: ca.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/ca.p3,v
retrieving revision 1.48.2.1
retrieving revision 1.48.2.2
diff -u -r1.48.2.1 -r1.48.2.2
--- ca.p3	7 Nov 2004 17:48:01 -0000	1.48.2.1
+++ ca.p3	26 Nov 2004 12:31:18 -0000	1.48.2.2
@@ -238,6 +238,8 @@
 $lang['AppCheck']        = "check participants";
 $lang['AppCheckDesc']    = "(do not create on conflict)";
 $lang['AppConflict']     = "conflict for %s with %s";
+$lang['MiniCalHeadline'] = "MiniCal";
+$lang['MiniCalHref']     = "minical";
 
 # Personal Page
 $lang['PersonalPage']      = "El meu TUTOS";