Merge changes I82859d98,I3da54fbf

* changes:
  upd: fix some wording
  upd: replace assure, assurance, assurer etc in output to user

diff --combined src/org/cacert/gigi/dbObjects/User.java
index 61f347a4e90b380e70802d9871641da1ead0161f,4e925a563a9e9879c12173ce1a1421bb75d30cce..cf43f80f3182a4377a1578b3f11ac370375f8e53
--- 1/src/org/cacert/gigi/dbObjects/User.java
--- 2/src/org/cacert/gigi/dbObjects/User.java
+++ b/src/org/cacert/gigi/dbObjects/User.java
@@@ -136,7 -136,7 +136,7 @@@ public class User extends CertificateOw
      public void setDoB(DayDate dob) throws GigiApiException {
          synchronized (Notary.class) {
              if (getReceivedAssurances().length != 0) {
-                 throw new GigiApiException("No change after assurance allowed.");
+                 throw new GigiApiException("No change after verification allowed.");
              }
  
              if ( !CalendarUtil.isOfAge(dob, User.MINIMUM_AGE)) {
@@@ -257,7 -257,6 +257,7 @@@
       * 
       * @return the maximal points @
       */
 +    @SuppressWarnings("unused")
      public int getMaxAssurePoints() {
          if ( !CalendarUtil.isOfAge(dob, ADULT_AGE) && POJAM_ENABLED) {
              return 10; // PoJAM
@@@ -396,7 -395,7 +396,7 @@@
  
      }
  
 -    public Name getPreferredName() {
 +    public synchronized Name getPreferredName() {
          return preferredName;
      }