svn commit: r602874 - in /lenya/trunk/src: modules-core/sitemanagement/usecases/site/ webapp/lenya/resources/i18n/

[email protected]
Newsgroups gmane.comp.cms.lenya.cvs
Message-ID <[email protected]> 
Author: andreas
Date: Mon Dec 10 03:57:14 2007
New Revision: 602874

URL: http://svn.apache.org/viewvc?rev=602874&view=rev
Log:
Simplified i18n for copy+paste and updated styling

Modified:
    lenya/trunk/src/modules-core/sitemanagement/usecases/site/copy.jx
    lenya/trunk/src/modules-core/sitemanagement/usecases/site/paste.jx
    lenya/trunk/src/webapp/lenya/resources/i18n/cmsui.xml
    lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml
    lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_es.xml
    lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_fr.xml
    lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_it.xml
    lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ja.xml
    lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_nl.xml
    lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_pt.xml
    lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ru.xml

Modified: lenya/trunk/src/modules-core/sitemanagement/usecases/site/copy.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/usecases/site/copy.jx?rev=602874&r1=602873&r2=602874&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/usecases/site/copy.jx (original)
+++ lenya/trunk/src/modules-core/sitemanagement/usecases/site/copy.jx Mon Dec 10 03:57:14 2007
@@ -29,14 +29,7 @@
   <page:body>
     <div class="lenya-box">
       <div class="lenya-box-title">
-        <i18n:translate>
-          <i18n:text key="copy-doc"/>
-          <i18n:param>
-            <q>
-              <jx:out value="${usecase.getParameter('document').getLink().getLabel()}"/>
-            </q>
-          </i18n:param>
-        </i18n:translate>
+        <i18n:text>Copy Document</i18n:text>
       </div>
       <div class="lenya-box-body">
         <form method="get" action="" id="form-copy_document">
@@ -53,9 +46,7 @@
                 <br/>
                 <i18n:translate>
                   <i18n:text key="copy-doc-to-clip?"/>
-                  <i18n:param>
-                    <jx:out value="${usecase.getParameter('document').getLink().getLabel()}"/>
-                  </i18n:param>
+                  <i18n:param>${usecase.getParameter('document').getLink().getLabel()}</i18n:param>
                 </i18n:translate>
               </td>
             </tr>

Modified: lenya/trunk/src/modules-core/sitemanagement/usecases/site/paste.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/usecases/site/paste.jx?rev=602874&r1=602873&r2=602874&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/usecases/site/paste.jx (original)
+++ lenya/trunk/src/modules-core/sitemanagement/usecases/site/paste.jx Mon Dec 10 03:57:14 2007
@@ -29,14 +29,7 @@
   <page:body>
     <div class="lenya-box">
       <div class="lenya-box-title">
-        <i18n:translate>
-          <i18n:text key="paste-doc"/>
-          <i18n:param>
-            <q>
-              <jx:out value="${usecase.getParameter('clipboardLabel')}"/>
-            </q>
-          </i18n:param>
-        </i18n:translate>
+        <i18n:text>Paste Document</i18n:text>
       </div>
       <div class="lenya-box-body">
         <form method="post" action="" id="form-paste">
@@ -53,11 +46,7 @@
                 <br/>
                 <i18n:translate>
                   <i18n:text key="paste-doc-from-clip?"/>
-                  <i18n:param>
-                    <strong>
-                      <jx:out value="${usecase.getParameter('clipboardLabel')}"/>
-                    </strong>
-                  </i18n:param>
+                  <i18n:param>${usecase.getParameter('clipboardLabel')}</i18n:param>
                 </i18n:translate>
               </td>
             </tr>

Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui.xml?rev=602874&r1=602873&r2=602874&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui.xml Mon Dec 10 03:57:14 2007
@@ -282,15 +282,13 @@
   <message key="rename-label-doc">Change navigation title of document {0}</message>
       <!-- Copy document -->
   <message key="Copy Document">Copy Document</message>
-  <message key="copy-doc">Copy document {0}</message>
   <message key="copy-doc-to-clip?">
-    Do you want to copy the document {0} and its descendants to the clipboard?
+    Do you want to copy the document <xhtml:q>{0}</xhtml:q> and its descendants to the clipboard?
     You can paste the subtree later at the location of your choosing.
   </message>
       <!-- Paste document -->
   <message key="Paste Document">Paste Document</message>
-  <message key="paste-doc">Paste document {0}</message>
-  <message key="paste-doc-from-clip?">Do you want to paste the document {0} from the clipboard?</message>
+  <message key="paste-doc-from-clip?">Do you want to paste the document <xhtml:q>{0}</xhtml:q> from the clipboard?</message>
 
       <!-- Cut document -->
   <message key="Cut Document">Cut Document</message>

Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml?rev=602874&r1=602873&r2=602874&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml Mon Dec 10 03:57:14 2007
@@ -288,15 +288,14 @@
   <message key="rename-label-doc">Navigationstitel des Dokuments {0} ändern</message>
       <!-- Copy document -->
   <message key="Copy Document">Dokument kopieren</message>
