diff --git a/cps/shelf.py b/cps/shelf.py
index d299fdfb..c78059ca 100644
--- a/cps/shelf.py
+++ b/cps/shelf.py
@@ -229,9 +229,9 @@ def create_shelf():
                 return redirect(url_for('shelf.show_shelf', shelf_id = shelf.id ))
             except Exception:
                 flash(_(u"There was an error"), category="error")
-        return render_title_template('shelf_edit.html', shelf=shelf, title=_(u"create a shelf"), page="shelfcreate")
+        return render_title_template('shelf_edit.html', shelf=shelf, title=_(u"Create a Shelf"), page="shelfcreate")
     else:
-        return render_title_template('shelf_edit.html', shelf=shelf, title=_(u"create a shelf"), page="shelfcreate")
+        return render_title_template('shelf_edit.html', shelf=shelf, title=_(u"Create a Shelf"), page="shelfcreate")
 
 
 @shelf.route("/shelf/edit/<int:shelf_id>", methods=["GET", "POST"])
diff --git a/cps/templates/admin.html b/cps/templates/admin.html
index 5b2ad78c..69deee09 100644
--- a/cps/templates/admin.html
+++ b/cps/templates/admin.html
@@ -15,7 +15,7 @@
             <th>{{_('Downloads')}}</th>
             <th class="hidden-xs">{{_('Admin')}}</th>
             <th class="hidden-xs">{{_('Download')}}</th>
-            <th class="hidden-xs">{{_('View eBooks')}}</th>
+            <th class="hidden-xs">{{_('View Books')}}</th>
             <th class="hidden-xs">{{_('Upload')}}</th>
             <th class="hidden-xs">{{_('Edit')}}</th>
         </tr>
@@ -58,7 +58,7 @@
           <td class="hidden-xs">{{email.mail_from}}</td>
         </tr>
       </table>
-      <div class="btn btn-default" id="admin_edit_email"><a href="{{url_for('admin.edit_mailsettings')}}">{{_('Change SMTP settings')}}</a></div>
+      <div class="btn btn-default" id="admin_edit_email"><a href="{{url_for('admin.edit_mailsettings')}}">{{_('Edit E-mail Server Settings')}}</a></div>
     </div>
   </div>
 
diff --git a/cps/templates/index.html b/cps/templates/index.html
old mode 100755
new mode 100644
diff --git a/cps/templates/modal_restriction.html b/cps/templates/modal_restriction.html
index ede585d7..26aa2ee1 100644
--- a/cps/templates/modal_restriction.html
+++ b/cps/templates/modal_restriction.html
@@ -3,10 +3,10 @@
   <div class="modal-dialog modal-lg" role="document">
     <div class="modal-content">
       <div class="modal-header">
-        <h4 class="modal-title hidden" id="h1">{{_('Select allowed/denied Tags')}}</h4>
-        <h4 class="modal-title hidden" id="h2">{{_('Select allowed/denied Custom Column values')}}</h4>
-        <h4 class="modal-title hidden" id="h3">{{_('Select allowed/denied Tags of user')}}</h4>
-        <h4 class="modal-title hidden" id="h4">{{_('Select allowed/denied Custom Column values of user')}}</h4>
+        <h4 class="modal-title hidden" id="h1">{{_('Select Allowed/Denied Tags')}}</h4>
+        <h4 class="modal-title hidden" id="h2">{{_('Select Allowed/Denied Custom Column Values')}}</h4>
+        <h4 class="modal-title hidden" id="h3">{{_('Select Allowed/Denied Tags of User')}}</h4>
+        <h4 class="modal-title hidden" id="h4">{{_('Select Allowed/Denied Custom Column Values of User')}}</h4>
       </div>
       <div class="modal-body">
           <table class="table table-no-bordered" id="restrict-elements-table" data-id-field="id" data-show-header="false" data-editable-mode="inline">
diff --git a/cps/templates/user_edit.html b/cps/templates/user_edit.html
index 2b1640c3..dad0b773 100644
--- a/cps/templates/user_edit.html
+++ b/cps/templates/user_edit.html
@@ -80,8 +80,8 @@
           <label for="Show_detail_random">{{_('Show Random Books')}}</label>
       </div>
       {% if ( g.user and g.user.role_admin() and not new_user ) %}
-      <a href="#" id="get_user_tags" class="btn btn-default" data-toggle="modal" data-target="#restrictModal">{{_('Add allowed/denied Tags')}}</a>
-      <a href="#" id="get_user_column_values" class="btn btn-default" data-toggle="modal" data-target="#restrictModal">{{_('Add allowed/denied custom column values')}}</a>
+      <a href="#" id="get_user_tags" class="btn btn-default" data-toggle="modal" data-target="#restrictModal">{{_('Add Allowed/Denied Tags')}}</a>
+      <a href="#" id="get_user_column_values" class="btn btn-default" data-toggle="modal" data-target="#restrictModal">{{_('Add allowed/Denied Custom Column Values')}}</a>
       {% endif %}
     </div>
       <div class="col-sm-6">
diff --git a/cps/translations/cs/LC_MESSAGES/messages.po b/cps/translations/cs/LC_MESSAGES/messages.po
index 7faa9154..88965d38 100644
--- a/cps/translations/cs/LC_MESSAGES/messages.po
+++ b/cps/translations/cs/LC_MESSAGES/messages.po
@@ -583,7 +583,7 @@ msgid "There was an error"
 msgstr "Došlo k chybě"
 
 #: cps/shelf.py:232 cps/shelf.py:234
-msgid "create a shelf"
+msgid "Create a Shelf"
 msgstr "vytvořit polici"
 
 #: cps/shelf.py:270
@@ -852,11 +852,11 @@ msgstr "Kniha byla úspěšně zařazena do fronty pro odeslání na %(kindlemai
 
 #: cps/web.py:1064
 #, python-format
-msgid "There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Při odesílání této knihy došlo k chybě: %(res)s"
 
 #: cps/web.py:1066
-msgid "Please configure your kindle e-mail address first..."
+msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Nejprve nakonfigurujte vaši kindle e-mailovou adresu.."
 
 #: cps/web.py:1083
@@ -992,7 +992,7 @@ msgid "Download"
 msgstr "Stahovat"
 
 #: cps/templates/admin.html:18
-msgid "View eBooks"
+msgid "View Books"
 msgstr ""
 
 #: cps/templates/admin.html:19 cps/templates/layout.html:65
@@ -1032,7 +1032,7 @@ msgid "From E-mail"
 msgstr "Z e-mailu"
 
 #: cps/templates/admin.html:61
-msgid "Change SMTP settings"
+msgid "Edit E-mail Server Settings"
 msgstr "Změnit SMTP nastavení"
 
 #: cps/templates/admin.html:67
@@ -1977,19 +1977,19 @@ msgid "Show Access Log: "
 msgstr "Zobrazit log přístupu: "
 
 #: cps/templates/modal_restriction.html:6
