roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1549855 [3/3] - in /roller/trunk: app/src/main/resources/ app/src/main/webapp/WEB-INF/jsps/editor/ docs/
Date Tue, 10 Dec 2013 14:50:01 GMT
Modified: roller/trunk/app/src/main/resources/ApplicationResources_de.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_de.properties?rev=1549855&r1=1549854&r2=1549855&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_de.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_de.properties Tue Dec 10 14:50:00
2013
@@ -170,7 +170,7 @@ categoriesForm.parent=Kategorie
 categoriesForm.path=Pfad
 categoriesForm.remove=L\u00F6schen
 categoriesForm.root=root
-categoriesForm.rootPrompt=Dies sind Ihre Kategorien auf der obersten Ebene. Sie k\u00F6nnen
diese Kategorien verwenden um Ihre Weblogeintr\u00E4ge zu organisieren und Ihre Leser k\u00F6nnen
zwischen unterschiedlichen Newsfeeds f\u00FCr Ihre Kategorien w\u00E4hlen. Sie k\u00F6nnen
auch Unterkategorien definieren, aber viele der Roller Makros zeigen nur die Kategorien auf
der obersten Ebene an.
+categoriesForm.rootPrompt=Dies sind Ihre Kategorien auf der obersten Ebene. Sie k\u00F6nnen
diese Kategorien verwenden um Ihre Weblogeintr\u00E4ge zu organisieren und Ihre Leser k\u00F6nnen
zwischen unterschiedlichen Newsfeeds f\u00FCr Ihre Kategorien w\u00E4hlen.
 categoriesForm.rootTitle=Kategorien
 categoriesForm.subtitle=Kategorien in Weblog <span>{0}</span> verwalten
 categoriesForm.warn.notMoving=Die Kategorie [{0}] kann nicht in eine ihr untergeordnete Kategorie
verschoben werden

Modified: roller/trunk/app/src/main/resources/ApplicationResources_es.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_es.properties?rev=1549855&r1=1549854&r2=1549855&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_es.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_es.properties Tue Dec 10 14:50:00
2013
@@ -1,4 +1,4 @@
-# Translation (c) 2005 by Patricio Martínez Ros <silencium@wanadoo.es>
+# Translation (c) 2005 by Patricio Mart�nez Ros <silencium@wanadoo.es>
 application.none = Ninguno
 application.cancel = Cancelar
 application.done = Hecho
@@ -65,7 +65,7 @@ categoriesForm.description = Descripci\u
 categoriesForm.edit = Editar
 categoriesForm.root = ra\u00EDz
 categoriesForm.rootTitle = Categor\u00EDas
-categoriesForm.rootPrompt = Estas son sus categor\u00EDas weblog de nivel superior. Puede
usar categor\u00EDas para organizar sus entradas de weblog y sus lectores pueden elegir suscribirse
cada una de sus categor\u00EDas. Tambi\u00E9n puede definir subcategor\u00EDas, pero muchos
de los macros de visualizaci\u00F3n de Roller s\u00F3lo mostrar\u00E1n las categor\u00EDas
de nivel superior.
+categoriesForm.rootPrompt = Estas son sus categor\u00EDas weblog de nivel superior. Puede
usar categor\u00EDas para organizar sus entradas de weblog y sus lectores pueden elegir suscribirse
cada una de sus categor\u00EDas.
 categoriesForm.categoryPrompt = Puede a\u00F1adir subcategor\u00EDas aqu\u00ED, 
 categoriesForm.addCategory = A\u00F1adir categor\u00EDa
 categoriesForm.checkAll = Chequear todo

