Incorporate better error message handling.

46 files changed, 7072 insertions, 3649 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index c6ecadd..53f5d60 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,4 +1,4 @@
 src/pam_pwquality.c
 src/pwscore.c
 src/pwmake.c
-
+src/error.c
diff --git a/po/ar.po b/po/ar.po
index 8fcec8e..fafbbd5 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2001-07-13 15:36+0200\n"
 "Last-Translator: Novell Language <language@novell.com>\n"
 "Language-Team: Novell Language <language@novell.com>\n"
@@ -32,156 +32,228 @@ msgstr "أعد كتابة كلمة سر %s%s الجديدة: "
 msgid "Sorry, passwords do not match."
 msgstr "عذرًا، يوجد عدم تطابق بين كلمات السر."
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "خطأ في المحادثة"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "لا يوجد اختلاف عن كلمة السر القديمة"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "كلمة سر يمكن قراءتها من الجهتين"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "لم يتم سوى تغيير حالة الأحرف"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "كلمة السر الجديدة شديدة الشبه بكلمة السر القديمة"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "كلمة السر شديدة البساطة"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "كلمة مرور ملتفة"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr ""
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr ""
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "لم يتم إدخال كلمة السر"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "خطأ في الوحدة النمطية للخدمة"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "كلمة سر سيئة: %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "خطأ في المحادثة"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "خطأ في المحادثة"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "لا يوجد اختلاف عن كلمة السر القديمة"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "كلمة سر يمكن قراءتها من الجهتين"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "كلمة السر الجديدة شديدة الشبه بكلمة السر القديمة"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "لا يوجد اختلاف عن كلمة السر القديمة"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr ""
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "لا يوجد اختلاف عن كلمة السر القديمة"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr ""
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "كلمة السر الجديدة شديدة الشبه بكلمة السر القديمة"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, c-format
+msgid "The password contains less than %ld character classes"
+msgstr ""
+
+#: src/error.c:81
 msgid "The password does not contain enough character classes"
 msgstr ""
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr ""
+
+#: src/error.c:87
 msgid "The password contains too many same characters consecutively"
 msgstr ""
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "لم يتم إدخال كلمة السر"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "كلمة سر يمكن قراءتها من الجهتين"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "خطأ غير معروف"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:113
+msgid "Bad integer value"
+msgstr ""
+
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
+msgstr ""
+
+#: src/error.c:120
+msgid "Setting is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:133
+msgid "Fatal failure"
+msgstr ""
+
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "خطأ غير معروف"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "خطأ في المحادثة"
+#~ msgid "memory allocation error"
+#~ msgstr "خطأ في المحادثة"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "لا يوجد اختلاف عن كلمة السر القديمة"
+
+#~ msgid "is a palindrome"
+#~ msgstr "كلمة سر يمكن قراءتها من الجهتين"
+
+#~ msgid "case changes only"
+#~ msgstr "لم يتم سوى تغيير حالة الأحرف"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "كلمة السر الجديدة شديدة الشبه بكلمة السر القديمة"
+
+#~ msgid "is too simple"
+#~ msgstr "كلمة السر شديدة البساطة"
+
+#~ msgid "is rotated"
+#~ msgstr "كلمة مرور ملتفة"
+
+#~ msgid "Error in service module"
+#~ msgstr "خطأ في الوحدة النمطية للخدمة"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "خطأ في المحادثة"
diff --git a/po/as.po b/po/as.po
index 8de2edd..40cdb19 100644
--- a/po/as.po
+++ b/po/as.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Linux-PAM.tip\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2009-04-09 19:25+0530\n"
 "Last-Translator: Amitakhya Phukan <aphukan@fedoraproject.org>\n"
 "Language-Team: Assamese <fedora-trans-as@redhat.com>\n"
@@ -33,158 +33,236 @@ msgstr "নতুন %s%s গুপ্তশব্দ পুনঃ লিখক:
 msgid "Sorry, passwords do not match."
 msgstr "ক্ষমা কৰিব, গুপ্তশব্দৰ অমিল "
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "সম্বাদৰ ভুল"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "পুৰণিটোৰ সৈতে একেই"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "এটা অনুলোম‌-বিলোম বাক্য"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "অকল কেচ সলনি কৰা"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "পৰণিটোৰ সৈতে বহুত একেই"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "বৰ সৰল"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "পকোৱা হৈছে"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr "পৰ্যাপ্ত character classes নাই"
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr "এটাৰ পিছত এটা বহুতো একেই আখৰ আছে"
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "কোনো গুপ্তশব্দ দিয়া হোৱা নাই"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "সেৱাৰ অংশত ভুল"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "বেয়া গুপ্তশব্দ: %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "সম্বাদৰ ভুল"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "সম্বাদৰ ভুল"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "পুৰণিটোৰ সৈতে একেই"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "এটা অনুলোম‌-বিলোম বাক্য"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "পৰণিটোৰ সৈতে বহুত একেই"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "পুৰণিটোৰ সৈতে একেই"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, fuzzy, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr "এটাৰ পিছত এটা বহুতো একেই আখৰ আছে"
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "পুৰণিটোৰ সৈতে একেই"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, fuzzy, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr "এটাৰ পিছত এটা বহুতো একেই আখৰ আছে"
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "পৰ্যাপ্ত character classes নাই"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, fuzzy, c-format
+msgid "The password contains less than %ld character classes"
+msgstr "পৰ্যাপ্ত character classes নাই"
+
+#: src/error.c:81
 #, fuzzy
 msgid "The password does not contain enough character classes"
 msgstr "পৰ্যাপ্ত character classes নাই"
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, fuzzy, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr "এটাৰ পিছত এটা বহুতো একেই আখৰ আছে"
+
+#: src/error.c:87
 #, fuzzy
 msgid "The password contains too many same characters consecutively"
 msgstr "এটাৰ পিছত এটা বহুতো একেই আখৰ আছে"
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "কোনো গুপ্তশব্দ দিয়া হোৱা নাই"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "এটা অনুলোম‌-বিলোম বাক্য"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "অজ্ঞাত ভুল"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
+msgstr ""
+
+#: src/error.c:113
+msgid "Bad integer value"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:120
+msgid "Setting is not of integer type"
+msgstr ""
+
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "অজ্ঞাত ভুল"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "সম্বাদৰ ভুল"
+#~ msgid "memory allocation error"
+#~ msgstr "সম্বাদৰ ভুল"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "পুৰণিটোৰ সৈতে একেই"
+
+#~ msgid "is a palindrome"
+#~ msgstr "এটা অনুলোম‌-বিলোম বাক্য"
+
+#~ msgid "case changes only"
+#~ msgstr "অকল কেচ সলনি কৰা"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "পৰণিটোৰ সৈতে বহুত একেই"
+
+#~ msgid "is too simple"
+#~ msgstr "বৰ সৰল"
+
+#~ msgid "is rotated"
+#~ msgstr "পকোৱা হৈছে"
+
+#~ msgid "not enough character classes"
+#~ msgstr "পৰ্যাপ্ত character classes নাই"
+
+#~ msgid "contains too many same characters consecutively"
+#~ msgstr "এটাৰ পিছত এটা বহুতো একেই আখৰ আছে"
+
+#~ msgid "Error in service module"
+#~ msgstr "সেৱাৰ অংশত ভুল"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "সম্বাদৰ ভুল"
diff --git a/po/bn_IN.po b/po/bn_IN.po
index 95b7b51..3b4214d 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam.tip\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2009-04-08 18:30+0530\n"
 "Last-Translator: Runa Bhattacharjee <runab@fedoraproject.org>\n"
 "Language-Team: Bengali INDIA <fedora-trans-bn_in@redhat.com>\n"
@@ -33,158 +33,236 @@ msgstr "নতুন %s%s পাসওয়ার্ড পুনরায় লি�
 msgid "Sorry, passwords do not match."
 msgstr "দুঃখিত, পাসওয়ার্ড দুটি এক নয়।"
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "Conversation অর্থাৎ তথ্য বিনিময়কালীন সমস্যা"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "পুরোনোটির অনুরূপ"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "উভমুখী শব্দ"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "শুধুমাত্র হরফের ছাঁদ পরিবর্তন করা হয়েছে"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "পুরোনো পাসওয়ার্ডের সমতূল্য"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "জটিল নয়"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "ঘোরানো হয়েছে"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr "পর্যাপ্ত অক্ষর শ্রেণী উপস্থিত নেই"
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr "একই অক্ষর অত্যাধিক বার ক্রমাগত ব্যবহার করা হয়েছে"
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "কোনো পাসওয়ার্ড উল্লিখিত হয়নি"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "পরিসেবা মডিউলে সমস্যা"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "পাসওয়ার্ড ভাল নয়: %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "Conversation অর্থাৎ তথ্য বিনিময়কালীন সমস্যা"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "Conversation অর্থাৎ তথ্য বিনিময়কালীন সমস্যা"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "পুরোনোটির অনুরূপ"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "উভমুখী শব্দ"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "পুরোনো পাসওয়ার্ডের সমতূল্য"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "পুরোনোটির অনুরূপ"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, fuzzy, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr "একই অক্ষর অত্যাধিক বার ক্রমাগত ব্যবহার করা হয়েছে"
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "পুরোনোটির অনুরূপ"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, fuzzy, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr "একই অক্ষর অত্যাধিক বার ক্রমাগত ব্যবহার করা হয়েছে"
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "পর্যাপ্ত অক্ষর শ্রেণী উপস্থিত নেই"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, fuzzy, c-format
+msgid "The password contains less than %ld character classes"
+msgstr "পর্যাপ্ত অক্ষর শ্রেণী উপস্থিত নেই"
+
+#: src/error.c:81
 #, fuzzy
 msgid "The password does not contain enough character classes"
 msgstr "পর্যাপ্ত অক্ষর শ্রেণী উপস্থিত নেই"
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, fuzzy, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr "একই অক্ষর অত্যাধিক বার ক্রমাগত ব্যবহার করা হয়েছে"
+
+#: src/error.c:87
 #, fuzzy
 msgid "The password contains too many same characters consecutively"
 msgstr "একই অক্ষর অত্যাধিক বার ক্রমাগত ব্যবহার করা হয়েছে"
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "কোনো পাসওয়ার্ড উল্লিখিত হয়নি"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "উভমুখী শব্দ"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "অজানা সমস্যা"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
+msgstr ""
+
+#: src/error.c:113
+msgid "Bad integer value"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:120
+msgid "Setting is not of integer type"
+msgstr ""
+
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "অজানা সমস্যা"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "Conversation অর্থাৎ তথ্য বিনিময়কালীন সমস্যা"
+#~ msgid "memory allocation error"
+#~ msgstr "Conversation অর্থাৎ তথ্য বিনিময়কালীন সমস্যা"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "পুরোনোটির অনুরূপ"
+
+#~ msgid "is a palindrome"
+#~ msgstr "উভমুখী শব্দ"
+
+#~ msgid "case changes only"
+#~ msgstr "শুধুমাত্র হরফের ছাঁদ পরিবর্তন করা হয়েছে"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "পুরোনো পাসওয়ার্ডের সমতূল্য"
+
+#~ msgid "is too simple"
+#~ msgstr "জটিল নয়"
+
+#~ msgid "is rotated"
+#~ msgstr "ঘোরানো হয়েছে"
+
+#~ msgid "not enough character classes"
+#~ msgstr "পর্যাপ্ত অক্ষর শ্রেণী উপস্থিত নেই"
+
+#~ msgid "contains too many same characters consecutively"
+#~ msgstr "একই অক্ষর অত্যাধিক বার ক্রমাগত ব্যবহার করা হয়েছে"
+
+#~ msgid "Error in service module"
+#~ msgstr "পরিসেবা মডিউলে সমস্যা"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "Conversation অর্থাৎ তথ্য বিনিময়কালীন সমস্যা"
diff --git a/po/ca.po b/po/ca.po
index ed04d36..94ae40a 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linux-PAM\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2009-05-18 16:10+0200\n"
 "Last-Translator: Albert Carabasa Giribet <albertc@asic.udl.cat>\n"
 "Language-Team: Catalan <fedora@softcatala.net>\n"
@@ -45,158 +45,236 @@ msgstr "Torneu a escriure la nova contrasenya de %s%s: "
 msgid "Sorry, passwords do not match."
 msgstr "Les contrasenyes no coincideixen."
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "Error de conversa"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "és la mateixa que l'antiga"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "és un palíndrom"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "només canvien les majúscules i minúscules"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "és massa semblant a l'antiga"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "és massa senzilla"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "està girada"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr "no hi ha suficients classes de caràcters"
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr "conté massa caràcters idèntics consecutius"
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "No s'ha proporcionat cap contrasenya"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "Error en el mòdul de servei"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "CONTRASENYA INCORRECTA: %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "Error de conversa"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "Error de conversa"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "és la mateixa que l'antiga"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "és un palíndrom"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "és massa semblant a l'antiga"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "és la mateixa que l'antiga"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, fuzzy, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr "conté massa caràcters idèntics consecutius"
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "és la mateixa que l'antiga"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, fuzzy, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr "conté massa caràcters idèntics consecutius"
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "no hi ha suficients classes de caràcters"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, fuzzy, c-format
+msgid "The password contains less than %ld character classes"
+msgstr "no hi ha suficients classes de caràcters"
+
+#: src/error.c:81
 #, fuzzy
 msgid "The password does not contain enough character classes"
 msgstr "no hi ha suficients classes de caràcters"
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, fuzzy, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr "conté massa caràcters idèntics consecutius"
+
+#: src/error.c:87
 #, fuzzy
 msgid "The password contains too many same characters consecutively"
 msgstr "conté massa caràcters idèntics consecutius"
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "No s'ha proporcionat cap contrasenya"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "és un palíndrom"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "Error desconegut"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
+msgstr ""
+
+#: src/error.c:113
+msgid "Bad integer value"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:120
+msgid "Setting is not of integer type"
+msgstr ""
+
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "Error desconegut"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "Error de conversa"
+#~ msgid "memory allocation error"
+#~ msgstr "Error de conversa"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "és la mateixa que l'antiga"
+
+#~ msgid "is a palindrome"
+#~ msgstr "és un palíndrom"
+
+#~ msgid "case changes only"
+#~ msgstr "només canvien les majúscules i minúscules"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "és massa semblant a l'antiga"
+
+#~ msgid "is too simple"
+#~ msgstr "és massa senzilla"
+
+#~ msgid "is rotated"
+#~ msgstr "està girada"
+
+#~ msgid "not enough character classes"
+#~ msgstr "no hi ha suficients classes de caràcters"
+
+#~ msgid "contains too many same characters consecutively"
+#~ msgstr "conté massa caràcters idèntics consecutius"
+
+#~ msgid "Error in service module"
+#~ msgstr "Error en el mòdul de servei"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "Error de conversa"
diff --git a/po/cs.po b/po/cs.po
index 30341d2..8605bcd 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Linux-PAM\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2009-03-24 15:22+0100\n"
 "Last-Translator: Tomas Mraz <t8m@centrum.cz>\n"
 "Language-Team: cs_CZ <cs@li.org>\n"
@@ -32,150 +32,230 @@ msgstr "Opakujte nové %s%sheslo: "
 msgid "Sorry, passwords do not match."
 msgstr "Hesla se neshodují."
 
-#: src/pam_pwquality.c:104
-msgid "memory allocation error"
-msgstr "chyba alokace paměti"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "je stejné jako předcházející"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "je palindrom"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "pouze mění velikost"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "je příliš podobné předcházejícímu"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "je příliš jednoduché"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "je posunuté"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr "nemá dostatek různých druhů znaků"
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr "obsahuje příliš mnoho stejných znaků za sebou"
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "Nezadáno heslo"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "Chyba v modulu služby"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "ŠPATNÉ HESLO: %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr "Použití: %s\n"
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr "        Příkaz čte hodnocené heslo ze standardního vstupu.\n"
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr "Chyba: %s\n"
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, fuzzy, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr "Chyba kontroly kvality hesla: %s\n"
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr "Použití: %s <počet-bitů-entropie>\n"
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "Chyba alokace paměti"
+
+#: src/error.c:35
 msgid "Memory allocation error"
 msgstr "Chyba alokace paměti"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 msgid "The password is the same as the old one"
 msgstr "Heslo je stejné jako předcházející"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 msgid "The password is a palindrome"
 msgstr "Heslo je palindrom"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr "Heslo se odlišuje pouze změnou velikosti písmen"
 
-#: src/pwscore.c:39
+#: src/error.c:43
 msgid "The password is too similar to the old one"
 msgstr "Heslo je příliš podobné předcházejícímu"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "Heslo obsahuje příliš málo číslic"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr "Heslo obsahuje příliš málo číslic"
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, fuzzy, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr "Heslo obsahuje příliš málo velkých písmen"
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr "Heslo obsahuje příliš málo velkých písmen"
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "Heslo obsahuje příliš málo malých písmen"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr "Heslo obsahuje příliš málo malých písmen"
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, fuzzy, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr "Heslo obsahuje příliš málo jiných znaků než číslic a písmen"
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr "Heslo obsahuje příliš málo jiných znaků než číslic a písmen"
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "Heslo nemá dostatek různých druhů znaků"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr "Heslo je příliš krátké"
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr "Heslo je pouze rotací starého hesla"
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, fuzzy, c-format
+msgid "The password contains less than %ld character classes"
+msgstr "Heslo nemá dostatek různých druhů znaků"
+
+#: src/error.c:81
 msgid "The password does not contain enough character classes"
 msgstr "Heslo nemá dostatek různých druhů znaků"
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, fuzzy, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr "Heslo obsahuje příliš mnoho stejných znaků za sebou"
+
+#: src/error.c:87
 msgid "The password contains too many same characters consecutively"
 msgstr "Heslo obsahuje příliš mnoho stejných znaků za sebou"
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "Nezadáno heslo"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
+msgstr "Nebylo možno získat náhodná čísla z RNG zařízení"
+
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+"Generování hesla selhalo - požadovaná entropie je příliš malá vzhledem k "
+"nastavení"
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
 msgstr "Heslo neprošlo kontrolou slovníkem - %s"
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "Neznámá chyba"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
-msgstr "Chyba: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
+msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:113
+msgid "Bad integer value"
+msgstr ""
+
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
-msgstr "Chyba kontroly kvality hesla: %s\n"
+msgid "Setting %s is not of integer type"
+msgstr ""
+
+#: src/error.c:120
+msgid "Setting is not of integer type"
+msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
-msgstr "Použití: %s <počet-bitů-entropie>\n"
+msgid "Setting %s is not of string type"
+msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
-msgstr "Nebylo možno získat náhodná čísla z RNG zařízení"
+#: src/error.c:127
+msgid "Setting is not of string type"
+msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
-msgstr "Generování hesla selhalo - požadovaná entropie je příliš malá vzhledem k nastavení"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
+msgstr ""
+
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "Neznámá chyba"
+
+#~ msgid "memory allocation error"
+#~ msgstr "chyba alokace paměti"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "je stejné jako předcházející"
+
+#~ msgid "is a palindrome"
+#~ msgstr "je palindrom"
+
+#~ msgid "case changes only"
+#~ msgstr "pouze mění velikost"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "je příliš podobné předcházejícímu"
+
+#~ msgid "is too simple"
+#~ msgstr "je příliš jednoduché"
+
+#~ msgid "is rotated"
+#~ msgstr "je posunuté"
+
+#~ msgid "not enough character classes"
+#~ msgstr "nemá dostatek různých druhů znaků"
+
+#~ msgid "contains too many same characters consecutively"
+#~ msgstr "obsahuje příliš mnoho stejných znaků za sebou"
+
+#~ msgid "Error in service module"
+#~ msgstr "Chyba v modulu služby"
 
