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/08/20 16:17:53 UTC
svn commit: r1619110 - in /roller/trunk/app/src/main:
java/org/apache/roller/weblogger/ui/rendering/model/ resources/
Author: gmazza
Date: Wed Aug 20 14:17:52 2014
New Revision: 1619110
URL: http://svn.apache.org/r1619110
Log:
Problem with overescaping in Search fields fixed; unused resource strings removed.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.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_ru.properties
roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java?rev=1619110&r1=1619109&r2=1619110&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java Wed Aug 20 14:17:52 2014
@@ -50,7 +50,6 @@ import org.apache.roller.weblogger.ui.re
import org.apache.roller.weblogger.ui.rendering.pagers.WeblogEntriesPager;
import org.apache.roller.weblogger.ui.rendering.util.WeblogSearchRequest;
import org.apache.roller.weblogger.util.I18nMessages;
-import org.apache.roller.weblogger.util.Utilities;
/**
* Extends normal page renderer model to represent search results.
@@ -66,7 +65,7 @@ public class SearchResultsModel extends
private URLStrategy urlStrategy = null;
// the actual search results mapped by Day -> Set of entries
- private Map<Date, TreeSet<WeblogEntryWrapper>> results
+ private Map<Date, TreeSet<WeblogEntryWrapper>> results
= new TreeMap<Date, TreeSet<WeblogEntryWrapper>>(Collections.reverseOrder());
// the pager used by the 3.0+ rendering system
@@ -249,8 +248,8 @@ public class SearchResultsModel extends
public String getTerm() {
String query = searchRequest.getQuery();
- return (query == null)
- ? "" : StringEscapeUtils.escapeXml(Utilities.escapeHTML(query));
+ return (query == null)
+ ? "" : StringEscapeUtils.escapeXml10(query);
}
public String getRawTerm() {
Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1619110&r1=1619109&r2=1619110&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Wed Aug 20 14:17:52 2014
@@ -432,7 +432,6 @@ error.add.user.openIdInUse=Open ID alrea
error.add.user.missingUserName=You must specify a username.
error.add.user.badUserName=Invalid user name (must be alpha-numerics only).
error.add.user.missingPassword=You must specify a password.
-error.add.user.missingEmailAddress=You must specify a valid email address.
error.upload.dirmax=You cannot exceed the maximum directory size of {0} MB.
error.upload.disabled=File Upload has been turned off
error.upload.file=No file selected
@@ -655,8 +654,6 @@ macro.bookmark.urlFeed=URL of site''s RS
# --------------------------------------------------------- Search Results Macro
-macro.searchresults.hits_1=<strong>{0}</strong> entries found.<br /><em>You can also
-macro.searchresults.hits_2=try this same search</a> on Google.</em>
macro.searchresults.incategory=- All Categories -
error.searchProblem=There was a problem with your search.
@@ -693,8 +690,7 @@ macro.weblog.searchbutton=Search
macro.weblog.searchhits=Entries found for "{0}": <strong>{1}</strong>
macro.weblog.searchgoogle=<em>You can also \
<a href="http://google.com/search?q={0}%20site:{1}/{3}" \
-class="google">try this same search</a> on \
-<a href="http://google.com">Google</a>.</em>
+class="google">try this same search</a> on Google.</em>
macro.weblog.notifyMeOfComments=Notify me by email of new comments
macro.weblog.noEntriesForCategory=No entries found for specified category
@@ -795,7 +791,6 @@ mediaFileEdit.updateFileContents=Update
mediaFileEdit.clickToView=Click to view in new window
mediaFileEdit.permalink=Link (URL)
mediaFileEdit.linkTitle=Link to Media File, opens in new window
-mediaFileEdit.copyToClipboard=Copy Link (URL) to Clipboard
mediaFileEdit.includesEnclosure=This weblog entry includes the following media file enclosure:
mediaFileEdit.popupTitle=Media File Editor
@@ -1094,14 +1089,12 @@ pingTarget.sendPingNow=Send Ping Now
pingTarget.updated=Ping target "{0}" updated
pingTarget.created=Ping target "{0}" created
pingTarget.deleted=Ping target "{0}" deleted
-pingTarget.saved.error=Error updating ping target.
pingTarget.nameNotUnique=Target name already exists, please choose another.
pingTarget.nameMissing=Name is required
pingTarget.pingUrlMissing=Ping URL is required
pingTarget.malformedUrl=The URL is not properly formed.
pingTarget.unknownHost=The hostname in this URL doesn''t seem to exist.
-pingTarget.unspecified=No ping target id was specified in the request
pingTarget.notFound=Ping target id {0} was not found
# --------------------------------------------------------------- Planet Roller
@@ -1381,7 +1374,6 @@ userAdmin.userSaved=User profile saved
userAdmin.cantChangeOwnRole=Cannot change your own role
userAdmin.error.userNotFound=Specified user not found
-userAdmin.error.unexpected=Unexpected error
# --------------------------------------------------------------- User register
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=1619110&r1=1619109&r2=1619110&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_de.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_de.properties Wed Aug 20 14:17:52 2014
@@ -240,7 +240,6 @@ comments.htmlenabled=Erlaubt
comments.mathAuthenticatorQuestion=Bitte beantworten Sie diese kleine Mathematik-Frage
# ------------------------------------------------------------- comments.jsp
comments.title=Kommentar
-commonPingTarget.subtitle=Bearbeitung der allgemeinen Ping Ziele
# -------------------------------------------------------------- Ping Target Admin/Editing
commonPingTargets.commonPingTargets=Allgemeine Weblog Ping Ziele
commonPingTargets.explanation=Diese Zielwebsites sind in allen Weblogs verf\u00FCgbar f\u00FCr Update Pings.
@@ -324,7 +323,6 @@ error.activate.user.missingActivationCod
#---------------------------------------------------------- Error messages
error.add.user.badUserName=Ung\u00FCltiger Benutzername (nur alpha-numerische Zeichen erlaubt).
# ---------------------------------------------------------------- Activating User Account with E-mail
-error.add.user.missingEmailAddress=Sie m\u00FCssen eine g\u00FCltige E-Mailadresse angeben.
error.add.user.missingPassword=Sie m\u00FCssen ein Passwort angeben.
error.add.user.missingUserName=Sie m\u00FCssen einen Benutzernamen angeben.
error.add.user.userNameInUse=Der Benutzername ist schon vergeben.
@@ -445,8 +443,6 @@ loginPage.userName=Benutzername
# ------------------------------------------------------------- Bookmark Macro
macro.bookmark.urlFeed=URL des Bliki.info RSS Newsfeeds
# ------------------------------------------------------------- RSS Macro
-macro.searchresults.hits_1=<strong>{0}</strong> Eintr\u00E4ge gefunden.<br /><em>Sie k\u00F6nnen
-macro.searchresults.hits_2=die gleiche Suche</a> auf Google durchf\u00FChren.</em>
macro.searchresults.incategory=- Alle Kategorien -
# ------------------------------------------------------------- Search Results Day Macro
macro.weblog.comment=Kommentar
@@ -705,7 +701,6 @@ yourProfile.title=Ihr Profil
userAdmin.cantChangeOwnRole=Sie k\u00F6nnen Ihre eigene Rolle nicht \u00E4ndern
userAdmin.editEntries=Eintr\u00E4ge bearbeiten
userAdmin.enabled=Eingeschaltet
-userAdmin.error.unexpected=Unerwarteter Error
userAdmin.error.userNotFound=Der angegebene Benutzer wurde nicht gefunden
userAdmin.manage=Verwalten
userAdmin.newEntry=Neuer Eintrag
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=1619110&r1=1619109&r2=1619110&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_es.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_es.properties Wed Aug 20 14:17:52 2014
@@ -180,7 +180,6 @@ error.add.user.userNameInUse=El nombre d
error.add.user.missingUserName=Debe especificar un nombre de usuario
error.add.user.badUserName=Nombre de usuario no v\u00E1lido (debe ser s\u00F3lo alfanum\u00E9rico)
error.add.user.missingPassword=Debe especificar una contrase\u00F1a
-error.add.user.missingEmailAddress=Debe especificar una direcci\u00F3n v\u00E1lida de correo electr\u00F3nico
error.upload.dirmax=No se puede exceder el tama\u00F1o m\u00E1ximo de directorio de {0} MB.
error.upload.disabled=La carga de ficheros ha sido deshabilitada
error.upload.file=Ning\u00FAn fichero seleccionado
@@ -229,8 +228,6 @@ loginPage.rememberMe=Recordarme
loginPage.login=Entrar
loginPage.reset=Reiniciar
macro.bookmark.urlFeed=URL de la suscripci\u00F3n RSS al sitio web
-macro.searchresults.hits_1=<strong>{0}</strong> entradas encontradas.<br /><em>Tambi\u00E9n puede
-macro.searchresults.hits_2=probar la misma b\u00FAsqueda</a> en Google.</em>
error.searchProblem=Ha habido un problema con su b\u00FAsqueda.
macro.weblog.comments=Comentarios
macro.weblog.comment=Comentario
@@ -255,7 +252,7 @@ macro.weblog.post=Enviar
macro.weblog.searchalert=Por favor, introduzca un t\u00E9rmino que buscar para continuar.
macro.weblog.searchbutton=Buscar
macro.weblog.searchhits="{0}": <strong>{1}</strong> entradas encontradas.
-macro.weblog.searchgoogle=<em>Tambi\u00E9n puede <a href\="http\://google.com/search?q\={0}%20site\:{1}/page/{3}" class\="google">probar la misma b\u00FAsqueda</a> en <a href\="http\://google.com">Google</a>.</em>
+macro.weblog.searchgoogle=<em>Tambi\u00E9n puede <a href\="http\://google.com/search?q\={0}%20site\:{1}/page/{3}" class\="google">probar la misma b\u00FAsqueda</a> en Google.</em>
macro.weblog.notifyMeOfComments=Avisarme de nuevos comentarios por correo electr\u00F3nico
mainPage.category=Categor\u00EDa
mainPage.searchWeblogs=Buscar blogs
@@ -322,7 +319,6 @@ ping.transmissionFailed=La transmisi\u00
ping.unknownHost=El nombre del host del objetivo ping es desconocido.
ping.networkConnectionFailed=Hay problemas de conexi\u00F3n para alcanzar el sitio del objetivo ping.
ping.pingProcessingIsSuspended=El proceso ping se ha suspendido temporalmente por un administrador de sitio.
-commonPingTarget.subtitle=Editando objetivo ping personalizado
pingTarget.pingUrl=URL para ping
pingTarget.remove=Eliminar
pingTarget.confirmRemoveTitle=Eliminar confirmaci\u00F3n de objetivo ping
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=1619110&r1=1619109&r2=1619110&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_fr.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_fr.properties Wed Aug 20 14:17:52 2014
@@ -348,7 +348,6 @@ error.add.user.missingUserName=Vous deve
error.add.user.badUserName=Nom d'utilisateur incorrect \
(veuillez utiliser des caractères alpha-numériques uniquement).
error.add.user.missingPassword=Vous devez entrer un mot de passe.
-error.add.user.missingEmailAddress=Vous devez entrer une adresse de courriel valide.
error.upload.dirmax=Vous ne pouvez pas dépasser la limite de {0} MB pour la taille d'un répertoire.
error.upload.disabled=Le chargement de fichier est désactivé
@@ -482,9 +481,6 @@ macro.bookmark.urlFeed=URL du fil d'info
# --------------------------------------------------------- Search Results Macro
-macro.searchresults.hits_1=<strong>{0}</strong> entrées.<br /><em>Vous pouvez aussi
-macro.searchresults.hits_2=essayer la même recherche</a> sur Google.</em>
-
error.searchProblem=Votre recherche est incorrecte ou une erreur est survenue durant son execution.
# ----------------------------------------------------------------- Weblog Macro
@@ -520,8 +516,7 @@ macro.weblog.searchbutton=Rechercher
macro.weblog.searchhits="{0}": <strong>{1}</strong> entrées trouvées.
macro.weblog.searchgoogle=<em>Vous pouvez aussi \
<a href="http://google.com/search?q={0}%20site:{1}/page/{3}" \
-class="google">essayer cette recherche</a> sur \
-<a href="http://google.com">Google</a>.</em>
+class="google">essayer cette recherche</a> sur Google.</em>
#FIXME
macro.weblog.notifyMeOfComments=Notifiez moi par courriel de nouveaux commentaires
@@ -675,8 +670,6 @@ Le site distant est injoignable.
ping.pingProcessingIsSuspended=Les notifications ont été provisoirement suspendues par \
l'administrateur de ce site.
-commonPingTarget.subtitle=Edition de l'adresse de notification commune
-
pingTarget.pingUrl=Adresse URL
pingTarget.autoEnabled=Ping Automatique
pingTarget.remove=Effacer
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=1619110&r1=1619109&r2=1619110&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties Wed Aug 20 14:17:52 2014
@@ -288,7 +288,6 @@ error.add.user.userNameInUse=\u3053\u306
error.add.user.missingUserName=\u30E6\u30FC\u30B6\u540D\u304C\u898B\u4ED8\u304B\u308A\u307E\u305B\u3093\u3002
error.add.user.badUserName=\u305D\u306E\u30E6\u30FC\u30B6\u540D\u306F\u4F7F\u3048\u307E\u305B\u3093\u3002\u82F1\u6570\u5B57\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
error.add.user.missingPassword=\u5BFE\u5FDC\u3059\u308B\u30D1\u30B9\u30EF\u30FC\u30C9\u304C\u898B\u4ED8\u304B\u308A\u307E\u305B\u3093\u3002
-error.add.user.missingEmailAddress=\u30E1\u30FC\u30EB\u30A2\u30C9\u30EC\u30B9\u304C\u6709\u52B9\u306A\u3082\u306E\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
error.upload.dirmax=\u3053\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B{0} MB\u4EE5\u4E0A\u306E\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9\u306F\u3067\u304D\u307E\u305B\u3093
error.upload.disabled=\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093
@@ -394,9 +393,6 @@ loginPage.reset=\u30EA\u30BB\u30C3\u30C8
# --------------------------------------------------------- Search Results Macro
-macro.searchresults.hits_1=<strong>{0}</strong>\u30A8\u30F3\u30C8\u30EA\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F<em>\u307E\u305F
-macro.searchresults.hits_2=\u540C\u69D8\u306E\u691C\u7D22</a>\u304CGoogle\u3067\u3082\u3067\u304D\u307E\u3059\u3002</em>
-
error.searchProblem=\u691C\u7D22\u306B\u554F\u984C\u304C\u3042\u308A\u307E\u3059
# ----------------------------------------------------------------- Weblog Macro
@@ -422,7 +418,7 @@ macro.weblog.postcommentHeader=\u30B3\u3
macro.weblog.post=\u6295\u7A3F
macro.weblog.searchbutton=\u691C\u7D22
macro.weblog.searchhits="{0}": <strong>{1}</strong>\u30A8\u30F3\u30C8\u30EA\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F
-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.searchgoogle=<em>Google\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.notifyMeOfComments=\u65B0\u3057\u3044\u30B3\u30E1\u30F3\u30C8\u3092\u30E1\u30FC\u30EB\u3067\u901A\u77E5\u3059\u308B
# -------------------------------------------------------------------- Main page
@@ -543,8 +539,6 @@ ping.networkConnectionFailed=\u5BFE\u8C6
ping.pingProcessingIsSuspended=\u73FE\u5728\u3001\u767A\u4FE1\u5148\u306E\u30E1\u30F3\u30C6\u30CA\u30F3\u30B9\u306A\u3069\u306E\u7406\u7531\u3067\
Ping\u3092\u53D7\u3051\u4ED8\u3051\u3066\u3082\u3089\u3048\u306A\u3044\u3088\u3046\u3067\u3059\u3002\u5F53\u8A72\u30B5\u30A4\u30C8\u306E\u30A2\u30CA\u30A6\u30F3\u30B9\u3092\u307F\u3066\u304F\u3060\u3055\u3044\u3002
-commonPingTarget.subtitle=Ping\u30BF\u30FC\u30B2\u30C3\u30C8\u3092\u7DE8\u96C6\u3057\u307E\u3059
-
pingTarget.pingUrl=Ping URL
pingTarget.autoEnabled=\u81EA\u52D5Ping\u8A2D\u5B9A
pingTarget.remove=\u524A\u9664
Modified: roller/trunk/app/src/main/resources/ApplicationResources_ko.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ko.properties?rev=1619110&r1=1619109&r2=1619110&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ko.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ko.properties Wed Aug 20 14:17:52 2014
@@ -370,7 +370,6 @@ error.add.user.userNameInUse=\uc0ac\uc6a
error.add.user.missingUserName=\uc0ac\uc6a9\uc790\uba85\uc744 \uc124\uc815\ud558\uc2ed\uc2dc\uc624.
error.add.user.badUserName=\uc0ac\uc6a9\uc790\uba85\uc774 \uc720\ud6a8\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. (\uc54c\ud30c\ubcb3\uacfc \uc22b\uc790\ub9cc \ud5c8\uc6a9\ub429\ub2c8\ub2e4.).
error.add.user.missingPassword=\ube44\ubc00\ubc88\ud638\ub97c \uc124\uc815\ud558\uc2ed\uc2dc\uc624.
-error.add.user.missingEmailAddress=\uc720\ud6a8\ud55c \uc804\uc790\uc6b0\ud3b8 \uc8fc\uc18c\ub97c \uc124\uc815\ud558\uc2ed\uc2dc\uc624.
error.upload.dirmax=\ub514\ub809\ud130\ub9ac \ud06c\uae30\ub294 {0} MB\ub97c \ucd08\uacfc\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
error.upload.disabled=\ud30c\uc77c \uc5c5\ub85c\ub4dc \uae30\ub2a5\uc774 \ud65c\uc131\ud654\ub418\uc5b4 \uc788\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
@@ -593,8 +592,7 @@ macro.weblog.postpreview=\ubbf8\ub9ac\ub
macro.weblog.searchalert=\uac80\uc0c9\uc5b4\ub97c \uc785\ub825\ud558\uc2ed\uc2dc\uc624.
macro.weblog.searchbutton=\uac80\uc0c9
macro.weblog.searchhits="{0}": <strong>{1}</strong> \uae30\uc0ac\uac00 \ubc1c\uacac\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
-macro.weblog.searchgoogle=<em> \
-<a href="http://google.com">Google</a>\uc744 \ud1b5\ud574 \
+macro.weblog.searchgoogle=<em>Google\uc744 \ud1b5\ud574 \
<a href="http://google.com/search?q={0}%20site:{1}/page/{3}" \
class="google">\ub3d9\uc77c \uac80\uc0c9\uc5b4\ub85c \uac80\uc0c9</a>\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4.</em>
macro.weblog.notifyMeOfComments=\uc0c8\ub85c\uc6b4 \uc758\uacac\uc5d0 \ub300\ud574 \uc804\uc790\uc6b0\ud3b8\uc73c\ub85c \uc54c\ub9ac\uae30
@@ -742,8 +740,6 @@ ping.unknownHost=\uc5f0\uacb0\ud655\uc77
ping.networkConnectionFailed=\uc5f0\uacb0\ud655\uc778 \ub300\uc0c1 \uc0ac\uc774\ud2b8\uc5d0 \ub3c4\ub2ec\ud558\ub294 \ub370\uc5d0 \ub124\ud2b8\uc6cc\ud06c \uc5f0\uacb0 \ubb38\uc81c\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4.
ping.pingProcessingIsSuspended=\uc5f0\uacb0\ud655\uc778 \ucc98\ub9ac\uac00 \uc0ac\uc774\ud2b8 \uad00\ub9ac\uc790\uc5d0 \uc758\ud574 \uc77c\uc2dc\uc801\uc73c\ub85c \uc911\uc9c0\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
-commonPingTarget.subtitle=\uacf5\ud1b5 \uc5f0\uacb0\ud655\uc778 \ub300\uc0c1 \ud3b8\uc9d1
-
pingTarget.pingUrl=\uc5f0\uacb0\ud655\uc778 URL
pingTarget.autoEnabled=\uc790\ub3d9 \uc5f0\uacb0\ud655\uc778?
pingTarget.remove=\uc0ad\uc81c
@@ -975,7 +971,6 @@ userAdmin.userSaved=\uc0ac\uc6a9\uc790 \
userAdmin.cantChangeOwnRole=\uadc0\ud558 \uc790\uc2e0\uc758 \uc5ed\ud560\uc744 \ubcc0\uacbd\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
userAdmin.error.userNotFound=\ud574\ub2f9 \uc0ac\uc6a9\uc790\uac00 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
-userAdmin.error.unexpected=\uc608\uae30\uce58 \uc54a\uc740 \uc624\ub958
# --------------------------------------------------------------- User register
Modified: roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ru.properties?rev=1619110&r1=1619109&r2=1619110&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ru.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ru.properties Wed Aug 20 14:17:52 2014
@@ -227,7 +227,6 @@ error.add.user.userNameInUse=\u0422\u043
error.add.user.missingUserName=\u0412\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u043f\u0440\u0438\u0441\u0432\u043e\u0438\u0442\u044c \u0438\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044e
error.add.user.badUserName= \u0418\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u043d\u0435 \u043a\u043e\u0440\u0440\u0435\u043a\u0442\u043d\u043e (\u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u044e\u0442\u0441\u044f \u0442\u043e\u043b\u044c\u043a\u043e \u0431\u0443\u043a\u0432\u0435\u043d\u043d\u043e-\u0446\u0438\u0444\u0440\u043e\u0432\u044b\u0435 \u0441\u0438\u043c\u0432\u043e\u043b\u044b).
error.add.user.missingPassword=\u0412\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0438\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c
-error.add.user.missingEmailAddress=\u0412\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0443\u043a\u0430\u0437\u0430\u0442\u044c \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0439 email \u0430\u0434\u0440\u0435\u0441.
error.upload.dirmax= \u041c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u044b\u0439 \u0440\u0430\u0437\u043c\u0435\u0440 \u043a\u0430\u0442\u0430\u043b\u043e\u0433\u0430 {0} MB.
error.upload.disabled=\u0417\u0430\u0433\u0440\u0443\u0437\u043a\u0430 \u0444\u0430\u0439\u043b\u0430 \u043d\u0435 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u0430
@@ -305,9 +304,6 @@ macro.bookmark.urlFeed=URL \u041a\u043
# --------------------------------------------------------- Search Results Macro
-macro.searchresults.hits_1=<strong>{0}</strong> \u0437\u0430\u043f\u0438\u0441\u0435\u0439 \u043d\u0430\u0439\u0434\u0435\u043d\u043e.<br /><em>\u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u043f\u043e\u043f\u0440\u043e\u0431\u043e\u0432\u0430\u0442\u044c \u0435\u0449\u0435
-macro.searchresults.hits_2=\u041f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0435\u0449\u0435 \u043f\u043e\u0438\u0441\u043a\u0430\u0442\u044c </a> \u043d\u0430 \
-Google.</em>
error.searchProblem=\u0412\u043e\u0437\u043d\u0438\u043a\u043b\u0438 \u043f\u0440\u043e\u0431\u043b\u0435\u043c\u044b \u043f\u0440\u0438 \u043f\u043e\u0438\u0441\u043a\u0435 .
# ----------------------------------------------------------------- Weblog Macro
@@ -339,7 +335,7 @@ macro.weblog.searchhits="{0}": <strong>{
macro.weblog.searchgoogle=<em>\u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0442\u0430\u043a\u0436\u0435 \
<a href="http://google.com/search?q={0}%20site:{1}/page/{3}" \
class="google">\u043f\u043e\u043f\u044b\u0442\u0430\u0442\u044c\u0441\u044f \u043f\u043e\u0438\u0441\u043a\u0430\u0442\u044c </a> \u043d\u0430 \
-<a href="http://google.com">Google</a>.</em>
+Google.</em>
macro.weblog.notifyMeOfComments=\u0418\u0437\u0432\u0435\u0441\u0442\u0438\u0442\u044c \u043c\u0435\u043d\u044f \u043f\u043e email \u043e \u043d\u043e\u0432\u044b\u0445 \u043a\u043e\u043c\u043c\u0435\u043d\u0442\u0430\u0440\u0438\u044f\u0445
# -------------------------------------------------------------------- Main page
@@ -444,8 +440,6 @@ ping.unknownHost=\u0418\u043c\u044f \u04
ping.networkConnectionFailed=\u041f\u0440\u0438 \u043f\u0440\u043e\u0445\u043e\u0436\u0434\u0435\u043d\u0438\u0438 \u043f\u0438\u043d\u0433\u0430 \u0432\u043e\u0437\u043d\u0438\u043a\u043b\u0438 \u043f\u0440\u043e\u0431\u043b\u0435\u043c\u044b \u0441\u0435\u0442\u0438
ping.pingProcessingIsSuspended=\u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u044c \u043f\u0435\u0440\u0435\u0434\u0430\u0447\u0438 \u043f\u0438\u043d\u0433\u0430 \u0431\u044b\u043b\u0430 \u0432\u0440\u0435\u043c\u0435\u043d\u043d\u043e \u043f\u0440\u0438\u043e\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u0430 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u043e\u043c \u0441\u0430\u0439\u0442\u0430
-commonPingTarget.subtitle=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043e\u0431\u0449\u0438\u0435 \u0430\u0434\u0440\u0435\u0441\u0430 \u043f\u0438\u043d\u0433\u0430
-
pingTarget.pingUrl=URL \u043f\u0438\u043d\u0433\u0430
pingTarget.remove=\u0423\u0434\u0430\u043b\u0438\u0442\u044c
pingTarget.confirmRemoveTitle=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435 \u0430\u0434\u0440\u0435\u0441\u0430 \u043f\u0438\u043d\u0433\u0430
Modified: roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties?rev=1619110&r1=1619109&r2=1619110&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties Wed Aug 20 14:17:52 2014
@@ -125,7 +125,6 @@ comments.header2=\u8bc4\u8bba\uff1a
comments.htmlenabled=\u542f\u7528
comments.mathAuthenticatorQuestion=\u8bf7\u56de\u7b54\u8fd9\u4e2a\u7b80\u5355\u7684\u6570\u5b66\u9898
comments.title=\u8bc4\u8bba
-commonPingTarget.subtitle=\u7f16\u8f91\u666e\u901aPing\u76ee\u6807
commonPingTargets.commonPingTargets=\u666e\u901a\u7f51\u5fd7Ping\u76ee\u6807
commonPingTargets.explanation=\u8fd9\u4e9b\u76ee\u6807\u7ad9\u70b9\u5bf9\u6240\u6709\u7f51\u5fd7\u7684Ping\u66f4\u65b0\u9002\u7528\u3002
commonPingTargets.subtitle=\u7ba1\u7406\u9002\u7528\u4e8e\u6240\u6709\u7f51\u5fd7\u7684\u7f51\u5fd7Ping\u529f\u80fd\u3002
@@ -184,7 +183,6 @@ email.comment.respond=\u56de\u590d\u6b64
email.comment.title=\u8bc4\u8bba
email.comment.wrote=\u64b0\u5199
error.add.user.badUserName=\u7528\u6237\u540d\u975e\u6cd5\uff08\u53ea\u5141\u8bb8\u5b57\u6bcd\u548c\u6570\u5b57\uff09\u3002
-error.add.user.missingEmailAddress=\u8bf7\u8f93\u5165\u5408\u6cd5\u7684\u7535\u5b50\u90ae\u4ef6\u5730\u5740\u3002
error.add.user.missingPassword=\u8bf7\u8f93\u5165\u5bc6\u7801\u3002
error.add.user.missingUserName=\u60a8\u5fc5\u987b\u6307\u5b9a\u7528\u6237\u540d\u3002
error.add.user.userNameInUse=\u7528\u6237\u540d\u5df2\u7ecf\u88ab\u5360\u7528\u3002
@@ -239,8 +237,6 @@ loginPage.reset=\u91cd\u7f6e
loginPage.title=\u6b22\u8fce\u6765\u5230Roller
loginPage.userName=\u7528\u6237\u540d
macro.bookmark.urlFeed=\u7f51\u7ad9RSS\u79cd\u5b50\u7684URL\u5730\u5740
-macro.searchresults.hits_1=\u627e\u5230\u4e86<strong>{0}</strong>\u4e2a\u65e5\u5fd7\u3002<br />\u4f60\u4e5f\u53ef\u4ee5<em>
-macro.searchresults.hits_2=\u5728<a href="http://google.com">Google</a>\u8fdb\u884c\u540c\u6837\u7684\u641c\u7d22\u3002</em>
macro.weblog.comment=\u8bc4\u8bba
macro.weblog.commentpermalink.title=\u8bc4\u8bba\u7684\u6c38\u4e45\u94fe\u63a5
macro.weblog.comments=\u8bc4\u8bba
@@ -262,7 +258,7 @@ macro.weblog.preview=\u9884\u89c8
macro.weblog.rememberinfo=\u8bb0\u4e0b\u60a8\u7684\u4fe1\u606f\uff1f
macro.weblog.searchalert=\u8bf7\u8f93\u5165\u641c\u7d22\u6761\u76ee.
macro.weblog.searchbutton=\u641c\u7d22
-macro.weblog.searchgoogle=<em>\u60a8\u4e5f\u53ef\u4ee5\u4f7f\u7528<a href="http://google.com">Google</a>\u6765\u641c\u7d22<a href="http://google.com/search?q={0}%20site:{1}/{2}/{3}" class="google">\u8fd9\u4e2a\u94fe\u63a5</a>\u3002</em>
+macro.weblog.searchgoogle=<em>\u60a8\u4e5f\u53ef\u4ee5\u4f7f\u7528Google\u6765\u641c\u7d22<a href="http://google.com/search?q={0}%20site:{1}/{2}/{3}" class="google">\u8fd9\u4e2a\u94fe\u63a5</a>\u3002</em>
macro.weblog.searchhits="{0}": \u627e\u5230<strong>{1}</strong>\u6761\u65e5\u5fd7\u3002
macro.weblog.url=URL\uff1a
macro.weblog.yourcomment=\u60a8\u7684\u8bc4\u8bba\uff1a