You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by gm...@apache.org on 2014/07/02 06:26:32 UTC
svn commit: r1607241 [3/3] - in /roller/trunk/app/src/main:
java/org/apache/roller/weblogger/ui/struts2/editor/ resources/
webapp/WEB-INF/jsps/admin/ webapp/WEB-INF/jsps/core/
webapp/WEB-INF/jsps/editor/
Modified: roller/trunk/app/src/main/resources/ApplicationResources_fr.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_fr.properties?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_fr.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_fr.properties Wed Jul 2 04:26:31 2014
@@ -16,10 +16,10 @@
generic.all=Tous
generic.none=Aucune
-application.cancel=Annuler
-application.done=Terminé
-application.yes=Oui
-application.no=Non
+generic.cancel=Annuler
+generic.done=Terminé
+generic.yes=Oui
+generic.no=Non
application.true=Vrai
application.false=Faux
@@ -38,7 +38,6 @@ bookmarkForm.cancel=Annuler
bookmarkForm.description=Description
bookmarkForm.folder=Répertoire de signets
bookmarkForm.image=Lien de l'image
-bookmarkForm.name=Nom
bookmarkForm.priority=Priorité de tri
bookmarkForm.rssUrl=Adresse du fil d'information
bookmarkForm.save=Sauvegarder
@@ -79,7 +78,6 @@ bookmarksForm.edit=Editer
bookmarksForm.edit.tip=Cliquez pour éditer ce signet ou répertoire
bookmarksForm.move=Déplacer la selection
bookmarksForm.move.confirm=Déplacer les signets sélectionnés ?
-bookmarksForm.name=Nom
bookmarksForm.path=Chemin
bookmarksForm.visitLink=Visiter
bookmarksForm.visitLink.tip=Cliquez ici pour visiter ce site
@@ -127,7 +125,6 @@ categoryForm.add.subtitle=Ajouter une ca
categoryForm.correct.title=Modification de catégories
categoryForm.correct.subtitle=Modifier une catégorie
-categoryForm.name=Nom
categoryForm.description=Description
categoryForm.image=Image
categoryForm.save=Sauvegarder
@@ -137,7 +134,6 @@ categoryForm.error.duplicateName=Il exis
# ----------------------------------------------------------- CategoriesForm.jsp
-categoriesForm.name=Nom
categoriesForm.subtitle=Gérer les catégories du blog <span>{0}</span>
categoriesForm.description=Description
categoriesForm.edit=Editer
@@ -403,7 +399,6 @@ createWebsite.tip.theme=Le thème util
Vous pouvez aisément changer de thème ou éditer les modèles existants pour personnaliser votre blog à votre goût.
createWebsite.handle=Identifiant
-createWebsite.name=Nom
createWebsite.description=Description
createWebsite.emailAddress=Adresse de courriel
createWebsite.locale=Langue
@@ -579,7 +574,6 @@ folderForm.correct.title=Correct Folder
#FIXME
folderForm.correct.subtitle=Correcting bookmark folder edits
-folderForm.name=Nom
folderForm.save=Enregistrer
folderForm.cancel=Annuler
folderForm.description=Description
@@ -906,7 +900,6 @@ pas très à l'aise avec HTML, vous
de les modifier.
pageForm.advancedSettings=Paramètres avancés
-pagesForm.name=Nom
pagesForm.action=Action
pagesForm.link=Lien
pagesForm.description=Description
@@ -952,7 +945,6 @@ pas très à l'aise avec HTML, vous
de les modifier. Notez aussi que ce modèle étant un modèle réservé, \
vous ne pouvez pas changer le nom, le lien ou la description de celui-ci.\
-pageForm.name=Nom
pageForm.link=Lien
pageForm.hidden=Caché
pageForm.hidden.tip=Les pages cachées ne sont pas accessibles par un lien URL à travers ce blog
@@ -1045,7 +1037,6 @@ customPingTarget.subtitle=Ajouter ou �
#pour le blog <span>{0}</span>
commonPingTarget.subtitle=Edition de l'adresse de notification commune
-pingTarget.name=Nom
pingTarget.pingUrl=Adresse URL
pingTarget.autoEnabled=Ping Automatique
pingTarget.addNew=Ajouter
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=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties Wed Jul 2 04:26:31 2014
@@ -16,10 +16,10 @@
generic.all=\u3059\u3079\u3066
generic.none=\u306A\u3057
-application.cancel=\u30AD\u30E3\u30F3\u30BB\u30EB
-application.done=\u623B\u308B
-application.yes=\u306F\u3044
-application.no=\u3044\u3044\u3048
+generic.cancel=\u30AD\u30E3\u30F3\u30BB\u30EB
+generic.done=\u623B\u308B
+generic.yes=\u306F\u3044
+generic.no=\u3044\u3044\u3048
# ------------------------------------------------------------- BookmarkForm.jsp
@@ -27,10 +27,8 @@ bookmarkForm.add.title=\u30D6\u30C3\u30A
bookmarkForm.add.subtitle=\u30D5\u30A9\u30EB\u30C0[{0}]\u306B\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u3092\u8FFD\u52A0\u3059\u308B
bookmarkForm.edit.title=\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u3092\u7DE8\u96C6\u3059\u308B
bookmarkForm.edit.subtitle=\u30D5\u30A9\u30EB\u30C0[{0}]\u306E\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u3092\u7DE8\u96C6\u3059\u308B
-bookmarkForm.cancel=\u30AD\u30E3\u30F3\u30BB\u30EB
bookmarkForm.description=\u8A73\u7D30
bookmarkForm.image=\u753B\u50CFURL
-bookmarkForm.name=\u540D\u524D
bookmarkForm.rssUrl=Newsfeed\u306EURL
bookmarkForm.save=\u4FDD\u5B58
bookmarkForm.url=\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u306EURL
@@ -52,7 +50,6 @@ bookmarksForm.folder=\u30D6\u30C3\u30AF\
bookmarksForm.edit=\u7DE8\u96C6
bookmarksForm.edit.tip=\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u307E\u305F\u306F\u30D5\u30A9\u30EB\u30C0\u3092\u7DE8\u96C6
bookmarksForm.move=\u9078\u629E\u3057\u305F\u3082\u306E\u3092\u79FB\u52D5
-bookmarksForm.name=\u540D\u524D
bookmarksForm.path=\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u30D5\u30A9\u30EB\u30C0
bookmarksForm.visitLink=\u8A2A\u554F
bookmarksForm.visitLink.tip=\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u8A2A\u554F
@@ -93,16 +90,13 @@ categoryForm.edit.subtitle=\u30AB\u30C6\
categoryForm.add.title=\u30AB\u30C6\u30B4\u30EA\u8FFD\u52A0
categoryForm.add.subtitle=\u30AB\u30C6\u30B4\u30EA\u3092\u8FFD\u52A0\u3057\u307E\u3059
-categoryForm.name=\u540D\u524D
categoryForm.description=\u8A73\u7D30
categoryForm.image=\u753B\u50CF
categoryForm.save=\u4FDD\u5B58
-categoryForm.cancel=\u30AD\u30E3\u30F3\u30BB\u30EB
# ----------------------------------------------------------- CategoriesForm.jsp
-categoriesForm.name=\u540D\u524D
categoriesForm.subtitle=<span>{0}</span>\u306E\u30AB\u30C6\u30B4\u30EA\u3092\u7BA1\u7406\u3057\u307E\u3059
categoriesForm.description=\u8A73\u7D30
categoriesForm.edit=\u7DE8\u96C6
@@ -196,8 +190,6 @@ commentManagement.postTime=\u6295\u7A3F\
commentManagement.entryTitled=Regarding
commentManagement.select=\u9078\u629E
-commentManagement.all=\u3059\u3079\u3066
-commentManagement.none=\u306A\u3057
# -------------------------------------------------------------- CommentServlet
@@ -272,7 +264,6 @@ createWebsite.tip.theme=\u521D\u671F\u30
\u3042\u3068\u3067\u7528\u610F\u306B\u5909\u66F4\u3067\u304D\u307E\u3059\u3057\u3001\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA\u3082\u3067\u304D\u307E\u3059\u3002
createWebsite.handle=\u30D6\u30ED\u30B0\u30CF\u30F3\u30C9\u30EB
-createWebsite.name=\u30D6\u30ED\u30B0\u30BF\u30A4\u30C8\u30EB
createWebsite.description=\u8A73\u7D30
createWebsite.emailAddress=\u30E1\u30FC\u30EB\u30A2\u30C9\u30EC\u30B9
createWebsite.locale=\u30ED\u30B1\u30FC\u30EB
@@ -281,7 +272,6 @@ createWebsite.theme=\u521D\u671F\u30C6\u
createWebsite.weblogUrl=\u30D6\u30ED\u30B0URL
createWebsite.button.save=\u30D6\u30ED\u30B0\u3092\u4F5C\u6210
-createWebsite.button.cancel=\u30AD\u30E3\u30F3\u30BB\u30EB
createWebsite.created=\u65B0\u3057\u3044\u30D6\u30ED\u30B0[<b>{0}</b>]\u304C\u4F5C\u6210\u3055\u308C\u307E\u3057\u305F
@@ -346,9 +336,7 @@ folderForm.add.subtitle=\u65B0\u3057\u30
folderForm.edit.title=\u30D5\u30A9\u30EB\u30C0\u7DE8\u96C6
folderForm.edit.subtitle=\u30D5\u30A9\u30EB\u30C0[{0}]\u3092\u7DE8\u96C6\u3057\u307E\u3059
-folderForm.name=\u540D\u524D
folderForm.save=\u5909\u66F4\u3092\u4FDD\u5B58
-folderForm.cancel=\u30AD\u30E3\u30F3\u30BB\u30EB
# ------------------------------------------------------ index / setup page
@@ -417,10 +405,6 @@ loginPage.reset=\u30EA\u30BB\u30C3\u30C8
macro.bookmark.urlFeed=URL of site's RSS feed
-# -------------------------------------------------------------------- RSS Macro
-
-macro.rss.all=\u3059\u3079\u3066
-
# --------------------------------------------------------- Search Results Macro
macro.searchresults.hits_1=<strong>{0}</strong>\u30A8\u30F3\u30C8\u30EA\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F<em>\u307E\u305F
@@ -539,7 +523,6 @@ pagesForm.tip=\u30D6\u30ED\u30B0\u306E\u
\u65B0\u3057\u3044\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u3092\u5B9A\u7FA9\u3059\u308B\u305F\u3081\u306E\u30DA\u30FC\u30B8\u3092\u4F5C\u308B\u3053\u3068\u3082\u3067\u304D\u307E\u3059\u3002\
\u305F\u3060\u672C\u9805\u76EE\u306F<b>\u4E0A\u7D1A\u8005\u5411\u3051</b>\u3067\u3059\u3002\u6700\u4F4E\u9650\u3001HTML\u306E\u77E5\u8B58\u304C\u306A\u3044\u3068\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA\u306F\u3064\u3089\u3044\u3067\u3057\u3087\u3046\u3002
-pagesForm.name=\u540D\u524D
pagesForm.description=\u8A73\u7D30
pagesForm.remove=\u524A\u9664
pagesForm.required=(\u5FC5\u9808)
@@ -551,7 +534,6 @@ editPages.title.removeOK=\u30C6\u30F3\u3
# -------------------------------------------------------------------- Page edit
-pageForm.name=\u540D\u524D
pageForm.link=\u30EA\u30F3\u30AF
pageForm.hidden=\u96A0\u3057\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8
pageForm.hidden.tip=\u96A0\u3057\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u306A\u304F\u3059\u308B
@@ -596,7 +578,6 @@ pingTarget.pingTarget=Ping\u30BF\u30FC\u
commonPingTarget.subtitle=Ping\u30BF\u30FC\u30B2\u30C3\u30C8\u3092\u7DE8\u96C6\u3057\u307E\u3059
-pingTarget.name=\u30B5\u30A4\u30C8\u540D
pingTarget.pingUrl=Ping URL
pingTarget.autoEnabled=\u81EA\u52D5Ping\u8A2D\u5B9A
pingTarget.save=\u5909\u66F4\u3092\u4FDD\u5B58
@@ -690,7 +671,6 @@ planetGroups.title=Title
planetGroups.handle=\u30CF\u30F3\u30C9\u30EB
planetGroups.button.save=\u4FDD\u5B58
-planetGroups.button.cancel=\u30AD\u30E3\u30F3\u30BB\u30EB
planetGroups.button.delete=\u524A\u9664
planetGroups.success.saved=\u30B0\u30EB\u30FC\u30D7\u304C\u4FDD\u5B58\u3055\u308C\u307E\u3057\u305F
@@ -815,7 +795,6 @@ userRegister.tip.passwordConfirm=\u3082\
# ---------------------------------------------------------------- User settings
userSettings.button.save=\u5909\u66F4\u3092\u4FDD\u5B58
-userSettings.button.cancel=\u30AD\u30E3\u30F3\u30BB\u30EB
userSettings.username=\u30E6\u30FC\u30B6\u540D
userSettings.fullname=\u30D5\u30EB\u30CD\u30FC\u30E0
@@ -936,8 +915,6 @@ weblogEntriesPager.month.dateFormat=yyyy
# ---------------------------------------------------------- Weblog Entry Remove
weblogEntryRemove.removeWeblogEntry=\u30A8\u30F3\u30C8\u30EA\u306E\u524A\u9664
-weblogEntryRemove.yes=\u306F\u3044
-weblogEntryRemove.no=\u3044\u3044\u3048
weblogEntryRemove.areYouSure=\u672C\u5F53\u306B\u3053\u306E\u30A8\u30F3\u30C8\u30EA\u3092\u524A\u9664\u3057\u307E\u3059\u304B\uFF1F
weblogEntryRemove.entryTitle=\u30A8\u30F3\u30C8\u30EA\u30BF\u30A4\u30C8\u30EB
weblogEntryRemove.entryId=\u30A8\u30F3\u30C8\u30EAID
@@ -1033,13 +1010,11 @@ websiteSettings.ignoreUrls=\u3053\u3053\
\u6295\u7A3F\u306A\u3044\u3057\u53D7\u4FE1\u906E\u65AD\u306E\u5BFE\u8C61\u3068\u306A\u308A\u307E\u3059\u3002
websiteSettings.acceptedBlacklist={0}\u500B\u306E\u6587\u5B57\u5217\u3068{1}\u30D1\u30BF\u30FC\u30F3\u306E\u6B63\u898F\u8868\u73FE\u306E\u30D6\u30E9\u30C3\u30AF\u30EA\u30B9\u30C8\u30EB\u30FC\u30EB\u304C\u767B\u9332\u3055\u308C\u3066\u3044\u307E\u3059\u3002
websiteSettings.error.processingBlacklist=Error processing blacklist: {0}
-websiteSettings.error.sameTemplate=\u30C7\u30D5\u30A9\u30EB\u30C8\u30DA\u30FC\u30B8\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u3068day\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u304C\u540C\u4E00\u306E\u305F\u3081\u3001\u5909\u66F4\u306F\u62D2\u5426\u3055\u308C\u307E\u3057\u305F\u3002
# --- Buttons
websiteSettings.savedChanges=\u8A2D\u5B9A\u304C\u4FDD\u5B58\u3055\u308C\u307E\u3057\u305F
websiteSettings.button.update=\u8A2D\u5B9A\u3092\u4FDD\u5B58
-websiteSettings.button.rebuildIndex=\u691C\u7D22\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u304C\u518D\u69CB\u7BC9\u3055\u308C\u307E\u3057\u305F
# --- Remove weblog
@@ -1142,13 +1117,10 @@ comment.validator.excessSizeMessage=\u30
comment.validator.excessLinksMessage=\u30B3\u30E1\u30F3\u30C8\u304C{0}\u500B\u4EE5\u4E0A\u306E\u30EA\u30F3\u30AF\u3092\u6301\u3063\u3066\u3044\u307E\u3059
Entry.error.textNull=\u672C\u6587\u306F\u5FC5\u9808\u9805\u76EE\u3067\u3059
pageForm.outputContentType=Content-Type
-pageForm.outputContentTypeStyle=CSS (test/style)
planetSubscriptions.column.delete=\u524A\u9664
-uploadFiles.error.delete={0}\u306E\u524A\u9664\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304C\u7A7A\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
bookmarksForm.delete.confirm=\u9078\u629E\u3057\u305F\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u3092\u524A\u9664
commentManagement.bulkDeletePrompt2=\u3053\u308C\u3089\u3059\u3079\u3066\u3092\u524A\u9664\u3057\u307E\u3059\u304B\uFF1F
CreateWeblog.error.descriptionSize=\u8A73\u7D30\u306F255\u6587\u5B57\u4EE5\u5185\u3067\u306A\u3051\u308C\u3070\u3044\u3051\u307E\u305B\u3093
-Folder.error.descriptionSize=\u8A73\u7D30\u306F255\u6587\u5B57\u4EE5\u5185\u3067\u306A\u3051\u308C\u3070\u3044\u3051\u307E\u305B\u3093
Template.error.descriptionSize=\u8A73\u7D30\u306F255\u6587\u5B57\u4EE5\u5185\u3067\u306A\u3051\u308C\u3070\u3044\u3051\u307E\u305B\u3093
Bookmark.error.descriptionSize=\u8A73\u7D30\u306F255\u6587\u5B57\u4EE5\u5185\u3067\u306A\u3051\u308C\u3070\u3044\u3051\u307E\u305B\u3093
WeblogConfig.error.descriptionSize=\u8A73\u7D30\u306F255\u6587\u5B57\u4EE5\u5185\u3067\u306A\u3051\u308C\u3070\u3044\u3051\u307E\u305B\u3093
Modified: roller/trunk/app/src/main/resources/ApplicationResources_ko.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ko.properties?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ko.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ko.properties Wed Jul 2 04:26:31 2014
@@ -17,10 +17,10 @@
generic.all=\ubaa8\ub4e0 \uc758\uacac
generic.none=\uc5c6\uc74c
-application.cancel=\ucde8\uc18c
-application.done=\ucc98\ub9ac \uc644\ub8cc
-application.yes=\uc608
-application.no=\uc544\ub2c8\uc624
+generic.cancel=\ucde8\uc18c
+generic.done=\ucc98\ub9ac \uc644\ub8cc
+generic.yes=\uc608
+generic.no=\uc544\ub2c8\uc624
application.true=\ucc38
application.false=\uac70\uc9d3
@@ -39,7 +39,6 @@ bookmarkForm.cancel=\ucde8\uc18c
bookmarkForm.description=\uc124\uba85
bookmarkForm.folder=\ubd81\ub9c8\ud06c \ud3f4\ub354
bookmarkForm.image=\uc774\ubbf8\uc9c0 URL
-bookmarkForm.name=\uc774\ub984
bookmarkForm.priority=\uc6b0\uc120\uc21c\uc704 \uc815\ub82c
bookmarkForm.rssUrl=\ub274\uc2a4 \ud53c\ub4dc URL
bookmarkForm.save=\uc800\uc7a5
@@ -93,7 +92,6 @@ bookmarksForm.edit=\ud3b8\uc9d1
bookmarksForm.edit.tip=\uc774 \ud3f4\ub354 \ub610\ub294 \ubd81\ub9c8\ud06c\ub97c \ud3b8\uc9d1\ud558\uc2dc\ub824\uba74 \ud074\ub9ad\ud558\uc2ed\uc2dc\uc624.
bookmarksForm.move=\uc120\ud0dd \ud56d\ubaa9 \uc774\ub3d9
bookmarksForm.move.confirm=\uc120\ud0dd\ub41c \ubd81\ub9c8\ud06c\ub4e4\uc744 \uc774\ub3d9\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?
-bookmarksForm.name=\uc774\ub984
bookmarksForm.path=\uacbd\ub85c
bookmarksForm.visitLink=\ubc29\ubb38
bookmarksForm.visitLink.tip=\uc774 \uc0ac\uc774\ud2b8\ub97c \ubc29\ubb38\ud558\uc2dc\ub824\uba74 \ud074\ub9ad\ud558\uc2ed\uc2dc\uc624.
@@ -138,7 +136,6 @@ categoryForm.add.subtitle=\uce74\ud14c\u
categoryForm.correct.title=\uce74\ud14c\uace0\ub9ac \ubcc0\uacbd
categoryForm.correct.subtitle=\uce74\ud14c\uace0\ub9ac\ub97c \ubcc0\uacbd\ud569\ub2c8\ub2e4.
-categoryForm.name=\uc774\ub984
categoryForm.description=\uc124\uba85
categoryForm.image=\uc774\ubbf8\uc9c0
categoryForm.save=\uc800\uc7a5
@@ -155,7 +152,6 @@ Category.error.imageBad=\uc785\ub825\ud5
# ----------------------------------------------------------- CategoriesForm.jsp
-categoriesForm.name=\uc774\ub984
categoriesForm.subtitle=\uc6f9\ub85c\uadf8 <span>{0}</span> \ub0b4\uc758 \uce74\ud14c\uace0\ub9ac \uad00\ub9ac
categoriesForm.description=\uc124\uba85
categoriesForm.edit=\ud3b8\uc9d1
@@ -411,7 +407,6 @@ createWebsite.tip.theme=\uc774 \uc6f9\ub
\ub098\uc911\uc5d0 \ub2e4\ub978 \ud14c\ub9c8\ub85c \ubc14\uafb8\uac70\ub098 \uc6d0\ud558\ub294 \ub300\ub85c \ud14c\ub9c8 \ud15c\ud50c\ub9bf\ub4e4\uc744 \uc27d\uac8c \ud3b8\uc9d1\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4.
createWebsite.handle=\ud578\ub4e4
-createWebsite.name=\uc774\ub984
createWebsite.description=\uc124\uba85
createWebsite.emailAddress=\uc804\uc790\uc6b0\ud3b8 \uc8fc\uc18c
createWebsite.locale=\ub85c\ucf00\uc77c
@@ -592,7 +587,6 @@ folderForm.edit.subtitle=\ud3f4\ub354 [{
folderForm.correct.title=\ud3f4\ub354 \uac31\uc2e0
folderForm.correct.subtitle=\ubd81\ub9c8\ud06c \ud3f4\ub354 \ud3b8\uc9d1 \uac31\uc2e0
-folderForm.name=\uc774\ub984
folderForm.save=\uc800\uc7a5
folderForm.cancel=\ucde8\uc18c
folderForm.description=\uc124\uba85
@@ -970,7 +964,6 @@ pagesForm.tip=\uc6f9\ub85c\uadf8\uc758 \
\ud15c\ud50c\ub9bf\uc744 \uadf8\ub300\ub85c \ub450\uae30 \ubc14\ub78d\ub2c8\ub2e4.
pageForm.advancedSettings=\uace0\uae09 \ud658\uacbd \uc124\uc815 \uc815\ubcf4
-pagesForm.name=\uc774\ub984
pagesForm.action=\uc791\uc5c5
pagesForm.link=\ub9c1\ud06c
pagesForm.description=\uc124\uba85
@@ -1004,7 +997,6 @@ pageForm.tip=\uc774 \ud15c\ud50c\ub9bf\u
\uc774 \uae30\ub2a5\uc740 \uace0\uae09 \uc0ac\uc6a9\uc790\ub4e4\ub9cc\uc744 \uc704\ud55c \uac83\uc73c\ub85c\uc11c, HTML \uc0ac\uc6a9\uc5d0 \uc775\uc219\uce58 \uc54a\ub2e4\uba74, \
\uc774 \ud15c\ud50c\ub9bf\uc744 \uadf8\ub300\ub85c \ub450\uc2ed\uc2dc\uc624. \uc8fc\uc758: \uc774\ub294 \ud544\uc218\uc801\uc778 \uc6f9\ub85c\uadf8 \ud15c\ud50c\ub9bf\uc774\ubbc0\ub85c, \
\uc774\ub984, \ub9c1\ud06c \ub610\ub294 \uc124\uba85\uc744 \ubcc0\uacbd\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
-pageForm.name=\uc774\ub984
pageForm.link=\ub9c1\ud06c
pageForm.hidden=\uc228\uae40
pageForm.hidden.tip=\uc228\uae40 \ud398\uc774\uc9c0\ub4e4\uc740 \uc6f9\ub85c\uadf8 URL\uc744 \ud1b5\ud574 \uc811\uadfc\ub420 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
@@ -1091,7 +1083,6 @@ pingTarget.pingTarget=\uc5f0\uacb0\ud655
customPingTarget.subtitle=\uc6f9\ub85c\uadf8, <span>{0}</span> \ub0b4\uc758 \ucee4\uc2a4\ud140 \uc5f0\uacb0\ud655\uc778 \ub300\uc0c1 \ud3b8\uc9d1
commonPingTarget.subtitle=\uacf5\ud1b5 \uc5f0\uacb0\ud655\uc778 \ub300\uc0c1 \ud3b8\uc9d1
-pingTarget.name=\uc774\ub984
pingTarget.pingUrl=\uc5f0\uacb0\ud655\uc778 URL
pingTarget.autoEnabled=\uc790\ub3d9 \uc5f0\uacb0\ud655\uc778?
pingTarget.addNew=\uc2e0\uaddc \ub4f1\ub85d
Modified: roller/trunk/app/src/main/resources/ApplicationResources_nl.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_nl.properties?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_nl.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_nl.properties Wed Jul 2 04:26:31 2014
@@ -62,7 +62,6 @@ bookmarkForm.description=Omschrijving
bookmarkForm.editBookmark=Wijzig Favoriet
bookmarkForm.folder=Favorieten Folder
bookmarkForm.image=URL van Plaatje
-bookmarkForm.name=Naam
bookmarkForm.priority=Sorteer Prioriteit
bookmarkForm.rssUrl=URL van RSS feed
bookmarkForm.save=Bewaren
@@ -79,7 +78,6 @@ bookmarksForm.edit=Wijzig
bookmarksForm.edit.tip=Klik om deze favoriet te wijzigen.
bookmarksForm.folder=Folder
bookmarksForm.move=Verplaats selectie
-bookmarksForm.name=Naam
bookmarksForm.path=Pad
bookmarksForm.root=start
bookmarksForm.visitLink=Ga naar
@@ -99,7 +97,6 @@ calendar.next=Volgende
# ---------------------------------------------------------- CategoryForm.jsp
-categoryForm.name=Naam
categoryForm.description=Omschrijving
categoryForm.image=Plaatje
categoryForm.save=Bewaren
@@ -110,7 +107,6 @@ categoryForm.correctCategory=Corrigeer C
# ---------------------------------------------------------- CategoriesForm.jsp
-categoriesForm.name=Naam
categoriesForm.description=Omschrijving
categoriesForm.edit=Wijzigen
categoriesForm.root=Start
@@ -313,7 +309,6 @@ navigationBar.register=Registreren
# ------------------------------------------------------------ Page management
pagesForm.title=Pagina Templates
-pagesForm.name=Naam
pagesForm.link=Link
pagesForm.description=Omschrijving
pagesForm.edit=Wijzigen
@@ -327,7 +322,6 @@ pagesForm.emptyPage=Lege pagina...
# ------------------------------------------------------------ Page edit
pageForm.editPage=Wijzig Pagina
-pageForm.name=Naam
pageForm.link=Link
pageForm.description=Omschrijving
pageForm.template=Template
@@ -336,7 +330,6 @@ pageForm.save=Bewaren
# ------------------------------------------------------------ FolderForm.jsp
-folderForm.name=Naam
folderForm.save=Bewaren
folderForm.cancel=Afbreken
folderForm.description=Omschrijvingen
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=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ru.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ru.properties Wed Jul 2 04:26:31 2014
@@ -6,10 +6,10 @@
generic.all=\u0412\u0441\u0435
generic.none=\u041d\u0435\u0442
-application.cancel=\u041e\u0442\u043c\u0435\u043d\u0430
-application.done=\u0413\u043e\u0442\u043e\u0432\u043e
-application.yes=\u0414\u0430
-application.no=\u041d\u0435\u0442
+generic.cancel=\u041e\u0442\u043c\u0435\u043d\u0430
+generic.done=\u0413\u043e\u0442\u043e\u0432\u043e
+generic.yes=\u0414\u0430
+generic.no=\u041d\u0435\u0442
# ------------------------------------------------------------- BookmarkForm.jsp
@@ -26,7 +26,6 @@ bookmarkForm.cancel=\u041e\u0442\u043c\u
bookmarkForm.description=\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435
bookmarkForm.folder=\u041e\u0442\u043c\u0435\u0442\u0438\u0442\u044c \u043f\u0430\u043f\u043a\u0443
bookmarkForm.image=URL \u041a\u0430\u0440\u0442\u0438\u043d\u043a\u0438
-bookmarkForm.name=\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435
bookmarkForm.priority=\u0421\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u043a\u0430
bookmarkForm.rssUrl=URL \u041d\u043e\u0432\u043e\u0441\u0442\u0435\u0439
bookmarkForm.save=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c
@@ -58,7 +57,6 @@ bookmarksForm.folder=\u041f\u0430\u043f\
bookmarksForm.edit=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c
bookmarksForm.edit.tip=\u041d\u0430\u0436\u043c\u0438\u0442\u0435 \u0447\u0442\u043e\u0431\u044b \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c
bookmarksForm.move=\u041f\u0435\u0440\u0435\u043c\u0435\u0441\u0442\u0438\u0442\u044c \u0432\u044b\u0431\u0440\u0430\u043d\u043d\u043e\u0435
-bookmarksForm.name=\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435
bookmarksForm.path=\u041F\u0430\u043F\u043A\u0430 \u0421\u0441\u044B\u043B\u043E\u043A
bookmarksForm.visitLink=\u041f\u043e\u0441\u0435\u0442\u0438\u0442\u044c
bookmarksForm.visitLink.tip=\u041d\u0430\u0436\u043c\u0438\u0442\u0435 \u0447\u0442\u043e\u0431\u044b \u043f\u0435\u0440\u0435\u0439\u0442\u0438
@@ -89,7 +87,6 @@ categoryForm.add.subtitle=\u0414\u043e\u
categoryForm.correct.title=\u0418\u0441\u043f\u0440\u0430\u0432\u0438\u0442\u044c \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044e
categoryForm.correct.subtitle=\u0418\u0441\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u0438
-categoryForm.name=\u0418\u043c\u044f
categoryForm.description=\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435
categoryForm.image=\u043a\u0430\u0440\u0442\u0438\u043d\u043a\u0430
categoryForm.save=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c
@@ -98,7 +95,6 @@ categoryForm.cancel=\u041e\u0442\u043c\u
# ----------------------------------------------------------- CategoriesForm.jsp
-categoriesForm.name=\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435
categoriesForm.subtitle=\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044f\u043c\u0438 \u0432 \u0434\u043d\u0435\u0432\u043d\u0438\u043a\u0435 <span>{0}</span>
categoriesForm.description=\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435
categoriesForm.edit=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c
@@ -249,7 +245,6 @@ createWebsite.tip.theme=\u0422\u0435\u04
\u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u043b\u0435\u0433\u043a\u043e \u043f\u0435\u0440\u0435\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043d\u0430 \u0434\u0440\u0443\u0433\u0443\u044e \u0442\u0435\u043c\u0443 \u0438\u043b\u0438 \u043e\u0442\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0448\u0430\u0431\u043b\u043e\u043d.
createWebsite.handle=\u0418\u043c\u044f
-createWebsite.name=\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435
createWebsite.description=\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435
createWebsite.emailAddress=Email
createWebsite.locale=\u041a\u043e\u0434\u0438\u0440\u043e\u0432\u043a\u0430
@@ -402,7 +397,6 @@ folderForm.edit.subtitle=\u0420\u0435\u0
folderForm.correct.title=\u041a\u043e\u0440\u0440\u0435\u043a\u0442\u043d\u044b\u0439 \u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a \u043f\u0430\u043f\u043a\u0438
folderForm.correct.subtitle=\u041a\u043e\u0440\u0440\u0435\u043a\u0442\u043d\u043e\u0435 \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u043f\u0430\u043f\u043a\u0438 \u0437\u0430\u043a\u043b\u0430\u0434\u043e\u043a
-folderForm.name=\u0418\u043c\u044f
folderForm.save=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c
folderForm.cancel=\u041e\u0442\u043c\u0435\u043d\u0430
folderForm.description=\u043e\u043f\u0438\u0441\u0430\u043d\u0438\u0435
@@ -629,7 +623,6 @@ pagesForm.title=\u0428\u0430\u0431\u043b
pagesForm.subtitle=\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0448\u0430\u0431\u043b\u043e\u043d\u0430\u043c\u0438 \u0434\u043d\u0435\u0432\u043d\u0438\u043a\u0430 <span>{0}</span>
pagesForm.tip=\u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0448\u0430\u0431\u043b\u043e\u043d\u044b, \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u044f\u044e\u0449\u0438\u0435 \u043e\u0444\u043e\u0440\u043c\u043b\u0435\u043d\u0438\u0435 (\u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435, \u0446\u0432\u0435\u0442\u0430 \u0438 \u0448\u0440\u0438\u0444\u0442\u044b) \u0412\u0430\u0448\u0435\u0433\u043e \u0434\u043d\u0435\u0432\u043d\u0438\u043a\u0430. \u0422\u0430\u043a\u0436\u0435 \u0432\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0441\u043e\u0437\u0434\u0430\u0432\u0430\u0442\u044c \u0448\u0430\u0431\u043b\u043e\u043d\u044b, \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u044f\u044e\u0449\u0438\u0435 \u0432\u0438\u0434 \u043d\u043e\u0432\u044b\u0445 \u0441\u0442\u0440\u0430\u043d\u0438\u0446. \u042d\u0442\u0430 \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u044c - \u
0434\u043b\u044f \u043e\u043f\u044b\u0442\u043d\u044b\u0445 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439, \u0435\u0441\u043b\u0438 \u0432\u044b \u043d\u0435 \u0443\u0432\u0435\u0440\u0435\u043d\u044b \u0432 \u0437\u043d\u0430\u043d\u0438\u0438 HTML, \u0442\u043e \u043c\u043e\u0436\u0435\u0442\u0435 \u043f\u0440\u043e\u0441\u0442\u043e \u043e\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0441\u0432\u043e\u0439 \u0448\u0430\u0431\u043b\u043e\u043d.
-pagesForm.name=\u0418\u043c\u044f
pagesForm.link=\u0421\u0441\u044b\u043b\u043a\u0430
pagesForm.description=\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435
pagesForm.edit=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c
@@ -648,7 +641,6 @@ pageCache.flushed=\u041a\u044d\u0448 \u0
pageForm.title=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u0448\u0430\u0431\u043b\u043e\u043d\u0430
pageForm.editPage=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0448\u0430\u0431\u043b\u043e\u043d
-pageForm.name=\u0418\u043c\u044f
pageForm.link=\u0421\u0441\u044b\u043b\u043a\u0430
pageForm.description=\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435
pageForm.template=\u0428\u0430\u0431\u043b\u043e\u043d
@@ -686,7 +678,6 @@ pingTarget.pingTarget=\u0410\u0434\u0440
commonPingTarget.subtitle=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043e\u0431\u0449\u0438\u0435 \u0430\u0434\u0440\u0435\u0441\u0430 \u043f\u0438\u043d\u0433\u0430
-pingTarget.name=\u0418\u043c\u044f
pingTarget.pingUrl=URL \u043f\u0438\u043d\u0433\u0430
pingTarget.addNew=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c...
pingTarget.save=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c
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=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties Wed Jul 2 04:26:31 2014
@@ -12,12 +12,12 @@
# copyright in this work, please see the NOTICE file in the top level
# directory of this distribution.
-application.cancel=\u53d6\u6d88
-application.done=\u6267\u884c
-application.no=\u5426
+generic.cancel=\u53d6\u6d88
+generic.done=\u6267\u884c
+generic.no=\u5426
generic.none=\u4ec0\u4e48\u4e5f\u6ca1\u6709
generic.all=\u6240\u6709
-application.yes=\u662f
+generic.yes=\u662f
bookmarkForm.add.subtitle=\u5728\u6587\u4ef6\u5939 [{0}] \u6dfb\u52a0\u65b0\u7684\u4e66\u7b7e
bookmarkForm.add.title=\u6dfb\u52a0\u65b0\u4e66\u7b7e
bookmarkForm.addBookmark=\u589e\u52a0\u4e00\u4e2a\u65b0\u4e66\u7b7e
@@ -31,7 +31,6 @@ bookmarkForm.edit.title=\u7f16\u8f91\u4e
bookmarkForm.editBookmark=\u7f16\u8f91\u4e66\u7b7e
bookmarkForm.folder=\u4e66\u7b7e\u5939
bookmarkForm.image=\u56fe\u50cfURL
-bookmarkForm.name=\u540d\u5b57
bookmarkForm.priority=\u6392\u5e8f\u4f18\u5148\u7ea7
bookmarkForm.rssUrl=\u65b0\u95fb\u79cd\u5b50URL
bookmarkForm.save=\u4fdd\u5b58
@@ -49,7 +48,6 @@ bookmarksForm.folderPrompt=\u8fd9\u662f\
bookmarksForm.folderTitle=\u4e66\u7b7e\u5939 [{0}]
bookmarksForm.importBookmarks=\u5bfc\u5165OPML\u683c\u5f0f\u7684\u4e66\u7b7e
bookmarksForm.move=\u79fb\u52a8\u9009\u4e2d\u7684
-bookmarksForm.name=\u540d\u5b57
bookmarksForm.path=\u4E66\u7B7E\u5939
bookmarksForm.root=\u6839
bookmarksForm.rootPrompt=\u8fd9\u662f\u60a8\u7684\u9876\u5c42\u4e66\u7b7e\u5939\u3002\u8fd9\u91cc\u4fdd\u7559\u7684\u4e66\u7b7e\u5c06\u4f1a\u5728\u60a8\u7684\u7f51\u5fd7\u7684blogroll\u663e\u793a\uff08\u8fd9\u91cc\u5047\u8bbe\u60a8\u4f7f\u7528\u9ed8\u8ba4\u4e3b\u9898\uff09\u3002\u60a8\u4e5f\u53ef\u4ee5\u5efa\u7acb\u4e66\u7b7e\u5939\uff0c\u76f8\u5e94\u7684\uff0c\u5982\u679c\u60a8\u9700\u8981\u663e\u793a\u4e66\u7b7e\u5939\u7684\u5185\u5bb9\uff0c\u5c31\u9700\u8981\u5728\u60a8\u7684\u6a21\u677f\u4e2d\u5f15\u7528\u76f8\u5e94\u7684\u5b8f\u6765\u4f7f\u7528\u5b83\u3002
@@ -78,7 +76,6 @@ categoriesForm.description=\u63cf\u8ff0
categoriesForm.edit=\u7f16\u8f91
categoriesForm.error.move=\u79fb\u52a8\u9519\u8bef\uff0c\u4e0d\u80fd\u7531\u7236\u76ee\u5f55\u79fb\u52a8\u5230\u5b83\u7684\u5b50\u76ee\u5f55
categoriesForm.move=\u79fb\u52a8
-categoriesForm.name=\u5206\u7c7b\u540d\u79f0
categoriesForm.parent=\u5206\u7c7b
categoriesForm.path=\u8def\u5f84
categoriesForm.remove=\u79fb\u9664
@@ -105,7 +102,6 @@ categoryForm.edit.subtitle=\u6b63\u5728\
categoryForm.edit.title=\u7f16\u8f91\u5206\u7c7b
categoryForm.editCategory=\u7f16\u8f91\u5206\u7c7b
categoryForm.image=\u56fe\u50cf
-categoryForm.name=\u5206\u7c7b\u540d\u79f0
categoryForm.save=\u4fdd\u5b58
commentManagement.all=\u6240\u6709
commentManagement.approved=\u6279\u51c6
@@ -242,7 +238,6 @@ createWebsite.description=\u63cf\u8ff0
createWebsite.emailAddress=\u7535\u5b50\u90ae\u4ef6\u5730\u5740
createWebsite.handle=\u7f51\u5fd7\u5730\u5740
createWebsite.locale=\u672c\u5730\u5316\u8bbe\u7f6e
-createWebsite.name=\u7f51\u7ad9\u540d
createWebsite.prompt=\u60a8\u53ef\u4ee5\u901a\u8fc7\u4e0b\u9762\u7684\u8868\u5355\u4e3a\u60a8\u6216\u8005\u60a8\u7684\u670b\u53cb\u4eec\u5efa\u7acb\u4e00\u4e2a\u65b0\u7684\u7f51\u5fd7
createWebsite.theme=\u4e3b\u9898
createWebsite.timeZone=\u65f6\u533a
@@ -358,7 +353,6 @@ folderForm.description=\u63cf\u8ff0
folderForm.edit.subtitle=\u6B63\u5728\u7F16\u8F91\u6587\u4EF6\u5939 [{0}]
folderForm.edit.title=\u7f16\u8f91\u6587\u4ef6\u5939
folderForm.editFolder=\u7f16\u8f91\u4e66\u7b7e\u5939
-folderForm.name=\u540d\u5b57
folderForm.save=\u4fdd\u5b58
folderForm.save.exception=\u4fdd\u5b58\u4e66\u7b7e\u5939\u51fa\u9519,\u662f\u5426\u540d\u5b57\u5df2\u7ecf\u88ab\u5360\u7528\uff1f\u9519\u8bef\u4fe1\u606f\u662f{0}
footer.macros=\u5b8f
@@ -521,7 +515,6 @@ pageCache.flushed=\u9875\u9762\u7f13\u5b
pageForm.description=\u63cf\u8ff0
pageForm.editPage=\u7f16\u8f91\u6a21\u677f
pageForm.link=\u94fe\u63a5
-pageForm.name=\u540d\u5b57
pageForm.save=\u4fdd\u5b58
pageForm.save.success=\u6a21\u677f\u6210\u529f\u66f4\u65b0\u3002
pageForm.template=\u6a21\u677f
@@ -539,7 +532,6 @@ pagesForm.edit=\u7f16\u8f91
pagesForm.emptyPage=\u7a7a\u6a21\u677f\u2026\u2026
pagesForm.hiddenNote=\u6ce8\u610f\uff1a\u540d\u5b57\u4ee5"_"\u4e0b\u5212\u7ebf\u4e3a\u5f00\u5934\u7684\u9875\u9762\u662f\u9690\u85cf\u7684\u3002\u4ed6\u4eec\u4e0d\u4f1a\u5728\u5bfc\u822a\u6761\u4e2d\u663e\u793a\u3002
pagesForm.link=\u94fe\u63a5
-pagesForm.name=\u540d\u5b57
pagesForm.remove=\u79fb\u9664
pagesForm.required=\uff08\u5fc5\u9700\u7684\uff09
pagesForm.subtitle=\u7ba1\u7406\u7f51\u5fd7 <span>{0}</span> \u7684\u6a21\u677f
@@ -566,7 +558,6 @@ pingTarget.enable=\u751f\u6548
pingTarget.enabled=\u5f00\u542f
pingTarget.malformedUrl=URL\u683c\u5f0f\u4e0d\u6b63\u786e\u3002
pingTarget.manual=\u624b\u52a8
-pingTarget.name=\u540d\u5b57
pingTarget.nameNotUnique=\u8fd9\u4e2aPing\u76ee\u6807\u7684\u540d\u5b57\u540c\u5176Ping\u76ee\u6807\u6709\u51b2\u7a81\u3002
pingTarget.pingTarget=Ping\u76ee\u6807
pingTarget.pingUrl=Ping URL\u5730\u5740
Modified: roller/trunk/app/src/main/resources/ApplicationResources_zh_TW.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_zh_TW.properties?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_zh_TW.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_zh_TW.properties Wed Jul 2 04:26:31 2014
@@ -62,7 +62,6 @@ bookmarkForm.description=\u5167\u5bb9
bookmarkForm.editBookmark=\u7de8\u8f2f\u66f8\u7c64
bookmarkForm.folder=\u66f8\u7c64\u593e
bookmarkForm.image=\u5f71\u50cfURL
-bookmarkForm.name=\u540d\u7a31
bookmarkForm.priority=\u6307\u5b9a\u512a\u5148\u9806\u5e8f
bookmarkForm.rssUrl=Newsfeed URL
bookmarkForm.save=\u5b58\u6a94
@@ -79,7 +78,6 @@ bookmarksForm.edit=\u7de8\u8f2f
bookmarksForm.edit.tip=\u9ede\u9078\u6b64\u8655\u4ee5\u7de8\u8f2f\u6b64\u66f8\u7c64
bookmarksForm.folder=\u8cc7\u6599\u593e
bookmarksForm.move=\u642c\u79fb\u5df2\u9078\u53d6
-bookmarksForm.name=\u540d\u7a31
bookmarksForm.path=\u8CC7\u6599\u593E
bookmarksForm.root=\u6839\u8def\u5f91
bookmarksForm.visitLink=\u700f\u89bd\u7db2\u7ad9
@@ -99,7 +97,6 @@ calendar.next=\u4e0b\u4e00\u6708
# ---------------------------------------------------------- CategoryForm.jsp
-categoryForm.name=\u540d\u7a31
categoryForm.description=\u5167\u5bb9
categoryForm.image=\u5f71\u50cf
categoryForm.save=\u5b58\u6a94
@@ -110,7 +107,6 @@ categoryForm.correctCategory=\u66f4\u6b6
# ---------------------------------------------------------- CategoriesForm.jsp
-categoriesForm.name=\u540d\u7a31
categoriesForm.description=\u5167\u5bb9
categoriesForm.edit=\u7de8\u8f2f
categoriesForm.root=\u6839\u76ee\u9304
@@ -330,7 +326,6 @@ navigationBar.register=\u8a3b\u518a\u65b
# ------------------------------------------------------------ Page management
pagesForm.title=\u9801\u9762\u6a23\u677f
-pagesForm.name=\u540d\u7a31
pagesForm.link=\u9023\u7d50
pagesForm.description=\u5167\u5bb9
pagesForm.edit=\u7de8\u8f2f
@@ -345,7 +340,6 @@ pagesForm.emptyPage=\u7a7a\u767d\u9801\u
# ------------------------------------------------------------ Page edit
pageForm.editPage=\u7de8\u8f2f\u9801\u9762
-pageForm.name=\u540d\u7a31
pageForm.link=\u9023\u7d50
pageForm.description=\u5167\u5bb9
pageForm.template=\u9801\u9762\u6a23\u677f
@@ -355,7 +349,6 @@ pageForm.save.success=\u9801\u9762\u5df2
# ------------------------------------------------------------ FolderForm.jsp
-folderForm.name=\u540d\u7a31
folderForm.save=\u5b58\u6a94
folderForm.cancel=\u53d6\u6d88
folderForm.description=\u5167\u5bb9
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetAdd.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetAdd.jsp?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetAdd.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetAdd.jsp Wed Jul 2 04:26:31 2014
@@ -25,7 +25,7 @@
<s:hidden name="salt" />
<div class="formrow">
- <label for="name" class="formrow"><s:text name="pingTarget.name" /></label>
+ <label for="name" class="formrow"><s:text name="generic.name" /></label>
<s:textfield name="bean.name" size="30" maxlength="30" />
</div>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetConfirm.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetConfirm.jsp?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetConfirm.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetConfirm.jsp Wed Jul 2 04:26:31 2014
@@ -25,7 +25,7 @@
<p/>
<table>
- <tr><td><s:text name="pingTarget.name" /> </td><td><b><s:property value="pingTarget.name" /></b></td></tr>
+ <tr><td><s:text name="generic.name" /> </td><td><b><s:property value="pingTarget.name" /></b></td></tr>
<tr><td><s:text name="pingTarget.pingUrl" /> </td><td><b><s:property value="pingTarget.pingUrl" /></b></td></tr>
</table>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetEdit.jsp?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetEdit.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetEdit.jsp Wed Jul 2 04:26:31 2014
@@ -26,7 +26,7 @@
<s:hidden name="bean.id" />
<div class="formrow">
- <label for="name" class="formrow"><s:text name="pingTarget.name" /></label>
+ <label for="name" class="formrow"><s:text name="generic.name" /></label>
<s:textfield name="bean.name" size="30" maxlength="30" />
</div>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargets.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargets.jsp?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargets.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargets.jsp Wed Jul 2 04:26:31 2014
@@ -27,7 +27,7 @@
<%-- Headings --%>
<tr class="rollertable">
- <th class="rollertable" width="20%%"><s:text name="pingTarget.name" /></th>
+ <th class="rollertable" width="20%%"><s:text name="generic.name" /></th>
<th class="rollertable" width="55%"><s:text name="pingTarget.pingUrl" /></th>
<th class="rollertable" width="15%" colspan="2"><s:text name="pingTarget.autoEnabled" /></th>
<th class="rollertable" width="5%"><s:text name="pingTarget.edit" /></th>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CreateUser.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CreateUser.jsp?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CreateUser.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CreateUser.jsp Wed Jul 2 04:26:31 2014
@@ -92,7 +92,7 @@
<div class="control">
<s:submit value="%{getText('userAdmin.save')}" />
- <input type="button" value="<s:text name="application.cancel"/>" onclick="window.location='<s:url action="userAdmin"/>'" />
+ <input type="button" value="<s:text name="generic.cancel"/>" onclick="window.location='<s:url action="userAdmin"/>'" />
</div>
</s:form>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagement.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagement.jsp?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagement.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagement.jsp Wed Jul 2 04:26:31 2014
@@ -334,7 +334,7 @@ function handleCommentResponse() {
<s:submit value="%{getText('commentManagement.update')}" />
-<s:submit value="%{getText('application.cancel')}" action="globalCommentManagement" />
+<s:submit value="%{getText('generic.cancel')}" action="globalCommentManagement" />
</s:form>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/ModifyUser.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/ModifyUser.jsp?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/ModifyUser.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/ModifyUser.jsp Wed Jul 2 04:26:31 2014
@@ -146,7 +146,7 @@
<div class="control">
<s:submit value="%{getText('userAdmin.save')}" />
- <input type="button" value="<s:text name="application.cancel"/>" onclick="window.location='<s:url action="userAdmin"/>'" />
+ <input type="button" value="<s:text name="generic.cancel"/>" onclick="window.location='<s:url action="userAdmin"/>'" />
</div>
</s:form>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PlanetGroups.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PlanetGroups.jsp?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PlanetGroups.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PlanetGroups.jsp Wed Jul 2 04:26:31 2014
@@ -51,7 +51,7 @@
<s:submit value="%{getText('planetGroups.button.save')}" />
<input type="button"
- value='<s:text name="application.cancel" />'
+ value='<s:text name="generic.cancel" />'
onclick="window.location='<s:url action="planetGroups"/>'"/>
<s:if test="group != null" >
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp Wed Jul 2 04:26:31 2014
@@ -51,7 +51,7 @@ function handlePreview(handle) {
<table class="formtable">
<tr>
- <td class="label"><label for="name" /><s:text name="createWebsite.name" /></label></td>
+ <td class="label"><label for="name" /><s:text name="generic.name" /></label></td>
<td class="field"><s:textfield name="bean.name" size="30" maxlength="30" /></td>
<td class="description"><s:text name="createWebsite.tip.name" /></td>
</tr>
@@ -124,7 +124,7 @@ function handlePreview(handle) {
<br />
<s:submit value="%{getText('createWebsite.button.save')}" />
-<input type="button" value="<s:text name="application.cancel"/>" onclick="window.location='<s:url action="menu"/>'" />
+<input type="button" value="<s:text name="generic.cancel"/>" onclick="window.location='<s:url action="menu"/>'" />
</s:form>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/OAuthKeys.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/OAuthKeys.jsp?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/OAuthKeys.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/OAuthKeys.jsp Wed Jul 2 04:26:31 2014
@@ -69,4 +69,4 @@
<br />
-<input type="button" value="<s:text name="application.cancel"/>" onclick="window.location='<s:url action="menu"/>'" />
+<input type="button" value="<s:text name="generic.cancel"/>" onclick="window.location='<s:url action="menu"/>'" />
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Profile.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Profile.jsp?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Profile.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Profile.jsp Wed Jul 2 04:26:31 2014
@@ -97,6 +97,6 @@
<br />
<s:submit value="%{getText('userSettings.button.save')}" />
- <input type="button" value="<s:text name="application.cancel"/>" onclick="window.location='<s:url action="menu"/>'" />
+ <input type="button" value="<s:text name="generic.cancel"/>" onclick="window.location='<s:url action="menu"/>'" />
</s:form>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Register.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Register.jsp?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Register.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Register.jsp Wed Jul 2 04:26:31 2014
@@ -149,7 +149,7 @@
<p id="readytip"><s:text name="userRegister.tip.ready" /></p>
<s:submit id="submit" key="userRegister.button.save" />
-<input type="button" value="<s:text name="application.cancel"/>"
+<input type="button" value="<s:text name="generic.cancel"/>"
onclick="window.location='<s:url value="/"/>'" />
</s:form>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp Wed Jul 2 04:26:31 2014
@@ -32,7 +32,7 @@
<table>
<tr>
- <td><s:text name="bookmarkForm.name" /></td>
+ <td><s:text name="generic.name" /></td>
<td><s:textfield name="bean.name" maxlength="255" size="70" /></td>
</tr>
@@ -60,7 +60,7 @@
<p>
<s:submit value="%{getText('bookmarkForm.save')}" />
- <s:submit value="%{getText('application.cancel')}" action="bookmarkAdd!cancel" />
+ <s:submit value="%{getText('generic.cancel')}" action="bookmarkAdd!cancel" />
</p>
</s:form>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp Wed Jul 2 04:26:31 2014
@@ -32,7 +32,7 @@
<table>
<tr>
- <td><s:text name="bookmarkForm.name" /></td>
+ <td><s:text name="generic.name" /></td>
<td><s:textfield name="bean.name" maxlength="255" size="70" /></td>
</tr>
@@ -60,7 +60,7 @@
<p>
<s:submit value="%{getText('bookmarkForm.save')}" />
- <s:submit value="%{getText('application.cancel')}" action="bookmarkAdd!cancel" />
+ <s:submit value="%{getText('generic.cancel')}" action="bookmarkAdd!cancel" />
</p>
</s:form>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp Wed Jul 2 04:26:31 2014
@@ -90,7 +90,7 @@ function onMove()
<tr class="rHeaderTr">
<th class="rollertable" width="5%"><input name="control" type="checkbox" onclick="toggleFunctionAll(this.checked);"
title="<s:text name="bookmarksForm.selectAllLabel"/>"/></th>
- <th class="rollertable" width="25%"><s:text name="bookmarksForm.name" /></th>
+ <th class="rollertable" width="25%"><s:text name="generic.name" /></th>
<th class="rollertable" width="25%"><s:text name="bookmarksForm.url" /></th>
<th class="rollertable" width="35%"><s:text name="bookmarksForm.feedurl" /></th>
<th class="rollertable" width="5%"><s:text name="bookmarksForm.edit" /></th>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksImport.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksImport.jsp?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksImport.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksImport.jsp Wed Jul 2 04:26:31 2014
@@ -34,5 +34,5 @@
<br />
<br />
<s:submit value="%{getText('bookmarksImport.import')}" />
- <s:submit value="%{getText('application.cancel')}" action="bookmarks" />
+ <s:submit value="%{getText('generic.cancel')}" action="bookmarks" />
</s:form>
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=1607241&r1=1607240&r2=1607241&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 Wed Jul 2 04:26:31 2014
@@ -50,7 +50,7 @@ function onMove()
<table class="rollertable">
<tr class="rollertable">
- <th class="rollertable" width="35%"><s:text name="categoriesForm.name" /></th>
+ <th class="rollertable" width="35%"><s:text name="generic.name" /></th>
<th class="rollertable" width="45%"><s:text name="categoriesForm.description" /></th>
<th class="rollertable" width="10%"><s:text name="categoriesForm.edit" /></th>
<th class="rollertable" width="10%"><s:text name="categoriesForm.remove" /></th>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryAdd.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryAdd.jsp?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryAdd.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryAdd.jsp Wed Jul 2 04:26:31 2014
@@ -28,7 +28,7 @@
<table>
<tr>
- <td><s:text name="categoryForm.name" /></td>
+ <td><s:text name="generic.name" /></td>
<td><s:textfield name="bean.name" size="70" maxlength="255" /></td>
</tr>
@@ -46,7 +46,7 @@
<p>
<s:submit value="%{getText('categoryForm.save')}" />
- <s:submit value="%{getText('application.cancel')}" action="categoryAdd!cancel" />
+ <s:submit value="%{getText('generic.cancel')}" action="categoryAdd!cancel" />
</p>
</s:form>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp Wed Jul 2 04:26:31 2014
@@ -29,7 +29,7 @@
<table>
<tr>
- <td><s:text name="categoryForm.name" /></td>
+ <td><s:text name="generic.name" /></td>
<td><s:textfield name="bean.name" size="70" maxlength="255" /></td>
</tr>
@@ -47,7 +47,7 @@
<p>
<s:submit value="%{getText('categoryForm.save')}" />
- <s:submit value="%{getText('application.cancel')}" action="categoryEdit!cancel" />
+ <s:submit value="%{getText('generic.cancel')}" action="categoryEdit!cancel" />
</p>
</s:form>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryRemove.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryRemove.jsp?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryRemove.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryRemove.jsp Wed Jul 2 04:26:31 2014
@@ -45,7 +45,7 @@
<strong><s:text name="categoryDeleteOK.areYouSure" /></strong>
</p>
- <s:submit value="%{getText('application.yes')}" />
- <s:submit value="%{getText('application.no')}" action="categoryRemove!cancel" />
+ <s:submit value="%{getText('generic.yes')}" />
+ <s:submit value="%{getText('generic.no')}" action="categoryRemove!cancel" />
</s:form>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp Wed Jul 2 04:26:31 2014
@@ -315,7 +315,7 @@
<a onclick='saveComment("<s:property value="#comment.id"/>")'><s:text name="commentManagement.saveComment" /></a> |
</span>
<span id="cancellink-<s:property value="#comment.id"/>" style="display: none">
- <a onclick='editCommentCancel("<s:property value="#comment.id"/>")'><s:text name="application.cancel" /></a>
+ <a onclick='editCommentCancel("<s:property value="#comment.id"/>")'><s:text name="generic.cancel" /></a>
</span>
</div>
</div>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryRemove.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryRemove.jsp?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryRemove.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryRemove.jsp Wed Jul 2 04:26:31 2014
@@ -34,14 +34,14 @@
<s:hidden name="salt" />
<s:hidden name="weblog" />
<s:hidden name="removeId" />
- <s:submit value="%{getText('application.yes')}" />
+ <s:submit value="%{getText('generic.yes')}" />
</s:form>
</td>
<td>
<s:form action="entryEdit">
<s:hidden name="salt" />
<s:hidden name="weblog" />
- <s:submit value="%{getText('application.no')}" action="entryRemove!cancel" />
+ <s:submit value="%{getText('generic.no')}" action="entryRemove!cancel" />
</s:form>
</td>
</tr>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryRemoveViaList.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryRemoveViaList.jsp?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryRemoveViaList.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryRemoveViaList.jsp Wed Jul 2 04:26:31 2014
@@ -36,14 +36,14 @@
<s:hidden name="salt" />
<s:hidden name="weblog" />
<s:hidden name="removeId" />
- <s:submit value="%{getText('application.yes')}" />
+ <s:submit value="%{getText('generic.yes')}" />
</s:form>
</td>
<td>
<s:form action="entries">
<s:hidden name="salt" />
<s:hidden name="weblog" />
- <s:submit value="%{getText('application.no')}" action="entryRemove!cancel" />
+ <s:submit value="%{getText('generic.no')}" action="entryRemove!cancel" />
</s:form>
</td>
</tr>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderAdd.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderAdd.jsp?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderAdd.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderAdd.jsp Wed Jul 2 04:26:31 2014
@@ -29,14 +29,14 @@
<table>
<tr>
- <td><s:text name="folderForm.name" /></td>
+ <td><s:text name="generic.name" /></td>
<td><s:textfield name="bean.name" size="70" maxlength="255" /></td>
</tr>
</table>
<p>
<s:submit value="%{getText('folderForm.save')}" />
- <s:submit value="%{getText('application.cancel')}" action="folderAdd!cancel" />
+ <s:submit value="%{getText('generic.cancel')}" action="folderAdd!cancel" />
</p>
</s:form>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp Wed Jul 2 04:26:31 2014
@@ -34,14 +34,14 @@
<table>
<tr>
- <td><s:text name="folderForm.name" /></td>
+ <td><s:text name="generic.name" /></td>
<td><s:textfield name="bean.name" size="70" maxlength="255" /></td>
</tr>
</table>
<p>
<s:submit value="%{getText('folderForm.save')}" />
- <s:submit value="%{getText('application.cancel')}" action="folderEdit!cancel" />
+ <s:submit value="%{getText('generic.cancel')}" action="folderEdit!cancel" />
</p>
</s:form>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp Wed Jul 2 04:26:31 2014
@@ -79,7 +79,7 @@
<tr>
<td class="entryEditFormLabel">
- <label for="status"><s:text name="mediaFileAdd.name" /></label>
+ <label for="status"><s:text name="generic.name" /></label>
</td>
<td>
<s:textfield name="bean.name" size="50" maxlength="255" />
@@ -179,7 +179,7 @@
<br />
<div class="control">
<input type="submit" value='<s:text name="mediaFileAdd.upload" />' name="upload" />
- <s:submit value="%{getText('application.cancel')}" action="mediaFileView" />
+ <s:submit value="%{getText('generic.cancel')}" action="mediaFileView" />
</div>
</s:form>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp Wed Jul 2 04:26:31 2014
@@ -87,7 +87,7 @@ $("#d_clip_button").ready(function() {
<tr>
<td class="entryEditFormLabel">
- <label for="status"><s:text name="mediaFileEdit.name" /></label>
+ <label for="status"><s:text name="generic.name" /></label>
</td>
<td>
<s:textfield name="bean.name" size="40" maxlength="100" tabindex="1" />
@@ -212,7 +212,7 @@ $("#d_clip_button").ready(function() {
<input type="submit" tabindex="7"
value="<s:text name="mediaFileEdit.save" />" name="submit" />
<input type="button" tabindex="8"
- value="<s:text name="application.cancel" />" onClick="javascript:window.parent.onEditCancelled();" />
+ value="<s:text name="generic.cancel" />" onClick="javascript:window.parent.onEditCancelled();" />
</div>
</s:form>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp Wed Jul 2 04:26:31 2014
@@ -71,7 +71,7 @@
<tr>
<td>
- <label for="name"><s:text name="mediaFileView.name" /></label>
+ <label for="name"><s:text name="generic.name" /></label>
</td>
<td>
<s:textfield id="beanName" name="bean.name" size="20" maxlength="255" />
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MemberResign.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MemberResign.jsp?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MemberResign.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MemberResign.jsp Wed Jul 2 04:26:31 2014
@@ -29,8 +29,8 @@
<s:form action="memberResign!resign">
<s:hidden name="salt" />
<s:hidden name="weblog" />
- <s:submit value="%{getText('application.yes')}" />
- <s:submit value="%{getText('application.no')}" action="menu"/>
+ <s:submit value="%{getText('generic.yes')}" />
+ <s:submit value="%{getText('generic.no')}" action="menu"/>
</s:form>
</td>
</tr>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp Wed Jul 2 04:26:31 2014
@@ -59,7 +59,7 @@
<br />
<s:submit value="%{getText('inviteMember.button.save')}" />
- <s:submit value="%{getText('application.cancel')}" action="invite!cancel" />
+ <s:submit value="%{getText('generic.cancel')}" action="invite!cancel" />
</s:form>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Pings.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Pings.jsp?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Pings.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Pings.jsp Wed Jul 2 04:26:31 2014
@@ -37,7 +37,7 @@
<table class="rollertable">
<%-- Headings --%>
<tr class="rollertable">
- <th class="rollertable" width="20%"><s:text name="pingTarget.name" /></th>
+ <th class="rollertable" width="20%"><s:text name="generic.name" /></th>
<th class="rollertable" width="40%"><s:text name="pingTarget.pingUrl" /></th>
<th class="rollertable" width="20%" colspan=2><s:text name="pingTarget.auto" /></th>
<th class="rollertable" width="20%"><s:text name="pingTarget.manual" /></th>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp Wed Jul 2 04:26:31 2014
@@ -48,7 +48,7 @@
<table cellspacing="5">
<tr>
- <td class="label"><s:text name="pageForm.name" /> </td>
+ <td class="label"><s:text name="generic.name" /> </td>
<td class="field">
<s:if test="template.required || bean.mobile">
<s:textfield name="bean.name" size="50" readonly="true" cssStyle="background: #e5e5e5" />
@@ -137,7 +137,7 @@
<tr>
<td>
<s:submit value="%{getText('pageForm.save')}" />
- <input type="button" value='<s:text name="application.done"/>'
+ <input type="button" value='<s:text name="generic.done"/>'
onclick="window.location='<s:url action="templates"><s:param name="weblog" value="%{weblog}"/></s:url>'" />
</td>
<td align="right">
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/TemplateRemove.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/TemplateRemove.jsp?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/TemplateRemove.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/TemplateRemove.jsp Wed Jul 2 04:26:31 2014
@@ -47,8 +47,8 @@
<s:hidden name="removeId" />
<s:hidden name="weblog" value="%{actionWeblog.handle}" />
- <s:submit value="%{getText('application.yes')}" />
- <s:submit value="%{getText('application.no')}" action="templateRemove!cancel" />
+ <s:submit value="%{getText('generic.yes')}" />
+ <s:submit value="%{getText('generic.no')}" action="templateRemove!cancel" />
</s:form>
</td>
</tr>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp Wed Jul 2 04:26:31 2014
@@ -40,7 +40,7 @@
<s:if test="!templates.isEmpty">
<tr>
- <th width="30%"><s:text name="pagesForm.name" /></th>
+ <th width="30%"><s:text name="generic.name" /></th>
<th width="10"><s:text name="pagesForm.action" /></th>
<th width="55%"><s:text name="pagesForm.description" /></th>
<th width="10"><s:text name="pagesForm.remove" /></th>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/TemplatesRemove.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/TemplatesRemove.jsp?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/TemplatesRemove.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/TemplatesRemove.jsp Wed Jul 2 04:26:31 2014
@@ -45,8 +45,8 @@
<table>
<tr>
<td>
- <s:submit value="%{getText('application.yes')}" action="templatesRemove!remove" />
- <s:submit value="%{getText('application.no')}" action="templatesRemove!cancel" />
+ <s:submit value="%{getText('generic.yes')}" action="templatesRemove!remove" />
+ <s:submit value="%{getText('generic.no')}" action="templatesRemove!cancel" />
</td>
</tr>
</table>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/TemplatesSidebar.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/TemplatesSidebar.jsp?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/TemplatesSidebar.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/TemplatesSidebar.jsp Wed Jul 2 04:26:31 2014
@@ -31,7 +31,7 @@
<table cellpadding="0" cellspacing="6">
<tr>
- <td><s:text name="pagesForm.name"/></td>
+ <td><s:text name="generic.name"/></td>
<td><s:textfield name="newTmplName" /></td>
</tr>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/WeblogRemoveConfirm.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/WeblogRemoveConfirm.jsp?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/WeblogRemoveConfirm.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/WeblogRemoveConfirm.jsp Wed Jul 2 04:26:31 2014
@@ -44,14 +44,14 @@
<s:form action="weblogRemove!remove">
<s:hidden name="salt" />
<s:hidden name="weblog" value="%{actionWeblog.handle}" />
- <s:submit value="%{getText('application.yes')}" />
+ <s:submit value="%{getText('generic.yes')}" />
</s:form>
</td>
<td>
<s:form action="weblogConfig" method="post">
<s:hidden name="salt" />
<s:hidden name="weblog" value="%{actionWeblog.handle}" />
- <s:submit value="%{getText('application.no')}" />
+ <s:submit value="%{getText('generic.no')}" />
</s:form>
</td>
</tr>