-#: src/pwmake.c:56
-msgid "Error: Memory allocation error"
-msgstr "Chyba: Alokace paměti selhala"
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "Chyba: Alokace paměti selhala"
diff --git a/po/da.po b/po/da.po
index 4f3450c..7a35c62 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2009-10-04 18:01+0200\n"
 "Last-Translator: Kris Thomsen <lakristho@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -32,158 +32,236 @@ msgstr "Genindtast ny %s%sadgangskode: "
 msgid "Sorry, passwords do not match."
 msgstr "Adgangskoderne stemmer ikke overens."
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "Konversationsfejl"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "er den samme som den gamle"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "det staves ens forfra og bagfra"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "kun forskel i store/små bogstaver"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "ligner for meget den gamle"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "er for simpel"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "er roteret"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr "ikke nok tegnklasser"
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr "indeholder for mange af de samme tegn"
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "Ingen adgangskode angivet"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "Der opstod en fejl i tjenestemodul"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "DÅRLIG ADGANGSKODE: %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "Konversationsfejl"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "Konversationsfejl"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "er den samme som den gamle"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "det staves ens forfra og bagfra"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "ligner for meget den gamle"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "er den samme som den gamle"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, fuzzy, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr "indeholder for mange af de samme tegn"
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "er den samme som den gamle"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, fuzzy, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr "indeholder for mange af de samme tegn"
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "ikke nok tegnklasser"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, fuzzy, c-format
+msgid "The password contains less than %ld character classes"
+msgstr "ikke nok tegnklasser"
+
+#: src/error.c:81
 #, fuzzy
 msgid "The password does not contain enough character classes"
 msgstr "ikke nok tegnklasser"
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, fuzzy, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr "indeholder for mange af de samme tegn"
+
+#: src/error.c:87
 #, fuzzy
 msgid "The password contains too many same characters consecutively"
 msgstr "indeholder for mange af de samme tegn"
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "Ingen adgangskode angivet"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "det staves ens forfra og bagfra"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "Ukendt fejl"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
+msgstr ""
+
+#: src/error.c:113
+msgid "Bad integer value"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:120
+msgid "Setting is not of integer type"
+msgstr ""
+
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "Ukendt fejl"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "Konversationsfejl"
+#~ msgid "memory allocation error"
+#~ msgstr "Konversationsfejl"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "er den samme som den gamle"
+
+#~ msgid "is a palindrome"
+#~ msgstr "det staves ens forfra og bagfra"
+
+#~ msgid "case changes only"
+#~ msgstr "kun forskel i store/små bogstaver"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "ligner for meget den gamle"
+
+#~ msgid "is too simple"
+#~ msgstr "er for simpel"
+
+#~ msgid "is rotated"
+#~ msgstr "er roteret"
+
+#~ msgid "not enough character classes"
+#~ msgstr "ikke nok tegnklasser"
+
+#~ msgid "contains too many same characters consecutively"
+#~ msgstr "indeholder for mange af de samme tegn"
+
+#~ msgid "Error in service module"
+#~ msgstr "Der opstod en fejl i tjenestemodul"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "Konversationsfejl"
diff --git a/po/de.po b/po/de.po
index c708fe5..243642d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Linux-PAM\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2011-06-21 13:27+02:00\n"
 "Last-Translator: Fabian Affolter <fab@fedoraproject.org>\n"
 "Language-Team: German <fedora-trans-de@redhat.com>\n"
@@ -33,157 +33,235 @@ msgstr "Geben Sie das neue %s%sPasswort erneut ein: "
 msgid "Sorry, passwords do not match."
 msgstr "Die Passwörter stimmen nicht überein."
 
-#: src/pam_pwquality.c:104
-msgid "memory allocation error"
-msgstr "Fehler beim Allozieren von Speicher"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "ist das gleiche wie das Alte"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "ist ein Palindrome"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "nur Änderungen bei der Gross-/Kleinschreibung"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "ist dem alten zu ähnlich"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "ist zu einfach"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "wurde gedreht"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr "nicht genug unterschiedliche Arten von Zeichen"
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr "das gleiche Zeichen wurde so oft hintereinander verwendet"
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "Kein Passwort angegeben"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "Fehler im Service-Modul"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "Schlechtes Passwort: %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "Fehler beim Allozieren von Speicher"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "Fehler beim Allozieren von Speicher"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "ist das gleiche wie das Alte"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "ist ein Palindrome"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "ist dem alten zu ähnlich"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "ist das gleiche wie das Alte"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, fuzzy, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr "das gleiche Zeichen wurde so oft hintereinander verwendet"
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "ist das gleiche wie das Alte"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, fuzzy, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr "das gleiche Zeichen wurde so oft hintereinander verwendet"
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "nicht genug unterschiedliche Arten von Zeichen"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, fuzzy, c-format
+msgid "The password contains less than %ld character classes"
+msgstr "nicht genug unterschiedliche Arten von Zeichen"
+
+#: src/error.c:81
 #, fuzzy
 msgid "The password does not contain enough character classes"
 msgstr "nicht genug unterschiedliche Arten von Zeichen"
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, fuzzy, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr "das gleiche Zeichen wurde so oft hintereinander verwendet"
+
+#: src/error.c:87
 #, fuzzy
 msgid "The password contains too many same characters consecutively"
 msgstr "das gleiche Zeichen wurde so oft hintereinander verwendet"
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "Kein Passwort angegeben"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "ist ein Palindrome"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "Unbekannter Fehler"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
+msgstr ""
+
+#: src/error.c:113
+msgid "Bad integer value"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:120
+msgid "Setting is not of integer type"
+msgstr ""
+
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "Unbekannter Fehler"
+
+#~ msgid "memory allocation error"
+#~ msgstr "Fehler beim Allozieren von Speicher"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "ist das gleiche wie das Alte"
+
+#~ msgid "is a palindrome"
+#~ msgstr "ist ein Palindrome"
+
+#~ msgid "case changes only"
+#~ msgstr "nur Änderungen bei der Gross-/Kleinschreibung"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "ist dem alten zu ähnlich"
+
+#~ msgid "is too simple"
+#~ msgstr "ist zu einfach"
+
+#~ msgid "is rotated"
+#~ msgstr "wurde gedreht"
+
+#~ msgid "not enough character classes"
+#~ msgstr "nicht genug unterschiedliche Arten von Zeichen"
+
+#~ msgid "contains too many same characters consecutively"
+#~ msgstr "das gleiche Zeichen wurde so oft hintereinander verwendet"
+
+#~ msgid "Error in service module"
+#~ msgstr "Fehler im Service-Modul"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "Fehler beim Allozieren von Speicher"
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "Fehler beim Allozieren von Speicher"
diff --git a/po/es.po b/po/es.po
index 5c74c1d..a8148b8 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Linux-PAM.tip.es\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2009-03-18 22:51-0300\n"
 "Last-Translator: Domingo Becker <domingobecker@gmail.com>\n"
 "Language-Team: Fedora Spanish <fedora-trans-es@redhat.com>\n"
@@ -36,158 +36,236 @@ msgstr "Vuelva a escribir la nueva %s%scontraseña: "
 msgid "Sorry, passwords do not match."
 msgstr "Las contraseñas no coinciden."
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "Error de conversación"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "es igual que la antigua"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "es un palíndromo"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "sólo hay cambios de minúsculas y mayúsculas"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "es demasiado similar a la antigua"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "es demasiado sencilla"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "es igual pero al revés"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr "no hay suficientes clases de caracteres"
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr "contiene demasiados carateres iguales consecutivos"
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "No se ha proporcionado ninguna contraseña"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "Error en el módulo de servicios"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "CONTRASEÑA INCORRECTA: %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "Error de conversación"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "Error de conversación"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "es igual que la antigua"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "es un palíndromo"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "es demasiado similar a la antigua"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "es igual que la antigua"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, fuzzy, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr "contiene demasiados carateres iguales consecutivos"
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "es igual que la antigua"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, fuzzy, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr "contiene demasiados carateres iguales consecutivos"
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "no hay suficientes clases de caracteres"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, fuzzy, c-format
+msgid "The password contains less than %ld character classes"
+msgstr "no hay suficientes clases de caracteres"
+
+#: src/error.c:81
 #, fuzzy
 msgid "The password does not contain enough character classes"
 msgstr "no hay suficientes clases de caracteres"
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, fuzzy, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr "contiene demasiados carateres iguales consecutivos"
+
+#: src/error.c:87
 #, fuzzy
 msgid "The password contains too many same characters consecutively"
 msgstr "contiene demasiados carateres iguales consecutivos"
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "No se ha proporcionado ninguna contraseña"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "es un palíndromo"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "Error desconocido"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
+msgstr ""
+
+#: src/error.c:113
+msgid "Bad integer value"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:120
+msgid "Setting is not of integer type"
+msgstr ""
+
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "Error desconocido"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "Error de conversación"
+#~ msgid "memory allocation error"
+#~ msgstr "Error de conversación"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "es igual que la antigua"
+
+#~ msgid "is a palindrome"
+#~ msgstr "es un palíndromo"
+
+#~ msgid "case changes only"
+#~ msgstr "sólo hay cambios de minúsculas y mayúsculas"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "es demasiado similar a la antigua"
+
+#~ msgid "is too simple"
+#~ msgstr "es demasiado sencilla"
+
+#~ msgid "is rotated"
+#~ msgstr "es igual pero al revés"
+
+#~ msgid "not enough character classes"
+#~ msgstr "no hay suficientes clases de caracteres"
+
+#~ msgid "contains too many same characters consecutively"
+#~ msgstr "contiene demasiados carateres iguales consecutivos"
+
+#~ msgid "Error in service module"
+#~ msgstr "Error en el módulo de servicios"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "Error de conversación"
diff --git a/po/fi.po b/po/fi.po
index a98014f..5edc72a 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Linux-PAM\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2006-05-04 08:30+0200\n"
 "Last-Translator: Jyri Palokangas <jmp@netti.fi>\n"
 "Language-Team:  <yast-trans-fi@kotoistaminen.novell.fi>\n"
@@ -34,156 +34,228 @@ msgstr "Anna uudelleen uusi %s%ssalasana: "
 msgid "Sorry, passwords do not match."
 msgstr "Salasanat eivät täsmää."
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "Keskusteluvirhe"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "on sama kuin vanha"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "on palindromi"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "vain kirjainkoko muutos"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "on liian samankaltainen vanhan kanssa"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "on liian yksinkertainen"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "on kierrätetty"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr ""
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr ""
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "Et antanut salasanaa"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "Virhe palvelumoduulissa"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "HUONO SALASANA: %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "Keskusteluvirhe"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "Keskusteluvirhe"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "on sama kuin vanha"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "on palindromi"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "on liian samankaltainen vanhan kanssa"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "on sama kuin vanha"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr ""
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "on sama kuin vanha"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr ""
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "on liian samankaltainen vanhan kanssa"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, c-format
+msgid "The password contains less than %ld character classes"
+msgstr ""
+
+#: src/error.c:81
 msgid "The password does not contain enough character classes"
 msgstr ""
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr ""
+
+#: src/error.c:87
 msgid "The password contains too many same characters consecutively"
 msgstr ""
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "Et antanut salasanaa"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "on palindromi"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "Tuntematon virhe"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:113
+msgid "Bad integer value"
+msgstr ""
+
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
+msgstr ""
+
+#: src/error.c:120
+msgid "Setting is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:133
+msgid "Fatal failure"
+msgstr ""
+
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "Tuntematon virhe"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "Keskusteluvirhe"
+#~ msgid "memory allocation error"
+#~ msgstr "Keskusteluvirhe"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "on sama kuin vanha"
+
+#~ msgid "is a palindrome"
+#~ msgstr "on palindromi"
+
+#~ msgid "case changes only"
+#~ msgstr "vain kirjainkoko muutos"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "on liian samankaltainen vanhan kanssa"
+
+#~ msgid "is too simple"
+#~ msgstr "on liian yksinkertainen"
+
+#~ msgid "is rotated"
+#~ msgstr "on kierrätetty"
+
+#~ msgid "Error in service module"
+#~ msgstr "Virhe palvelumoduulissa"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "Keskusteluvirhe"
diff --git a/po/fr.po b/po/fr.po
index a77c35c..7a0351a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam.fr2\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2009-04-15 23:00+0200\n"
 "Last-Translator: Charles-Antoine Couret <cacouret@wanadoo.fr>\n"
 "Language-Team: French <fedora-trans-fr@redhat.com>\n"
@@ -35,158 +35,236 @@ msgstr "Retapez le nouveau %s%smot de passe : "
 msgid "Sorry, passwords do not match."
 msgstr "Les mots de passe ne correspondent pas."
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "Erreur de conversation"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "est identique à l'ancien"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "est un palindrome"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "changement de casse uniquement"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "ressemble trop à l'ancien"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "est trop simple"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "est inversé"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr "les caractères utilisés ne sont pas suffisamment variés"
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr "contient trop de caractères consécutifs identiques"
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "Aucun mot de passe fourni"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "Erreur dans le module de service"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "MOT DE PASSE INCORRECT : %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "Erreur de conversation"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "Erreur de conversation"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "est identique à l'ancien"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "est un palindrome"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "ressemble trop à l'ancien"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "est identique à l'ancien"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, fuzzy, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr "contient trop de caractères consécutifs identiques"
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "est identique à l'ancien"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, fuzzy, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr "contient trop de caractères consécutifs identiques"
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "les caractères utilisés ne sont pas suffisamment variés"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, fuzzy, c-format
+msgid "The password contains less than %ld character classes"
+msgstr "les caractères utilisés ne sont pas suffisamment variés"
+
+#: src/error.c:81
 #, fuzzy
 msgid "The password does not contain enough character classes"
 msgstr "les caractères utilisés ne sont pas suffisamment variés"
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, fuzzy, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr "contient trop de caractères consécutifs identiques"
+
+#: src/error.c:87
 #, fuzzy
 msgid "The password contains too many same characters consecutively"
 msgstr "contient trop de caractères consécutifs identiques"
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "Aucun mot de passe fourni"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "est un palindrome"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "Erreur inconnue"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
+msgstr ""
+
+#: src/error.c:113
+msgid "Bad integer value"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:120
+msgid "Setting is not of integer type"
+msgstr ""
+
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "Erreur inconnue"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "Erreur de conversation"
+#~ msgid "memory allocation error"
+#~ msgstr "Erreur de conversation"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "est identique à l'ancien"
+
+#~ msgid "is a palindrome"
+#~ msgstr "est un palindrome"
+
+#~ msgid "case changes only"
+#~ msgstr "changement de casse uniquement"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "ressemble trop à l'ancien"
+
+#~ msgid "is too simple"
+#~ msgstr "est trop simple"
+
+#~ msgid "is rotated"
+#~ msgstr "est inversé"
+
+#~ msgid "not enough character classes"
+#~ msgstr "les caractères utilisés ne sont pas suffisamment variés"
+
+#~ msgid "contains too many same characters consecutively"
+#~ msgstr "contient trop de caractères consécutifs identiques"
+
+#~ msgid "Error in service module"
+#~ msgstr "Erreur dans le module de service"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "Erreur de conversation"
diff --git a/po/gu.po b/po/gu.po
index 22f38b3..2336c7d 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam.default.gu\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2010-08-02 18:15+0530\n"
 "Last-Translator: Sweta Kothari <swkothar@redhat.com>\n"
 "Language-Team: Gujarati\n"
@@ -35,158 +35,236 @@ msgstr "નવો %s%sપાસવર્ડ ફરી લખો: "
 msgid "Sorry, passwords do not match."
 msgstr "માફ કરજો, પાસવર્ડો બંધબેસતા નથી."
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "વાર્તાલાપ ભૂલ"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "એ જૂના જેવો જ છે"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "એ પેલીન્ડ્રોમ છે"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "કેસ ફેરફાર માત્ર"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "એ જૂના સાથે એકદમ સરખો છે"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "એ ખૂબ સાદો છે"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "એ ફેરવાયેલ છે"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr "પૂરતા અક્ષર વર્ગો નથી"
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr "એકપછી એક ઘણા બધા સરખા અક્ષરોને સમાવે છે"
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "કોઈ પાસવર્ડ પૂરો પડાયેલ નથી"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "સેવા મોડ્યુલમાં ભૂલ"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "ખરાબ પાસવર્ડ: %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "વાર્તાલાપ ભૂલ"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "વાર્તાલાપ ભૂલ"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "એ જૂના જેવો જ છે"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "એ પેલીન્ડ્રોમ છે"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "એ જૂના સાથે એકદમ સરખો છે"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "એ જૂના જેવો જ છે"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, fuzzy, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr "એકપછી એક ઘણા બધા સરખા અક્ષરોને સમાવે છે"
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "એ જૂના જેવો જ છે"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, fuzzy, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr "એકપછી એક ઘણા બધા સરખા અક્ષરોને સમાવે છે"
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "પૂરતા અક્ષર વર્ગો નથી"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, fuzzy, c-format
+msgid "The password contains less than %ld character classes"
+msgstr "પૂરતા અક્ષર વર્ગો નથી"
+
+#: src/error.c:81
 #, fuzzy
 msgid "The password does not contain enough character classes"
 msgstr "પૂરતા અક્ષર વર્ગો નથી"
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, fuzzy, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr "એકપછી એક ઘણા બધા સરખા અક્ષરોને સમાવે છે"
+
+#: src/error.c:87
 #, fuzzy
 msgid "The password contains too many same characters consecutively"
 msgstr "એકપછી એક ઘણા બધા સરખા અક્ષરોને સમાવે છે"
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "કોઈ પાસવર્ડ પૂરો પડાયેલ નથી"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "એ પેલીન્ડ્રોમ છે"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "અજ્ઞાત ભૂલ"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
+msgstr ""
+
+#: src/error.c:113
+msgid "Bad integer value"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:120
+msgid "Setting is not of integer type"
+msgstr ""
+
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "અજ્ઞાત ભૂલ"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "વાર્તાલાપ ભૂલ"
+#~ msgid "memory allocation error"
+#~ msgstr "વાર્તાલાપ ભૂલ"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "એ જૂના જેવો જ છે"
+
+#~ msgid "is a palindrome"
+#~ msgstr "એ પેલીન્ડ્રોમ છે"
+
+#~ msgid "case changes only"
+#~ msgstr "કેસ ફેરફાર માત્ર"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "એ જૂના સાથે એકદમ સરખો છે"
+
+#~ msgid "is too simple"
+#~ msgstr "એ ખૂબ સાદો છે"
+
+#~ msgid "is rotated"
+#~ msgstr "એ ફેરવાયેલ છે"
+
+#~ msgid "not enough character classes"
+#~ msgstr "પૂરતા અક્ષર વર્ગો નથી"
+
+#~ msgid "contains too many same characters consecutively"
+#~ msgstr "એકપછી એક ઘણા બધા સરખા અક્ષરોને સમાવે છે"
+
+#~ msgid "Error in service module"
+#~ msgstr "સેવા મોડ્યુલમાં ભૂલ"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "વાર્તાલાપ ભૂલ"
diff --git a/po/he.po b/po/he.po
index 3cfab0e..cc2d08f 100644
--- a/po/he.po
+++ b/po/he.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PAM\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Elad <el.il@doom.co.il>\n"
 "Language-Team: Hebrew <fedora-he-list@redhat.com>\n"
@@ -28,156 +28,219 @@ msgstr ""
 msgid "Sorry, passwords do not match."
 msgstr "סליחה, הססמאות לא תואמות."
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "שגיאת אימות"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "זהה לישנה"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "פילנדרום"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr ""
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "יותר מדי דומה לישנה"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "פשוטה מדי."
+#: src/pam_pwquality.c:168
+#, c-format
+msgid "BAD PASSWORD: %s"
+msgstr "ססמה לא טובה: %s"
 
-#: src/pam_pwquality.c:120
-msgid "is rotated"
+#: src/pwscore.c:21
+#, c-format
+msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
+#: src/pwscore.c:22
+#, c-format
+msgid ""
+"       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
 msgstr ""
 
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "לא סופקה ססמה"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
 msgstr ""
 
-#: src/pam_pwquality.c:198
-#, c-format
-msgid "BAD PASSWORD: %s"
-msgstr "ססמה לא טובה: %s"
-
-#: src/pwscore.c:20
+#: src/pwscore.c:65
 #, c-format
-msgid "Usage: %s\n"
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwmake.c:21
 #, c-format
-msgid ""
-"       The command reads the password to be scored from the standard input.\n"
+msgid "Usage: %s <entropy-bits>\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "שגיאת אימות"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "שגיאת אימות"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "זהה לישנה"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "פילנדרום"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "יותר מדי דומה לישנה"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "זהה לישנה"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr ""
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "זהה לישנה"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr ""
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "יותר מדי דומה לישנה"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, c-format
+msgid "The password contains less than %ld character classes"
+msgstr ""
+
+#: src/error.c:81
 msgid "The password does not contain enough character classes"
 msgstr ""
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr ""
+
+#: src/error.c:87
 msgid "The password contains too many same characters consecutively"
 msgstr ""
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "לא סופקה ססמה"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "פילנדרום"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "שגיאה לא מוכרת"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
+msgstr ""
+
+#: src/error.c:113
+msgid "Bad integer value"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
+msgstr ""
+
+#: src/error.c:120
+msgid "Setting is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
+msgstr ""
+
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "שגיאה לא מוכרת"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "שגיאת אימות"
+#~ msgid "memory allocation error"
+#~ msgstr "שגיאת אימות"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "זהה לישנה"
+
+#~ msgid "is a palindrome"
+#~ msgstr "פילנדרום"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "יותר מדי דומה לישנה"
+
+#~ msgid "is too simple"
+#~ msgstr "פשוטה מדי."
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "שגיאת אימות"
diff --git a/po/hi.po b/po/hi.po
index 3de55c7..a339e7b 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam.tip\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2009-06-08 12:22+0530\n"
 "Last-Translator: Rajesh Ranjan <rajesh672@gmail.com>\n"
 "Language-Team: Hindi <hindi.sf.net>\n"