-msgid "Select allowed/denied Tags"
+msgid "Select Allowed/Denied Tags"
 msgstr ""
 
 #: cps/templates/modal_restriction.html:7
-msgid "Select allowed/denied Custom Column values"
+msgid "Select Allowed/Denied Custom Column Values"
 msgstr ""
 
 #: cps/templates/modal_restriction.html:8
-msgid "Select allowed/denied Tags of user"
+msgid "Select Allowed/Denied Tags of User"
 msgstr ""
 
 #: cps/templates/modal_restriction.html:9
-msgid "Select allowed/denied Custom Column values of user"
+msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr ""
 
 #: cps/templates/modal_restriction.html:15
@@ -2313,11 +2313,11 @@ msgid "Create/View"
 msgstr ""
 
 #: cps/templates/user_edit.html:83
-msgid "Add allowed/denied Tags"
+msgid "Add Allowed/Denied Tags"
 msgstr ""
 
 #: cps/templates/user_edit.html:84
-msgid "Add allowed/denied custom column values"
+msgid "Add allowed/Denied Custom Column Values"
 msgstr ""
 
 #: cps/templates/user_edit.html:129
diff --git a/cps/translations/de/LC_MESSAGES/messages.po b/cps/translations/de/LC_MESSAGES/messages.po
index 2010e48d..84a9f1d4 100644
--- a/cps/translations/de/LC_MESSAGES/messages.po
+++ b/cps/translations/de/LC_MESSAGES/messages.po
@@ -584,7 +584,7 @@ msgid "There was an error"
 msgstr "Es trat ein Fehler auf"
 
 #: cps/shelf.py:232 cps/shelf.py:234
-msgid "create a shelf"
+msgid "Create a Shelf"
 msgstr "Bücherregal erzeugen"
 
 #: cps/shelf.py:270
@@ -853,11 +853,11 @@ msgstr "Buch erfolgreich zum Senden an %(kindlemail)s eingereiht"
 
 #: cps/web.py:1064
 #, python-format
-msgid "There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Beim Senden des Buchs trat ein Fehler auf: %(res)s"
 
 #: cps/web.py:1066
-msgid "Please configure your kindle e-mail address first..."
+msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Bitte zuerst die Kindle E-Mailadresse konfigurieren..."
 
 #: cps/web.py:1083
@@ -993,7 +993,7 @@ msgid "Download"
 msgstr "Download"
 
 #: cps/templates/admin.html:18
-msgid "View eBooks"
+msgid "View Books"
 msgstr "Bücher ansehen"
 
 #: cps/templates/admin.html:19 cps/templates/layout.html:65
@@ -1033,7 +1033,7 @@ msgid "From E-mail"
 msgstr "Absenderadresse"
 
 #: cps/templates/admin.html:61
-msgid "Change SMTP settings"
+msgid "Edit E-mail Server Settings"
 msgstr "SMTP-Einstellungen ändern"
 
 #: cps/templates/admin.html:67
@@ -1978,19 +1978,19 @@ msgid "Show Access Log: "
 msgstr "Zugriffslogbuch anzeigen: "
 
 #: cps/templates/modal_restriction.html:6
-msgid "Select allowed/denied Tags"
+msgid "Select Allowed/Denied Tags"
 msgstr "Erlaubte/verbotene Tags auswählen"
 
 #: cps/templates/modal_restriction.html:7
-msgid "Select allowed/denied Custom Column values"
+msgid "Select Allowed/Denied Custom Column Values"
 msgstr "Erlaubte/Verbotene Calibre Spalten auswählen"
 
 #: cps/templates/modal_restriction.html:8
-msgid "Select allowed/denied Tags of user"
+msgid "Select Allowed/Denied Tags of User"
 msgstr "Erlaubte/Verbotene Tags des Benutzers auswählen"
 
 #: cps/templates/modal_restriction.html:9
-msgid "Select allowed/denied Custom Column values of user"
+msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr "Erlaubte/Verbotene Calibre Spalten des Benutzers auswählen"
 
 #: cps/templates/modal_restriction.html:15
@@ -2314,11 +2314,11 @@ msgid "Create/View"
 msgstr "Erzeugen/Ansehen"
 
 #: cps/templates/user_edit.html:83
-msgid "Add allowed/denied Tags"
+msgid "Add Allowed/Denied Tags"
 msgstr "Erlaubte/Verbotene Tags"
 
 #: cps/templates/user_edit.html:84
-msgid "Add allowed/denied custom column values"
+msgid "Add allowed/Denied Custom Column Values"
 msgstr "Erlaubte/Verbotene Calibre Spalten hinzufügen"
 
 #: cps/templates/user_edit.html:129
diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po
index 08cb7b4d..074cf1a6 100644
--- a/cps/translations/es/LC_MESSAGES/messages.po
+++ b/cps/translations/es/LC_MESSAGES/messages.po
@@ -586,7 +586,7 @@ msgid "There was an error"
 msgstr "Ha sucedido un error"
 
 #: cps/shelf.py:232 cps/shelf.py:234
-msgid "create a shelf"
+msgid "Create a Shelf"
 msgstr "crear un estante"
 
 #: cps/shelf.py:270
@@ -855,11 +855,11 @@ msgstr "Libro puesto en la cola de envío a %(kindlemail)s"
 
 #: cps/web.py:1064
 #, python-format
-msgid "There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Ha sucedido un error en el envío del libro: %(res)s"
 
 #: cps/web.py:1066
-msgid "Please configure your kindle e-mail address first..."
+msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Por favor configure primero la dirección de correo de su kindle..."
 
 #: cps/web.py:1083
@@ -995,7 +995,7 @@ msgid "Download"
 msgstr "Descargar"
 
 #: cps/templates/admin.html:18
-msgid "View eBooks"
+msgid "View Books"
 msgstr "Ver libros electrónicos"
 
 #: cps/templates/admin.html:19 cps/templates/layout.html:65
@@ -1035,7 +1035,7 @@ msgid "From E-mail"
 msgstr "Desde el correo"
 
 #: cps/templates/admin.html:61
-msgid "Change SMTP settings"
+msgid "Edit E-mail Server Settings"
 msgstr "Cambiar parámetros SMTP"
 
 #: cps/templates/admin.html:67
@@ -1980,19 +1980,19 @@ msgid "Show Access Log: "
 msgstr ""
 
 #: cps/templates/modal_restriction.html:6
-msgid "Select allowed/denied Tags"
+msgid "Select Allowed/Denied Tags"
 msgstr ""
 
 #: cps/templates/modal_restriction.html:7
-msgid "Select allowed/denied Custom Column values"
+msgid "Select Allowed/Denied Custom Column Values"
 msgstr ""
 
 #: cps/templates/modal_restriction.html:8
-msgid "Select allowed/denied Tags of user"
+msgid "Select Allowed/Denied Tags of User"
 msgstr ""
 
 #: cps/templates/modal_restriction.html:9
