svn commit: r1607137 [1/3] - in /roller/trunk/app/src/main: resources/ApplicationResources.properties resources/ApplicationResources_de.properties resources/ApplicationResources_ja_JP.properties webapp/WEB-INF/jsps/editor/WeblogConfig.jsp

[gm...@apache.org]

Author: gmazza
Date: Tue Jul  1 16:44:00 2014
New Revision: 1607137

URL: http://svn.apache.org/r1607137
Log:
Page model and email address from field removed from blog user settings page, unused strings removed from Japanese resource file.

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_ja_JP.properties
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.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=1607137&r1=1607136&r2=1607137&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Tue Jul  1 16:44:00 2014
@@ -1761,7 +1761,6 @@ websiteSettings.commentSettings=Comments
 websiteSettings.allowComments=Allow comments for your weblog?
 websiteSettings.moderateComments=Moderate comments before posting
 websiteSettings.emailComments=Email notification of posted comments
-websiteSettings.emailFromAddress=Default <em>from</em> e-mail address for notifications
 websiteSettings.commentsOffForInactiveWeblog=Turned comments off for inactive weblog
 
 # --- Default comments settings
@@ -1797,13 +1796,6 @@ websiteSettings.analyticsTrackingCode=Tr
 
 websiteSettings.savedChanges=Saved changes to weblog settings
 websiteSettings.button.update=Update Weblog Settings
-websiteSettings.button.rebuildIndex=Rebuild Search Index
-
-# --- Global admin settings
-
-websiteSettings.adminSettings=Global Admin only settings
-websiteSettings.pageModels=Comma-separated list of custom page model classes \
-to be loaded for this weblog
 
 # --- Remove weblog
 

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=1607137&r1=1607136&r2=1607137&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_de.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_de.properties Tue Jul  1 16:44:00 2014
@@ -914,12 +914,10 @@ websiteRemove.youSure=Sind Sie sicher, d
 websiteSettings.about=\u00DCber Ihren Blog
 websiteSettings.acceptedBlacklist={0} String und {2} Regex Blacklist Regeln akzeptiert
 websiteSettings.active=Weblog ist aktiv (und soll in Blogverzeichnissen enthalten sein)
-websiteSettings.adminSettings=Einstellungen f\u00FCr die globale Systemadministration
 websiteSettings.allowComments=Kommentare sind erlaubt in Ihrem Weblog?
 websiteSettings.applyCommentDefaults=Kommentarstandards f\u00FCr existierende Eintr\u00E4ge anwenden (nur dies Mal)?
 websiteSettings.bloggerApi=Blogger API
 websiteSettings.bloggerApiCategory=Kategorie f\u00FCr gesendete Eintr\u00E4ge via Blogger API
-websiteSettings.button.rebuildIndex=Suchindex neu aufbauen
 websiteSettings.button.remove=Weblog entfernen
 websiteSettings.button.update=Website Einstellungen updaten
 websiteSettings.commentSettings=Kommentare
@@ -930,7 +928,6 @@ websiteSettings.defaultCommentSettings=S
 websiteSettings.editor=Weblog Editor, der benutzt werden soll
 websiteSettings.emailAddress=E-Mail-Adresse des Weblogbesitzers
 websiteSettings.emailComments=E-Mail Kommentare?
-websiteSettings.emailFromAddress=Voreingestellte <em>von</em> E-Mail Adresse<br />f\u00FCr Kommentar-Benachrichtigungen
 websiteSettings.enableBloggerApi=Blogger API einschlaten f\u00FCr Ihren Weblog?
 websiteSettings.enableMultiLang=Ich ver\u00F6ffentliche meinen Weblog in verschiedenen Sprachen
 websiteSettings.entryDisplayCount=Zahl der anzuzeigenden Eintr\u00E4ge in meinem Weblog
@@ -944,7 +941,6 @@ websiteSettings.label1=Standard Eintrags
 websiteSettings.label2=(durchgef\u00FChrt in der aufgef\u00FChrten Ordnung)
 websiteSettings.languageSettings=Internationalisierungseinstellungen
 websiteSettings.moderateComments=Kommentare moderieren
-websiteSettings.pageModels=Komma-getrennte Liste von angepassten Seitenmodellklassen f\u00FCr diesen Weblog laden
 websiteSettings.removeWebsite=Sie sind der letzte Beitragende dieses Weblogs, m\u00F6chten Sie ihn l\u00F6schen?
 websiteSettings.removeWebsiteHeading=Weblog l\u00F6schen?
 websiteSettings.removeWebsiteWarning=<b>WARNUNG:</b> Die L\u00F6schung eines Weblogs l\u00F6scht alles: alle Weblogeintr\u00E4ge, Bookmarks, Kommentare und Einstellungen. <b>Eine Weblogl\u00F6schung ist irreversibel</b>.