@@ -36,158 +36,236 @@ msgstr "नया %s%spassword फिर टाइप करें: "
 msgid "Sorry, passwords do not match."
 msgstr "क्षमा करें, शब्दकूट नहीं मिलते हैं."
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "रूपांतरक त्रुटि"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "पुराने की तरह समान है"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "एक पालिनड्रोम है"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "स्थिति परिवर्तन सिर्फ"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "पुराने के बहुत समान है"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "बहुत सरल है"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "घुमाया गया है"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr "पर्याप्त वर्ण वर्ग नहीं"
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr "कई समान वर्ण लगातार  समाहित करता है"
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "कोई कूटशब्द नहीं दिया गया है"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "सेवा मॉड्यूल में त्रुटि"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "खराब शब्दकूट: %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "रूपांतरक त्रुटि"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "रूपांतरक त्रुटि"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "पुराने की तरह समान है"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "एक पालिनड्रोम है"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "पुराने के बहुत समान है"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "पुराने की तरह समान है"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, fuzzy, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr "कई समान वर्ण लगातार  समाहित करता है"
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "पुराने की तरह समान है"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, fuzzy, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr "कई समान वर्ण लगातार  समाहित करता है"
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "पर्याप्त वर्ण वर्ग नहीं"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, fuzzy, c-format
+msgid "The password contains less than %ld character classes"
+msgstr "पर्याप्त वर्ण वर्ग नहीं"
+
+#: src/error.c:81
 #, fuzzy
 msgid "The password does not contain enough character classes"
 msgstr "पर्याप्त वर्ण वर्ग नहीं"
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, fuzzy, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr "कई समान वर्ण लगातार  समाहित करता है"
+
+#: src/error.c:87
 #, fuzzy
 msgid "The password contains too many same characters consecutively"
 msgstr "कई समान वर्ण लगातार  समाहित करता है"
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "कोई कूटशब्द नहीं दिया गया है"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "एक पालिनड्रोम है"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "अनजान त्रुटि"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
+msgstr ""
+
+#: src/error.c:113
+msgid "Bad integer value"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:120
+msgid "Setting is not of integer type"
+msgstr ""
+
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "अनजान त्रुटि"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "रूपांतरक त्रुटि"
+#~ msgid "memory allocation error"
+#~ msgstr "रूपांतरक त्रुटि"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "पुराने की तरह समान है"
+
+#~ msgid "is a palindrome"
+#~ msgstr "एक पालिनड्रोम है"
+
+#~ msgid "case changes only"
+#~ msgstr "स्थिति परिवर्तन सिर्फ"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "पुराने के बहुत समान है"
+
+#~ msgid "is too simple"
+#~ msgstr "बहुत सरल है"
+
+#~ msgid "is rotated"
+#~ msgstr "घुमाया गया है"
+
+#~ msgid "not enough character classes"
+#~ msgstr "पर्याप्त वर्ण वर्ग नहीं"
+
+#~ msgid "contains too many same characters consecutively"
+#~ msgstr "कई समान वर्ण लगातार  समाहित करता है"
+
+#~ msgid "Error in service module"
+#~ msgstr "सेवा मॉड्यूल में त्रुटि"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "रूपांतरक त्रुटि"
diff --git a/po/hu.po b/po/hu.po
index aad8d69..e4080b9 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2009-03-20 20:53+0100\n"
 "Last-Translator: Sulyok Péter <peti@sulyok.hu>\n"
 "Language-Team: Hungarian <fedora-trans-hu@redhat.com>\n"
@@ -36,158 +36,236 @@ msgstr "Ismét az új %s%sjelszó: "
 msgid "Sorry, passwords do not match."
 msgstr "Sajnálom, de a jelszavak nem egyeznek."
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "Beszélgetési hiba"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "ugyanaz, mint a régi"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "palindrom"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "csak a kis/nagybetűkben változott"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "túl hasonló a régihez"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "túl egyszerű"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "forgatva"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr "elégtelen betűosztály"
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr "túl sok egymást követő betű egyezik meg"
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "Nincs jelszó megadva"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "Hiba a szervizmodulban"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "ROSSZ JELSZÓ: %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "Beszélgetési hiba"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "Beszélgetési hiba"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "ugyanaz, mint a régi"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "palindrom"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "túl hasonló a régihez"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "ugyanaz, mint a régi"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, fuzzy, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr "túl sok egymást követő betű egyezik meg"
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "ugyanaz, mint a régi"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, fuzzy, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr "túl sok egymást követő betű egyezik meg"
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "elégtelen betűosztály"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, fuzzy, c-format
+msgid "The password contains less than %ld character classes"
+msgstr "elégtelen betűosztály"
+
+#: src/error.c:81
 #, fuzzy
 msgid "The password does not contain enough character classes"
 msgstr "elégtelen betűosztály"
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, fuzzy, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr "túl sok egymást követő betű egyezik meg"
+
+#: src/error.c:87
 #, fuzzy
 msgid "The password contains too many same characters consecutively"
 msgstr "túl sok egymást követő betű egyezik meg"
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "Nincs jelszó megadva"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "palindrom"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "Ismeretlen hiba"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
+msgstr ""
+
+#: src/error.c:113
+msgid "Bad integer value"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:120
+msgid "Setting is not of integer type"
+msgstr ""
+
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "Ismeretlen hiba"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "Beszélgetési hiba"
+#~ msgid "memory allocation error"
+#~ msgstr "Beszélgetési hiba"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "ugyanaz, mint a régi"
+
+#~ msgid "is a palindrome"
+#~ msgstr "palindrom"
+
+#~ msgid "case changes only"
+#~ msgstr "csak a kis/nagybetűkben változott"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "túl hasonló a régihez"
+
+#~ msgid "is too simple"
+#~ msgstr "túl egyszerű"
+
+#~ msgid "is rotated"
+#~ msgstr "forgatva"
+
+#~ msgid "not enough character classes"
+#~ msgstr "elégtelen betűosztály"
+
+#~ msgid "contains too many same characters consecutively"
+#~ msgstr "túl sok egymást követő betű egyezik meg"
+
+#~ msgid "Error in service module"
+#~ msgstr "Hiba a szervizmodulban"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "Beszélgetési hiba"
diff --git a/po/it.po b/po/it.po
index 9dbcb75..d1a3b68 100644
--- a/po/it.po
+++ b/po/it.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Linux-PAM.tip\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2009-04-20 18:31+0200\n"
 "Last-Translator: mario_santagiuliana <mario at marionline.it>\n"
 "Language-Team: Italian <fedora-trans-it at redhat.com>\n"
@@ -35,158 +35,236 @@ msgstr "Reimmettere la nuova password%s%s: "
 msgid "Sorry, passwords do not match."
 msgstr "Le password non corrispondono."
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "Errore di conversazione"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "è la stessa di quella precedente"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "è un palindromo"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "cambiano solo le maiuscole/minuscole"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "è troppo simile alla precedente"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "è troppo semplice"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "è una rotazione della precedente"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr "non ha abbastanza classi di caratteri"
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr "contiene troppi caratteri simili consecutivi"
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "Nessuna password fornita"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "Errore nel modulo di servizio"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "PASSWORD ERRATA: %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "Errore di conversazione"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "Errore di conversazione"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "è la stessa di quella precedente"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "è un palindromo"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "è troppo simile alla precedente"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "è la stessa di quella precedente"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, fuzzy, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr "contiene troppi caratteri simili consecutivi"
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "è la stessa di quella precedente"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, fuzzy, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr "contiene troppi caratteri simili consecutivi"
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "non ha abbastanza classi di caratteri"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, fuzzy, c-format
+msgid "The password contains less than %ld character classes"
+msgstr "non ha abbastanza classi di caratteri"
+
+#: src/error.c:81
 #, fuzzy
 msgid "The password does not contain enough character classes"
 msgstr "non ha abbastanza classi di caratteri"
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, fuzzy, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr "contiene troppi caratteri simili consecutivi"
+
+#: src/error.c:87
 #, fuzzy
 msgid "The password contains too many same characters consecutively"
 msgstr "contiene troppi caratteri simili consecutivi"
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "Nessuna password fornita"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "è un palindromo"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "Errore sconosciuto"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
+msgstr ""
+
+#: src/error.c:113
+msgid "Bad integer value"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:120
+msgid "Setting is not of integer type"
+msgstr ""
+
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "Errore sconosciuto"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "Errore di conversazione"
+#~ msgid "memory allocation error"
+#~ msgstr "Errore di conversazione"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "è la stessa di quella precedente"
+
+#~ msgid "is a palindrome"
+#~ msgstr "è un palindromo"
+
+#~ msgid "case changes only"
+#~ msgstr "cambiano solo le maiuscole/minuscole"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "è troppo simile alla precedente"
+
+#~ msgid "is too simple"
+#~ msgstr "è troppo semplice"
+
+#~ msgid "is rotated"
+#~ msgstr "è una rotazione della precedente"
+
+#~ msgid "not enough character classes"
+#~ msgstr "non ha abbastanza classi di caratteri"
+
+#~ msgid "contains too many same characters consecutively"
+#~ msgstr "contiene troppi caratteri simili consecutivi"
+
+#~ msgid "Error in service module"
+#~ msgstr "Errore nel modulo di servizio"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "Errore di conversazione"
diff --git a/po/ja.po b/po/ja.po
index b24bcac..eca4e54 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ja\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2009-08-30 11:39+0900\n"
 "Last-Translator: Kiyoto Hashida <khashida@redhat.com>\n"
 "Language-Team: Japanese <jp@li.org>\n"
@@ -33,158 +33,236 @@ msgstr "新しい%s%sパスワードを再入力してください:"
 msgid "Sorry, passwords do not match."
 msgstr "パスワードが一致しません。"
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "会話エラー"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "パスワードが古いものと同じです。"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "前後どちらから読んでも同じパスワードです。"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "大文字小文字を変えただけのパスワード"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "古いものと似ています"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "簡単すぎます"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "回転しています"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr "文字クラスが不十分です"
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr "連続的な同一文字が多く含まれ過ぎです"
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "パスワードが与えられていません"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "サービスモジュールのエラー"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "よくないパスワード: %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "会話エラー"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "会話エラー"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "パスワードが古いものと同じです。"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "前後どちらから読んでも同じパスワードです。"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "古いものと似ています"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "パスワードが古いものと同じです。"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, fuzzy, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr "連続的な同一文字が多く含まれ過ぎです"
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "パスワードが古いものと同じです。"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, fuzzy, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr "連続的な同一文字が多く含まれ過ぎです"
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "文字クラスが不十分です"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, fuzzy, c-format
+msgid "The password contains less than %ld character classes"
+msgstr "文字クラスが不十分です"
+
+#: src/error.c:81
 #, fuzzy
 msgid "The password does not contain enough character classes"
 msgstr "文字クラスが不十分です"
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, fuzzy, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr "連続的な同一文字が多く含まれ過ぎです"
+
+#: src/error.c:87
 #, fuzzy
 msgid "The password contains too many same characters consecutively"
 msgstr "連続的な同一文字が多く含まれ過ぎです"
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "パスワードが与えられていません"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "前後どちらから読んでも同じパスワードです。"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "不明なエラー"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
+msgstr ""
+
+#: src/error.c:113
+msgid "Bad integer value"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:120
+msgid "Setting is not of integer type"
+msgstr ""
+
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "不明なエラー"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "会話エラー"
+#~ msgid "memory allocation error"
+#~ msgstr "会話エラー"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "パスワードが古いものと同じです。"
+
+#~ msgid "is a palindrome"
+#~ msgstr "前後どちらから読んでも同じパスワードです。"
+
+#~ msgid "case changes only"
+#~ msgstr "大文字小文字を変えただけのパスワード"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "古いものと似ています"
+
+#~ msgid "is too simple"
+#~ msgstr "簡単すぎます"
+
+#~ msgid "is rotated"
+#~ msgstr "回転しています"
+
+#~ msgid "not enough character classes"
+#~ msgstr "文字クラスが不十分です"
+
+#~ msgid "contains too many same characters consecutively"
+#~ msgstr "連続的な同一文字が多く含まれ過ぎです"
+
+#~ msgid "Error in service module"
+#~ msgstr "サービスモジュールのエラー"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "会話エラー"
diff --git a/po/kk.po b/po/kk.po
index 74d71e2..7b6290f 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Linux-PAM 1.0.3\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2009-02-26 13:07+0600\n"
 "Last-Translator: Baurzhan M. <baurthefirst@gmail.com>\n"
 "Language-Team: Kazakh <kk_KZ@googlegroups.com>\n"
@@ -31,158 +31,236 @@ msgstr "%s%sүшін жаңа парольді қайта енгізіңіз: "
 msgid "Sorry, passwords do not match."
 msgstr "Кешіріңіз, парольдер өзара сәйкес емес."
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "Сұхбат қатесі"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "алдыңғысына сәйкес болып тұр"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "палиндром болып тұр"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "өзгерістер таңбалардың регистрінде ғана"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "ескі парольге өте ұқсас"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "өте оңай болып тұр"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "аударылған ескі пароль"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr "керек таңбалар кластары жоқ"
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr "құрамында бірдей таңбалардың тізбегі бар"
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "Пароль көрсетілмеді"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "Қызмет модулінде қате"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "ҚАТЕ ПАРОЛЬ: %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "Сұхбат қатесі"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "Сұхбат қатесі"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "алдыңғысына сәйкес болып тұр"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "палиндром болып тұр"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "ескі парольге өте ұқсас"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "алдыңғысына сәйкес болып тұр"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, fuzzy, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr "құрамында бірдей таңбалардың тізбегі бар"
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "алдыңғысына сәйкес болып тұр"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, fuzzy, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr "құрамында бірдей таңбалардың тізбегі бар"
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "керек таңбалар кластары жоқ"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, fuzzy, c-format
+msgid "The password contains less than %ld character classes"
+msgstr "керек таңбалар кластары жоқ"
+
+#: src/error.c:81
 #, fuzzy
 msgid "The password does not contain enough character classes"
 msgstr "керек таңбалар кластары жоқ"
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, fuzzy, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr "құрамында бірдей таңбалардың тізбегі бар"
+
+#: src/error.c:87
 #, fuzzy
 msgid "The password contains too many same characters consecutively"
 msgstr "құрамында бірдей таңбалардың тізбегі бар"
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "Пароль көрсетілмеді"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "палиндром болып тұр"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "Белгісіз қате"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
+msgstr ""
+
+#: src/error.c:113
+msgid "Bad integer value"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:120
+msgid "Setting is not of integer type"
+msgstr ""
+
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "Белгісіз қате"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "Сұхбат қатесі"
+#~ msgid "memory allocation error"
+#~ msgstr "Сұхбат қатесі"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "алдыңғысына сәйкес болып тұр"
+
+#~ msgid "is a palindrome"
+#~ msgstr "палиндром болып тұр"
+
+#~ msgid "case changes only"
+#~ msgstr "өзгерістер таңбалардың регистрінде ғана"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "ескі парольге өте ұқсас"
+
+#~ msgid "is too simple"
+#~ msgstr "өте оңай болып тұр"
+
+#~ msgid "is rotated"
+#~ msgstr "аударылған ескі пароль"
+
+#~ msgid "not enough character classes"
+#~ msgstr "керек таңбалар кластары жоқ"
+
+#~ msgid "contains too many same characters consecutively"
+#~ msgstr "құрамында бірдей таңбалардың тізбегі бар"
+
+#~ msgid "Error in service module"
+#~ msgstr "Қызмет модулінде қате"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "Сұхбат қатесі"
diff --git a/po/km.po b/po/km.po
index a488339..7d46447 100644
--- a/po/km.po
+++ b/po/km.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Linux-PAM\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2006-03-17 10:32+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <support@khmeros.info>\n"
@@ -32,156 +32,228 @@ msgstr "វាយ​ពាក្យ​សម្ងាត់ %s%s ថ្មី​
 msgid "Sorry, passwords do not match."
 msgstr "សូម​ទោស ពាក្យ​សម្ងាត់​មិន​ដូច​គ្នា​ឡើយ ។"
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "កំហុស​សន្ទនា"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "ដូច​គ្នា​នឹង​ពាក្យ​សម្ងាត់​ចាស់"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "ត្រឡប់​ចុះ​ឡើង"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "គ្រាន់​តែ​ផ្លាស់ប្ដូរ​លក្ខណៈ​អក្សរ​ប៉ុណ្ណោះ​"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "ស្រដៀង​គ្នា​ណាស់​នឹង​ពាក្យ​សម្ងាត់​ចាស់"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "សាមញ្ញ​ពេក"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "បាន​បង្វិល"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr ""
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr ""
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "មិន​បាន​ផ្ដល់​ពាក្យសម្ងាត់"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "កំហុស​នៅ​ក្នុង​ម៉ូឌុល​សេវា"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "ពាក្យ​សម្ងាត់​មិន​ល្អ ៖ %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "កំហុស​សន្ទនា"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "កំហុស​សន្ទនា"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "ដូច​គ្នា​នឹង​ពាក្យ​សម្ងាត់​ចាស់"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "ត្រឡប់​ចុះ​ឡើង"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "ស្រដៀង​គ្នា​ណាស់​នឹង​ពាក្យ​សម្ងាត់​ចាស់"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "ដូច​គ្នា​នឹង​ពាក្យ​សម្ងាត់​ចាស់"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr ""
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "ដូច​គ្នា​នឹង​ពាក្យ​សម្ងាត់​ចាស់"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr ""
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "ស្រដៀង​គ្នា​ណាស់​នឹង​ពាក្យ​សម្ងាត់​ចាស់"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, c-format
+msgid "The password contains less than %ld character classes"
+msgstr ""
+
+#: src/error.c:81
 msgid "The password does not contain enough character classes"
 msgstr ""
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr ""
+
+#: src/error.c:87
 msgid "The password contains too many same characters consecutively"
 msgstr ""
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "មិន​បាន​ផ្ដល់​ពាក្យសម្ងាត់"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "ត្រឡប់​ចុះ​ឡើង"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "មិន​ស្គាល់​កំហុស"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:113
+msgid "Bad integer value"
+msgstr ""
+
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
+msgstr ""
+
+#: src/error.c:120
+msgid "Setting is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:133
+msgid "Fatal failure"
+msgstr ""
+
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "មិន​ស្គាល់​កំហុស"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "កំហុស​សន្ទនា"
+#~ msgid "memory allocation error"
+#~ msgstr "កំហុស​សន្ទនា"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "ដូច​គ្នា​នឹង​ពាក្យ​សម្ងាត់​ចាស់"
+
+#~ msgid "is a palindrome"
+#~ msgstr "ត្រឡប់​ចុះ​ឡើង"
+
+#~ msgid "case changes only"
+#~ msgstr "គ្រាន់​តែ​ផ្លាស់ប្ដូរ​លក្ខណៈ​អក្សរ​ប៉ុណ្ណោះ​"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "ស្រដៀង​គ្នា​ណាស់​នឹង​ពាក្យ​សម្ងាត់​ចាស់"
+
+#~ msgid "is too simple"
+#~ msgstr "សាមញ្ញ​ពេក"
+
+#~ msgid "is rotated"
+#~ msgstr "បាន​បង្វិល"
+
+#~ msgid "Error in service module"
+#~ msgstr "កំហុស​នៅ​ក្នុង​ម៉ូឌុល​សេវា"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "កំហុស​សន្ទនា"
diff --git a/po/kn.po b/po/kn.po
index 0b0e4e8..e63da57 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam.tip.kn\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2009-04-03 12:24+0530\n"
 "Last-Translator: Shankar Prasad <svenkate@redhat.com>\n"
 "Language-Team: Kannada <en@li.org>\n"
