You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by sy...@apache.org on 2005/11/07 16:47:58 UTC

svn commit: r331284 - in /cocoon/branches/BRANCH_2_1_X/src: blocks/axis/samples/ blocks/javaflow/samples/forms/ blocks/proxy/samples/ java/org/apache/cocoon/serialization/ webapp/samples/i18n/ webapp/samples/i18n/translations/ webapp/samples/modules/

Author: sylvain
Date: Mon Nov  7 07:47:34 2005
New Revision: 331284

URL: http://svn.apache.org/viewcvs?rev=331284&view=rev
Log:
Fixing some small bugs

Removed:
    cocoon/branches/BRANCH_2_1_X/src/blocks/proxy/samples/README.txt
Modified:
    cocoon/branches/BRANCH_2_1_X/src/blocks/axis/samples/status.xsp
    cocoon/branches/BRANCH_2_1_X/src/blocks/javaflow/samples/forms/form2-binding.xml
    cocoon/branches/BRANCH_2_1_X/src/blocks/proxy/samples/samples.xml
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/serialization/ZipArchiveSerializer.java
    cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/menu.xml
    cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/simple.xml
    cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/simple.xsp
    cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/tiered.xml
    cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu.xml
    cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_de.xml
    cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_el.xml
    cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_en.xml
    cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_in.xml
    cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_ja.xml
    cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_ko.xml
    cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_ru.xml
    cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_zh_CN.xml
    cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_zh_TW.xml
    cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages.xml
    cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_de.xml
    cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_el.xml
    cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_en.xml
    cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_es.xml
    cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_fr.xml
    cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_fr_CH.xml
    cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_hy.xml
    cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_in.xml
    cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_ja.xml
    cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_ko.xml
    cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_pl.xml
    cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_pt.xml
    cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_ru.xml
    cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_tr.xml
    cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_zh_TW.xml
    cocoon/branches/BRANCH_2_1_X/src/webapp/samples/modules/menu.xml

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/axis/samples/status.xsp
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/axis/samples/status.xsp?rev=331284&r1=331283&r2=331284&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/axis/samples/status.xsp (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/axis/samples/status.xsp Mon Nov  7 07:47:34 2005
@@ -16,7 +16,7 @@
 -->
 
 <!--
-  -- $Id$
+  $Id$
   -->
 <xsp:page language="java"
           xmlns:xsp="http://apache.org/xsp"

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/javaflow/samples/forms/form2-binding.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/javaflow/samples/forms/form2-binding.xml?rev=331284&r1=331283&r2=331284&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/javaflow/samples/forms/form2-binding.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/javaflow/samples/forms/form2-binding.xml Mon Nov  7 07:47:34 2005
@@ -50,14 +50,16 @@
   <!-- (it is of course possible to implement other binding strategies) -->
   <fb:repeater id="contacts"
     parent-path="."
-    row-path="contacts"
-    unique-row-id="id"
-    unique-path="@id">
+    row-path="contacts">
 
 	<!-- compare to xml-binding: the convertor is not needed here -->
 
     <!-- important note: the row-path is used inside jxpath-createPath context,
     as a consequence it cannot have dependent children or predicates -->
+
+    <fb:identity>
+       <fb:value id="id" path="@id"/>
+    </fb:identity>
 
     <fb:on-bind>
       <!-- executed on updates AND right after the insert -->

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/proxy/samples/samples.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/proxy/samples/samples.xml?rev=331284&r1=331283&r2=331284&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/proxy/samples/samples.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/proxy/samples/samples.xml Mon Nov  7 07:47:34 2005
@@ -21,6 +21,12 @@
     <sample name="Back" href="..">to Cocoon Blocks Samples main page</sample>
   </group>
 
+  <group name="No samples">
+    <note>There are currently no samples for this block. It will be revisited in
+          in a future version</note>
+  </group>
+
+  <!-- Samples disabled
   <group name="Web Site Syndication">
     <sample name="Examples" href="wsproxy/">
       Demonstrates how to embed one website's functionality into another.
@@ -33,5 +39,6 @@
       Only styling is used in addition to the proxy.
     </sample>
   </group> 
+  -->
 
 </samples>

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/serialization/ZipArchiveSerializer.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/serialization/ZipArchiveSerializer.java?rev=331284&r1=331283&r2=331284&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/serialization/ZipArchiveSerializer.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/serialization/ZipArchiveSerializer.java Mon Nov  7 07:47:34 2005
@@ -1,19 +1,18 @@
 /*
  * Copyright 1999-2004 The Apache Software Foundation.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.cocoon.serialization;
 
 import java.io.FilterOutputStream;
@@ -67,7 +66,7 @@
  * </pre>
  *
  * @author <a href="http://www.apache.org/~sylvain">Sylvain Wallez</a>
- * @version CVS $Id$
+ * @version $Id$
  */
 
 // TODO (1) : handle more attributes on <archive> for properties of ZipOutputStream
@@ -76,10 +75,9 @@
 // TODO (2) : handle more attributes on <entry> for properties of ZipEntry
 //            (compression method and level, time, comment, etc.)
 
-public class ZipArchiveSerializer 
-    extends AbstractSerializer 
-    implements Disposable, Serviceable {
-        
+public class ZipArchiveSerializer extends AbstractSerializer
+                                  implements Disposable, Serviceable {
+
     /**
      * The namespace for elements handled by this serializer,
      * "http://apache.org/cocoon/zip-archive/1.0".
@@ -106,7 +104,7 @@
     protected SourceResolver resolver;
 
     /** Temporary byte buffer to read source data */
-    protected byte[] buffer = new byte[1024];
+    protected byte[] buffer;
 
     /** Serializer used when in IN_CONTENT state */
     protected Serializer serializer;
@@ -120,7 +118,7 @@
     /**
      * Store exception
      */
-    private SAXException exception = null;
+    private SAXException exception;
 
 
     /**
@@ -132,17 +130,12 @@
     }
 
     /**
-     * Returns null.
+     * Returns default mime type for zip archives, <code>application/zip</code>.
+     * Can be overridden in the sitemap.
+     * @return application/zip
      */
     public String getMimeType() {
-        // FIXME: There are many applications of Zip serializer, and one of them to generate
-        // OpenOffice documents, which have different mime type than "application/x-zip".
-        // Problem is that constant returned here can not be overriden in the sitemap neither
-        // when declaring serializer, nor when using it.
-        // Bug http://issues.apache.org/bugzilla/show_bug.cgi?id=10277 might be related to this issue.
-        // WAS HERE: Always return "application/x-zip" which is the default for Zip archives
-        // return "application/x-zip";
-        return null;
+        return "application/zip";
     }
 
     /**
@@ -160,7 +153,7 @@
      * @param uri The Namespace URI the prefix is mapped to.
      */
     public void startPrefixMapping(String prefix, String uri) throws SAXException {
-        if (state == IN_CONTENT_STATE) {
+        if (state == IN_CONTENT_STATE && this.contentDepth > 0) {
             // Pass to the serializer
             super.startPrefixMapping(prefix, uri);
 
@@ -171,6 +164,13 @@
             }
         }
     }
+    
+    public void endPrefixMapping(String prefix) throws SAXException {
+        if (state == IN_CONTENT_STATE && this.contentDepth > 0) {
+            // Pass to the serializer
+            super.endPrefixMapping(prefix);
+        }
+    }
 
     // Note : no need to implement endPrefixMapping() as we just need to pass it through if there
     // is a serializer, which is what the superclass does.
@@ -211,6 +211,15 @@
                 break;
 
             case IN_CONTENT_STATE:
+                if (this.contentDepth == 0) {
+                    // Give it any namespaces already declared
+                    Enumeration prefixes = this.nsSupport.getPrefixes();
+                    while (prefixes.hasMoreElements()) {
+                        String prefix = (String) prefixes.nextElement();
+                        super.startPrefixMapping(prefix, this.nsSupport.getURI(prefix));
+                    }
+                }
+
                 this.contentDepth++;
                 super.startElement(namespaceURI, localName, qName, atts);
                 break;
@@ -263,6 +272,10 @@
                 // Get the source and its data
                 source = resolver.resolveURI(src);
                 InputStream sourceInput = source.getInputStream();
+                
+                // Buffer lazily allocated
+                if (this.buffer == null)
+                    this.buffer = new byte[1024];
 
                 // Copy the source to the zip
                 int len;
@@ -286,8 +299,7 @@
                 // Direct its output to the zip file, filtering calls to close()
                 // (we don't want the archive to be closed by the serializer)
                 this.serializer.setOutputStream(new FilterOutputStream(this.zipOutput) {
-                    public void close() { /*nothing*/
-                    }
+                    public void close() { /* nothing */ }
                 });
 
                 // Set it as the current XMLConsumer
@@ -296,13 +308,6 @@
                 // start its document
                 this.serializer.startDocument();
 
-                // and give it any namespaces already declared
-                Enumeration prefixes = this.nsSupport.getPrefixes();
-                while (prefixes.hasMoreElements()) {
-                    String prefix = (String) prefixes.nextElement();
-                    super.startPrefixMapping(prefix, this.nsSupport.getURI(prefix));
-                }
-
                 this.state = IN_CONTENT_STATE;
                 this.contentDepth = 0;
             }
@@ -387,20 +392,19 @@
         if (this.selector != null) {
             this.manager.release(this.selector);
         }
-        
+
         this.nsSupport.reset();
         super.recycle();
     }
-    
+
     /* (non-Javadoc)
      * @see org.apache.avalon.framework.activity.Disposable#dispose()
      */
     public void dispose() {
-        if ( this.manager != null ) {
-            this.manager.release( this.resolver );
+        if (this.manager != null) {
+            this.manager.release(this.resolver);
             this.resolver = null;
             this.manager = null;
         }
     }
-
 }

Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/menu.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/menu.xml?rev=331284&r1=331283&r2=331284&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/menu.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/menu.xml Mon Nov  7 07:47:34 2005
@@ -61,9 +61,4 @@
     <external label="LocaleAction Javadoc" href="http://cocoon.apache.org/2.1/apidocs/org/apache/cocoon/acting/LocaleAction.html" i18n:attr="label"/>   
   </menu>
   
-  <menu label="Credits" i18n:attr="label">
-    <menu-item label="Konstantin Piroumian" href="mailto:kpiroumian@apache.org" i18n:attr="label" />  
-    <menu-item label="Many others..." href="http://cocoon.apache.org/2.1/who.html" i18n:attr="label"/>      
-  </menu>  
-   
 </book>

Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/simple.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/simple.xml?rev=331284&r1=331283&r2=331284&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/simple.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/simple.xml Mon Nov  7 07:47:34 2005
@@ -85,8 +85,6 @@
   </content>
 
   <bottom>
-    <copyright>
-      <i18n:text>copyright</i18n:text>
-    </copyright>
+    <copyright>Copyright 1999-2005 The Apache Software Foundation</copyright>
   </bottom>
 </document>

Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/simple.xsp
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/simple.xsp?rev=331284&r1=331283&r2=331284&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/simple.xsp (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/simple.xsp Mon Nov  7 07:47:34 2005
@@ -121,9 +121,7 @@
     </content>
 
     <bottom>
-      <copyright>
-        <i18n:text>copyright</i18n:text>
-      </copyright>
+      <copyright>Copyright 1999-2005 The Apache Software Foundation</copyright>
     </bottom>
   </document>
 </xsp:page>

Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/tiered.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/tiered.xml?rev=331284&r1=331283&r2=331284&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/tiered.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/tiered.xml Mon Nov  7 07:47:34 2005
@@ -81,8 +81,6 @@
   </content>
 
   <bottom>
-    <copyright>
-      <i18n:text>copyright</i18n:text>
-    </copyright>
+     <copyright>Copyright 1999-2005 The Apache Software Foundation</copyright>
   </bottom>
 </document>

Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu.xml?rev=331284&r1=331283&r2=331284&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu.xml Mon Nov  7 07:47:34 2005
@@ -39,7 +39,4 @@
     <message key="i18n transformer Javadoc"><![CDATA[<I18ntransformer> Javadoc]]></message>
     <message key="LocaleAction Javadoc"><![CDATA[<LocaleAction> Javadoc]]></message>
 
-    <message key="Credits">Credits</message>
-    <message key="Konstantin Piroumian">Konstantin Piroumian</message>
-    <message key="Many others...">Many others...</message>
 </catalogue>

Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_de.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_de.xml?rev=331284&r1=331283&r2=331284&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_de.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_de.xml Mon Nov  7 07:47:34 2005
@@ -18,7 +18,7 @@
 <!--+
     | German message catalogue file for menu in Cocoon 2 i18n sample
     |
-    | CVS $Id: menu_de.xml,v 1.5 2004/04/06 08:51:37 antonio Exp $
+    | CVS $Id$
     +-->
 
 <catalogue xml:lang="de">
@@ -33,7 +33,4 @@
     <message key="i18n transformer docs"><![CDATA[<I18ntransformer> docs]]></message>
     <message key="i18n transformer Javadoc"><![CDATA[<I18ntransformer> Javadoc]]></message>
     <message key="LocaleAction Javadoc"><![CDATA[<LocaleAction> Javadoc]]></message>
-    <message key="Credits">Kredite</message>
-    <message key="Konstantin Piroumian">Konstantin Piroumian</message>
-    <message key="Many others...">Viele Andere...</message>
 </catalogue>

Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_el.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_el.xml?rev=331284&r1=331283&r2=331284&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_el.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_el.xml Mon Nov  7 07:47:34 2005
@@ -18,7 +18,7 @@
 <!--+
     | Greek message catalogue file for menu in Cocoon 2 i18n sample
     |
-    | CVS $Id: menu_el.xml,v 1.3 2004/03/06 02:25:36 antonio Exp $
+    | CVS $Id$
     +-->
 
 <catalogue xml:lang="gr">
@@ -33,7 +33,4 @@
 	<message key="i18n transformer docs">i18n transformer docs</message>
 	<message key="i18n transformer Javadoc">i18n transformer Javadoc</message>
 	<message key="LocaleAction Javadoc">LocaleAction Javadoc</message>
-	<message key="Credits">Πιστώσεις</message>
-	<message key="Konstantin Piroumian">Κωνσταντίνος Πιρουμιάν</message>
-	<message key="Many others...">Και πολλοί άλλοι...</message>
 </catalogue>

Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_en.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_en.xml?rev=331284&r1=331283&r2=331284&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_en.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_en.xml Mon Nov  7 07:47:34 2005
@@ -18,7 +18,7 @@
 <!--+
     | English message catalogue file for menu in Cocoon 2 i18n sample
     |
-    | CVS $Id: menu_en.xml,v 1.3 2004/03/06 02:25:36 antonio Exp $
+    | CVS $Id$
     +-->
 
 <catalogue xml:lang="en">
@@ -33,7 +33,4 @@
     <message key="i18n transformer docs"><![CDATA[<I18ntransformer> docs]]></message>
     <message key="i18n transformer Javadoc"><![CDATA[<I18ntransformer> Javadoc]]></message>
     <message key="LocaleAction Javadoc"><![CDATA[<LocaleAction> Javadoc]]></message>
-    <message key="Credits">Credits</message>
-    <message key="Konstantin Piroumian">Konstantin Piroumian</message>
-    <message key="Many others...">Many others...</message>
 </catalogue>

Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_in.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_in.xml?rev=331284&r1=331283&r2=331284&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_in.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_in.xml Mon Nov  7 07:47:34 2005
@@ -18,7 +18,7 @@
 <!--+
     | Indonesian message catalogue file for menu in Cocoon 2 i18n sample
     |
-    | CVS $Id: menu_in.xml,v 1.3 2004/03/06 02:25:37 antonio Exp $
+    | CVS $Id$
     +-->
 
 <catalogue xml:lang="in">
@@ -33,7 +33,4 @@
     <message key="i18n transformer docs"><![CDATA[<I18ntransformer> docs]]></message>
     <message key="i18n transformer Javadoc"><![CDATA[<I18ntransformer> Javadoc]]></message>
     <message key="LocaleAction Javadoc"><![CDATA[<LocaleAction> Javadoc]]></message>
-    <message key="Credits">Kontribusi</message>
-    <message key="Konstantin Piroumian">Konstantin Piroumian</message>
-    <message key="Many others...">Banyak lagi...</message>
 </catalogue>

Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_ja.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_ja.xml?rev=331284&r1=331283&r2=331284&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_ja.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_ja.xml Mon Nov  7 07:47:34 2005
@@ -18,7 +18,7 @@
 <!--+
     | Japanese message catalogue file for menu in Cocoon 2 i18n sample
     |
-    | CVS $Id: menu_ja.xml,v 1.3 2004/03/06 02:25:36 antonio Exp $
+    | CVS $Id$
     +-->
 
 <catalogue xml:lang="ja">
@@ -33,7 +33,4 @@
     <message key="i18n transformer docs">i18nトランスフォーマ文書</message>
     <message key="i18n transformer Javadoc">i18nトランスフォーマJavaDoc</message>
     <message key="LocaleAction Javadoc">LocaleAction JavaDoc</message>
-    <message key="Credits">謝辞</message>
-    <message key="Konstantin Piroumian">コンスタンティン・ピルミャン</message>
-    <message key="Many others...">その他大勢の方々...</message>
 </catalogue>

Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_ko.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_ko.xml?rev=331284&r1=331283&r2=331284&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_ko.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_ko.xml Mon Nov  7 07:47:34 2005
@@ -18,7 +18,7 @@
 <!--+
     | Korean message catalogue file for menu in Cocoon 2 i18n sample
     |
-    | CVS $Id: menu_ko.xml,v 1.3 2004/03/06 02:25:36 antonio Exp $
+    | CVS $Id$
     +-->
 
 <catalogue xml:lang="ko">
@@ -33,7 +33,4 @@
     <message key="i18n transformer docs">국제화 변환기 문서</message>
     <message key="i18n transformer Javadoc">국제화 변환기 자바독</message>
     <message key="LocaleAction Javadoc">LocaleAction 자바독</message>
-    <message key="Credits">제공자</message>
-    <message key="Konstantin Piroumian">콘스탄틴 피오루미안</message>
-    <message key="Many others...">그밖은 많은 분들...</message>
 </catalogue>

Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_ru.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_ru.xml?rev=331284&r1=331283&r2=331284&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_ru.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_ru.xml Mon Nov  7 07:47:34 2005
@@ -18,7 +18,7 @@
 <!--+
     | Russian message catalogue file for menu in Cocoon 2 i18n sample
     |
-    | CVS $Id: menu_ru.xml,v 1.3 2004/03/06 02:25:36 antonio Exp $
+    | CVS $Id$
     +-->
 
 <catalogue xml:lang="ru">
@@ -33,7 +33,4 @@
     <message key="i18n transformer docs">Документация по трансформеру i18n</message>
     <message key="i18n transformer Javadoc">Javadoc по трансформеру i18n</message>
     <message key="LocaleAction Javadoc">Javadoc по LocaleAction</message>
-    <message key="Credits">Разработчики</message>
-    <message key="Konstantin Piroumian">Константин Пирумян</message>
-    <message key="Many others...">Многие другие...</message>
 </catalogue>

Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_zh_CN.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_zh_CN.xml?rev=331284&r1=331283&r2=331284&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_zh_CN.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_zh_CN.xml Mon Nov  7 07:47:34 2005
@@ -18,7 +18,7 @@
 <!--+
     | Chinese message catalogue file for menu in Cocoon 2 i18n sample
     |
-    | CVS $Id: menu_zh_CN.xml,v 1.3 2004/03/06 02:25:37 antonio Exp $
+    | CVS $Id$
     +-->
 
 <catalogue xml:lang="zh_CN">
@@ -33,7 +33,4 @@
     <message key="i18n transformer docs">国际化 变换机 文书</message>
     <message key="i18n transformer Javadoc">国际化 变换机 Javadoc</message>
     <message key="LocaleAction Javadoc">LocaleAction Javadoc</message>
-    <message key="Credits">提供者</message>
-    <message key="Konstantin Piroumian">Konstantin Piroumian</message>
-    <message key="Many others...">别的多位...</message>
 </catalogue>

Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_zh_TW.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_zh_TW.xml?rev=331284&r1=331283&r2=331284&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_zh_TW.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/menu_zh_TW.xml Mon Nov  7 07:47:34 2005
@@ -18,7 +18,7 @@
 <!--+
     | Chinese message catalogue file for menu in Cocoon 2 i18n sample
     |
-    | CVS $Id: menu_zh_TW.xml,v 1.3 2004/03/06 02:25:37 antonio Exp $
+    | CVS $Id$
     +-->
 
 <catalogue xml:lang="zh_TW">
@@ -33,7 +33,4 @@
     <message key="i18n transformer docs">國際化 變換機 文書</message>
     <message key="i18n transformer Javadoc">國際化 變換機 Javadoc</message>
     <message key="LocaleAction Javadoc">LocaleAction Javadoc</message>
-    <message key="Credits">提供者</message>
-    <message key="Konstantin Piroumian">Konstantin Piroumian</message>
-    <message key="Many others...">別的多位...</message>
 </catalogue>

Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages.xml?rev=331284&r1=331283&r2=331284&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages.xml Mon Nov  7 07:47:34 2005
@@ -18,7 +18,7 @@
 <!--+
     | Default (English) message catalogue file for Cocoon 2 i18n sample
     |
-    | CVS $Id: messages.xml,v 1.3 2004/03/06 02:25:36 antonio Exp $
+    | CVS $Id$
     +-->
 
 <catalogue xml:lang="en">
@@ -33,7 +33,6 @@
     <message key="article">Article</message>
     <message key="article_text1">This is a i18n paragraph.</message>
     <message key="article_text2">This is another i18n paragraph and is also a cool one.</message>
-    <message key="copyright">Copyright © 2001 Konstantin Piroumian. No rights are reserved.</message>
     <message key="Hello">Hello, {0}! Glad to see you!</message>
     <message key="Kot">Tomcat</message>
     <message key="none">None</message>

Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_de.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_de.xml?rev=331284&r1=331283&r2=331284&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_de.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_de.xml Mon Nov  7 07:47:34 2005
@@ -18,7 +18,7 @@
 <!--+
     | German message catalogue file for Cocoon 2 i18n sample
     |
-    | CVS $Id: messages_de.xml,v 1.4 2004/03/06 02:25:36 antonio Exp $
+    | CVS $Id$
     +-->
 
 <catalogue xml:lang="de">
@@ -34,7 +34,6 @@
     <message key="article">Artikel</message>
     <message key="article_text1">Dies ist ein Absatz nach i18n.</message>
     <message key="article_text2">Dies ist ein weiterer Absatz nach i18n und auch noch ein ziemlich cooler dazu.</message>
-    <message key="copyright">Copyright © 2001 Konstantin Piroumian. Deutsche Übersetzung von Jörg Prante, Tommy Santoso.</message>
     <message key="Hello">Hallo {0}! Schön, dich zu sehen!</message>
     <message key="Kot">Tomcat</message>
     <message key="none">nichts</message>

Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_el.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_el.xml?rev=331284&r1=331283&r2=331284&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_el.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_el.xml Mon Nov  7 07:47:34 2005
@@ -18,7 +18,7 @@
 <!--+
     | Greek message catalogue file for Cocoon 2 i18n sample
     |
-    | CVS $Id: messages_el.xml,v 1.3 2004/03/06 02:25:37 antonio Exp $
+    | CVS $Id$
     +-->
 
 <catalogue xml:lang="el">
@@ -33,7 +33,6 @@
 	<message key="article">Αρθρο</message>
 	<message key="article_text1">Μία παράγραφος  i18n.</message>
 	<message key="article_text2">Ακόμα μία παράγραφος  i18n.</message>
-	<message key="copyright">Copyright © 2001 Κωνσταντίνος Πιρουμιάν. Δεν έχουν κατοχυρωθεί δικαιώματα.</message>
 	<message key="Hello">Γειά σου , {0}! Είμαι ευτυχής που σε βλέπω!</message>
 	<message key="Kot">Tomcat (τομκατ)</message>
 	<message key="none">κανένα</message>

Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_en.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_en.xml?rev=331284&r1=331283&r2=331284&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_en.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_en.xml Mon Nov  7 07:47:34 2005
@@ -18,7 +18,7 @@
 <!--+
     | English message catalogue file for Cocoon 2 i18n sample
     |
-    | CVS $Id: messages_en.xml,v 1.3 2004/03/06 02:25:37 antonio Exp $
+    | CVS $Id$
     +-->
 
 <catalogue xml:lang="en">
@@ -33,7 +33,6 @@
     <message key="article">Article</message>
     <message key="article_text1">This is a i18n paragraph.</message>
     <message key="article_text2">This is another i18n paragraph and is also a cool one.</message>
-    <message key="copyright">Copyright © 2001 Konstantin Piroumian. No rights are reserved.</message>
     <message key="Hello">Hello, {0}! Glad to see you!</message>
     <message key="Kot">Tomcat</message>
     <message key="none">None</message>

Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_es.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_es.xml?rev=331284&r1=331283&r2=331284&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_es.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_es.xml Mon Nov  7 07:47:34 2005
@@ -18,7 +18,7 @@
 <!--+
     | Spanish message catalogue file for Cocoon 2 i18n sample
     |
-    | CVS $Id: messages_es.xml,v 1.3 2004/03/06 02:25:36 antonio Exp $
+    | CVS $Id$
     +-->
 
 <catalogue xml:lang="es">
@@ -34,7 +34,6 @@
     <message key="article">Artículo</message>
     <message key="article_text1">Esto es un párrafo i18n.</message>
     <message key="article_text2">Esto es otro párrafo i18n y también es 'cool'.</message>
-    <message key="copyright">Copyright © 2001 Konstantin Piroumian. Sin derechos reservados.</message>
     <message key="Hello">¡¡Hola!, {0}! ¡Encantado de verte!</message>
     <message key="Kot">Tomcat</message>
     <message key="none">Ninguno</message>

Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_fr.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_fr.xml?rev=331284&r1=331283&r2=331284&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_fr.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_fr.xml Mon Nov  7 07:47:34 2005
@@ -18,7 +18,7 @@
 <!--+
     | French message catalogue file for Cocoon 2 i18n sample
     |
-    | CVS $Id: messages_fr.xml,v 1.3 2004/03/06 02:25:37 antonio Exp $
+    | CVS $Id$
     +-->
 
 <catalogue xml:lang="fr">
@@ -34,7 +34,6 @@
     <message key="article">Article</message>
     <message key="article_text1">Ceci est un paragraphe auquel une transformation i18n a été appliquée.</message>
     <message key="article_text2">Ceci est autre un paragraphe auquel une transformation i18n a été appliquée et il s'en porte d'autant mieux!</message>
-    <message key="copyright">Copyright © 2001 Konstantin Piroumian. Traduction française de Olivier Lange.</message>
     <message key="Hello">Salut {0}! Ravi de te rencontrer!</message>
     <message key="Kot">Tomcat</message>
     <message key="none">inconnu</message>

Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_fr_CH.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_fr_CH.xml?rev=331284&r1=331283&r2=331284&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_fr_CH.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_fr_CH.xml Mon Nov  7 07:47:34 2005
@@ -18,7 +18,7 @@
 <!--+
     | French (CH) message catalogue file for Cocoon 2 i18n sample
     |
-    | CVS $Id: messages_fr_CH.xml,v 1.3 2004/03/06 02:25:36 antonio Exp $
+    | CVS $Id$
     +-->
 
 <catalogue xml:lang="fr_CH">
@@ -33,7 +33,6 @@
     <message key="article">Article</message>
     <message key="article_text1">Ceci est un paragraphe i18n.</message>
     <message key="article_text2">Ceci est un autre paragraphe i18n, et en plus, il est particulièrement drôle.</message>
-    <message key="copyright">Copyright © 2001 Konstantin Piroumian. Aucun droit reservé. Traduction française (CH) de Hahn Kurt.</message>
     <message key="Hello">Bonjour, {0}! Enchanté de vous voir!</message>
     <message key="Kot">Tomcat</message>
     <message key="none">Aucun</message>

Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_hy.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_hy.xml?rev=331284&r1=331283&r2=331284&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_hy.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_hy.xml Mon Nov  7 07:47:34 2005
@@ -18,7 +18,7 @@
 <!--+
     | Armenian message catalogue file for Cocoon 2 i18n sample
     |
-    | CVS $Id: messages_hy.xml,v 1.3 2004/03/06 02:25:37 antonio Exp $
+    | CVS $Id$
     +-->
 
 <catalogue xml:lang="hy">
@@ -34,7 +34,6 @@
     <message key="article">Հոդված</message>
     <message key="article_text1">Սա միջազգային պարագրաֆ է:</message>
     <message key="article_text2">Սա էլ է միջազգային պարագրաֆ և նույն պես ցենտր :)</message>
-    <message key="copyright">Copyright © 2001 Konstantin Piroumian. Ոչինչ պաշտպանված չէ:</message>
     <message key="Hello">Ողջու՜յն {0}, ուրախ եմ քեզ տեսնել:</message>
     <message key="Kot">Ô¿Õ¸Õ¿Õ¸</message>
     <message key="none">ոչ ոք</message>

Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_in.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_in.xml?rev=331284&r1=331283&r2=331284&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_in.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_in.xml Mon Nov  7 07:47:34 2005
@@ -18,7 +18,7 @@
 <!--+
     | Indonesian message catalogue file for Cocoon 2 i18n sample
     |
-    | CVS $Id: messages_in.xml,v 1.5 2004/03/06 02:25:37 antonio Exp $
+    | CVS $Id$
     +-->
 
 <catalogue xml:lang="in">
@@ -34,7 +34,6 @@
     <message key="article">Artikel</message>
     <message key="article_text1">Kalimat ini berdasarkan i18n.</message>
     <message key="article_text2">Kalimat lain berdasarkan i18n, canggih deh.</message>
-    <message key="copyright">Copyright © 2001 Konstantin Piroumian. Translasi bahasa indonesia oleh Tommy Santoso.</message>
     <message key="Hello">Hallo {0}! Senang bertemu dengan anda!</message>
     <message key="Kot">Tomcat</message>
     <message key="none">tidak ada</message>

Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_ja.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_ja.xml?rev=331284&r1=331283&r2=331284&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_ja.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_ja.xml Mon Nov  7 07:47:34 2005
@@ -18,7 +18,7 @@
 <!--+
     | Japanese message catalogue file for Cocoon 2 i18n sample
     |
-    | CVS $Id: messages_ja.xml,v 1.3 2004/03/06 02:25:36 antonio Exp $
+    | CVS $Id$
     +-->
 
 <catalogue xml:lang="ja">
@@ -33,7 +33,6 @@
     <message key="article">アーティクル</message>
     <message key="article_text1">ここは、多言語化されたパラグラフです。</message>
     <message key="article_text2">ここは、もう一つの多言語化されたパラグラフであり、多少イカしています。</message>
-    <message key="copyright">Copyright c 2002 - 2003 Konstantin Piroumian　日本語訳　北畠徹也</message>
     <message key="Hello">はじめまして {0}さん、よろしくお願いします</message>
     <message key="Kot">トムキャット</message>
     <message key="none">なし</message>

Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_ko.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_ko.xml?rev=331284&r1=331283&r2=331284&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_ko.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_ko.xml Mon Nov  7 07:47:34 2005
@@ -18,7 +18,7 @@
 <!--+
     | Korean message catalogue file for Cocoon 2 i18n sample
     |
-    | CVS $Id: messages_ko.xml,v 1.3 2004/03/06 02:25:37 antonio Exp $
+    | CVS $Id$
     +-->
 
 <catalogue xml:lang="ko">
@@ -33,7 +33,6 @@
   <message key="article">논문</message>
   <message key="article_text1">이것은 국제화된 문단입니다.</message>
   <message key="article_text2">이것은 또하나의 국제화된 문단이며, 역시 멋지죠.</message>
-  <message key="copyright">Copyright © 2002 Konstantin Piroumian. 번역 이아스.</message>
   <message key="Hello">안녕하세요, {0}! 만나서 반갑습니다!</message>
   <message key="Kot">톰켓</message>
   <message key="none">없음</message>

Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_pl.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_pl.xml?rev=331284&r1=331283&r2=331284&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_pl.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_pl.xml Mon Nov  7 07:47:34 2005
@@ -18,7 +18,7 @@
 <!--+
     | Polish message catalogue file for Cocoon 2 i18n sample
     |
-    | CVS $Id: messages_pl.xml,v 1.3 2004/03/06 02:25:37 antonio Exp $
+    | CVS $Id$
     +-->
 
 <catalogue xml:lang="pl">
@@ -34,7 +34,6 @@
     <message key="article">Artykuł</message>
     <message key="article_text1">To jest paragraf w i18n.</message>
     <message key="article_text2">To jest następny paragraf w i18n i jest takze fajny.</message>
-    <message key="copyright">Copyright © 2001 Konstantin Piroumian i Krzysztof Zieliński. Żadne prawa nie są zastrzeżone:)</message>
     <message key="Hello">Witam, {0}! Miło Cię widzieć!</message>
     <message key="Kot">Tomcat</message>
     <message key="none">Nic</message>

Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_pt.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_pt.xml?rev=331284&r1=331283&r2=331284&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_pt.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_pt.xml Mon Nov  7 07:47:34 2005
@@ -18,7 +18,7 @@
 <!--+
     | Portuguese message catalogue file for Cocoon 2 i18n sample
     |
