roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1607400 - in /roller/trunk/app/src/main: resources/ webapp/WEB-INF/jsps/admin/ webapp/WEB-INF/jsps/core/ webapp/WEB-INF/jsps/editor/
Date Wed, 02 Jul 2014 15:30:17 GMT
Author: gmazza
Date: Wed Jul  2 15:30:16 2014
New Revision: 1607400

URL: http://svn.apache.org/r1607400
Log:
More cleanup of language resource files.

Modified:
    roller/trunk/app/src/main/resources/ApplicationResources.properties
    roller/trunk/app/src/main/resources/ApplicationResources_de.properties
    roller/trunk/app/src/main/resources/ApplicationResources_es.properties
    roller/trunk/app/src/main/resources/ApplicationResources_fr.properties
    roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetAdd.jsp
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetEdit.jsp
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargets.jsp
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CreateUser.jsp
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagement.jsp
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/ModifyUser.jsp
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PlanetConfig.jsp
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PlanetGroups.jsp
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptions.jsp
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/UserAdmin.jsp
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Setup.jsp
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryAdd.jsp
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderAdd.jsp
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Members.jsp
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp

Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1607400&r1=1607399&r2=1607400&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Wed Jul  2 15:30:16 2014
@@ -15,7 +15,6 @@
 # directory of this distribution.
 
 # -- Common terms used to reduce the number of strings that need translation.
-
 generic.all=All
 generic.none=None
 generic.cancel=Cancel
@@ -24,10 +23,9 @@ generic.yes=Yes
 generic.no=No
 generic.name=Name
 generic.description=Description
-#future use:
-#generic.save=Save
-#generic.edit=Edit
-#generic.delete=Delete
+generic.save=Save
+generic.edit=Edit
+generic.delete=Delete
 
 # ------------------------------------------------------------- BookmarkForm.jsp
 
@@ -37,7 +35,6 @@ bookmarkForm.edit.title=Edit Bookmark
 bookmarkForm.edit.subtitle=Editing bookmark in folder [{0}]
 bookmarkForm.image=Image URL
 bookmarkForm.rssUrl=Newsfeed URL
-bookmarkForm.save=Save
 bookmarkForm.url=Bookmark URL
 bookmarkForm.created=Bookmark created
 bookmarkForm.changesSaved=Changes saved
@@ -78,7 +75,6 @@ bookmarksForm.feedurl=Newsfeed URL
 bookmarksForm.folder=Bookmark Folder
 bookmarksForm.deleteFolder=Delete folder
 bookmarksForm.viewFolder=Switch to Folder
-bookmarksForm.edit=Edit
 bookmarksForm.edit.tip=Click to modify this bookmark
 bookmarksForm.folder.edit.tip=Click to edit folder
 bookmarksForm.move=Move selected to:
@@ -127,7 +123,6 @@ categoryForm.edit.subtitle=Editing categ
 categoryForm.add.title=Add Category
 categoryForm.add.subtitle=Adding category
 categoryForm.image=Image URL
-categoryForm.save=Save
 categoryForm.created=Category created
 categoryForm.changesSaved=Changes saved
 
@@ -145,7 +140,6 @@ categoriesForm.noresults=There are curre
 # ----------------------------------------------------------- CategoriesForm.jsp
 
 categoriesForm.subtitle=Manage categories in weblog <span>{0}</span>
-categoriesForm.edit=Edit
 categoriesForm.root=root
 categoriesForm.rootTitle=Categories
 categoriesForm.rootPrompt=\
@@ -251,7 +245,6 @@ commentManagement.onlySpam=Spam only
 
 commentManagement.columnApproved=Approved
 commentManagement.columnSpam=Spam
-commentManagement.columnDelete=Delete
 commentManagement.columnComment=Comment
 commentManagement.update=Save changes
 commentManagement.updateSuccess=Successfully updated comments
@@ -272,7 +265,6 @@ commentManagement.select=Select
 commentManagement.readmore=View Entire Comment
 
 commentManagement.editComment=Edit Comment
-commentManagement.saveComment=Save
 commentManagement.saveError=Error saving comment
 
 # -------------------------------------------------------------- CommentServlet
@@ -349,9 +341,6 @@ configForm.webAnalytics=Web Analytics
 configForm.defaultAnalyticsTrackingCode=Default tracking code
 configForm.allowAnalyticsCodeOverride=Allow individual blogs to override?
 
-configForm.save=Save
-
-
 # ---------------------------------------------------------------- Create weblog
 
 createWebsite.title=Create Weblog
@@ -478,7 +467,6 @@ folderForm.add.subtitle=Adding new bookm
 folderForm.edit.title=Edit Folder
 folderForm.edit.subtitle=Editing bookmark folder [{0}]
 
-folderForm.save=Save
 folderForm.add.success=Folder added
 folderForm.update.success=Folder updated
 
@@ -526,7 +514,6 @@ below once you have created at least one
 
 frontpageConfig.frontpageBlogName=Name of weblog to serve as frontpage blog
 frontpageConfig.frontpageAggregated=Enable aggregated site-wide frontpage
-frontpageConfig.save=Save
 frontpageConfig.values.saved=Properties successfully saved
 frontpageConfig.values.error=Error saving properties
 frontpageConfig.weblogs.error=Unexpected error accessing Weblogs
@@ -789,11 +776,9 @@ mediaFileEdit.pagetip=You may edit the i
 file. Each file must have a name, but all other fields are optional. \
 Or you can use the links at the bottom of the page to create a new weblog \
 entry that includes this file.
-mediaFileEdit.description=Description
 mediaFileEdit.tags=Tags (space separated)
 mediaFileEdit.copyright=Copyright statement
 mediaFileEdit.directory=Folder
-mediaFileEdit.save=Save
 mediaFileEdit.fileInfo=File info
 mediaFileEdit.fileTypeSize=<b>Type</b>: {0} <b>Size</b>: {1} bytes
 mediaFileEdit.fileDimensions=<b>Image</b>: {0} X {1} pixels
@@ -831,7 +816,6 @@ mediaFileView.deleteSelected=Delete sele
 mediaFileView.moveSelected=Move selected to:
 mediaFileView.toggleSelected=Select all/none
 mediaFileView.deleteFolder=Delete folder
-mediaFileView.delete=Delete
 
 mediaFileView.gt=>
 mediaFileView.ge=>\=
@@ -921,7 +905,6 @@ memberPermissions.membersChanged=Changed
 memberPermissions.confirmRemove=Are you sure you want to remove members from this \
 weblog?
 
-memberPermissions.button.save=Save
 memberPermissions.saveError=Error saving permissions
 
 memberPermissions.inviteMember=Invite new member
@@ -1021,9 +1004,7 @@ pageForm.hidden=Hidden
 pageForm.hidden.tip=Hidden pages cannot be accessed via a weblog URL
 pageForm.navbar=Include in page menu
 pageForm.navbar.tip=Include in menu produced by showPageMenu() macro
-pageForm.description=Description
 pageForm.template=Template
-pageForm.save=Save
 pageForm.newTemplateContent=<html><body></body></html>
 pageForm.save.success=Template updated successfully.
 pageForm.launch=launch
@@ -1094,8 +1075,6 @@ commonPingTarget.subtitle=Editing common
 
 pingTarget.pingUrl=Ping URL
 pingTarget.autoEnabled=Auto Ping?
-pingTarget.save=Save
-pingTarget.edit=Edit
 pingTarget.remove=Remove
 pingTarget.confirmRemoveTitle=Remove Ping Target Confirmation
 pingTarget.confirmCommonRemove=Removing this target will also remove all user''s \
@@ -1159,20 +1138,12 @@ Planet aggregator page. To add a new sub
 newsfeed URL then click the Save button.
 
 planetSubscriptions.existingTitle=Existing Subscriptions
-
 planetSubscriptions.column.title=Title
 planetSubscriptions.column.feedUrl=Feed URL
-planetSubscriptions.column.delete=Delete
-
 planetSubscription.feedUrl=Newsfeed URL
-
-planetSubscriptions.button.save=Save
-planetSubscriptions.button.delete=Delete
-
 planetSubscription.success.deleted=Subscription successfully deleted
 planetSubscription.foundExisting=Found existing subscription [{0}], adding it instead
 planetSubscription.success.saved=Saved subscription
-
 planetSubscription.error=Must specify newfeed URL
 planetSubscription.error.feedUrl=Newsfeed URL is required
 planetSubscriptions.error.duringSave=Duplicate subscription? - {0}
@@ -1191,10 +1162,8 @@ your changes and then click Save. Or, us
 
 planetGroups.existingTitle=Existing Custom Aggregation Groups
 planetGroups.existingPrompt=Select an existing custom aggregation group to edit.
-planetGroups.edit=Edit
 
 planetGroups.column.title=Title
-planetGroups.column.edit=Edit
 planetGroups.column.subscriptions=Subscriptions
 planetGroups.column.handle=Handle
 
@@ -1205,9 +1174,6 @@ planetGroups.edit.tip=Edit this group
 planetGroups.title=Title
 planetGroups.handle=Handle
 
-planetGroups.button.save=Save
-planetGroups.button.delete=Delete
-
 planetGroups.success.saved=Saved group
 planetGroups.error.saved=Error saving planet group - duplicate?
 