@@ -32,158 +32,236 @@ msgstr "ಹೊಸ %s%sಗುಪ್ತಪದವನ್ನು ಪುನರ್ ಟ�
 msgid "Sorry, passwords do not match."
 msgstr "ಕ್ಷಮಿಸಿ, ಗುಪ್ತಪದಗಳು ತಾಳೆಯಾಗುತ್ತಿಲ್ಲ."
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "ಸಂವಾದಾತ್ಮಕ ದೋಷ"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "ಇದು ಹಳೆಯದರ ಹಾಗೆಯೇ ಇದೆ"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "ಇದು ಒಂದು ಸಮಾನ ಪೂರ್ವಾಪರವಾಗಿದೆ (palindrome)"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "ಕೇವಲ ಕೇಸ್ ಗಳ ಬದಲಾವಣೆಯಾಗಿದೆ ಅಷ್ಟೆ"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "ಇದು ಹಳೆಯದಕ್ಕೆ ಬಹಳಷ್ಟು ಹೋಲುತ್ತದೆ"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "ಇದು ಬಹಳ ಸರಳವಾಗಿದೆ"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "ಇದು ತಿರುಗಿಸಲಾಗಿದೆ"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr "ಸಾಕಷ್ಟು ಕ್ಯಾರೆಕ್ಟರ್ ವರ್ಗಗಳು ಇಲ್ಲ"
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr "ಇದು ಒಂದೇ ಬಗೆಯ ಬಹಳಷ್ಟು ಕ್ಯಾರೆಕ್ಟರುಗಳನ್ನು ಅನುಕ್ರಮವಾಗಿ ಹೊಂದಿದೆ"
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "ಯಾವುದೇ ಗುಪ್ತಪದ ನೀಡಲಾಗಿಲ್ಲ"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "ಸೇವಾ ಮಾಡ್ಯೂಲಿನಲ್ಲಿ ದೋಷ"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "ಕೆಟ್ಟ ಗುಪ್ತಪದ: %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "ಸಂವಾದಾತ್ಮಕ ದೋಷ"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "ಸಂವಾದಾತ್ಮಕ ದೋಷ"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "ಇದು ಹಳೆಯದರ ಹಾಗೆಯೇ ಇದೆ"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "ಇದು ಒಂದು ಸಮಾನ ಪೂರ್ವಾಪರವಾಗಿದೆ (palindrome)"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "ಇದು ಹಳೆಯದಕ್ಕೆ ಬಹಳಷ್ಟು ಹೋಲುತ್ತದೆ"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "ಇದು ಹಳೆಯದರ ಹಾಗೆಯೇ ಇದೆ"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, fuzzy, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr "ಇದು ಒಂದೇ ಬಗೆಯ ಬಹಳಷ್ಟು ಕ್ಯಾರೆಕ್ಟರುಗಳನ್ನು ಅನುಕ್ರಮವಾಗಿ ಹೊಂದಿದೆ"
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "ಇದು ಹಳೆಯದರ ಹಾಗೆಯೇ ಇದೆ"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, fuzzy, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr "ಇದು ಒಂದೇ ಬಗೆಯ ಬಹಳಷ್ಟು ಕ್ಯಾರೆಕ್ಟರುಗಳನ್ನು ಅನುಕ್ರಮವಾಗಿ ಹೊಂದಿದೆ"
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "ಸಾಕಷ್ಟು ಕ್ಯಾರೆಕ್ಟರ್ ವರ್ಗಗಳು ಇಲ್ಲ"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, fuzzy, c-format
+msgid "The password contains less than %ld character classes"
+msgstr "ಸಾಕಷ್ಟು ಕ್ಯಾರೆಕ್ಟರ್ ವರ್ಗಗಳು ಇಲ್ಲ"
+
+#: src/error.c:81
 #, fuzzy
 msgid "The password does not contain enough character classes"
 msgstr "ಸಾಕಷ್ಟು ಕ್ಯಾರೆಕ್ಟರ್ ವರ್ಗಗಳು ಇಲ್ಲ"
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, fuzzy, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr "ಇದು ಒಂದೇ ಬಗೆಯ ಬಹಳಷ್ಟು ಕ್ಯಾರೆಕ್ಟರುಗಳನ್ನು ಅನುಕ್ರಮವಾಗಿ ಹೊಂದಿದೆ"
+
+#: src/error.c:87
 #, fuzzy
 msgid "The password contains too many same characters consecutively"
 msgstr "ಇದು ಒಂದೇ ಬಗೆಯ ಬಹಳಷ್ಟು ಕ್ಯಾರೆಕ್ಟರುಗಳನ್ನು ಅನುಕ್ರಮವಾಗಿ ಹೊಂದಿದೆ"
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "ಯಾವುದೇ ಗುಪ್ತಪದ ನೀಡಲಾಗಿಲ್ಲ"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "ಇದು ಒಂದು ಸಮಾನ ಪೂರ್ವಾಪರವಾಗಿದೆ (palindrome)"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "ಗೊತ್ತಿರದ ದೋಷ"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
+msgstr ""
+
+#: src/error.c:113
+msgid "Bad integer value"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:120
+msgid "Setting is not of integer type"
+msgstr ""
+
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "ಗೊತ್ತಿರದ ದೋಷ"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "ಸಂವಾದಾತ್ಮಕ ದೋಷ"
+#~ msgid "memory allocation error"
+#~ msgstr "ಸಂವಾದಾತ್ಮಕ ದೋಷ"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "ಇದು ಹಳೆಯದರ ಹಾಗೆಯೇ ಇದೆ"
+
+#~ msgid "is a palindrome"
+#~ msgstr "ಇದು ಒಂದು ಸಮಾನ ಪೂರ್ವಾಪರವಾಗಿದೆ (palindrome)"
+
+#~ msgid "case changes only"
+#~ msgstr "ಕೇವಲ ಕೇಸ್ ಗಳ ಬದಲಾವಣೆಯಾಗಿದೆ ಅಷ್ಟೆ"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "ಇದು ಹಳೆಯದಕ್ಕೆ ಬಹಳಷ್ಟು ಹೋಲುತ್ತದೆ"
+
+#~ msgid "is too simple"
+#~ msgstr "ಇದು ಬಹಳ ಸರಳವಾಗಿದೆ"
+
+#~ msgid "is rotated"
+#~ msgstr "ಇದು ತಿರುಗಿಸಲಾಗಿದೆ"
+
+#~ msgid "not enough character classes"
+#~ msgstr "ಸಾಕಷ್ಟು ಕ್ಯಾರೆಕ್ಟರ್ ವರ್ಗಗಳು ಇಲ್ಲ"
+
+#~ msgid "contains too many same characters consecutively"
+#~ msgstr "ಇದು ಒಂದೇ ಬಗೆಯ ಬಹಳಷ್ಟು ಕ್ಯಾರೆಕ್ಟರುಗಳನ್ನು ಅನುಕ್ರಮವಾಗಿ ಹೊಂದಿದೆ"
+
+#~ msgid "Error in service module"
+#~ msgstr "ಸೇವಾ ಮಾಡ್ಯೂಲಿನಲ್ಲಿ ದೋಷ"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "ಸಂವಾದಾತ್ಮಕ ದೋಷ"
diff --git a/po/ko.po b/po/ko.po
index c3b4fda..c8240d8 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam.tip\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2009-09-04 16:29+1000\n"
 "Last-Translator: Eunju Kim <eukim@redhat.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
@@ -32,158 +32,236 @@ msgstr "새 %s%s 암호 재입력:"
 msgid "Sorry, passwords do not match."
 msgstr "죄송합니다. 암호가 일치하지 않습니다."
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "인증 대화 오류"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "이전 암호와 같음"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "앞뒤 어느쪽에서 읽어도 같은 문맥임"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "대소문자만 변경"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "이전 암호와 유사함"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "너무 간단함"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "교체됨"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr "문자 클래스가 부족합니다  "
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr "너무 많은 동일한 문자가 연속적으로 포함되어있습니다   "
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "암호가 없음"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "서비스 모듈에서 오류 발생"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "잘못된 암호: %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "인증 대화 오류"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "인증 대화 오류"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "이전 암호와 같음"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "앞뒤 어느쪽에서 읽어도 같은 문맥임"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "이전 암호와 유사함"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "이전 암호와 같음"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, fuzzy, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr "너무 많은 동일한 문자가 연속적으로 포함되어있습니다   "
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "이전 암호와 같음"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, fuzzy, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr "너무 많은 동일한 문자가 연속적으로 포함되어있습니다   "
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "문자 클래스가 부족합니다  "
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, fuzzy, c-format
+msgid "The password contains less than %ld character classes"
+msgstr "문자 클래스가 부족합니다  "
+
+#: src/error.c:81
 #, fuzzy
 msgid "The password does not contain enough character classes"
 msgstr "문자 클래스가 부족합니다  "
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, fuzzy, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr "너무 많은 동일한 문자가 연속적으로 포함되어있습니다   "
+
+#: src/error.c:87
 #, fuzzy
 msgid "The password contains too many same characters consecutively"
 msgstr "너무 많은 동일한 문자가 연속적으로 포함되어있습니다   "
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "암호가 없음"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "앞뒤 어느쪽에서 읽어도 같은 문맥임"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "알 수 없는 오류"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
+msgstr ""
+
+#: src/error.c:113
+msgid "Bad integer value"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:120
+msgid "Setting is not of integer type"
+msgstr ""
+
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "알 수 없는 오류"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "인증 대화 오류"
+#~ msgid "memory allocation error"
+#~ msgstr "인증 대화 오류"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "이전 암호와 같음"
+
+#~ msgid "is a palindrome"
+#~ msgstr "앞뒤 어느쪽에서 읽어도 같은 문맥임"
+
+#~ msgid "case changes only"
+#~ msgstr "대소문자만 변경"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "이전 암호와 유사함"
+
+#~ msgid "is too simple"
+#~ msgstr "너무 간단함"
+
+#~ msgid "is rotated"
+#~ msgstr "교체됨"
+
+#~ msgid "not enough character classes"
+#~ msgstr "문자 클래스가 부족합니다  "
+
+#~ msgid "contains too many same characters consecutively"
+#~ msgstr "너무 많은 동일한 문자가 연속적으로 포함되어있습니다   "
+
+#~ msgid "Error in service module"
+#~ msgstr "서비스 모듈에서 오류 발생"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "인증 대화 오류"
diff --git a/po/libpwquality.pot b/po/libpwquality.pot
index 7c11150..2958ba1 100644
--- a/po/libpwquality.pot
+++ b/po/libpwquality.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libpwquality 0.9\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\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"
@@ -31,150 +31,192 @@ msgstr ""
 msgid "Sorry, passwords do not match."
 msgstr ""
 
-#: src/pam_pwquality.c:104
-msgid "memory allocation error"
-msgstr ""
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr ""
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr ""
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr ""
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr ""
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr ""
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
+#: src/pam_pwquality.c:168
+#, c-format
+msgid "BAD PASSWORD: %s"
 msgstr ""
 
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
+#: src/pwscore.c:21
+#, c-format
+msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
+#: src/pwscore.c:22
+#, c-format
+msgid ""
+"       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
 msgstr ""
 
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
 msgstr ""
 
-#: src/pam_pwquality.c:198
+#: src/pwscore.c:65
 #, c-format
-msgid "BAD PASSWORD: %s"
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
 msgstr ""
 
-#: src/pwscore.c:20
+#: src/pwmake.c:21
 #, c-format
-msgid "Usage: %s\n"
+msgid "Usage: %s <entropy-bits>\n"
 msgstr ""
 
-#: src/pwscore.c:21
-#, c-format
-msgid ""
-"       The command reads the password to be scored from the standard input.\n"
+#: src/error.c:31
+msgid "Memory allocation error when setting"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/error.c:35
 msgid "Memory allocation error"
 msgstr ""
 
-#: src/pwscore.c:33
+#: src/error.c:37
 msgid "The password is the same as the old one"
 msgstr ""
 
-#: src/pwscore.c:35
+#: src/error.c:39
 msgid "The password is a palindrome"
 msgstr ""
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 msgid "The password is too similar to the old one"
 msgstr ""
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, c-format
+msgid "The password contains less than %ld digits"
+msgstr ""
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr ""
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr ""
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr ""
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, c-format
+msgid "The password is shorter than %ld characters"
+msgstr ""
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, c-format
+msgid "The password contains less than %ld character classes"
+msgstr ""
+
+#: src/error.c:81
 msgid "The password does not contain enough character classes"
 msgstr ""
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr ""
+
+#: src/error.c:87
 msgid "The password contains too many same characters consecutively"
 msgstr ""
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+msgid "The password fails the dictionary check"
+msgstr ""
+
+#: src/error.c:102 src/error.c:106
+msgid "Unknown setting"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:109
+msgid "Bad integer value of setting"
+msgstr ""
+
+#: src/error.c:113
+msgid "Bad integer value"
+msgstr ""
+
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:120
+msgid "Setting is not of integer type"
+msgstr ""
+
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
 msgstr ""
 
-#: src/pwmake.c:56
-msgid "Error: Memory allocation error"
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
+msgstr ""
+
+#: src/error.c:135
+msgid "Unknown error"
 msgstr ""
diff --git a/po/ml.po b/po/ml.po
index 04d78d7..2402a9e 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam.default.ml\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2010-03-24 14:41+0530\n"
 "Last-Translator: \n"
 "Language-Team:  <en@li.org>\n"
@@ -35,158 +35,236 @@ msgstr "വീണ്ടും %s%s അടയാളവാക്ക് ടൈപ�
 msgid "Sorry, passwords do not match."
 msgstr "ക്ഷമിക്കണം, അടയാളവാക്കുകള്‍ തമ്മില്‍ ചേരുന്നില്ല."
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "സംവാദത്തിലുളള പിശക്"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "പഴയത് പോലെ തന്നെയാകുന്നതു്"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "ഒരു പാലിന്‍ഡ്രോം ആണു്"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "അക്ഷരങ്ങളുടെ വലിപ്പം മാത്രം മാറുന്നതു്"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "പഴയതിന് സാമ്യമുള്ളതു്"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "സാധാരണയുള്ളതു്"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "is rotated"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr "മതിയായ ക്യാരക്ടര്‍ ക്ലാസ്സുകള്‍ ലഭ്യമല്ല"
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr "അടുത്തടുത്ത് ഒരേപോലുള്ള അനവധി അക്ഷരങ്ങളുണ്ടു്"
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "അടയാളവാക്ക് നല്‍കിയിട്ടില്ല"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "സര്‍വീസ് മൊഡ്യൂളില്‍ പിഴവ്"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "തെറ്റായ അടയാളവാക്ക്: %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "സംവാദത്തിലുളള പിശക്"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "സംവാദത്തിലുളള പിശക്"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "പഴയത് പോലെ തന്നെയാകുന്നതു്"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "ഒരു പാലിന്‍ഡ്രോം ആണു്"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "പഴയതിന് സാമ്യമുള്ളതു്"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "പഴയത് പോലെ തന്നെയാകുന്നതു്"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, fuzzy, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr "അടുത്തടുത്ത് ഒരേപോലുള്ള അനവധി അക്ഷരങ്ങളുണ്ടു്"
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "പഴയത് പോലെ തന്നെയാകുന്നതു്"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, fuzzy, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr "അടുത്തടുത്ത് ഒരേപോലുള്ള അനവധി അക്ഷരങ്ങളുണ്ടു്"
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "മതിയായ ക്യാരക്ടര്‍ ക്ലാസ്സുകള്‍ ലഭ്യമല്ല"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, fuzzy, c-format
+msgid "The password contains less than %ld character classes"
+msgstr "മതിയായ ക്യാരക്ടര്‍ ക്ലാസ്സുകള്‍ ലഭ്യമല്ല"
+
+#: src/error.c:81
 #, fuzzy
 msgid "The password does not contain enough character classes"
 msgstr "മതിയായ ക്യാരക്ടര്‍ ക്ലാസ്സുകള്‍ ലഭ്യമല്ല"
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, fuzzy, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr "അടുത്തടുത്ത് ഒരേപോലുള്ള അനവധി അക്ഷരങ്ങളുണ്ടു്"
+
+#: src/error.c:87
 #, fuzzy
 msgid "The password contains too many same characters consecutively"
 msgstr "അടുത്തടുത്ത് ഒരേപോലുള്ള അനവധി അക്ഷരങ്ങളുണ്ടു്"
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "അടയാളവാക്ക് നല്‍കിയിട്ടില്ല"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "ഒരു പാലിന്‍ഡ്രോം ആണു്"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "അപരിചിതമായ പിശക്"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
+msgstr ""
+
+#: src/error.c:113
+msgid "Bad integer value"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:120
+msgid "Setting is not of integer type"
+msgstr ""
+
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "അപരിചിതമായ പിശക്"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "സംവാദത്തിലുളള പിശക്"
+#~ msgid "memory allocation error"
+#~ msgstr "സംവാദത്തിലുളള പിശക്"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "പഴയത് പോലെ തന്നെയാകുന്നതു്"
+
+#~ msgid "is a palindrome"
+#~ msgstr "ഒരു പാലിന്‍ഡ്രോം ആണു്"
+
+#~ msgid "case changes only"
+#~ msgstr "അക്ഷരങ്ങളുടെ വലിപ്പം മാത്രം മാറുന്നതു്"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "പഴയതിന് സാമ്യമുള്ളതു്"
+
+#~ msgid "is too simple"
+#~ msgstr "സാധാരണയുള്ളതു്"
+
+#~ msgid "is rotated"
+#~ msgstr "is rotated"
+
+#~ msgid "not enough character classes"
+#~ msgstr "മതിയായ ക്യാരക്ടര്‍ ക്ലാസ്സുകള്‍ ലഭ്യമല്ല"
+
+#~ msgid "contains too many same characters consecutively"
+#~ msgstr "അടുത്തടുത്ത് ഒരേപോലുള്ള അനവധി അക്ഷരങ്ങളുണ്ടു്"
+
+#~ msgid "Error in service module"
+#~ msgstr "സര്‍വീസ് മൊഡ്യൂളില്‍ പിഴവ്"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "സംവാദത്തിലുളള പിശക്"
diff --git a/po/mr.po b/po/mr.po
index 91765c4..88952b2 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam.tip.mr\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2009-04-14 11:31+0530\n"
 "Last-Translator: Sandeep Shedmake <sandeep.shedmake@gmail.com>\n"
 "Language-Team: marathi\n"
