Change Title label to Job Title for clarity

453780

5 files changed, 38 insertions, 30 deletions

diff --git a/ipa-server/ipa-gui/ipagui/forms/user.py b/ipa-server/ipa-gui/ipagui/forms/user.py
index 2c10eeac6..350283749 100644
--- a/ipa-server/ipa-gui/ipagui/forms/user.py
+++ b/ipa-server/ipa-gui/ipagui/forms/user.py
@@ -25,7 +25,7 @@ class UserFields(object):
     sn = widgets.TextField(name="sn", label="Last Name")
     cn = widgets.TextField(name="cn", label="Full Name")
     cns = ExpandingForm(name="cns", label="Full Name", fields=[cn])
-    title = widgets.TextField(name="title", label="Title")
+    title = widgets.TextField(name="title", label="Job Title")
     displayname = widgets.TextField(name="displayname", label="Display Name")
     initials = widgets.TextField(name="initials", label="Initials")
 
diff --git a/ipa-server/ipa-gui/ipagui/templates/userlist.kid b/ipa-server/ipa-gui/ipagui/templates/userlist.kid
index b7091c953..718a29803 100644
--- a/ipa-server/ipa-gui/ipagui/templates/userlist.kid
+++ b/ipa-server/ipa-gui/ipagui/templates/userlist.kid
@@ -49,7 +49,7 @@
                     Unit
                 </th>
                 <th>
-                    Title
+                    Job Title
                 </th>
             </tr>
           </thead>
diff --git a/ipa-server/ipa-gui/locales/ja/LC_MESSAGES/messages.po b/ipa-server/ipa-gui/locales/ja/LC_MESSAGES/messages.po
index 3af064b6f..1e03419ba 100644
--- a/ipa-server/ipa-gui/locales/ja/LC_MESSAGES/messages.po
+++ b/ipa-server/ipa-gui/locales/ja/LC_MESSAGES/messages.po
@@ -67,7 +67,7 @@ msgid "Unit"
 msgstr "ユニット"
 
 #: ipagui/templates/userlist.kid:th
-msgid "Title"
+msgid "Job Title"
 msgstr ""
 
 #: ipagui/templates/userlist.kid:a
diff --git a/ipa-server/ipa-gui/locales/messages.pot b/ipa-server/ipa-gui/locales/messages.pot
index 37b21b198..9140381ca 100644
--- a/ipa-server/ipa-gui/locales/messages.pot
+++ b/ipa-server/ipa-gui/locales/messages.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2008-02-07 21:59\n"
+"POT-Creation-Date: 2008-07-25 09:17\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,14 +15,27 @@ msgstr ""
 "Generated-By: pygettext.py 1.5\n"
 
 
-#: ipagui/forms/delegate.py:82 ipagui/forms/delegate.py:84
+#: ipagui/forms/delegate.py:83 ipagui/forms/delegate.py:85
 msgid "Please choose a group"
 msgstr ""
 
-#: ipagui/subcontrollers/delegation.py:336
+#: ipagui/helpers/validators.py:42
+msgid "Duplicate values are not allowed"
+msgstr ""
+
+#: ipagui/helpers/validators.py:43
+msgid "Empty values not allowed"
+msgstr ""
+
+#: ipagui/subcontrollers/delegation.py:409
 msgid "Please select at least one value"
 msgstr ""
 
+#: ipagui/subcontrollers/delegation.py:411
+#: ipagui/subcontrollers/delegation.py:413
+msgid "Group not found"
+msgstr ""
+
 #: ipagui/templates/ipapolicyeditform.kid:div
 msgid ""
 msgstr ""
@@ -39,18 +52,6 @@ msgstr ""
 msgid "User Settings"
 msgstr ""
 
-#: ipagui/templates/ipapolicyeditform.kid:a
-msgid "Remove"
-msgstr ""
-
-#: ipagui/templates/ipapolicyeditform.kid:a
-msgid "Add User Object Class"
-msgstr ""
-
-#: ipagui/templates/ipapolicyeditform.kid:a
-msgid "Add Group Object Class"
-msgstr ""
-
 #: ipagui/templates/principalshow.kid:title
 msgid "View Service Principal"
 msgstr ""
@@ -191,7 +192,11 @@ msgid "Identity Details"
 msgstr ""
 
 #: ipagui/templates/usernewform.kid:a
-msgid "Add Common Name"
+msgid "Remove"
+msgstr ""
+
+#: ipagui/templates/usernewform.kid:a
+msgid "Add Full Name"
 msgstr ""
 
 #: ipagui/templates/usernewform.kid:h2
@@ -533,6 +538,14 @@ msgstr ""
 msgid "You do not have permission to access this page."
 msgstr ""
 
+#: ipagui/templates/not_found.kid:title
+msgid "Page Not Found"
+msgstr ""
+
+#: ipagui/templates/not_found.kid:div
+msgid "${message}"
+msgstr ""
+
 #: ipagui/templates/groupedit.kid:title
 msgid "Edit Group"
 msgstr ""
@@ -589,10 +602,6 @@ msgstr ""
 msgid "Message:"
 msgstr ""
 
-#: ipagui/templates/unhandled_exception.kid:pre
-msgid "${message}"
-msgstr ""
-
 #: ipagui/templates/unhandled_exception.kid:b
 msgid "HTTP Error Message:"
 msgstr ""
@@ -646,7 +655,7 @@ msgid "Unit"
 msgstr ""
 
 #: ipagui/templates/userlist.kid:th
-msgid "Title"
+msgid "Job Title"
 msgstr ""
 
 #: ipagui/templates/userlist.kid:a
@@ -728,7 +737,10 @@ msgid "Your title goes here"
 msgstr ""
 
 #: ipagui/templates/master.kid:style
-msgid "@import \"${tg.url('/static/css/style.css')}\";"
+msgid ""
+"@import \"${tg.url('/static/css/style_platform.css')}\";\n"
+"    @import \"${tg.url('/static/css/style_platform-objects.css')}\";\n"
+"    @import \"${tg.url('/static/css/style_freeipa.css')}\";"
 msgstr ""
 
 #: ipagui/templates/master.kid:a
@@ -768,7 +780,3 @@ msgstr ""
 msgid "Self Service"
 msgstr ""
 
-#: ipagui/templates/master.kid:a
-msgid "Powered by FreeIPA"
-msgstr ""
-
diff --git a/ipa-server/xmlrpc-server/attrs.py b/ipa-server/xmlrpc-server/attrs.py
index f7ae0affa..415744a23 100644
--- a/ipa-server/xmlrpc-server/attrs.py
+++ b/ipa-server/xmlrpc-server/attrs.py
@@ -21,7 +21,7 @@ attr_label_list = {
     "givenname":"First Name",
     "sn":"Last Name",
     "cn":"Full Name",
-    "title":"Title",
+    "title":"Job Title",
     "displayname":"Display Name",
     "initials":"Initials",
     "uid":"Login",