@@ -1232,7 +1198,6 @@ stylesheetEdit.revertTip1=<font color="r
 please use the <em>Shared Theme</em> default by clicking the delete stylesheet button. \
 This will ensure you are using the latest version and any changes will be picked up.</font> 
 
-stylesheetEdit.save=Save
 stylesheetEdit.revert=Restore Stylesheet
 stylesheetEdit.delete=Delete Stylesheet
 
@@ -1389,8 +1354,6 @@ userAdmin.title.createNewUser=Creating n
 userAdmin.subtitle.createNewUser=Create new user, all fields are required.
 
 userAdmin.enabled=Enabled
-userAdmin.edit=Edit
-userAdmin.save=Save
 userAdmin.title=User Administration
 userAdmin.userAdmin=Administrator
 
@@ -1676,8 +1639,6 @@ weblogEntryQuery.label.publishedOnly=Pub
 weblogEntryQuery.label.pendingOnly=Pending Only
 weblogEntryQuery.label.scheduledOnly=Scheduled Only
 
-weblogEntryQuery.delete=Delete
-weblogEntryQuery.edit=Edit
 weblogEntryQuery.view=View
 weblogEntryQuery.category=Category
 weblogEntryQuery.pubTime=Published

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=1607400&r1=1607399&r2=1607400&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_de.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_de.properties Wed Jul  2 15:30:16 2014
@@ -10,6 +10,9 @@ generic.done=Fertig
 generic.no=Nein
 generic.yes=Ja
 generic.description=Beschreibung
+generic.save=Speichern
+generic.edit=Bearbeiten
+generic.delete=L\u00F6schen
 
 #
 Bookmark.error.descriptionSize=Die Beschreibung darf nicht l\u00E4nger als 255 Zeichen sein
@@ -84,14 +87,12 @@ bookmarkForm.edit.subtitle=Lesezeichen b
 bookmarkForm.edit.title=Lesezeichen bearbeiten
 bookmarkForm.image=Bild URL
 bookmarkForm.rssUrl=Newsfeed URL
-bookmarkForm.save=Speichern
 bookmarkForm.url=Lesezeichen URL
 # --------------------------------------------------------- BookmarksForm.jsp
 bookmarksForm.addBookmark=Lesezeichen hinzuf\u00FCgen
 bookmarksForm.addFolder=Ordner hinzuf\u00FCgen
 bookmarksForm.delete=L\u00F6sche Auswahl
 bookmarksForm.delete.confirm=Ausgew\u00E4hlte Lesezeichen l\u00F6schen?
-bookmarksForm.edit=Bearbeiten
 bookmarksForm.edit.tip=Anklicken um das Lesezeichen zu bearbeiten
 bookmarksForm.error.move=Fehler beim Verschieben, Elternknoten nach Kindknoten zu verschieben ist nicht erlaubt
 bookmarksForm.folder=Ordner
@@ -124,7 +125,6 @@ calendar.prev=Voriger
 calendar.summary=Blog Archiv Kalender
 calendar.today=Heute
 categoriesForm.addCategory=Kategorie hinzuf\u00FCgen
-categoriesForm.edit=Bearbeiten
 categoriesForm.move=Verschieben
 categoriesForm.move.confirm=Ausgew\u00E4hlte Kategorien verschieben?
 # ---------------------------------------------------------- CategoriesForm.jsp
@@ -141,7 +141,6 @@ categoryDeleteOK.removeCategory=L\u00F6s
 categoryDeleteOK.warningCatInUse=WARNUNG: Diese Kategorie wird benutzt!
 categoryDeleteOK.youMustMoveEntries=Sie m\u00FCssen die Eintr\u00E4ge in der Kategorie in eine andere Kategorie verschieben, w\u00E4hlen Sie dazu in der Auswahlliste die Zielkategorie, welche die Eintr\u00E4ge erhalten soll.</p>
 categoryForm.add.title=Kategorie hinzuf\u00FCgen
-categoryForm.description=Beschreibung
 categoryForm.edit.subtitle=Kategorie bearbeiten
 # ------------------------------------------------------------- CategoryForm.jsp
 categoryForm.edit.title=Kategorie bearbeiten
@@ -150,7 +149,6 @@ categoryForm.error.duplicateName=Es gibt
 # ------------------------------------------------------------- CategoryForm.jsp
 categoryForm.image=Bild
 # ---------------------------------------------------------- CategoryForm.jsp
-categoryForm.save=Speichern
 comment.validator.akismetMessage=Der Akismet Dienst (akismet.com) h\u00E4lt den Kommentar f\u00FCr Spam
 comment.validator.akismetName=Akismet Kommentarpr\u00FCfung
 comment.validator.blacklistMessage=Der Kommentar enth\u00E4lt gesperrte/ignorierte Worte
@@ -166,7 +164,6 @@ commentManagement.bulkDeletePrompt1=Ihre
 commentManagement.bulkDeletePrompt2=Alle l\u00F6schen?
 commentManagement.columnApproved=Zugelassen
 commentManagement.columnComment=Kommentar
-commentManagement.columnDelete=L\u00F6schen
 commentManagement.columnSpam=Spam
 commentManagement.commentBy=Eingetragen von
 commentManagement.commentByBoth={0} (<a href="mailto:{1}">{2}</a>) von IP Adresse {3}
@@ -345,8 +342,6 @@ folderForm.add.title=Ordner hinzuf\u00FC
 folderForm.edit.subtitle=Bearbeite Lesezeichenordner [{0}]
 folderForm.edit.title=Ordner bearbeiten
 folderForm.error.duplicateName=Der Ordnername {0} wird bereits verwendet, bitte w\u00E4hlen Sie einen anderen
-# ------------------------------------------------------------ FolderForm.jsp
-folderForm.save=Sichern
 # ---------------------------------------------------------------------- Footer
 footer.productName=Powered by <a href="http://roller.apache.org">Apache Roller Weblogger</a> Version {0}
 # ------------------------------------------------------------ Footer
@@ -486,7 +481,6 @@ maintenance.subtitle=Weblog-Wartungsoper
 maintenance.title=Webseitenwartung
 memberPermissions.administrator=Admin
 memberPermissions.author=Autor
-memberPermissions.button.save=Speichern
 memberPermissions.confirmRemove=Sind Sie sicher, dass Sie Mitglieder aus diesem Weblog entfernen wollen?
 memberPermissions.description=Sie k\u00F6nnen die Rechte der Weblog-Mitglieder \u00E4ndern und oder die Benutzer l\u00F6schen indem Sie die Verwaltungsoberfl\u00E4che in der unten folgenden Tabelle verwenden und abschlie\u00DFend Speichern anklicken um die \u00C4nderungen umzusetzen. Bedenken Sie, dass Sie sich nicht selbst degradieren oder l\u00F6schen k\u00F6nnen.
 memberPermissions.inviteMember=Mitglieder einladen
@@ -521,7 +515,6 @@ pageForm.navbar=In Seitenmen\u00FC einbi
 pageForm.navbar.tip=In Men\u00FC einbinden, welches durch showPageMenu() macro erzeugt wird.
 pageForm.outputContentType=Content-Type
 # ------------------------------------------------------------ Page edit
-pageForm.save=Sichern
 pageForm.save.success=Seite erfolgreich ge\u00E4ndert.
 pageForm.subtitle=Schablone <span>{0}</span> anpassen im Weblog <span>{1}</span>
 pageForm.template=Schablone
@@ -539,7 +532,6 @@ pagesForm.add=Hinzuf\u00FCgen
 pagesForm.addNewPage=Neue Seite hinzuf\u00FCgen
 # -------------------------------------------------------------------- Page edit
 # -------------------------------------------------------------------- Page edit
-pagesForm.description=Beschreibung
 pagesForm.error.alreadyExists=Die Schablone {0} existiert bereits.
 pagesForm.remove=L\u00F6schen
 pagesForm.required=(muss eingegeben werden)
@@ -561,7 +553,6 @@ pingTarget.confirmCommonRemove=Das L\u00
 pingTarget.confirmRemoveTitle=L\u00F6sche Ping Ziel Best\u00E4tigung
 pingTarget.disable=Ausschalten
 pingTarget.disabled=AUS
-pingTarget.edit=Bearbeiten
 pingTarget.enable=Einschalten
 pingTarget.enabled=AN
 pingTarget.malformedUrl=Die URL ist nicht korrekt aufgebaut.
@@ -571,7 +562,6 @@ pingTarget.pingTarget=Ping Ziel
 pingTarget.pingUrl=Ping URL
 pingTarget.remove=L\u00F6schen
 pingTarget.removeOK=Ja, l\u00F6schen
-pingTarget.save=Sichern
 pingTarget.saved=Ping-Ziel gespeichert
 pingTarget.sendPingNow=Sende jetzt ein Ping
 pingTarget.unknownHost=Der Hostname in der URL scheint nicht zu existieren.
@@ -583,13 +573,9 @@ pings.title=Konfiguriere Automatische We
 planetConfig.prompt=konfiguriere Planet Roller
 planetConfig.subtitle=Konfiguration des integrierten Newsfeed-Aggregators von Roller.
 planetConfig.title=Titel
-planetGroups.button.delete=L\u00F6schen
-planetGroups.button.save=Speichern
-planetGroups.column.edit=Bearbeiten
 planetGroups.column.handle=Handle
 planetGroups.column.subscriptions=Abonnements
 planetGroups.column.title=Titel