@@ -32,158 +32,236 @@ msgstr "नवीन गुप्तशब्द %s%sp पुन्हा टा
 msgid "Sorry, passwords do not match."
 msgstr "माफ करा, गुप्तशब्द जुळत नाही."
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "संवाद त्रुटी"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "प्रविष्ट केलेले जुण्या प्रमाणेच आहे"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "पॅलींड्रोम आहे"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "फक्त आकार बदलाव"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "प्रविष्ट केलेले जुण्या नुरूपच आहे"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "खूपच सोपे आहे"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "स्तर बदलविले गेले"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr "अतिरिक्त अक्षर गट उपलब्ध नाही"
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr "पाठोपाठ खूप जास्त समान अक्षर आढळले"
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "गुप्तशब्द दिलेला नाही"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "सेवा विभाग अंतर्गत त्रुटी आढळली"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "अयोग्य गुप्तशब्द: %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "संवाद त्रुटी"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "संवाद त्रुटी"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "प्रविष्ट केलेले जुण्या प्रमाणेच आहे"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "पॅलींड्रोम आहे"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "प्रविष्ट केलेले जुण्या नुरूपच आहे"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "प्रविष्ट केलेले जुण्या प्रमाणेच आहे"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, fuzzy, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr "पाठोपाठ खूप जास्त समान अक्षर आढळले"
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "प्रविष्ट केलेले जुण्या प्रमाणेच आहे"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, fuzzy, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr "पाठोपाठ खूप जास्त समान अक्षर आढळले"
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "अतिरिक्त अक्षर गट उपलब्ध नाही"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, fuzzy, c-format
+msgid "The password contains less than %ld character classes"
+msgstr "अतिरिक्त अक्षर गट उपलब्ध नाही"
+
+#: src/error.c:81
 #, fuzzy
 msgid "The password does not contain enough character classes"
 msgstr "अतिरिक्त अक्षर गट उपलब्ध नाही"
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, fuzzy, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr "पाठोपाठ खूप जास्त समान अक्षर आढळले"
+
+#: src/error.c:87
 #, fuzzy
 msgid "The password contains too many same characters consecutively"
 msgstr "पाठोपाठ खूप जास्त समान अक्षर आढळले"
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "गुप्तशब्द दिलेला नाही"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "पॅलींड्रोम आहे"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "अपरिचित चूक"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
+msgstr ""
+
+#: src/error.c:113
+msgid "Bad integer value"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:120
+msgid "Setting is not of integer type"
+msgstr ""
+
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "अपरिचित चूक"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "संवाद त्रुटी"
+#~ msgid "memory allocation error"
+#~ msgstr "संवाद त्रुटी"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "प्रविष्ट केलेले जुण्या प्रमाणेच आहे"
+
+#~ msgid "is a palindrome"
+#~ msgstr "पॅलींड्रोम आहे"
+
+#~ msgid "case changes only"
+#~ msgstr "फक्त आकार बदलाव"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "प्रविष्ट केलेले जुण्या नुरूपच आहे"
+
+#~ msgid "is too simple"
+#~ msgstr "खूपच सोपे आहे"
+
+#~ msgid "is rotated"
+#~ msgstr "स्तर बदलविले गेले"
+
+#~ msgid "not enough character classes"
+#~ msgstr "अतिरिक्त अक्षर गट उपलब्ध नाही"
+
+#~ msgid "contains too many same characters consecutively"
+#~ msgstr "पाठोपाठ खूप जास्त समान अक्षर आढळले"
+
+#~ msgid "Error in service module"
+#~ msgstr "सेवा विभाग अंतर्गत त्रुटी आढळली"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "संवाद त्रुटी"
diff --git a/po/ms.po b/po/ms.po
index 03b37e3..203427e 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linux-pam\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2008-09-25 23:52+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -32,165 +32,238 @@ msgstr "Baru me&nggunakan Template"
 msgid "Sorry, passwords do not match."
 msgstr "Sijil dan kekunci diberi tidak sepadan."
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "Ralat KMail"
-
-#: src/pam_pwquality.c:106
-#, fuzzy
-msgid "is the same as the old one"
-msgstr "  --src          - pakej berikut adalah pakej sumber (sama dgn -s).\n"
-
-#: src/pam_pwquality.c:108
-#, fuzzy
-msgid "is a palindrome"
-msgstr "seadanya"
-
-#: src/pam_pwquality.c:110
-#, fuzzy
-msgid "case changes only"
-msgstr "Tetapkan hanya kad \"%s\"%s"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr ""
-
-#: src/pam_pwquality.c:118
-#, fuzzy
-msgid "is too simple"
-msgstr "Nama terlalu panjang"
-
-#: src/pam_pwquality.c:120
-#, fuzzy
-msgid "is rotated"
-msgstr "seadanya"
-
-#: src/pam_pwquality.c:122
-#, fuzzy
-msgid "not enough character classes"
-msgstr "Tidak cukup volum fizikal"
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr ""
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-#, fuzzy
-msgid "No password supplied"
-msgstr "Kata Laluan & Akaun Pengguna"
-
-#: src/pam_pwquality.c:130
-#, fuzzy
-msgid "Error in service module"
-msgstr "Comment=Ralat dalam sintaks"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, fuzzy, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "Katalaluan Tidak Betul"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "Ralat KMail"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "Ralat KMail"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "  --src          - pakej berikut adalah pakej sumber (sama dgn -s).\n"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "seadanya"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 msgid "The password is too similar to the old one"
 msgstr ""
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "  --src          - pakej berikut adalah pakej sumber (sama dgn -s).\n"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr ""
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "  --src          - pakej berikut adalah pakej sumber (sama dgn -s).\n"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, fuzzy, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr "Tidak cukup volum fizikal"
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "Tidak cukup volum fizikal"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, fuzzy, c-format
+msgid "The password contains less than %ld character classes"
+msgstr "Tidak cukup volum fizikal"
+
+#: src/error.c:81
 #, fuzzy
 msgid "The password does not contain enough character classes"
 msgstr "Tidak cukup volum fizikal"
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, fuzzy, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr "Tidak cukup volum fizikal"
+
+#: src/error.c:87
 msgid "The password contains too many same characters consecutively"
 msgstr ""
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+#, fuzzy
+msgid "No password supplied"
+msgstr "Kata Laluan & Akaun Pengguna"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
+msgstr ""
+
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
+#: src/error.c:96 src/error.c:99
 #, fuzzy
-msgid "Unknown error"
+msgid "The password fails the dictionary check"
+msgstr "seadanya"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "ralat tidak diketahui"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:113
+msgid "Bad integer value"
+msgstr ""
+
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:120
+msgid "Setting is not of integer type"
+msgstr ""
+
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:135
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "Ralat KMail"
+msgid "Unknown error"
+msgstr "ralat tidak diketahui"
+
+#, fuzzy
+#~ msgid "memory allocation error"
+#~ msgstr "Ralat KMail"
+
+#, fuzzy
+#~ msgid "is the same as the old one"
+#~ msgstr ""
+#~ "  --src          - pakej berikut adalah pakej sumber (sama dgn -s).\n"
+
+#, fuzzy
+#~ msgid "is a palindrome"
+#~ msgstr "seadanya"
+
+#, fuzzy
+#~ msgid "case changes only"
+#~ msgstr "Tetapkan hanya kad \"%s\"%s"
+
+#, fuzzy
+#~ msgid "is too simple"
+#~ msgstr "Nama terlalu panjang"
+
+#, fuzzy
+#~ msgid "is rotated"
+#~ msgstr "seadanya"
+
+#, fuzzy
+#~ msgid "not enough character classes"
+#~ msgstr "Tidak cukup volum fizikal"
+
+#, fuzzy
+#~ msgid "Error in service module"
+#~ msgstr "Comment=Ralat dalam sintaks"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "Ralat KMail"
diff --git a/po/nb.po b/po/nb.po
index 28469ae..08b909b 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Linux-PAM\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2008-04-30 12:59+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@online.no>\n"
 "Language-Team:  <nb@li.org>\n"
@@ -31,157 +31,232 @@ msgstr "Bekreft nytt %s%s-passord: "
 msgid "Sorry, passwords do not match."
 msgstr "Beklager, ikke samsvar mellom passord."
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "Dialogfeil"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "er det samme som det gamle"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "er et palindrom"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "kun endring av små/store bokstaver"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "er for likt det gamle"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "er for enkelt"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "er rotert"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr "ikke nok tegnklasser"
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr ""
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "Passord ikke angitt"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "Feil i tjenestemodul"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "SVAKT PASSORD: %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "Dialogfeil"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "Dialogfeil"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "er det samme som det gamle"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "er et palindrom"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "er for likt det gamle"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "er det samme som det gamle"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr ""
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "er det samme som det gamle"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, fuzzy, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr "ikke nok tegnklasser"
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "ikke nok tegnklasser"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, fuzzy, c-format
+msgid "The password contains less than %ld character classes"
+msgstr "ikke nok tegnklasser"
+
+#: src/error.c:81
 #, fuzzy
 msgid "The password does not contain enough character classes"
 msgstr "ikke nok tegnklasser"
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, fuzzy, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr "ikke nok tegnklasser"
+
+#: src/error.c:87
 msgid "The password contains too many same characters consecutively"
 msgstr ""
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "Passord ikke angitt"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "er et palindrom"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "Ukjent feil"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
+msgstr ""
+
+#: src/error.c:113
+msgid "Bad integer value"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
+msgstr ""
+
+#: src/error.c:120
+msgid "Setting is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
+msgstr ""
+
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "Ukjent feil"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "Dialogfeil"
+#~ msgid "memory allocation error"
+#~ msgstr "Dialogfeil"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "er det samme som det gamle"
+
+#~ msgid "is a palindrome"
+#~ msgstr "er et palindrom"
+
+#~ msgid "case changes only"
+#~ msgstr "kun endring av små/store bokstaver"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "er for likt det gamle"
+
+#~ msgid "is too simple"
+#~ msgstr "er for enkelt"
+
+#~ msgid "is rotated"
+#~ msgstr "er rotert"
+
+#~ msgid "not enough character classes"
+#~ msgstr "ikke nok tegnklasser"
+
+#~ msgid "Error in service module"
+#~ msgstr "Feil i tjenestemodul"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "Dialogfeil"
diff --git a/po/nl.po b/po/nl.po
index 204468d..23f42d3 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam.tip.nl\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2010-07-13 14:11+0200\n"
 "Last-Translator: Geert Warrink <geert.warrink@onsnet.nu>\n"
 "Language-Team: Fedora\n"
@@ -36,158 +36,236 @@ msgstr "Nieuw %s%swachtwoord herhalen: "
 msgid "Sorry, passwords do not match."
 msgstr "Sorry, wachtwoorden komen niet overeen."
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "Conversatie fout"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "is hetzelfde als het oude"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "is een palindroom"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "alleen veranderingen in hoofd/kleine letters"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "lijkt te veel op het oude"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "is te eenvoudig"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "is omgedraaid"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr "niet genoeg karakter klasses"
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr "bevat teveel dezelfde opeenvolgende karakters"
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "Geen wachtwoord opgegeven"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "Fout in service module"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "SLECHT WACHTWOORD: %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "Conversatie fout"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "Conversatie fout"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "is hetzelfde als het oude"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "is een palindroom"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "lijkt te veel op het oude"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "is hetzelfde als het oude"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, fuzzy, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr "bevat teveel dezelfde opeenvolgende karakters"
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "is hetzelfde als het oude"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, fuzzy, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr "bevat teveel dezelfde opeenvolgende karakters"
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "niet genoeg karakter klasses"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, fuzzy, c-format
+msgid "The password contains less than %ld character classes"
+msgstr "niet genoeg karakter klasses"
+
+#: src/error.c:81
 #, fuzzy
 msgid "The password does not contain enough character classes"
 msgstr "niet genoeg karakter klasses"
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, fuzzy, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr "bevat teveel dezelfde opeenvolgende karakters"
+
+#: src/error.c:87
 #, fuzzy
 msgid "The password contains too many same characters consecutively"
 msgstr "bevat teveel dezelfde opeenvolgende karakters"
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "Geen wachtwoord opgegeven"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "is een palindroom"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "Onbekende fout"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
+msgstr ""
+
+#: src/error.c:113
+msgid "Bad integer value"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:120
+msgid "Setting is not of integer type"
+msgstr ""
+
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "Onbekende fout"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "Conversatie fout"
+#~ msgid "memory allocation error"
+#~ msgstr "Conversatie fout"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "is hetzelfde als het oude"
+
+#~ msgid "is a palindrome"
+#~ msgstr "is een palindroom"
+
+#~ msgid "case changes only"
+#~ msgstr "alleen veranderingen in hoofd/kleine letters"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "lijkt te veel op het oude"
+
+#~ msgid "is too simple"
+#~ msgstr "is te eenvoudig"
+
+#~ msgid "is rotated"
+#~ msgstr "is omgedraaid"
+
+#~ msgid "not enough character classes"
+#~ msgstr "niet genoeg karakter klasses"
+
+#~ msgid "contains too many same characters consecutively"
+#~ msgstr "bevat teveel dezelfde opeenvolgende karakters"
+
+#~ msgid "Error in service module"
+#~ msgstr "Fout in service module"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "Conversatie fout"
diff --git a/po/or.po b/po/or.po
index 33baa78..928b3ed 100644
--- a/po/or.po
+++ b/po/or.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam.tip.or\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2009-04-01 15:07+0530\n"
 "Last-Translator: Manoj Kumar Giri <mgiri@redhat.com>\n"
 "Language-Team: Oriya <oriya-it@googlegroups.com>\n"
@@ -37,158 +37,236 @@ msgstr "ନୂତନ %s%s ପ୍ରବେଶ ସଙ୍କେତକୁ ପୁନ�
 msgid "Sorry, passwords do not match."
 msgstr "କ୍ଷମା କରିବେ, ପ୍ରବେଶ ସଙ୍କେତ ମିଶୁ ନାହିଁ।"
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "କଥୋପକଥନ ତୃଟି"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "ପୁରୁଣା ପ୍ରବେଶ ସଙ୍କେତ ସହିତ ଏହା ସମାନ ଅଟେ"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "ପ୍ରବେଶ ସଙ୍କେତଟି ଗୋଟିଏ ପାଲିନଡ୍ରୋମ ଅଟେ"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "କେବଳ ଅକ୍ଷର ପ୍ରକାର ପରିବର୍ତ୍ତିତ ହୋଇଥାଏ"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "ଏହା ପୂର୍ବ ପ୍ରବେଶ ସଙ୍କେତ ସହିତ ବହୁତ ସମାନ ଅଟେ"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "ଏହା ଅତି ସହଜ ଅଟେ"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "ଏହା ଘୂର୍ଣ୍ଣୟମାନ ଅଟେ"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr "ଯଥେଷ୍ଟ ବର୍ଣ୍ଣ ଶ୍ରେଣୀ ନାହିଁ"
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr "ଅତ୍ୟଧିକ ସମାନ ଅକ୍ଷରକୁ ଲଗାତାର ଧାରଣ କରିଥାଏ"
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "କୌଣସି ପ୍ରବେଶ ସଙ୍କେତ ପ୍ରଦାନ କରାଯାଇ ନାହିଁ"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "ସେବା ଏକକାଂଶରେ ତୃଟି"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "ଖରାପ ପ୍ରବେଶ ସଙ୍କେତ: %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "କଥୋପକଥନ ତୃଟି"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "କଥୋପକଥନ ତୃଟି"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "ପୁରୁଣା ପ୍ରବେଶ ସଙ୍କେତ ସହିତ ଏହା ସମାନ ଅଟେ"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "ପ୍ରବେଶ ସଙ୍କେତଟି ଗୋଟିଏ ପାଲିନଡ୍ରୋମ ଅଟେ"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "ଏହା ପୂର୍ବ ପ୍ରବେଶ ସଙ୍କେତ ସହିତ ବହୁତ ସମାନ ଅଟେ"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "ପୁରୁଣା ପ୍ରବେଶ ସଙ୍କେତ ସହିତ ଏହା ସମାନ ଅଟେ"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, fuzzy, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr "ଅତ୍ୟଧିକ ସମାନ ଅକ୍ଷରକୁ ଲଗାତାର ଧାରଣ କରିଥାଏ"
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "ପୁରୁଣା ପ୍ରବେଶ ସଙ୍କେତ ସହିତ ଏହା ସମାନ ଅଟେ"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, fuzzy, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr "ଅତ୍ୟଧିକ ସମାନ ଅକ୍ଷରକୁ ଲଗାତାର ଧାରଣ କରିଥାଏ"
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "ଯଥେଷ୍ଟ ବର୍ଣ୍ଣ ଶ୍ରେଣୀ ନାହିଁ"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, fuzzy, c-format
+msgid "The password contains less than %ld character classes"
+msgstr "ଯଥେଷ୍ଟ ବର୍ଣ୍ଣ ଶ୍ରେଣୀ ନାହିଁ"
+
+#: src/error.c:81
 #, fuzzy
 msgid "The password does not contain enough character classes"
 msgstr "ଯଥେଷ୍ଟ ବର୍ଣ୍ଣ ଶ୍ରେଣୀ ନାହିଁ"
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, fuzzy, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr "ଅତ୍ୟଧିକ ସମାନ ଅକ୍ଷରକୁ ଲଗାତାର ଧାରଣ କରିଥାଏ"
+
+#: src/error.c:87
 #, fuzzy
 msgid "The password contains too many same characters consecutively"
 msgstr "ଅତ୍ୟଧିକ ସମାନ ଅକ୍ଷରକୁ ଲଗାତାର ଧାରଣ କରିଥାଏ"
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "କୌଣସି ପ୍ରବେଶ ସଙ୍କେତ ପ୍ରଦାନ କରାଯାଇ ନାହିଁ"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "ପ୍ରବେଶ ସଙ୍କେତଟି ଗୋଟିଏ ପାଲିନଡ୍ରୋମ ଅଟେ"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "ଅଜଣା ତୃଟି"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
+msgstr ""
+
+#: src/error.c:113
+msgid "Bad integer value"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:120
+msgid "Setting is not of integer type"
+msgstr ""
+
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "ଅଜଣା ତୃଟି"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "କଥୋପକଥନ ତୃଟି"
+#~ msgid "memory allocation error"
+#~ msgstr "କଥୋପକଥନ ତୃଟି"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "ପୁରୁଣା ପ୍ରବେଶ ସଙ୍କେତ ସହିତ ଏହା ସମାନ ଅଟେ"
+
+#~ msgid "is a palindrome"
+#~ msgstr "ପ୍ରବେଶ ସଙ୍କେତଟି ଗୋଟିଏ ପାଲିନଡ୍ରୋମ ଅଟେ"
+
+#~ msgid "case changes only"
+#~ msgstr "କେବଳ ଅକ୍ଷର ପ୍ରକାର ପରିବର୍ତ୍ତିତ ହୋଇଥାଏ"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "ଏହା ପୂର୍ବ ପ୍ରବେଶ ସଙ୍କେତ ସହିତ ବହୁତ ସମାନ ଅଟେ"
+
+#~ msgid "is too simple"
+#~ msgstr "ଏହା ଅତି ସହଜ ଅଟେ"
+
+#~ msgid "is rotated"
+#~ msgstr "ଏହା ଘୂର୍ଣ୍ଣୟମାନ ଅଟେ"
+
+#~ msgid "not enough character classes"
+#~ msgstr "ଯଥେଷ୍ଟ ବର୍ଣ୍ଣ ଶ୍ରେଣୀ ନାହିଁ"
+
+#~ msgid "contains too many same characters consecutively"
+#~ msgstr "ଅତ୍ୟଧିକ ସମାନ ଅକ୍ଷରକୁ ଲଗାତାର ଧାରଣ କରିଥାଏ"
+
+#~ msgid "Error in service module"
+#~ msgstr "ସେବା ଏକକାଂଶରେ ତୃଟି"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "କଥୋପକଥନ ତୃଟି"
diff --git a/po/pa.po b/po/pa.po
index 8a1f44f..19f3d5f 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam.tip.pa\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2009-06-01 16:19+0530\n"
 "Last-Translator: Jaswinder Singh <jsingh@redhat.com>\n"
 "Language-Team: Punjabi <Punjabi-users@lists.sourceforge.net>\n"