Modified: roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties?rev=1549855&r1=1549854&r2=1549855&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties Tue Dec 10 14:50:00
2013
@@ -135,8 +135,7 @@ categoriesForm.rootPrompt=\
 \u30AB\u30C6\u30B4\u30EA\u306E\u6700\u4E0A\u4F4D\u3067\u3059\u3002\
 \u30D6\u30ED\u30B0\u30A8\u30F3\u30C8\u30EA\u3092\u5206\u985E\u3057\u3001\u8AAD\u8005\u306B\u7279\u5B9A\u306E\u5206\u91CE\u306B\u7279\u5316\u3057\u305F\u30A8\u30F3\u30C8\u30EA\u7FA4\u3092\u8AAD\u307E\u305B\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\
 \u3053\u308C\u306F\u30D5\u30A3\u30FC\u30C9\u306B\u3082\u5F71\u97FF\u3057\u307E\u3059\u3002Roller\u306F\u7279\u5B9A\u30AB\u30C6\u30B4\u30EA\u306E\u30D5\u30A3\u30FC\u30C9\u3092\u53D6\u5F97\u3055\u305B\u308B\u3053\u3068\u3082\u3067\u304D\u307E\u3059\u3002\
-\u30A8\u30F3\u30C8\u30EA\u306E\u4E0B\u306B\u30A8\u30F3\u30C8\u30EA\u3092\u4F5C\u308B\u3053\u3068\u3082\u3067\u304D\u307E\u3059\u304C\u3001\
-Roller\u306E\u30DE\u30AF\u30ED\u306F\u30C8\u30C3\u30D7\u30EC\u30D9\u30EB\u30AB\u30C6\u30B4\u30EA\u306E\u307F\u30B5\u30DD\u30FC\u30C8\u3059\u308B\u3082\u306E\u304C\u591A\u3044\u3067\u3059(\u306E\u3067\u304A\u85A6\u3081\u306F\u3057\u307E\u305B\u3093)\u3002
+
 categoriesForm.categoryPrompt=\
 \u30B5\u30D6\u30AB\u30C6\u30B4\u30EA\u3092\u8FFD\u52A0\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u304C\u3001\
 Roller\u306E\u30DE\u30AF\u30ED\u306F\u30C8\u30C3\u30D7\u30EC\u30D9\u30EB\u30AB\u30C6\u30B4\u30EA\u306E\u307F\u30B5\u30DD\u30FC\u30C8\u3059\u308B\u3082\u306E\u304C\u591A\u3044\u3067\u3059(\u306E\u3067\u304A\u85A6\u3081\u306F\u3057\u307E\u305B\u3093)\u3002

Modified: roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ru.properties?rev=1549855&r1=1549854&r2=1549855&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ru.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ru.properties Tue Dec 10 14:50:00
2013
@@ -106,12 +106,9 @@ categoriesForm.description=\u041e\u043f\
 categoriesForm.edit=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c
 categoriesForm.root=root
 categoriesForm.rootTitle=\u041a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u0438
-categoriesForm.rootPrompt=\
-\u042d\u0442\u043e \u0433\u043b\u0430\u0432\u043d\u0430\u044f \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044f
\u0434\u043d\u0435\u0432\u043d\u0438\u043a\u0430. \
-\u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c
\u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u0438 \u0447\u0442\u043e\u0431\u044b \u0443\u043f\u043e\u0440\u044f\u0434\u043e\u0447\u0438\u0442\u044c
\u0437\u0430\u043f\u0438\u0441\u0438, \u0438 \u0412\u0430\u0448\u0438 \u0447\u0438\u0442\u0430\u0442\u0435\u043b\u0438
\u043c\u043e\u0433\u0443\u0442 \
-\u043f\u043e\u0434\u043f\u0438\u0441\u0430\u0442\u044c\u0441\u044f \u043d\u0430 \u043e\u0442\u0434\u0435\u043b\u044c\u043d\u0443\u044e
\u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044e \u0412\u0430\u0448\u0435\u0433\u043e
\u0434\u043d\u0435\u0432\u043d\u0438\u043a\u0430. \
-\u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0438\u0442\u044c
\u043f\u043e\u0434-\u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u0438, \u043d\u043e \u043c\u043d\u043e\u0433\u0438\u0435
\u043c\u0430\u043a\u0440\u043e\u0441\u044b \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u044e\u0442
\
-\u0442\u043e\u043b\u044c\u043a\u043e \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u0438
\u0432\u0435\u0440\u0445\u043d\u0435\u0433\u043e \u0443\u0440\u043e\u0432\u043d\u044f.
+categoriesForm.rootPrompt=\u042D\u0442\u043E \u0433\u043B\u0430\u0432\u043D\u0430\u044F \u043A\u0430\u0442\u0435\u0433\u043E\u0440\u0438\u044F
\u0434\u043D\u0435\u0432\u043D\u0438\u043A\u0430. \
+\u0412\u044B \u043C\u043E\u0436\u0435\u0442\u0435 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C
\u043A\u0430\u0442\u0435\u0433\u043E\u0440\u0438\u0438 \u0447\u0442\u043E\u0431\u044B \u0443\u043F\u043E\u0440\u044F\u0434\u043E\u0447\u0438\u0442\u044C
\u0437\u0430\u043F\u0438\u0441\u0438, \u0438 \u0412\u0430\u0448\u0438 \u0447\u0438\u0442\u0430\u0442\u0435\u043B\u0438
\u043C\u043E\u0433\u0443\u0442 \
+\u043F\u043E\u0434\u043F\u0438\u0441\u0430\u0442\u044C\u0441\u044F \u043D\u0430 \u043E\u0442\u0434\u0435\u043B\u044C\u043D\u0443\u044E
\u043A\u0430\u0442\u0435\u0433\u043E\u0440\u0438\u044E \u0412\u0430\u0448\u0435\u0433\u043E
\u0434\u043D\u0435\u0432\u043D\u0438\u043A\u0430.
 categoriesForm.categoryPrompt=\
 \u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c