-  <message key="copy-doc">Kopieren von Dokument {0}</message>
+  <message key="copy-doc">Dokument kopieren</message>
   <message key="copy-doc-to-clip?">
-    Wollen Sie das Dokument {0} und die untergeordneten Dokumente in die Zwischenablage kopieren?
+    Wollen Sie das Dokument <xhtml:q>{0}</xhtml:q> und die untergeordneten Dokumente in die Zwischenablage kopieren?
     Sie können den Teilbaum später an gewünschter Stelle einfügen.
   </message>
       <!-- Paste document -->
   <message key="Paste Document">Dokument einfügen</message>
-  <message key="paste-doc">Dokument {0} einfügen</message>
-  <message key="paste-doc-from-clip?">Wollen Sie das Dokument {0} aus der Zwischenablage einfügen?</message>
+  <message key="paste-doc-from-clip?">Wollen Sie das Dokument <xhtml:q>{0}</xhtml:q> aus der Zwischenablage einfügen?</message>
       <!-- Cut document -->
   <message key="Cut Document">Dokument ausschneiden</message>
   <message key="cut-doc">Ausschneiden von Dokument {0}</message>

Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_es.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_es.xml?rev=602874&r1=602873&r2=602874&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_es.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_es.xml Mon Dec 10 03:57:14 2007
@@ -290,12 +290,10 @@
   <message key="rename-label-doc">Cambiar el título de navegación del documento {0}</message>
       <!-- Copy document -->
   <message key="Copy Document">Copiar Documento</message>
-  <message key="copy-doc">Copiar documento {0}</message>
-  <message key="copy-doc-to-clip?">¿Seguro que desea copiar el documento {0} al portapapeles? Más tarde puede pegar el documento en el lugar que elija.</message>
+  <message key="copy-doc-to-clip?">¿Seguro que desea copiar el documento <xhtml:q>{0}</xhtml:q> al portapapeles? Más tarde puede pegar el documento en el lugar que elija.</message>
       <!-- Paste document -->
   <message key="Paste Document">Pegar Documento</message>
-  <message key="paste-doc">Pegar documento {0}</message>
-  <message key="paste-doc-from-clip?">¿Seguro que desea pegar el documento {0} desde el portapapeles?</message>
+  <message key="paste-doc-from-clip?">¿Seguro que desea pegar el documento <xhtml:q>{0}</xhtml:q> desde el portapapeles?</message>
 
       <!-- Cut document -->
   <message key="Cut Document">Cortar Documento</message>

Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_fr.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_fr.xml?rev=602874&r1=602873&r2=602874&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_fr.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_fr.xml Mon Dec 10 03:57:14 2007
@@ -267,12 +267,10 @@
   <message key="rename-label-doc">Changer le titre de navigation du document {0}</message>
       <!-- Copy document -->
   <message key="Copy Document">Copier le document</message>
-  <message key="copy-doc">Copier le document {0}</message>
-  <message key="copy-doc-to-clip?">Voulez-vous copier le document {0} vers le presse-papiers? Vous pourrez le coller ultérieurement à l'endroit de votre choix.</message>
+  <message key="copy-doc-to-clip?">Voulez-vous copier le document <xhtml:q>{0}</xhtml:q> vers le presse-papiers? Vous pourrez le coller ultérieurement à l'endroit de votre choix.</message>
       <!-- Paste document -->
   <message key="Paste Document">Coller le document</message>
-  <message key="paste-doc">Coller le document {0}</message>
-  <message key="paste-doc-from-clip?">Voulez-vous coller le document {0} à partir du presse-papiers?</message>
+  <message key="paste-doc-from-clip?">Voulez-vous coller le document <xhtml:q>{0}</xhtml:q> à partir du presse-papiers?</message>
       <!-- Cut document -->
   <message key="Cut Document">Couper le document</message>
   <message key="cut-doc">Couper le document {0}</message>

Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_it.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_it.xml?rev=602874&r1=602873&r2=602874&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_it.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_it.xml Mon Dec 10 03:57:14 2007
@@ -221,12 +221,10 @@
 	<message key="rename-doc">Rinomina documento {0}</message>
 	<!-- Copy document -->
 	<message key="Copy Document">Copia Documento</message>
-	<message key="copy-doc">Copia documento {0}</message>
-	<message key="copy-doc-to-clip?">Vuoi copiare il documento {0} negli appunti? Puoi incollare successivamente il documento in un'altra posizione.</message>
+  <message key="copy-doc-to-clip?">Vuoi copiare il documento <xhtml:q>{0}</xhtml:q> negli appunti? Puoi incollare successivamente il documento in un'altra posizione.</message>
 	<!-- Paste document -->
 	<message key="Paste Document">Incolla Documento</message>