-msgid "Select allowed/denied Custom Column values of user"
+msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr ""
 
 #: cps/templates/modal_restriction.html:15
@@ -2316,11 +2316,11 @@ msgid "Create/View"
 msgstr ""
 
 #: cps/templates/user_edit.html:83
-msgid "Add allowed/denied Tags"
+msgid "Add Allowed/Denied Tags"
 msgstr ""
 
 #: cps/templates/user_edit.html:84
-msgid "Add allowed/denied custom column values"
+msgid "Add allowed/Denied Custom Column Values"
 msgstr ""
 
 #: cps/templates/user_edit.html:129
diff --git a/cps/translations/fi/LC_MESSAGES/messages.po b/cps/translations/fi/LC_MESSAGES/messages.po
index ffa64093..adf68b87 100644
--- a/cps/translations/fi/LC_MESSAGES/messages.po
+++ b/cps/translations/fi/LC_MESSAGES/messages.po
@@ -584,7 +584,7 @@ msgid "There was an error"
 msgstr "Tapahtui virhe"
 
 #: cps/shelf.py:232 cps/shelf.py:234
-msgid "create a shelf"
+msgid "Create a Shelf"
 msgstr "luo hylly"
 
 #: cps/shelf.py:270
@@ -853,11 +853,11 @@ msgstr "Kirja lisätty onnistuneeksi lähetettäväksi osoitteeseen %(kindlemail
 
 #: cps/web.py:1064
 #, python-format
-msgid "There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Kirjan: %(res)s lähettämisessa tapahtui virhe"
 
 #: cps/web.py:1066
-msgid "Please configure your kindle e-mail address first..."
+msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Ole hyvä ja aseta Kindle sähköpostiosoite ensin..."
 
 #: cps/web.py:1083
@@ -993,7 +993,7 @@ msgid "Download"
 msgstr "Lataa"
 
 #: cps/templates/admin.html:18
-msgid "View eBooks"
+msgid "View Books"
 msgstr "Näytä ekirjat"
 
 #: cps/templates/admin.html:19 cps/templates/layout.html:65
@@ -1033,7 +1033,7 @@ msgid "From E-mail"
 msgstr "Lähettäjän sähköposti"
 
 #: cps/templates/admin.html:61
-msgid "Change SMTP settings"
+msgid "Edit E-mail Server Settings"
 msgstr "Muuta SMTP asetuksia"
 
 #: cps/templates/admin.html:67
@@ -1978,19 +1978,19 @@ msgid "Show Access Log: "
 msgstr ""
 
 #: cps/templates/modal_restriction.html:6
-msgid "Select allowed/denied Tags"
+msgid "Select Allowed/Denied Tags"
 msgstr ""
 
 #: cps/templates/modal_restriction.html:7
-msgid "Select allowed/denied Custom Column values"
+msgid "Select Allowed/Denied Custom Column Values"
 msgstr ""
 
 #: cps/templates/modal_restriction.html:8
-msgid "Select allowed/denied Tags of user"
+msgid "Select Allowed/Denied Tags of User"
 msgstr ""
 
 #: cps/templates/modal_restriction.html:9
-msgid "Select allowed/denied Custom Column values of user"
+msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr ""
 
 #: cps/templates/modal_restriction.html:15
@@ -2314,11 +2314,11 @@ msgid "Create/View"
 msgstr ""
 
 #: cps/templates/user_edit.html:83
-msgid "Add allowed/denied Tags"
+msgid "Add Allowed/Denied Tags"
 msgstr ""
 
 #: cps/templates/user_edit.html:84
-msgid "Add allowed/denied custom column values"
+msgid "Add allowed/Denied Custom Column Values"
 msgstr ""
 
 #: cps/templates/user_edit.html:129
diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po
index 54883ce5..7ffa16a8 100644
--- a/cps/translations/fr/LC_MESSAGES/messages.po
+++ b/cps/translations/fr/LC_MESSAGES/messages.po
@@ -597,7 +597,7 @@ msgid "There was an error"
 msgstr "Il y a eu une erreur"
 
 #: cps/shelf.py:232 cps/shelf.py:234
-msgid "create a shelf"
+msgid "Create a Shelf"
 msgstr "créer une étagère"
 
 #: cps/shelf.py:270
@@ -866,11 +866,11 @@ msgstr "Le livre a été mis en file de traitement avec succès pour un envois v
 
 #: cps/web.py:1064
 #, python-format
-msgid "There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Il y a eu une erreur en envoyant ce livre : %(res)s"
 
 #: cps/web.py:1066
-msgid "Please configure your kindle e-mail address first..."
+msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Veuillez configurer votre adresse de courriel Kindle en premier lieu…"
 
 #: cps/web.py:1083
@@ -1006,7 +1006,7 @@ msgid "Download"
 msgstr "Télécharger"
 
 #: cps/templates/admin.html:18
-msgid "View eBooks"
+msgid "View Books"
 msgstr "Afficher les Ebooks"
 
 #: cps/templates/admin.html:19 cps/templates/layout.html:65
@@ -1046,7 +1046,7 @@ msgid "From E-mail"
 msgstr "Expéditeur des courriels"
 
 #: cps/templates/admin.html:61
-msgid "Change SMTP settings"
+msgid "Edit E-mail Server Settings"
 msgstr "Modifier les paramètres SMTP"
 
 #: cps/templates/admin.html:67
@@ -1991,19 +1991,19 @@ msgid "Show Access Log: "
 msgstr ""
 
 #: cps/templates/modal_restriction.html:6
-msgid "Select allowed/denied Tags"
+msgid "Select Allowed/Denied Tags"
 msgstr ""
 
 #: cps/templates/modal_restriction.html:7
-msgid "Select allowed/denied Custom Column values"
+msgid "Select Allowed/Denied Custom Column Values"
 msgstr ""
 
 #: cps/templates/modal_restriction.html:8
-msgid "Select allowed/denied Tags of user"
+msgid "Select Allowed/Denied Tags of User"
 msgstr ""
 
 #: cps/templates/modal_restriction.html:9
-msgid "Select allowed/denied Custom Column values of user"
+msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr ""
 
 #: cps/templates/modal_restriction.html:15
@@ -2327,11 +2327,11 @@ msgid "Create/View"
 msgstr ""
 
 #: cps/templates/user_edit.html:83
-msgid "Add allowed/denied Tags"
+msgid "Add Allowed/Denied Tags"
 msgstr ""
 
 #: cps/templates/user_edit.html:84
-msgid "Add allowed/denied custom column values"
+msgid "Add allowed/Denied Custom Column Values"
 msgstr ""
 
 #: cps/templates/user_edit.html:129
diff --git a/cps/translations/hu/LC_MESSAGES/messages.po b/cps/translations/hu/LC_MESSAGES/messages.po
index fde17b2a..645210dd 100644
--- a/cps/translations/hu/LC_MESSAGES/messages.po
+++ b/cps/translations/hu/LC_MESSAGES/messages.po
@@ -584,7 +584,7 @@ msgid "There was an error"
 msgstr "Hiba történt"
 
 #: cps/shelf.py:232 cps/shelf.py:234