\u043f\u043e\u0434\u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044e \u0437\u0434\u0435\u0441\u044c,
\u043d\u043e \u043c\u043d\u043e\u0433\u0438\u0435 \u043c\u0430\u043a\u0440\u043e\u0441\u044b
\u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u044e\u0442 \
 \u0442\u043e\u043b\u044c\u043a\u043e \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u0438
\u0432\u0435\u0440\u0445\u043d\u0435\u0433\u043e \u0443\u0440\u043e\u0432\u043d\u044f.

Modified: roller/trunk/app/src/main/resources/ApplicationResources_sl.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_sl.properties?rev=1549855&r1=1549854&r2=1549855&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_sl.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_sl.properties Tue Dec 10 14:50:00
2013
@@ -164,12 +164,9 @@ categoriesForm.description=Opis
 categoriesForm.edit=urejanje
 categoriesForm.root=korenski
 categoriesForm.rootTitle=Kategorije
-categoriesForm.rootPrompt=\
-To so va\u0161e weblog kategorije na najvi\u0161jem nivoju. \
+categoriesForm.rootPrompt=To so va\u0161e weblog kategorije na najvi\u0161jem nivoju. \
 Kategorije lahko uporabite za organizacijo va\u0161ih weblog vnosov v va\u0161e \u010Ditalce
in tako lahko \
-izbirate lo\u010Dene kanale Novic za vsako va\u0161o kategorijo. \
-Lahko tudi definirate podkategorije, toda ve\u010Dina makrojev Roller-ja prika\u017Ee \
-samo kategorije na vrhnjem nivoju.
+izbirate lo\u010Dene kanale Novic za vsako va\u0161o kategorijo.
 categoriesForm.categoryPrompt=\
 Tukaj lahko dodajate pod-kategorije, vendar ve\u010Dina Roller-jevih makrojev prika\u017Ee
\
 samo kategorije na vrhnjem nivoju.

Modified: roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties?rev=1549855&r1=1549854&r2=1549855&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties Tue Dec 10 14:50:00
2013
@@ -72,7 +72,7 @@ calendar.prev=\u524d\u9875
 calendar.summary=\u65e5\u5fd7\u5f52\u6863\u65e5\u5386
 calendar.today=\u4eca\u5929
 categoriesForm.addCategory=\u6dfb\u52a0\u5206\u7c7b