@@ -33,158 +33,236 @@ msgstr "ਨਵਾਂ %s%sਪਾਸਵਰਡ ਮੁੜ-ਲਿਖੋ: "
 msgid "Sorry, passwords do not match."
 msgstr "ਮਾਫ ਕਰਨਾ ਪਾਸਵਰਡ ਮੇਲ ਨਹੀਂ ਖਾਂਦਾ।"
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "ਤਬਦੀਲੀ ਗਲਤੀ"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "ਪੁਰਾਣੇ ਵਰਗਾ ਹੈ"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "ਇੱਕ palindrome ਹੈ"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "ਸਿਰਫ ਅੱਖਰ ਤਬਦੀਲੀ"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "ਪੁਰਾਣੇ ਨਾਲ ਬਹੁਤ ਮਿਲਦਾ-ਜੁਲਦਾ ਹੈ"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "ਬਹੁਤ ਸਧਾਰਨ ਹੈ"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "ਘੁੰਮਾਇਆ ਹੈ"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr "ਲੋੜੀਂਦੀਆਂ ਅੱਖਰ ਸ਼੍ਰੇਣੀਆਂ ਨਹੀਂ ਹਨ"
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr "ਲਗਾਤਾਰ ਬਹੁਤ ਸਾਰੇ ਮਿਲਦੇ-ਜੁਲਦੇ ਅੱਖਰ ਸ਼ਾਮਿਲ ਹਨ"
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "ਕੋਈ ਪਾਸਵਰਡ ਨਹੀਂ ਦਿੱਤਾ ਗਿਆ"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "ਸੇਵਾ ਮੈਡੀਊਲ ਵਿੱਚ ਗਲਤੀ"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "ਗਲਤ ਪਾਸਵਰਡ: %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "ਤਬਦੀਲੀ ਗਲਤੀ"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "ਤਬਦੀਲੀ ਗਲਤੀ"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "ਪੁਰਾਣੇ ਵਰਗਾ ਹੈ"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "ਇੱਕ palindrome ਹੈ"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "ਪੁਰਾਣੇ ਨਾਲ ਬਹੁਤ ਮਿਲਦਾ-ਜੁਲਦਾ ਹੈ"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "ਪੁਰਾਣੇ ਵਰਗਾ ਹੈ"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, fuzzy, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr "ਲਗਾਤਾਰ ਬਹੁਤ ਸਾਰੇ ਮਿਲਦੇ-ਜੁਲਦੇ ਅੱਖਰ ਸ਼ਾਮਿਲ ਹਨ"
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "ਪੁਰਾਣੇ ਵਰਗਾ ਹੈ"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, fuzzy, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr "ਲਗਾਤਾਰ ਬਹੁਤ ਸਾਰੇ ਮਿਲਦੇ-ਜੁਲਦੇ ਅੱਖਰ ਸ਼ਾਮਿਲ ਹਨ"
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "ਲੋੜੀਂਦੀਆਂ ਅੱਖਰ ਸ਼੍ਰੇਣੀਆਂ ਨਹੀਂ ਹਨ"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, fuzzy, c-format
+msgid "The password contains less than %ld character classes"
+msgstr "ਲੋੜੀਂਦੀਆਂ ਅੱਖਰ ਸ਼੍ਰੇਣੀਆਂ ਨਹੀਂ ਹਨ"
+
+#: src/error.c:81
 #, fuzzy
 msgid "The password does not contain enough character classes"
 msgstr "ਲੋੜੀਂਦੀਆਂ ਅੱਖਰ ਸ਼੍ਰੇਣੀਆਂ ਨਹੀਂ ਹਨ"
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, fuzzy, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr "ਲਗਾਤਾਰ ਬਹੁਤ ਸਾਰੇ ਮਿਲਦੇ-ਜੁਲਦੇ ਅੱਖਰ ਸ਼ਾਮਿਲ ਹਨ"
+
+#: src/error.c:87
 #, fuzzy
 msgid "The password contains too many same characters consecutively"
 msgstr "ਲਗਾਤਾਰ ਬਹੁਤ ਸਾਰੇ ਮਿਲਦੇ-ਜੁਲਦੇ ਅੱਖਰ ਸ਼ਾਮਿਲ ਹਨ"
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "ਕੋਈ ਪਾਸਵਰਡ ਨਹੀਂ ਦਿੱਤਾ ਗਿਆ"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "ਇੱਕ palindrome ਹੈ"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "ਅਣਜਾਣੀ ਗਲਤੀ"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
+msgstr ""
+
+#: src/error.c:113
+msgid "Bad integer value"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:120
+msgid "Setting is not of integer type"
+msgstr ""
+
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "ਅਣਜਾਣੀ ਗਲਤੀ"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "ਤਬਦੀਲੀ ਗਲਤੀ"
+#~ msgid "memory allocation error"
+#~ msgstr "ਤਬਦੀਲੀ ਗਲਤੀ"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "ਪੁਰਾਣੇ ਵਰਗਾ ਹੈ"
+
+#~ msgid "is a palindrome"
+#~ msgstr "ਇੱਕ palindrome ਹੈ"
+
+#~ msgid "case changes only"
+#~ msgstr "ਸਿਰਫ ਅੱਖਰ ਤਬਦੀਲੀ"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "ਪੁਰਾਣੇ ਨਾਲ ਬਹੁਤ ਮਿਲਦਾ-ਜੁਲਦਾ ਹੈ"
+
+#~ msgid "is too simple"
+#~ msgstr "ਬਹੁਤ ਸਧਾਰਨ ਹੈ"
+
+#~ msgid "is rotated"
+#~ msgstr "ਘੁੰਮਾਇਆ ਹੈ"
+
+#~ msgid "not enough character classes"
+#~ msgstr "ਲੋੜੀਂਦੀਆਂ ਅੱਖਰ ਸ਼੍ਰੇਣੀਆਂ ਨਹੀਂ ਹਨ"
+
+#~ msgid "contains too many same characters consecutively"
+#~ msgstr "ਲਗਾਤਾਰ ਬਹੁਤ ਸਾਰੇ ਮਿਲਦੇ-ਜੁਲਦੇ ਅੱਖਰ ਸ਼ਾਮਿਲ ਹਨ"
+
+#~ msgid "Error in service module"
+#~ msgstr "ਸੇਵਾ ਮੈਡੀਊਲ ਵਿੱਚ ਗਲਤੀ"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "ਤਬਦੀਲੀ ਗਲਤੀ"
diff --git a/po/pl.po b/po/pl.po
index 5ccdfe3..03e54d6 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2009-09-27 13:48+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <fedora-trans-pl@redhat.com>\n"
@@ -32,158 +32,236 @@ msgstr "Proszę ponownie podać nowe hasło %s%s: "
 msgid "Sorry, passwords do not match."
 msgstr "Podane hasła nie zgadzają się."
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "Błąd rozmowy"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "jest identyczne ze starym"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "jest palindromem"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "ma zmienioną tylko wielkość znaków"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "jest za bardzo podobne do poprzedniego"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "jest za proste"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "jest obrócone"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr "za mało klas znaków"
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr "zawiera za dużo takich samych znaków po sobie"
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "Nie podano hasła"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "Błąd w module usługi"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "BŁĘDNE HASŁO: %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "Błąd rozmowy"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "Błąd rozmowy"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "jest identyczne ze starym"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "jest palindromem"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "jest za bardzo podobne do poprzedniego"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "jest identyczne ze starym"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, fuzzy, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr "zawiera za dużo takich samych znaków po sobie"
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "jest identyczne ze starym"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, fuzzy, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr "zawiera za dużo takich samych znaków po sobie"
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "za mało klas znaków"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, fuzzy, c-format
+msgid "The password contains less than %ld character classes"
+msgstr "za mało klas znaków"
+
+#: src/error.c:81
 #, fuzzy
 msgid "The password does not contain enough character classes"
 msgstr "za mało klas znaków"
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, fuzzy, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr "zawiera za dużo takich samych znaków po sobie"
+
+#: src/error.c:87
 #, fuzzy
 msgid "The password contains too many same characters consecutively"
 msgstr "zawiera za dużo takich samych znaków po sobie"
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "Nie podano hasła"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "jest palindromem"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "Nieznany błąd"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
+msgstr ""
+
+#: src/error.c:113
+msgid "Bad integer value"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:120
+msgid "Setting is not of integer type"
+msgstr ""
+
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "Nieznany błąd"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "Błąd rozmowy"
+#~ msgid "memory allocation error"
+#~ msgstr "Błąd rozmowy"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "jest identyczne ze starym"
+
+#~ msgid "is a palindrome"
+#~ msgstr "jest palindromem"
+
+#~ msgid "case changes only"
+#~ msgstr "ma zmienioną tylko wielkość znaków"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "jest za bardzo podobne do poprzedniego"
+
+#~ msgid "is too simple"
+#~ msgstr "jest za proste"
+
+#~ msgid "is rotated"
+#~ msgstr "jest obrócone"
+
+#~ msgid "not enough character classes"
+#~ msgstr "za mało klas znaków"
+
+#~ msgid "contains too many same characters consecutively"
+#~ msgstr "zawiera za dużo takich samych znaków po sobie"
+
+#~ msgid "Error in service module"
+#~ msgstr "Błąd w module usługi"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "Błąd rozmowy"
diff --git a/po/pt.po b/po/pt.po
index d3dd68b..02cf05c 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2009-04-09 16:42+0100\n"
 "Last-Translator: Rui Gouveia <rui.gouveia@globaltek.pt>\n"
 "Language-Team: pt <fedora-trans-pt@redhat.com>\n"
@@ -35,158 +35,236 @@ msgstr "Digite novamente a nova %s%ssenha: "
 msgid "Sorry, passwords do not match."
 msgstr "Lamento, as senhas não coincidem."
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "Erro de conversação"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "é igual à anterior"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "é um palíndromo"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "apenas muda a capitulação"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "é muito semelhante à anterior"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "é demasiado simples"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "é rodada"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr "não tem classes de caracteres suficientes"
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr "contém demasiados caracteres iguais consecutivos"
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "Não foi fornecida uma senha"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "Erro no módulo do serviço"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "MÁ SENHA: %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "Erro de conversação"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "Erro de conversação"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "é igual à anterior"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "é um palíndromo"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "é muito semelhante à anterior"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "é igual à anterior"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, fuzzy, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr "contém demasiados caracteres iguais consecutivos"
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "é igual à anterior"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, fuzzy, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr "contém demasiados caracteres iguais consecutivos"
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "não tem classes de caracteres suficientes"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, fuzzy, c-format
+msgid "The password contains less than %ld character classes"
+msgstr "não tem classes de caracteres suficientes"
+
+#: src/error.c:81
 #, fuzzy
 msgid "The password does not contain enough character classes"
 msgstr "não tem classes de caracteres suficientes"
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, fuzzy, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr "contém demasiados caracteres iguais consecutivos"
+
+#: src/error.c:87
 #, fuzzy
 msgid "The password contains too many same characters consecutively"
 msgstr "contém demasiados caracteres iguais consecutivos"
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "Não foi fornecida uma senha"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "é um palíndromo"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "Erro desconhecido"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
+msgstr ""
+
+#: src/error.c:113
+msgid "Bad integer value"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:120
+msgid "Setting is not of integer type"
+msgstr ""
+
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "Erro desconhecido"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "Erro de conversação"
+#~ msgid "memory allocation error"
+#~ msgstr "Erro de conversação"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "é igual à anterior"
+
+#~ msgid "is a palindrome"
+#~ msgstr "é um palíndromo"
+
+#~ msgid "case changes only"
+#~ msgstr "apenas muda a capitulação"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "é muito semelhante à anterior"
+
+#~ msgid "is too simple"
+#~ msgstr "é demasiado simples"
+
+#~ msgid "is rotated"
+#~ msgstr "é rodada"
+
+#~ msgid "not enough character classes"
+#~ msgstr "não tem classes de caracteres suficientes"
+
+#~ msgid "contains too many same characters consecutively"
+#~ msgstr "contém demasiados caracteres iguais consecutivos"
+
+#~ msgid "Error in service module"
+#~ msgstr "Erro no módulo do serviço"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "Erro de conversação"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5a40107..82016be 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Linux-PAM.tip\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2009-02-20 12:41-0300\n"
 "Last-Translator: Taylon <taylonsilva@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <fedora-trans-pt_br@redhat.com>\n"
@@ -35,158 +35,236 @@ msgstr "Redigite a nova %s%ssenha:"
 msgid "Sorry, passwords do not match."
 msgstr "As senhas não são iguais."
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "Erro de conversação"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "é igual à antiga senha"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "é um palíndromo"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "mudou apenas maiúsculas/minúsculas"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "é muito semelhante à antiga"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "é simples demais"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "foi invertida"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr "classes de caractere insuficientes"
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr "contém muitos caracteres igual consecutivamente"
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "Nenhuma senha informada"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "Erro no módulo de serviço"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "SENHA INCORRETA: %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "Erro de conversação"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "Erro de conversação"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "é igual à antiga senha"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "é um palíndromo"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "é muito semelhante à antiga"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "é igual à antiga senha"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, fuzzy, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr "contém muitos caracteres igual consecutivamente"
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "é igual à antiga senha"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, fuzzy, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr "contém muitos caracteres igual consecutivamente"
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "classes de caractere insuficientes"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, fuzzy, c-format
+msgid "The password contains less than %ld character classes"
+msgstr "classes de caractere insuficientes"
+
+#: src/error.c:81
 #, fuzzy
 msgid "The password does not contain enough character classes"
 msgstr "classes de caractere insuficientes"
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, fuzzy, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr "contém muitos caracteres igual consecutivamente"
+
+#: src/error.c:87
 #, fuzzy
 msgid "The password contains too many same characters consecutively"
 msgstr "contém muitos caracteres igual consecutivamente"
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "Nenhuma senha informada"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "é um palíndromo"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "Erro desconhecido"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
+msgstr ""
+
+#: src/error.c:113
+msgid "Bad integer value"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:120
+msgid "Setting is not of integer type"
+msgstr ""
+
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "Erro desconhecido"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "Erro de conversação"
+#~ msgid "memory allocation error"
+#~ msgstr "Erro de conversação"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "é igual à antiga senha"
+
+#~ msgid "is a palindrome"
+#~ msgstr "é um palíndromo"
+
+#~ msgid "case changes only"
+#~ msgstr "mudou apenas maiúsculas/minúsculas"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "é muito semelhante à antiga"
+
+#~ msgid "is too simple"
+#~ msgstr "é simples demais"
+
+#~ msgid "is rotated"
+#~ msgstr "foi invertida"
+
+#~ msgid "not enough character classes"
+#~ msgstr "classes de caractere insuficientes"
+
+#~ msgid "contains too many same characters consecutively"
+#~ msgstr "contém muitos caracteres igual consecutivamente"
+
+#~ msgid "Error in service module"
+#~ msgstr "Erro no módulo de serviço"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "Erro de conversação"
diff --git a/po/ru.po b/po/ru.po
index 3ca4038..7c01bda 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2009-08-21 15:33+1000\n"
 "Last-Translator: Yulia Poyarkova <yulia.poyarkova@redhat.com>\n"
 "Language-Team: \n"
@@ -37,159 +37,237 @@ msgstr "Повторите ввод нового пароля %s%s: "
 msgid "Sorry, passwords do not match."
 msgstr "Извините, но пароли не совпадают."
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "Ошибка диалога"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "совпадает со старым"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "является палиндромом"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "изменения только в регистре"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "слишком похож на старый"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "слишком простой"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "является результатом чередования"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr "слишком мало символов различных типов"
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr "содержит слишком длинную последовательность одинаковых символов"
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "Пароль не указан"
-
-#  Translators: error message
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "Ошибка в модуле службы"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "НЕУДАЧНЫЙ ПАРОЛЬ: %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "Ошибка диалога"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "Ошибка диалога"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "совпадает со старым"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "является палиндромом"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "слишком похож на старый"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "совпадает со старым"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, fuzzy, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr "содержит слишком длинную последовательность одинаковых символов"
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "совпадает со старым"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, fuzzy, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr "содержит слишком длинную последовательность одинаковых символов"
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "слишком мало символов различных типов"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, fuzzy, c-format
+msgid "The password contains less than %ld character classes"
+msgstr "слишком мало символов различных типов"
+
+#: src/error.c:81
 #, fuzzy
 msgid "The password does not contain enough character classes"
 msgstr "слишком мало символов различных типов"
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, fuzzy, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr "содержит слишком длинную последовательность одинаковых символов"
+
+#: src/error.c:87
 #, fuzzy
 msgid "The password contains too many same characters consecutively"
 msgstr "содержит слишком длинную последовательность одинаковых символов"
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "Пароль не указан"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "является палиндромом"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "Неизвестная ошибка"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:113
+msgid "Bad integer value"
+msgstr ""
+
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:120
+msgid "Setting is not of integer type"
+msgstr ""
+
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:133
+msgid "Fatal failure"
+msgstr ""
+
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "Неизвестная ошибка"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "Ошибка диалога"
+#~ msgid "memory allocation error"
+#~ msgstr "Ошибка диалога"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "совпадает со старым"
+
+#~ msgid "is a palindrome"
+#~ msgstr "является палиндромом"
+
+#~ msgid "case changes only"
+#~ msgstr "изменения только в регистре"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "слишком похож на старый"
+
+#~ msgid "is too simple"
+#~ msgstr "слишком простой"
+
+#~ msgid "is rotated"
+#~ msgstr "является результатом чередования"
+
+#~ msgid "not enough character classes"
+#~ msgstr "слишком мало символов различных типов"
+
+#~ msgid "contains too many same characters consecutively"
+#~ msgstr "содержит слишком длинную последовательность одинаковых символов"
+
+#  Translators: error message
+#~ msgid "Error in service module"
+#~ msgstr "Ошибка в модуле службы"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "Ошибка диалога"
diff --git a/po/si.po b/po/si.po
index 1743b71..3964818 100644
--- a/po/si.po
+++ b/po/si.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: si\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2007-06-22 12:24+0530\n"
 "Last-Translator: Danishka Navin <snavin@redhat.com>\n"
 "Language-Team: Sinhala <en@li.org>\n"
@@ -32,156 +32,228 @@ msgstr "නව %s%sරහස්පදය නැවත ඇතුළත් කර�
 msgid "Sorry, passwords do not match."
 msgstr "සමාවෙන්න, රහස්පද ගැලපෙන්නේ නැත."
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "පරිවර්තන දෝෂය"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "එය පැරණි රහස්පදය හා සමාන වේ"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "එය පැලින්ඩ්‍රොමයකි"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "කැපිටල් සිම්පල් වෙනස්කම් පමණි"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "එය පැරණි රහස්පදය බොගොදුරට  සමාන වේ"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "එය සරළ වැඩි වේ"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "භ්‍රමණය වි ඇත"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr ""
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr ""
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "රහස්පදය සපයා නැත"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "සේවා අංගයේ දෝෂයකි"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "BAD PASSWORD: %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "පරිවර්තන දෝෂය"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "පරිවර්තන දෝෂය"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "එය පැරණි රහස්පදය හා සමාන වේ"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "එය පැලින්ඩ්‍රොමයකි"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "එය පැරණි රහස්පදය බොගොදුරට  සමාන වේ"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "එය පැරණි රහස්පදය හා සමාන වේ"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr ""
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "එය පැරණි රහස්පදය හා සමාන වේ"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr ""
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "එය පැරණි රහස්පදය බොගොදුරට  සමාන වේ"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, c-format
+msgid "The password contains less than %ld character classes"
+msgstr ""
+
+#: src/error.c:81
 msgid "The password does not contain enough character classes"
 msgstr ""
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr ""
+
+#: src/error.c:87
 msgid "The password contains too many same characters consecutively"
 msgstr ""
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "රහස්පදය සපයා නැත"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "එය පැලින්ඩ්‍රොමයකි"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "නොදන්නා දෝෂයක්"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:113
+msgid "Bad integer value"
+msgstr ""
+
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
+msgstr ""
+
+#: src/error.c:120
+msgid "Setting is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:133
+msgid "Fatal failure"
+msgstr ""
+
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "නොදන්නා දෝෂයක්"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "පරිවර්තන දෝෂය"
+#~ msgid "memory allocation error"
+#~ msgstr "පරිවර්තන දෝෂය"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "එය පැරණි රහස්පදය හා සමාන වේ"
+
+#~ msgid "is a palindrome"
+#~ msgstr "එය පැලින්ඩ්‍රොමයකි"
+
+#~ msgid "case changes only"
+#~ msgstr "කැපිටල් සිම්පල් වෙනස්කම් පමණි"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "එය පැරණි රහස්පදය බොගොදුරට  සමාන වේ"
+
+#~ msgid "is too simple"
+#~ msgstr "එය සරළ වැඩි වේ"
+
+#~ msgid "is rotated"
+#~ msgstr "භ්‍රමණය වි ඇත"
+
+#~ msgid "Error in service module"
+#~ msgstr "සේවා අංගයේ දෝෂයකි"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "පරිවර්තන දෝෂය"
diff --git a/po/sk.po b/po/sk.po
index 80ccbb5..8c3d414 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Linux-PAM\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2009-03-24 22:24+0100\n"
 "Last-Translator: Pavol Šimo <palo.simo@gmail.com>\n"
 "Language-Team: Slovak <fedora-trans-sk@redhat.com>\n"