-	<message key="paste-doc">Incolla documento {0}</message>
-	<message key="paste-doc-from-clip?">Vuoi incollare il documento {0} dagli appunti?</message>
+  <message key="paste-doc-from-clip?">Vuoi incollare il documento </xhtml:q>{0}</message> dagli appunti?</message>
 	<!-- Cut document -->
 	<message key="Cut Document">Taglia Documento</message>
 	<message key="cut-doc">Taglia documento {0}</message>

Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ja.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ja.xml?rev=602874&r1=602873&r2=602874&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ja.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ja.xml Mon Dec 10 03:57:14 2007
@@ -245,11 +245,9 @@
   <message key="rename-doc">ドキュメント {0} の名前変更</message>
       <!-- Copy document -->
   <message key="Copy Document">ドキュメントのコピー</message>
-  <message key="copy-doc">ドキュメント {0} のコピー</message>
   <message key="copy-doc-to-clip?">ドキュメント {0} をコピーしクリップボードに移動させますか？ お好みの場所に後で貼り付けをすることが出来ます</message>
       <!-- Paste document -->
   <message key="Paste Document">ドキュメントの貼り付け</message>
-  <message key="paste-doc">ドキュメント {0} の貼り付け</message>
   <message key="paste-doc-from-clip?">クリップボードからドキュメント {0} を貼り付けしますか？</message>
       <!-- Cut document -->
   <message key="Cut Document">ドキュメントの切り取り</message>

Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_nl.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_nl.xml?rev=602874&r1=602873&r2=602874&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_nl.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_nl.xml Mon Dec 10 03:57:14 2007
@@ -282,13 +282,11 @@
   <message key="rename-doc">Hernoem document {0}</message>
       <!-- Copy document -->
   <message key="Copy Document">Kopieer Document</message>
-  <message key="copy-doc">Kopieer document {0}</message>
-  <message key="copy-doc-to-clip?">Wilt u het document {0} kopieren naar het clipboard? U kan het document later plakken op een lokatie naar keuze.</message>
+  <message key="copy-doc-to-clip?">Wilt u het document <xhtml:q>{0}</xhtml:q> kopieren naar het clipboard? U kan het document later plakken op een lokatie naar keuze.</message>
       <!-- Paste document -->
   <message key="Paste Document">Document Plakken</message>
 
-  <message key="paste-doc">Document {0} Plakken</message>
-  <message key="paste-doc-from-clip?">Wilt u het document {0} plakken vanaf het clipboard?</message>
+  <message key="paste-doc-from-clip?">Wilt u het document <xhtml:q>{0}</xhtml:q> plakken vanaf het clipboard?</message>
       <!-- Cut document -->
   <message key="Cut Document">Document Knippen</message>
   <message key="cut-doc">Document {0} Knippen</message>

Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_pt.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_pt.xml?rev=602874&r1=602873&r2=602874&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_pt.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_pt.xml Mon Dec 10 03:57:14 2007
@@ -247,12 +247,10 @@
   <message key="rename-doc">Renomear Documento {0}</message>
       <!-- Copy document -->
   <message key="Copy Document">Copiar Documento</message>
-  <message key="copy-doc">Copiar documento {0}</message>
-  <message key="copy-doc-to-clip?">Deseja realmente copiar o documento {0} para o clipboard? Mais tarde poderá colar o documento numa localização escolhida por si.</message>
+  <message key="copy-doc-to-clip?">Deseja realmente copiar o documento <xhtml:q>{0}</xhtml:q> para o clipboard? Mais tarde poderá colar o documento numa localização escolhida por si.</message>
       <!-- Paste document -->
   <message key="Paste Document">Colar Documento</message>
-  <message key="paste-doc">Colar documento {0}</message>
-  <message key="paste-doc-from-clip?">Deseja realmente colar o documento {0} do clipboard?</message>
+  <message key="paste-doc-from-clip?">Deseja realmente colar o documento <xhtml:q>{0}</xhtml:q> do clipboard?</message>
       <!-- Cut document -->
   <message key="Cut Document">Cortar Documento</message>
   <message key="cut-doc">Cortar documento {0}</message>

Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ru.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ru.xml?rev=602874&r1=602873&r2=602874&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ru.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ru.xml Mon Dec 10 03:57:14 2007
@@ -266,13 +266,11 @@
 <message key="rename-doc">Переименовать документ {0}</message>
 <!-- Copy document -->
 <message key="Copy Document">Копировать документ</message>
-<message key="copy-doc">Копировать документ {0}</message>
-<message key="copy-doc-to-clip?">Хотите скопировать документ {0} В буфер обмена? Скопированный документ можно будет вставить после в выбранное место.</message>
+<message key="copy-doc-to-clip?">Хотите скопировать документ <xhtml:q>{0}</xhtml:q> В буфер обмена? Скопированный документ можно будет вставить после в выбранное место.</message>
 <!-- Paste document -->
 
 <message key="Paste Document">Вставить документ</message>
-<message key="paste-doc">Вставить документ {0}</message>
-<message key="paste-doc-from-clip?">Хотите вставить документ {0} из буфера обмена?</message>
+<message key="paste-doc-from-clip?">Хотите вставить документ <xhtml:q>{0}</xhtml:q> из буфера обмена?</message>
 <!-- Cut document -->
 <message key="Cut Document">Вырезать документ</message>
 <message key="cut-doc">Вырезать документ {0}</message>
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.