-msgid "create a shelf"
+msgid "Create a Shelf"
 msgstr "Polc készítése"
 
 #: cps/shelf.py:270
@@ -853,11 +853,11 @@ msgstr "A könyv sikeresen küldésre lett jelölve a következő címre: %(kind
 
 #: cps/web.py:1064
 #, python-format
-msgid "There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Hiba történt a könyv küldésekor: %(res)s"
 
 #: cps/web.py:1066
-msgid "Please configure your kindle e-mail address first..."
+msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Először be kell állítani a kindle e-mail címet..."
 
 #: cps/web.py:1083
@@ -993,7 +993,7 @@ msgid "Download"
 msgstr "Letöltés"
 
 #: cps/templates/admin.html:18
-msgid "View eBooks"
+msgid "View Books"
 msgstr ""
 
 #: cps/templates/admin.html:19 cps/templates/layout.html:65
@@ -1033,7 +1033,7 @@ msgid "From E-mail"
 msgstr "Küldő e-mail cím"
 
 #: cps/templates/admin.html:61
-msgid "Change SMTP settings"
+msgid "Edit E-mail Server Settings"
 msgstr "SMTP beállítások változtatása"
 
 #: cps/templates/admin.html:67
@@ -1978,19 +1978,19 @@ msgid "Show Access Log: "
 msgstr ""
 
 #: cps/templates/modal_restriction.html:6
-msgid "Select allowed/denied Tags"
+msgid "Select Allowed/Denied Tags"
 msgstr ""
 
 #: cps/templates/modal_restriction.html:7
-msgid "Select allowed/denied Custom Column values"
+msgid "Select Allowed/Denied Custom Column Values"
 msgstr ""
 
 #: cps/templates/modal_restriction.html:8
-msgid "Select allowed/denied Tags of user"
+msgid "Select Allowed/Denied Tags of User"
 msgstr ""
 
 #: cps/templates/modal_restriction.html:9
-msgid "Select allowed/denied Custom Column values of user"
+msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr ""
 
 #: cps/templates/modal_restriction.html:15
@@ -2314,11 +2314,11 @@ msgid "Create/View"
 msgstr ""
 
 #: cps/templates/user_edit.html:83
-msgid "Add allowed/denied Tags"
+msgid "Add Allowed/Denied Tags"
 msgstr ""
 
 #: cps/templates/user_edit.html:84
-msgid "Add allowed/denied custom column values"
+msgid "Add allowed/Denied Custom Column Values"
 msgstr ""
 
 #: cps/templates/user_edit.html:129
diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po
index 598ba357..dc03ab2e 100644
--- a/cps/translations/it/LC_MESSAGES/messages.po
+++ b/cps/translations/it/LC_MESSAGES/messages.po
@@ -583,7 +583,7 @@ msgid "There was an error"
 msgstr "C'era un errore"
 
 #: cps/shelf.py:232 cps/shelf.py:234
-msgid "create a shelf"
+msgid "Create a Shelf"
 msgstr "Crea uno scaffale"
 
 #: cps/shelf.py:270
@@ -852,11 +852,11 @@ msgstr "Libro accodato con successo per essere spedito a %(kindlemail)s"
 
 #: cps/web.py:1064
 #, python-format
-msgid "There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Si è verificato un errore durante l'invio di questo libro: %(res)s"
 
 #: cps/web.py:1066
-msgid "Please configure your kindle e-mail address first..."
+msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Per favore configura dapprima il tuo indirizzo e-mail di Kindle..."
 
 #: cps/web.py:1083
@@ -992,7 +992,7 @@ msgid "Download"
 msgstr "Download"
 
 #: cps/templates/admin.html:18
-msgid "View eBooks"
+msgid "View Books"
 msgstr "Vedi libri"
 
 #: cps/templates/admin.html:19 cps/templates/layout.html:65
@@ -1032,7 +1032,7 @@ msgid "From E-mail"
 msgstr "E-mail da"
 
 #: cps/templates/admin.html:61
-msgid "Change SMTP settings"
+msgid "Edit E-mail Server Settings"
 msgstr "Modifica le impostazioni SMTP"
 
 #: cps/templates/admin.html:67
@@ -1977,19 +1977,19 @@ msgid "Show Access Log: "
 msgstr "Mostra il log di accesso: "
 
 #: cps/templates/modal_restriction.html:6
-msgid "Select allowed/denied Tags"
+msgid "Select Allowed/Denied Tags"
 msgstr "Seleziona le categorie consentite/negate"
 
 #: cps/templates/modal_restriction.html:7
-msgid "Select allowed/denied Custom Column values"
+msgid "Select Allowed/Denied Custom Column Values"
 msgstr "Seleziona i valori personali per le colonne consentiti/negati"
 
 #: cps/templates/modal_restriction.html:8
-msgid "Select allowed/denied Tags of user"
+msgid "Select Allowed/Denied Tags of User"
 msgstr "Seleziona le categorie consentite/negate per l'utente"
 
 #: cps/templates/modal_restriction.html:9
-msgid "Select allowed/denied Custom Column values of user"
+msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr "Seleziona i valori personali per le colonne consentiti/negati per l'utente"
 
 #: cps/templates/modal_restriction.html:15
@@ -2313,11 +2313,11 @@ msgid "Create/View"
 msgstr "Crea/Visualizza"
 
 #: cps/templates/user_edit.html:83
-msgid "Add allowed/denied Tags"
+msgid "Add Allowed/Denied Tags"
 msgstr "Aggiungi categorie permesse/negate"
 
 #: cps/templates/user_edit.html:84
-msgid "Add allowed/denied custom column values"
+msgid "Add allowed/Denied Custom Column Values"
 msgstr "Aggiungi valori personali nelle colonne permessi/negati"
 
 #: cps/templates/user_edit.html:129
diff --git a/cps/translations/ja/LC_MESSAGES/messages.po b/cps/translations/ja/LC_MESSAGES/messages.po
index 7e3761fa..7ccceddc 100644
--- a/cps/translations/ja/LC_MESSAGES/messages.po
+++ b/cps/translations/ja/LC_MESSAGES/messages.po
@@ -584,7 +584,7 @@ msgid "There was an error"
 msgstr "エラーが発生しました"
 
 #: cps/shelf.py:232 cps/shelf.py:234
-msgid "create a shelf"
+msgid "Create a Shelf"
 msgstr "本棚を作成する"
 
 #: cps/shelf.py:270
@@ -853,11 +853,11 @@ msgstr "本の %(kindlemail)s への送信がキューに追加されました"
 
 #: cps/web.py:1064
 #, python-format
-msgid "There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "%(res)s を送信中にエラーが発生しました"
 
 #: cps/web.py:1066
-msgid "Please configure your kindle e-mail address first..."
+msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "初めにKindleのメールアドレスを設定してください"
 
 #: cps/web.py:1083