-planetGroups.edit=Bearbeiten
 planetGroups.edit.tip=Diese Gruppe bearbeiten
 planetGroups.error.handle=Handle muss eingegeben werden
 planetGroups.error.nameReserved=Der Handle ''all'' kann nicht verwendet werden
@@ -612,9 +598,6 @@ planetSubscription.feedUrl=Newsfeed-URL
 planetSubscription.foundExisting=Abonnement [{0}] exisitiert bereits, es wurde aber trotzdem hinzugef\u00FCgt
 planetSubscription.success.deleted=Abonnement erfolgreich gel\u00F6scht
 planetSubscription.success.saved=Abonnement gespeichert
-planetSubscriptions.button.delete=L\u00F6schen
-planetSubscriptions.button.save=Speichern
-planetSubscriptions.column.delete=L\u00F6schen
 planetSubscriptions.column.feedUrl=Feed-URL
 planetSubscriptions.column.title=Titel
 planetSubscriptions.error.duringSave=Doppeltes Abonnement? - {0}
@@ -636,7 +619,6 @@ stylesheetEdit.noStylesheetOverride=Leid
 stylesheetEdit.revert=Stylesheet zur\u00FCcksetzen
 stylesheetEdit.revert.success=Stylesheet erfolgreich zur\u00FCckgesetzt
 stylesheetEdit.revertTip=Falls Sie auf Probleme sto\u00DFen, welche Sie nicht mehr beheben k\u00F6nnen, so beginnen Sie einfach von vorne, indem Sie auf 'Stylesheet wiederherstellen' klicken.
-stylesheetEdit.save=Speichern
 stylesheetEdit.save.success=Stylesheet erfolgreich aktualisiert
 stylesheetEdit.subtitle=Weblog Stylesheet bearbeiten
 stylesheetEdit.tip=Dieses Formular erlaubt Ihnen das Stylesheet f\u00FCr Ihr Thema zu bearbeiten.
@@ -694,7 +676,6 @@ uploadFiles.uploadedFiles=Hochgeladene D
 user.account.activation.mail.content=<html><body style="background: white; color: black; font-size: 12px"> <p>Zum Aktivieren Ihres neuen Roller-Benutzerkontos mit dem Benutzernamen [{1}] klicken Sie bitte auf den folgenden Link:</p> <p><a href="{2}">{2}</a></p></body></html>
 user.account.activation.mail.subject=Roller: Aktivitierungscode f\u00FCr Ihr Benutzerkonto
 userAdmin.cantChangeOwnRole=Sie k\u00F6nnen Ihre eigene Rolle nicht \u00E4ndern
-userAdmin.edit=Bearbeiten
 userAdmin.editEntries=Eintr\u00E4ge bearbeiten
 # ---------------------------------------------------------------------- Search
 userAdmin.enabled=Eingeschaltet
@@ -707,7 +688,6 @@ userAdmin.newEntry=Neuer Eintrag
 userAdmin.prompt.createANewUser=Neuen Benutzer erstellen
 userAdmin.prompt.orYouCan=Oder Sie k\u00F6nnen
 userAdmin.prompt.searchUser=Sie k\u00F6nnen Benutzer finden indem Sie die ersten Buchstaben des Benutzernamens oder des Passworts eintippen. W\u00E4hlen Sie einen Benutzer aus und klicken Sie auf Bearbeiten um das Benutzerprofil und die Weblogs des Benutzers zu bearbeiten.
-userAdmin.save=Sichern
 userAdmin.subtitle.createNewUser=Neuen Benutzer erstellen, alle Felder sind erforderlich.
 userAdmin.subtitle.editUser=Profilbearbeitung und Rechte f\u00FCr Benutzer <span>{0}</span>
 userAdmin.subtitle.searchUser=W\u00E4hlen sie einen zu verwaltenden Benutzer
@@ -851,7 +831,6 @@ weblogEntry.pendingEntrySubject=Roller: 
 weblogEntryQuery.button.query=Abfrage
 weblogEntryQuery.category=Kategory
 weblogEntryQuery.draft=Entwurf
-weblogEntryQuery.edit=Bearbeiten
 weblogEntryQuery.label.allEntries=Alle Eintr\u00E4ge
 weblogEntryQuery.label.category=Kategorie
 weblogEntryQuery.label.draftOnly=Nur Entw\u00FCrfe

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=1607400&r1=1607399&r2=1607400&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_es.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_es.properties Wed Jul  2 15:30:16 2014
@@ -7,13 +7,17 @@ generic.done=Hecho
 generic.yes=S\u00ED
 generic.no=No
 generic.description=Descripci\u00F3n
+generic.save=Guardar
+generic.edit=Editar
+generic.delete=Eliminar
+
+
 bookmarkForm.add.title=A\u00F1adir nuevo marcador
 bookmarkForm.add.subtitle=A\u00F1adiendo marcador en la carpeta [{0}]
 bookmarkForm.edit.title=Editar marcador
 bookmarkForm.edit.subtitle=Editando marcador en carpeta [{0}]
 bookmarkForm.image=URL de la imagen
 bookmarkForm.rssUrl=URL de la suscripci\u00F3n
-bookmarkForm.save=Guardar
 bookmarkForm.url=URL del marcador
 bookmarksForm.root=ra\u00EDz
 bookmarksForm.rootTitle=Blogroll
@@ -23,7 +27,6 @@ bookmarksForm.addBookmark=A\u00F1adir ma
 bookmarksForm.addFolder=A\u00F1adir carpeta de marcador
 bookmarksForm.delete=Borrar seleccionado
 bookmarksForm.folder=Carpeta de marcador
-bookmarksForm.edit=Editar
 bookmarksForm.edit.tip=Haga click para editar esta marcador
 bookmarksForm.move=Mover el seleccionado
 bookmarksForm.path=Carpeta de marcador
@@ -40,11 +43,8 @@ categoryForm.edit.title=Editar categor\u
 categoryForm.edit.subtitle=Editando categor\u00EDa
 categoryForm.add.title=A\u00F1adir categor\u00EDa
 categoryForm.add.subtitle=A\u00F1adiendo categor\u00EDa
-categoryForm.description=Descripci\u00F3n
 categoryForm.image=imagen
-categoryForm.save=Guardar
 categoriesForm.subtitle=Administrar categor\u00EDas en weblog <span>{0}</span>
-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.
@@ -88,7 +88,6 @@ commentManagement.onlyDisapproved=S\u00F
 commentManagement.onlySpam=S\u00F3lo spam
 commentManagement.columnApproved=Aprobado
 commentManagement.columnSpam=Spam
-commentManagement.columnDelete=Eliminar
 commentManagement.columnComment=Comentario
 commentManagement.update=Guardar cambios
 commentManagement.updateSuccess=Comentarios actualizados con \u00E9xito
@@ -134,7 +133,6 @@ configForm.maxDirSize=Tama\u00F1o m\u00E
 configForm.themeSettings=Configuraci\u00F3n  de temas
 configForm.newUserThemes=Directorio de temas
 configForm.allowCustomTheme=\u00BFPermitir temas personalizados?
-configForm.save=Guardar
 createWebsite.title=Crear weblog
 createWebsite.prompt=Use este formulario para crear un nuevo weblog para usted o para usted y un grupo de sus amigos.
 createWebsite.tip.name=El nombre es el t\u00EDtulo del weblog, se mostrar\u00E1 en la parte de arriba de la p\u00E1gina, y en el campo t\u00EDtulo de la suscripci\u00F3n de noticias del weblog. Este campo no deber\u00EDa incluir HTML.
@@ -145,7 +143,6 @@ createWebsite.tip.timezone=La zona horar
 createWebsite.tip.locale=El lugar por defecto usado para mostrar en este weblog cuando el navegador no especifique un lugar.
 createWebsite.tip.theme=El tema usado para mostrar este weblog. M\u00E1s tarde, puede cambiar f\u00E1cilmente a otro tema o editar las plantillas de los temas para personalizarlo a su gusto.
 createWebsite.handle=T\u00EDtulo
-createWebsite.description=Descripci\u00F3n
 createWebsite.emailAddress=Direcci\u00F3n de correo electr\u00F3nico
 createWebsite.locale=Ubicaci\u00F3n
 createWebsite.timeZone=Zona horaria
@@ -172,10 +169,6 @@ error.upload.filemax=Fichero mayor que e
 error.upload.forbiddenFile=Puede cargar s\u00F3lo ficheros acabados en {0}
 error.general=ERROR\: Excepci\u00F3n inesperada [{0}] ha sido registrada.
 error.password.mismatch=Nombre de usuario o contrase\u00F1a incorrectos
-error.remove.bookmark=Error al intentar borrar marcador
-error.remove.bookmarks=Error al intentar borrar marcadores
-error.remove.folder=Error al intentar borrar carpeta de marcadores
-error.remove.newsfeed=Error al intentar borrar suscripci\u00F3n de noticias
 error.trackback=Error al enviar referencia. Posible causa\: URL de referencia incorrecta. {0}
 error.trackbackNotAllowed=Error al enviar referencia. El administrador del sitio ha deshabilitado el env\u00EDo de referencias a la URL especificada.
 error.title.403=Acceso denegado (404)
@@ -194,7 +187,6 @@ folderForm.add.title=A\u00F1adir carpeta
 folderForm.add.subtitle=A\u00F1adir nuevo marcador
 folderForm.edit.title=Editar carpeta
 folderForm.edit.subtitle=Editar carpeta de marcadores [{0}]