-    | CVS $Id: messages_pt.xml,v 1.3 2004/03/06 02:25:37 antonio Exp $
+    | CVS $Id$
     +-->
 
 <catalogue xml:lang="pt">
@@ -34,7 +34,6 @@
     <message key="article">Artigo</message>
     <message key="article_text1">Isto é um i18n parágrafo.</message>
     <message key="article_text2">Isto é outro i18n parágrafo, tambem é bem legal.</message>
-    <message key="copyright">Copyright © 2001 Konstantin Piroumian. Direitos não reservados.</message>
     <message key="Hello">Oi, {0}! Prazer em ver você!</message>
     <message key="Kot">Tomcat</message>
     <message key="none">Nenhum</message>

Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_ru.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_ru.xml?rev=331284&r1=331283&r2=331284&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_ru.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_ru.xml Mon Nov  7 07:47:34 2005
@@ -18,7 +18,7 @@
 <!--+
     | Russian message catalogue file for Cocoon 2 i18n sample
     |
-    | CVS $Id: messages_ru.xml,v 1.3 2004/03/06 02:25:36 antonio Exp $
+    | CVS $Id$
     +-->
 
 <catalogue xml:lang="ru">
@@ -34,7 +34,6 @@
     <message key="article">Статья</message>
     <message key="article_text1">Это интернационализированный абзац.</message>
     <message key="article_text2">Это тоже интернационализированный абзац и такой же классный.</message>