-categoriesForm.categoryPrompt=\u60a8\u53ef\u4ee5\u5728\u8fd9\u91cc\u6dfb\u52a0\u4e00\u4e2a\u5b50\u7c7b\uff0c\u4f46\u662fRoller\u53ea\u63d0\u4f9b\u4e00\u4e9b\u663e\u793a\u9876\u7ea7\u5206\u7c7b\u7684\u5b8f\u3002
+categoriesForm.categoryPrompt=\u60A8\u53EF\u4EE5\u5728\u8FD9\u91CC\u6DFB\u52A0\u4E00\u4E2A\u5B50\u7C7B\uFF0C\u4F46\u662FRoller\u53EA\u63D0\u4F9B\u4E00\u4E9B\u663E\u793A\u9876\u7EA7\u5206\u7C7B\u7684\u5B8F\u3002
 categoriesForm.checkAll=\u5168\u90e8\u9009\u62e9
 categoriesForm.checkNone=\u4e00\u4e2a\u4e0d\u9009
 categoriesForm.delete=\u5220\u9664
@@ -85,7 +85,7 @@ categoriesForm.parent=\u5206\u7c7b
 categoriesForm.path=\u8def\u5f84
 categoriesForm.remove=\u79fb\u9664
 categoriesForm.root=\u6839
-categoriesForm.rootPrompt=\u8fd9\u91cc\u60a8\u7684\u9876\u7ea7\u5206\u7c7b\u3002\u4f60\u53ef\u4ee5\u5229\u7528\u5206\u7c7b\u6765\u7ec4\u7ec7\u60a8\u7684\u65e5\u5fd7\uff0c\u60a8\u7684\u62dc\u8bbf\u8005\u4e5f\u53ef\u4ee5\u901a\u8fc7\u9009\u62e9\u67d0\u4e00\u4e2a\u5206\u7c7b\u6765\u8ba2\u9605\u4ed6\u611f\u5174\u8da3\u7684\u4e13\u9898\u3002\u4f60\u53ef\u4ee5\u5b9a\u4e49\u5b50\u7c7b\uff0c\u4f46\u662fRoller\u53ea\u63d0\u4f9b\u663e\u793a\u9876\u7ea7\u5206\u7c7b\u7684\u5b8f\u3002
+categoriesForm.rootPrompt=\u8FD9\u91CC\u60A8\u7684\u9876\u7EA7\u5206\u7C7B\u3002\u4F60\u53EF\u4EE5\u5229\u7528\u5206\u7C7B\u6765\u7EC4\u7EC7\u60A8\u7684\u65E5\u5FD7\uFF0C\u60A8\u7684\u62DC\u8BBF\u8005\u4E5F\u53EF\u4EE5\u901A\u8FC7\u9009\u62E9\u67D0\u4E00\u4E2A\u5206\u7C7B\u6765\u8BA2\u9605\u4ED6\u611F\u5174\u8DA3\u7684\u4E13\u9898\u3002
 categoriesForm.rootTitle=\u5206\u7c7b
 categoriesForm.subtitle=\u7ba1\u7406\u7f51\u5fd7 <span>{0}</span> \u7684\u5206\u7c7b
 categoriesForm.warn.notMoving=\u4e0d\u80fd\u79fb\u52a8\u7236\u7c7b\u76ee\u5f55 [{0} ]\u5230\u5b83\u7684\u5b50\u7c7b\u4e2d\u53bb

Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp?rev=1549855&r1=1549854&r2=1549855&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp Tue Dec 10 14:50:00
2013
@@ -31,30 +31,14 @@ function onMove()
 //-->
 </script>
 
-<s:if test="categoryPath.isEmpty">
-    <p class="subtitle">
-        <s:text name="categoriesForm.subtitle" >
-            <s:param value="weblog" />
-        </s:text>
-    </p>  
-    <p class="pagetip">
-        <s:text name="categoriesForm.rootPrompt" />
-    </p>
-</s:if>
-
-<s:else>
-    <p class="subtitle">
-    <s:text name="categoriesForm.path" />: /
-    <s:iterator id="pathItem" value="categoryPath">
-        <s:url id="pathUrl" action="categories">
-            <s:param name="weblog" value="%{actionWeblog.handle}" />
-            <s:param name="categoryId" value="#pathItem.id" />
-        </s:url>
-        <s:a href="%{pathUrl}"><s:property value="#pathItem.name" /></s:a>
/ 
-    </s:iterator>
-    <p>
-    <p><s:text name="categoriesForm.categoryPrompt" /></p>
-</s:else>
+<p class="subtitle">
+    <s:text name="categoriesForm.subtitle" >
+        <s:param value="weblog" />
+    </s:text>
+</p>
+<p class="pagetip">
+    <s:text name="categoriesForm.rootPrompt" />
+</p>
 
 
 <%-- Form is a table of categories each with checkbox --%>