-folderForm.save=Guardar
 inviteMember.title=Invitar a un nuevo miembro
 inviteMember.subtitle=Invitar a un nuevo usuario a que se una a este weblog
 inviteMember.prompt=Invitar a un usuario a unirse a este weblog seleccionando abajo su direcci\u00F3n de correo electr\u00F3nico, eligiendo un permiso para este y haciendo click en el bot\u00F3n Enviar invitaci\u00F3n. Si el usuario no se muestra en la lista de abajo, escriba las primeras letras del nombre de usuario o direcci\u00F3n de correo electr\u00F3nico para encontrar coincidencias.
@@ -275,7 +267,6 @@ memberPermissions.noSelfDemotions=\u00A1
 memberPermissions.membersRemoved={0} usuario(s) eliminado(s)
 memberPermissions.membersChanged=Permiso cambiado para {0} usuario(s)
 memberPermissions.confirmRemove=\u00BFEst\u00E1 seguro de que desea eliminar miembros de este weblog?
-memberPermissions.button.save=Guardar
 memberPermissions.whyInvite=Invitar a alguien para ayudar a escribir el weblog.
 memberPermissions.permissionsHelpTitle=\u00BFQu\u00E9 son los permisos?
 memberPermissions.permissionHelp=Los permisos de <b>administrador</b> permiten a los usuarios enviar entradas, administrar el weblog y sus usuarios<br />Los permisos de <b>autor</b> permiten a los usuarios enviar entradas, pero no administrar el weblog<br />Los permisos <b>limitados</b> permiten a los usuarios guardar entradas solamente de tipo borrador.
@@ -288,7 +279,6 @@ navigationBar.register=Registrarse
 pagesForm.title=Plantillas
 pagesForm.subtitle=Administrar plantillas que definen el weblog <span>{0}</span>
 pagesForm.tip=Puede editar las plantillas que definan la composici\u00F3n, colores y fuentes del weblog. Tambi\u00E9n puede crear nuevas plantillas para definir p\u00E1ginas completamente nuevas. Esto es s\u00F3lo para usuarios avanzados, si no controla HTML, tal vez prefiera dejar quietas las plantillas.
-pagesForm.description=Descripci\u00F3n
 pagesForm.remove=Eliminar
 pagesForm.required=(obligatorio)
 pagesForm.addNewPage=A\u00F1adir una nueva plantilla
@@ -297,7 +287,6 @@ pagesForm.themesReminder=<b>Recuerde\:<b
 editPages.title.removeOK=Confirmar la eliminaci\u00F3n de la plantilla
 pageForm.link=Enlace
 pageForm.template=Plantilla
-pageForm.save=Guardar
 pageForm.save.success=Plantilla actualizada con \u00E9xito.
 pageRemove.subtitle=Confirmar la eliminaci\u00F3n de la p\u00E1gina.
 pageRemove.youSure=\u00BFEst\u00E1 seguro de que desea eliminar esta p\u00E1gina?
@@ -320,8 +309,6 @@ ping.pingProcessingIsSuspended=El proces
 pingTarget.pingTarget=Objetivo ping
 commonPingTarget.subtitle=Editando objetivo ping personalizado
 pingTarget.pingUrl=URL para ping
-pingTarget.save=Guardar
-pingTarget.edit=Editar
 pingTarget.remove=Eliminar
 pingTarget.confirmRemoveTitle=Eliminar confirmaci\u00F3n de objetivo ping
 pingTarget.confirmCommonRemove=Eliminando este objetivo tambi\u00E9n eliminar\u00E1 la configuraci\u00F3n de pings atom\u00E1ticos de todos los usuarios que usan este objetivo. \u00BFEst\u00E1 seguro?
@@ -350,8 +337,6 @@ planetSubscriptions.existingTitle=Suscri
 planetSubscriptions.column.title=T\u00EDtulo
 planetSubscriptions.column.feedUrl=URL de la suscripci\u00F3n
 planetSubscription.feedUrl=URL de la suscripci\u00F3n de noticias
-planetSubscriptions.button.save=Guardar
-planetSubscriptions.button.delete=Eliminar
 planetSubscription.success.deleted=Suscripci\u00F3n eliminada con \u00E9xito
 planetSubscription.success.saved=Suscripci\u00F3n guardada
 planetSubscription.error=Debe especificar la URL de la suscripci\u00F3n de noticias
@@ -364,9 +349,7 @@ planetGroups.prompt.add=Para crear un gr
 planetGroups.prompt.edit=Est\u00E1 editando un agregador personalizado de grupos. Aplique los cambios y luego haga click en Guardar. O haga click en Eliminar para eliminarlo.
 planetGroups.existingTitle=Agregador personalizado de grupos existente
 planetGroups.existingPrompt=Seleccione un agregador personalizado de grupos existente para editar.
-planetGroups.edit=Editar
 planetGroups.column.title=T\u00EDtulo
-planetGroups.column.edit=Editar
 planetGroups.column.subscriptions=Suscripciones
 planetGroups.column.handle=Nombre
 planetGroups.tip.title=T\u00EDtulo del grupo
@@ -374,8 +357,6 @@ planetGroups.tip.handle=Nombre de este g
 planetGroups.edit.tip=Editar este grupo
 planetGroups.title=T\u00EDtulo
 planetGroups.handle=Nombre
-planetGroups.button.save=Guardar
-planetGroups.button.delete=Eliminar
 planetGroups.success.saved=Grupo guardado
 planetGroups.error.title=El t\u00EDtulo es obligatorio
 planetGroups.error.handle=El nombre es obligatorio
@@ -412,7 +393,6 @@ themeEditor.selectTheme=Seleccionar un n
 themeEditor.yourCurrentTheme=Su tema actual es
 themeEditor.preview=Vista previa
 themeEditor.save=Guardar
-uploadFiles.exceededQuota=Ha excedido su cuota de carga de ficheros.
 uploadFiles.upload=Cargar
 userAdmin.title.searchUser=Encontrar usuario para editar
 userAdmin.subtitle.searchUser=Seleccione usuario para administrar
@@ -421,8 +401,6 @@ userAdmin.subtitle.editUser=Cambiar el p
 userAdmin.title.createNewUser=Creando nuevo usuario
 userAdmin.subtitle.createNewUser=Crear nuevo usuario, todos los campos son obligatorios.
 userAdmin.enabled=Habilitado
-userAdmin.edit=Editar
-userAdmin.save=Guardar
 userAdmin.title=Administraci\u00F3n de usuario
 userAdmin.userAdmin=Administrador
 userAdmin.subtitle.userCreation=Creaci\u00F3n de un nuevo usuario
@@ -459,7 +437,6 @@ userSettings.passwordConfirm=Contrase\u0
 userSettings.email=Correo electr\u00F3nico
 userSettings.locale=Idioma
 userSettings.timeZone=Zona horaria
-userSettings.save=Guardar
 weblogEdit.title.newEntry=Nueva entrada
 weblogEdit.subtitle.newEntry=Crear una nueva entrada en el weblog <span>{0}</span>
 weblogEdit.title.editEntry=Editar entrada
@@ -532,14 +509,11 @@ weblogEntryQuery.label.allEntries=Todas 
 weblogEntryQuery.label.draftOnly=S\u00F3lo borrador
 weblogEntryQuery.label.publishedOnly=S\u00F3lo publicadas
 weblogEntryQuery.label.pendingOnly=S\u00F3lo pendientes
-weblogEntryQuery.edit=Editar
 weblogEntryQuery.category=Categor\u00EDa
 weblogEntryQuery.pubTime=Publicado
 weblogEntryQuery.updateTime=Actualizado
 weblogEntryQuery.pending=Pendiente
 weblogEntryQuery.draft=Borrador
-weblogEntryQuery.button.export=Exportar
-weblogMain.links=Enlaces
 websiteSettings.title=Configuraci\u00F3n del Weblog
 websiteSettings.subtitle=Administrar la configuraci\u00F3n del weblog <span>{0}</span>
 websiteSettings.tip=Cambiar t\u00EDtulo del weblog, descripci\u00F3n, configuraci\u00F3n de prevenci\u00F3n de spam en comentarios y referencias.
@@ -583,7 +557,6 @@ yourProfile.saved=Los cambios en su perf
 yourWebsites.title=Men\u00FA principal
 yourWebsites.actions=Acciones
 yourWebsites.createOne=crear uno?
-yourWebsites.prompt.noBlogNoCreate=Tiene una cuenta de usuario, pero no weblog. Pregunte a su administrador para crear uno  para usted.
 yourWebsites.prompt.hasBlog=Seleccionar un weblog para editar, gestionar o configurar.
 yourWebsites.accept=aceptar
 yourWebsites.decline=rechazar

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=1607400&r1=1607399&r2=1607400&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_fr.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_fr.properties Wed Jul  2 15:30:16 2014
@@ -20,7 +20,11 @@ generic.cancel=Annuler
 generic.done=Terminé
 generic.yes=Oui
 generic.no=Non
+generic.name=Nom
 generic.description=Description
+generic.save=Enregistrer
+generic.edit=Editer
+generic.delete=Effacer
 
 # ------------------------------------------------------------- BookmarkForm.jsp
 
@@ -30,7 +34,6 @@ bookmarkForm.edit.title=Editer un signet
 bookmarkForm.edit.subtitle=Editer un signet dans le répertoire [{0}]
 bookmarkForm.image=Lien de l'image
 bookmarkForm.rssUrl=Adresse du fil d'information