-    <message key="copyright">Авторские права © 2001 Константин Пирумян. Ничто не защищено.</message>
     <message key="Hello">Привет, {0}! Рад тебя видеть!</message>
     <message key="Kot">Кот</message>
     <message key="none">Незнакомец</message>

Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_tr.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_tr.xml?rev=331284&r1=331283&r2=331284&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_tr.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_tr.xml Mon Nov  7 07:47:34 2005
@@ -18,7 +18,7 @@
 <!--+
     | Turkish message catalogue file for Cocoon 2 i18n sample
     |
-    | CVS $Id: messages_tr.xml,v 1.3 2004/03/06 02:25:36 antonio Exp $
+    | CVS $Id$
     +-->
 
 <catalogue xml:lang="tr">
@@ -33,7 +33,6 @@
     <message key="article">Makale</message>
     <message key="article_text1">Bu bir i18n paragrafıdır.</message>
     <message key="article_text2">Bu da bir i18n paragrafı ve aynı zamanda çok hoş.</message>
-    <message key="copyright">Copyright © 2001 Konstantin Piroumian. Hiçbir hakkı saklı değildir. Thanks to Vadim Gritsenko.</message>
     <message key="Hello, {0}! Glad to see you!">Merhaba, {0}! Seni gördüğüme memnum oldum!</message>
     <message key="Kot">Tekir</message>
     <message key="none">bilinmeyen</message>

Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_zh_TW.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_zh_TW.xml?rev=331284&r1=331283&r2=331284&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_zh_TW.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/i18n/translations/messages_zh_TW.xml Mon Nov  7 07:47:34 2005
@@ -18,7 +18,7 @@
 <!--+
     | Chinese message catalogue file for Cocoon 2 i18n sample
     |