@@ -31,158 +31,236 @@ msgstr "Opakujte nové %s%sheslo: "
 msgid "Sorry, passwords do not match."
 msgstr "Prepáčte, heslá sa nezhodujú."
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "Chyba konverzácie"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "je rovnaké ako predchádzajúce"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "je palindróm"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "len zmena veľkosti"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "je príliš podobné predchádzajúcemu"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "je príliš jednoduché"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "je otočené"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr "nedostatok rôznych druhov znakov"
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr "obsahuje príliš veľa rovnakých znakov za sebou"
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "Heslo nezadané"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "Chyba v module služby"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "NESPRÁVNE HESLO: %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "Chyba konverzácie"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "Chyba konverzácie"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "je rovnaké ako predchádzajúce"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "je palindróm"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "je príliš podobné predchádzajúcemu"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "je rovnaké ako predchádzajúce"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, fuzzy, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr "obsahuje príliš veľa rovnakých znakov za sebou"
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "je rovnaké ako predchádzajúce"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, fuzzy, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr "obsahuje príliš veľa rovnakých znakov za sebou"
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "nedostatok rôznych druhov znakov"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, fuzzy, c-format
+msgid "The password contains less than %ld character classes"
+msgstr "nedostatok rôznych druhov znakov"
+
+#: src/error.c:81
 #, fuzzy
 msgid "The password does not contain enough character classes"
 msgstr "nedostatok rôznych druhov znakov"
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, fuzzy, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr "obsahuje príliš veľa rovnakých znakov za sebou"
+
+#: src/error.c:87
 #, fuzzy
 msgid "The password contains too many same characters consecutively"
 msgstr "obsahuje príliš veľa rovnakých znakov za sebou"
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "Heslo nezadané"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "je palindróm"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "Neznáma chyba"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
+msgstr ""
+
+#: src/error.c:113
+msgid "Bad integer value"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:120
+msgid "Setting is not of integer type"
+msgstr ""
+
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "Neznáma chyba"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "Chyba konverzácie"
+#~ msgid "memory allocation error"
+#~ msgstr "Chyba konverzácie"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "je rovnaké ako predchádzajúce"
+
+#~ msgid "is a palindrome"
+#~ msgstr "je palindróm"
+
+#~ msgid "case changes only"
+#~ msgstr "len zmena veľkosti"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "je príliš podobné predchádzajúcemu"
+
+#~ msgid "is too simple"
+#~ msgstr "je príliš jednoduché"
+
+#~ msgid "is rotated"
+#~ msgstr "je otočené"
+
+#~ msgid "not enough character classes"
+#~ msgstr "nedostatok rôznych druhov znakov"
+
+#~ msgid "contains too many same characters consecutively"
+#~ msgstr "obsahuje príliš veľa rovnakých znakov za sebou"
+
+#~ msgid "Error in service module"
+#~ msgstr "Chyba v module služby"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "Chyba konverzácie"
diff --git a/po/sr.po b/po/sr.po
index 15ce2ff..da04ae1 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Linux-PAM\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2009-03-25 22:53+0100\n"
 "Last-Translator: Miloš Komarčević <kmilos@gmail.com>\n"
 "Language-Team: Serbian (sr) <fedora-trans-sr@redhat.com>\n"
@@ -35,158 +35,236 @@ msgstr "Поново унесите нову %s%sлозинку: "
 msgid "Sorry, passwords do not match."
 msgstr "Извините, лозинке се не подударају."
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "Грешка у разговору"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "иста је као и стара"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "палиндром је"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "само промене величине слова"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "сувише је слична претходној"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "сувише је једноставна"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "изокренута је"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr "нема довољно класа знакова"
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr "садржи превише истих знакова узастопно"
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "Није понуђена лозинка"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "Грешка у услужном модулу"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "ЛОША ЛОЗИНКА: %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "Грешка у разговору"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "Грешка у разговору"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "иста је као и стара"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "палиндром је"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "сувише је слична претходној"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "иста је као и стара"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, fuzzy, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr "садржи превише истих знакова узастопно"
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "иста је као и стара"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, fuzzy, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr "садржи превише истих знакова узастопно"
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "нема довољно класа знакова"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, fuzzy, c-format
+msgid "The password contains less than %ld character classes"
+msgstr "нема довољно класа знакова"
+
+#: src/error.c:81
 #, fuzzy
 msgid "The password does not contain enough character classes"
 msgstr "нема довољно класа знакова"
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, fuzzy, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr "садржи превише истих знакова узастопно"
+
+#: src/error.c:87
 #, fuzzy
 msgid "The password contains too many same characters consecutively"
 msgstr "садржи превише истих знакова узастопно"
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "Није понуђена лозинка"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "палиндром је"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "Непозната грешка"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
+msgstr ""
+
+#: src/error.c:113
+msgid "Bad integer value"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:120
+msgid "Setting is not of integer type"
+msgstr ""
+
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "Непозната грешка"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "Грешка у разговору"
+#~ msgid "memory allocation error"
+#~ msgstr "Грешка у разговору"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "иста је као и стара"
+
+#~ msgid "is a palindrome"
+#~ msgstr "палиндром је"
+
+#~ msgid "case changes only"
+#~ msgstr "само промене величине слова"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "сувише је слична претходној"
+
+#~ msgid "is too simple"
+#~ msgstr "сувише је једноставна"
+
+#~ msgid "is rotated"
+#~ msgstr "изокренута је"
+
+#~ msgid "not enough character classes"
+#~ msgstr "нема довољно класа знакова"
+
+#~ msgid "contains too many same characters consecutively"
+#~ msgstr "садржи превише истих знакова узастопно"
+
+#~ msgid "Error in service module"
+#~ msgstr "Грешка у услужном модулу"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "Грешка у разговору"
diff --git a/po/sr@latin.po b/po/sr@latin.po
index db855ad..825e640 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Linux-PAM\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2009-03-25 22:53+0100\n"
 "Last-Translator: Miloš Komarčević <kmilos@gmail.com>\n"
 "Language-Team: Serbian (sr) <fedora-trans-sr@redhat.com>\n"
@@ -35,158 +35,236 @@ msgstr "Ponovo unesite novu %s%slozinku: "
 msgid "Sorry, passwords do not match."
 msgstr "Izvinite, lozinke se ne podudaraju."
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "Greška u razgovoru"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "ista je kao i stara"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "palindrom je"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "samo promene veličine slova"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "suviše je slična prethodnoj"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "suviše je jednostavna"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "izokrenuta je"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr "nema dovoljno klasa znakova"
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr "sadrži previše istih znakova uzastopno"
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "Nije ponuđena lozinka"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "Greška u uslužnom modulu"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "LOŠA LOZINKA: %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "Greška u razgovoru"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "Greška u razgovoru"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "ista je kao i stara"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "palindrom je"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "suviše je slična prethodnoj"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "ista je kao i stara"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, fuzzy, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr "sadrži previše istih znakova uzastopno"
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "ista je kao i stara"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, fuzzy, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr "sadrži previše istih znakova uzastopno"
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "nema dovoljno klasa znakova"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, fuzzy, c-format
+msgid "The password contains less than %ld character classes"
+msgstr "nema dovoljno klasa znakova"
+
+#: src/error.c:81
 #, fuzzy
 msgid "The password does not contain enough character classes"
 msgstr "nema dovoljno klasa znakova"
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, fuzzy, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr "sadrži previše istih znakova uzastopno"
+
+#: src/error.c:87
 #, fuzzy
 msgid "The password contains too many same characters consecutively"
 msgstr "sadrži previše istih znakova uzastopno"
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "Nije ponuđena lozinka"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "palindrom je"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "Nepoznata greška"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
+msgstr ""
+
+#: src/error.c:113
+msgid "Bad integer value"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:120
+msgid "Setting is not of integer type"
+msgstr ""
+
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "Nepoznata greška"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "Greška u razgovoru"
+#~ msgid "memory allocation error"
+#~ msgstr "Greška u razgovoru"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "ista je kao i stara"
+
+#~ msgid "is a palindrome"
+#~ msgstr "palindrom je"
+
+#~ msgid "case changes only"
+#~ msgstr "samo promene veličine slova"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "suviše je slična prethodnoj"
+
+#~ msgid "is too simple"
+#~ msgstr "suviše je jednostavna"
+
+#~ msgid "is rotated"
+#~ msgstr "izokrenuta je"
+
+#~ msgid "not enough character classes"
+#~ msgstr "nema dovoljno klasa znakova"
+
+#~ msgid "contains too many same characters consecutively"
+#~ msgstr "sadrži previše istih znakova uzastopno"
+
+#~ msgid "Error in service module"
+#~ msgstr "Greška u uslužnom modulu"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "Greška u razgovoru"
diff --git a/po/sv.po b/po/sv.po
index e1e89d2..c14c84f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Linux-PAM\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2010-03-25 19:44+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -32,158 +32,236 @@ msgstr "Ange nytt %s%slösenord igen: "
 msgid "Sorry, passwords do not match."
 msgstr "Tyvärr, lösenorden stämmer inte överens."
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "Konversationsfel"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "är samma som det gamla"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "är ett palindrom"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "endast ändringar i gemener och versaler"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "är för likt det gamla"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "är för enkelt"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "är roterat"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr "för få teckenklasser"
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr "innehåller för många tecken av samma sort i följd"
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "Inget lösenord angivet"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "Fel i tjänstemodul"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "DÅLIGT LÖSENORD: %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "Konversationsfel"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "Konversationsfel"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "är samma som det gamla"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "är ett palindrom"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "är för likt det gamla"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "är samma som det gamla"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, fuzzy, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr "innehåller för många tecken av samma sort i följd"
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "är samma som det gamla"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, fuzzy, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr "innehåller för många tecken av samma sort i följd"
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "för få teckenklasser"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, fuzzy, c-format
+msgid "The password contains less than %ld character classes"
+msgstr "för få teckenklasser"
+
+#: src/error.c:81
 #, fuzzy
 msgid "The password does not contain enough character classes"
 msgstr "för få teckenklasser"
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, fuzzy, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr "innehåller för många tecken av samma sort i följd"
+
+#: src/error.c:87
 #, fuzzy
 msgid "The password contains too many same characters consecutively"
 msgstr "innehåller för många tecken av samma sort i följd"
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "Inget lösenord angivet"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "är ett palindrom"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "Okänt fel"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
+msgstr ""
+
+#: src/error.c:113
+msgid "Bad integer value"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:120
+msgid "Setting is not of integer type"
+msgstr ""
+
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "Okänt fel"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "Konversationsfel"
+#~ msgid "memory allocation error"
+#~ msgstr "Konversationsfel"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "är samma som det gamla"
+
+#~ msgid "is a palindrome"
+#~ msgstr "är ett palindrom"
+
+#~ msgid "case changes only"
+#~ msgstr "endast ändringar i gemener och versaler"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "är för likt det gamla"
+
+#~ msgid "is too simple"
+#~ msgstr "är för enkelt"
+
+#~ msgid "is rotated"
+#~ msgstr "är roterat"
+
+#~ msgid "not enough character classes"
+#~ msgstr "för få teckenklasser"
+
+#~ msgid "contains too many same characters consecutively"
+#~ msgstr "innehåller för många tecken av samma sort i följd"
+
+#~ msgid "Error in service module"
+#~ msgstr "Fel i tjänstemodul"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "Konversationsfel"
diff --git a/po/ta.po b/po/ta.po
index 46152d0..5964578 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam.tip.ta\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2009-04-03 22:27+0530\n"
 "Last-Translator: I. Felix <ifelix@redhat.com>\n"
 "Language-Team: Tamil <fedora-trans-ta@redhat.com>\n"
@@ -36,158 +36,236 @@ msgstr "புதிய %s%spassword மீண்டும் உள்ளிட
 msgid "Sorry, passwords do not match."
 msgstr "கடவுச்சொல் பொருந்தவில்லை."
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "உரையாடல் பிழை"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "இது பழையதைப் போல உள்ளது"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "இது ஒரு palindrome"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "எழுத்து வகை மாற்றங்கள் மட்டும்"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "இது பழையதை ஒத்தே உள்ளது"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "இது மிகவும் எளிதாக உள்ளது"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "இது சுழலக்கூடியது"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr "போதிய எழுத்து வகுப்புகள் இல்லை"
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr "நிறைய அதே எழுத்துக்கள் தொடர்ந்து கொண்டுள்ளது"
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "கடவுச்சொல் கொடுக்கப்படவில்லை"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "சேவை தொகுதியில் பிழை"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "தவறான கடவுச்சொல்: %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "உரையாடல் பிழை"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "உரையாடல் பிழை"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "இது பழையதைப் போல உள்ளது"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "இது ஒரு palindrome"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "இது பழையதை ஒத்தே உள்ளது"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "இது பழையதைப் போல உள்ளது"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, fuzzy, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr "நிறைய அதே எழுத்துக்கள் தொடர்ந்து கொண்டுள்ளது"
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "இது பழையதைப் போல உள்ளது"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, fuzzy, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr "நிறைய அதே எழுத்துக்கள் தொடர்ந்து கொண்டுள்ளது"
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "போதிய எழுத்து வகுப்புகள் இல்லை"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, fuzzy, c-format
+msgid "The password contains less than %ld character classes"
+msgstr "போதிய எழுத்து வகுப்புகள் இல்லை"
+
+#: src/error.c:81
 #, fuzzy
 msgid "The password does not contain enough character classes"
 msgstr "போதிய எழுத்து வகுப்புகள் இல்லை"
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, fuzzy, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr "நிறைய அதே எழுத்துக்கள் தொடர்ந்து கொண்டுள்ளது"
+
+#: src/error.c:87
 #, fuzzy
 msgid "The password contains too many same characters consecutively"
 msgstr "நிறைய அதே எழுத்துக்கள் தொடர்ந்து கொண்டுள்ளது"
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "கடவுச்சொல் கொடுக்கப்படவில்லை"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "இது ஒரு palindrome"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "தெரியாத பிழை"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
+msgstr ""
+
+#: src/error.c:113
+msgid "Bad integer value"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:120
+msgid "Setting is not of integer type"
+msgstr ""
+
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "தெரியாத பிழை"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "உரையாடல் பிழை"
+#~ msgid "memory allocation error"
+#~ msgstr "உரையாடல் பிழை"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "இது பழையதைப் போல உள்ளது"
+
+#~ msgid "is a palindrome"
+#~ msgstr "இது ஒரு palindrome"
+
+#~ msgid "case changes only"
+#~ msgstr "எழுத்து வகை மாற்றங்கள் மட்டும்"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "இது பழையதை ஒத்தே உள்ளது"
+
+#~ msgid "is too simple"
+#~ msgstr "இது மிகவும் எளிதாக உள்ளது"
+
+#~ msgid "is rotated"
+#~ msgstr "இது சுழலக்கூடியது"
+
+#~ msgid "not enough character classes"
+#~ msgstr "போதிய எழுத்து வகுப்புகள் இல்லை"
+
+#~ msgid "contains too many same characters consecutively"
+#~ msgstr "நிறைய அதே எழுத்துக்கள் தொடர்ந்து கொண்டுள்ளது"
+
+#~ msgid "Error in service module"
+#~ msgstr "சேவை தொகுதியில் பிழை"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "உரையாடல் பிழை"
diff --git a/po/te.po b/po/te.po
index 3eae490..d34e21c 100644
--- a/po/te.po
+++ b/po/te.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam.tip.te\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2009-04-14 15:14+0530\n"
 "Last-Translator: Krishna Babu K <kkrothap@redhat.com>\n"
 "Language-Team: Telugu <en@li.org>\n"
@@ -36,158 +36,236 @@ msgstr "కొత్త %s%sసంకేతపదమును మరలాటై
 msgid "Sorry, passwords do not match."
 msgstr "క్షమించాలి, సంకేతపదము సరిపోలలేదు."
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "సంభాషణా దోషము"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "ఇది పాతదేనా"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "పాలిండ్రోమా"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "కేస్ మార్పులు మాత్రమే"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "పాతదానికి మరీ దగ్గరపోలికగావుంది"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "మరీ సరళంగావుంది"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "ఇది పర్యాయంగానా"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr "సరిపోవునంత కారెక్టర్ క్లాసెస్ లేవు"
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr "ఒకదానితర్వాత వొకటి అదే అక్షరాలు చాలావున్నాయి"
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "ఎటువంటి సంకేతపదము యివ్వలేదు"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "సేవా మాడ్యూల్‌నందు దోషము"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "చెడ్డ సంకేతపదము: %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "సంభాషణా దోషము"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "సంభాషణా దోషము"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "ఇది పాతదేనా"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "పాలిండ్రోమా"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "పాతదానికి మరీ దగ్గరపోలికగావుంది"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "ఇది పాతదేనా"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, fuzzy, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr "ఒకదానితర్వాత వొకటి అదే అక్షరాలు చాలావున్నాయి"
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "ఇది పాతదేనా"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, fuzzy, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr "ఒకదానితర్వాత వొకటి అదే అక్షరాలు చాలావున్నాయి"
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "సరిపోవునంత కారెక్టర్ క్లాసెస్ లేవు"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, fuzzy, c-format
+msgid "The password contains less than %ld character classes"
+msgstr "సరిపోవునంత కారెక్టర్ క్లాసెస్ లేవు"
+
+#: src/error.c:81
 #, fuzzy
 msgid "The password does not contain enough character classes"
 msgstr "సరిపోవునంత కారెక్టర్ క్లాసెస్ లేవు"
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, fuzzy, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr "ఒకదానితర్వాత వొకటి అదే అక్షరాలు చాలావున్నాయి"
+
+#: src/error.c:87
 #, fuzzy
 msgid "The password contains too many same characters consecutively"
 msgstr "ఒకదానితర్వాత వొకటి అదే అక్షరాలు చాలావున్నాయి"
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "ఎటువంటి సంకేతపదము యివ్వలేదు"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "పాలిండ్రోమా"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "తెలియని దోషము"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
+msgstr ""
+
+#: src/error.c:113
+msgid "Bad integer value"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:120
+msgid "Setting is not of integer type"
+msgstr ""
+
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "తెలియని దోషము"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "సంభాషణా దోషము"
+#~ msgid "memory allocation error"
+#~ msgstr "సంభాషణా దోషము"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "ఇది పాతదేనా"
+
+#~ msgid "is a palindrome"
+#~ msgstr "పాలిండ్రోమా"
+
+#~ msgid "case changes only"
+#~ msgstr "కేస్ మార్పులు మాత్రమే"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "పాతదానికి మరీ దగ్గరపోలికగావుంది"
+
+#~ msgid "is too simple"
+#~ msgstr "మరీ సరళంగావుంది"
+
+#~ msgid "is rotated"
+#~ msgstr "ఇది పర్యాయంగానా"
+
+#~ msgid "not enough character classes"
+#~ msgstr "సరిపోవునంత కారెక్టర్ క్లాసెస్ లేవు"
+
+#~ msgid "contains too many same characters consecutively"
+#~ msgstr "ఒకదానితర్వాత వొకటి అదే అక్షరాలు చాలావున్నాయి"
+
+#~ msgid "Error in service module"
+#~ msgstr "సేవా మాడ్యూల్‌నందు దోషము"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "సంభాషణా దోషము"
diff --git a/po/tr.po b/po/tr.po
index 755e986..38485b8 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Linux-PAM\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2006-05-03 19:00+0200\n"
 "Last-Translator: Bahadır Kandemir <bahadir@pardus.org.tr>\n"
 "Language-Team: Türkçe <tr@li.org>\n"
