From 6dd7431ccdbb3d62a5b434e527d13706032090a1 Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 30 Mar 2011 00:42:08 +0000 Subject: [PATCH] message cleanup --- .../src/java/src/i2p/susi/dns/AddressbookBean.java | 10 +++++----- .../src/java/src/i2p/susi/dns/NamingServiceBean.java | 6 +++--- apps/susidns/src/jsp/addressbook.jsp | 4 ++-- apps/susidns/src/jsp/details.jsp | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java b/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java index 931923a4d..0738984a3 100644 --- a/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java +++ b/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java @@ -247,8 +247,8 @@ public class AddressbookBean //message = _("This addressbook is empty."); message = ""; else - message = ngettext("Addressbook contains 1 entry.", - "Addressbook contains {0} entries.", + message = ngettext("Address book contains 1 entry.", + "Address book contains {0} entries.", resultCount); } if (resultCount <= 0) { @@ -294,9 +294,9 @@ public class AddressbookBean String oldDest = (String) addressbook.get(host); if (destination.equals(oldDest)) { - message = _("Host name {0} is already in addressbook, unchanged.", displayHost); + message = _("Host name {0} is already in address book, unchanged.", displayHost); } else if (oldDest != null && !action.equals(_("Replace"))) { - message = _("Host name {0} is already in addressbook with a different destination. Click \"Replace\" to overwrite.", displayHost); + message = _("Host name {0} is already in address book with a different destination. Click \"Replace\" to overwrite.", displayHost); } else { boolean valid = true; try { @@ -357,7 +357,7 @@ public class AddressbookBean if( changed ) { try { save(); - message += "
" + _("Addressbook saved."); + message += "
" + _("Address book saved."); } catch (Exception e) { Debug.debug( e.getClass().getName() + ": " + e.getMessage() ); message += "
" + _("ERROR: Could not write addressbook file."); diff --git a/apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java b/apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java index 8b24e2ed6..c2bc2453c 100644 --- a/apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java +++ b/apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java @@ -239,9 +239,9 @@ public class NamingServiceBean extends AddressbookBean Properties outProperties= new Properties(); Destination oldDest = getNamingService().lookup(host, nsOptions, outProperties); if (oldDest != null && destination.equals(oldDest.toBase64())) { - message = _("Host name {0} is already in addressbook, unchanged.", displayHost); + message = _("Host name {0} is already in address book, unchanged.", displayHost); } else if (oldDest != null && !action.equals(_("Replace"))) { - message = _("Host name {0} is already in addressbook with a different destination. Click \"Replace\" to overwrite.", displayHost); + message = _("Host name {0} is already in address book with a different destination. Click \"Replace\" to overwrite.", displayHost); } else { try { Destination dest = new Destination(destination); @@ -308,7 +308,7 @@ public class NamingServiceBean extends AddressbookBean search = null; } if( changed ) { - message += "
" + _("Addressbook saved."); + message += "
" + _("Address book saved."); } } else { diff --git a/apps/susidns/src/jsp/addressbook.jsp b/apps/susidns/src/jsp/addressbook.jsp index 83c37e8eb..649bca73c 100644 --- a/apps/susidns/src/jsp/addressbook.jsp +++ b/apps/susidns/src/jsp/addressbook.jsp @@ -43,7 +43,7 @@ -${book.book} <%=intl._("addressbook")%> - susidns +${book.book} <%=intl._("address book")%> - susidns @@ -177,7 +177,7 @@ ${book.loadBookMessages}
-

<%=intl._("This addressbook is empty.")%>

+

<%=intl._("This address book is empty.")%>

 diff --git a/apps/susidns/src/jsp/details.jsp b/apps/susidns/src/jsp/details.jsp index 3350d050c..ac55a12aa 100644 --- a/apps/susidns/src/jsp/details.jsp +++ b/apps/susidns/src/jsp/details.jsp @@ -88,7 +88,7 @@ <% if (addr.isIDN()) { %> -<%=intl._("Punycode Name")%> +<%=intl._("Encoded Name")%> <%=addr.getName()%> <%