@@ -993,7 +993,7 @@ msgid "Download"
 msgstr "ダウンロード"
 
 #: cps/templates/admin.html:18
-msgid "View eBooks"
+msgid "View Books"
 msgstr ""
 
 #: cps/templates/admin.html:19 cps/templates/layout.html:65
@@ -1033,7 +1033,7 @@ msgid "From E-mail"
 msgstr ""
 
 #: cps/templates/admin.html:61
-msgid "Change SMTP settings"
+msgid "Edit E-mail Server Settings"
 msgstr "SMTP設定を変更"
 
 #: cps/templates/admin.html:67
@@ -1978,19 +1978,19 @@ msgid "Show Access Log: "
 msgstr ""
 
 #: cps/templates/modal_restriction.html:6
-msgid "Select allowed/denied Tags"
+msgid "Select Allowed/Denied Tags"
 msgstr ""
 
 #: cps/templates/modal_restriction.html:7
-msgid "Select allowed/denied Custom Column values"
+msgid "Select Allowed/Denied Custom Column Values"
 msgstr ""
 
 #: cps/templates/modal_restriction.html:8
-msgid "Select allowed/denied Tags of user"
+msgid "Select Allowed/Denied Tags of User"
 msgstr ""
 
 #: cps/templates/modal_restriction.html:9
-msgid "Select allowed/denied Custom Column values of user"
+msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr ""
 
 #: cps/templates/modal_restriction.html:15
@@ -2314,11 +2314,11 @@ msgid "Create/View"
 msgstr ""
 
 #: cps/templates/user_edit.html:83
-msgid "Add allowed/denied Tags"
+msgid "Add Allowed/Denied Tags"
 msgstr ""
 
 #: cps/templates/user_edit.html:84
-msgid "Add allowed/denied custom column values"
+msgid "Add allowed/Denied Custom Column Values"
 msgstr ""
 
 #: cps/templates/user_edit.html:129
diff --git a/cps/translations/km/LC_MESSAGES/messages.po b/cps/translations/km/LC_MESSAGES/messages.po
index 7e835a8c..6dfe105c 100644
--- a/cps/translations/km/LC_MESSAGES/messages.po
+++ b/cps/translations/km/LC_MESSAGES/messages.po
@@ -585,7 +585,7 @@ msgid "There was an error"
 msgstr "មានបញ្ហា"
 
 #: cps/shelf.py:232 cps/shelf.py:234
-msgid "create a shelf"
+msgid "Create a Shelf"
 msgstr "បង្កើតធ្នើ"
 
 #: cps/shelf.py:270
@@ -854,11 +854,11 @@ msgstr "សៀវភៅបានចូលជួរសម្រាប់ផ្ញ
 
 #: cps/web.py:1064
 #, python-format
-msgid "There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "មានបញ្ហានៅពេលផ្ញើសៀវភៅនេះ៖ %(res)s"
 
 #: cps/web.py:1066
-msgid "Please configure your kindle e-mail address first..."
+msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
 #: cps/web.py:1083
@@ -994,7 +994,7 @@ msgid "Download"
 msgstr "ទាញយក"
 
 #: cps/templates/admin.html:18
-msgid "View eBooks"
+msgid "View Books"
 msgstr ""
 
 #: cps/templates/admin.html:19 cps/templates/layout.html:65
@@ -1034,7 +1034,7 @@ msgid "From E-mail"
 msgstr "ពីអ៊ីមែល"
 
 #: cps/templates/admin.html:61
-msgid "Change SMTP settings"
+msgid "Edit E-mail Server Settings"
 msgstr "ប្តូរការកំណត់ SMTP"
 
 #: cps/templates/admin.html:67
@@ -1979,19 +1979,19 @@ msgid "Show Access Log: "
 msgstr ""
 
 #: cps/templates/modal_restriction.html:6
-msgid "Select allowed/denied Tags"
+msgid "Select Allowed/Denied Tags"
 msgstr ""
 
 #: cps/templates/modal_restriction.html:7
-msgid "Select allowed/denied Custom Column values"
+msgid "Select Allowed/Denied Custom Column Values"
 msgstr ""
 
 #: cps/templates/modal_restriction.html:8
-msgid "Select allowed/denied Tags of user"
+msgid "Select Allowed/Denied Tags of User"
 msgstr ""
 
 #: cps/templates/modal_restriction.html:9
-msgid "Select allowed/denied Custom Column values of user"
+msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr ""
 
 #: cps/templates/modal_restriction.html:15
@@ -2315,11 +2315,11 @@ msgid "Create/View"
 msgstr ""
 
 #: cps/templates/user_edit.html:83
-msgid "Add allowed/denied Tags"
+msgid "Add Allowed/Denied Tags"
 msgstr ""
 
 #: cps/templates/user_edit.html:84
-msgid "Add allowed/denied custom column values"
+msgid "Add allowed/Denied Custom Column Values"
 msgstr ""
 
 #: cps/templates/user_edit.html:129
diff --git a/cps/translations/nl/LC_MESSAGES/messages.po b/cps/translations/nl/LC_MESSAGES/messages.po
index 370f71da..566b7c73 100644
--- a/cps/translations/nl/LC_MESSAGES/messages.po
+++ b/cps/translations/nl/LC_MESSAGES/messages.po
@@ -585,7 +585,7 @@ msgid "There was an error"
 msgstr "Er is een fout opgetreden"
 
 #: cps/shelf.py:232 cps/shelf.py:234
-msgid "create a shelf"
+msgid "Create a Shelf"
 msgstr "creëer een boekenplank"
 
 #: cps/shelf.py:270
@@ -854,11 +854,11 @@ msgstr "Het boek is in de wachtrij geplaatst om te worden verstuurd aan %(kindle
 
 #: cps/web.py:1064
 #, python-format
-msgid "There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Fout opgetreden bij het versturen van dit boek: %(res)s"
 
 #: cps/web.py:1066
-msgid "Please configure your kindle e-mail address first..."
+msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Stel je kindle-e-mailadres in..."
 
 #: cps/web.py:1083
@@ -994,7 +994,7 @@ msgid "Download"
 msgstr "Downloaden"
 
 #: cps/templates/admin.html:18
-msgid "View eBooks"
+msgid "View Books"
 msgstr "Boeken lezen"
 
 #: cps/templates/admin.html:19 cps/templates/layout.html:65
@@ -1034,7 +1034,7 @@ msgid "From E-mail"
 msgstr "Van e-mail"
 
 #: cps/templates/admin.html:61
-msgid "Change SMTP settings"
+msgid "Edit E-mail Server Settings"
 msgstr "SMTP-instellingen bewerken"
 
 #: cps/templates/admin.html:67
@@ -1979,19 +1979,19 @@ msgid "Show Access Log: "
 msgstr "Toon Toegangslog: "
 
 #: cps/templates/modal_restriction.html:6