-bookmarkForm.save=Sauvegarder
 bookmarkForm.url=Lien du signet
 
 # ----------------------------------------------------------- BookmarksForm.jsp
@@ -53,7 +56,6 @@ bookmarksForm.addFolder=Ajouter un ré
 bookmarksForm.delete=Effacer la sélection
 bookmarksForm.delete.confirm=Effacer les signets sélectionnés ?
 bookmarksForm.folder=Répertoire de signets
-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 ?
@@ -98,13 +100,11 @@ categoryForm.edit.subtitle=Editer une ca
 categoryForm.add.title=Ajout de catégories
 categoryForm.add.subtitle=Ajouter une catégorie
 categoryForm.image=Image
-categoryForm.save=Sauvegarder
 categoryForm.error.duplicateName=Il existe déjà une catégorie nommée '{0}'. Veuillez choisir un autre nom.
 
 # ----------------------------------------------------------- CategoriesForm.jsp
 
 categoriesForm.subtitle=Gérer les catégories du blog <span>{0}</span>
-categoriesForm.edit=Editer
 categoriesForm.root=Racine
 categoriesForm.rootTitle=Catégories
 categoriesForm.rootPrompt=\
@@ -206,7 +206,6 @@ commentManagement.onlySpam=Spam seulemen
 
 commentManagement.columnApproved=Approuvé
 commentManagement.columnSpam=Spam
-commentManagement.columnDelete=Effacer
 commentManagement.columnComment=Commentaire
 commentManagement.update=Enregistrer
 commentManagement.updateSuccess=Les commentaires ont été mis à jour.
@@ -288,8 +287,6 @@ configForm.themeSettings=Paramètres d
 configForm.newUserThemes=Répertoire des thèmes
 configForm.allowCustomTheme=Autoriser les thèmes personnalisés
 
-configForm.save=Enregistrer
-
 # ---------------------------------------------------------------- Create weblog
 
 createWebsite.title=Créer un blog
@@ -398,8 +395,6 @@ folderForm.add.subtitle=Ajoute un rép
 folderForm.edit.title=Editer un répertoire
 folderForm.edit.subtitle=Edite le répertoire de signets dans le répertoire [{0}]
 
-folderForm.save=Enregistrer
-
 folderForm.error.duplicateName=Le répertoire '{0}' est en cours d'utilisation. \
 Vous devez choisir un autre répertoire.
 
@@ -539,7 +534,6 @@ mainPage.searchWeblogs=Rechercher un blo
 mainPage.actions=Actions
 mainPage.loggedInAs=Connecté en tant que
 mainPage.currentWebsite=Edition du blog
-mainPage.adminWarning=Vous avez les droits d'<b>administrateur principal</b><br /> de ce site, utilisez les avec prudence.
 mainPage.mainMenu=Menu principal
 
 # ------------------------------------------------------------------ Maintenance
@@ -574,8 +568,6 @@ memberPermissions.membersChanged=Les per
 
 memberPermissions.confirmRemove=Etes vous certain(e) de vouloir enlever des membres de ce blog ?
 
-memberPermissions.button.save=Enregistrer
-
 memberPermissions.inviteMember=Inviter un nouveau membre
 memberPermissions.whyInvite=Inviter quelqu'un à joindre votre blog et vous aider à écrire.
 
@@ -589,12 +581,6 @@ Des droits <b>Limités</b> ne permette
 
 newUser.addNewUser=Enregistrement d'un nouvel utilisateur
 
-# --------------------------------------------------------------- Navigation Bar
-
-navigationBar.header=Navigation
-navigationBar.main=Page principale
-navigationBar.youMay=Vous pouvez
-
 # -------------------------------------------------------------- Page management
 
 pagesForm.title=Modéles
@@ -641,9 +627,7 @@ pageForm.hidden=Caché
 pageForm.hidden.tip=Les pages cachées ne sont pas accessibles par un lien URL à travers ce blog
 pageForm.navbar=Inclus dans le menu de la page
 pageForm.navbar.tip=Inclus dans le menu produit par la macro 'showPageMenu()'
-pageForm.description=Description
 pageForm.template=Modèle
-pageForm.save=Enregistrer
 pageForm.newTemplateContent=<html><body></body></html>
 pageForm.save.success=Modèle mis à jour.
 pageForm.launch=exécuter
@@ -681,8 +665,6 @@ pings.commonPingTargetsExplanation=Ces a
 par l'administrateur de ce site pour tous les utilisateurs. Vous pouvez envoyer \
 des notifications à tous ces sites.
 
-pings.customPingTargets=Adresses de notification personnalisées
-
 ping.successful=La notification a réussie.
 ping.transmittedButError=La notification à été envoyée au site distant mais celui-ci a renvoyé \
 le message d'erreur suivant :
@@ -702,8 +684,6 @@ commonPingTarget.subtitle=Edition de l'a
 
 pingTarget.pingUrl=Adresse URL
 pingTarget.autoEnabled=Ping Automatique
-pingTarget.save=Enregistrer
-pingTarget.edit=Editer
 pingTarget.remove=Effacer
 pingTarget.confirmRemoveTitle=Confirmation d'effacement de l'adresse de notification
 pingTarget.confirmCommonRemove=Effacer cette adresse affectera tous les blogs l'utilisant. \
@@ -766,9 +746,6 @@ planetSubscriptions.column.feedUrl=URL d
 
 planetSubscription.feedUrl=URL du fil d'information
 
-planetSubscriptions.button.save=Enregistrer
-planetSubscriptions.button.delete=Effacer
-
 #FIXME UH
 planetSubscription.foundExisting=Il y a [{0}] souscriptions existantes. \
 Celle-ci a été ajoutée.
@@ -777,7 +754,6 @@ planetSubscription.success.saved=Souscri
 planetSubscription.error=Vous devez specifier une adresse URL pour le fil d'information
 planetSubscription.error.feedUrl=URL du fil requise
 planetSubscriptions.error.duringSave=La souscription {0} semble déjà exister
-planetSubscription.error.deleting=Une erreur est survenue durant l'effacement \
 de la souscription.
 
 # ------------------------------------------------------------ PlanetGroups.jsp
@@ -796,10 +772,8 @@ Vous pouvez aussi effacer ce groupe en c
 
 planetGroups.existingTitle=Groupes d'aggregations personnalisés existants
 planetGroups.existingPrompt=Sélectionnez un groupe existant à editer.
-planetGroups.edit=Editer
 
 planetGroups.column.title=Titre
-planetGroups.column.edit=Editer
 planetGroups.column.subscriptions=Souscriptions
 planetGroups.column.handle=Identifiant
 
@@ -810,15 +784,11 @@ planetGroups.edit.tip=Editer ce group
 planetGroups.title=Titre
 planetGroups.handle=Identifiant
 
-planetGroups.button.save=Enregistrer
-planetGroups.button.delete=Effacer
-
 planetGroups.success.saved=Groupe enregistré
 
 planetGroups.error.title=Le titre est requis
 planetGroups.error.handle=L'identifiant est requis
 planetGroups.error.nameReserved=L'identifiant 'all' ne peut être utilisé
-planetGroups.error.deleting=Une erreur est survenue durant l'effacement de ce groupe.
 
 # ------------------------------------------------------------------ Statistics
 
@@ -895,8 +865,6 @@ userAdmin.subtitle.createNewUser=Crée
 Tous les champs du formulaire sont requis.
 
 userAdmin.enabled=Activé
-userAdmin.edit=Editer
-userAdmin.save=Enregistrer
 userAdmin.title=Gestion des utilisateurs
 userAdmin.userAdmin=Administrateur
 
@@ -1069,16 +1037,11 @@ weblogEntriesPager.month.dateFormat=MMM 
 # ---------------------------------------------------------- Weblog Entry Remove
 
 weblogEntryRemove.removeWeblogEntry=Effacer cette publication
-weblogEntryRemove.yes=Oui
-weblogEntryRemove.no=Non
 weblogEntryRemove.areYouSure=Etes vous certain(e) de vouloir effacer cette publication ?
 weblogEntryRemove.entryTitle=Titre de la publication
 weblogEntryRemove.entryId=Identifiant
 
 # --------------------------------------------------- Weblog Entry Export/Import
-weblogEntryExport.title=Exporter les publications
-
-# --------------------------------------------------- Weblog Entry Export/Import
 
 weblogEntryQuery.title=Publications
 weblogEntryQuery.subtitle=Rechercher et éditer les publications du blog <span>{0}</span>
@@ -1094,9 +1057,6 @@ weblogEntryQuery.noneFound=Aucune public
 
 weblogEntryQuery.label.startDate=Date de début
 weblogEntryQuery.label.endDate=Date de fin
-
-weblogEntryQuery.section.select.entryAttributes=Publications à inclure
-
 weblogEntryQuery.label.category=Catégorie
 weblogEntryQuery.label.tags=Tags
 weblogEntryQuery.label.text=Texte de recherche
@@ -1108,7 +1068,6 @@ weblogEntryQuery.label.publishedOnly=Ent
 weblogEntryQuery.label.pendingOnly=Entrées en attente seulement
 weblogEntryQuery.label.scheduledOnly=Entrées planifiées seulement
 