@@ -33,158 +33,236 @@ msgstr "Yeni %s%sparolasını tekrar girin: "
 msgid "Sorry, passwords do not match."
 msgstr "Üzgünüm, parolalar birbirine uymuyor."
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "Etkileşim hatası"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "eskisi ile aynı"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "bir palindrom (iki yönden aynı şekilde okunuyor)"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "sadece büyük-küçük harf değişimi"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "eskisine çok benziyor"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "çok basit"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "değiştirilmiş"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr "yetersiz karakter sınıfı"
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr "aynı karakterleri arka arkaya içeriyor"
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "Parola girilmedi"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "Servis modülünde hata"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "KÖTÜ PAROLA: %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "Etkileşim hatası"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "Etkileşim hatası"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "eskisi ile aynı"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "bir palindrom (iki yönden aynı şekilde okunuyor)"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "eskisine çok benziyor"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "eskisi ile aynı"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, fuzzy, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr "aynı karakterleri arka arkaya içeriyor"
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "eskisi ile aynı"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, fuzzy, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr "aynı karakterleri arka arkaya içeriyor"
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "yetersiz karakter sınıfı"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, fuzzy, c-format
+msgid "The password contains less than %ld character classes"
+msgstr "yetersiz karakter sınıfı"
+
+#: src/error.c:81
 #, fuzzy
 msgid "The password does not contain enough character classes"
 msgstr "yetersiz karakter sınıfı"
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, fuzzy, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr "aynı karakterleri arka arkaya içeriyor"
+
+#: src/error.c:87
 #, fuzzy
 msgid "The password contains too many same characters consecutively"
 msgstr "aynı karakterleri arka arkaya içeriyor"
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "Parola girilmedi"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "bir palindrom (iki yönden aynı şekilde okunuyor)"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "Bilinmeyen hata"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
+msgstr ""
+
+#: src/error.c:113
+msgid "Bad integer value"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:120
+msgid "Setting is not of integer type"
+msgstr ""
+
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "Bilinmeyen hata"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "Etkileşim hatası"
+#~ msgid "memory allocation error"
+#~ msgstr "Etkileşim hatası"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "eskisi ile aynı"
+
+#~ msgid "is a palindrome"
+#~ msgstr "bir palindrom (iki yönden aynı şekilde okunuyor)"
+
+#~ msgid "case changes only"
+#~ msgstr "sadece büyük-küçük harf değişimi"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "eskisine çok benziyor"
+
+#~ msgid "is too simple"
+#~ msgstr "çok basit"
+
+#~ msgid "is rotated"
+#~ msgstr "değiştirilmiş"
+
+#~ msgid "not enough character classes"
+#~ msgstr "yetersiz karakter sınıfı"
+
+#~ msgid "contains too many same characters consecutively"
+#~ msgstr "aynı karakterleri arka arkaya içeriyor"
+
+#~ msgid "Error in service module"
+#~ msgstr "Servis modülünde hata"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "Etkileşim hatası"
diff --git a/po/uk.po b/po/uk.po
index cd89ce5..34bdc3c 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Linux-PAM.uk\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2010-03-07 13:00+0200\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
@@ -34,158 +34,236 @@ msgstr "Повторіть новий пароль %s%s: "
 msgid "Sorry, passwords do not match."
 msgstr "Вибачте, паролі не збігаються."
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "Помилка обміну даними"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "такий самий, як і старий"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "— це паліндром"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "тільки зміни в регістрі"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "занадто подібний до старого"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "занадто простий"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "чергується"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr "недостатнє використання класів символів"
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr "містить забагато послідовних однакових символів"
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "Пароль не встановлено"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "Помилка в модулі служби"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "ПОГАНИЙ ПАРОЛЬ: %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "Помилка обміну даними"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "Помилка обміну даними"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "такий самий, як і старий"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "— це паліндром"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "занадто подібний до старого"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "такий самий, як і старий"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, fuzzy, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr "містить забагато послідовних однакових символів"
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "такий самий, як і старий"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, fuzzy, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr "містить забагато послідовних однакових символів"
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "недостатнє використання класів символів"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, fuzzy, c-format
+msgid "The password contains less than %ld character classes"
+msgstr "недостатнє використання класів символів"
+
+#: src/error.c:81
 #, fuzzy
 msgid "The password does not contain enough character classes"
 msgstr "недостатнє використання класів символів"
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, fuzzy, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr "містить забагато послідовних однакових символів"
+
+#: src/error.c:87
 #, fuzzy
 msgid "The password contains too many same characters consecutively"
 msgstr "містить забагато послідовних однакових символів"
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "Пароль не встановлено"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "— це паліндром"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "Невідома помилка"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
+msgstr ""
+
+#: src/error.c:113
+msgid "Bad integer value"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:120
+msgid "Setting is not of integer type"
+msgstr ""
+
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "Невідома помилка"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "Помилка обміну даними"
+#~ msgid "memory allocation error"
+#~ msgstr "Помилка обміну даними"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "такий самий, як і старий"
+
+#~ msgid "is a palindrome"
+#~ msgstr "— це паліндром"
+
+#~ msgid "case changes only"
+#~ msgstr "тільки зміни в регістрі"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "занадто подібний до старого"
+
+#~ msgid "is too simple"
+#~ msgstr "занадто простий"
+
+#~ msgid "is rotated"
+#~ msgstr "чергується"
+
+#~ msgid "not enough character classes"
+#~ msgstr "недостатнє використання класів символів"
+
+#~ msgid "contains too many same characters consecutively"
+#~ msgstr "містить забагато послідовних однакових символів"
+
+#~ msgid "Error in service module"
+#~ msgstr "Помилка в модулі служби"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "Помилка обміну даними"
diff --git a/po/vi.po b/po/vi.po
index 2d6fc3e..c0790f8 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2011-06-04 17:58+0700\n"
 "Last-Translator: Lê Trường An <truongan@linuxmail.org>\n"
 "Language-Team: Vietnamese <du-an-most@lists.hanoilug.org>\n"
@@ -33,158 +33,236 @@ msgstr "Nhập lại mật khẩu %s%s mới: "
 msgid "Sorry, passwords do not match."
 msgstr "Xin lỗi, mật khẩu không khớp."
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "Lỗi giao tiếp"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "là giống như cũ"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "là một xâu palindrome"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "chỉ thay đổi chữ thường/hoa"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "quá giống cái cũ"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "quá đơn giản"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "được sử dụng lại"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr "không đủ các lớp nhân vật"
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr "chứa quá nhiều kí tự giống nhau liên tiếp"
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "Không có mật khẩu được cung cấp"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "Lỗi trong mô-đun dịch vụ"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "Mật khẩu không an toàn: %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "Lỗi giao tiếp"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "Lỗi giao tiếp"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "là giống như cũ"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "là một xâu palindrome"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "quá giống cái cũ"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "là giống như cũ"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, fuzzy, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr "chứa quá nhiều kí tự giống nhau liên tiếp"
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "là giống như cũ"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, fuzzy, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr "chứa quá nhiều kí tự giống nhau liên tiếp"
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "không đủ các lớp nhân vật"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, fuzzy, c-format
+msgid "The password contains less than %ld character classes"
+msgstr "không đủ các lớp nhân vật"
+
+#: src/error.c:81
 #, fuzzy
 msgid "The password does not contain enough character classes"
 msgstr "không đủ các lớp nhân vật"
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, fuzzy, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr "chứa quá nhiều kí tự giống nhau liên tiếp"
+
+#: src/error.c:87
 #, fuzzy
 msgid "The password contains too many same characters consecutively"
 msgstr "chứa quá nhiều kí tự giống nhau liên tiếp"
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "Không có mật khẩu được cung cấp"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "là một xâu palindrome"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "Lỗi không rõ"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
+msgstr ""
+
+#: src/error.c:113
+msgid "Bad integer value"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:120
+msgid "Setting is not of integer type"
+msgstr ""
+
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "Lỗi không rõ"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "Lỗi giao tiếp"
+#~ msgid "memory allocation error"
+#~ msgstr "Lỗi giao tiếp"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "là giống như cũ"
+
+#~ msgid "is a palindrome"
+#~ msgstr "là một xâu palindrome"
+
+#~ msgid "case changes only"
+#~ msgstr "chỉ thay đổi chữ thường/hoa"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "quá giống cái cũ"
+
+#~ msgid "is too simple"
+#~ msgstr "quá đơn giản"
+
+#~ msgid "is rotated"
+#~ msgstr "được sử dụng lại"
+
+#~ msgid "not enough character classes"
+#~ msgstr "không đủ các lớp nhân vật"
+
+#~ msgid "contains too many same characters consecutively"
+#~ msgstr "chứa quá nhiều kí tự giống nhau liên tiếp"
+
+#~ msgid "Error in service module"
+#~ msgstr "Lỗi trong mô-đun dịch vụ"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "Lỗi giao tiếp"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ad4739e..b6cc8f4 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam.tip\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2009-04-03 12:47+1000\n"
 "Last-Translator: Leah Liu <lliu@redhat.com>\n"
 "Language-Team: Simplified Chinese <zh@li.org>\n"
@@ -34,158 +34,236 @@ msgstr "重新输入新的 %s%s密码："
 msgid "Sorry, passwords do not match."
 msgstr "抱歉，密码不匹配。"
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "转换错误"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "与旧密码相同"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "是回文"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "仅更改了大小写"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "与旧密码过于相似"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "过于简单"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "是旧密码的循环"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr "没有足够的字符分类"
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr "包含过多连续相同的字符"
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "密码未提供"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "服务模块存在错误"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "无效的密码： %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "转换错误"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "转换错误"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "与旧密码相同"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "是回文"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "与旧密码过于相似"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "与旧密码相同"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, fuzzy, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr "包含过多连续相同的字符"
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "与旧密码相同"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, fuzzy, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr "包含过多连续相同的字符"
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "没有足够的字符分类"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, fuzzy, c-format
+msgid "The password contains less than %ld character classes"
+msgstr "没有足够的字符分类"
+
+#: src/error.c:81
 #, fuzzy
 msgid "The password does not contain enough character classes"
 msgstr "没有足够的字符分类"
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, fuzzy, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr "包含过多连续相同的字符"
+
+#: src/error.c:87
 #, fuzzy
 msgid "The password contains too many same characters consecutively"
 msgstr "包含过多连续相同的字符"
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "密码未提供"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "是回文"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "未知的错误"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
+msgstr ""
+
+#: src/error.c:113
+msgid "Bad integer value"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:120
+msgid "Setting is not of integer type"
+msgstr ""
+
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "未知的错误"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "转换错误"
+#~ msgid "memory allocation error"
+#~ msgstr "转换错误"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "与旧密码相同"
+
+#~ msgid "is a palindrome"
+#~ msgstr "是回文"
+
+#~ msgid "case changes only"
+#~ msgstr "仅更改了大小写"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "与旧密码过于相似"
+
+#~ msgid "is too simple"
+#~ msgstr "过于简单"
+
+#~ msgid "is rotated"
+#~ msgstr "是旧密码的循环"
+
+#~ msgid "not enough character classes"
+#~ msgstr "没有足够的字符分类"
+
+#~ msgid "contains too many same characters consecutively"
+#~ msgstr "包含过多连续相同的字符"
+
+#~ msgid "Error in service module"
+#~ msgstr "服务模块存在错误"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "转换错误"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 2953e62..ee27c7c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam.tip\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2009-04-06 21:21+1000\n"
 "Last-Translator: Terry Chuang <tchuang@redhat.com>\n"
 "Language-Team:  <zh@li.org>\n"
@@ -33,158 +33,236 @@ msgstr "再次輸入新的 %s%s密碼："
 msgid "Sorry, passwords do not match."
 msgstr "抱歉，密碼不符合。"
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "交談錯誤"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "與舊的密碼相同"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "是一個回文"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "僅變更大小寫"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "與舊的密碼太相似"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "太簡單"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "已旋轉"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr "字元類別不足"
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr "包含了太多連續的相同字元"
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "未提供密碼"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "服務模組發生錯誤"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "不良的密碼： %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "交談錯誤"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "交談錯誤"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "與舊的密碼相同"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "是一個回文"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "與舊的密碼太相似"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "與舊的密碼相同"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, fuzzy, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr "包含了太多連續的相同字元"
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "與舊的密碼相同"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, fuzzy, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr "包含了太多連續的相同字元"
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "字元類別不足"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, fuzzy, c-format
+msgid "The password contains less than %ld character classes"
+msgstr "字元類別不足"
+
+#: src/error.c:81
 #, fuzzy
 msgid "The password does not contain enough character classes"
 msgstr "字元類別不足"
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, fuzzy, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr "包含了太多連續的相同字元"
+
+#: src/error.c:87
 #, fuzzy
 msgid "The password contains too many same characters consecutively"
 msgstr "包含了太多連續的相同字元"
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "未提供密碼"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "是一個回文"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "未知的錯誤"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
+msgstr ""
+
+#: src/error.c:113
+msgid "Bad integer value"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:120
+msgid "Setting is not of integer type"
+msgstr ""
+
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
+msgstr ""
+
+#: src/error.c:133
+msgid "Fatal failure"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "未知的錯誤"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "交談錯誤"
+#~ msgid "memory allocation error"
+#~ msgstr "交談錯誤"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "與舊的密碼相同"
+
+#~ msgid "is a palindrome"
+#~ msgstr "是一個回文"
+
+#~ msgid "case changes only"
+#~ msgstr "僅變更大小寫"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "與舊的密碼太相似"
+
+#~ msgid "is too simple"
+#~ msgstr "太簡單"
+
+#~ msgid "is rotated"
+#~ msgstr "已旋轉"
+
+#~ msgid "not enough character classes"
+#~ msgstr "字元類別不足"
+
+#~ msgid "contains too many same characters consecutively"
+#~ msgstr "包含了太多連續的相同字元"
+
+#~ msgid "Error in service module"
+#~ msgstr "服務模組發生錯誤"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "交談錯誤"
diff --git a/po/zu.po b/po/zu.po
index b9ef800..b6fa6c8 100644
--- a/po/zu.po
+++ b/po/zu.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Linux-PAM\n"
 "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2011-09-16 14:36+0200\n"
+"POT-Creation-Date: 2011-09-21 11:38+0200\n"
 "PO-Revision-Date: 2006-11-03 12:03\n"
 "Last-Translator: Novell Language <language@novell.com>\n"
 "Language-Team: Novell Language <language@novell.com>\n"
@@ -28,156 +28,228 @@ msgstr "Thayipha kabusha %s%siphasiwedi entsha: "
 msgid "Sorry, passwords do not match."
 msgstr "Uxolo, amaphasiwedi awahambelani."
 
-#: src/pam_pwquality.c:104
-#, fuzzy
-msgid "memory allocation error"
-msgstr "Iphutha lengxoxo"
-
-#: src/pam_pwquality.c:106
-msgid "is the same as the old one"
-msgstr "iyafana nendala"
-
-#: src/pam_pwquality.c:108
-msgid "is a palindrome"
-msgstr "iyi-palindrome"
-
-#: src/pam_pwquality.c:110
-msgid "case changes only"
-msgstr "kushintshe onobumba kuphela"
-
-#: src/pam_pwquality.c:112
-msgid "is too similar to the old one"
-msgstr "ifana kakhulu nendala"
-
-#: src/pam_pwquality.c:118
-msgid "is too simple"
-msgstr "ilula kakhulu"
-
-#: src/pam_pwquality.c:120
-msgid "is rotated"
-msgstr "ijikelezisiwe"
-
-#: src/pam_pwquality.c:122
-msgid "not enough character classes"
-msgstr ""
-
-#: src/pam_pwquality.c:124
-msgid "contains too many same characters consecutively"
-msgstr ""
-
-#: src/pam_pwquality.c:126 src/pwscore.c:57
-msgid "No password supplied"
-msgstr "Ayikho iphasiwedi enikeziwe"
-
-#: src/pam_pwquality.c:130
-msgid "Error in service module"
-msgstr "Iphutha kwimoduli yesevisi"
-
-#: src/pam_pwquality.c:198
+#: src/pam_pwquality.c:168
 #, c-format
 msgid "BAD PASSWORD: %s"
 msgstr "IPHASIWEDI ENGASEBENZI: %s"
 
-#: src/pwscore.c:20
+#: src/pwscore.c:21
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/pwscore.c:21
+#: src/pwscore.c:22
 #, c-format
 msgid ""
 "       The command reads the password to be scored from the standard input.\n"
 msgstr ""
 
-#: src/pwscore.c:31 src/pwmake.c:28
+#: src/pwscore.c:45 src/pwscore.c:53 src/pwscore.c:58
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/pwscore.c:45
+msgid "Could not obtain the password to be scored"
+msgstr ""
+
+#: src/pwscore.c:65
+#, c-format
+msgid ""
+"Password quality check failed:\n"
+" %s\n"
+msgstr ""
+
+#: src/pwmake.c:21
+#, c-format
+msgid "Usage: %s <entropy-bits>\n"
+msgstr ""
+
+#: src/error.c:31
+#, fuzzy
+msgid "Memory allocation error when setting"
+msgstr "Iphutha lengxoxo"
+
+#: src/error.c:35
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "Iphutha lengxoxo"
 
-#: src/pwscore.c:33
+#: src/error.c:37
 #, fuzzy
 msgid "The password is the same as the old one"
 msgstr "iyafana nendala"
 
-#: src/pwscore.c:35
+#: src/error.c:39
 #, fuzzy
 msgid "The password is a palindrome"
 msgstr "iyi-palindrome"
 
-#: src/pwscore.c:37
+#: src/error.c:41
 msgid "The password differs with case changes only"
 msgstr ""
 
-#: src/pwscore.c:39
+#: src/error.c:43
 #, fuzzy
 msgid "The password is too similar to the old one"
 msgstr "ifana kakhulu nendala"
 
-#: src/pwscore.c:41
+#: src/error.c:46
+#, fuzzy, c-format
+msgid "The password contains less than %ld digits"
+msgstr "iyafana nendala"
+
+#: src/error.c:49
 msgid "The password contains too few digits"
 msgstr ""
 
-#: src/pwscore.c:43
+#: src/error.c:52
+#, c-format
+msgid "The password contains less than %ld uppercase letters"
+msgstr ""
+
+#: src/error.c:55
 msgid "The password contains too few uppercase letters"
 msgstr ""
 
-#: src/pwscore.c:45
+#: src/error.c:58
+#, fuzzy, c-format
+msgid "The password contains less than %ld lowercase letters"
+msgstr "iyafana nendala"
+
+#: src/error.c:61
 msgid "The password contains too few lowercase letters"
 msgstr ""
 
-#: src/pwscore.c:47
+#: src/error.c:64
+#, c-format
+msgid "The password contains less than %ld non-alphanumeric characters"
+msgstr ""
+
+#: src/error.c:67
 msgid "The password contains too few non-alphanumeric characters"
 msgstr ""
 
-#: src/pwscore.c:49
+#: src/error.c:70
+#, fuzzy, c-format
+msgid "The password is shorter than %ld characters"
+msgstr "ifana kakhulu nendala"
+
+#: src/error.c:73
 msgid "The password is too short"
 msgstr ""
 
-#: src/pwscore.c:51
+#: src/error.c:75
 msgid "The password is just rotated old one"
 msgstr ""
 
-#: src/pwscore.c:53
+#: src/error.c:78
+#, c-format
+msgid "The password contains less than %ld character classes"
+msgstr ""
+
+#: src/error.c:81
 msgid "The password does not contain enough character classes"
 msgstr ""
 
-#: src/pwscore.c:55
+#: src/error.c:84
+#, c-format
+msgid "The password contains more than %ld same characters consecutively"
+msgstr ""
+
+#: src/error.c:87
 msgid "The password contains too many same characters consecutively"
 msgstr ""
 
-#: src/pwscore.c:59
-#, c-format
-msgid "The password fails the dictionary check - %s"
+#: src/error.c:89
+msgid "No password supplied"
+msgstr "Ayikho iphasiwedi enikeziwe"
+
+#: src/error.c:91
+msgid "Cannot obtain random numbers from the RNG device"
 msgstr ""
 
-#: src/pwscore.c:62 src/pwmake.c:34
-msgid "Unknown error"
+#: src/error.c:93
+msgid "Password generation failed - required entropy too low for settings"
+msgstr ""
+
+#: src/error.c:96 src/error.c:99
+#, fuzzy
+msgid "The password fails the dictionary check"
+msgstr "iyi-palindrome"
+
+#: src/error.c:102 src/error.c:106
+#, fuzzy
+msgid "Unknown setting"
 msgstr "Iphutha elingaziwa"
 
-#: src/pwscore.c:91
-#, c-format
-msgid "Error: %s\n"
+#: src/error.c:109
+msgid "Bad integer value of setting"
 msgstr ""
 
-#: src/pwscore.c:100
+#: src/error.c:113
+msgid "Bad integer value"
+msgstr ""
+
+#: src/error.c:116
 #, c-format
-msgid "Password quality check failed: %s\n"
+msgid "Setting %s is not of integer type"
+msgstr ""
+
+#: src/error.c:120
+msgid "Setting is not of integer type"
 msgstr ""
 
-#: src/pwmake.c:20
+#: src/error.c:123
 #, c-format
-msgid "Usage: %s <entropy-bits>\n"
+msgid "Setting %s is not of string type"
 msgstr ""
 
-#: src/pwmake.c:30
-msgid "Cannot obtain random numbers from the RNG device"
+#: src/error.c:127
+msgid "Setting is not of string type"
 msgstr ""
 
-#: src/pwmake.c:32
-msgid "Password generation failed - required entropy too low for settings"
+#: src/error.c:129
+msgid "Opening the configuration file failed"
+msgstr ""
+
+#: src/error.c:131
+msgid "The configuration file is malformed"
 msgstr ""
 
-#: src/pwmake.c:56
+#: src/error.c:133
+msgid "Fatal failure"
+msgstr ""
+
+#: src/error.c:135
+msgid "Unknown error"
+msgstr "Iphutha elingaziwa"
+
 #, fuzzy
-msgid "Error: Memory allocation error"
-msgstr "Iphutha lengxoxo"
+#~ msgid "memory allocation error"
+#~ msgstr "Iphutha lengxoxo"
+
+#~ msgid "is the same as the old one"
+#~ msgstr "iyafana nendala"
+
+#~ msgid "is a palindrome"
+#~ msgstr "iyi-palindrome"
+
+#~ msgid "case changes only"
+#~ msgstr "kushintshe onobumba kuphela"
+
+#~ msgid "is too similar to the old one"
+#~ msgstr "ifana kakhulu nendala"
+
+#~ msgid "is too simple"
+#~ msgstr "ilula kakhulu"
+
+#~ msgid "is rotated"
+#~ msgstr "ijikelezisiwe"
+
+#~ msgid "Error in service module"
+#~ msgstr "Iphutha kwimoduli yesevisi"
+
+#, fuzzy
+#~ msgid "Error: Memory allocation error"
+#~ msgstr "Iphutha lengxoxo"