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 [1/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/
Author: gmazza
Date: Wed Jul 2 04:26:31 2014
New Revision: 1607241
URL: http://svn.apache.org/r1607241
Log:
Removed unused strings from Spanish resource file (almost 40% unused today).
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java
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/resources/ApplicationResources_ko.properties
roller/trunk/app/src/main/resources/ApplicationResources_nl.properties
roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
roller/trunk/app/src/main/resources/ApplicationResources_zh_TW.properties
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetAdd.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetConfirm.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/ModifyUser.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PlanetGroups.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/OAuthKeys.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Profile.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Register.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/BookmarksImport.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/CategoryRemove.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryRemove.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryRemoveViaList.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/MediaFileAdd.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MemberResign.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Pings.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/TemplateRemove.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/TemplatesRemove.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/TemplatesSidebar.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/WeblogRemoveConfirm.jsp
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java Wed Jul 2 04:26:31 2014
@@ -117,7 +117,7 @@ public class MediaFileView extends Media
"mediaFileView.mb", getText("mediaFileView.mb")));
SORT_OPTIONS = Arrays.asList(new KeyValueObject("name",
- getText("mediaFileView.name")), new KeyValueObject(
+ getText("generic.name")), new KeyValueObject(
"date_uploaded", getText("mediaFileView.date")),
new KeyValueObject("type", getText("mediaFileView.type")));
}
Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Wed Jul 2 04:26:31 2014
@@ -15,17 +15,15 @@
# directory of this distribution.
# -- Common terms used to reduce the number of strings that need translation.
-# -- Switching from application.* to generic.* as application.name, application.description
-# -- can be confusing.
generic.all=All
generic.none=None
-application.cancel=Cancel
-application.done=Done
-application.yes=Yes
-application.no=No
+generic.cancel=Cancel
+generic.done=Done
+generic.yes=Yes
+generic.no=No
+generic.name=Name
#future use:
-#generic.name=Name
#generic.description=Description
#generic.save=Save
#generic.edit=Edit
@@ -39,7 +37,6 @@ bookmarkForm.edit.title=Edit Bookmark
bookmarkForm.edit.subtitle=Editing bookmark in folder [{0}]
bookmarkForm.description=Description
bookmarkForm.image=Image URL
-bookmarkForm.name=Name
bookmarkForm.rssUrl=Newsfeed URL
bookmarkForm.save=Save
bookmarkForm.url=Bookmark URL
@@ -87,7 +84,6 @@ bookmarksForm.edit.tip=Click to modify t
bookmarksForm.folder.edit.tip=Click to edit folder
bookmarksForm.move=Move selected to:
bookmarksForm.move.confirm=Move selected bookmarks?
-bookmarksForm.name=Name
bookmarksForm.path=Folder
bookmarksForm.selectAllLabel=Select all bookmarks
bookmarksForm.selectOneLabel=Select bookmark named {0}
@@ -131,7 +127,6 @@ categoryForm.edit.title=Edit Category
categoryForm.edit.subtitle=Editing category
categoryForm.add.title=Add Category
categoryForm.add.subtitle=Adding category
-categoryForm.name=Name
categoryForm.description=Description
categoryForm.image=Image URL
categoryForm.save=Save
@@ -151,7 +146,6 @@ categoriesForm.noresults=There are curre
# ----------------------------------------------------------- CategoriesForm.jsp
-categoriesForm.name=Name
categoriesForm.subtitle=Manage categories in weblog <span>{0}</span>
categoriesForm.description=Description
categoriesForm.edit=Edit
@@ -389,7 +383,6 @@ you can easily switch to another theme o
customize it to your liking.
createWebsite.handle=Handle
-createWebsite.name=Name
createWebsite.description=Description
createWebsite.emailAddress=Email Address
createWebsite.locale=Locale
@@ -489,7 +482,6 @@ folderForm.add.subtitle=Adding new bookm
folderForm.edit.title=Edit Folder
folderForm.edit.subtitle=Editing bookmark folder [{0}]
-folderForm.name=Name
folderForm.save=Save
folderForm.add.success=Folder added
folderForm.update.success=Folder updated
@@ -756,7 +748,6 @@ mediaFileAdd.title=Add new media file(s)
mediaFileAdd.pageTip=Use this page to upload up to five new media files. \
Form fields that you set below will be applied to all files uploaded.
mediaFileAdd.fileLocation=Choose file to upload
-mediaFileAdd.name=Name
mediaFileAdd.description=Description
mediaFileAdd.tags=Tags (space separated)
mediaFileAdd.copyright=Copyright statement
@@ -803,7 +794,6 @@ 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.name=Name
mediaFileEdit.description=Description
mediaFileEdit.tags=Tags (space separated)
mediaFileEdit.copyright=Copyright statement
@@ -861,7 +851,6 @@ mediaFileView.others=Others
mediaFileView.kb=KB
mediaFileView.mb=MB
mediaFileView.bytes=Bytes
-mediaFileView.name=Name
mediaFileView.date=Date
mediaFileView.type=Type
mediaFileView.size=Size
@@ -1002,7 +991,6 @@ new pages. This is for advanced users on
with HTML, you might want to leave your templates alone. Please <b>backup</b> your templates!
pageForm.advancedSettings=Advanced Settings
-pagesForm.name=Name
pagesForm.action=Action
pagesForm.description=Description
pagesForm.remove=Remove
@@ -1034,7 +1022,6 @@ and code you are allowed to use in a tem
users only, if you''re not comfortable with HTML, you might want to leave \
your templates alone. NOTE: this is a required weblog template, you cannot \
change the name, link or description.
-pageForm.name=Name
pageForm.link=Link
pageForm.hidden=Hidden
pageForm.hidden.tip=Hidden pages cannot be accessed via a weblog URL
@@ -1111,7 +1098,6 @@ pingTarget.pingTarget=Ping Target
commonPingTarget.subtitle=Editing common ping target
-pingTarget.name=Name
pingTarget.pingUrl=Ping URL
pingTarget.autoEnabled=Auto Ping?
pingTarget.save=Save
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=1607241&r1=1607240&r2=1607241&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_de.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_de.properties Wed Jul 2 04:26:31 2014
@@ -4,11 +4,11 @@
#
generic.all=Alle
-generic.none=None
-application.cancel=Abbrechen
-application.done=Fertig
-application.no=Nein
-application.yes=Ja
+generic.none=Kein
+generic.cancel=Abbrechen
+generic.done=Fertig
+generic.no=Nein
+generic.yes=Ja
#
Bookmark.error.descriptionSize=Die Beschreibung darf nicht l\u00E4nger als 255 Zeichen sein
@@ -79,12 +79,10 @@ WeblogConfig.error.nameSize=Der Name dar
bookmarkForm.add.subtitle=Lesezeichen hinzuf\u00FCgen in Ordner [{0}]
# ------------------------------------------------------------- BookmarkForm.jsp
bookmarkForm.add.title=Neues Lesezeichen hinzuf\u00FCgen
-bookmarkForm.cancel=Abbrechen
bookmarkForm.description=Beschreibung
bookmarkForm.edit.subtitle=Lesezeichen bearbeiten in Ordner [{0}]
bookmarkForm.edit.title=Lesezeichen bearbeiten
bookmarkForm.image=Bild URL
-bookmarkForm.name=Name
bookmarkForm.rssUrl=Newsfeed URL
bookmarkForm.save=Speichern
bookmarkForm.url=Lesezeichen URL
@@ -100,7 +98,6 @@ bookmarksForm.folder=Ordner
bookmarksForm.importBookmarks=Lesezeichen via OPML importieren
bookmarksForm.move=Verschiebe Auswahl
bookmarksForm.move.confirm=Ausgew\u00E4hlte Lesezeichen verschieben?
-bookmarksForm.name=Name
bookmarksForm.path=Ordner
bookmarksForm.root=root
bookmarksForm.rootPrompt=Die ist Ihr oberster Lesezeichenordner. Die Lesezeichen, die Sie hier anlegen, werden im Blogrollen Bereich Ihres Blogs erscheinen (vorausgesetzt Sie benutzen eines der Standardthemen). Sie k\u00F6nnen Lesezeichenordner anlegen, aber Sie m\u00FCssen entsprechende Lesezeichenanzeigemacros zu Ihren Weblog Schablonen hinzuf\u00FCgen, wenn Sie die Ordnerinhalte anzeigen wollen.
@@ -132,7 +129,6 @@ categoriesForm.edit=Bearbeiten
categoriesForm.move=Verschieben
categoriesForm.move.confirm=Ausgew\u00E4hlte Kategorien verschieben?
# ---------------------------------------------------------- CategoriesForm.jsp
-categoriesForm.name=Name
categoriesForm.remove=L\u00F6schen
categoriesForm.root=root
categoriesForm.rootPrompt=Dies sind Ihre Kategorien auf der obersten Ebene. Sie k\u00F6nnen diese Kategorien verwenden um Ihre Weblogeintr\u00E4ge zu organisieren und Ihre Leser k\u00F6nnen zwischen unterschiedlichen Newsfeeds f\u00FCr Ihre Kategorien w\u00E4hlen.
@@ -146,7 +142,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.cancel=Abbrechen
categoryForm.description=Beschreibung
categoryForm.edit.subtitle=Kategorie bearbeiten
# ------------------------------------------------------------- CategoryForm.jsp
@@ -156,7 +151,6 @@ categoryForm.error.duplicateName=Es gibt
# ------------------------------------------------------------- CategoryForm.jsp
categoryForm.image=Bild
# ---------------------------------------------------------- CategoryForm.jsp
-categoryForm.name=Name
categoryForm.save=Speichern
comment.validator.akismetMessage=Der Akismet Dienst (akismet.com) h\u00E4lt den Kommentar f\u00FCr Spam
comment.validator.akismetName=Akismet Kommentarpr\u00FCfung
@@ -169,7 +163,6 @@ comment.validator.excessSizeMessage=Der
comment.validator.excessSizeName=Gr\u00F6\u00DFen\u00FCberschreitung Kommentarpr\u00FCfung
comment.validator.trackbackLinkbackMessage=Trackback von Webseite, der nicht auf Ihren Weblogeintrag verlinkt
comment.validator.trackbackLinkbackName=Trackback R\u00FCcklink Kommentarpr\u00FCfung
-commentManagement.all=Alle
commentManagement.bulkDeletePrompt1=Ihre Abfrage lieferte {0} Kommentare,
commentManagement.bulkDeletePrompt2=Alle l\u00F6schen?
commentManagement.columnApproved=Zugelassen
@@ -188,7 +181,6 @@ commentManagement.entryTitled=Betreffend
commentManagement.globalTip=Als globale Administration k\u00F6nnen Sie \u00FCber die Checkboxen den Spamstatus von Kommentaren einstellen oder Kommentare l\u00F6schen. Nicht \u00E4ndern k\u00F6nnen Sie hier den Freigabestatus, so dass Sie nicht in Konflikt mit Freigabeprozessen von anderen Nutzerinnen und Nutzern geraten k\u00F6nnen. Falls Sie \u00C4nderungen machen vergessen Sie nicht, diese durch Anklicken von <em>\u00C4nderungen speichern</em> am Ende der Seite zu sichern.
commentManagement.next=N\u00E4chste Seite
commentManagement.noCommentsFound=Keine Kommentare gefunden
-commentManagement.none=Keine
commentManagement.nowShowing=Zeige <b>{0}</b> Kommentare
commentManagement.onlyApproved=Nur freigegebene
commentManagement.onlyDisapproved=Nur abgelehnte
@@ -282,14 +274,12 @@ configForm.userSettings=Benutzer Einstel
configForm.weblogSettings=Einstellungen zur Weblogdarstellung
createWeblog.error.handleExists=Dieser Handle wird bereits bei einem anderen Weblog verwendet
createWeblog.error.invalidHandle=Dieser Handle ist ung\u00FCltig
-createWebsite.button.cancel=Abbrechen
createWebsite.button.save=Weblog erzeugen
createWebsite.created=Das neue Weblog [<b>{0}</b>] wurde erfolgreich angelegt.
createWebsite.description=Beschreibung
createWebsite.emailAddress=E-Mailadresse
createWebsite.handle=Handle
createWebsite.locale=Sprache
-createWebsite.name=Name
createWebsite.prompt=Nutzen Sie dieses Formular um ein neues Weblog f\u00FCr sich und andere anzulegen.
createWebsite.theme=Thema
createWebsite.timeZone=Zeitzone
@@ -354,12 +344,10 @@ errorPage.title=Unerwartete Ausnahmebedi
folderForm.add.subtitle=Neuen Lesezeichenordner hinzuf\u00FCgen
# --------------------------------------------------------------- FolderForm.jsp
folderForm.add.title=Ordner hinzuf\u00FCgen
-folderForm.cancel=Abbrechen
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.name=Name
folderForm.save=Sichern
# ---------------------------------------------------------------------- Footer
footer.productName=Powered by <a href="http://roller.apache.org">Apache Roller Weblogger</a> Version {0}
@@ -445,12 +433,10 @@ loginPage.userName=Benutzername
# ------------------------------------------------------------- Bookmark Macro
macro.bookmark.urlFeed=URL des Bliki.info RSS Newsfeeds
# ------------------------------------------------------------- RSS Macro
-macro.rss.all=Alle
macro.searchresults.hits_1=<strong>{0}</strong> Eintr\u00E4ge gefunden.<br /><em>Sie k\u00F6nnen
macro.searchresults.hits_2=die gleiche Suche</a> auf <a href="http://google.com">Google</a> durchf\u00FChren.</em>
macro.searchresults.incategory=- In der Kategorie -
# ------------------------------------------------------------- Search Results Day Macro
-macro.weblog.allcategories=Alle
macro.weblog.comment=Kommentar
macro.weblog.comment.unknown=Unbekannt
macro.weblog.commentpermalink.title=Kommentar Permalink
@@ -534,7 +520,6 @@ pageForm.hidden.tip=Auf versteckte Seite
pageForm.launch=Starten
pageForm.link=Link
# ------------------------------------------------------------ Page edit
-pageForm.name=Name
pageForm.navbar=In Seitenmen\u00FC einbinden
pageForm.navbar.tip=In Men\u00FC einbinden, welches durch showPageMenu() macro erzeugt wird.
pageForm.outputContentType=Content-Type
@@ -559,7 +544,6 @@ pagesForm.addNewPage=Neue Seite hinzuf\u
# -------------------------------------------------------------------- Page edit
pagesForm.description=Beschreibung
pagesForm.error.alreadyExists=Die Schablone {0} existiert bereits.
-pagesForm.name=Name
pagesForm.remove=L\u00F6schen
pagesForm.required=(muss eingegeben werden)
pagesForm.subtitle=Schablonen f\u00FCr den Weblog <span>{0}</span> verwalten.
@@ -585,7 +569,6 @@ pingTarget.enable=Einschalten
pingTarget.enabled=AN
pingTarget.malformedUrl=Die URL ist nicht korrekt aufgebaut.
pingTarget.manual=Manuell
-pingTarget.name=Name
pingTarget.nameNotUnique=Der Name dieses Ziels steht in Konflikt mit einem anderen Namen in der gleichen Zielmenge.
pingTarget.pingTarget=Ping Ziel
pingTarget.pingUrl=Ping URL
@@ -603,7 +586,6 @@ pings.title=Konfiguriere Automatische We
planetConfig.prompt=konfiguriere Planet Roller
planetConfig.subtitle=Konfiguration des integrierten Newsfeed-Aggregators von Roller.
planetConfig.title=Titel
-planetGroups.button.cancel=Abbrechen
planetGroups.button.delete=L\u00F6schen
planetGroups.button.save=Speichern
planetGroups.column.edit=Bearbeiten
@@ -762,7 +744,6 @@ userRegister.tip.passwordConfirm=Best\u0
userRegister.tip.screenName=Ihr gew\u00FCnschter angezeigter Name (kein HTML)
userRegister.tip.timeZone=Ihre bevorzugte Zeitzone
userRegister.tip.userName=Ein kurzer, aus einem Wort bestehender Benutzername f\u00FCr das Benutzerkonto. Bitte beschr\u00E4nken Sie sich auf einfache ASCII-Zeichen (a-z, A-Z, 0-9), und vermeiden Sie die Verwendung von HTML.
-userSettings.button.cancel=Abbrechen
userSettings.button.save=Profil speichern
# ------------------------------------------------------------------- Planet Roller
userSettings.email=E-Mail
@@ -904,9 +885,7 @@ weblogEntryQuery.view=Ansicht
weblogEntryRemove.areYouSure=Sind Sie sicher, das Sie diesen Weblog Eintrag entfernen wollen?
weblogEntryRemove.entryId=Eintrags-ID
weblogEntryRemove.entryTitle=Eintragstitel
-weblogEntryRemove.no=Nein
weblogEntryRemove.removeWeblogEntry=Entferne Weblog Eintrag
-weblogEntryRemove.yes=Ja
websiteRemove.subtitle=Weblogl\u00F6schung ist <b>NICHT UMKEHRBAR</b>
websiteRemove.title=Weblogl\u00F6schung best\u00E4tigen
websiteRemove.websiteId=Weblog-ID