-weblogEntryQuery.edit=Editer
 weblogEntryQuery.view=Afficher
 weblogEntryQuery.category=Catégorie
 weblogEntryQuery.pubTime=Publié le
@@ -1245,7 +1204,6 @@ yourWebsites.permission=Permission
 #FIXME
 yourWebsites.confirmResignation=Etes vous certain de vouloir démissionner de ce blog ?
 yourWebsites.weblog=Lien
-yourWebsites.description=Description
 
 yourWebsites.newEntry=Nouvelle&nbsp;publication
 yourWebsites.editEntries=Publications

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=1607400&r1=1607399&r2=1607400&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 15:30:16 2014
@@ -21,6 +21,9 @@ generic.done=\u623B\u308B
 generic.yes=\u306F\u3044
 generic.no=\u3044\u3044\u3048
 generic.description=\u8A73\u7D30
+generic.save=\u4FDD\u5B58
+generic.edit=\u7DE8\u96C6
+generic.delete=\u524A\u9664
 
 # ------------------------------------------------------------- BookmarkForm.jsp
 
@@ -30,7 +33,6 @@ bookmarkForm.edit.title=\u30D6\u30C3\u30
 bookmarkForm.edit.subtitle=\u30D5\u30A9\u30EB\u30C0[{0}]\u306E\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u3092\u7DE8\u96C6\u3059\u308B
 bookmarkForm.image=\u753B\u50CFURL
 bookmarkForm.rssUrl=Newsfeed\u306EURL
-bookmarkForm.save=\u4FDD\u5B58
 bookmarkForm.url=\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u306EURL
 
 # ----------------------------------------------------------- BookmarksForm.jsp
@@ -47,7 +49,6 @@ bookmarksForm.addBookmark=\u30D6\u30C3\u
 bookmarksForm.addFolder=\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u30D5\u30A9\u30EB\u30C0\u8FFD\u52A0
 bookmarksForm.delete=\u9078\u629E\u3057\u305F\u3082\u306E\u3092\u524A\u9664
 bookmarksForm.folder=\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u30D5\u30A9\u30EB\u30C0
-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.path=\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u30D5\u30A9\u30EB\u30C0
@@ -86,18 +87,13 @@ calendar.next=\u6B21
 
 categoryForm.edit.title=\u30AB\u30C6\u30B4\u30EA\u7DE8\u96C6
 categoryForm.edit.subtitle=\u30AB\u30C6\u30B4\u30EA\u3092\u7DE8\u96C6\u3057\u307E\u3059
-
 categoryForm.add.title=\u30AB\u30C6\u30B4\u30EA\u8FFD\u52A0
 categoryForm.add.subtitle=\u30AB\u30C6\u30B4\u30EA\u3092\u8FFD\u52A0\u3057\u307E\u3059
-
 categoryForm.image=\u753B\u50CF
-categoryForm.save=\u4FDD\u5B58
-
 
 # ----------------------------------------------------------- CategoriesForm.jsp
 
 categoriesForm.subtitle=<span>{0}</span>\u306E\u30AB\u30C6\u30B4\u30EA\u3092\u7BA1\u7406\u3057\u307E\u3059
-categoriesForm.edit=\u7DE8\u96C6
 categoriesForm.root=\u30EB\u30FC\u30C8
 categoriesForm.rootTitle=\u30AB\u30C6\u30B4\u30EA\u30EB\u30FC\u30C8
 categoriesForm.rootPrompt=\
@@ -172,7 +168,6 @@ commentManagement.onlyDisapproved=\u62D2
 commentManagement.onlySpam=\u30B9\u30D1\u30E0\u306E\u307F
 commentManagement.columnApproved=\u627F\u8A8D
 commentManagement.columnSpam=\u30B9\u30D1\u30E0
-commentManagement.columnDelete=\u524A\u9664
 commentManagement.columnComment=\u30B3\u30E1\u30F3\u30C8
 commentManagement.update=\u5909\u66F4\u3092\u4FDD\u5B58
 commentManagement.updateSuccess=\u30B3\u30E1\u30F3\u30C8\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u306B\u6210\u529F\u3057\u307E\u3057\u305F\u3002
@@ -237,8 +232,6 @@ configForm.themeSettings=\u30C6\u30FC\u3
 configForm.newUserThemes=\u30C6\u30FC\u30DE\u306E\u7F6E\u3044\u3066\u3042\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA
 configForm.allowCustomTheme=\u30C6\u30FC\u30DE\u306E\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA\u3092\u8A31\u53EF\u3057\u307E\u3059\u304B\uFF1F
 
-configForm.save=\u4FDD\u5B58
-
 # ---------------------------------------------------------------- Create weblog
 
 createWebsite.title=\u65B0\u3057\u3044\u30D6\u30ED\u30B0\u3092\u4F5C\u6210\u3059\u308B
@@ -329,12 +322,9 @@ errorPage.message=Roller\u304C\u4F8B\u59
 
 folderForm.add.title=\u30D5\u30A9\u30EB\u30C0\u8FFD\u52A0
 folderForm.add.subtitle=\u65B0\u3057\u3044\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u30D5\u30A9\u30EB\u30C0\u3092\u8FFD\u52A0\u3057\u307E\u3059
-
 folderForm.edit.title=\u30D5\u30A9\u30EB\u30C0\u7DE8\u96C6
 folderForm.edit.subtitle=\u30D5\u30A9\u30EB\u30C0[{0}]\u3092\u7DE8\u96C6\u3057\u307E\u3059
 
-folderForm.save=\u5909\u66F4\u3092\u4FDD\u5B58
-
 # ------------------------------------------------------ index / setup page
 
 index.heading=Roller\u3078\u3088\u3046\u3053\u305D\uFF01
@@ -420,7 +410,6 @@ macro.weblog.preview=\u30D7\u30EC\u30D3\
 macro.weblog.commentpermalink.title=\u30B3\u30E1\u30F3\u30C8\u30D1\u30FC\u30DE\u30EA\u30F3\u30AF
 macro.weblog.readMore=\u3082\u3063\u3068\u8AAD\u3080
 macro.weblog.readMoreLink=[<a class="readmore" href="{0}">\u3082\u3063\u3068\u8AAD\u3080</a>]
-
 macro.weblog.postedby=\u6295\u7A3F\u8005
 macro.weblog.on=on
 macro.weblog.name=\u540D\u524D
@@ -443,7 +432,6 @@ on Dictionary.com" class="dictionary">{2
 macro.weblog.searchhits=<strong>{0}</strong>\u30A8\u30F3\u30C8\u30EA\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F
 macro.weblog.searchagain=\u518D\u5EA6\u691C\u7D22\u3059\u308B
 macro.weblog.searchgoogle=<em><a href="http://www.google.co.jp/">Google</a>\u3067<a href="http://www.google.co.jp/search?q={0}%20site:{1}/page/{3}" class="google">\u540C\u3058\u30AF\u30A8\u30EA\u30EF\u30FC\u30C9\u3067\u691C\u7D22</a>\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002</em>
-macro.weblog.allcategories=\u3059\u3079\u3066
 macro.weblog.notifyMeOfComments=\u65B0\u3057\u3044\u30B3\u30E1\u30F3\u30C8\u3092\u30E1\u30FC\u30EB\u3067\u901A\u77E5\u3059\u308B
 
 # -------------------------------------------------------------------- Main page
@@ -487,9 +475,6 @@ memberPermissions.membersRemoved={0}\u4E
 memberPermissions.membersChanged={0}\u4EBA\u306E\u30E6\u30FC\u30B6\u6A29\u9650\u3092\u5909\u66F4\u3057\u307E\u3057\u305F
 
 memberPermissions.confirmRemove=\u3053\u306E\u30D6\u30ED\u30B0\u304B\u3089\u672C\u5F53\u306B\u9664\u540D\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B\uFF1F
-
-memberPermissions.button.save=\u8A2D\u5B9A\u3092\u4FDD\u5B58
-
 memberPermissions.inviteMember=\u65B0\u898F\u62DB\u5F85\u30E6\u30FC\u30B6
 memberPermissions.whyInvite=\u65B0\u3057\u304F\u3053\u306E\u30D6\u30ED\u30B0\u3078\u30E6\u30FC\u30B6\u3092\u62DB\u5F85\u3057\u307E\u3059
 
@@ -536,7 +521,6 @@ pageForm.hidden.tip=\u96A0\u3057\u30C6\u
 pageForm.navbar=\u30DA\u30FC\u30B8\u30E1\u30CB\u30E5\u30FC\u306B\u542B\u3081\u308B
 pageForm.navbar.tip=Include in menu produced by showPageMenu() macro
 pageForm.template=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8
-pageForm.save=\u4FDD\u5B58
 pageForm.newTemplateContent=<html><body></body></html>
 pageForm.save.success=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u304C\u66F4\u65B0\u3055\u308C\u307E\u3057\u305F
 
@@ -575,8 +559,6 @@ commonPingTarget.subtitle=Ping\u30BF\u30
 
 pingTarget.pingUrl=Ping URL
 pingTarget.autoEnabled=\u81EA\u52D5Ping\u8A2D\u5B9A
-pingTarget.save=\u5909\u66F4\u3092\u4FDD\u5B58
-pingTarget.edit=\u7DE8\u96C6
 pingTarget.remove=\u524A\u9664
 pingTarget.confirmRemoveTitle=Ping\u30BF\u30FC\u30B2\u30C3\u30C8\u524A\u9664
 pingTarget.confirmCommonRemove=\u5168\u30E6\u30FC\u30B6\u5BFE\u8C61\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u3092\u524A\u9664\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u307E\u3059\u3002\uFF3C
