upd: fixes wording

Change-Id: Ic413b6c11185f8f28dc2280e65ab318615e8f0d1

diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateRequest.java b/src/org/cacert/gigi/pages/account/certs/CertificateRequest.java
index 12b6323d2c185a1b86f0305bc43ac7312c5594e1..bae43d589e6fae2dab514b3b925872e6289856cf 100644 (file)
--- a/src/org/cacert/gigi/pages/account/certs/CertificateRequest.java
+++ b/src/org/cacert/gigi/pages/account/certs/CertificateRequest.java
@@ -363,7 +363,7 @@ public class CertificateRequest {
                 }
             }
             error.mergeInto(new GigiApiException(SprintfCommand.createSimple(//
-                    "The requested Subject alternate name \"{0}\" has been removed.", san.getType().toString().toLowerCase() + ":" + san.getName())));
+                    "The requested subject alternate name (SAN) \"{0}\" has been removed.", san.getType().toString().toLowerCase() + ":" + san.getName())));
         }
         SANs = filteredSANs;
     }

diff --git a/src/org/cacert/gigi/pages/account/mail/MailOverview.templ b/src/org/cacert/gigi/pages/account/mail/MailOverview.templ
index 487d052fda5874ad404057bbe0a36ad5c17c1dca..c0294310896c7ca8db529902e8bdad297d83efa6 100644 (file)
--- a/src/org/cacert/gigi/pages/account/mail/MailOverview.templ
+++ b/src/org/cacert/gigi/pages/account/mail/MailOverview.templ
@@ -3,7 +3,7 @@
   <div class="panel-heading"><?=_Manage email accounts?></div>
   <div class="panel-body">
    <p>
-<?=_Please Note: You can not set an unverified account as a default account, and you can not remove a default account. To remove the default account you must set another verified account as the default.?>
+<?=_Please Note: You can not set an unverified email address as a default email address, and you can not remove a default email address. To remove the default email address you must set another verified email address as the default.?>
 </p>
   </div>
 <?=$manForm?>

diff --git a/src/org/cacert/gigi/util/Notary.java b/src/org/cacert/gigi/util/Notary.java
index e1c903e867cf589896790842f88925d9db5e5c92..ed1ce238c93d144cd04da9ca42230df36600a25b 100644 (file)
--- a/src/org/cacert/gigi/util/Notary.java
+++ b/src/org/cacert/gigi/util/Notary.java
@@ -156,7 +156,7 @@ public class Notary {
             } else if (type == AssuranceType.TTP_ASSISTED) {
                 assureTTP(assurer, assuree, assureeName, awarded, location, date);
             } else {
-                throw new GigiApiException(SprintfCommand.createSimple("Unknown Assurance type: {0}", type.toString()));
+                throw new GigiApiException(SprintfCommand.createSimple("Unknown Verification type: {0}", type.toString()));
             }
             assurer.invalidateMadeAssurances();
             assuree.invalidateReceivedAssurances();