-msgid "Select allowed/denied Tags"
+msgid "Select Allowed/Denied Tags"
 msgstr "Selecteer Toegestaan/Geweigerd tags toe"
 
 #: cps/templates/modal_restriction.html:7
-msgid "Select allowed/denied Custom Column values"
+msgid "Select Allowed/Denied Custom Column Values"
 msgstr "Selecteer Toegestaan/Geweigerd aangepaste kolom waarden"
 
 #: cps/templates/modal_restriction.html:8
-msgid "Select allowed/denied Tags of user"
+msgid "Select Allowed/Denied Tags of User"
 msgstr "Selecteer Toegestaan/Geweigerd tags van gebruikers"
 
 #: cps/templates/modal_restriction.html:9
-msgid "Select allowed/denied Custom Column values of user"
+msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr "Selecteer Toegestaan/Geweigerd aangepaste kolom waarden van gebruikers"
 
 #: cps/templates/modal_restriction.html:15
@@ -2315,11 +2315,11 @@ msgid "Create/View"
 msgstr "Aanmaken/Bekijk"
 
 #: cps/templates/user_edit.html:83
-msgid "Add allowed/denied Tags"
+msgid "Add Allowed/Denied Tags"
 msgstr "Voeg Toegestaan/Geweigerd tags toe"
 
 #: cps/templates/user_edit.html:84
-msgid "Add allowed/denied custom column values"
+msgid "Add allowed/Denied Custom Column Values"
 msgstr "Voeg Toegestaan/Geweigerd aangepaste kolom waarden toe"
 
 #: cps/templates/user_edit.html:129
diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po
index bc8629a1..06401683 100644
--- a/cps/translations/pl/LC_MESSAGES/messages.po
+++ b/cps/translations/pl/LC_MESSAGES/messages.po
@@ -591,7 +591,7 @@ msgid "There was an error"
 msgstr "Wystąpił błąd"
 
 #: cps/shelf.py:232 cps/shelf.py:234
-msgid "create a shelf"
+msgid "Create a Shelf"
 msgstr "utwórz półkę"
 
 #: cps/shelf.py:270
@@ -860,11 +860,11 @@ msgstr "Książka została umieszczona w kolejce do wysłania do %(kindlemail)s"
 
 #: cps/web.py:1064
 #, python-format
-msgid "There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Wystąpił błąd podczas wysyłania tej książki: %(res)s"
 
 #: cps/web.py:1066
-msgid "Please configure your kindle e-mail address first..."
+msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Najpierw skonfiguruj adres e-mail Kindle..."
 
 #: cps/web.py:1083
@@ -1002,7 +1002,7 @@ msgid "Download"
 msgstr "Pobieranie"
 
 #: cps/templates/admin.html:18
-msgid "View eBooks"
+msgid "View Books"
 msgstr "Przeglądanie"
 
 #: cps/templates/admin.html:19 cps/templates/layout.html:65
@@ -1042,7 +1042,7 @@ msgid "From E-mail"
 msgstr "Wyślij z adresu e-mail"
 
 #: cps/templates/admin.html:61
-msgid "Change SMTP settings"
+msgid "Edit E-mail Server Settings"
 msgstr "Zmień ustawienia SMTP"
 
 #: cps/templates/admin.html:67
@@ -1996,19 +1996,19 @@ msgid "Show Access Log: "
 msgstr "Pokaż dziennik dostępu: "
 
 #: cps/templates/modal_restriction.html:6
-msgid "Select allowed/denied Tags"
+msgid "Select Allowed/Denied Tags"
 msgstr "Wybierz dozwolone/zabronione etykiety"
 
 #: cps/templates/modal_restriction.html:7
-msgid "Select allowed/denied Custom Column values"
+msgid "Select Allowed/Denied Custom Column Values"
 msgstr "Wybierz dozwolone/zabronione wartości własnych kolumn"
 
 #: cps/templates/modal_restriction.html:8
-msgid "Select allowed/denied Tags of user"
+msgid "Select Allowed/Denied Tags of User"
 msgstr "Wybierz dozwolone/zabronione etykiety użytkownika"
 
 #: cps/templates/modal_restriction.html:9
-msgid "Select allowed/denied Custom Column values of user"
+msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr "Wybierz dozwolone/zabronione wartości własnych kolumn użytkownika"
 
 #: cps/templates/modal_restriction.html:15
@@ -2334,11 +2334,11 @@ msgid "Create/View"
 msgstr "Utwórz/Przeglądaj"
 
 #: cps/templates/user_edit.html:83
-msgid "Add allowed/denied Tags"
+msgid "Add Allowed/Denied Tags"
 msgstr "Dodaj dozwolone/zabronione etykiety"
 
 #: cps/templates/user_edit.html:84
-msgid "Add allowed/denied custom column values"
+msgid "Add allowed/Denied Custom Column Values"
 msgstr "Dodaj dozwolone/zabronione wartości własnych kolumn"
 
 #: cps/templates/user_edit.html:129
diff --git a/cps/translations/ru/LC_MESSAGES/messages.po b/cps/translations/ru/LC_MESSAGES/messages.po
index 4c3a2b6f..697c6bba 100644
--- a/cps/translations/ru/LC_MESSAGES/messages.po
+++ b/cps/translations/ru/LC_MESSAGES/messages.po
@@ -585,7 +585,7 @@ msgid "There was an error"
 msgstr "Произошла ошибка"
 
 #: cps/shelf.py:232 cps/shelf.py:234
-msgid "create a shelf"
+msgid "Create a Shelf"
 msgstr "создать полку"
 
 #: cps/shelf.py:270
@@ -854,11 +854,11 @@ msgstr "Книга успешно поставлена в очередь для
 
 #: cps/web.py:1064
 #, python-format
-msgid "There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "При отправке этой книги произошла ошибка: %(res)s"
 
 #: cps/web.py:1066
-msgid "Please configure your kindle e-mail address first..."
+msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Пожалуйста, сначала настройте e-mail на вашем kindle..."
 
 #: cps/web.py:1083
@@ -994,7 +994,7 @@ msgid "Download"
 msgstr "Скачать"
 
 #: cps/templates/admin.html:18
-msgid "View eBooks"
+msgid "View Books"
 msgstr "Посмотреть электронные книги"
 
 #: cps/templates/admin.html:19 cps/templates/layout.html:65
@@ -1034,7 +1034,7 @@ msgid "From E-mail"
 msgstr "Отправитель"
 
 #: cps/templates/admin.html:61
-msgid "Change SMTP settings"
+msgid "Edit E-mail Server Settings"
 msgstr "Изменить настройки SMTP"
 
 #: cps/templates/admin.html:67
@@ -1979,19 +1979,19 @@ msgid "Show Access Log: "
 msgstr "Показать журнал доступа:"
 
 #: cps/templates/modal_restriction.html:6
-msgid "Select allowed/denied Tags"
+msgid "Select Allowed/Denied Tags"
 msgstr "Выбрать разрешенные / запрещенные теги"
 
 #: cps/templates/modal_restriction.html:7