@@ -625,10 +607,6 @@ planetSubscriptions.column.title=Title
 planetSubscriptions.column.feedUrl=Feed URL
 
 planetSubscription.feedUrl=Newsfeed URL
-
-planetSubscriptions.button.save=\u4FDD\u5B58
-planetSubscriptions.button.delete=\u524A\u9664
-
 planetSubscription.success.deleted=Subscription successfully deleted
 planetSubscription.foundExisting=Found existing subscription [{0}], adding it instead
 planetSubscription.success.saved=\u8CFC\u8AAD\u304C\u4FDD\u5B58\u3055\u308C\u307E\u3057\u305F
@@ -651,10 +629,8 @@ your changes and then click Save. Or, us
 
 planetGroups.existingTitle=Existing Custom Aggregation Groups
 planetGroups.existingPrompt=Select an existing custom aggregation group to edit.
-planetGroups.edit=\u7DE8\u96C6
 
 planetGroups.column.title=Title
-planetGroups.column.edit=\u7DE8\u96C6
 planetGroups.column.subscriptions=Subscriptions
 planetGroups.column.handle=\u30CF\u30F3\u30C9\u30EB
 
@@ -664,10 +640,6 @@ planetGroups.edit.tip=\u30B0\u30EB\u30FC
 
 planetGroups.title=Title
 planetGroups.handle=\u30CF\u30F3\u30C9\u30EB
-
-planetGroups.button.save=\u4FDD\u5B58
-planetGroups.button.delete=\u524A\u9664
-
 planetGroups.success.saved=\u30B0\u30EB\u30FC\u30D7\u304C\u4FDD\u5B58\u3055\u308C\u307E\u3057\u305F
 
 planetGroups.error.title=Title is required
@@ -745,8 +717,6 @@ userAdmin.title.createNewUser=\u65B0\u89
 userAdmin.subtitle.createNewUser=\u65B0\u898F\u30E6\u30FC\u30B6\u3092\u4F5C\u6210\u3057\u307E\u3059(\u5168\u9805\u76EE\u5FC5\u9808)
 
 userAdmin.enabled=\u6709\u52B9
-userAdmin.edit=\u7DE8\u96C6
-userAdmin.save=\u30E6\u30FC\u30B6\u3092\u4F5C\u6210\u307E\u305F\u306F\u5909\u66F4\u3092\u4FDD\u5B58
 userAdmin.title=\u30E6\u30FC\u30B6\u7BA1\u7406
 userAdmin.userAdmin=\u30B7\u30B9\u30C6\u30E0\u7BA1\u7406\u8005
 
@@ -936,7 +906,6 @@ weblogEntryQuery.label.draftOnly=\u4E0B\
 weblogEntryQuery.label.publishedOnly=\u6295\u7A3F\u6E08\u307F\u306E\u307F
 weblogEntryQuery.label.pendingOnly=\u4E2D\u9014\u30A8\u30F3\u30C8\u30EA\u306E\u307F
 
-weblogEntryQuery.edit=\u7DE8\u96C6
 weblogEntryQuery.view=\u8868\u793A
 weblogEntryQuery.category=\u30AB\u30C6\u30B4\u30EA
 weblogEntryQuery.pubTime=\u6295\u7A3F\u6E08\u307F
@@ -1111,7 +1080,6 @@ 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
-planetSubscriptions.column.delete=\u524A\u9664
 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
@@ -1169,7 +1137,6 @@ ConfigForm.description=Planet \u8A73\u7D
 loginPage.openIdPrompt=OpenID\u3092\u7528\u3044\u3066\u30ED\u30B0\u30A4\u30F3\u3057\u3066\u304F\u3060\u3055\u3044
 footer.productName=Powered by <a href="http://roller.apache.org">Apache Roller Weblogger</a> Version {0}
 macro.weblog.postpreview=\u30D7\u30EC\u30D3\u30E5\u30FC
-stylesheetEdit.save=\u4FDD\u5B58
 ConfigForm.message.saveSucceeded=Planet\u8A2D\u5B9A\u304C\u4FDD\u5B58\u3055\u308C\u307E\u3057\u305F
 weblogEdit.scheduled=\u30B9\u30B1\u30B8\u30E5\u30FC\u30EB\u6E08\u307F
 weblogEdit.scheduledEntries=\u30B9\u30B1\u30B8\u30E5\u30FC\u30EB\u6E08\u307F\u30A8\u30F3\u30C8\u30EA

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=1607400&r1=1607399&r2=1607400&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 15:30:16 2014
@@ -37,7 +37,7 @@
     <p/>
     <div class="formrow">
        <label for="" class="formrow">&nbsp;</label>
-       <s:submit value="%{getText('pingTarget.save')}" />
+       <s:submit value="%{getText('generic.save')}" />
     </div>
 
 </s:form>

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=1607400&r1=1607399&r2=1607400&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 15:30:16 2014
@@ -38,7 +38,7 @@
     <p/>
     <div class="formrow">
        <label for="" class="formrow">&nbsp;</label>
-       <s:submit value="%{getText('pingTarget.save')}" />
+       <s:submit value="%{getText('generic.save')}" />
        <s:submit value="%{getText('pingTarget.cancel')}" action="commonPingTargets" />
     </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=1607400&r1=1607399&r2=1607400&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 15:30:16 2014
@@ -30,7 +30,7 @@
     <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>
+    <th class="rollertable" width="5%"><s:text name="generic.edit" /></th>
     <th class="rollertable" width="5%"><s:text name="pingTarget.remove" /></th>
 </tr>
 
@@ -79,7 +79,7 @@
             <s:param name="bean.id" value="#pingTarget.id" />
         </s:url>
         <s:a href="%{editPing}">
-            <img src='<c:url value="/images/page_white_edit.png"/>' border="0" alt="<s:text name="pingTarget.edit" />" />
+            <img src='<c:url value="/images/page_white_edit.png"/>' border="0" alt="<s:text name="generic.edit" />" />
         </s:a>
     </td>
     

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=1607400&r1=1607399&r2=1607400&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 15:30:16 2014
@@ -91,7 +91,7 @@
     <br />
     
     <div class="control">
