You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2007/12/10 12:57:50 UTC
svn commit: r602874 - in /lenya/trunk/src:
modules-core/sitemanagement/usecases/site/ webapp/lenya/resources/i18n/
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>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org