-msgid "Select allowed/denied Custom Column values"
+msgid "Select Allowed/Denied Custom Column Values"
 msgstr "Выбрать разрешенные / запрещенные значения индивидуальных столбцов"
 
 #: cps/templates/modal_restriction.html:8
-msgid "Select allowed/denied Tags of user"
+msgid "Select Allowed/Denied Tags of User"
 msgstr "Выбрать разрешенные / запрещенные теги пользователя"
 
 #: cps/templates/modal_restriction.html:9
-msgid "Select allowed/denied Custom Column values of user"
+msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr "Выбрать разрешенные / запрещенные значения индивидуальных столбцов пользователя"
 
 #: cps/templates/modal_restriction.html:15
@@ -2315,11 +2315,11 @@ msgid "Create/View"
 msgstr "Создать/Просмотреть"
 
 #: cps/templates/user_edit.html:83
-msgid "Add allowed/denied Tags"
+msgid "Add Allowed/Denied Tags"
 msgstr "Добавить разрешенные / запрещенные теги"
 
 #: cps/templates/user_edit.html:84
-msgid "Add allowed/denied custom column values"
+msgid "Add allowed/Denied Custom Column Values"
 msgstr "Добавить разрешенные / запрещенные значения индивидуальных столбцов"
 
 #: cps/templates/user_edit.html:129
diff --git a/cps/translations/sv/LC_MESSAGES/messages.po b/cps/translations/sv/LC_MESSAGES/messages.po
index cc2ecccd..7415db8f 100644
--- a/cps/translations/sv/LC_MESSAGES/messages.po
+++ b/cps/translations/sv/LC_MESSAGES/messages.po
@@ -584,7 +584,7 @@ msgid "There was an error"
 msgstr "Det fanns ett fel"
 
 #: cps/shelf.py:232 cps/shelf.py:234
-msgid "create a shelf"
+msgid "Create a Shelf"
 msgstr "skapa en hylla"
 
 #: cps/shelf.py:270
@@ -853,11 +853,11 @@ msgstr "Boken är i kö för att skicka till %(kindlemail)s"
 
 #: cps/web.py:1064
 #, python-format
-msgid "There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Det gick inte att skicka den här boken: %(res)s"
 
 #: cps/web.py:1066
-msgid "Please configure your kindle e-mail address first..."
+msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Konfigurera din kindle-e-postadress först..."
 
 #: cps/web.py:1083
@@ -993,7 +993,7 @@ msgid "Download"
 msgstr "Hämta"
 
 #: cps/templates/admin.html:18
-msgid "View eBooks"
+msgid "View Books"
 msgstr "Visa e-böcker"
 
 #: cps/templates/admin.html:19 cps/templates/layout.html:65
@@ -1033,7 +1033,7 @@ msgid "From E-mail"
 msgstr "Från meddelande"
 
 #: cps/templates/admin.html:61
-msgid "Change SMTP settings"
+msgid "Edit E-mail Server Settings"
 msgstr "Ändra SMTP-inställningar"
 
 #: cps/templates/admin.html:67
@@ -1978,19 +1978,19 @@ msgid "Show Access Log: "
 msgstr "Visa åtkomstlogg: "
 
 #: cps/templates/modal_restriction.html:6
-msgid "Select allowed/denied Tags"
+msgid "Select Allowed/Denied Tags"
 msgstr "Välj tillåtna/avvisade taggar"
 
 #: cps/templates/modal_restriction.html:7
-msgid "Select allowed/denied Custom Column values"
+msgid "Select Allowed/Denied Custom Column Values"
 msgstr "Välj tillåtna/avvisade anpassade kolumnvärden"
 
 #: cps/templates/modal_restriction.html:8
-msgid "Select allowed/denied Tags of user"
+msgid "Select Allowed/Denied Tags of User"
 msgstr "Välj tillåtna/avvisade användarens taggar"
 
 #: cps/templates/modal_restriction.html:9
-msgid "Select allowed/denied Custom Column values of user"
+msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr "Välj tillåtna/avvisade anpassade kolumnvärden för användaren"
 
 #: cps/templates/modal_restriction.html:15
@@ -2314,11 +2314,11 @@ msgid "Create/View"
 msgstr "Skapa/Visa"
 
 #: cps/templates/user_edit.html:83
-msgid "Add allowed/denied Tags"
+msgid "Add Allowed/Denied Tags"
 msgstr "Lägg till tillåtna/avvisade taggar"
 
 #: cps/templates/user_edit.html:84
-msgid "Add allowed/denied custom column values"
+msgid "Add allowed/Denied Custom Column Values"
 msgstr "Lägg till tillåtna/avvisade anpassade kolumnvärden"
 
 #: cps/templates/user_edit.html:129
diff --git a/cps/translations/uk/LC_MESSAGES/messages.po b/cps/translations/uk/LC_MESSAGES/messages.po
index 024e9ff2..8513385d 100644
--- a/cps/translations/uk/LC_MESSAGES/messages.po
+++ b/cps/translations/uk/LC_MESSAGES/messages.po
@@ -583,7 +583,7 @@ msgid "There was an error"
 msgstr "Сталась помилка"
 
 #: cps/shelf.py:232 cps/shelf.py:234
-msgid "create a shelf"
+msgid "Create a Shelf"
 msgstr "створити книжкову полицю"
 
 #: cps/shelf.py:270
@@ -852,11 +852,11 @@ msgstr ""
 
 #: cps/web.py:1064
 #, python-format
-msgid "There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Помилка при відправці книги: %(res)s"
 
 #: cps/web.py:1066
-msgid "Please configure your kindle e-mail address first..."
+msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
 #: cps/web.py:1083
@@ -992,7 +992,7 @@ msgid "Download"
 msgstr "Завантажити"
 
 #: cps/templates/admin.html:18
-msgid "View eBooks"
+msgid "View Books"
 msgstr ""
 
 #: cps/templates/admin.html:19 cps/templates/layout.html:65
@@ -1032,7 +1032,7 @@ msgid "From E-mail"
 msgstr "Відправник"
 
 #: cps/templates/admin.html:61
-msgid "Change SMTP settings"
+msgid "Edit E-mail Server Settings"
 msgstr "Змінити налаштування SMTP"
 
 #: cps/templates/admin.html:67
@@ -1977,19 +1977,19 @@ msgid "Show Access Log: "
 msgstr ""
 
 #: cps/templates/modal_restriction.html:6
-msgid "Select allowed/denied Tags"
+msgid "Select Allowed/Denied Tags"
 msgstr ""
 
 #: cps/templates/modal_restriction.html:7
-msgid "Select allowed/denied Custom Column values"
+msgid "Select Allowed/Denied Custom Column Values"
 msgstr ""
 
 #: cps/templates/modal_restriction.html:8
-msgid "Select allowed/denied Tags of user"
+msgid "Select Allowed/Denied Tags of User"
 msgstr ""
 
 #: cps/templates/modal_restriction.html:9