-        <s:submit value="%{getText('userAdmin.save')}" />
+        <s:submit value="%{getText('generic.save')}" />
         <input type="button" value="<s:text name="generic.cancel"/>" onclick="window.location='<s:url action="userAdmin"/>'" />
     </div>
     

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=1607400&r1=1607399&r2=1607400&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 15:30:16 2014
@@ -182,7 +182,7 @@ function handleCommentResponse() {
         <s:text name="commentManagement.columnSpam" />
     </th>
     <th class="rollertable" width="5%" >
-        <s:text name="commentManagement.columnDelete" />
+        <s:text name="generic.columnDelete" />
     </th>
     <th class="rollertable">
         <s:text name="commentManagement.columnComment" />

Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp?rev=1607400&r1=1607399&r2=1607400&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp Wed Jul  2 15:30:16 2014
@@ -106,7 +106,7 @@
     </table>
     
     <div class="control">
-        <input class="buttonBox" type="submit" value="<s:text name="configForm.save"/>"/>
+        <input class="buttonBox" type="submit" value="<s:text name="generic.save"/>"/>
     </div>
     
 </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=1607400&r1=1607399&r2=1607400&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 15:30:16 2014
@@ -145,7 +145,7 @@
     <br />
     
     <div class="control">
-        <s:submit value="%{getText('userAdmin.save')}" />
+        <s:submit value="%{getText('generic.save')}" />
         <input type="button" value="<s:text name="generic.cancel"/>" onclick="window.location='<s:url action="userAdmin"/>'" />
     </div>
     

Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PlanetConfig.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PlanetConfig.jsp?rev=1607400&r1=1607399&r2=1607400&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PlanetConfig.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PlanetConfig.jsp Wed Jul  2 15:30:16 2014
@@ -79,7 +79,7 @@
     </table>
     
     <div class="control">
-        <input class="buttonBox" type="submit" value="<s:text name="configForm.save"/>"/>
+        <input class="buttonBox" type="submit" value="<s:text name="generic.save"/>"/>
     </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=1607400&r1=1607399&r2=1607400&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 15:30:16 2014
@@ -48,7 +48,7 @@
     
     <div class="formrow">
         <label class="formrow" />&nbsp;</label>
-        <s:submit value="%{getText('planetGroups.button.save')}" />
+        <s:submit value="%{getText('generic.save')}" />
         &nbsp;
         <input type="button" 
                value='<s:text name="generic.cancel" />'
@@ -60,7 +60,7 @@
                 <s:param name="bean.id" value="%{bean.id}" />
             </s:url>
             <input type="button" 
-                   value='<s:text name="planetGroups.button.delete" />' 
+                   value='<s:text name="generic.delete" />'
                    onclick="window.location='<s:property value="%{deleteUrl}"/>'" />
         </s:if>
     </div>
@@ -81,7 +81,7 @@
         <s:text name="planetGroups.column.handle" />
     </th>
     <th class="rollertable" width="10%">
-        <s:text name="planetGroups.column.edit" />
+        <s:text name="generic.edit" />
     </th>
     <th class="rollertable" width="10%">
         <s:text name="planetGroups.column.subscriptions" />

Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptions.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptions.jsp?rev=1607400&r1=1607399&r2=1607400&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptions.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptions.jsp Wed Jul  2 15:30:16 2014
@@ -47,7 +47,7 @@ function confirmSubDelete(subUrl) {
     <div class="formrow">
         <label for="feedURL" class="formrow" /><s:text name="planetSubscription.feedUrl" /></label>
         <s:textfield name="subUrl" size="40" maxlength="255" />
-        &nbsp;<s:submit value="%{getText('planetSubscriptions.button.save')}" />
+        &nbsp;<s:submit value="%{getText('generic.save')}" />
     </div>
 </s:form>
 
@@ -69,7 +69,7 @@ function confirmSubDelete(subUrl) {
             <s:text name="planetSubscriptions.column.feedUrl" />
         </th>
         <th class="rollertable" width="10%">
-            <s:text name="planetSubscriptions.column.delete" />
+            <s:text name="generic.delete" />
         </th>
     </tr>
     <s:iterator id="sub" value="subscriptions" status="rowstatus">
@@ -92,7 +92,7 @@ function confirmSubDelete(subUrl) {
         <td class="rollertable">
             <img src='<s:url value="/images/delete.png"/>' />
             <a href="javascript: void(0);" onclick="confirmSubDelete('<s:property value="feedURL"/>')">
-                <s:text name="planetSubscriptions.button.delete"/>
+                <s:text name="generic.delete"/>
             </a>
         </td>       
         

Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/UserAdmin.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/UserAdmin.jsp?rev=1607400&r1=1607399&r2=1607400&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/UserAdmin.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/UserAdmin.jsp Wed Jul  2 15:30:16 2014
@@ -33,7 +33,7 @@
     <input name="userName" id="userName" size="30" maxlength="30" 
            onfocus="onUserNameFocus(null)" onkeyup="onUserNameChange(null)" 
            style="margin:4px" />
-    <input type="submit" value='<s:text name="userAdmin.edit" />' 
+    <input type="submit" value='<s:text name="generic.edit" />'
            style="margin:4px" />
     <br />
     <select id="userList" size="10" onchange="onUserSelected()" 

Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp?rev=1607400&r1=1607399&r2=1607400&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp Wed Jul  2 15:30:16 2014
@@ -84,7 +84,7 @@
                        </tr>
                        
                        <tr>
-                           <td class="mm_subtable_label"><s:text name='yourWebsites.description' /></td>   
+                           <td class="mm_subtable_label"><s:text name='generic.description' /></td>
                            <td><s:property value="#perms.weblog.description" escape="false" /></td>
                        </tr>
 

Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Setup.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Setup.jsp?rev=1607400&r1=1607399&r2=1607400&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Setup.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Setup.jsp Wed Jul  2 15:30:16 2014
@@ -96,7 +96,7 @@
                     <tr>
                         <td colspan="2" class="label">
                             <div class="control">
-                                <s:submit value="%{getText('frontpageConfig.save')}" />
+                                <s:submit value="%{getText('generic.save')}" />
                             </div>
                         </td>
                     </tr>

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=1607400&r1=1607399&r2=1607400&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 15:30:16 2014
@@ -59,7 +59,7 @@
     </table>
     
     <p>
-        <s:submit value="%{getText('bookmarkForm.save')}" />
+        <s:submit value="%{getText('generic.save')}" />
         <s:submit value="%{getText('generic.cancel')}" action="bookmarkAdd!cancel" />
     </p>
     

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=1607400&r1=1607399&r2=1607400&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 15:30:16 2014
@@ -59,7 +59,7 @@
     </table>
     
     <p>
-        <s:submit value="%{getText('bookmarkForm.save')}" />
+        <s:submit value="%{getText('generic.save')}" />
         <s:submit value="%{getText('generic.cancel')}" action="bookmarkAdd!cancel" />
     </p>
     

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=1607400&r1=1607399&r2=1607400&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 15:30:16 2014
@@ -93,7 +93,7 @@ function onMove()
             <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>
+            <th class="rollertable" width="5%"><s:text name="generic.edit" /></th>
             <th class="rollertable" width="5%"><s:text name="bookmarksForm.visitLink" /></th>
         </tr>
         

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=1607400&r1=1607399&r2=1607400&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 15:30:16 2014
@@ -52,7 +52,7 @@ function onMove()
         <tr class="rollertable">
             <th class="rollertable" width="35%"><s:text name="generic.name" /></th>
             <th class="rollertable" width="45%"><s:text name="generic.description" /></th>
-            <th class="rollertable" width="10%"><s:text name="categoriesForm.edit" /></th>
+            <th class="rollertable" width="10%"><s:text name="generic.edit" /></th>
             <th class="rollertable" width="10%"><s:text name="categoriesForm.remove" /></th>
         </tr>
         

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=1607400&r1=1607399&r2=1607400&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 15:30:16 2014
@@ -45,7 +45,7 @@
     </table>
     
     <p>
-        <s:submit value="%{getText('categoryForm.save')}" />
+        <s:submit value="%{getText('generic.save')}" />
         <s:submit value="%{getText('generic.cancel')}" action="categoryAdd!cancel" />
     </p>
     

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=1607400&r1=1607399&r2=1607400&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 15:30:16 2014
@@ -46,7 +46,7 @@
     </table>
     
     <p>
-        <s:submit value="%{getText('categoryForm.save')}" />
+        <s:submit value="%{getText('generic.save')}" />
         <s:submit value="%{getText('generic.cancel')}" action="categoryEdit!cancel" />
     </p>
     

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=1607400&r1=1607399&r2=1607400&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 15:30:16 2014
@@ -170,7 +170,7 @@
                     <s:text name="commentManagement.columnSpam" />
                 </th>
                 <th class="rollertable" width="5%" >
-                    <s:text name="commentManagement.columnDelete" />
+                    <s:text name="generic.columnDelete" />
                 </th>
                 <th class="rollertable">
                     <s:text name="commentManagement.columnComment" />

Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp?rev=1607400&r1=1607399&r2=1607400&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp Wed Jul  2 15:30:16 2014
@@ -163,7 +163,7 @@
             <s:param name="weblog" value="%{actionWeblog.handle}" />
             <s:param name="bean.id" value="#post.id" />
         </s:url>
-        <s:a href="%{editUrl}"><s:text name="weblogEntryQuery.edit" /></s:a>
+        <s:a href="%{editUrl}"><s:text name="generic.edit" /></s:a>
     </td>
 
     <td>
@@ -171,7 +171,7 @@
             <s:param name="weblog" value="%{actionWeblog.handle}" />
             <s:param name="removeId" value="#post.id" />
         </s:url>
-        <s:a href="%{deleteUrl}"><s:text name="weblogEntryQuery.delete" /></s:a>
+        <s:a href="%{deleteUrl}"><s:text name="generic.delete" /></s:a>
     </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=1607400&r1=1607399&r2=1607400&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 15:30:16 2014
@@ -35,7 +35,7 @@
     </table>
     
     <p>
-        <s:submit value="%{getText('folderForm.save')}" />
+        <s:submit value="%{getText('generic.save')}" />
         <s:submit value="%{getText('generic.cancel')}" action="folderAdd!cancel" />
     </p>
     

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=1607400&r1=1607399&r2=1607400&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 15:30:16 2014
@@ -40,7 +40,7 @@
     </table>
     
     <p>
-        <s:submit value="%{getText('folderForm.save')}" />
+        <s:submit value="%{getText('generic.save')}" />
         <s:submit value="%{getText('generic.cancel')}" action="folderEdit!cancel" />
     </p>
     

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=1607400&r1=1607399&r2=1607400&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 15:30:16 2014
@@ -210,7 +210,7 @@ $("#d_clip_button").ready(function() {
 
     <div class="control">
        <input type="submit" tabindex="7"
-              value="<s:text name="mediaFileEdit.save" />" name="submit" />
+              value="<s:text name="generic.save" />" name="submit" />
        <input type="button" tabindex="8"
               value="<s:text name="generic.cancel" />" onClick="javascript:window.parent.onEditCancelled();" />
     </div>

Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Members.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Members.jsp?rev=1607400&r1=1607399&r2=1607400&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Members.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Members.jsp Wed Jul  2 15:30:16 2014
@@ -108,7 +108,7 @@ function save() {
     <br />
      
     <div class="control">
-       <s:submit value="%{getText('memberPermissions.button.save')}" />
+       <s:submit value="%{getText('generic.save')}" />
     </div>
     
 </s:form>

Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp?rev=1607400&r1=1607399&r2=1607400&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp Wed Jul  2 15:30:16 2014
@@ -92,7 +92,7 @@
     <table style="width:100%">
         <tr>
             <td>
-                <s:submit value="%{getText('stylesheetEdit.save')}" />&nbsp;&nbsp;
+                <s:submit value="%{getText('generic.save')}" />&nbsp;&nbsp;
                 <s:if test="!customTheme">
                     <s:submit value="%{getText('stylesheetEdit.revert')}" onclick="revertStylesheet();return false;" />
                 </s:if>

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=1607400&r1=1607399&r2=1607400&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 15:30:16 2014
@@ -136,7 +136,7 @@
     <table style="width:100%">
         <tr>
             <td>
-                <s:submit value="%{getText('pageForm.save')}" />
+                <s:submit value="%{getText('generic.save')}" />
                 <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>



Mime
View raw message