-    | CVS $Id: messages_zh_TW.xml,v 1.3 2004/03/06 02:25:36 antonio Exp $
+    | CVS $Id$
     +-->
 
 <catalogue xml:lang="zh_TW">
@@ -33,7 +33,6 @@
     <message key="article">論文</message>
     <message key="article_text1">這個是國際化的段落.</message>
     <message key="article_text2">這個還是國際化的段落, 并且出色.</message>
-    <message key="copyright">Copyright © 2002 Konstantin Piroumian. 翻譯 李蒼信.</message>
     <message key="Hello">您好, {0}! 見到你很高興!</message>
     <message key="Kot">Tomcat</message>
     <message key="none">零</message>

Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/modules/menu.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/modules/menu.xml?rev=331284&r1=331283&r2=331284&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/modules/menu.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/modules/menu.xml Mon Nov  7 07:47:34 2005
@@ -53,10 +53,4 @@
     <external label="Input Modules Docs" href="../../docs/userdocs/concepts/modules.html"/>
     <external label="API Docs" href="../../api/java/org/apache/cocoon/components/modules/input/package-summary.html"/>
   </menu>
-
-  <menu label="Credits">
-    <menu-item label="Christian Haul" href="mailto:haul@apache.org"/>
-    <menu-item label="Konstantin Piroumian" href="mailto:kpiroumian@apache.org"/>
-    <menu-item label="Many others..." href="/docs/who.html"/>
-  </menu>
 </book>