-msgid "Select allowed/denied Custom Column values of user"
+msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr ""
 
 #: cps/templates/modal_restriction.html:15
@@ -2313,11 +2313,11 @@ msgid "Create/View"
 msgstr ""
 
 #: cps/templates/user_edit.html:83
-msgid "Add allowed/denied Tags"
+msgid "Add Allowed/Denied Tags"
 msgstr ""
 
 #: cps/templates/user_edit.html:84
-msgid "Add allowed/denied custom column values"
+msgid "Add allowed/Denied Custom Column Values"
 msgstr ""
 
 #: cps/templates/user_edit.html:129
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index 84bfb2f4..29163fa2 100644
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
@@ -584,7 +584,7 @@ msgid "There was an error"
 msgstr "发生错误"
 
 #: cps/shelf.py:232 cps/shelf.py:234
-msgid "create a shelf"
+msgid "Create a Shelf"
 msgstr "创建书架"
 
 #: cps/shelf.py:270
@@ -853,11 +853,11 @@ msgstr "书籍已经被成功加入 %(kindlemail)s 的发送队列"
 
 #: cps/web.py:1064
 #, python-format
-msgid "There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "发送这本书的时候出现错误: %(res)s"
 
 #: cps/web.py:1066
-msgid "Please configure your kindle e-mail address first..."
+msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "请先配置您的kindle邮箱..."
 
 #: cps/web.py:1083
@@ -993,7 +993,7 @@ msgid "Download"
 msgstr "下载"
 
 #: cps/templates/admin.html:18
-msgid "View eBooks"
+msgid "View Books"
 msgstr "查看电子书"
 
 #: cps/templates/admin.html:19 cps/templates/layout.html:65
@@ -1033,7 +1033,7 @@ msgid "From E-mail"
 msgstr "来自邮箱"
 
 #: cps/templates/admin.html:61
-msgid "Change SMTP settings"
+msgid "Edit E-mail Server Settings"
 msgstr "修改SMTP设置"
 
 #: cps/templates/admin.html:67
@@ -1978,19 +1978,19 @@ msgid "Show Access Log: "
 msgstr "显示Access Log: "
 
 #: cps/templates/modal_restriction.html:6
-msgid "Select allowed/denied Tags"
+msgid "Select Allowed/Denied Tags"
 msgstr "选择（允许/禁止）标签"
 
 #: cps/templates/modal_restriction.html:7
-msgid "Select allowed/denied Custom Column values"
+msgid "Select Allowed/Denied Custom Column Values"
 msgstr "选择（允许/禁止）自定义栏值"
 
 #: cps/templates/modal_restriction.html:8
-msgid "Select allowed/denied Tags of user"
+msgid "Select Allowed/Denied Tags of User"
 msgstr "选择（允许/禁止）用户标签"
 
 #: cps/templates/modal_restriction.html:9
-msgid "Select allowed/denied Custom Column values of user"
+msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr "选择（允许/禁止）用户自定义栏值"
 
 #: cps/templates/modal_restriction.html:15
@@ -2314,11 +2314,11 @@ msgid "Create/View"
 msgstr "新建/查看"
 
 #: cps/templates/user_edit.html:83
-msgid "Add allowed/denied Tags"
+msgid "Add Allowed/Denied Tags"
 msgstr "添加（允许/禁止）标签"
 
 #: cps/templates/user_edit.html:84
-msgid "Add allowed/denied custom column values"
+msgid "Add allowed/Denied Custom Column Values"
 msgstr "添加（允许/禁止）自定义栏值"
 
 #: cps/templates/user_edit.html:129
diff --git a/cps/web.py b/cps/web.py
index c7820a84..81246172 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -1061,9 +1061,9 @@ def send_to_kindle(book_id, book_format, convert):
                   category="success")
             ub.update_download(book_id, int(current_user.id))
         else:
-            flash(_(u"There was an error sending this book: %(res)s", res=result), category="error")
+            flash(_(u"Oops! There was an error sending this book: %(res)s", res=result), category="error")
     else:
-        flash(_(u"Please configure your kindle e-mail address first..."), category="error")
+        flash(_(u"Please update your profile with a valid Send to Kindle E-mail Address."), category="error")
     if "HTTP_REFERER" in request.environ:
         return redirect(request.environ["HTTP_REFERER"])
     else:
diff --git a/messages.pot b/messages.pot
index d337de64..5d0ce3de 100644
--- a/messages.pot
+++ b/messages.pot
@@ -583,7 +583,7 @@ msgid "There was an error"
 msgstr ""
 
 #: cps/shelf.py:232 cps/shelf.py:234
-msgid "create a shelf"
+msgid "Create a Shelf"
 msgstr ""
 
 #: cps/shelf.py:270
@@ -852,11 +852,11 @@ msgstr ""
 
 #: cps/web.py:1064
 #, python-format
-msgid "There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending this book: %(res)s"
 msgstr ""
 
 #: cps/web.py:1066
-msgid "Please configure your kindle e-mail address first..."
+msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
 #: cps/web.py:1083
@@ -992,7 +992,7 @@ msgid "Download"
 msgstr ""
 
 #: cps/templates/admin.html:18
-msgid "View eBooks"
+msgid "View Books"
 msgstr ""
 
 #: cps/templates/admin.html:19 cps/templates/layout.html:65
@@ -1032,7 +1032,7 @@ msgid "From E-mail"
 msgstr ""
 
 #: cps/templates/admin.html:61
-msgid "Change SMTP settings"
+msgid "Edit E-mail Server Settings"
 msgstr ""
 
 #: cps/templates/admin.html:67
@@ -1977,19 +1977,19 @@ msgid "Show Access Log: "
 msgstr ""
 
 #: cps/templates/modal_restriction.html:6
-msgid "Select allowed/denied Tags"
+msgid "Select Allowed/Denied Tags"
 msgstr ""
 
 #: cps/templates/modal_restriction.html:7
-msgid "Select allowed/denied Custom Column values"
+msgid "Select Allowed/Denied Custom Column Values"
 msgstr ""
 
 #: cps/templates/modal_restriction.html:8
-msgid "Select allowed/denied Tags of user"
+msgid "Select Allowed/Denied Tags of User"
 msgstr ""
 
 #: cps/templates/modal_restriction.html:9
-msgid "Select allowed/denied Custom Column values of user"
+msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr ""
 
 #: cps/templates/modal_restriction.html:15
@@ -2313,11 +2313,11 @@ msgid "Create/View"
 msgstr ""
 
 #: cps/templates/user_edit.html:83
-msgid "Add allowed/denied Tags"
+msgid "Add Allowed/Denied Tags"
 msgstr ""
 
 #: cps/templates/user_edit.html:84
-msgid "Add allowed/denied custom column values"
+msgid "Add allowed/Denied Custom Column Values"
 msgstr ""
 
 #: cps/templates/user_edit.html:129