@@ -62,28 +46,14 @@ function onMove()
 	<s:hidden name="salt" />
     <s:hidden name="weblog" />
     <s:hidden name="categoryId" /> 
-    
-    <s:if test="!allCategories.isEmpty">
-    
-        <%-- Move-selected button --%>
-        <s:submit value="%{getText('categoriesForm.move')}" onclick="onMove();return false;"
/>
-    
-        <%-- Move-to combo-box --%>
-        <s:select name="targetCategoryId" list="allCategories" listKey="id" listValue="path"
/>
-    
-        <br /><br />
-    
-    </s:if>
-    
+
     <table class="rollertable">
         
         <tr class="rollertable">
-            <th class="rollertable" width="5%"><input type="checkbox" name="control"
onclick="toggleFunctionAll(this.checked);"/></th>
-            <th class="rollertable" width="5%">&nbsp;</th>
-            <th class="rollertable" width="30%"><s:text name="categoriesForm.name"
/></th>
+            <th class="rollertable" width="35%"><s:text name="categoriesForm.name"
/></th>
             <th class="rollertable" width="45%"><s:text name="categoriesForm.description"
/></th>
-            <th class="rollertable" width="5%"><s:text name="categoriesForm.edit"
/></th>
-            <th class="rollertable" width="5%"><s:text name="categoriesForm.remove"
/></th>
+            <th class="rollertable" width="10%"><s:text name="categoriesForm.edit"
/></th>
+            <th class="rollertable" width="10%"><s:text name="categoriesForm.remove"
/></th>
         </tr>
         
         <s:if test="AllCategories != null && !AllCategories.isEmpty">
@@ -97,18 +67,8 @@ function onMove()
                 <tr class="rollertable_even">
             </s:else>
             
-                <td class="rollertable center" style="vertical-align:middle">
-                    <input type="checkbox" name="selectedCategories" value="<s:property
value="#category.id"/>" />
-                </td>
-                
-                <td class="rollertable" align="center"><img src='<s:url value="/images/folder.png"/>'
alt="icon" /></td>
-                
                 <td class="rollertable">
-                    <s:url id="categoryUrl" action="categories">
-                        <s:param name="weblog" value="%{actionWeblog.handle}" />
-                        <s:param name="categoryId" value="#category.id" />
-                    </s:url>
-                    <s:a href="%{categoryUrl}"><str:truncateNicely lower="15" upper="20"
><s:property value="#category.name" /></str:truncateNicely></s:a>
+                    <str:truncateNicely lower="15" upper="20" ><s:property value="#category.name"
/></str:truncateNicely>
                 </td>
                 
                 <td class="rollertable">

Modified: roller/trunk/docs/roller-install-guide.odt
URL: http://svn.apache.org/viewvc/roller/trunk/docs/roller-install-guide.odt?rev=1549855&r1=1549854&r2=1549855&view=diff
==============================================================================
Binary files - no diff available.

Modified: roller/trunk/docs/roller-template-guide.odt
URL: http://svn.apache.org/viewvc/roller/trunk/docs/roller-template-guide.odt?rev=1549855&r1=1549854&r2=1549855&view=diff
==============================================================================
Binary files - no diff available.

Modified: roller/trunk/docs/roller-user-guide.odt
URL: http://svn.apache.org/viewvc/roller/trunk/docs/roller-user-guide.odt?rev=1549855&r1=1549854&r2=1549855&view=diff
==============================================================================
Binary files - no diff available.



Mime
View raw message