Automated l10n update (.po files)

author: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2014-09-29 03:08:03 -0500
committer: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2014-09-29 03:08:03 -0500
commit: 242434109c14a494dee7738b9c343f5947d20506 (patch)
tree: ea25930767128361a7669f1a25a479a66ccdfbeb /tde-i18n-pa/messages/tdepim
parent: 8819501c6a160b7ae106b1a968bc953b0f0bc465 (diff)
download: tde-i18n-242434109c14a494dee7738b9c343f5947d20506.tar.gz
tde-i18n-242434109c14a494dee7738b9c343f5947d20506.zip
46 files changed, 11253 insertions, 8000 deletions
diff --git a/tde-i18n-pa/messages/tdepim/kaddressbook.po b/tde-i18n-pa/messages/tdepim/kaddressbook.po
index 71593e3a8ce..5795c21511d 100644
--- a/tde-i18n-pa/messages/tdepim/kaddressbook.po
+++ b/tde-i18n-pa/messages/tdepim/kaddressbook.po
@@ -6,17 +6,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kaddressbook\n"
-"POT-Creation-Date: 2008-08-19 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-04-20 17:43+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: customfieldswidget.h:156
+#: customfieldswidget.h:159
 msgid "Custom Fields"
 msgstr "ਪਰਚਲਣ ਖੇਤਰ"
 
@@ -1028,7 +1029,7 @@ msgid ""
 "Address Types"
 msgstr "ਸਿਰਨਾਵਾਂ ਕਿਸਮਾਂ"
 
-#: addresseeeditordialog.cpp:39 undocmds.cpp:197
+#: addresseeeditordialog.cpp:39 undocmds.cpp:213
 msgid "Edit Contact"
 msgstr "ਸੰਪਰਕ ਸੋਧ"
 
@@ -1036,7 +1037,7 @@ msgstr "ਸੰਪਰਕ ਸੋਧ"
 msgid "Edit Contact '%1'"
 msgstr "'%1' ਸੰਪਰਕ ਸੋਧ"
 
-#: addresseeeditorextension.cpp:68
+#: addresseeeditorextension.cpp:74
 msgid "Contact Editor"
 msgstr "ਸੰਪਰਕ ਸੰਪਾਦਕ"
 
@@ -1074,7 +1075,7 @@ msgstr "%1:"
 msgid "Blog feed:"
 msgstr ""
 
-#: addresseeeditorwidget.cpp:292 tdeabcore.cpp:1356
+#: addresseeeditorwidget.cpp:292 kabcore.cpp:1418
 msgid "Select Categories..."
 msgstr "ਵਰਗ ਚੋਣ..."
 
@@ -1201,48 +1202,48 @@ msgstr "ਸਮਾਂ"
 msgid "Date & Time"
 msgstr "ਮਿਤੀ ਤੇ ਸਫਾ"
 
-#: customfieldswidget.cpp:405
+#: customfieldswidget.cpp:433
 msgid "A field with the same name already exists, please choose another one."
 msgstr ""
 
-#: customfieldswidget.cpp:434
+#: customfieldswidget.cpp:462
 msgid "Remove Field"
 msgstr "ਖੇਤਰ ਹਟਾਓ"
 
-#: customfieldswidget.cpp:435
+#: customfieldswidget.cpp:463
 msgid "Select the field you want to remove:"
 msgstr ""
 
-#: customfieldswidget.cpp:466
+#: customfieldswidget.cpp:494
 msgid "Add Field..."
 msgstr "ਖੇਤਰ ਸ਼ਾਮਿਲ..."
 
-#: customfieldswidget.cpp:469
+#: customfieldswidget.cpp:497
 msgid "Remove Field..."
 msgstr "ਖੇਤਰ ਹਟਾਓ..."
 
-#: distributionlisteditor.cpp:161
+#: distributionlisteditor.cpp:165
 #, fuzzy
 msgid "Edit Distribution List"
 msgstr "ਨਵੀਂ ਵੰਡ ਸੂਚੀ"
 
-#: distributionlisteditor.cpp:170 filtereditdialog.cpp:122
+#: distributionlisteditor.cpp:174 filtereditdialog.cpp:122
 #: simpleaddresseeeditor.cpp:70
 msgid "Name:"
 msgstr "ਨਾਂ:"
 
-#: distributionlisteditor.cpp:180
+#: distributionlisteditor.cpp:184
 #, fuzzy
 msgid "Distribution list members:"
 msgstr "ਨਵੀਂ ਵੰਡ ਸੂਚੀ"
 
-#: distributionlisteditor.cpp:259
+#: distributionlisteditor.cpp:264
 msgid ""
 "A distribution list with the name %1 already exists. Please choose another "
 "name."
 msgstr ""
 
-#: distributionlisteditor.cpp:259
+#: distributionlisteditor.cpp:264
 msgid "Name in Use"
 msgstr ""
 
@@ -1359,11 +1360,11 @@ msgstr ""
 msgid "Edit Address Book Filters"
 msgstr ""
 
-#: filtereditdialog.cpp:269
+#: features/resourceselection.cpp:187 filtereditdialog.cpp:269
 msgid "&Add..."
 msgstr "ਸ਼ਾਮਿਲ(&A)..."
 
-#: filtereditdialog.cpp:270
+#: features/resourceselection.cpp:182 filtereditdialog.cpp:270
 msgid "&Edit..."
 msgstr "ਸੋਧ(&E)..."
 
@@ -1427,7 +1428,7 @@ msgstr ""
 msgid "Reset"
 msgstr "ਮੁੜ ਨਿਰਧਾਰਨ"
 
-#: imagewidget.cpp:258
+#: imagewidget.cpp:260
 msgid "Picture"
 msgstr "ਤਸਵੀਰ"
 
@@ -1474,360 +1475,407 @@ msgstr "ਦਿੱਖ ਖੇਤਰ"
 msgid "All Fields"
 msgstr "ਸਭ ਖੇਤਰ"
 
-#: tdeabcore.cpp:115
+#: kabcore.cpp:117
 msgid "Unable to load '%1'."
 msgstr ""
 
-#: tdeabcore.cpp:121 ldapsearchdialog.cpp:95 ldapsearchdialog.cpp:307
+#: kabcore.cpp:123 ldapsearchdialog.cpp:95 ldapsearchdialog.cpp:307
 msgid "Department"
 msgstr "ਵਿਭਾਗ"
 
-#: tdeabcore.cpp:124
+#: kabcore.cpp:126
 msgid "Profession"
 msgstr "ਕਿੱਤਾ"
 
-#: tdeabcore.cpp:126
+#: kabcore.cpp:128
 msgid "Assistant's Name"
 msgstr "ਸਹਾਇਕ ਦਾ ਨਾਂ"
 
-#: tdeabcore.cpp:128
+#: kabcore.cpp:130
 msgid "Manager's Name"
 msgstr "ਮੁੱਖੀ ਦਾ ਨਾਂ"
 
-#: tdeabcore.cpp:130
+#: kabcore.cpp:132
 #, fuzzy
 msgid "Partner's Name"
 msgstr "ਮੁੱਖੀ ਦਾ ਨਾਂ"
 
-#: tdeabcore.cpp:132
+#: kabcore.cpp:134
 msgid "Office"
 msgstr "ਦਫ਼ਤਰ"
 
-#: tdeabcore.cpp:134
+#: kabcore.cpp:136
 msgid "IM Address"
 msgstr ""
 
-#: tdeabcore.cpp:136
+#: kabcore.cpp:138
 msgid "Anniversary"
 msgstr "ਵਰੇ ਗੰਢ"
 
-#: tdeabcore.cpp:138
+#: kabcore.cpp:140
 msgid "Blog"
 msgstr "Blog"
 
-#: tdeabcore.cpp:297
+#: kabcore.cpp:315
 msgid "KAddressBook"
 msgstr "ਕੇਸਿਰਨਾਵਾਂ ਕਿਤਾਬ"
 
-#: tdeabcore.cpp:298
+#: kabcore.cpp:316
 msgid "The TDE Address Book"
 msgstr "ਕੇਡੀਈ ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ"
 
-#: tdeabcore.cpp:300
-msgid "(c) 1997-2005, The TDE PIM Team"
+#: kabcore.cpp:318
+#, fuzzy
+msgid ""
+"(c) 2008-2010, The Trinity Team\n"
+"(c) 1997-2005, The KDE PIM Team"
 msgstr "(c) 1997-2005, TDE PIM ਟੀਮ"
 
-#: tdeabcore.cpp:301
+#: kabcore.cpp:319
 msgid "Current maintainer"
 msgstr "ਮੌਜੂਦਾ ਪ੍ਰਬੰਧਕ"
 
-#: tdeabcore.cpp:302
+#: kabcore.cpp:320
+#, fuzzy
+msgid "Previous maintainer"
+msgstr "ਮੌਜੂਦਾ ਪ੍ਰਬੰਧਕ"
+
+#: kabcore.cpp:321
 msgid "Original author"
 msgstr "ਅਸਲੀ ਲੇਖਕ"
 
-#: tdeabcore.cpp:304
+#: kabcore.cpp:323
 msgid "Co-maintainer, libtdeabc port, CSV import/export"
 msgstr ""
 
-#: tdeabcore.cpp:306
+#: kabcore.cpp:325
 msgid "GUI and framework redesign"
 msgstr ""
 
-#: tdeabcore.cpp:308
+#: kabcore.cpp:327
 msgid "DCOP interface"
 msgstr "DCOP ਇੰਟਰਫੇਸ"
 
-#: tdeabcore.cpp:309
+#: kabcore.cpp:328
 msgid "Contact pinning"
 msgstr ""
 
-#: tdeabcore.cpp:310 tdeabcore.cpp:312
+#: kabcore.cpp:329 kabcore.cpp:331
 msgid "LDAP Lookup"
 msgstr "LDAP ਖੋਜ"
 
-#: tdeabcore.cpp:467
+#: kabcore.cpp:500
 #, c-format
 msgid ""
 "_n: Do you really want to delete this distribution list?\n"
 "Do you really want to delete these %n distribution lists?"
 msgstr ""
 
-#: tdeabcore.cpp:493
+#: kabcore.cpp:531
 #, c-format
 msgid ""
-"_n: Do you really want to delete this contact?\n"
-"Do you really want to delete these %n contacts?"
+"_n: <qt>Do you really want to delete this contact from your addressbook?"
+"<br><b>Note:</b>The contact will be also removed from all distribution "
+"lists.</qt>\n"
+"<qt>Do you really want to delete these %n contacts from your addressbook?"
+"<br><b>Note:</b>The contacts will be also removed from all distribution "
+"lists.</qt>"
 msgstr ""
 
-#: tdeabcore.cpp:589
+#: kabcore.cpp:638
 msgid "Please select only one contact."
 msgstr ""
 
-#: tdeabcore.cpp:593
+#: kabcore.cpp:642
 msgid ""
 "<qt>Do you really want to use <b>%1</b> as your new personal contact?</qt>"
 msgstr ""
 
-#: tdeabcore.cpp:594
+#: kabcore.cpp:643
 #, fuzzy
 msgid "Use"
 msgstr "ਉਪਭੋਗਤਾ ID"
 
-#: tdeabcore.cpp:594
+#: kabcore.cpp:643
 msgid "Do Not Use"
 msgstr ""
 
-#: features/distributionlistwidget.cpp:266 tdeabcore.cpp:664
+#: features/distributionlistwidget.cpp:266 kabcore.cpp:717
 msgid "New Distribution List"
 msgstr "ਨਵੀਂ ਵੰਡ ਸੂਚੀ"
 
-#: tdeabcore.cpp:670
+#: kabcore.cpp:723
 #, fuzzy
 msgid "New Distribution List (%1)"
 msgstr "ਨਵੀਂ ਵੰਡ ਸੂਚੀ"
 
-#: tdeabcore.cpp:859
+#: kabcore.cpp:900
 msgid "<qt>Unable to save address book <b>%1</b>.</qt>"
 msgstr ""
 
-#: tdeabcore.cpp:866
+#: kabcore.cpp:907
 msgid "<qt>Unable to get access for saving the address book <b>%1</b>.</qt>"
 msgstr ""
 
-#: tdeabcore.cpp:970
+#: kabcore.cpp:1021
 msgid ""
 "Your TDE installation is missing LDAP support, please ask your administrator or "
 "distributor for more information."
 msgstr ""
 
-#: tdeabcore.cpp:972
+#: kabcore.cpp:1023
 msgid "No LDAP IO Slave Available"
 msgstr ""
 
-#: tdeabcore.cpp:1008
+#: kabcore.cpp:1059
 msgid "Address Book"
 msgstr "ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ"
 
-#: tdeabcore.cpp:1011
+#: kabcore.cpp:1062
 msgid "Print Addresses"
 msgstr "ਸਿਰਨਾਵੇਂ ਛਾਪੋ"
 
-#: tdeabcore.cpp:1177 tdeabcore.cpp:1630
+#: kabcore.cpp:1228 kabcore.cpp:1731
 #, fuzzy
 msgid "Contacts"
 msgstr "ਸ਼ਾਮਿਲ"
 
-#: tdeabcore.cpp:1258
+#: kabcore.cpp:1242
+#, fuzzy
+msgid "Add contacts to the distribution list"
+msgstr "ਨਵੀਂ ਵੰਡ ਸੂਚੀ"
+
+#: kabcore.cpp:1244
+msgid ""
+"Click this button if you want to add more contacts to the current distribution "
+"list. You will be shown a dialog that allows to enter a list of existing "
+"contacts to this distribution list."
+msgstr ""
+
+#: kabcore.cpp:1256
+#, fuzzy
+msgid "Remove contacts from the distribution list"
+msgstr "ਨਵੀਂ ਵੰਡ ਸੂਚੀ"
+
+#: kabcore.cpp:1258
+msgid ""
+"Click this button if you want to remove the selected contacts from the current "
+"distribution list."
+msgstr ""
+
+#: kabcore.cpp:1320
 msgid "&Send Email to Contact..."
 msgstr "ਸੰਪਰਕ ਨੂੰ ਈ-ਪੱਤਰ ਭੇਜੋ(&S)..."
 
-#: tdeabcore.cpp:1261
+#: kabcore.cpp:1323
 msgid "Send a mail to all selected contacts."
 msgstr ""
 
-#: tdeabcore.cpp:1262
+#: kabcore.cpp:1324
 msgid "Print a special number of contacts."
 msgstr ""
 
-#: tdeabcore.cpp:1266
+#: kabcore.cpp:1328
 msgid "Save all changes of the address book to the storage backend."
 msgstr ""
 
-#: tdeabcore.cpp:1268
+#: kabcore.cpp:1330
 msgid "&New Contact..."
 msgstr "ਨਵਾਂ ਸੰਪਰਕ(&N)..."
 
-#: tdeabcore.cpp:1270
+#: kabcore.cpp:1332
 msgid ""
 "Create a new contact"
 "<p>You will be presented with a dialog where you can add all data about a "
 "person, including addresses and phone numbers."
 msgstr ""
 
-#: tdeabcore.cpp:1272
+#: kabcore.cpp:1334
 #, fuzzy
 msgid "&New Distribution List..."
 msgstr "ਨਵੀਂ ਵੰਡ ਸੂਚੀ"
 
-#: tdeabcore.cpp:1274
+#: kabcore.cpp:1336
 msgid ""
 "Create a new distribution list"
 "<p>You will be presented with a dialog where you can create a new distribution "
 "list."
 msgstr ""
 
-#: tdeabcore.cpp:1276
+#: kabcore.cpp:1338
 msgid "Send &Contact..."
 msgstr "ਸੰਪਰਕ ਭੇਜੋ(&C)..."
 
-#: tdeabcore.cpp:1279
+#: kabcore.cpp:1341
 msgid "Send a mail with the selected contact as attachment."
 msgstr ""
 
-#: tdeabcore.cpp:1281
+#: kabcore.cpp:1343
 msgid "Chat &With..."
 msgstr "ਇਸ ਨਾਲ ਗੱਲਬਾਤ..."
 
-#: tdeabcore.cpp:1284
+#: kabcore.cpp:1346
 msgid "Start a chat with the selected contact."
 msgstr ""
 
-#: tdeabcore.cpp:1286
+#: kabcore.cpp:1348
 msgid "&Edit Contact..."
 msgstr "ਸੰਪਰਕ ਸੋਧ(&E)..."
 
-#: tdeabcore.cpp:1289
+#: kabcore.cpp:1351
 msgid ""
 "Edit a contact"
 "<p>You will be presented with a dialog where you can change all data about a "
 "person, including addresses and phone numbers."
 msgstr ""
 
-#: tdeabcore.cpp:1291
+#: kabcore.cpp:1353
 msgid "&Merge Contacts"
 msgstr ""
 
-#: tdeabcore.cpp:1300
+#: kabcore.cpp:1362
 msgid ""
 "Copy the currently selected contact(s) to system clipboard in vCard format."
 msgstr ""
 
-#: tdeabcore.cpp:1301
+#: kabcore.cpp:1363
 msgid ""
 "Cuts the currently selected contact(s) to system clipboard in vCard format."
 msgstr ""
 
-#: tdeabcore.cpp:1302
+#: kabcore.cpp:1364
 msgid "Paste the previously cut or copied contacts from clipboard."
 msgstr ""
 
-#: tdeabcore.cpp:1303
+#: kabcore.cpp:1365
 msgid "Selects all visible contacts from current view."
 msgstr ""
 
-#: tdeabcore.cpp:1307
+#: kabcore.cpp:1369
 msgid "&Delete Contact"
 msgstr "ਸੰਪਰਕ ਹਟਾਓ(&D)"
 
-#: tdeabcore.cpp:1310
+#: kabcore.cpp:1372
 msgid "Delete all selected contacts."
 msgstr ""
 
-#: tdeabcore.cpp:1313
+#: kabcore.cpp:1375
 #, fuzzy
 msgid "&Copy Contact To..."
 msgstr "ਨਵਾਂ ਸੰਪਰਕ(&N)..."
 
-#: tdeabcore.cpp:1316
+#: kabcore.cpp:1378
 msgid ""
 "Store a contact in a different Addressbook"
 "<p>You will be presented with a dialog where you can select a new storage place "
 "for this contact."
 msgstr ""
 
-#: tdeabcore.cpp:1319
+#: kabcore.cpp:1381
 #, fuzzy
 msgid "M&ove Contact To..."
 msgstr "ਨਵਾਂ ਸੰਪਰਕ(&N)..."
 
-#: tdeabcore.cpp:1325
+#: kabcore.cpp:1387
 msgid "Show Jump Bar"
 msgstr ""
 
-#: tdeabcore.cpp:1327
+#: kabcore.cpp:1389
 msgid "Toggle whether the jump button bar shall be visible."
 msgstr ""
 
-#: tdeabcore.cpp:1328
+#: kabcore.cpp:1390
 msgid "Hide Jump Bar"
 msgstr ""
 
-#: tdeabcore.cpp:1331
+#: kabcore.cpp:1393
 msgid "Show Details"
 msgstr "ਵੇਰਵਾ ਵੇਖਾਓ"
 
-#: tdeabcore.cpp:1333
+#: kabcore.cpp:1395
 msgid "Toggle whether the details page shall be visible."
 msgstr ""
 
-#: tdeabcore.cpp:1334
+#: kabcore.cpp:1396
 msgid "Hide Details"
 msgstr "ਵੇਰਵਾ ਓਹਲੇ"
 
-#: tdeabcore.cpp:1338
+#: kabcore.cpp:1400
 msgid "&Configure Address Book..."
 msgstr "ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਸੰਰਚਨਾ(&C)..."
 
-#: tdeabcore.cpp:1344
+#: kabcore.cpp:1406
 msgid ""
 "You will be presented with a dialog, that offers you all possibilities to "
 "configure KAddressBook."
 msgstr ""
 
-#: tdeabcore.cpp:1347
+#: kabcore.cpp:1409
 msgid "&Lookup Addresses in LDAP Directory..."
 msgstr ""
 
-#: tdeabcore.cpp:1349
+#: kabcore.cpp:1411
 msgid ""
 "Search for contacts on a LDAP server"
 "<p>You will be presented with a dialog, where you can search for contacts and "
 "select the ones you want to add to your local address book."
 msgstr ""
 
-#: tdeabcore.cpp:1351
+#: kabcore.cpp:1413
 msgid "Set as Personal Contact Data"
 msgstr ""
 
-#: tdeabcore.cpp:1354
+#: kabcore.cpp:1416
 msgid ""
 "Set the personal contact"
 "<p>The data of this contact will be used in many other TDE applications, so you "
 "do not have to input your personal data several times."
 msgstr ""
 
-#: tdeabcore.cpp:1359
+#: kabcore.cpp:1421
 msgid "Set the categories for all selected contacts."
 msgstr ""
 
-#: tdeabcore.cpp:1361
+#: kabcore.cpp:1423
 msgid "Clear Search Bar"
 msgstr ""
 
-#: tdeabcore.cpp:1364
+#: kabcore.cpp:1426
 msgid "Clear Search Bar<p>Clears the content of the quick search bar."
 msgstr ""
 
-#: tdeabcore.cpp:1438
+#: kabcore.cpp:1505
 msgid "Merge with existing categories?"
 msgstr ""
 
-#: tdeabcore.cpp:1439
+#: kabcore.cpp:1506
 msgid "Merge"
 msgstr ""
 
-#: tdeabcore.cpp:1439
+#: kabcore.cpp:1506
 msgid "Do Not Merge"
 msgstr ""
 
-#: tdeabcore.cpp:1490
+#: kabcore.cpp:1557
 #, c-format
 msgid ""
 "_n: %n contact matches\n"
 "%n contacts matching"
 msgstr ""
 
-#: tdeabcore.cpp:1630
+#: kabcore.cpp:1632
+msgid ""
+"_n: <qt>Do you really want to remove this contact from the %1 distribution "
+"list?"
+"<br><b>Note:</b>The contact will be not be removed from your addressbook nor "
+"from any other distribution list.</qt>\n"
+"<qt>Do you really want to remove these %n contacts from the %1 distribution "
+"list?"
+"<br><b>Note:</b>The contacts will be not be removed from your addressbook nor "
+"from any other distribution list.</qt>"
+msgstr ""
+
+#: kabcore.cpp:1732
 #, fuzzy, c-format
 msgid "Distribution List: %1"
 msgstr "ਨਵੀਂ ਵੰਡ ਸੂਚੀ"
@@ -1836,7 +1884,7 @@ msgstr "ਨਵੀਂ ਵੰਡ ਸੂਚੀ"
 msgid "Address Book Browser"
 msgstr "ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਝਲਕਾਰਾ"
 
-#: kaddressbookmain.cpp:151
+#: kaddressbookmain.cpp:157
 msgid ""
 "You will be presented with a dialog, where you can configure the application "
 "wide shortcuts."
@@ -1858,7 +1906,7 @@ msgstr "ਕੁੰਜੀ ਕਿਸਮ"
 msgid "Select the key type:"
 msgstr "ਕੁੰਜੀ ਕਿਸਮ ਚੁਣੋ:"
 
-#: keywidget.cpp:124 xxport/csv_xxport.cpp:68 xxport/ldif_xxport.cpp:117
+#: keywidget.cpp:124 xxport/csv_xxport.cpp:73 xxport/ldif_xxport.cpp:123
 msgid "<qt>Unable to open file <b>%1</b>.</qt>"
 msgstr ""
 
@@ -2011,18 +2059,18 @@ msgid ""
 "Imported from LDAP directory %1 on %2"
 msgstr ""
 
-#: ldapsearchdialog.cpp:588
+#: ldapsearchdialog.cpp:595
 #, c-format
 msgid ""
 "_n: The following contact was imported into your address book:\n"
 "The following %n contacts were imported into your address book:"
 msgstr ""
 
-#: ldapsearchdialog.cpp:603
+#: ldapsearchdialog.cpp:607
 msgid "Please select the contacts you want to add to the distribution list."
 msgstr ""
 
-#: ldapsearchdialog.cpp:603
+#: ldapsearchdialog.cpp:607
 msgid "No Contacts Selected"
 msgstr ""
 
@@ -2171,7 +2219,7 @@ msgid "Contact Toolbar"
 msgstr "ਸੰਪਰਕ ਸੰਦ-ਪੱਟੀ"
 
 #. i18n: file editors/imaddressbase.ui line 24
-#: editors/imeditorwidget.cpp:369 rc.cpp:63
+#: editors/imeditorwidget.cpp:371 rc.cpp:63
 #, no-c-format
 msgid ""
 "_: Instant messaging\n"
@@ -2403,7 +2451,7 @@ msgstr ""
 #. i18n: file common/kaddressbook.kcfg line 34
 #: rc.cpp:174
 #, no-c-format
-msgid "Honor TDE single click"
+msgid "Honor KDE single click"
 msgstr ""
 
 #. i18n: file common/kaddressbook.kcfg line 59
@@ -2432,34 +2480,48 @@ msgstr ""
 msgid "Save only the URL to the sound file, not the whole object."
 msgstr ""
 
-#: undocmds.cpp:46
+#: undocmds.cpp:58
 #, c-format
 msgid ""
 "_n: Delete Contact\n"
 "Delete %n Contacts"
 msgstr ""
 
-#: undocmds.cpp:97
+#: undocmds.cpp:111
 #, c-format
 msgid ""
 "_n: Paste Contact\n"
 "Paste %n Contacts"
 msgstr ""
 
-#: undocmds.cpp:153
+#: undocmds.cpp:167
 #, c-format
 msgid ""
 "_n: New Contact\n"
 "New %n Contacts"
 msgstr ""
 
-#: undocmds.cpp:222
+#: undocmds.cpp:244
 #, c-format
 msgid ""
 "_n: Cut Contact\n"
 "Cut %n Contacts"
 msgstr ""
 
+#: undocmds.cpp:310
+#, c-format
+msgid ""
+"_n: Copy Contact To\n"
+"Copy %n Contacts To"
+msgstr ""
+
+#: undocmds.cpp:359
+#, c-format
+msgid ""
+"_n: Move Contact To\n"
+"Move %n Contacts To"
+msgstr ""
+
 #: viewconfigurefieldspage.cpp:205
 msgid "Select Fields to Display"
 msgstr ""
@@ -2504,7 +2566,7 @@ msgstr ""
 msgid "<qt>Are you sure that you want to delete the view <b>%1</b>?</qt>"
 msgstr ""
 
-#: editors/imeditorwidget.cpp:424 viewmanager.cpp:311
+#: editors/imeditorwidget.cpp:426 viewmanager.cpp:311
 msgid "Confirm Delete"
 msgstr "ਹਟਾਉਣ ਦੀ ਪੁਸ਼ਟੀ"
 
@@ -2524,64 +2586,64 @@ msgstr ""
 msgid "Do Not Import"
 msgstr "ਆਯਾਤ(&I)"
 
-#: viewmanager.cpp:538 views/configuretableviewdialog.cpp:123
+#: viewmanager.cpp:543 views/configuretableviewdialog.cpp:123
 #: xxport/csvimportdialog.cpp:419
 msgid "None"
 msgstr "ਕੋਈ ਨਹੀਂ"
 
-#: viewmanager.cpp:539
+#: viewmanager.cpp:544
 msgid "Unfiled"
 msgstr "ਨਾ-ਪ੍ਰਭਾਸ਼ਿਤ"
 
-#: viewmanager.cpp:562
+#: viewmanager.cpp:567
 msgid "Select View"
 msgstr "ਦਰਿਸ਼ ਚੁਣੋ"
 
-#: viewmanager.cpp:571
+#: viewmanager.cpp:576
 msgid "Modify View..."
 msgstr ""
 
-#: viewmanager.cpp:574
+#: viewmanager.cpp:579
 msgid ""
 "By pressing this button a dialog opens that allows you to modify the view of "
 "the addressbook. There you can add or remove fields that you want to be shown "
 "or hidden in the addressbook like the name for example."
 msgstr ""
 
-#: viewmanager.cpp:576
+#: viewmanager.cpp:581
 msgid "Add View..."
 msgstr "ਦਰਿਸ਼ ਸ਼ਾਮਿਲ..."
 
-#: viewmanager.cpp:579
+#: viewmanager.cpp:584
 msgid ""
 "You can add a new view by choosing one from the dialog that appears after "
 "pressing the button. You have to give the view a name, so that you can "
 "distinguish between the different views."
 msgstr ""
 
-#: viewmanager.cpp:581
+#: viewmanager.cpp:586
 msgid "Delete View"
 msgstr "ਦਰਿਸ਼ ਹਟਾਓ"
 
-#: viewmanager.cpp:584
+#: viewmanager.cpp:589
 msgid ""
 "By pressing this button you can delete the actual view, which you have added "
 "before."
 msgstr ""
 
-#: viewmanager.cpp:586
+#: viewmanager.cpp:591
 msgid "Refresh View"
 msgstr "ਦਰਿਸ਼ ਤਾਜ਼ਾ"
 
-#: viewmanager.cpp:589
+#: viewmanager.cpp:594
 msgid "The view will be refreshed by pressing this button."
 msgstr ""
 
-#: viewmanager.cpp:591
+#: viewmanager.cpp:596
 msgid "Edit &Filters..."
 msgstr "ਫਿਲਟਰ ਸੋਧ..."
 
-#: viewmanager.cpp:594
+#: viewmanager.cpp:599
 msgid ""
 "Edit the contact filters"
 "<p>You will be presented with a dialog, where you can add, remove and edit "
@@ -2752,34 +2814,34 @@ msgid ""
 "Add Address"
 msgstr ""
 
-#: editors/imeditorwidget.cpp:423
+#: editors/imeditorwidget.cpp:425
 #, c-format
 msgid ""
 "_n: Do you really want to delete the selected address?\n"
 "Do you really want to delete the %n selected addresses?"
 msgstr ""
 
-#: features/distributionlistngwidget.cpp:111
+#: features/distributionlistngwidget.cpp:110
 #, fuzzy
 msgid "Distribution List Editor NG"
 msgstr "ਨਵੀਂ ਵੰਡ ਸੂਚੀ"
 
-#: features/distributionlistngwidget.cpp:128
+#: features/distributionlistngwidget.cpp:127
 #, fuzzy
 msgid "Distribution Lists"
 msgstr "ਨਵੀਂ ਵੰਡ ਸੂਚੀ"
 
-#: features/distributionlistngwidget.cpp:134
+#: features/distributionlistngwidget.cpp:133
 #, fuzzy
 msgid "Add distribution list"
 msgstr "ਨਵੀਂ ਵੰਡ ਸੂਚੀ"
 
-#: features/distributionlistngwidget.cpp:140
+#: features/distributionlistngwidget.cpp:139
 #, fuzzy
 msgid "Edit distribution list"
 msgstr "ਨਵੀਂ ਵੰਡ ਸੂਚੀ"
 
-#: features/distributionlistngwidget.cpp:146
+#: features/distributionlistngwidget.cpp:145
 #, fuzzy
 msgid "Remove distribution list"
 msgstr "ਨਵੀਂ ਵੰਡ ਸੂਚੀ"
@@ -2789,6 +2851,7 @@ msgstr "ਨਵੀਂ ਵੰਡ ਸੂਚੀ"
 msgid "New Distribution List..."
 msgstr "ਨਵੀਂ ਵੰਡ ਸੂਚੀ"
 
+#: features/distributionlistngwidget.cpp:175
 #: features/distributionlistngwidget.cpp:236
 #, fuzzy
 msgid "All Contacts"
@@ -2867,42 +2930,42 @@ msgstr "ਈ-ਪੱਤਰ ਸਿਰਨਾਵੇ"
 msgid "Preferred address"
 msgstr "ਪਸੰਦੀਦਾ ਸਿਰਨਾਵਾਂ"
 
-#: features/resourceselection.cpp:166 features/resourceselection.cpp:374
-#: features/resourceselection.cpp:395
+#: features/resourceselection.cpp:172
+msgid "Re&load"
+msgstr ""
+
+#: features/resourceselection.cpp:224 features/resourceselection.cpp:494
+#: features/resourceselection.cpp:515
 msgid "Address Books"
 msgstr "ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ"
 
-#: features/resourceselection.cpp:180
+#: features/resourceselection.cpp:238
 msgid "Add Address Book"
 msgstr "ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਸ਼ਾਮਿਲ"
 
-#: features/resourceselection.cpp:181
+#: features/resourceselection.cpp:239
 msgid "Please select type of the new address book:"
 msgstr ""
 
-#: features/resourceselection.cpp:191
+#: features/resourceselection.cpp:249
 msgid "<qt>Unable to create an address book of type <b>%1</b>.</qt>"
 msgstr ""
 
-#: features/resourceselection.cpp:196
-msgid "%1 address book"
-msgstr "%1 ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ"
-
-#: features/resourceselection.cpp:237
+#: features/resourceselection.cpp:300
 msgid "<qt>Do you really want to remove the address book <b>%1</b>?</qt>"
 msgstr ""
 
-#: features/resourceselection.cpp:380
+#: features/resourceselection.cpp:500
 #, fuzzy
 msgid "Add addressbook"
 msgstr "ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਸ਼ਾਮਿਲ"
 
-#: features/resourceselection.cpp:385
+#: features/resourceselection.cpp:505
 #, fuzzy
 msgid "Edit addressbook settings"
 msgstr "ਈ-ਪੱਤਰ ਸਿਰਨਾਵੀਂ ਸੋਧ"
 
-#: features/resourceselection.cpp:390
+#: features/resourceselection.cpp:510
 #, fuzzy
 msgid "Remove addressbook"
 msgstr "%1 ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ"
@@ -3292,11 +3355,17 @@ msgstr ""
 msgid "Export CSV List..."
 msgstr ""
 
-#: xxport/csv_xxport.cpp:55 xxport/ldif_xxport.cpp:102
+#: xxport/csv_xxport.cpp:53 xxport/csvimportdialog.cpp:861
+#: xxport/ldif_xxport.cpp:100 xxport/vcard_xxport.cpp:296
+#: xxport/vcard_xxport.cpp:318
+msgid "Do you want to overwrite file \"%1\""
+msgstr ""
+
+#: xxport/csv_xxport.cpp:60 xxport/ldif_xxport.cpp:108
 msgid "<qt>Unable to open file <b>%1</b>.%2.</qt>"
 msgstr ""
 
-#: xxport/csv_xxport.cpp:76
+#: xxport/csv_xxport.cpp:81
 msgid "The contacts have been exported successfully."
 msgstr ""
 
@@ -3423,15 +3492,15 @@ msgstr ""
 msgid "Please select a template, that matches the CSV file:"
 msgstr ""
 
-#: xxport/csvimportdialog.cpp:860
+#: xxport/csvimportdialog.cpp:864
 msgid "Template Name"
 msgstr ""
 
-#: xxport/csvimportdialog.cpp:860
+#: xxport/csvimportdialog.cpp:864
 msgid "Please enter a name for the template:"
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਨਮੂਨੇ ਲਈ ਇੱਕ ਨਾਂ ਦਿਓ:"
 
-#: xxport/csvimportdialog.cpp:930
+#: xxport/csvimportdialog.cpp:934
 msgid "Cannot open input file."
 msgstr ""
 
@@ -3451,11 +3520,11 @@ msgstr ""
 msgid "Export to Mobile Phone..."
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:134 xxport/gnokii_xxport.cpp:824
+#: xxport/gnokii_xxport.cpp:134 xxport/gnokii_xxport.cpp:820
 msgid "Failed to initialize the gnokii library."
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:140 xxport/gnokii_xxport.cpp:853
+#: xxport/gnokii_xxport.cpp:140 xxport/gnokii_xxport.cpp:849
 msgid ""
 "<qt>"
 "<center>Mobile Phone interface initialization failed."
@@ -3468,42 +3537,42 @@ msgid ""
 "correct.</center></qt>"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:179 xxport/gnokii_xxport.cpp:953
+#: xxport/gnokii_xxport.cpp:179 xxport/gnokii_xxport.cpp:949
 msgid "Mobile Phone information:"
 msgstr "ਮੋਬਾਇਲ ਫੋਨ ਜਾਣਕਾਰੀ:"
 
-#: xxport/gnokii_xxport.cpp:180 xxport/gnokii_xxport.cpp:954
+#: xxport/gnokii_xxport.cpp:180 xxport/gnokii_xxport.cpp:950
 msgid "Manufacturer"
 msgstr "ਨਿਰਮਾਤਾ"
 
-#: xxport/gnokii_xxport.cpp:181 xxport/gnokii_xxport.cpp:955
+#: xxport/gnokii_xxport.cpp:181 xxport/gnokii_xxport.cpp:951
 msgid "Phone model"
 msgstr "ਫੋਨ ਮਾਡਲ"
 
-#: xxport/gnokii_xxport.cpp:182 xxport/gnokii_xxport.cpp:956
+#: xxport/gnokii_xxport.cpp:182 xxport/gnokii_xxport.cpp:952
 msgid "Revision"
 msgstr "ਦੁਹਰਾਓ"
 
-#: xxport/gnokii_xxport.cpp:183 xxport/gnokii_xxport.cpp:957
+#: xxport/gnokii_xxport.cpp:183 xxport/gnokii_xxport.cpp:953
 msgid "IMEI"
 msgstr "IMEI"
 
-#: xxport/gnokii_xxport.cpp:184 xxport/gnokii_xxport.cpp:958
+#: xxport/gnokii_xxport.cpp:184 xxport/gnokii_xxport.cpp:954
 msgid "Phonebook status"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:185 xxport/gnokii_xxport.cpp:959
+#: xxport/gnokii_xxport.cpp:185 xxport/gnokii_xxport.cpp:955
 msgid "%1 out of %2 contacts used"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:211 xxport/gnokii_xxport.cpp:995
+#: xxport/gnokii_xxport.cpp:211 xxport/gnokii_xxport.cpp:991
 msgid ""
 "<qt>Importing <b>%1</b> contacts from <b>%2</b> of the Mobile Phone."
 "<br>"
 "<br>%3</qt>"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:532 xxport/gnokii_xxport.cpp:1327
+#: xxport/gnokii_xxport.cpp:532 xxport/gnokii_xxport.cpp:1323
 msgid ""
 "<qt>Please connect your Mobile Phone to your computer and press <b>Continue</b> "
 "to start importing the personal contacts."
@@ -3513,12 +3582,12 @@ msgid ""
 "KAddressbook will behave unresponsively.</qt>"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:540 xxport/gnokii_xxport.cpp:1335
+#: xxport/gnokii_xxport.cpp:540 xxport/gnokii_xxport.cpp:1331
 msgid "Mobile Phone Import"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:541 xxport/gnokii_xxport.cpp:590
-#: xxport/gnokii_xxport.cpp:1336 xxport/gnokii_xxport.cpp:1385
+#: xxport/gnokii_xxport.cpp:541 xxport/gnokii_xxport.cpp:588
+#: xxport/gnokii_xxport.cpp:1332 xxport/gnokii_xxport.cpp:1379
 msgid ""
 "<qt>"
 "<center>Establishing connection to the Mobile Phone."
@@ -3526,11 +3595,11 @@ msgid ""
 "<br>Please wait...</center></qt>"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:564 xxport/gnokii_xxport.cpp:1359
+#: xxport/gnokii_xxport.cpp:562 xxport/gnokii_xxport.cpp:1353
 msgid "&Stop Import"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:581 xxport/gnokii_xxport.cpp:1376
+#: xxport/gnokii_xxport.cpp:579 xxport/gnokii_xxport.cpp:1370
 msgid ""
 "<qt>Please connect your Mobile Phone to your computer and press <b>Continue</b> "
 "to start exporting the selected personal contacts."
@@ -3540,12 +3609,12 @@ msgid ""
 "KAddressbook will behave unresponsively.</qt>"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:589 xxport/gnokii_xxport.cpp:773
-#: xxport/gnokii_xxport.cpp:1384 xxport/gnokii_xxport.cpp:1568
+#: xxport/gnokii_xxport.cpp:587 xxport/gnokii_xxport.cpp:769
+#: xxport/gnokii_xxport.cpp:1378 xxport/gnokii_xxport.cpp:1560
 msgid "Mobile Phone Export"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:645 xxport/gnokii_xxport.cpp:1440
+#: xxport/gnokii_xxport.cpp:641 xxport/gnokii_xxport.cpp:1432
 msgid ""
 "<qt>Do you want the selected contacts to be <b>appended</b> "
 "to the current mobile phonebook or should they <b>replace</b> "
@@ -3556,30 +3625,30 @@ msgid ""
 "contacts will be available from inside your phone.</qt>"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:651 xxport/gnokii_xxport.cpp:1446
+#: xxport/gnokii_xxport.cpp:647 xxport/gnokii_xxport.cpp:1438
 msgid "Export to Mobile Phone"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:652 xxport/gnokii_xxport.cpp:1447
+#: xxport/gnokii_xxport.cpp:648 xxport/gnokii_xxport.cpp:1439
 msgid "&Append to Current Phonebook"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:653 xxport/gnokii_xxport.cpp:1448
+#: xxport/gnokii_xxport.cpp:649 xxport/gnokii_xxport.cpp:1440
 msgid "&Replace Current Phonebook with New Contacts"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:660 xxport/gnokii_xxport.cpp:1455
+#: xxport/gnokii_xxport.cpp:656 xxport/gnokii_xxport.cpp:1447
 msgid "&Stop Export"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:661 xxport/gnokii_xxport.cpp:1456
+#: xxport/gnokii_xxport.cpp:657 xxport/gnokii_xxport.cpp:1448
 msgid ""
 "<qt>Exporting <b>%1</b> contacts to the <b>%2</b> of the Mobile Phone."
 "<br>"
 "<br>%3</qt>"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:728 xxport/gnokii_xxport.cpp:1523
+#: xxport/gnokii_xxport.cpp:724 xxport/gnokii_xxport.cpp:1515
 msgid ""
 "<qt>"
 "<center>All selected contacts have been sucessfully copied to the Mobile Phone."
@@ -3588,15 +3657,15 @@ msgid ""
 "have been deleted.</center></qt>"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:733 xxport/gnokii_xxport.cpp:1528
+#: xxport/gnokii_xxport.cpp:729 xxport/gnokii_xxport.cpp:1520
 msgid "&Stop Delete"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:753 xxport/gnokii_xxport.cpp:1548
+#: xxport/gnokii_xxport.cpp:749 xxport/gnokii_xxport.cpp:1540
 msgid "Export to phone finished."
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:764 xxport/gnokii_xxport.cpp:1559
+#: xxport/gnokii_xxport.cpp:760 xxport/gnokii_xxport.cpp:1551
 msgid ""
 "<qt>The following contacts could not be exported to the Mobile Phone. Possible "
 "Reasons for this problem could be:"
@@ -3611,45 +3680,46 @@ msgid ""
 "above contacts.</qt>"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:827
+#: xxport/gnokii_xxport.cpp:823
 msgid "Gnokii is not yet configured."
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:839
+#: xxport/gnokii_xxport.cpp:835
 msgid ""
 "Gnokii reports a 'Lock File Error'.\n"
 " Please exit all other running instances of gnokii, check if you have write "
 "permissions in the /var/lock directory and try again."
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:868
+#: xxport/gnokii_xxport.cpp:864
 msgid "Unknown"
 msgstr "ਅਣਜਾਣ"
 
-#: xxport/gnokii_xxport.cpp:965
+#: xxport/gnokii_xxport.cpp:961
 msgid "internal memory"
 msgstr "ਅੰਦਰੂਨੀ ਮੈਮੋਰੀ"
 
-#: xxport/gnokii_xxport.cpp:966
+#: xxport/gnokii_xxport.cpp:962
 msgid "SIM-card memory"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:967
+#: xxport/gnokii_xxport.cpp:963
 msgid "unknown memory"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:1586 xxport/gnokii_xxport.cpp:1594
+#: xxport/gnokii_xxport.cpp:1578 xxport/gnokii_xxport.cpp:1586
 msgid ""
 "Gnokii interface is not available.\n"
 "Please ask your distributor to add gnokii at compile time."
 msgstr ""
 
 #: xxport/kde2_xxport.cpp:45
-msgid "Import TDE 2 Addressbook..."
-msgstr ""
+#, fuzzy
+msgid "Import KDE 2 Addressbook..."
+msgstr "ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਸੰਰਚਨਾ(&C)..."
 
 #: xxport/kde2_xxport.cpp:52
-msgid "<qt>Could not find a TDE 2 address book <b>%1</b>.</qt>"
+msgid "<qt>Could not find a KDE 2 address book <b>%1</b>.</qt>"
 msgstr ""
 
 #: xxport/kde2_xxport.cpp:57
@@ -3657,8 +3727,9 @@ msgid "Override previously imported entries?"
 msgstr ""
 
 #: xxport/kde2_xxport.cpp:58
-msgid "Import TDE 2 Addressbook"
-msgstr ""
+#, fuzzy
+msgid "Import KDE 2 Addressbook"
+msgstr "ਕੇਡੀਈ ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ"
 
 #: xxport/ldif_xxport.cpp:56
 msgid "Import LDIF Addressbook..."
@@ -3708,81 +3779,84 @@ msgstr ""
 msgid "Export vCard 3.0..."
 msgstr ""
 
-#: xxport/vcard_xxport.cpp:125
+#: xxport/vcard_xxport.cpp:131
 msgid ""
 "You have selected a list of contacts, shall they be exported to several files?"
 msgstr ""
 
-#: xxport/vcard_xxport.cpp:128
+#: xxport/vcard_xxport.cpp:134
 msgid "Export to Several Files"
 msgstr ""
 
-#: xxport/vcard_xxport.cpp:128
+#: xxport/vcard_xxport.cpp:134
 msgid "Export to One File"
 msgstr ""
 
-#: xxport/vcard_xxport.cpp:190
+#: xxport/vcard_xxport.cpp:212
 msgid "Select vCard to Import"
 msgstr ""
 
-#: xxport/vcard_xxport.cpp:197
+#: xxport/vcard_xxport.cpp:219
 msgid "vCard Import Failed"
 msgstr ""
 
-#: xxport/vcard_xxport.cpp:213
+#: xxport/vcard_xxport.cpp:252
 msgid ""
 "<qt>When trying to read the vCard, there was an error opening the file '%1': "
 "%2</qt>"
 msgstr ""
 
-#: xxport/vcard_xxport.cpp:221
+#: xxport/vcard_xxport.cpp:260
 msgid "<qt>Unable to access vCard: %1</qt>"
 msgstr ""
 
-#: xxport/vcard_xxport.cpp:232
+#: xxport/vcard_xxport.cpp:271
 msgid "No contacts were imported, due to errors with the vCards."
 msgstr ""
 
-#: xxport/vcard_xxport.cpp:234
+#: xxport/vcard_xxport.cpp:273
 msgid "The vCard does not contain any contacts."
 msgstr ""
 
-#: xxport/vcard_xxport.cpp:402
+#: xxport/vcard_xxport.cpp:469
 msgid "Import vCard"
 msgstr ""
 
-#: xxport/vcard_xxport.cpp:409
+#: xxport/vcard_xxport.cpp:476
 msgid "Do you want to import this contact in your address book?"
 msgstr ""
 
-#: xxport/vcard_xxport.cpp:420
+#: xxport/vcard_xxport.cpp:487
 msgid "Import All..."
 msgstr "ਸਭ ਆਯਾਤ..."
 
-#: xxport/vcard_xxport.cpp:475
+#: xxport/vcard_xxport.cpp:542
 msgid "Select vCard Fields"
 msgstr ""
 
-#: xxport/vcard_xxport.cpp:482
+#: xxport/vcard_xxport.cpp:549
 msgid "Select the fields which shall be exported in the vCard."
 msgstr ""
 
-#: xxport/vcard_xxport.cpp:485
+#: xxport/vcard_xxport.cpp:552
 msgid "Private fields"
 msgstr "ਨਿੱਜੀ ਖੇਤਰ"
 
-#: xxport/vcard_xxport.cpp:488
+#: xxport/vcard_xxport.cpp:555
 msgid "Business fields"
 msgstr "ਵਪਾਰਿਕ ਖੇਤਰ"
 
-#: xxport/vcard_xxport.cpp:491
+#: xxport/vcard_xxport.cpp:558
 msgid "Other fields"
 msgstr "ਹੋਰ ਖੇਤਰ"
 
-#: xxport/vcard_xxport.cpp:494
+#: xxport/vcard_xxport.cpp:561
 msgid "Encryption keys"
 msgstr ""
 
+#~ msgid "%1 address book"
+#~ msgstr "%1 ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ"
+
 #, fuzzy
 #~ msgid "Show Extension"
 #~ msgstr "ਸਹਿਯੋਗੀ ਪੱਟੀ ਵੇਖਾਓ"
diff --git a/tde-i18n-pa/messages/tdepim/kalarm.po b/tde-i18n-pa/messages/tdepim/kalarm.po
index e98d543287a..f1d98132ee6 100644
--- a/tde-i18n-pa/messages/tdepim/kalarm.po
+++ b/tde-i18n-pa/messages/tdepim/kalarm.po
@@ -4,17 +4,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kalarm\n"
-"POT-Creation-Date: 2008-08-19 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-01-17 10:46+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: fontcolour.h:42
+#: fontcolour.h:43
 msgid "Requested font"
 msgstr ""
 
@@ -85,37 +86,37 @@ msgid ""
 "%1"
 msgstr ""
 
-#: alarmevent.cpp:2077
+#: alarmevent.cpp:2082
 msgid ""
 "_: Brief form of 'At Login'\n"
 "Login"
 msgstr ""
 
-#: alarmevent.cpp:2077
+#: alarmevent.cpp:2082
 msgid "At login"
 msgstr ""
 
-#: alarmevent.cpp:2085 alarmevent.cpp:2119
+#: alarmevent.cpp:2090 alarmevent.cpp:2124
 #, c-format
 msgid ""
 "_n: 1 Minute\n"
 "%n Minutes"
 msgstr ""
 
-#: alarmevent.cpp:2087 alarmevent.cpp:2121
+#: alarmevent.cpp:2092 alarmevent.cpp:2126
 #, c-format
 msgid ""
 "_n: 1 Hour\n"
 "%n Hours"
 msgstr ""
 
-#: alarmevent.cpp:2091 alarmevent.cpp:2123
+#: alarmevent.cpp:2096 alarmevent.cpp:2128
 msgid ""
 "_: Hours and Minutes\n"
 "%1H %2M"
 msgstr ""
 
-#: alarmevent.cpp:2094 alarmevent.cpp:2126
+#: alarmevent.cpp:2099 alarmevent.cpp:2131
 #, c-format
 msgid ""
 "_n: 1 Day\n"
@@ -124,28 +125,28 @@ msgstr ""
 "1 ਦਿਨ\n"
 "%n ਦਿਨ"
 
-#: alarmevent.cpp:2096 alarmevent.cpp:2127
+#: alarmevent.cpp:2101 alarmevent.cpp:2132
 #, c-format
 msgid ""
 "_n: 1 Week\n"
 "%n Weeks"
 msgstr ""
 
-#: alarmevent.cpp:2098
+#: alarmevent.cpp:2103
 #, c-format
 msgid ""
 "_n: 1 Month\n"
 "%n Months"
 msgstr ""
 
-#: alarmevent.cpp:2100
+#: alarmevent.cpp:2105
 #, c-format
 msgid ""
 "_n: 1 Year\n"
 "%n Years"
 msgstr ""
 
-#: alarmevent.cpp:2106 alarmevent.cpp:2129 soundpicker.cpp:52
+#: alarmevent.cpp:2111 alarmevent.cpp:2134 soundpicker.cpp:52
 msgid "None"
 msgstr "ਕੋਈ ਨਹੀਂ"
 
@@ -530,13 +531,13 @@ msgid ""
 "&From:"
 msgstr ""
 
-#: editdlg.cpp:156 messagewin.cpp:456
+#: editdlg.cpp:156 messagewin.cpp:458
 msgid ""
 "_: Email addressee\n"
 "To:"
 msgstr ""
 
-#: editdlg.cpp:157 messagewin.cpp:463
+#: editdlg.cpp:157 messagewin.cpp:465
 msgid ""
 "_: Email subject\n"
 "Subject:"
@@ -855,76 +856,76 @@ msgid ""
 "%1%2"
 msgstr ""
 
-#: editdlg.cpp:1550 messagewin.cpp:1541
+#: editdlg.cpp:1551 messagewin.cpp:1543
 msgid "Defer Alarm"
 msgstr ""
 
-#: editdlg.cpp:1704
+#: editdlg.cpp:1705
 msgid ""
 "Log file must be the name or path of a local file, with write permission."
 msgstr ""
 
-#: editdlg.cpp:1730
+#: editdlg.cpp:1731
 #, c-format
 msgid ""
 "Invalid email address:\n"
 "%1"
 msgstr ""
 
-#: editdlg.cpp:1737
+#: editdlg.cpp:1738
 msgid "No email address specified"
 msgstr ""
 
-#: editdlg.cpp:1754
+#: editdlg.cpp:1755
 #, c-format
 msgid ""
 "Invalid email attachment:\n"
 "%1"
 msgstr ""
 
-#: editdlg.cpp:1783
+#: editdlg.cpp:1784
 msgid "Display the alarm message now"
 msgstr ""
 
-#: editdlg.cpp:1800
+#: editdlg.cpp:1801
 msgid "Display the file now"
 msgstr ""
 
-#: editdlg.cpp:1812
+#: editdlg.cpp:1813
 msgid "Execute the specified command now"
 msgstr ""
 
-#: editdlg.cpp:1823
+#: editdlg.cpp:1824
 msgid "Send the email to the specified addressees now"
 msgstr ""
 
-#: editdlg.cpp:1897
+#: editdlg.cpp:1898
 msgid "Choose File to Attach"
 msgstr ""
 
-#: editdlg.cpp:2004
+#: editdlg.cpp:2005
 msgid "Please select a file to display"
 msgstr ""
 
-#: editdlg.cpp:2006
+#: editdlg.cpp:2007
 msgid ""
 "%1\n"
 "not found"
 msgstr ""
 
-#: editdlg.cpp:2007
+#: editdlg.cpp:2008
 msgid ""
 "%1\n"
 "is a folder"
 msgstr ""
 
-#: editdlg.cpp:2008
+#: editdlg.cpp:2009
 msgid ""
 "%1\n"
 "is not readable"
 msgstr ""
 
-#: editdlg.cpp:2009
+#: editdlg.cpp:2010
 msgid ""
 "%1\n"
 "appears not to be a text or image file"
@@ -1050,76 +1051,76 @@ msgstr ""
 msgid "Choose Alarm Font & Color"
 msgstr ""
 
-#: functions.cpp:505
+#: functions.cpp:507
 msgid "Error saving alarms"
 msgstr ""
 
-#: functions.cpp:506
+#: functions.cpp:508
 msgid "Error saving alarm"
 msgstr ""
 
-#: functions.cpp:509
+#: functions.cpp:511
 msgid "Error deleting alarms"
 msgstr ""
 
-#: functions.cpp:510
+#: functions.cpp:512
 msgid "Error deleting alarm"
 msgstr ""
 
-#: functions.cpp:513
+#: functions.cpp:515
 msgid "Error saving reactivated alarms"
 msgstr ""
 
-#: functions.cpp:514
+#: functions.cpp:516
 msgid "Error saving reactivated alarm"
 msgstr ""
 
-#: functions.cpp:517
+#: functions.cpp:519
 msgid "Error saving alarm template"
 msgstr ""
 
-#: functions.cpp:532
+#: functions.cpp:534
 msgid "Unable to show alarms in KOrganizer"
 msgstr ""
 
-#: functions.cpp:533
+#: functions.cpp:535
 msgid "Unable to show alarm in KOrganizer"
 msgstr ""
 
-#: functions.cpp:536
+#: functions.cpp:538
 msgid "Unable to update alarm in KOrganizer"
 msgstr ""
 
-#: functions.cpp:539
+#: functions.cpp:541
 msgid "Unable to delete alarms from KOrganizer"
 msgstr ""
 
-#: functions.cpp:540
+#: functions.cpp:542
 msgid "Unable to delete alarm from KOrganizer"
 msgstr ""
 
-#: functions.cpp:634
+#: functions.cpp:636
 msgid ""
 "_: Please set the 'From' email address...\n"
 "%1\n"
 "Please set it in the Preferences dialog."
 msgstr ""
 
-#: functions.cpp:638
+#: functions.cpp:640
 msgid ""
 "Alarms are currently disabled.\n"
 "Do you want to enable alarms now?"
 msgstr ""
 
-#: functions.cpp:639
+#: functions.cpp:641
 msgid "Enable"
 msgstr "ਯੋਗ"
 
-#: functions.cpp:639
+#: functions.cpp:641
 msgid "Keep Disabled"
 msgstr ""
 
-#: functions.cpp:706
+#: functions.cpp:708
 msgid ""
 "Unable to start KMail\n"
 "(%1)"
@@ -1248,7 +1249,8 @@ msgstr ""
 #: kamail.cpp:137
 msgid ""
 "No 'From' email address is configured.\n"
-"Please set it in the Trinity Control Center or in the KAlarm Preferences dialog."
+"Please set it in the Trinity Control Center or in the KAlarm Preferences "
+"dialog."
 msgstr ""
 
 #: kamail.cpp:141
@@ -1559,7 +1561,7 @@ msgstr ""
 msgid "&Copy..."
 msgstr "ਨਕਲ(&C)..."
 
-#: mainwindow.cpp:334 messagewin.cpp:520 templatedlg.cpp:66
+#: mainwindow.cpp:334 messagewin.cpp:522 templatedlg.cpp:66
 msgid "&Edit..."
 msgstr "ਸੋਧ(&E)..."
 
@@ -1599,7 +1601,7 @@ msgstr ""
 msgid "New Alarm"
 msgstr ""
 
-#: mainwindow.cpp:611 messagewin.cpp:1459
+#: mainwindow.cpp:611 messagewin.cpp:1461
 msgid "Edit Alarm"
 msgstr ""
 
@@ -1648,168 +1650,168 @@ msgstr ""
 msgid "Disa&ble"
 msgstr ""
 
-#: messagewin.cpp:290 messagewin.cpp:323
+#: messagewin.cpp:292 messagewin.cpp:325
 msgid "Reminder"
 msgstr "ਯਾਦ-ਪੱਤਰ"
 
-#: messagewin.cpp:290
+#: messagewin.cpp:292
 msgid "Message"
 msgstr "ਸੁਨੇਹਾ"
 
-#: messagewin.cpp:318
+#: messagewin.cpp:320
 msgid ""
 "The scheduled date/time for the message (as opposed to the actual time of "
 "display)."
 msgstr ""
 
-#: messagewin.cpp:341
+#: messagewin.cpp:343
 msgid "The file whose contents are displayed below"
 msgstr ""
 
-#: messagewin.cpp:367
+#: messagewin.cpp:369
 msgid "The contents of the file to be displayed"
 msgstr ""
 
-#: messagewin.cpp:375
+#: messagewin.cpp:377
 msgid "File is a folder"
 msgstr ""
 
-#: messagewin.cpp:375
+#: messagewin.cpp:377
 msgid "Failed to open file"
 msgstr ""
 
-#: messagewin.cpp:375 sounddlg.cpp:445
+#: messagewin.cpp:377 sounddlg.cpp:445
 msgid "File not found"
 msgstr "ਫਾਇਲ ਨਹੀਂ ਲੱਭੀ"
 
-#: messagewin.cpp:394
+#: messagewin.cpp:396
 msgid "The alarm message"
 msgstr ""
 
-#: messagewin.cpp:452
+#: messagewin.cpp:454
 msgid "The email to send"
 msgstr ""
 
-#: messagewin.cpp:515
+#: messagewin.cpp:517
 msgid "Acknowledge the alarm"
 msgstr ""
 
-#: messagewin.cpp:525
+#: messagewin.cpp:527
 msgid "Edit the alarm."
 msgstr ""
 
-#: messagewin.cpp:531
+#: messagewin.cpp:533
 msgid "&Defer..."
 msgstr ""
 
-#: messagewin.cpp:537
+#: messagewin.cpp:539
 msgid ""
 "Defer the alarm until later.\n"
 "You will be prompted to specify when the alarm should be redisplayed."
 msgstr ""
 
-#: messagewin.cpp:553 sounddlg.cpp:314
+#: messagewin.cpp:555 sounddlg.cpp:314
 msgid "Stop sound"
 msgstr ""
 
-#: messagewin.cpp:554 sounddlg.cpp:315
+#: messagewin.cpp:556 sounddlg.cpp:315
 msgid "Stop playing the sound"
 msgstr ""
 
-#: messagewin.cpp:570
+#: messagewin.cpp:572
 msgid ""
 "_: Locate this email in KMail\n"
 "Locate in KMail"
 msgstr ""
 
-#: messagewin.cpp:571
+#: messagewin.cpp:573
 msgid "Locate and highlight this email in KMail"
 msgstr ""
 
-#: messagewin.cpp:583
+#: messagewin.cpp:585
 msgid "Activate KAlarm"
 msgstr ""
 
-#: messagewin.cpp:625
+#: messagewin.cpp:629
 msgid "Today"
 msgstr "ਅੱਜ"
 
-#: messagewin.cpp:627
+#: messagewin.cpp:631
 #, c-format
 msgid ""
 "_n: Tomorrow\n"
 "in %n days' time"
 msgstr ""
 
-#: messagewin.cpp:629
+#: messagewin.cpp:633
 #, c-format
 msgid ""
 "_n: in 1 week's time\n"
 "in %n weeks' time"
 msgstr ""
 
-#: messagewin.cpp:643
+#: messagewin.cpp:647
 #, c-format
 msgid ""
 "_n: in 1 minute's time\n"
 "in %n minutes' time"
 msgstr ""
 
-#: messagewin.cpp:645
+#: messagewin.cpp:649
 #, c-format
 msgid ""
 "_n: in 1 hour's time\n"
 "in %n hours' time"
 msgstr ""
 
-#: messagewin.cpp:647
+#: messagewin.cpp:651
 #, c-format
 msgid ""
 "_n: in 1 hour 1 minute's time\n"
 "in %n hours 1 minute's time"
 msgstr ""
 
-#: messagewin.cpp:649
+#: messagewin.cpp:653
 msgid ""
 "_n: in 1 hour %1 minutes' time\n"
 "in %n hours %1 minutes' time"
 msgstr ""
 
-#: messagewin.cpp:822 messagewin.cpp:836
+#: messagewin.cpp:826 messagewin.cpp:840
 msgid "Unable to speak message"
 msgstr ""
 
-#: messagewin.cpp:836
+#: messagewin.cpp:840
 msgid "DCOP Call sayMessage failed"
 msgstr ""
 
-#: messagewin.cpp:858 sounddlg.cpp:302
+#: messagewin.cpp:862 sounddlg.cpp:302
 #, c-format
 msgid ""
 "Cannot open audio file:\n"
 "%1"
 msgstr ""
 
-#: messagewin.cpp:882
+#: messagewin.cpp:885
 msgid ""
 "Unable to set master volume\n"
 "(Error accessing KMix:\n"
 "%1)"
 msgstr ""
 
-#: messagewin.cpp:1403
+#: messagewin.cpp:1405
 msgid "Do you really want to acknowledge this alarm?"
 msgstr ""
 
-#: messagewin.cpp:1404
+#: messagewin.cpp:1406
 msgid "Acknowledge Alarm"
 msgstr ""
 
-#: messagewin.cpp:1404
+#: messagewin.cpp:1406
 msgid "&Acknowledge"
 msgstr ""
 
-#: messagewin.cpp:1449
+#: messagewin.cpp:1451
 msgid "Unable to locate this email in KMail"
 msgstr ""
 
@@ -2067,8 +2069,8 @@ msgstr ""
 
 #: prefdlg.cpp:661
 msgid ""
-"Check to use the email address set in the Trinity Control Center, to identify you "
-"as the sender when sending email alarms."
+"Check to use the email address set in the Trinity Control Center, to identify "
+"you as the sender when sending email alarms."
 msgstr ""
 
 #: prefdlg.cpp:665
@@ -2102,8 +2104,8 @@ msgstr ""
 
 #: prefdlg.cpp:702
 msgid ""
-"Check to use the email address set in the Trinity Control Center, for blind copying "
-"email alarms to yourself."
+"Check to use the email address set in the Trinity Control Center, for blind "
+"copying email alarms to yourself."
 msgstr ""
 
 #: prefdlg.cpp:708
@@ -2547,164 +2549,164 @@ msgstr "ਦਿਨ"
 msgid "Enter the number of days between repetitions of the alarm"
 msgstr ""
 
-#: recurrenceedit.cpp:1228
+#: recurrenceedit.cpp:1227
 msgid "Select the days of the week on which the alarm is allowed to occur"
 msgstr ""
 
-#: recurrenceedit.cpp:1230 recurrenceedit.cpp:1244
-msgid "Select the days of the week on which to repeat the alarm"
-msgstr ""
-
-#: recurrenceedit.cpp:1242
+#: recurrenceedit.cpp:1238
 msgid "week(s)"
 msgstr "ਹਫਤਾ"
 
-#: recurrenceedit.cpp:1243
+#: recurrenceedit.cpp:1239
 msgid "Enter the number of weeks between repetitions of the alarm"
 msgstr ""
 
-#: recurrenceedit.cpp:1267
+#: recurrenceedit.cpp:1240
+msgid "Select the days of the week on which to repeat the alarm"
+msgstr ""
+
+#: recurrenceedit.cpp:1263
 msgid ""
 "_: On day number in the month\n"
 "O&n day"
 msgstr ""
 
-#: recurrenceedit.cpp:1271
+#: recurrenceedit.cpp:1267
 msgid "Repeat the alarm on the selected day of the month"
 msgstr ""
 
-#: recurrenceedit.cpp:1277
+#: recurrenceedit.cpp:1273
 msgid ""
 "_: Last day of month\n"
 "Last"
 msgstr ""
 
-#: recurrenceedit.cpp:1280
+#: recurrenceedit.cpp:1276
 msgid "Select the day of the month on which to repeat the alarm"
 msgstr ""
 
-#: recurrenceedit.cpp:1292
+#: recurrenceedit.cpp:1288
 msgid ""
 "_: On the 1st Tuesday\n"
 "On t&he"
 msgstr ""
 
-#: recurrenceedit.cpp:1297
+#: recurrenceedit.cpp:1293
 msgid ""
 "Repeat the alarm on one day of the week, in the selected week of the month"
 msgstr ""
 
-#: recurrenceedit.cpp:1300
+#: recurrenceedit.cpp:1296
 msgid "1st"
 msgstr "1ਹਿਲਾਂ"
 
-#: recurrenceedit.cpp:1301
+#: recurrenceedit.cpp:1297
 msgid "2nd"
 msgstr "2ਜਾ"
 
-#: recurrenceedit.cpp:1302
+#: recurrenceedit.cpp:1298
 msgid "3rd"
 msgstr "3ਜਾ"
 
-#: recurrenceedit.cpp:1303
+#: recurrenceedit.cpp:1299
 msgid "4th"
 msgstr "4ਵਾਂ"
 
-#: recurrenceedit.cpp:1304
+#: recurrenceedit.cpp:1300
 msgid "5th"
 msgstr "5ਵਾਂ"
 
-#: recurrenceedit.cpp:1305
+#: recurrenceedit.cpp:1301
 msgid ""
 "_: Last Monday in March\n"
 "Last"
 msgstr ""
 
-#: recurrenceedit.cpp:1306
+#: recurrenceedit.cpp:1302
 msgid "2nd Last"
 msgstr "2ਜਾ ਆਖਰੀ"
 
-#: recurrenceedit.cpp:1307
+#: recurrenceedit.cpp:1303
 msgid "3rd Last"
 msgstr "3ਜਾ ਆਖਰੀ"
 
-#: recurrenceedit.cpp:1308
+#: recurrenceedit.cpp:1304
 msgid "4th Last"
 msgstr "4ਵਾਂ ਆਖਰੀ"
 
-#: recurrenceedit.cpp:1309
+#: recurrenceedit.cpp:1305
 msgid "5th Last"
 msgstr "5ਵਾਂ ਆਖਰੀ"
 
-#: recurrenceedit.cpp:1312
+#: recurrenceedit.cpp:1308
 msgid ""
 "_: Every (Monday...) in month\n"
 "Every"
 msgstr ""
 
-#: recurrenceedit.cpp:1315
+#: recurrenceedit.cpp:1311
 msgid "Select the week of the month in which to repeat the alarm"
 msgstr ""
 
-#: recurrenceedit.cpp:1328
+#: recurrenceedit.cpp:1324
 msgid "Select the day of the week on which to repeat the alarm"
 msgstr ""
 
-#: recurrenceedit.cpp:1446
+#: recurrenceedit.cpp:1442
 msgid "month(s)"
 msgstr "ਮਹੀਨੇ"
 
-#: recurrenceedit.cpp:1447
+#: recurrenceedit.cpp:1443
 msgid "Enter the number of months between repetitions of the alarm"
 msgstr ""
 
-#: recurrenceedit.cpp:1458
+#: recurrenceedit.cpp:1454
 msgid "year(s)"
 msgstr "ਸਾਲ"
 
-#: recurrenceedit.cpp:1459
+#: recurrenceedit.cpp:1455
 msgid "Enter the number of years between repetitions of the alarm"
 msgstr ""
 
-#: recurrenceedit.cpp:1464
+#: recurrenceedit.cpp:1460
 msgid ""
 "_: List of months to select\n"
 "Months:"
 msgstr ""
 
-#: recurrenceedit.cpp:1483
+#: recurrenceedit.cpp:1479
 msgid "Select the months of the year in which to repeat the alarm"
 msgstr ""
 
-#: recurrenceedit.cpp:1490
+#: recurrenceedit.cpp:1486
 msgid "February 2&9th alarm in non-leap years:"
 msgstr ""
 
-#: recurrenceedit.cpp:1493
+#: recurrenceedit.cpp:1489
 msgid ""
 "_: No date\n"
 "None"
 msgstr ""
 
-#: recurrenceedit.cpp:1494
+#: recurrenceedit.cpp:1490
 msgid ""
 "_: 1st March (short form)\n"
 "1 Mar"
 msgstr ""
 
-#: recurrenceedit.cpp:1495
+#: recurrenceedit.cpp:1491
 msgid ""
 "_: 28th February (short form)\n"
 "28 Feb"
 msgstr ""
 
-#: recurrenceedit.cpp:1501
+#: recurrenceedit.cpp:1497
 msgid ""
 "Select which date, if any, the February 29th alarm should trigger in non-leap "
 "years"
 msgstr ""
 
-#: recurrenceedit.cpp:1585
+#: recurrenceedit.cpp:1581
 msgid "No month selected"
 msgstr ""
 
@@ -3139,12 +3141,12 @@ msgstr "ਸੋਧ...."
 msgid "Date cannot be earlier than %1"
 msgstr ""
 
-#: lib/dateedit.cpp:68
+#: lib/dateedit.cpp:69
 #, c-format
 msgid "Date cannot be later than %1"
 msgstr ""
 
-#: lib/dateedit.cpp:79
+#: lib/dateedit.cpp:81
 msgid "today"
 msgstr "ਅੱਜ"
 
diff --git a/tde-i18n-pa/messages/tdepim/karm.po b/tde-i18n-pa/messages/tdepim/karm.po
index 2c114df9d7e..7ee269a6fe0 100644
--- a/tde-i18n-pa/messages/tdepim/karm.po
+++ b/tde-i18n-pa/messages/tdepim/karm.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: karm\n"
-"POT-Creation-Date: 2008-04-21 01:46+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-04-20 17:44+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-pa/messages/tdepim/kcmkabconfig.po b/tde-i18n-pa/messages/tdepim/kcmkabconfig.po
index 32658f63e0a..e22658b0158 100644
--- a/tde-i18n-pa/messages/tdepim/kcmkabconfig.po
+++ b/tde-i18n-pa/messages/tdepim/kcmkabconfig.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmkabconfig\n"
-"POT-Creation-Date: 2005-08-13 01:40+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-04-20 17:45+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -96,74 +97,74 @@ msgstr ""
 msgid "Extension Settings"
 msgstr ""
 
-#: tdeabconfigwidget.cpp:62 tdeabconfigwidget.cpp:154
+#: kabconfigwidget.cpp:62 kabconfigwidget.cpp:154
 msgid "General"
 msgstr "ਸਧਾਰਨ"
 
-#: tdeabconfigwidget.cpp:66
+#: kabconfigwidget.cpp:66
 msgid "Honor TDE single click"
 msgstr ""
 
-#: tdeabconfigwidget.cpp:69
+#: kabconfigwidget.cpp:69
 msgid "Automatic name parsing for new addressees"
 msgstr ""
 
-#: tdeabconfigwidget.cpp:72
+#: kabconfigwidget.cpp:72
 msgid "Trade single name component as family name"
 msgstr ""
 
-#: tdeabconfigwidget.cpp:80
+#: kabconfigwidget.cpp:80
 msgid "Limit unfiltered display to 100 contacts"
 msgstr ""
 
-#: tdeabconfigwidget.cpp:85
+#: kabconfigwidget.cpp:85
 msgid "Addressee editor type:"
 msgstr ""
 
-#: tdeabconfigwidget.cpp:89
+#: kabconfigwidget.cpp:89
 msgid "Full Editor"
 msgstr "ਪੂਰਾ ਸੰਪਾਦਕ"
 
-#: tdeabconfigwidget.cpp:90
+#: kabconfigwidget.cpp:90
 msgid "Simple Editor"
 msgstr "ਸਧਾਰਨ ਸੰਪਾਦਕ"
 
-#: tdeabconfigwidget.cpp:99
+#: kabconfigwidget.cpp:99
 msgid "Script-Hooks"
 msgstr ""
 
-#: tdeabconfigwidget.cpp:102
+#: kabconfigwidget.cpp:102
 msgid "Phone:"
 msgstr "ਫੋਨ:"
 
-#: tdeabconfigwidget.cpp:106
+#: kabconfigwidget.cpp:106
 msgid "<ul><li>%N: Phone Number</li></ul>"
 msgstr "<ul><li>%N: ਫੋਨ ਨੰਬਰ</li></ul>"
 
-#: tdeabconfigwidget.cpp:109
+#: kabconfigwidget.cpp:109
 msgid "Fax:"
 msgstr "ਫੈਕਸ:"
 
-#: tdeabconfigwidget.cpp:113
+#: kabconfigwidget.cpp:113
 msgid "<ul><li>%N: Fax Number</li></ul>"
 msgstr ""
 
-#: tdeabconfigwidget.cpp:117
+#: kabconfigwidget.cpp:117
 msgid "SMS Text:"
 msgstr ""
 
-#: tdeabconfigwidget.cpp:121
+#: kabconfigwidget.cpp:121
 msgid ""
 "<ul>"
 "<li>%N: Phone Number</li>"
 "<li>%F: File containing the text message(s)</li></ul>"
 msgstr ""
 
-#: tdeabconfigwidget.cpp:129
+#: kabconfigwidget.cpp:129
 msgid "Location Map"
 msgstr "ਸਥਿਤੀ ਨਕਸ਼ਾ"
 
-#: tdeabconfigwidget.cpp:135
+#: kabconfigwidget.cpp:135
 msgid ""
 "<ul> "
 "<li>%s: Street</li>"
@@ -173,7 +174,7 @@ msgid ""
 "<li>%c: Country ISO Code</li> </ul>"
 msgstr ""
 
-#: tdeabconfigwidget.cpp:158
+#: kabconfigwidget.cpp:158
 msgid "Contact"
 msgstr "ਸੰਪਰਕ"
 
diff --git a/tde-i18n-pa/messages/tdepim/kcmkontactnt.po b/tde-i18n-pa/messages/tdepim/kcmkontactnt.po
index 6b121f9a058..542437b8c84 100644
--- a/tde-i18n-pa/messages/tdepim/kcmkontactnt.po
+++ b/tde-i18n-pa/messages/tdepim/kcmkontactnt.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmkontactnt\n"
-"POT-Creation-Date: 2006-03-20 03:58+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-04-20 17:45+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-pa/messages/tdepim/kleopatra.po b/tde-i18n-pa/messages/tdepim/kleopatra.po
index 56dc91158e3..d01bb0c5a0e 100644
--- a/tde-i18n-pa/messages/tdepim/kleopatra.po
+++ b/tde-i18n-pa/messages/tdepim/kleopatra.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kleopatra\n"
-"POT-Creation-Date: 2008-08-19 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-01-17 10:46+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -189,7 +190,7 @@ msgstr "ਪਰੋਗਰਾਮ ਚਲਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ �
 msgid "Issuer certificate not found ( %1)"
 msgstr "ਜਾਰੀ ਕਰਤਾ ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਮਿਲਿਆ (%1)"
 
-#: certificateinfowidgetimpl.cpp:380 certmanager.cpp:1153
+#: certificateinfowidgetimpl.cpp:380 certmanager.cpp:1154
 msgid "Additional Information for Key"
 msgstr "ਕੁੰਜੀ ਲਈ ਵਧੀਕ ਜਾਣਕਾਰੀ"
 
@@ -221,8 +222,8 @@ msgid "Could not start certificate generation: %1"
 msgstr ""
 
 #: certificatewizardimpl.cpp:259 certificatewizardimpl.cpp:282
-#: certmanager.cpp:876 certmanager.cpp:878 certmanager.cpp:937
-#: certmanager.cpp:992 certmanager.cpp:994 crlview.cpp:111 crlview.cpp:134
+#: certmanager.cpp:876 certmanager.cpp:878 certmanager.cpp:938
+#: certmanager.cpp:993 certmanager.cpp:995 crlview.cpp:111 crlview.cpp:134
 msgid "Certificate Manager Error"
 msgstr ""
 
@@ -246,17 +247,17 @@ msgstr ""
 msgid "DCOP Communication Error, unable to send certificate using KMail."
 msgstr ""
 
-#: certificatewizardimpl.cpp:483 certmanager.cpp:1240
+#: certificatewizardimpl.cpp:483 certmanager.cpp:1241
 msgid ""
 "A file named \"%1\" already exists. Are you sure you want to overwrite it?"
 msgstr ""
 "ਫਾਇਲ ਨਾਂ \"%1\" ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਤਬਦੀਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: certificatewizardimpl.cpp:485 certmanager.cpp:1242
+#: certificatewizardimpl.cpp:485 certmanager.cpp:1243
 msgid "Overwrite File?"
 msgstr "ਕੀ ਫਾਇਲ ਉੱਪਰ ਲਿਖਣਾ ਹੈ?"
 
-#: certificatewizardimpl.cpp:486 certmanager.cpp:1243
+#: certificatewizardimpl.cpp:486 certmanager.cpp:1244
 msgid "&Overwrite"
 msgstr "ਉੱਪਰ ਲਿਖੋ(&O)"
 
@@ -533,29 +534,30 @@ msgstr ""
 msgid "CRL file imported successfully."
 msgstr ""
 
-#: certmanager.cpp:880 certmanager.cpp:996
+#: certmanager.cpp:880 certmanager.cpp:997
 msgid "Certificate Manager Information"
 msgstr ""
 
-#: certmanager.cpp:892
-msgid "Certificate Revocation List (*.crl *.arl *-crl.der *-arl.der)"
+#: certmanager.cpp:893
+msgid ""
+"Certificate Revocation List, DER encoded (*.crl *.arl *-crl.der *-arl.der)"
 msgstr ""
 
-#: certmanager.cpp:896
+#: certmanager.cpp:897
 msgid "Select CRL File"
 msgstr ""
 
-#: certmanager.cpp:937
+#: certmanager.cpp:938
 msgid "Unable to start %1 process. Please check your installation."
 msgstr ""
 
-#: certmanager.cpp:992
+#: certmanager.cpp:993
 msgid ""
 "The DirMngr process that tried to clear the CRL cache ended prematurely because "
 "of an unexpected error."
 msgstr ""
 
-#: certmanager.cpp:994
+#: certmanager.cpp:995
 #, c-format
 msgid ""
 "An error occurred when trying to clear the CRL cache. The output from DirMngr "
@@ -563,37 +565,37 @@ msgid ""
 "%1"
 msgstr ""
 
-#: certmanager.cpp:996
+#: certmanager.cpp:997
 msgid "CRL cache cleared successfully."
 msgstr ""
 
-#: certmanager.cpp:1002
+#: certmanager.cpp:1003
 msgid ""
 "<qt>"
 "<p>An error occurred while trying to delete the certificates:</p>"
 "<p><b>%1</b></p></qt>"
 msgstr ""
 
-#: certmanager.cpp:1006 certmanager.cpp:1101
+#: certmanager.cpp:1007 certmanager.cpp:1102
 msgid "Certificate Deletion Failed"
 msgstr ""
 
-#: certmanager.cpp:1040
+#: certmanager.cpp:1041
 msgid "Checking key dependencies..."
 msgstr ""
 
-#: certmanager.cpp:1066
+#: certmanager.cpp:1067
 msgid ""
 "Some or all of the selected certificates are issuers (CA certificates) for "
 "other, non-selected certificates.\n"
 "Deleting a CA certificate will also delete all certificates issued by it."
 msgstr ""
 
-#: certmanager.cpp:1071
+#: certmanager.cpp:1072
 msgid "Deleting CA Certificates"
 msgstr ""
 
-#: certmanager.cpp:1077
+#: certmanager.cpp:1078
 msgid ""
 "_n: Do you really want to delete this certificate and the %1 certificates it "
 "certified?\n"
@@ -601,18 +603,18 @@ msgid ""
 "certified?"
 msgstr ""
 
-#: certmanager.cpp:1080
+#: certmanager.cpp:1081
 #, c-format
 msgid ""
 "_n: Do you really want to delete this certificate?\n"
 "Do you really want to delete these %n certificates?"
 msgstr ""
 
-#: certmanager.cpp:1083
+#: certmanager.cpp:1084
 msgid "Delete Certificates"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਹਟਾਓ"
 
-#: certmanager.cpp:1093
+#: certmanager.cpp:1094
 msgid ""
 "<qt>"
 "<p>An error occurred while trying to delete the certificate:</p>"
@@ -620,7 +622,7 @@ msgid ""
 "<p></qt>"
 msgstr ""
 
-#: certmanager.cpp:1096
+#: certmanager.cpp:1097
 msgid ""
 "<qt>"
 "<p>An error occurred while trying to delete the certificates:</p>"
@@ -628,77 +630,77 @@ msgid ""
 "<p></qt>"
 msgstr ""
 
-#: certmanager.cpp:1100
+#: certmanager.cpp:1101
 msgid "Operation not supported by the backend."
 msgstr ""
 
-#: certmanager.cpp:1115
+#: certmanager.cpp:1116
 msgid "Deleting keys..."
 msgstr "ਕੁੰਜੀਆਂ ਹਟਾਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨ..."
 
-#: certmanager.cpp:1205
+#: certmanager.cpp:1206
 msgid ""
 "<qt>"
 "<p>An error occurred while trying to export the certificate:</p>"
 "<p><b>%1</b></p></qt>"
 msgstr ""
 
-#: certmanager.cpp:1209
+#: certmanager.cpp:1210
 msgid "Certificate Export Failed"
 msgstr ""
 
-#: certmanager.cpp:1224
+#: certmanager.cpp:1225
 msgid "Exporting certificate..."
 msgstr ""
 
-#: certmanager.cpp:1259
+#: certmanager.cpp:1260
 msgid "ASCII Armored Certificate Bundles (*.pem)"
 msgstr ""
 
-#: certmanager.cpp:1263 certmanager.cpp:1380
+#: certmanager.cpp:1264 certmanager.cpp:1383
 msgid "Save Certificate"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਸੰਭਾਲੋ"
 
-#: certmanager.cpp:1279
+#: certmanager.cpp:1280
 msgid "Secret Key Export"
 msgstr ""
 
-#: certmanager.cpp:1280
+#: certmanager.cpp:1282
 msgid ""
 "Select the secret key to export (<b>Warning: The PKCS#12 format is insecure; "
 "exporting secret keys is discouraged</b>):"
 msgstr ""
 
-#: certmanager.cpp:1298
+#: certmanager.cpp:1301
 msgid ""
 "<qt>"
 "<p>An error occurred while trying to export the secret key:</p>"
 "<p><b>%1</b></p></qt>"
 msgstr ""
 
-#: certmanager.cpp:1302
+#: certmanager.cpp:1305
 msgid "Secret-Key Export Failed"
 msgstr ""
 
-#: certmanager.cpp:1344 certmanager.cpp:1359
+#: certmanager.cpp:1347 certmanager.cpp:1362
 msgid "Exporting secret key..."
 msgstr ""
 
-#: certmanager.cpp:1345
+#: certmanager.cpp:1348
 msgid ""
 "Choose a charset for encoding the pkcs#12 passphrase (utf8 is recommended)"
 msgstr ""
 
-#: certmanager.cpp:1376
+#: certmanager.cpp:1379
 msgid "PKCS#12 Key Bundle (*.p12)"
 msgstr ""
 
-#: certmanager.cpp:1427
+#: certmanager.cpp:1430
 msgid ""
 "Could not start GnuPG LogViewer (kwatchgnupg). Please check your installation!"
 msgstr ""
 
-#: certmanager.cpp:1429
+#: certmanager.cpp:1432
 msgid "Kleopatra Error"
 msgstr ""
 
diff --git a/tde-i18n-pa/messages/tdepim/kmail.po b/tde-i18n-pa/messages/tdepim/kmail.po
index c29b1342846..ee04f79ccfe 100644
--- a/tde-i18n-pa/messages/tdepim/kmail.po
+++ b/tde-i18n-pa/messages/tdepim/kmail.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2008-08-19 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-05-07 12:45+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -96,7 +97,7 @@ msgstr ""
 msgid "multiple encryption keys per address"
 msgstr ""
 
-#: aboutdata.cpp:212 kmreaderwin.cpp:1336 kmstartup.cpp:148
+#: aboutdata.cpp:212 kmreaderwin.cpp:1300 kmstartup.cpp:149
 #: mailinglistpropertiesdialog.cpp:97
 msgid "KMail"
 msgstr "ਕੇਮੇਲ"
@@ -140,7 +141,8 @@ msgid "Locking Method"
 msgstr "ਲਾਕਿੰਗ ਢੰਗ"
 
 #: accountdialog.cpp:368
-msgid "Procmail loc&kfile:"
+#, fuzzy
+msgid "Procmail loc&tdefile:"
 msgstr "Procmail ਲਾਕ-ਫਾਇਲ(&k):"
 
 #: accountdialog.cpp:380
@@ -194,7 +196,7 @@ msgid "Check inter&val:"
 msgstr "ਜਾਂਚ ਅੰਤਰਾਲ(&v):"
 
 #: accountdialog.cpp:438 accountdialog.cpp:537 accountdialog.cpp:741
-#: accountdialog.cpp:1059 configuredialog.cpp:2655
+#: accountdialog.cpp:1059 configuredialog.cpp:2733
 msgid " min"
 msgstr " ਮਿੰਟ"
 
@@ -228,8 +230,8 @@ msgstr "ਦਸਤੀ ਪੱਤਰ ਜਾਂਚ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕ�
 msgid "Account Type: POP Account"
 msgstr "ਖਾਤਾ ਕਿਸਮ: POP ਖਾਤਾ"
 
-#: accountdialog.cpp:582 accountdialog.cpp:851 configuredialog.cpp:2526
-#: identitydialog.cpp:109 kmfilterdlg.cpp:160 kmtransport.cpp:376
+#: accountdialog.cpp:582 accountdialog.cpp:851 configuredialog.cpp:2550
+#: identitydialog.cpp:112 kmfilterdlg.cpp:164 kmtransport.cpp:376
 msgid "&General"
 msgstr "ਸਧਾਰਨ(&G)"
 
@@ -331,7 +333,7 @@ msgstr "ਵਾਧੂ(&E)"
 msgid "Check &What the Server Supports"
 msgstr "ਜਾਂਚ ਕਰੋ ਕਿ ਸਰਵਰ ਕਿਸ ਲਈ ਸਹਾਇਕ ਹੈ(&W)"
 
-#: accountdialog.cpp:782 accountdialog.cpp:1097 kmheaders.cpp:137
+#: accountdialog.cpp:782 accountdialog.cpp:1097 kmheaders.cpp:140
 #: kmtransport.cpp:502
 msgid "Encryption"
 msgstr "ਇਨਕਰਿਪਸ਼ਨ"
@@ -453,7 +455,8 @@ msgid "Sho&w hidden folders"
 msgstr "ਲੁਕਵੇਂ ਫੋਲਡਰ ਵੇਖਾਓ(&w)"
 
 #: accountdialog.cpp:987
-msgid "Show only s&ubscribed folders"
+#, fuzzy
+msgid "Show only serverside s&ubscribed folders"
 msgstr "ਸਿਰਫ਼ ਮੈਂਬਰੀ ਵਾਲੇ ਫੋਲਡਰ ਹੀ ਵੇਖਾਓ(&u)"
 
 #: accountdialog.cpp:992
@@ -510,9 +513,9 @@ msgstr "ਫਿਲਟਰ ਕਰਨਾ(&F)"
 msgid "<none>"
 msgstr "<none>"
 
-#: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:244
-#: kmfoldercachedimap.cpp:2085 kmfolderimap.cpp:204 kmfolderimap.cpp:907
-#: kmkernel.cpp:1374 subscriptiondialog.cpp:172
+#: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
+#: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
+#: kmkernel.cpp:1424 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "ਆਉਣ-ਬਕਸਾ"
 
@@ -578,7 +581,7 @@ msgid ""
 "the possibility to turn filtering messages on the server on."
 msgstr ""
 
-#: accountdialog.cpp:1734 vacationdialog.cpp:163
+#: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
 msgid ""
 "_n:  day\n"
 " days"
@@ -622,12 +625,12 @@ msgstr "ਖਾਲੀ"
 msgid "Edit Namespace '%1'"
 msgstr "ਨਾਂ-ਥਾਂ '%1' ਸੋਧ"
 
-#: accountmanager.cpp:101
+#: accountmanager.cpp:103
 #, c-format
 msgid "Account %1"
 msgstr "ਖਾਤਾ %1"
 
-#: accountmanager.cpp:181
+#: accountmanager.cpp:183
 msgid ""
 "Account %1 has no mailbox defined:\n"
 "mail checking aborted;\n"
@@ -637,24 +640,24 @@ msgstr ""
 "ਪੱਤਰ ਜਾਂਚ ਨੂੰ ਛੱਡਿਆ ਜਾ ਰਿਹਾ ਹੈ;\n"
 "ਆਪਣੇ ਖਾਤੇ ਦੀ ਸੈਟਿੰਗ ਦੀ ਜਾਂਚ ਕਰੋ।"
 
-#: accountmanager.cpp:196
+#: accountmanager.cpp:226
 msgid "Checking account %1 for new mail"
 msgstr "ਨਵੇਂ ਪੱਤਰ ਲਈ ਖਾਤੇ %1 ਦੀ ਜਾਂਚ ਜਾਰੀ"
 
-#: accountmanager.cpp:214 accountmanager.cpp:217 accountwizard.cpp:441
+#: accountmanager.cpp:244 accountmanager.cpp:247 accountwizard.cpp:441
 #: accountwizard.cpp:477
 msgid "Local Account"
 msgstr "ਲੋਕਲ ਖਾਤਾ"
 
-#: accountmanager.cpp:220
+#: accountmanager.cpp:250
 msgid "POP Account"
 msgstr "POP ਖਾਤਾ"
 
-#: accountmanager.cpp:223 accountmanager.cpp:225
+#: accountmanager.cpp:253 accountmanager.cpp:255
 msgid "IMAP Account"
 msgstr "IMAP ਖਾਤਾ"
 
-#: accountmanager.cpp:308
+#: accountmanager.cpp:343
 msgid ""
 "You need to add an account in the network section of the settings in order to "
 "receive mail."
@@ -763,13 +766,13 @@ msgstr "ਲੋਕਲ ਡਿਲਵਰੀ ਵਰਤੋਂ"
 msgid "Server Information"
 msgstr "ਸਰਵਰ ਜਾਣਕਾਰੀ"
 
-#. i18n: file customtemplates_base.ui line 248
-#: accountwizard.cpp:329 rc.cpp:212
+#. i18n: file customtemplates_base.ui line 302
+#: accountwizard.cpp:329 rc.cpp:221
 #, no-c-format
 msgid "None"
 msgstr "ਕੋਈ ਨਹੀਂ"
 
-#: accountwizard.cpp:384 configuredialog.cpp:792
+#: accountwizard.cpp:384 configuredialog.cpp:794
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -777,13 +780,13 @@ msgstr "Sendmail"
 msgid "Check for supported security capabilities of %1..."
 msgstr "%1 ਵਲੋਂ ਸਹਾਇਕ ਸੁਰੱਖਿਅਤ ਸਮਰੱਥਾਂ ਦੀ ਜਾਂਚ..."
 
-#: actionscheduler.cpp:598 kmfiltermgr.cpp:152 kmfiltermgr.cpp:255
-#: kmfiltermgr.cpp:293
+#: actionscheduler.cpp:598 kmfiltermgr.cpp:150 kmfiltermgr.cpp:253
+#: kmfiltermgr.cpp:291
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>ਫਿਲਟਰ ਨਿਯਮਾਂ ਦੀ ਪੜਤਾਲ:</b> "
 
-#: actionscheduler.cpp:605 kmfiltermgr.cpp:159 kmfiltermgr.cpp:262
-#: kmfiltermgr.cpp:299
+#: actionscheduler.cpp:605 kmfiltermgr.cpp:157 kmfiltermgr.cpp:260
+#: kmfiltermgr.cpp:297
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>ਫਿਲਟਰ ਨਿਯਮ ਮਿਲੇ ਹਨ।</b>"
 
@@ -792,111 +795,111 @@ msgstr "<b>ਫਿਲਟਰ ਨਿਯਮ ਮਿਲੇ ਹਨ।</b>"
 msgid "<b>Applying filter action:</b> %1"
 msgstr "<b>ਫਿਲਟਰ ਕਾਰਵਾਈ ਜਾਰੀ:</b> %1"
 
-#: antispamwizard.cpp:101
+#: antispamwizard.cpp:100
 msgid "Anti-Spam Wizard"
 msgstr "ਸਪਮ ਵਿਰੋਧੀ ਸਹਾਇਕ"
 
-#: antispamwizard.cpp:102
+#: antispamwizard.cpp:101
 msgid "Anti-Virus Wizard"
 msgstr "ਵਾਇਰਸ ਵਿਰੋਧੀ ਸਹਾਇਕ"
 
-#: antispamwizard.cpp:106
+#: antispamwizard.cpp:105
 msgid "Welcome to the KMail Anti-Spam Wizard"
 msgstr "ਕੇ-ਮੇਲ ਦੇ ਸਪਮ ਵਿਰੋਧੀ ਸਹਾਇਕ ਵਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ"
 
-#: antispamwizard.cpp:107
+#: antispamwizard.cpp:106
 msgid "Welcome to the KMail Anti-Virus Wizard"
 msgstr "ਕੇਮੇਲ ਦੇ ਵਾਇਰਸ ਵਿਰੋਧੀ ਸਹਾਇਕ ਵਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ"
 
-#: antispamwizard.cpp:113
+#: antispamwizard.cpp:112
 msgid "Options to fine-tune the handling of spam messages"
 msgstr ""
 
-#: antispamwizard.cpp:119
+#: antispamwizard.cpp:118
 msgid "Options to fine-tune the handling of virus messages"
 msgstr ""
 
-#: antispamwizard.cpp:131
+#: antispamwizard.cpp:130
 msgid "Summary of changes to be made by this wizard"
 msgstr "ਇਹ ਸਹਾਇਕ ਨਾਲ ਕੀਤੀਆਂ ਤਬਦੀਲੀਆਂ ਦਾ ਸੰਖੇਪ ਹੈ"
 
-#: antispamwizard.cpp:200
+#: antispamwizard.cpp:199
 msgid "Virus handling"
 msgstr "ਵਾਇਰਸ ਕੰਟਰੋਲ"
 
-#: antispamwizard.cpp:284 antispamwizard.cpp:286 antispamwizard.cpp:572
+#: antispamwizard.cpp:283 antispamwizard.cpp:285 antispamwizard.cpp:577
 msgid "Spam handling"
 msgstr "ਸਪਮ ਕੰਟਰੋਲ"
 
-#: antispamwizard.cpp:325 antispamwizard.cpp:327 antispamwizard.cpp:585
+#: antispamwizard.cpp:324 antispamwizard.cpp:326 antispamwizard.cpp:590
 msgid "Semi spam (unsure) handling"
 msgstr "ਅਰਧ ਸਮਪ (ਨਾ-ਸੁਰੱਖਿਅਤ) ਹੈਡਲਿੰਗ"
 
-#: antispamwizard.cpp:387 antispamwizard.cpp:389 antispamwizard.cpp:593
+#: antispamwizard.cpp:386 antispamwizard.cpp:388 antispamwizard.cpp:598
 msgid "Classify as spam"
 msgstr "ਸਪਮ ਵਰਗ ਵਿੱਚ"
 
-#: antispamwizard.cpp:419 antispamwizard.cpp:421 antispamwizard.cpp:595
+#: antispamwizard.cpp:418 antispamwizard.cpp:420 antispamwizard.cpp:600
 msgid "Classify as NOT spam"
 msgstr "ਸਪਮ ਨਹੀਂ ਵਰਗ ਵਿੱਚ"
 
-#: antispamwizard.cpp:493
+#: antispamwizard.cpp:498
 msgid "Scanning for %1..."
 msgstr "%1 ਦੀ ਜਾਂਚ ਜਾਰੀ ਹੈ..."
 
-#: antispamwizard.cpp:524
+#: antispamwizard.cpp:529
 msgid "Scanning for anti-spam tools finished."
 msgstr "ਸਪਸ-ਵਿਰੋਧੀ ਸੰਦ ਨੇ ਜਾਂਚ ਮੁਕੰਮਲ ਕਰ ਲਈ ਹੈ"
 
-#: antispamwizard.cpp:525
+#: antispamwizard.cpp:530
 msgid "Scanning for anti-virus tools finished."
 msgstr "ਐਂਟੀ-ਵਾਇਰਸ ਸੰਦ ਦੀ ਜਾਂਚ ਮੁਕੰਮਲ ਹੋਈ।"
 
-#: antispamwizard.cpp:528
+#: antispamwizard.cpp:533
 msgid ""
 "<p>No spam detection tools have been found. Install your spam detection "
 "software and re-run this wizard.</p>"
 msgstr ""
 
-#: antispamwizard.cpp:531
+#: antispamwizard.cpp:536
 msgid "Scanning complete. No anti-virus tools found."
 msgstr "ਜਾਂਚ ਮੁਕਮੰਲ ਹੋਈ। ਕੋਈ ਐਂਟੀ-ਵਾਇਰਸ ਸੰਦ ਨਹੀਂ ਮਿਲੇ।"
 
-#: antispamwizard.cpp:555
+#: antispamwizard.cpp:560
 msgid "<p>Messages classified as spam are marked as read."
 msgstr "<p>ਕੂੜੇ ਦੇ ਤੌਰ ਉੱਤੇ ਵੰਡੇ ਗਏ ਸੁਨੇਹਿਆਂ ਨੂੰ ਪੜਿਆ ਐਲਾਨਿਆ ਜਾਦਾ ਹੈ।"
 
-#: antispamwizard.cpp:557
+#: antispamwizard.cpp:562
 msgid "<p>Messages classified as spam are not marked as read."
 msgstr "<p>ਸਮਪ ਐਲਾਨਿਆ ਸੁਨੇਹਿਆਂ ਪੜ੍ਹਿਆ ਨਹੀਂ ਬਣਾਇਆ ਜਾਵੇਗਾ।"
 
-#: antispamwizard.cpp:560
+#: antispamwizard.cpp:565
 msgid "<br>Spam messages are moved into the folder named <i>"
 msgstr "<br>ਕੂੜਾ ਸੁਨੇਹਿਆਂ ਨੂੰ ਇਸ ਨਾਂ ਦੇ ਫੋਲਡਰ ਵਿੱਚ ਭੇਜਿਆ ਜਾਦਾ ਹੈ <i>"
 
-#: antispamwizard.cpp:563
+#: antispamwizard.cpp:568
 msgid "<br>Spam messages are not moved into a certain folder.</p>"
 msgstr "<br>ਕੂੜਾ ਸੁਨੇਹੇ ਇੱਕ ਖਾਸ ਫੋਲਡਰ ਵਿੱਚ ਨਹੀਂ ਭੇਜੇ ਜਾਦੇ ਹਨ।</p>"
 
-#: antispamwizard.cpp:587
+#: antispamwizard.cpp:592
 msgid "<p>The folder for messages classified as unsure (probably spam) is <i>"
 msgstr ""
 
-#: antispamwizard.cpp:600
+#: antispamwizard.cpp:605
 msgid "<p>The wizard will create the following filters:<ul>"
 msgstr "<p>ਸਹਾਇਕ ਹੇਠ ਦਿੱਤੇ ਫੋਲਡਰ ਬਣਾਏਗਾ:<ul>"
 
-#: antispamwizard.cpp:603
+#: antispamwizard.cpp:608
 msgid "<p>The wizard will replace the following filters:<ul>"
 msgstr "<p>ਸਹਾਇਕ ਹੇਠ ਦਿੱਤੇ ਫਿਲਟਰ ਬਣਾਏਗਾ:<ul>"
 
-#: antispamwizard.cpp:860
+#: antispamwizard.cpp:864
 msgid ""
 "The wizard will search for any tools to do spam detection\n"
 "and setup KMail to work with them."
 msgstr ""
 
-#: antispamwizard.cpp:864
+#: antispamwizard.cpp:868
 msgid ""
 "<p>Here you can get some assistance in setting up KMail's filter rules to use "
 "some commonly-known anti-virus tools.</p>"
@@ -911,25 +914,25 @@ msgid ""
 "former behavior."
 msgstr ""
 
-#: antispamwizard.cpp:915
+#: antispamwizard.cpp:919
 msgid ""
 "<p>Please select the tools to be used for the detection and go to the next "
 "page.</p>"
 msgstr ""
 
-#: antispamwizard.cpp:941
+#: antispamwizard.cpp:945
 msgid "&Mark detected spam messages as read"
 msgstr "ਕੂੜਾ ਸੁਨੇਹਿਆਂ ਨੂੰ ਪੜੇ ਬਣਾਓ(&M)"
 
-#: antispamwizard.cpp:943
+#: antispamwizard.cpp:947
 msgid "Mark messages which have been classified as spam as read."
 msgstr "ਕੂੜੇ ਦੇ ਤੌਰ 'ਤੇ ਖੋਜੇ ਗਏ ਸੁਨੇਹਿਆਂ ਨੂੰ ਪੜਿਆ ਬਣਾਓ।"
 
-#: antispamwizard.cpp:946
+#: antispamwizard.cpp:950
 msgid "Move &known spam to:"
 msgstr "ਕੂੜਾ ਖੋਜਿਆ ਨੂੰ ਭੇਜੋ(&k):"
 
-#: antispamwizard.cpp:948
+#: antispamwizard.cpp:952
 msgid ""
 "The default folder for spam messages is the trash folder, but you may change "
 "that in the folder view below."
@@ -937,11 +940,11 @@ msgstr ""
 "ਕੂੜਾ ਸੁਨਹਿਆਂ ਲਈ ਮੂਲ ਫੋਲਡਰ ਰੱਦੀ ਹੈ, ਪਰ ਤੁਸੀਂ ਉਸ ਨੂੰ ਫੋਲਡਰ ਝਲਕ ਵਿੱਚ ਹੇਠਾਂ ਇਸ ਨੂੰ "
 "ਬਦਲ ਸਕਦੇ ਹੋ।"
 
-#: antispamwizard.cpp:962
+#: antispamwizard.cpp:966
 msgid "Move &probable spam to:"
 msgstr ""
 
-#: antispamwizard.cpp:964
+#: antispamwizard.cpp:968
 msgid ""
 "The default folder is the inbox folder, but you may change that in the folder "
 "view below."
@@ -952,11 +955,11 @@ msgstr ""
 "<p>ਸਭ ਸੰਦ ਨਾ-ਸੁਰੱਖਿਅਤ ਵਰਗੀਕਰਨ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹਨ। ਜੇ ਤੁਸੀਂ ਇੱਕ ਢੁੱਕਵਾਂ ਸੰਦ ਨਾ "
 "ਚੁਣਿਆ ਤਾਂ ਤੁਸੀਂ ਇੱਕ ਫੋਲਡਰ ਵੀ ਨਹੀਂ ਚੁਣ ਸਕਦੇ।"
 
-#: antispamwizard.cpp:1064
+#: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
 msgstr "ਸੁਨੇਹਿਆਂ ਦੀ ਜਾਂਚ ਐਂਟੀ-ਵਾਇਰਸ ਸੰਦਾਂ ਨਾਲ"
 
-#: antispamwizard.cpp:1066
+#: antispamwizard.cpp:1070
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
@@ -964,28 +967,181 @@ msgid ""
 "special folder."
 msgstr ""
 
-#: antispamwizard.cpp:1072
+#: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
 msgstr "ਫੜੇ ਵਾਇਰਸ ਸੁਨੇਹਿਆਂ ਨੂੰ ਚੁਣੇ ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ"
 
-#: antispamwizard.cpp:1074
+#: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
 "messages into a predefined folder is created. The default folder is the trash "
 "folder, but you may change that in the folder view."
 msgstr ""
 
-#: antispamwizard.cpp:1080
+#: antispamwizard.cpp:1084
 msgid "Additionally, mark detected viral messages as read"
 msgstr "ਇਸ ਤੋਂ ਬਿਨਾਂ, ਵਾਇਰਲ ਸੁਨੇਹਿਆਂ ਨੂੰ ਪੜ੍ਹਿਆ ਬਣਾਓ"
 
-#: antispamwizard.cpp:1083
+#: antispamwizard.cpp:1087
 msgid ""
 "Mark messages which have been classified as virus-infected as read, as well as "
 "moving them to the selected folder."
 msgstr ""
 
-#: cachedimapjob.cpp:220 cachedimapjob.cpp:271 cachedimapjob.cpp:825
+#: archivefolderdialog.cpp:48
+msgid ""
+"_: Start of the filename for a mail archive file\n"
+"Archive"
+msgstr ""
+
+#: archivefolderdialog.cpp:53
+#, fuzzy
+msgid "Archive Folder"
+msgstr "ਫੋਲਡਰ ਚੇਪੋ"
+
+#: archivefolderdialog.cpp:70 importarchivedialog.cpp:54
+#, fuzzy
+msgid "&Folder:"
+msgstr "ਫੋਲਡਰ(&F)"
+
+#: archivefolderdialog.cpp:80
+#, fuzzy
+msgid "F&ormat:"
+msgstr "ਸਧਾਰਨ(&o):"
+
+#: archivefolderdialog.cpp:86
+msgid "Compressed Zip Archive (.zip)"
+msgstr ""
+
+#: archivefolderdialog.cpp:87
+msgid "Uncompressed Archive (.tar)"
+msgstr ""
+
+#: archivefolderdialog.cpp:88
+msgid "BZ2-Compressed Tar Archive (.tar.bz2)"
+msgstr ""
+
+#: archivefolderdialog.cpp:89
+msgid "GZ-Compressed Tar Archive (.tar.gz)"
+msgstr ""
+
+#: archivefolderdialog.cpp:96 importarchivedialog.cpp:61
+#, fuzzy
+msgid "&Archive File:"
+msgstr "ਨੱਥੀ ਫਾਇਲ"
+
+#: archivefolderdialog.cpp:111
+#, fuzzy
+msgid "&Delete folders after completion"
+msgstr "ਸਰਵਰ ਤੋਂ ਫੋਲਡਰ ਹਟਾਏ ਜਾ ਰਹੇ ਹਨ"
+
+#: archivefolderdialog.cpp:161
+#, fuzzy
+msgid "Please select the folder that should be archived."
+msgstr "ਚੁਣੋ ਕਿ ਕਿਹੜੀ ਕੁੰਜੀ ਨੱਥੀ ਕਰਨੀ ਹੈ।"
+
+#: archivefolderdialog.cpp:162
+#, fuzzy
+msgid "No folder selected"
+msgstr "ਕੋਈ ਫੋਲਡਰ ਚੁਣਿਆ ਨਹੀਂ ਗਿਆ"
+
+#: backupjob.cpp:123 importjob.cpp:89
+msgid "The operation was canceled by the user."
+msgstr ""
+
+#: backupjob.cpp:151
+#, fuzzy
+msgid "Failed to archive the folder '%1'."
+msgstr "ਫੋਲਡਰ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ"
+
+#: backupjob.cpp:153
+#, fuzzy
+msgid "Archiving failed."
+msgstr "ਸੰਚਾਰ ਫੇਲ੍ਹ ਹੋਇਆ।"
+
+#: backupjob.cpp:163
+msgid "Unable to finalize the archive file."
+msgstr ""
+
+#: backupjob.cpp:168
+msgid "Archiving finished"
+msgstr ""
+
+#: backupjob.cpp:173
+msgid ""
+"Archiving folder '%1' successfully completed. The archive was written to the "
+"file '%2'."
+msgstr ""
+
+#: backupjob.cpp:177
+msgid ""
+"_n: 1 message of size %1 was archived.\n"
+"%n messages with the total size of %1 were archived."
+msgstr ""
+
+#: backupjob.cpp:179
+#, c-format
+msgid "The archive file has a size of %1."
+msgstr ""
+
+#: backupjob.cpp:181
+msgid "Archiving finished."
+msgstr ""
+
+#: backupjob.cpp:216 backupjob.cpp:226
+#, fuzzy
+msgid "Unable to retrieve a message for folder '%1'."
+msgstr "ਸੁਨੇਹੇ ਨੂੰ ਫੋਲਡਰ ਵਿੱਚ ਜੋੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: "
+
+#: backupjob.cpp:251
+#, fuzzy
+msgid "Internal error while trying to retrieve a message from folder '%1'."
+msgstr "ਫੋਲਡਰ %1 ਦਾ ਨਾਂ ਤਬਦੀਲ ਕਰਨ ਵਿੱਚ ਗਲਤੀ"
+
+#: backupjob.cpp:321
+#, fuzzy
+msgid "Failed to write a message into the archive folder '%1'."
+msgstr "ਫੜੇ ਵਾਇਰਸ ਸੁਨੇਹਿਆਂ ਨੂੰ ਚੁਣੇ ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ"
+
+#: backupjob.cpp:360
+#, fuzzy
+msgid "Downloading a message in folder '%1' failed."
+msgstr "%1 ਫੋਲਡਰ ਤੋਂ ਪੁਰਾਣੇ ਸੁਨੇਹੇ ਹਟਾਉਣ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
+
+#: backupjob.cpp:362
+#, fuzzy
+msgid "Downloading a message in the current folder failed."
+msgstr "ਮੌਜੂਦਾ ਫੋਲਡਰ ਵਿੱਚ ਸਭ ਮਸਲੇ ਸਮੇਟੋ"
+
+#: backupjob.cpp:391
+#, fuzzy, c-format
+msgid "Archiving folder %1"
+msgstr "ਫੋਲਡਰ ਲਏ ਜਾ ਰਹੇ ਹਨ"
+
+#: backupjob.cpp:393 importjob.cpp:210
+#, fuzzy
+msgid "Unable to open folder '%1'."
+msgstr "ਅਣਜਾਣ ਫੋਲਡਰ '%1'"
+
+#: backupjob.cpp:413
+msgid "Unable to create folder structure for folder '%1' within archive file."
+msgstr ""
+
+#: backupjob.cpp:425
+msgid "Unable to backup messages in folder '%1', the index file is corrupted."
+msgstr ""
+
+#: backupjob.cpp:483
+#, fuzzy
+msgid "Unable to open archive for writing."
+msgstr "ਪੜਤਾਲ ਲਈ ਅਸਮਰੱਥ: ਕੁੰਜੀ ਗੁੰਮ ਹੈ।"
+
+#: backupjob.cpp:489
+#, fuzzy
+msgid "Archiving"
+msgstr "ਆਉਣ(&R)"
+
+#: cachedimapjob.cpp:220 cachedimapjob.cpp:271 cachedimapjob.cpp:886
 msgid "Error while deleting messages on the server: "
 msgstr "ਸਰਵਰ ਤੋਂ ਸੁਨੇਹੇ ਹਟਾਉਣ ਸਮੇਂ ਤੋਂ ਗਲਤੀ:"
 
@@ -993,15 +1149,15 @@ msgstr "ਸਰਵਰ ਤੋਂ ਸੁਨੇਹੇ ਹਟਾਉਣ ਸਮੇਂ �
 msgid "Error while retrieving message on the server: "
 msgstr "ਸਰਵਰ ਤੋਂ ਸੁਨੇਹੇ ਪ੍ਰਾਪਤ ਕਰਨ ਸਮੇਂ ਗਲਤੀ:"
 
-#: cachedimapjob.cpp:538
+#: cachedimapjob.cpp:541
 msgid "Error while uploading folder"
 msgstr "ਫੋਲਡਰ ਅੱਪਲੋਡ ਕਰਨ ਸਮੇਂ ਗਲਤੀ"
 
-#: cachedimapjob.cpp:539
+#: cachedimapjob.cpp:542
 msgid "Could not make the folder <b>%1</b> on the server."
 msgstr "ਸਰਵਰ ਉੱਤੇ <b>%1</b> ਫੋਲਡਰ ਬਣ ਨਹੀਂ ਸਕਿਆ।"
 
-#: cachedimapjob.cpp:540
+#: cachedimapjob.cpp:543
 msgid ""
 "This could be because you do not have permission to do this, or because the "
 "folder is already present on the server; the error message from the server "
@@ -1010,32 +1166,81 @@ msgstr ""
 "ਇਸ ਦਾ ਕਾਰਨ ਇਹ ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਤੁਹਾਨੂੰ ਇਸ ਲਈ ਅਧਿਕਾਰ ਨਾ ਹੋਵੇ ਜਾਂ ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਸਰਵਰ "
 "ਉੱਤੇ ਫੋਲਡਰ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੋ ਸਕਦਾ ਹੈ; ਸਰਵਰ ਸੰਚਾਰ ਤੋਂ ਗਲਤੀ ਸੁਨੇਹਾ ਇਹ ਹੈ:"
 
-#: cachedimapjob.cpp:626
+#: cachedimapjob.cpp:629
 msgid "Error while deleting folder %1 on the server: "
 msgstr "ਸਰਵਰ ਉੱਤੇ ਫੋਲਡਰ %1 ਬਣਾਉਣ ਵਿੱਚ ਗਲਤੀ: "
 
-#: cachedimapjob.cpp:679
+#: cachedimapjob.cpp:682
 msgid "Error while reading folder %1 on the server: "
 msgstr "ਸਰਵਰ ਉੱਤੇ ਫੋਲਡਰ %1 ਪੜ੍ਹਨ ਵਿੱਚ ਗਲਤੀ: "
 
-#: cachedimapjob.cpp:794
+#: cachedimapjob.cpp:811
+msgid ""
+"Error while trying to subscribe to the renamed folder %1.\n"
+"Renaming itself was successful, but the renamed folder might disappear from the "
+"folder list after the next sync since it is unsubscribed on the server.\n"
+"You can try to manually subscribe to the folder yourself.\n"
+"\n"
+"%2"
+msgstr ""
+
+#: cachedimapjob.cpp:857
 #, c-format
 msgid "Error while trying to rename folder %1"
 msgstr "ਫੋਲਡਰ %1 ਦਾ ਨਾਂ ਤਬਦੀਲ ਕਰਨ ਵਿੱਚ ਗਲਤੀ"
 
-#: callback.cpp:170
+#: callback.cpp:71
+msgid ""
+"<qt>The receiver of this invitation doesn't match any of your identities."
+"<br>Please select the transport which should be used to send your reply.</qt>"
+msgstr ""
+
+#: callback.cpp:74
+msgid ""
+"<qt>The identity matching the receiver of this invitation doesn't have an "
+"associated transport configured."
+"<br>Please select the transport which should be used to send your reply.</qt>"
+msgstr ""
+
+#: callback.cpp:78
+#, fuzzy
+msgid "Select Transport"
+msgstr "ਸੰਚਾਰ ਵੱਲ ਸੈੱਟ"
+
+#: callback.cpp:97
+#, fuzzy, c-format
+msgid "Declined: %1"
+msgstr " ਲਾਇਨ: %1 "
+
+#: callback.cpp:99
+#, c-format
+msgid "Tentative: %1"
+msgstr ""
+
+#: callback.cpp:101
+#, fuzzy, c-format
+msgid "Accepted: %1"
+msgstr "ਨੱਥੀ: %1"
+
+#: callback.cpp:103
+#, fuzzy, c-format
+msgid "Delegated: %1"
+msgstr "ਹਟਾਏ"
+
+#: callback.cpp:216
 msgid ""
 "<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any:"
+"<br>please choose which of the following addresses is yours, if any, or select "
+"one of your identities to use in the reply:"
 msgstr ""
 
-#: callback.cpp:176
+#: callback.cpp:222
 msgid ""
 "<qt>Several of your identities match the receiver of this message,"
 "<br>please choose which of the following addresses is yours:"
 msgstr ""
 
-#: callback.cpp:183
+#: callback.cpp:233
 msgid "Select Address"
 msgstr "ਸਿਰਨਾਵਾਂ ਚੁਣੋ"
 
@@ -1060,7 +1265,7 @@ msgstr "ਫੋਲਡਰ \"%1\" ਸਫਲਤਾਪੂਰਕ ਨਪੀੜਿਆ �
 msgid "Error occurred while compacting \"%1\". Compaction aborted."
 msgstr ""
 
-#: configuredialog.cpp:155
+#: configuredialog.cpp:156
 msgid ""
 "<qt>"
 "<p>This setting has been fixed by your administrator.</p>"
@@ -1070,171 +1275,171 @@ msgstr ""
 "<p>ਇਹ ਸਥਾਪਨ ਤੁਹਾਡੇ ਪਰਸ਼ਾਸ਼ਕ ਵਲੋਂ ਕੀਤਾ ਗਿਆ ਹੈ।</p> "
 "<p>ਜੇਕਰ ਤੁਸੀਂ ਸੋਚਦੇ ਹੋ ਕਿ ਇਹ ਗਲਤੀ ਹੈ ਤਾਂ ਉਸ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।</p></qt>"
 
-#: configuredialog.cpp:217
+#: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "ਪ੍ਰੋਫਾਇਲ ਲੋਡ(&L)..."
 
-#: configuredialog.cpp:305 simplestringlisteditor.cpp:85
+#: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "ਸ਼ਾਮਿਲ(&A)..."
 
-#: configuredialog.cpp:306 configuredialog.cpp:625 configuredialog.cpp:1096
-#: configuredialog.cpp:3165 simplestringlisteditor.cpp:108
+#: configuredialog.cpp:309 configuredialog.cpp:628 configuredialog.cpp:1102
+#: configuredialog.cpp:3278 simplestringlisteditor.cpp:108
 msgid "&Modify..."
 msgstr "ਸੋਧਿਆ(&M)..."
 
-#: configuredialog.cpp:307
+#: configuredialog.cpp:310
 msgid "&Rename"
 msgstr "ਨਾਂ-ਤਬਦੀਲ(&R)"
 
-#: configuredialog.cpp:308 configuredialog.cpp:3115 configuredialog.cpp:3164
+#: configuredialog.cpp:311 configuredialog.cpp:3228 configuredialog.cpp:3277
 msgid "Remo&ve"
 msgstr "ਹਟਾਓ(&v)"
 
-#: configuredialog.cpp:309
+#: configuredialog.cpp:312
 msgid "Set as &Default"
 msgstr "ਮੂਲ ਵਾਂਗ ਸੈੱਟ(&D)"
 
-#: configuredialog.cpp:450
+#: configuredialog.cpp:453
 msgid "<qt>Do you really want to remove the identity named <b>%1</b>?</qt>"
 msgstr "<qt>ਕੀ ਤੁਸੀਂ ਪਛਾਣ ਨਾਂ <b>%1</b> ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?</qt>"
 
-#: configuredialog.cpp:452
+#: configuredialog.cpp:455
 msgid "Remove Identity"
 msgstr "ਪਛਾਣ ਹਟਾਓ"
 
-#: configuredialog.cpp:493 configuredialog.cpp:3114
+#: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "ਸ਼ਾਮਿਲ..."
 
-#: configuredialog.cpp:495 configuredialog.cpp:3116
+#: configuredialog.cpp:498 configuredialog.cpp:3229
 msgid "Modify..."
 msgstr "ਸੋਧ..."
 
-#: configuredialog.cpp:499
+#: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "ਮੂਲ ਵਾਂਗ ਸੈੱਟ ਕਰੋ"
 
-#: configuredialog.cpp:562
+#: configuredialog.cpp:565
 msgid "&Receiving"
 msgstr "ਆਉਣ(&R)"
 
-#: configuredialog.cpp:570
+#: configuredialog.cpp:573
 msgid "&Sending"
 msgstr "ਭੇਜਣ(&S)"
 
-#: configuredialog.cpp:595
+#: configuredialog.cpp:598
 msgid "Outgoing accounts (add at least one):"
 msgstr "ਬਾਹਰ ਭੇਜਣ ਵਾਲੇ ਖਾਤੇ (ਘੱਟੋ-ਘੱਟ ਇੱਕ):"
 
-#. i18n: file customtemplates_base.ui line 99
-#: configuredialog.cpp:604 configuredialog.cpp:1074 configuredialog.cpp:3290
-#: distributionlistdialog.cpp:115 favoritefolderview.cpp:378
-#: kmcomposewin.cpp:366 rc.cpp:191 recipientspicker.cpp:389
+#. i18n: file customtemplates_base.ui line 89
+#: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
+#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
+#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "ਨਾਂ"
 
-#. i18n: file customtemplates_base.ui line 88
-#: configuredialog.cpp:605 configuredialog.cpp:1075 kmcomposewin.cpp:369
-#: kmfilterdlg.cpp:214 kmmimeparttree.cpp:65 rc.cpp:188
+#. i18n: file customtemplates_base.ui line 78
+#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
+#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
 #, no-c-format
 msgid "Type"
 msgstr "ਕਿਸਮ"
 
-#: configuredialog.cpp:618 configuredialog.cpp:1089 configuredialog.cpp:2836
-#: configuredialog.cpp:3087 configuredialog.cpp:3164 configuredialog.cpp:3498
+#: configuredialog.cpp:621 configuredialog.cpp:1095 configuredialog.cpp:2949
+#: configuredialog.cpp:3200 configuredialog.cpp:3277 configuredialog.cpp:3611
 msgid "A&dd..."
 msgstr "ਸ਼ਾਮਿਲ(&D)..."
 
-#: configuredialog.cpp:633 configuredialog.cpp:1104
+#: configuredialog.cpp:636 configuredialog.cpp:1110
 msgid "R&emove"
 msgstr "ਹਟਾਓ(&e)"
 
-#: configuredialog.cpp:640
+#: configuredialog.cpp:643
 msgid "Set Default"
 msgstr "ਮੂਲ ਬਣਾਓ"
 
-#: configuredialog.cpp:650
+#: configuredialog.cpp:653
 msgid "Common Options"
 msgstr "ਆਮ ਚੋਣਾਂ"
 
-#. i18n: file kmail.kcfg line 382
-#: configuredialog.cpp:658 rc.cpp:788
+#. i18n: file kmail.kcfg line 412
+#: configuredialog.cpp:661 rc.cpp:813
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "ਭੇਜਣ ਤੋਂ ਪਹਿਲਾਂ ਪੁਸ਼ਟੀ(&b)"
 
-#: configuredialog.cpp:666
+#: configuredialog.cpp:669
 msgid "Never Automatically"
 msgstr "ਆਟੋਮੈਟਿਕ ਕਦੇ ਨਹੀਂ"
 
-#: configuredialog.cpp:667
+#: configuredialog.cpp:670
 msgid "On Manual Mail Checks"
 msgstr "ਦਸਤੀ ਮੇਲ ਜਾਂਚ ਸਮੇਂ"
 
-#: configuredialog.cpp:668
+#: configuredialog.cpp:671
 msgid "On All Mail Checks"
 msgstr "ਸਭ ਪੱਤਰ ਜਾਂਚ ਸਮੇਂ"
 
-#: configuredialog.cpp:676
+#: configuredialog.cpp:679
 msgid "Send Now"
 msgstr "ਹੁਣ ਭੇਜੋ"
 
-#: configuredialog.cpp:677
+#: configuredialog.cpp:680
 msgid "Send Later"
 msgstr "ਬਾਅਦ 'ਚ ਭੇਜੋ"
 
-#: configuredialog.cpp:687
+#: configuredialog.cpp:690
 msgid "Allow 8-bit"
 msgstr "8-ਬਿੱਟ ਮਨਜ਼ੂਰ"
 
-#: configuredialog.cpp:688
+#: configuredialog.cpp:691
 msgid "MIME Compliant (Quoted Printable)"
 msgstr "MIME ਅਨੁਕੂਲ (ਹਵਾਲਾ ਛਪਣਯੋਗ)"
 
-#: configuredialog.cpp:701
+#: configuredialog.cpp:704
 msgid "Send &messages in outbox folder:"
 msgstr "ਸੁਨੇਹਿਆਂ ਨੂੰ ਬਾਹਰੀ ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ(&m):"
 
-#: configuredialog.cpp:709
+#: configuredialog.cpp:712
 msgid "Defa&ult send method:"
 msgstr "ਮੂਲ ਭੇਜਣ ਢੰਗ(&u):"
 
-#: configuredialog.cpp:711
+#: configuredialog.cpp:714
 msgid "Message &property:"
 msgstr "ਸੁਨੇਹਾ ਗੁਣ(&p):"
 
-#: configuredialog.cpp:713
+#: configuredialog.cpp:716
 msgid "Defaul&t domain:"
 msgstr "ਮੂਲ ਡੋਮੇਨ(&t):"
 
-#: configuredialog.cpp:717
+#: configuredialog.cpp:720
 msgid ""
 "<qt>"
 "<p>The default domain is used to complete email addresses that only consist of "
 "the user's name.</p></qt>"
 msgstr ""
 
-#: configuredialog.cpp:741
+#: configuredialog.cpp:744
 msgid ""
 "_: %1: name; %2: number appended to it to make it unique among a list of names\n"
 "%1 %2"
 msgstr "%1 %2"
 
-#: configuredialog.cpp:766 configuredialog.cpp:943 configuredialog.cpp:991
+#: configuredialog.cpp:769 configuredialog.cpp:950 configuredialog.cpp:997
 msgid "smtp (Default)"
 msgstr "smtp (ਮੂਲ)"
 
-#: configuredialog.cpp:768 configuredialog.cpp:945 configuredialog.cpp:993
+#: configuredialog.cpp:771 configuredialog.cpp:952 configuredialog.cpp:999
 msgid "sendmail (Default)"
 msgstr "sendmail (ਮੂਲ)"
 
-#: configuredialog.cpp:799 kmtransport.cpp:248
+#: configuredialog.cpp:801 kmtransport.cpp:248
 msgid "Add Transport"
 msgstr "ਟਰਾਂਸਪੋਰਟ ਸ਼ਾਮਲ"
 
-#: configuredialog.cpp:830
+#: configuredialog.cpp:832
 msgid ""
 "_: %1: type of transport. Result used in Configure->Accounts->"
 "Sending listview, \"type\" column, first row, to indicate that this is the "
@@ -1242,397 +1447,388 @@ msgid ""
 "%1 (Default)"
 msgstr "%1 (ਮੂਲ)"
 
-#: configuredialog.cpp:854
+#: configuredialog.cpp:856
 msgid "Modify Transport"
 msgstr "ਟਰਾਂਸਪੋਰਟ ਸੋਧ"
 
-#: configuredialog.cpp:890
+#: configuredialog.cpp:892
 #, c-format
 msgid ""
 "_n: This identity has been changed to use the modified transport:\n"
 "These %n identities have been changed to use the modified transport:"
 msgstr ""
 
-#: configuredialog.cpp:921
+#: configuredialog.cpp:927
 #, c-format
 msgid ""
 "_n: This identity has been changed to use the default transport:\n"
 "These %n identities have been changed to use the default transport:"
 msgstr ""
 
-#: configuredialog.cpp:1066
+#: configuredialog.cpp:1072
 msgid "Incoming accounts (add at least one):"
 msgstr "ਆਉਣ ਵਾਲੇ ਖਾਤੇ (ਘੱਟੋ-ਘੱਟ ਇੱਕ ਜੋੜੋ):"
 
-#: configuredialog.cpp:1076 kmfolderseldlg.cpp:95 kmfoldertree.cpp:376
-#: searchwindow.cpp:230
+#: configuredialog.cpp:1082 kmfoldertree.cpp:397 searchwindow.cpp:229
+#: simplefoldertree.h:141
 msgid "Folder"
 msgstr "ਫੋਲਡਰ"
 
-#: configuredialog.cpp:1112
+#: configuredialog.cpp:1118
 msgid "Chec&k mail on startup"
 msgstr "ਸ਼ੁਰੂ ਵੇਲੇ ਪੱਤਰ ਦੀ ਜਾਂਚ ਕਰੋ(&k)"
 
-#: configuredialog.cpp:1118
+#: configuredialog.cpp:1124
 msgid "New Mail Notification"
 msgstr "ਨਵਾਂ ਪੱਤਰ ਸੂਚਨਾ"
 
-#: configuredialog.cpp:1123
+#: configuredialog.cpp:1129
 msgid "&Beep"
 msgstr "ਧੁਨ(&B)"
 
-#: configuredialog.cpp:1131
+#: configuredialog.cpp:1137
 msgid "Deta&iled new mail notification"
 msgstr "ਵੇਰਵੇ ਸਮੇਤ ਨਵਾਂ ਪੱਤਰ ਸੂਚਨਾ(&i)"
 
-#: configuredialog.cpp:1135
+#: configuredialog.cpp:1141
 msgid "Show for each folder the number of newly arrived messages"
 msgstr "ਹਰੇਕ ਫੋਲਡਰ ਵਿੱਚ ਨਵੇਂ ਆਏ ਸੁਨੇਹੇ ਦੀ ਗਿਣਤੀ ਵੇਖਾਓ"
 
-#: configuredialog.cpp:1143
+#: configuredialog.cpp:1149
 msgid "Other Actio&ns"
 msgstr "ਹੋਰ ਕਾਰਵਾਈ(&n)"
 
-#: configuredialog.cpp:1221
+#: configuredialog.cpp:1227
 msgid "Unknown account type selected"
 msgstr "ਅਣਜਾਣੀ ਖਾਤਾ ਕਿਸਮ ਚੁਣੀ"
 
-#: configuredialog.cpp:1230
+#: configuredialog.cpp:1236
 msgid "Unable to create account"
 msgstr "ਖਾਤਾ ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ"
 
-#: configuredialog.cpp:1236 kmacctseldlg.cpp:36
+#: configuredialog.cpp:1242 kmacctseldlg.cpp:36
 msgid "Add Account"
 msgstr "ਖਾਤਾ ਸ਼ਾਮਿਲ"
 
-#: configuredialog.cpp:1288
+#: configuredialog.cpp:1294
 msgid "Unable to locate account"
 msgstr "ਖਾਤਾ ਲੱਭਣ ਤੋਂ ਅਸਫਲ"
 
-#: configuredialog.cpp:1315
+#: configuredialog.cpp:1321
 msgid "Modify Account"
 msgstr "ਖਾਤਾ ਸੋਧ"
 
-#: configuredialog.cpp:1360 configuredialog.cpp:1440
+#: configuredialog.cpp:1366 configuredialog.cpp:1446
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt><b>%1</b> ਖਾਤਾ ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ ਹੈ।</qt>"
 
-#: configuredialog.cpp:1491
+#: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "ਰੰਗ(&s)"
 
-#: configuredialog.cpp:1497
+#: configuredialog.cpp:1503
 msgid "La&yout"
 msgstr "ਖਾਕਾ(&y)"
 
-#: configuredialog.cpp:1503
+#: configuredialog.cpp:1509
 msgid "M&essage List"
 msgstr "ਸੁਨੇਹਾ ਸੂਚੀ(&e)"
 
-#: configuredialog.cpp:1509
+#: configuredialog.cpp:1515
 msgid "Message W&indow"
 msgstr "ਸੁਨੇਹਾ ਝਰੋਖਾ(&i)"
 
-#: configuredialog.cpp:1515
+#: configuredialog.cpp:1521
 msgid "System &Tray"
 msgstr "ਸਿਸਟਮ ਟਰੇ(&T)"
 
-#: configuredialog.cpp:1531
+#: configuredialog.cpp:1537
 msgid "Message Body"
 msgstr "ਸੁਨੇਹਾ ਭਾਗ"
 
-#: configuredialog.cpp:1532
+#: configuredialog.cpp:1538
 msgid "Message List"
 msgstr "ਸੁਨੇਹਾ ਸੂਚੀ"
 
-#: configuredialog.cpp:1533
+#: configuredialog.cpp:1539
 msgid "Message List - New Messages"
 msgstr "ਸੁਨੇਹਾ ਸੂਚੀ - ਨਵੇਂ ਸੁਨੇਹੇ"
 
-#: configuredialog.cpp:1534
+#: configuredialog.cpp:1540
 msgid "Message List - Unread Messages"
 msgstr "ਸੁਨੇਹਾ ਸੂਚੀ - ਨਾ-ਪਡ਼ੇ ਸੁਨੇਹੇ"
 
-#: configuredialog.cpp:1535
+#: configuredialog.cpp:1541
 msgid "Message List - Important Messages"
 msgstr "ਸੁਨੇਹਾ ਸੂਚੀ - ਖਾਸ ਸੁਨੇਹੇ"
 
-#: configuredialog.cpp:1536
+#: configuredialog.cpp:1542
 msgid "Message List - Todo Messages"
 msgstr "ਸੁਨੇਹਾ ਸੂਚੀ - ਕਰਨ ਲਈ ਸੁਨੇਹੇ"
 
-#: configuredialog.cpp:1537
+#: configuredialog.cpp:1543
 msgid "Message List - Date Field"
 msgstr "ਸੁਨੇਹਾ ਸੂਚੀ - ਮਿਤੀ ਖੇਤਰ"
 
-#: configuredialog.cpp:1538 configuredialog.cpp:1859
+#: configuredialog.cpp:1544 configuredialog.cpp:1868
 msgid "Folder List"
 msgstr "ਫੋਲਡਰ ਸੂਚੀ"
 
-#: configuredialog.cpp:1539 configuredialog.cpp:1702
+#: configuredialog.cpp:1545 configuredialog.cpp:1708
 msgid "Quoted Text - First Level"
 msgstr "ਹਵਾਲਾ ਪਾਠ - ਪਹਿਲਾਂ ਪੱਧਰ"
 
-#: configuredialog.cpp:1540 configuredialog.cpp:1703
+#: configuredialog.cpp:1546 configuredialog.cpp:1709
 msgid "Quoted Text - Second Level"
 msgstr "ਹਵਾਲਾ ਪਾਠ - ਦੂਜਾ ਪੱਧਰ"
 
-#: configuredialog.cpp:1541 configuredialog.cpp:1704
+#: configuredialog.cpp:1547 configuredialog.cpp:1710
 msgid "Quoted Text - Third Level"
 msgstr "ਹਵਾਲਾ ਪਾਠ - ਤੀਜਾ ਪੱਧਰ"
 
-#: configuredialog.cpp:1542
+#: configuredialog.cpp:1548
 msgid "Fixed Width Font"
 msgstr "ਨਿਸ਼ਚਿਤ ਫੋਂਟ ਚੌੜਾਈ"
 
-#: configuredialog.cpp:1543 kmcomposewin.cpp:356
+#: configuredialog.cpp:1549 kmcomposewin.cpp:386
 msgid "Composer"
 msgstr "ਸੰਗੀਤਕਾਰ"
 
-#: configuredialog.cpp:1544
+#: configuredialog.cpp:1550
 msgid "Printing Output"
 msgstr "ਪ੍ਰਿਟਿੰਗ ਆਉਟਪੁੱਟ"
 
-#: configuredialog.cpp:1559
+#: configuredialog.cpp:1565
 msgid "&Use custom fonts"
 msgstr "ਸੋਧੇ ਫੋਂਟ ਵਰਤੋਂ(&U)"
 
-#: configuredialog.cpp:1575
+#: configuredialog.cpp:1581
 msgid "Apply &to:"
 msgstr "ਲਾਗੂ ਕਰੋ(&t):"
 
-#: configuredialog.cpp:1699
+#: configuredialog.cpp:1705
 msgid "Composer Background"
 msgstr "ਲੇਖਕ ਬੈਕਗਰਾਊਂਡ"
 
-#: configuredialog.cpp:1700
+#: configuredialog.cpp:1706
 msgid "Alternative Background Color"
 msgstr "ਬਦਲਵਾਂ ਬੈਕਗਰਾਊਂਡ ਰੰਗ"
 
-#: configuredialog.cpp:1701
+#: configuredialog.cpp:1707
 msgid "Normal Text"
 msgstr "ਸਧਾਰਨ ਪਾਠ"
 
-#: configuredialog.cpp:1705
+#: configuredialog.cpp:1711
 msgid "Link"
 msgstr "ਸੰਬੰਧ"
 
-#: configuredialog.cpp:1706
+#: configuredialog.cpp:1712
 msgid "Followed Link"
 msgstr "ਖੋਲ੍ਹਿਆ ਸੰਬੰਧ"
 
-#: configuredialog.cpp:1707
+#: configuredialog.cpp:1713
 msgid "Misspelled Words"
 msgstr "ਗਲਤ ਸ਼ਬਦ ਜੋੜ"
 
 #. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1708 rc.cpp:444
+#: configuredialog.cpp:1714 rc.cpp:450
 #, no-c-format
 msgid "New Message"
 msgstr "ਨਵਾਂ ਸੁਨੇਹਾ"
 
-#: configuredialog.cpp:1709
+#: configuredialog.cpp:1715
 msgid "Unread Message"
 msgstr "ਨਾ-ਪੜਿਆ ਸੁਨੇਹਾ"
 
-#: configuredialog.cpp:1710
+#: configuredialog.cpp:1716
 msgid "Important Message"
 msgstr "ਜਰੂਰੀ ਸੁਨੇਹਾ"
 
-#: configuredialog.cpp:1711
+#: configuredialog.cpp:1717
 msgid "Todo Message"
 msgstr "ਕਰਨ ਲਈ ਸੁਨੇਹਾ"
 
-#: configuredialog.cpp:1712
+#: configuredialog.cpp:1718
 msgid "OpenPGP Message - Encrypted"
 msgstr "OpenPGP ਸੁਨੇਹਾ - ਇੰਕਰਿਪਟਡ"
 
-#: configuredialog.cpp:1713
+#: configuredialog.cpp:1719
 msgid "OpenPGP Message - Valid Signature with Trusted Key"
 msgstr "OpenPGP ਸੁਨੇਹਾ - ਭਰੋਸੇਯੋਗ ਕੁੰਜੀ ਨਾਲ ਠੀਕ ਦਸਤਖਤ"
 
-#: configuredialog.cpp:1714
+#: configuredialog.cpp:1720
 msgid "OpenPGP Message - Valid Signature with Untrusted Key"
 msgstr "OpenPGP ਸੁਨੇਹਾ - ਨਾ-ਭਰੋਸੇਯੋਗ ਕੁੰਜੀ ਨਾਲ ਠੀਕ ਦਸਤਖਤ"
 
-#: configuredialog.cpp:1715
+#: configuredialog.cpp:1721
 msgid "OpenPGP Message - Unchecked Signature"
 msgstr "OpenPGP ਸੁਨੇਹਾ - ਨਾ-ਜਾਂਚੇ ਦਸਤਖਤ"
 
-#: configuredialog.cpp:1716
+#: configuredialog.cpp:1722
 msgid "OpenPGP Message - Bad Signature"
 msgstr "OpenPGP ਸੁਨੇਹਾ - ਬੇਕਾਰ ਦਸਤਖਤ"
 
-#: configuredialog.cpp:1717
+#: configuredialog.cpp:1723
 msgid "Border Around Warning Prepending HTML Messages"
 msgstr ""
 
-#: configuredialog.cpp:1718
+#: configuredialog.cpp:1724
 msgid "Folder Name and Size When Close to Quota"
 msgstr ""
 
-#: configuredialog.cpp:1719
+#: configuredialog.cpp:1725
 msgid "HTML Status Bar Background - No HTML Message"
 msgstr "HTML ਹਾਲਤ ਪੱਟੀ ਬੈਕ-ਗਰਾਊਂਡ - ਕੋਈ HTML ਸੁਨੇਹਾ ਨਹੀਂ"
 
-#: configuredialog.cpp:1720
+#: configuredialog.cpp:1726
 msgid "HTML Status Bar Foreground - No HTML Message"
 msgstr "HTML ਹਾਲਤ ਪੱਟੀ ਫਾਰ-ਗਰਾਊਂਡ - ਕੋਈ HTML ਸੁਨੇਹਾ ਨਹੀਂ"
 
-#: configuredialog.cpp:1721
+#: configuredialog.cpp:1727
 msgid "HTML Status Bar Background - HTML Message"
 msgstr "HTML ਹਾਲਤ ਪੱਟੀ ਬੈਕ-ਗਰਾਊਂਡ - HTML ਸੁਨੇਹਾ"
 
-#: configuredialog.cpp:1722
+#: configuredialog.cpp:1728
 msgid "HTML Status Bar Foreground - HTML Message"
 msgstr "HTML ਹਾਲਤ ਪੱਟੀ ਫਾਰ-ਗਰਾਊਂਡ - HTML ਸੁਨੇਹਾ"
 
-#: configuredialog.cpp:1734
+#: configuredialog.cpp:1740
 msgid "&Use custom colors"
 msgstr "ਪਸੰਦਾ ਰੰਗ ਵਰਤੋਂ(&U)"
 
-#: configuredialog.cpp:1749
+#: configuredialog.cpp:1755
 msgid "Recycle colors on deep &quoting"
 msgstr ""
 
-#: configuredialog.cpp:1757
+#: configuredialog.cpp:1763
 msgid "Close to quota threshold"
 msgstr ""
 
-#: configuredialog.cpp:1763
+#: configuredialog.cpp:1770
 #, c-format
 msgid "%"
 msgstr ""
 
-#: configuredialog.cpp:1855
+#: configuredialog.cpp:1864
 msgid "Lon&g folder list"
 msgstr "ਲੰਮੀ ਫੋਲਡਰ ਸੂਚੀ(&g)"
 
-#: configuredialog.cpp:1856
+#: configuredialog.cpp:1865
 msgid "Shor&t folder list"
 msgstr "ਛੋਟੀ ਫੋਲਡਰ ਸੂਚੀ(&t)"
 
-#: configuredialog.cpp:1865
+#: configuredialog.cpp:1874
 msgid "Abo&ve the message pane"
 msgstr "ਸੁਨੇਹਾ ਬਾਹੀ ਤੇ (&v)"
 
-#: configuredialog.cpp:1866
+#: configuredialog.cpp:1875
 msgid "&Below the message pane"
 msgstr "ਸੁਨੇਹਾ ਬਾਹੀ ਦੇ ਹੇਠਾਂ(&B)"
 
-#: configuredialog.cpp:1869
+#: configuredialog.cpp:1878
 msgid "Message Structure Viewer Placement"
 msgstr ""
 
-#: configuredialog.cpp:1874
+#: configuredialog.cpp:1883
 msgid "Show &never"
 msgstr "ਕਦੇ ਨਾ ਵੇਖਾਓ(&n)"
 
-#: configuredialog.cpp:1875
+#: configuredialog.cpp:1884
 msgid "Show only for non-plaintext &messages"
 msgstr ""
 
-#: configuredialog.cpp:1876
+#: configuredialog.cpp:1885
 msgid "Show alway&s"
 msgstr "ਹਮੇਸ਼ਾ ਵੇਖਾਓ(&s)"
 
-#: configuredialog.cpp:1879
+#: configuredialog.cpp:1888
 msgid "Message Structure Viewer"
 msgstr "ਸੁਨੇਹਾ ਢਾਂਚਾ ਦਰਸ਼ਕ"
 
-#: configuredialog.cpp:1885
+#: configuredialog.cpp:1894
 msgid "&Do not show a message preview pane"
 msgstr "ਸੁਨੇਹਾ ਝਲਕ ਬਾਹੀ ਨਾ ਵੇਖਾਓ(&D)"
 
-#: configuredialog.cpp:1886
+#: configuredialog.cpp:1895
 msgid "Show the message preview pane belo&w the message list"
 msgstr "ਸੁਨੇਹਾ ਝਲਕ ਬਾਹੀ ਸੁਨੇਹਾ ਸੂਚੀ ਦੇ ਹੇਠਾਂ ਵੇਖਾਓ(&w)"
 
-#: configuredialog.cpp:1887
+#: configuredialog.cpp:1896
 msgid "Show the message preview pane ne&xt to the message list"
 msgstr "ਸੁਨੇਹਾ ਸੂਚੀ ਤੋਂ ਅੱਗੇ ਸੁਨੇਹਾ ਝਲਕ ਪੱਟੀ ਵੇਖਾਓ(&x)"
 
-#: configuredialog.cpp:1890
+#: configuredialog.cpp:1899
 msgid "Message Preview Pane"
 msgstr "ਸੁਨੇਹਾ ਝਲਕ ਬਾਹੀ"
 
-#: configuredialog.cpp:1908
+#: configuredialog.cpp:1917
 #, fuzzy
 msgid "Show favorite folder view"
 msgstr "ਛੋਟੀ ਫੋਲਡਰ ਸੂਚੀ(&t)"
 
-#: configuredialog.cpp:1912
-#, fuzzy
-msgid "Show folder quick search field"
-msgstr "ਤੇਜ਼ ਖੋਜ ਸਤਰ ਸੋਧ ਵੇਖਾਓ"
-
-#: configuredialog.cpp:1983
+#: configuredialog.cpp:1986
 msgid "Sta&ndard format (%1)"
 msgstr "ਮਿਆਰੀ ਫਾਰਮੈਟ(&n) (%1)"
 
-#: configuredialog.cpp:1984
+#: configuredialog.cpp:1987
 msgid "Locali&zed format (%1)"
 msgstr "ਲੋਕਲਾਈਜ਼ ਫਾਰਮੈਟ(&z) (%1)"
 
-#: configuredialog.cpp:1985
+#: configuredialog.cpp:1988
 msgid "Fancy for&mat (%1)"
 msgstr ""
 
-#: configuredialog.cpp:1986
+#: configuredialog.cpp:1989
 msgid "C&ustom format (Shift+F1 for help):"
 msgstr "ਪਸੰਦੀਦਾ ਫਾਰਮੈਟ (&u) (ਸਹਾਇਤਾ ਲਈ Shift+F1):"
 
-#: configuredialog.cpp:2003
+#: configuredialog.cpp:2006
 msgid "General Options"
 msgstr "ਸਧਾਰਨ ਚੋਣ"
 
-#: configuredialog.cpp:2006
-msgid "Show Quick Search"
-msgstr "ਤੇਜ਼ ਖੋਜ ਵੇਖਾਓ"
-
-#: configuredialog.cpp:2008
+#: configuredialog.cpp:2009
 msgid "Display messa&ge sizes"
 msgstr "ਸੁਨੇਹਾ ਆਕਾਰ ਵੇਖਾਓ(&g)"
 
-#: configuredialog.cpp:2010
+#: configuredialog.cpp:2011
 msgid "Show crypto &icons"
 msgstr "crypto ਆਈਕਾਨ ਵੇਖਾਓ(&i)"
 
-#: configuredialog.cpp:2012
+#: configuredialog.cpp:2013
 msgid "Show attachment icon"
 msgstr "ਨੱਥੀ ਆਈਕਾਨ ਵੇਖਾਓ"
 
-#: configuredialog.cpp:2015
+#: configuredialog.cpp:2016
 msgid "&Threaded message list"
 msgstr "ਮਾਮਲਾ ਸੁਨੇਹਾ ਸੂਚੀ(&T)"
 
-#: configuredialog.cpp:2033
+#: configuredialog.cpp:2032
 msgid "Threaded Message List Options"
 msgstr "ਮਾਮਲਾ ਸੁਨੇਹਾ ਸੂਚੀ ਚੋਣਾਂ"
 
-#: configuredialog.cpp:2037
+#: configuredialog.cpp:2036
 msgid "Always &keep threads open"
 msgstr "ਹਮੇਸ਼ਾ ਮਾਮਲਾ ਖੁੱਲ੍ਹਾ ਰੱਖੋ(&k)"
 
-#: configuredialog.cpp:2040
+#: configuredialog.cpp:2039
 msgid "Threads default to o&pen"
 msgstr "ਖੋਲ੍ਹਣ ਲਈ ਮਾਮਲੇ ਮੂਲ(&p)"
 
-#: configuredialog.cpp:2043
+#: configuredialog.cpp:2042
 msgid "Threads default to closed"
 msgstr "ਬੰਦ ਕਰਨ ਲਈ ਮਾਮਲਾ ਮੂਲ"
 
-#: configuredialog.cpp:2046
+#: configuredialog.cpp:2045
 msgid ""
 "Open threads that contain ne&w, unread or important messages and open watched "
 "threads."
 msgstr ""
 
-#: configuredialog.cpp:2056
+#: configuredialog.cpp:2055
 msgid "Date Display"
 msgstr "ਮਿਤੀ ਵੇਖਾਓ"
 
-#: configuredialog.cpp:2073
+#: configuredialog.cpp:2072
 msgid ""
 "<qt>"
 "<p><strong>These expressions may be used for the date:</strong></p>"
@@ -1665,113 +1861,162 @@ msgid ""
 "<p><strong>All other input characters will be ignored.</strong></p></qt>"
 msgstr ""
 
-#: configuredialog.cpp:2187
+#: configuredialog.cpp:2185
 msgid ""
 "Changing the global threading setting will override all folder specific values."
 msgstr ""
 
-#: configuredialog.cpp:2224
+#: configuredialog.cpp:2221
+msgid "Close message window after replying or forwarding"
+msgstr ""
+
+#: configuredialog.cpp:2225
 msgid "Show HTML stat&us bar"
 msgstr "HTML ਹਾਲਤ ਪੱਟੀ ਵੇਖਾਓ(&u)"
 
-#: configuredialog.cpp:2228
+#: configuredialog.cpp:2229
 msgid "Show s&pam status in fancy headers"
 msgstr "ਫੈਂਸੀ ਸਿਰਲੇਖ 'ਚ ਕੂੜਾ ਹਾਲਤ ਵੇਖਾਓ(&p)"
 
-#. i18n: file kmail.kcfg line 541
-#: configuredialog.cpp:2232 rc.cpp:856
+#. i18n: file kmail.kcfg line 583
+#: configuredialog.cpp:2233 rc.cpp:890
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr ""
 
-#: configuredialog.cpp:2236
+#: configuredialog.cpp:2237
 msgid "Use smaller font for quoted text"
 msgstr "ਹਵਾਲਾ ਪਾਠ ਲਈ ਛੋਟੇ ਫੋਂਟ ਵਰਤੋਂ"
 
-#. i18n: file kmail.kcfg line 546
-#: configuredialog.cpp:2240 rc.cpp:862
+#. i18n: file kmail.kcfg line 588
+#: configuredialog.cpp:2241 rc.cpp:896
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr ""
 
-#: configuredialog.cpp:2315
+#: configuredialog.cpp:2245
+msgid "Show current sender time"
+msgstr ""
+
+#: configuredialog.cpp:2262
+msgid ""
+"Close the standalone message window after replying or forwarding the message"
+msgstr ""
+
+#: configuredialog.cpp:2328
 msgid "Fallback ch&aracter encoding:"
 msgstr "ਆਖਰੀ ਅੱਖਰੀ ਇੰਕੋਡਿੰਗ(&a):"
 
-#: configuredialog.cpp:2325 configuredialog.cpp:2382 kmreaderwin.cpp:650
+#: configuredialog.cpp:2338 configuredialog.cpp:2400 kmreaderwin.cpp:584
 msgid "Auto"
 msgstr "ਸਵੈ"
 
-#: configuredialog.cpp:2336
+#: configuredialog.cpp:2349
 msgid "&Override character encoding:"
 msgstr "ਅੱਖਰ ਇੰਕੋਡਿੰਗ ਤਬਦੀਲ(&O):"
 
-#. i18n: file kmail.kcfg line 103
-#: configuredialog.cpp:2462 rc.cpp:643
+#. i18n: file kmail.kcfg line 105
+#: configuredialog.cpp:2486 rc.cpp:649
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "ਸਿਸਟਮ ਟਰੇ ਆਈਕਾਨ ਵੇਖਾਓ"
 
-#: configuredialog.cpp:2468
+#: configuredialog.cpp:2492
 msgid "System Tray Mode"
 msgstr "ਸਿਸਟਮ ਟਰੇ ਢੰਗ"
 
-#: configuredialog.cpp:2476
+#: configuredialog.cpp:2500
 msgid "Always show KMail in system tray"
 msgstr "ਸਿਸਟਮ ਟਰੇ ਵਿੱਚ ਕੇ-ਮੇਲ ਹਮੇਸ਼ਾ ਵੇਖਾਓ"
 
-#: configuredialog.cpp:2479
+#: configuredialog.cpp:2503
 msgid "Only show KMail in system tray if there are unread messages"
 msgstr "ਸਿਸਟਮ ਟਰੇ ਵਿੱਚ ਕੇ-ਮੇਲ ਤਾਂ ਹੀ ਵੇਖਾਓ, ਜੇਕਰ ਕੋਈ ਅਣ-ਪੜਿਆ ਸੁਨੇਹਾ ਹੋਵੇ"
 
-#: configuredialog.cpp:2539 identitydialog.cpp:384
+#: configuredialog.cpp:2563 identitydialog.cpp:408
 msgid "&Templates"
 msgstr "ਨਮੂਨੇ(&T)"
 
-#: configuredialog.cpp:2545
+#: configuredialog.cpp:2569
 msgid "&Custom Templates"
 msgstr ""
 
-#: configuredialog.cpp:2551
+#: configuredialog.cpp:2575
 msgid "&Subject"
 msgstr "ਵਿਸ਼ਾ(&S)"
 
-#: configuredialog.cpp:2558
+#: configuredialog.cpp:2582
 msgid "Cha&rset"
 msgstr "ਅੱਖਰ ਸਮੂਹ(&r)"
 
-#: configuredialog.cpp:2564
+#: configuredialog.cpp:2588
 msgid "H&eaders"
 msgstr "ਸਿਰਲੇਖ(&e)"
 
-#: configuredialog.cpp:2570
+#: configuredialog.cpp:2594
 msgid ""
 "_: Config->Composer->Attachments\n"
 "A&ttachments"
 msgstr "ਨੱਥੀ(&t)"
 
-#: configuredialog.cpp:2654
+#: configuredialog.cpp:2633
+msgid ""
+"When replying, add quote signs in front of all lines of the quoted text,\n"
+"even when the line was created by adding an additional linebreak while\n"
+"word-wrapping the text."
+msgstr ""
+
+#: configuredialog.cpp:2643
+msgid ""
+"When replying, only quote the selected text instead of the complete message "
+"when there is text selected in the message window."
+msgstr ""
+
+#: configuredialog.cpp:2704
+msgid "Warn if too many recipients are specified"
+msgstr ""
+
+#: configuredialog.cpp:2716
+msgid "Warn if more than this many recipients are specified"
+msgstr ""
+
+#: configuredialog.cpp:2732
 msgid "No autosave"
 msgstr "ਆਟੋ-ਸੰਭਾਲ ਨਹੀਂ"
 
-#: configuredialog.cpp:2661
+#: configuredialog.cpp:2741
+#, fuzzy
+msgid "Default Forwarding Type:"
+msgstr "ਮੂਲ ਡੋਮੇਨ(&t):"
+
+#: configuredialog.cpp:2744
+#, fuzzy
+msgid "Inline"
+msgstr "ਸਤਰ ਵਿੱਚ(&I)..."
+
+#: configuredialog.cpp:2745
+#, fuzzy
+msgid "As Attachment"
+msgstr "ਨੱਥੀ ਹੈ"
+
+#: configuredialog.cpp:2753
 msgid "Configure Completion Order"
 msgstr "ਪੂਰਨਤਾ ਕਰਮ ਸੰਰਚਨਾ"
 
-#: configuredialog.cpp:2669 kmlineeditspell.cpp:136
+#: configuredialog.cpp:2761 kmlineeditspell.cpp:159
 msgid "Edit Recent Addresses..."
 msgstr "ਤਾਜ਼ਾ ਸਿਰਨਾਵਿਆਂ 'ਚ ਸੋਧ..."
 
-#: configuredialog.cpp:2676 kmedit.cpp:540
+#: configuredialog.cpp:2768 kmedit.cpp:633
 msgid "External Editor"
 msgstr "ਬਾਹਰੀ ਸੰਪਾਦਕ"
 
-#: configuredialog.cpp:2707
+#: configuredialog.cpp:2799
 #, c-format
 msgid "<b>%f</b> will be replaced with the filename to edit."
 msgstr "<b>%f</b> ਫਾਇਲ ਨਾਂ ਨੂੰ ਸੋਧ ਨਾਲ ਤਬਦੀਲ ਕਰ ਦੇਵੇਗਾ।"
 
-#: configuredialog.cpp:2817
+#: configuredialog.cpp:2930
 msgid ""
 "<qt>The following placeholders are supported in the reply phrases:"
 "<br><b>%D</b>: date, <b>%S</b>: subject,"
@@ -1782,160 +2027,160 @@ msgid ""
 "<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
 msgstr ""
 
-#: configuredialog.cpp:2830
+#: configuredialog.cpp:2943
 msgid "Lang&uage:"
 msgstr "ਭਾਸ਼ਾ(&u):"
 
-#: configuredialog.cpp:2839 configuredialog.cpp:3087 configuredialog.cpp:3303
-#: configuredialog.cpp:3498
+#: configuredialog.cpp:2952 configuredialog.cpp:3200 configuredialog.cpp:3416
+#: configuredialog.cpp:3611
 msgid "Re&move"
 msgstr "ਹਟਾਓ(&m)"
 
-#: configuredialog.cpp:2853
+#: configuredialog.cpp:2966
 msgid "Reply to se&nder:"
 msgstr "ਭੇਜਣ ਵਾਲੇ ਨੂੰ ਜਵਾਬ(&n):"
 
-#: configuredialog.cpp:2861
+#: configuredialog.cpp:2974
 msgid "Repl&y to all:"
 msgstr "ਸਭ ਨੂੰ ਜਵਾਬ(&y):"
 
-#: configuredialog.cpp:2869
+#: configuredialog.cpp:2982
 msgid "&Forward:"
 msgstr "ਅੱਗੇ ਭੇਜੋ(&F):"
 
 #. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2877 rc.cpp:459
+#: configuredialog.cpp:2990 rc.cpp:465
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr ""
 
-#: configuredialog.cpp:2922 kmmessage.cpp:3960
+#: configuredialog.cpp:3035 kmmessage.cpp:4048
 msgid "On %D, you wrote:"
 msgstr "%D ਨੂੰ, ਤੁਸੀਂ ਲਿਖਿਆ:"
 
-#: configuredialog.cpp:2923 kmmessage.cpp:3962
+#: configuredialog.cpp:3036 kmmessage.cpp:4050
 msgid "On %D, %F wrote:"
 msgstr "%D ਨੂੰ, %F ਨੇ ਲਿਖਿਆ:"
 
-#: configuredialog.cpp:2924 kmmessage.cpp:3964
+#: configuredialog.cpp:3037 kmmessage.cpp:4052
 msgid "Forwarded Message"
 msgstr "ਅੱਗੇ ਭੇਜਿਆ ਸੁਨੇਹਾ"
 
-#: configuredialog.cpp:2925
+#: configuredialog.cpp:3038
 msgid ">%_"
 msgstr ">%_"
 
-#: configuredialog.cpp:3074
+#: configuredialog.cpp:3187
 msgid "Repl&y Subject Prefixes"
 msgstr "ਜਵਾਬੀ ਵਿਸ਼ਾ ਅਗੇਤਰ(&y)"
 
-#: configuredialog.cpp:3078 configuredialog.cpp:3107
+#: configuredialog.cpp:3191 configuredialog.cpp:3220
 msgid ""
 "Recognize any sequence of the following prefixes\n"
 "(entries are case-insensitive regular expressions):"
 msgstr ""
 
-#: configuredialog.cpp:3088 configuredialog.cpp:3499
+#: configuredialog.cpp:3201 configuredialog.cpp:3612
 msgid "Mod&ify..."
 msgstr "ਸੋਧ(&i)..."
 
-#: configuredialog.cpp:3089
+#: configuredialog.cpp:3202
 msgid "Enter new reply prefix:"
 msgstr "ਨਵਾਂ ਜਵਾਬੀ ਅਗੇਤਰ ਦਿਓ:"
 
-#: configuredialog.cpp:3103
+#: configuredialog.cpp:3216
 msgid "For&ward Subject Prefixes"
 msgstr "ਅੱਗੇ ਭੇਜਣ ਵਿਸ਼ਾ ਅਗੇਤਰ(&w)"
 
-#: configuredialog.cpp:3117
+#: configuredialog.cpp:3230
 msgid "Enter new forward prefix:"
 msgstr "ਨਵਾਂ ਅੱਗੇ ਭੇਜਣ ਅਗੇਤਰ ਦਿਓ:"
 
-#: configuredialog.cpp:3156
+#: configuredialog.cpp:3269
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom for "
 "a charset that contains all required characters."
 msgstr ""
 
-#: configuredialog.cpp:3165
+#: configuredialog.cpp:3278
 msgid "Enter charset:"
 msgstr "ਅੱਖਰ ਸਮੂਹ ਦਿਓ:"
 
-#: configuredialog.cpp:3171
+#: configuredialog.cpp:3284
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr "ਜਵਾਬ ਦੇਣ ਜਾਂ ਅੱਗੇ ਭੇਜਣ ਸਮੇਂ ਅਸਲੀ ਅੱਖਰ-ਸਮੂਹ ਰੱਖੋ, ਜੇਕਰ ਸੰਭਵ ਹੋਵੇ(&K)"
 
-#: configuredialog.cpp:3205
+#: configuredialog.cpp:3318
 msgid "This charset is not supported."
 msgstr "ਅੱਖਰ ਸਮੂਹ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
 
-#: configuredialog.cpp:3256
+#: configuredialog.cpp:3369
 msgid "&Use custom message-id suffix"
 msgstr ""
 
-#: configuredialog.cpp:3269
+#: configuredialog.cpp:3382
 msgid "Custom message-&id suffix:"
 msgstr ""
 
-#: configuredialog.cpp:3283
+#: configuredialog.cpp:3396
 msgid "Define custom mime header fields:"
 msgstr ""
 
-#: configuredialog.cpp:3291
+#: configuredialog.cpp:3404
 msgid "Value"
 msgstr "ਮੁੱਲ"
 
-#: configuredialog.cpp:3299
+#: configuredialog.cpp:3412
 msgid "Ne&w"
 msgstr "ਨਵਾਂ(&w)"
 
 #. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3312 kmfolderdia.cpp:268 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:76 rc.cpp:224
-#: rc.cpp:399
+#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
+#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
+#: rc.cpp:405
 #, no-c-format
 msgid "&Name:"
 msgstr "ਨਾਂ(&N):"
 
-#: configuredialog.cpp:3321
+#: configuredialog.cpp:3434
 msgid "&Value:"
 msgstr "ਮੁੱਲ(&V):"
 
-#. i18n: file kmail.kcfg line 359
-#: configuredialog.cpp:3468 rc.cpp:782
+#. i18n: file kmail.kcfg line 389
+#: configuredialog.cpp:3581 rc.cpp:807
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr ""
 
-#: configuredialog.cpp:3471
+#: configuredialog.cpp:3584
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names containing "
 "non-English characters"
 msgstr ""
 
-#: configuredialog.cpp:3482
+#: configuredialog.cpp:3595
 msgid "E&nable detection of missing attachments"
 msgstr "ਗੁੰਮ ਨੱਥੀ ਦੀ ਖੋਜ ਯੋਗ(&n)"
 
-#: configuredialog.cpp:3489
+#: configuredialog.cpp:3602
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
 
-#: configuredialog.cpp:3500
+#: configuredialog.cpp:3613
 msgid "Enter new key word:"
 msgstr "ਨਵਾਂ ਸ਼ਬਦ ਦਿਓ:"
 
-#: configuredialog.cpp:3521 configuredialog.cpp:3522 kmcomposewin.cpp:2232
-#: kmcomposewin.cpp:2233
+#: configuredialog.cpp:3634 configuredialog.cpp:3635 kmcomposewin.cpp:2297
+#: kmcomposewin.cpp:2298
 msgid "attachment"
 msgstr "ਨੱਥੀ"
 
-#: configuredialog.cpp:3523 configuredialog.cpp:3524 kmcomposewin.cpp:2234
-#: kmcomposewin.cpp:2235
+#: configuredialog.cpp:3636 configuredialog.cpp:3637 kmcomposewin.cpp:2299
+#: kmcomposewin.cpp:2300
 msgid "attached"
 msgstr "ਨੱਥੀ ਕੀਤੀ"
 
-#: configuredialog.cpp:3542
+#: configuredialog.cpp:3655
 msgid ""
 "You have chosen to encode attachment names containing non-English characters in "
 "a way that is understood by Outlook(tm) and other mail clients that do not "
@@ -1946,27 +2191,27 @@ msgid ""
 "option."
 msgstr ""
 
-#: configuredialog.cpp:3569
+#: configuredialog.cpp:3682
 msgid "&Reading"
 msgstr "ਪੜ੍ਹਨਾ(&R)"
 
-#: configuredialog.cpp:3575
+#: configuredialog.cpp:3688
 msgid "Composing"
 msgstr "ਲਿਖਣਾ"
 
-#: configuredialog.cpp:3581
+#: configuredialog.cpp:3694
 msgid "Warnings"
 msgstr "ਚੇਤਾਵਨੀਆਂ"
 
-#: configuredialog.cpp:3587
+#: configuredialog.cpp:3700
 msgid "S/MIME &Validation"
 msgstr "S/MIME ਜਾਂਚ(&V)"
 
-#: configuredialog.cpp:3593
+#: configuredialog.cpp:3706
 msgid "Crypto Backe&nds"
 msgstr ""
 
-#: configuredialog.cpp:3624
+#: configuredialog.cpp:3737
 msgid ""
 "<qt>"
 "<p>Messages sometimes come in both formats. This option controls whether you "
@@ -1984,7 +2229,7 @@ msgid ""
 "Folder</i> menu of KMail's main window.</p></qt>"
 msgstr ""
 
-#: configuredialog.cpp:3641
+#: configuredialog.cpp:3754
 msgid ""
 "<qt>"
 "<p>Some mail advertisements are in HTML and contain references to, for example, "
@@ -1999,7 +2244,7 @@ msgid ""
 "possible problem.</p></qt>"
 msgstr ""
 
-#: configuredialog.cpp:3654
+#: configuredialog.cpp:3767
 msgid ""
 "<qt>"
 "<h3>Message Disposition Notification Policy</h3>"
@@ -2026,19 +2271,19 @@ msgid ""
 "customer relationship management, it has been made available.</li></ul></qt>"
 msgstr ""
 
-#: configuredialog.cpp:3687
+#: configuredialog.cpp:3800
 msgid "HTML Messages"
 msgstr "HTML ਸੁਨੇਹੇ"
 
-#: configuredialog.cpp:3690
+#: configuredialog.cpp:3803
 msgid "Prefer H&TML to plain text"
 msgstr "ਸਧਾਰਨ ਪਾਠ ਲਈ H&TML ਪਸੰਦੀਦਾ"
 
-#: configuredialog.cpp:3694
+#: configuredialog.cpp:3807
 msgid "Allow messages to load e&xternal references from the Internet"
 msgstr "ਸੁਨੇਹਿਆਂ ਨੂੰ ਇੰਟਰਨੈੱਟ ਰਾਹੀਂ ਬਾਹਰੀ ਹਵਾਲੇ ਲੋਡ ਕਰਨ ਦੀ ਮਨਜ਼ੂਰੀ(&x)"
 
-#: configuredialog.cpp:3699
+#: configuredialog.cpp:3812
 msgid ""
 "<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
 "will be compromised by present and anticipated security exploits. <a "
@@ -2046,191 +2291,205 @@ msgid ""
 "More about external references...</a>"
 msgstr ""
 
-#: configuredialog.cpp:3711
+#: configuredialog.cpp:3824
 #, fuzzy
 msgid "Encrypted Messages"
 msgstr "ਇਕ੍ਰਿਪਟਡ ਸੁਨੇਹਾ"
 
-#: configuredialog.cpp:3713
+#: configuredialog.cpp:3826
 msgid "Attempt decryption of encrypted messages when viewing"
 msgstr ""
 
-#: configuredialog.cpp:3718
+#: configuredialog.cpp:3831
 msgid "Message Disposition Notifications"
 msgstr ""
 
-#: configuredialog.cpp:3730
+#: configuredialog.cpp:3843
 msgid "Send policy:"
 msgstr "ਭੇਜਣ ਨੀਤੀ:"
 
-#: configuredialog.cpp:3732 kmmessage.cpp:1361 kmmessage.cpp:1368
+#: configuredialog.cpp:3845 kmmessage.cpp:1381 kmmessage.cpp:1388
 msgid "&Ignore"
 msgstr "ਅਣਡਿੱਠਾ(&I)"
 
-#: configuredialog.cpp:3735
+#: configuredialog.cpp:3848
 msgid "As&k"
 msgstr "ਪੁੱਛੋ(&k)"
 
-#: configuredialog.cpp:3738
+#: configuredialog.cpp:3851
 msgid "&Deny"
 msgstr "ਪਾਬੰਦੀ(&O)"
 
-#: configuredialog.cpp:3741
+#: configuredialog.cpp:3854
 msgid "Al&ways send"
 msgstr "ਹਮੇਸ਼ਾ ਭੇਜੋ(&w)"
 
-#: configuredialog.cpp:3759
+#: configuredialog.cpp:3872
 msgid "Quote original message:"
 msgstr "ਅਸਲੀ ਸੁਨੇਹਾ ਹਵਾਲਾ:"
 
-#: configuredialog.cpp:3761
+#: configuredialog.cpp:3874
 msgid "Nothin&g"
 msgstr "ਕੁਝ ਨਹੀਂ(&g)"
 
-#: configuredialog.cpp:3764
+#: configuredialog.cpp:3877
 msgid "&Full message"
 msgstr "ਪੂਰਾ ਸੁਨੇਹਾ(&F)"
 
-#: configuredialog.cpp:3767
+#: configuredialog.cpp:3880
 msgid "Onl&y headers"
 msgstr "ਸਿਰਫ ਸਿਰਲੇਖ(&y)"
 
-#: configuredialog.cpp:3773
+#: configuredialog.cpp:3886
 msgid "Do not send MDNs in response to encrypted messages"
 msgstr ""
 
-#: configuredialog.cpp:3777
+#: configuredialog.cpp:3890
 msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
 msgstr ""
 
-#: configuredialog.cpp:3786
+#: configuredialog.cpp:3899
 msgid "Certificate && Key Bundle Attachments"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਅਤੇ ਕੁੰਜੀ ਨੱਥੀ"
 
-#: configuredialog.cpp:3789
+#: configuredialog.cpp:3902
 msgid "Automatically import keys and certificates"
 msgstr "ਕੁੰਜੀਆਂ ਤੇ ਸਰਟੀਫਕੇਟ ਆਟੋਮੈਟਿਕ ਹੀ ਆਯਾਤ"
 
-#: configuredialog.cpp:3850
+#: configuredialog.cpp:3963
 msgid ""
 "Changing the global HTML setting will override all folder specific values."
 msgstr ""
 
-#: configuredialog.cpp:4138
+#: configuredialog.cpp:4251
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4247 rc.cpp:347
+#: configuredialog.cpp:4360 rc.cpp:353
 #, no-c-format
 msgid "no proxy"
 msgstr "ਕੋਈ ਪਰਾਕਸੀ ਨਹੀਂ"
 
-#: configuredialog.cpp:4248
+#: configuredialog.cpp:4361
 msgid "(Current system setting: %1)"
 msgstr "(ਮੌਜੂਦਾ ਸਿਸਟਮ ਸੈਟਿੰਗ: %1)"
 
-#: configuredialog.cpp:4425
+#: configuredialog.cpp:4538
 msgid "&Folders"
 msgstr "ਫੋਲਡਰ(&F)"
 
-#: configuredialog.cpp:4428
+#: configuredialog.cpp:4541
 msgid "&Groupware"
 msgstr "ਗਰੁੱਪਵੇਅਰ(&G)"
 
-#: configuredialog.cpp:4449
+#: configuredialog.cpp:4562
 msgid ""
 "_: Corresponds to Folder->Move All Messages to Trash\n"
 "Ask for co&nfirmation before moving all messages to trash"
 msgstr "ਸਭ ਸੁਨਹਿਆਂ ਨੂੰ ਰੱਦੀ ਵਿੱਚ ਭੇਜਣ ਵੇਲੇ ਪੁਸ਼ਟੀ ਕਰਵਾਓ(&n)"
 
-#: configuredialog.cpp:4456
+#: configuredialog.cpp:4569
 msgid "E&xclude important messages from expiry"
 msgstr ""
 
-#: configuredialog.cpp:4467
+#: configuredialog.cpp:4580
 msgid ""
 "_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
 "in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "ਜਦੋਂ ਨਾ-ਪੜ੍ਹ ਸੁਨੇਹੇ ਖੋਜਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਹੋਵੇ:"
 
-#: configuredialog.cpp:4470
+#: configuredialog.cpp:4583
 msgid ""
 "_: continuation of \"When trying to find unread messages:\"\n"
 "Do not Loop"
 msgstr "ਘੁੰਮਾਓ ਨਹੀਂ"
 
-#: configuredialog.cpp:4472
+#: configuredialog.cpp:4585
 msgid ""
 "_: continuation of \"When trying to find unread messages:\"\n"
 "Loop in Current Folder"
 msgstr "ਮੌਜੂਦਾ ਫੋਲਡਰ ਵਿੱਚ ਘੁੰਮਾਓ"
 
-#: configuredialog.cpp:4474
+#: configuredialog.cpp:4587
 msgid ""
 "_: continuation of \"When trying to find unread messages:\"\n"
 "Loop in All Folders"
 msgstr "ਸਭ ਫੋਲਡਰਾਂ ਵਿੱਚ ਘੁੰਮਾਓ"
 
-#: configuredialog.cpp:4487
+#: configuredialog.cpp:4600
 msgid ""
 "_: to be continued with \"jump to first new message\", \"jump to first unread "
 "or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "ਜਦੋਂ ਇੱਕ ਫੋਲਡਰ 'ਚ ਜਾਓ:"
 
-#: configuredialog.cpp:4490
+#: configuredialog.cpp:4603
 msgid ""
 "_: continuation of \"When entering a folder:\"\n"
 "Jump to First New Message"
 msgstr "ਪਹਿਲੇ ਨਵੇਂ ਸੁਨੇਹੇ ਤੇ ਜਾਓ"
 
-#: configuredialog.cpp:4492
+#: configuredialog.cpp:4605
 msgid ""
 "_: continuation of \"When entering a folder:\"\n"
 "Jump to First Unread or New Message"
 msgstr "ਪਹਿਲੇ ਨਾ-ਪੜੇ ਸੁਨੇਹੇ ਜਾਂ ਨਵੇਂ ਸੁਨੇਹੇ 'ਤੇ ਜਾਓ"
 
-#: configuredialog.cpp:4494
+#: configuredialog.cpp:4607
 msgid ""
 "_: continuation of \"When entering a folder:\"\n"
 "Jump to Last Selected Message"
 msgstr "ਆਖਰੀ ਚੁਣੇ ਸੁਨੇਹੇ 'ਤੇ ਜਾਓ"
 
-#: configuredialog.cpp:4501
+#: configuredialog.cpp:4609
+#, fuzzy
+msgid ""
+"_: continuation of \"When entering a folder:\"\n"
+"Jump to Newest Message"
+msgstr "ਪਹਿਲੇ ਨਵੇਂ ਸੁਨੇਹੇ ਤੇ ਜਾਓ"
+
+#: configuredialog.cpp:4611
+#, fuzzy
+msgid ""
+"_: continuation of \"When entering a folder:\"\n"
+"Jump to Oldest Message"
+msgstr "ਪਹਿਲੇ ਨਵੇਂ ਸੁਨੇਹੇ ਤੇ ਜਾਓ"
+
+#: configuredialog.cpp:4618
 msgid "Mar&k selected message as read after"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਨੂੰ ਮਗਰੋਂ ਪੜਿਆ ਲਿਖੋ(&k)"
 
-#: configuredialog.cpp:4505
+#: configuredialog.cpp:4622
 msgid " sec"
 msgstr " ਸਕਿੰਟ"
 
-#: configuredialog.cpp:4518
+#: configuredialog.cpp:4635
 msgid "Ask for action after &dragging messages to another folder"
 msgstr "ਸੁਨੇਹਿਆਂ ਨੂੰ ਹੋਰ ਫੋਲਡਰ ਵਿੱਚ ਸੁੱਟਣ ਸਮੇਂ ਕਾਰਵਾਈ ਲਈ ਪੁੱਛੋ(&d)"
 
-#: configuredialog.cpp:4529
+#: configuredialog.cpp:4646
 msgid ""
 "_: to be continued with \"flat files\" and \"directories\", resp.\n"
 "By default, &message folders on disk are:"
 msgstr "ਮੂਲ ਰੂਪ ਵਿੱਚ ਸੁਨੇਹੇ ਡਿਸਕ ਕੇ ਇਸ ਫੋਲਡਰ ਵਿੱਚ ਹੋਣਗੇ(&m):"
 
-#: configuredialog.cpp:4532
+#: configuredialog.cpp:4649
 msgid ""
 "_: continuation of \"By default, &message folders on disk are\"\n"
 "Flat Files (\"mbox\" format)"
 msgstr "ਸਮਤਲ ਫਾਇਲਾਂ (\"mbox\" ਫਾਰਮੈਟ)"
 
-#: configuredialog.cpp:4534
+#: configuredialog.cpp:4651
 msgid ""
 "_: continuation of \"By default, &message folders on disk are\"\n"
 "Directories (\"maildir\" format)"
 msgstr "ਡਾਇਰੈਕਟਰੀਆਂ (\"maildir\" ਫਾਰਮੈਟ)"
 
-#: configuredialog.cpp:4537
+#: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
 "<qt>"
@@ -2245,35 +2504,35 @@ msgid ""
 "</qt>"
 msgstr ""
 
-#: configuredialog.cpp:4562
+#: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
 msgstr "ਸ਼ੁਰੂ ਵੇਲੇ ਫੋਲਡਰ ਖੋਲ੍ਹੋ:"
 
-#: configuredialog.cpp:4570
+#: configuredialog.cpp:4687
 msgid "Empty local &trash folder on program exit"
 msgstr "ਪਰੋਗਰਾਮ ਬੰਦ ਕਰਨ ਵੇਲੇ ਲੋਕਲ ਰੱਦ ਨੂੰ ਖਾਲੀ ਕਰੋ(&t)"
 
-#: configuredialog.cpp:4578
+#: configuredialog.cpp:4695
 msgid "Enable full text &indexing"
 msgstr ""
 
-#: configuredialog.cpp:4588
+#: configuredialog.cpp:4705
 msgid "Quota units: "
 msgstr ""
 
-#: configuredialog.cpp:4590 quotajobs.h:86
+#: configuredialog.cpp:4707 quotajobs.h:86
 msgid "KB"
 msgstr ""
 
-#: configuredialog.cpp:4591 quotajobs.h:91
+#: configuredialog.cpp:4708 quotajobs.h:91
 msgid "MB"
 msgstr "MB"
 
-#: configuredialog.cpp:4592 quotajobs.h:96
+#: configuredialog.cpp:4709 quotajobs.h:96
 msgid "GB"
 msgstr ""
 
-#: configuredialog.cpp:4601
+#: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
 "<qt>"
@@ -2291,7 +2550,7 @@ msgid ""
 "depending on which option is selected.</p></qt>"
 msgstr ""
 
-#: configuredialog.cpp:4618
+#: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
 "<qt>"
@@ -2304,149 +2563,159 @@ msgid ""
 "KMail while this operation is running.</p></qt>"
 msgstr ""
 
-#: configuredialog.cpp:4694
+#: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
 msgstr "&IMAP ਸਰੋਤ ਫੋਲਡਰ ਚੋਣ"
 
-#: configuredialog.cpp:4698
+#: configuredialog.cpp:4815
 msgid "&Enable IMAP resource functionality"
 msgstr "IMAP ਸਰੋਤ ਸਹੂਲਤ ਯੋਗ(&E)"
 
-#: configuredialog.cpp:4699
+#: configuredialog.cpp:4816
 msgid "This enables the IMAP storage for the Kontact applications"
 msgstr "ਕੇ-ਸੰਪਰਕ ਕਾਰਜ ਲਈ IMAP ਸਟੋਰੇਜ਼ ਯੋਗ ਕਰਦਾ ਹੈ"
 
-#: configuredialog.cpp:4712
+#: configuredialog.cpp:4829
 msgid "&Format used for the groupware folders:"
 msgstr "ਗਰੁੱਪਵੇਅਰ ਫੋਲਡਰ ਲਈ ਵਰਤਣ ਲਈ ਫਾਰਮੈਟ(&F):"
 
-#: configuredialog.cpp:4714
+#: configuredialog.cpp:4831
 msgid ""
 "Choose the format to use to store the contents of the groupware folders."
 msgstr "ਗਰੁੱਪਵੇਅਰ ਫੋਲਡਰਾਂ ਦੇ ਪਰਸੰਗਾਂ ਨੂੰ ਸੰਭਾਲਣ ਲਈ ਵਰਤਣ ਲਈ ਫਾਰਮੈਟ ਚੁਣੋ।"
 
-#: configuredialog.cpp:4723
-msgid "Standard (Ical / Vcard)"
-msgstr "ਮਿਆਰੀ (Ical / Vcard)"
+#: configuredialog.cpp:4840
+msgid "Deprecated Kolab1 (iCal/vCard)"
+msgstr ""
 
-#: configuredialog.cpp:4723
-msgid "Kolab (XML)"
+#: configuredialog.cpp:4840
+#, fuzzy
+msgid "Kolab2 (XML)"
 msgstr "ਕੋਲਬ (XML)"
 
-#: configuredialog.cpp:4731
+#: configuredialog.cpp:4848
 msgid "&Language of the groupware folders:"
 msgstr "ਗਰੁੱਪਵੇਅਰ ਫੋਲਡਰ ਦੀ ਭਾਸ਼ਾ ਚੁਣੋ(&L):"
 
-#: configuredialog.cpp:4734
+#: configuredialog.cpp:4851
 msgid "Set the language of the folder names"
 msgstr "ਫੋਲਡਰ ਨਾਂ ਲਈ ਭਾਸ਼ਾ ਦਿਓ"
 
-#: configuredialog.cpp:4743
+#: configuredialog.cpp:4860
 msgid "English"
 msgstr "ਅੰਗਰੇਜ਼ੀ"
 
-#: configuredialog.cpp:4743
+#: configuredialog.cpp:4860
 msgid "German"
 msgstr "ਜਰਮਨ"
 
-#: configuredialog.cpp:4743
+#: configuredialog.cpp:4860
 msgid "French"
 msgstr "ਫਰੈਂਚ"
 
-#: configuredialog.cpp:4743
+#: configuredialog.cpp:4860
 msgid "Dutch"
 msgstr "ਡੱਚ"
 
-#: configuredialog.cpp:4752
+#: configuredialog.cpp:4869
 msgid "Set the parent of the resource folders"
 msgstr "ਸਰੋਤ ਫੋਲਡਰਾਂ ਦਾ ਮੁੱਢਲਾ ਦਿਓ"
 
-#: configuredialog.cpp:4781
+#: configuredialog.cpp:4898
 msgid "&Hide groupware folders"
 msgstr "ਗਰੁੱਪਵੇਅਰ ਫੋਲਡਰ ਓਹਲੇ(&H)"
 
-#: configuredialog.cpp:4785
+#: configuredialog.cpp:4902
 msgid ""
 "When this is checked, you will not see the IMAP resource folders in the folder "
 "tree."
 msgstr ""
 "ਜਦੋਂ ਚੋਣ ਕੀਤੀ ਗਈ ਤਾਂ ਤੁਸੀਂ ਸਰੋਤ ਲੜੀ ਵਿੱਚ IMAP ਸਰੋਤ ਫੋਲਡਰ ਨਹੀਂ ਵੇਖ ਸਕੋਗੇ।"
 
-#: configuredialog.cpp:4792
+#: configuredialog.cpp:4909
 msgid "&Only show groupware folders for this account"
 msgstr "ਕੇਵਲ ਇਹ ਖਾਤੇ ਲਈ ਹੀ ਗਰੁੱਪਵੇਅਰ ਫੋਲਡਰ ਹਨ(&O)"
 
-#: configuredialog.cpp:4796
+#: configuredialog.cpp:4913
 msgid ""
 "When this is checked, you will not see normal  mail folders in the folder tree "
 "for the account configured for groupware."
 msgstr ""
 
-#: configuredialog.cpp:4804
+#: configuredialog.cpp:4921
 msgid "Synchronize groupware changes immediately"
 msgstr ""
 
-#: configuredialog.cpp:4806
+#: configuredialog.cpp:4923
 msgid ""
 "Synchronize groupware changes in disconnected IMAP folders immediately when "
 "being online."
 msgstr ""
 
-#: configuredialog.cpp:4818
+#: configuredialog.cpp:4935
 msgid "Groupware Compatibility && Legacy Options"
 msgstr "ਗਰੁੱਪਵੇਅਰ ਅਨੁਕੂਲਤਾ && ਪੁਰਤਾਨ ਚੋਣ"
 
-#: configuredialog.cpp:4823
+#: configuredialog.cpp:4940
 msgid "&Enable groupware functionality"
 msgstr "ਗਰੁੱਪਵੇਅਰ ਸਹੂਲਤ ਯੋਗ(&E)"
 
-#: configuredialog.cpp:4831
+#: configuredialog.cpp:4948
 msgid "Mangle From:/To: headers in replies to invitations"
 msgstr "ਸੱਦੇ ਨੂੰ ਜਵਾਬ ਲਈ ਸਿਰਲੇਖ ਦੇ ਵਲੋਂ:/ਵੱਲ ਨੂੰ ਵੱਖ ਕਰੋ"
 
-#: configuredialog.cpp:4832
+#: configuredialog.cpp:4949
 msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitation replies"
 msgstr ""
 
-#: configuredialog.cpp:4837
+#: configuredialog.cpp:4954
 msgid "Send invitations in the mail body"
 msgstr "ਪੱਤਰ ਮੁੱਖ ਭਾਗ ਵਿੱਚ ਸੱਦਾ ਭੇਜੋ"
 
-#: configuredialog.cpp:4838
+#: configuredialog.cpp:4955
 msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitations"
 msgstr ""
 
-#: configuredialog.cpp:4846
+#: configuredialog.cpp:4963
 msgid "Exchange compatible invitation naming"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 183
-#: configuredialog.cpp:4847 rc.cpp:685
+#: configuredialog.cpp:4964
+msgid ""
+"Outlook(tm), when used in combination with a Microsoft Exchange server,\n"
+"has a problem understanding standards-compliant groupware e-mail.\n"
+"Turn this option on to send groupware invitations and replies in an Exchange "
+"compatible way."
+msgstr ""
+
+#. i18n: file kmail.kcfg line 190
+#: configuredialog.cpp:4970 rc.cpp:694
 #, no-c-format
+msgid "Outlook compatible invitation reply comments"
+msgstr ""
+
+#: configuredialog.cpp:4971
 msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 188
-#: configuredialog.cpp:4853 rc.cpp:688
+#. i18n: file kmail.kcfg line 196
+#: configuredialog.cpp:4977 rc.cpp:700
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "ਆਟੋਮੈਟਿਕ ਹੀ ਸੱਦਾ ਭੇਜਣਾ"
 
-#: configuredialog.cpp:4854
+#: configuredialog.cpp:4978
 msgid ""
 "When this is on, the user will not see the mail composer window. Invitation "
 "mails are sent automatically"
 msgstr ""
 
-#: configuredialog.cpp:4867
+#: configuredialog.cpp:4991
 msgid ""
 "<qt>Invitations are normally sent as attachments to a mail. This switch changes "
 "the invitation mails to be sent in the text of the mail instead; this is "
@@ -2458,15 +2727,15 @@ msgid ""
 "be able to work with this.</qt>"
 msgstr ""
 
-#: configuredialog.cpp:4922
+#: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
 msgstr "<ਇੱਕ ਫੋਲਡਰ ਚੁਣੋ>"
 
-#: configuredialog.cpp:5026
+#: configuredialog.cpp:5154
 msgid "&Resource folders are subfolders of:"
 msgstr "ਅਧੀਨ ਫੋਲਡਰਾਂ ਲਈ ਸਰੋਤ ਫੋਲਡਰ(&R):"
 
-#: configuredialog.cpp:5029
+#: configuredialog.cpp:5157
 msgid "&Resource folders are in account:"
 msgstr "ਖਾਤੇ ਵਿੱਚ ਸਰੋਤ ਫੋਲਡਰ ਹਨ(&R):"
 
@@ -2534,31 +2803,31 @@ msgid ""
 "Not available"
 msgstr "ਕੋਈ ਉਪਲੱਬਧ ਨਹੀਂ"
 
-#: customtemplates.cpp:87
+#: customtemplates.cpp:100
 msgid ""
 "_: Message->\n"
 "Universal"
 msgstr "ਯੂਨੀਵਰਸਲ"
 
-#: customtemplates.cpp:88 customtemplates.cpp:131
+#: customtemplates.cpp:101 customtemplates.cpp:180
 msgid ""
 "_: Message->\n"
 "Reply"
 msgstr "ਜਵਾਬ"
 
-#: customtemplates.cpp:89 customtemplates.cpp:133
+#: customtemplates.cpp:102 customtemplates.cpp:182
 msgid ""
 "_: Message->\n"
 "Reply to All"
 msgstr "ਸਭ ਨੂੰ ਜਵਾਬ"
 
-#: customtemplates.cpp:90 customtemplates.cpp:135
+#: customtemplates.cpp:103 customtemplates.cpp:184
 msgid ""
 "_: Message->\n"
 "Forward"
 msgstr "ਅੱਗੇ ਭੇਜੋ"
 
-#: customtemplates.cpp:93
+#: customtemplates.cpp:106
 msgid ""
 "<qt>"
 "<p>Here you can add, edit, and delete custom message templates to use when you "
@@ -2573,49 +2842,70 @@ msgid ""
 "to <i>Universal</i> templates.</p></qt>"
 msgstr ""
 
-#: customtemplates.cpp:107 templatesconfiguration.cpp:105
+#: customtemplates.cpp:120 templatesconfiguration.cpp:105
 msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
 msgstr "<a href=\"whatsthis:%1\">ਇਹ ਕਿਵੇਂ ਕੰਮ ਕਰਦਾ ਹੈ?</a>"
 
-#: customtemplates.cpp:137
+#: customtemplates.cpp:122
+msgid "Additional recipients of the message when forwarding"
+msgstr ""
+
+#: customtemplates.cpp:123
+msgid "Additional recipients who get a copy of the message when forwarding"
+msgstr ""
+
+#: customtemplates.cpp:124
+msgid ""
+"When using this template for forwarding, the default recipients are those you "
+"enter here. This is a comma-separated list of mail addresses."
+msgstr ""
+
+#: customtemplates.cpp:125
+msgid ""
+"When using this template for forwarding, the recipients you enter here will by "
+"default get a copy of this message. This is a comma-separated list of mail "
+"addresses."
+msgstr ""
+
+#: customtemplates.cpp:186
 msgid ""
 "_: Message->\n"
 "Unknown"
 msgstr "ਅਣਜਾਣ"
 
-#: customtemplates.cpp:347 customtemplates.cpp:364
+#: customtemplates.cpp:420 customtemplates.cpp:437
 msgid "Key Conflict"
 msgstr "ਸਵਿੱਚ ਟਕਰਾਅ"
 
-#: customtemplates.cpp:348
+#: customtemplates.cpp:421
 msgid ""
 "The selected shortcut is already used for another custom template, would you "
 "still like to continue with the assignment?"
 msgstr ""
 
-#: customtemplates.cpp:365
+#: customtemplates.cpp:438
 msgid ""
 "The selected shortcut is already used, would you still like to continue with "
 "the assignment?"
 msgstr ""
 
-#: distributionlistdialog.cpp:96
+#: distributionlistdialog.cpp:97
 msgid "Save Distribution List"
 msgstr "ਵੰਡ ਸੂਚੀ ਸੰਭਾਲੋ"
 
-#: distributionlistdialog.cpp:97
+#: distributionlistdialog.cpp:98
 msgid "Save List"
 msgstr "ਸੂਚੀ ਸੰਭਾਲੋ"
 
-#: distributionlistdialog.cpp:106
+#: distributionlistdialog.cpp:107
 msgid "Name:"
 msgstr "ਨਾਂ:"
 
-#: distributionlistdialog.cpp:116 recipientspicker.cpp:390
+#: distributionlistdialog.cpp:117 recipientspicker.cpp:390
 msgid "Email"
 msgstr "ਈ-ਮੇਲ"
 
-#: distributionlistdialog.cpp:170
+#: distributionlistdialog.cpp:169
 msgid ""
 "There are no recipients in your list. First select some recipients, then try "
 "again."
@@ -2623,121 +2913,121 @@ msgstr ""
 "ਤੁਹਾਡੀ ਸੂਚੀ ਵਿੱਚ ਕੋਈ ਸੁਨੇਹੀ ਨਹੀਂ ਹੈ। ਪਹਿਲਾਂ ਕੁਝ ਸੁਨੇਹੇ ਸ਼ਾਮਿਲ ਕਰੋ, ਫਿਰ ਕੋਸ਼ਿਸ਼ "
 "ਕਰੋ।"
 
-#: distributionlistdialog.cpp:185
+#: distributionlistdialog.cpp:184
 msgid "New Distribution List"
 msgstr "ਨਵੀਂ ਵੰਡ ਸੂਚੀ"
 
-#: distributionlistdialog.cpp:186
+#: distributionlistdialog.cpp:185
 msgid "Please enter name:"
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਨਾਂ ਭਰੋ:"
 
-#: distributionlistdialog.cpp:197
+#: distributionlistdialog.cpp:198
 msgid ""
 "<qt>Distribution list with the given name <b>%1</b> already exists. Please "
 "select a different name.</qt>"
 msgstr ""
 
-#: editorwatcher.cpp:86
+#: editorwatcher.cpp:76
 #, fuzzy
 msgid "Edit with:"
 msgstr "ਪਛਾਣ ਸੋਧ"
 
-#: editorwatcher.cpp:169
+#: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the choosen editor is closed. To avoid data "
-"loss, editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
+"editing the attachment will be aborted."
 msgstr ""
 
-#: editorwatcher.cpp:170
+#: editorwatcher.cpp:163
 #, fuzzy
 msgid "Unable to edit attachment"
 msgstr "ਨੱਥੀ ਦਾ ਨਾਂ:"
 
-#: encodingdetector.cpp:1250 encodingdetector.cpp:1352
+#: encodingdetector.cpp:1170 encodingdetector.cpp:1272
 msgid ""
 "_: @item Text character set\n"
 "Unicode"
 msgstr ""
 
-#: encodingdetector.cpp:1252 encodingdetector.cpp:1322
+#: encodingdetector.cpp:1172 encodingdetector.cpp:1242
 msgid ""
 "_: @item Text character set\n"
 "Cyrillic"
 msgstr ""
 
-#: encodingdetector.cpp:1254 encodingdetector.cpp:1337
+#: encodingdetector.cpp:1174 encodingdetector.cpp:1257
 msgid ""
 "_: @item Text character set\n"
 "Western European"
 msgstr ""
 
-#: encodingdetector.cpp:1256 encodingdetector.cpp:1319
+#: encodingdetector.cpp:1176 encodingdetector.cpp:1239
 msgid ""
 "_: @item Text character set\n"
 "Central European"
 msgstr ""
 
-#: encodingdetector.cpp:1258 encodingdetector.cpp:1325
+#: encodingdetector.cpp:1178 encodingdetector.cpp:1245
 msgid ""
 "_: @item Text character set\n"
 "Greek"
 msgstr ""
 
-#: encodingdetector.cpp:1260 encodingdetector.cpp:1328
+#: encodingdetector.cpp:1180 encodingdetector.cpp:1248
 msgid ""
 "_: @item Text character set\n"
 "Hebrew"
 msgstr ""
 
-#: encodingdetector.cpp:1262 encodingdetector.cpp:1334
+#: encodingdetector.cpp:1182 encodingdetector.cpp:1254
 msgid ""
 "_: @item Text character set\n"
 "Turkish"
 msgstr ""
 
-#: encodingdetector.cpp:1264 encodingdetector.cpp:1331
+#: encodingdetector.cpp:1184 encodingdetector.cpp:1251
 msgid ""
 "_: @item Text character set\n"
 "Japanese"
 msgstr ""
 
-#: encodingdetector.cpp:1266 encodingdetector.cpp:1316
+#: encodingdetector.cpp:1186 encodingdetector.cpp:1236
 msgid ""
 "_: @item Text character set\n"
 "Baltic"
 msgstr ""
 
-#: encodingdetector.cpp:1268 encodingdetector.cpp:1313
+#: encodingdetector.cpp:1188 encodingdetector.cpp:1233
 msgid ""
 "_: @item Text character set\n"
 "Arabic"
 msgstr ""
 
-#: encodingdetector.cpp:1340
+#: encodingdetector.cpp:1260
 msgid ""
 "_: @item Text character set\n"
 "Chinese Traditional"
 msgstr ""
 
-#: encodingdetector.cpp:1343
+#: encodingdetector.cpp:1263
 msgid ""
 "_: @item Text character set\n"
 "Chinese Simplified"
 msgstr ""
 
-#: encodingdetector.cpp:1346
+#: encodingdetector.cpp:1266
 msgid ""
 "_: @item Text character set\n"
 "Korean"
 msgstr ""
 
-#: encodingdetector.cpp:1349
+#: encodingdetector.cpp:1269
 msgid ""
 "_: @item Text character set\n"
 "Thai"
 msgstr ""
 
-#: expirejob.cpp:164
+#: expirejob.cpp:177
 msgid ""
 "_n: Removing 1 old message from folder %1...\n"
 "Removing %n old messages from folder %1..."
@@ -2745,12 +3035,12 @@ msgstr ""
 "%1 ਫੋਲਡਰ ਵਿੱਚੋਂ 1 ਪੁਰਾਣੇ ਸੁਨੇਹੇ ਨੂੰ ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ...\n"
 "%1 ਫੋਲਡਰ ਵਿੱਚੋ %n ਪੁਰਾਣੇ ਸੁਨੇਹਿਆਂ ਨੂੰ ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: expirejob.cpp:171
+#: expirejob.cpp:184
 msgid "Cannot expire messages from folder %1: destination folder %2 not found"
 msgstr ""
 "ਫੋਲਡਰ %1 ਵਿੱਚ ਸੁਨੇਹਿਆਂ ਦੀ ਮਿਆਦ ਪੁੱਗ ਨਹੀਂ ਸਕਦੀ: ਟਿਕਾਣਾ ਫੋਲਡਰ %2 ਨਹੀਂ ਮਿਲਿਆ"
 
-#: expirejob.cpp:186
+#: expirejob.cpp:199
 msgid ""
 "_n: Moving 1 old message from folder %1 to folder %2...\n"
 "Moving %n old messages from folder %1 to folder %2..."
@@ -2758,7 +3048,7 @@ msgstr ""
 "ਫੋਲਡਰ %1 ਵਿੱਚੋਂ 1 ਪੁਰਾਣੇ ਸੁਨੇਹੇ ਨੂੰ ਫੋਲਡਰ %2 ਵਿੱਚ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ...\n"
 "ਫੋਲਡਰ %1 ਵਿੱਚੋਂ %n ਪੁਰਾਣੇ ਸੁਨੇਹਿਆਂ ਫੋਲਡਰ %2 ਵਿੱਚ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: expirejob.cpp:214
+#: expirejob.cpp:227
 msgid ""
 "_n: Removed 1 old message from folder %1.\n"
 "Removed %n old messages from folder %1."
@@ -2766,7 +3056,7 @@ msgstr ""
 "ਫੋਲਡਰ %1 ਵਿੱਚੋਂ 1 ਪੁਰਾਣੇ ਸੁਨੇਹੇ ਨੂੰ ਹਟਾਇਆ ਗਿਆ ਹੈ।\n"
 "ਫੋਲਡਰ %1 ਵਿੱਚੋਂ %n ਪੁਰਾਣੇ ਸੁਨੇਹਿਆਂ ਨੂੰ ਗਿਆ ਹੈ।"
 
-#: expirejob.cpp:220
+#: expirejob.cpp:233
 msgid ""
 "_n: Moved 1 old message from folder %1 to folder %2.\n"
 "Moved %n old messages from folder %1 to folder %2."
@@ -2774,19 +3064,19 @@ msgstr ""
 "ਫੋਲਡਰ %1 ਵਿੱਚੋਂ 1 ਪੁਰਾਣੇ ਸੁਨੇਹੇ ਨੂੰ ਫੋਲਡਰ %2 ਵਿੱਚ ਭੇਜਿਆ ਗਿਆ ਹੈ।\n"
 "ਫੋਲਡਰ %1 ਵਿੱਚੋਂ %n ਪੁਰਾਣੇ ਸੁਨੇਹਿਆਂ ਫੋਲਡਰ %2 ਵਿੱਚ ਭੇਜਿਆ ਗਿਆ ਹੈ।"
 
-#: expirejob.cpp:227
+#: expirejob.cpp:240
 msgid "Removing old messages from folder %1 failed."
 msgstr "%1 ਫੋਲਡਰ ਤੋਂ ਪੁਰਾਣੇ ਸੁਨੇਹੇ ਹਟਾਉਣ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
 
-#: expirejob.cpp:231
+#: expirejob.cpp:244
 msgid "Moving old messages from folder %1 to folder %2 failed."
 msgstr "ਫੋਲਡਰ %1 ਵਿੱਚੋਂ ਪੁਰਾਣੇ ਸੁਨੇਹਿਆਂ ਫੋਲਡਰ %2 ਵਿੱਚ ਭੇਜਣਾ ਅਸਫ਼ਲ ਰਿਹਾ ਹੈ।"
 
-#: expirejob.cpp:237
+#: expirejob.cpp:250
 msgid "Removing old messages from folder %1 was canceled."
 msgstr "ਫੋਲਡਰ %1 ਵਿੱਚੋਂ ਪੁਰਾਣੇ ਸੁਨੇਹਿਆਂ ਨੂੰ ਹਟਾਉਣ ਨੂੰ ਰੱਦ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ।"
 
-#: expirejob.cpp:241
+#: expirejob.cpp:254
 msgid "Moving old messages from folder %1 to folder %2 was canceled."
 msgstr ""
 "ਫੋਲਡਰ %1 ਵਿੱਚੋਂ ਪੁਰਾਣੇ ਸੁਨੇਹਿਆਂ ਫੋਲਡਰ %2 ਵਿੱਚ ਭੇਜਣਾ ਰੱਦ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ।"
@@ -2824,87 +3114,104 @@ msgid ""
 "Note: Expiry action will be applied immediately after confirming settings."
 msgstr "ਸੂਚਨਾ: ਮਿਆਦ ਕਾਰਵਾਈ ਸੈਟਿੰਗ ਪੁਸ਼ਟੀ ਹੋਣ ਤੋਂ ਤੁਰੰਤ ਬਾਅਦ ਲਾਗੂ ਹੋਵੇਗੀ।"
 
-#: expirypropertiesdialog.cpp:163
+#: expirypropertiesdialog.cpp:167
 msgid "Please select a folder to expire messages into."
 msgstr "ਮਿਆਦ ਪੁੱਗੀ ਵਾਲੇ ਸੁਨੇਹੇ ਭੇਜਣ ਲਈ ਇੱਕ ਫੋਲਡਰ ਚੁਣੋ ਜੀ।"
 
-#: expirypropertiesdialog.cpp:164
+#: expirypropertiesdialog.cpp:168
 msgid "No Folder Selected"
 msgstr "ਕੋਈ ਫੋਲਡਰ ਚੁਣਿਆ ਨਹੀਂ ਗਿਆ"
 
+#: expirypropertiesdialog.cpp:176
+#, fuzzy
+msgid ""
+"Please select a different folder than the current folder to expire message "
+"into."
+msgstr "ਮਿਆਦ ਪੁੱਗੀ ਵਾਲੇ ਸੁਨੇਹੇ ਭੇਜਣ ਲਈ ਇੱਕ ਫੋਲਡਰ ਚੁਣੋ ਜੀ।"
+
+#: expirypropertiesdialog.cpp:178
+#, fuzzy
+msgid "Wrong Folder Selected"
+msgstr "ਕੋਈ ਫੋਲਡਰ ਚੁਣਿਆ ਨਹੀਂ ਗਿਆ"
+
 #: favoritefolderview.cpp:90
 #, fuzzy
 msgid "Favorite Folders"
 msgstr "ਫੋਲਡਰ ਚੇਪੋ"
 
-#: favoritefolderview.cpp:326
+#: favoritefolderview.cpp:337 kmfoldertree.cpp:1190 kmmainwidget.cpp:2790
+msgid "&Assign Shortcut..."
+msgstr "ਸ਼ਾਰਟਕੱਟ ਦਿਓ(&A)..."
+
+#: favoritefolderview.cpp:338 kmfoldertree.cpp:1195
+msgid "Expire..."
+msgstr "ਮਿਆਦ..."
+
+#: favoritefolderview.cpp:342
 #, fuzzy
 msgid "Remove From Favorites"
 msgstr "ਹਵਾਲਾ ਅੱਖਰ ਹਟਾਓ(&m)"
 
-#: favoritefolderview.cpp:328 favoritefolderview.cpp:378
+#: favoritefolderview.cpp:344 favoritefolderview.cpp:389
 #, fuzzy
 msgid "Rename Favorite"
 msgstr "ਫਿਲਟਰ ਨਾਂ-ਬਦਲੋ"
 
-#: favoritefolderview.cpp:337 kmfoldertree.cpp:1153 kmmainwidget.cpp:2767
-msgid "&Assign Shortcut..."
-msgstr "ਸ਼ਾਰਟਕੱਟ ਦਿਓ(&A)..."
-
-#: favoritefolderview.cpp:338 kmfoldertree.cpp:1158
-msgid "Expire..."
-msgstr "ਮਿਆਦ..."
-
-#: favoritefolderview.cpp:341
+#: favoritefolderview.cpp:347
 #, fuzzy
 msgid "Add Favorite Folder..."
 msgstr "ਨਵਾਂ ਫੋਲਡਰ(&N)..."
 
-#: favoritefolderview.cpp:395
+#: favoritefolderview.cpp:406
 #, fuzzy
 msgid "Local Inbox"
 msgstr "ਲੋਕਲ ਪੱਤਰ-ਬਕਸਾ"
 
-#: favoritefolderview.cpp:397
+#: favoritefolderview.cpp:408
 #, c-format
 msgid "Inbox of %1"
 msgstr ""
 
-#: favoritefolderview.cpp:401
+#: favoritefolderview.cpp:412
 msgid "%1 on %2"
 msgstr ""
 
-#: favoritefolderview.cpp:403
+#: favoritefolderview.cpp:414
 msgid "%1 (local)"
 msgstr ""
 
-#: favoritefolderview.cpp:443
+#: favoritefolderview.cpp:454
 #, fuzzy
 msgid "Add Favorite Folder"
 msgstr "ਫੋਲਡਰ ਚੇਪੋ"
 
-#: filterimporterexporter.cpp:51
+#: filterimporterexporter.cpp:50
 #, fuzzy
 msgid "Select Filters"
 msgstr "ਫੋਲਡਰ ਚੁਣੋ"
 
-#: filterimporterexporter.cpp:58
+#: filterimporterexporter.cpp:61
 #, fuzzy
 msgid "Filters"
 msgstr "ਫਿਲਟਰ %1"
 
-#: filterimporterexporter.cpp:182
+#: filterimporterexporter.cpp:67
+#, fuzzy
+msgid "Unselect All"
+msgstr "ਸਭ ਪਾਠ ਚੁਣੋ"
+
+#: filterimporterexporter.cpp:213
 #, fuzzy
 msgid "Import Filters"
 msgstr "vCard ਆਯਾਤ ਅਸਫ਼ਲ ਹੋਇਆ ਹੈ"
 
-#: filterimporterexporter.cpp:189
+#: filterimporterexporter.cpp:220
 msgid ""
 "The selected file is not readable. Your file access permissions might be "
 "insufficient."
 msgstr ""
 
-#: filterimporterexporter.cpp:204
+#: filterimporterexporter.cpp:235
 #, fuzzy
 msgid "Export Filters"
 msgstr "ਕੁੰਜੀ ਨਿਰਯਾਤ ਅਸਫ਼ਲ"
@@ -2975,8 +3282,8 @@ msgstr ""
 "ਫਾਇਲ %1 ਨੂੰ ਲਿਖਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ:\n"
 "\"%2\" ਵਿੱਚ ਵੇਰਵੇ ਸਮੇਤ ਗਲਤੀ ਜਾਣਕਾਰੀ ਹੈ।"
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2706 kmcommands.cpp:2730
-#: kmmainwidget.cpp:1795 kmmainwidget.cpp:1812 urlhandlermanager.cpp:489
+#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "ਕੇ-ਮੇਲ ਗਲਤੀ"
 
@@ -3021,61 +3328,78 @@ msgid ""
 "account on the server will tell you which one it is."
 msgstr ""
 
-#: folderdiaacltab.cpp:106 folderdiaacltab.cpp:341
+#: folderdiaacltab.cpp:103 recipientseditor.cpp:776
+msgid "Se&lect..."
+msgstr "ਚੁਣੋ(&l)..."
+
+#: folderdiaacltab.cpp:106 folderdiaacltab.cpp:340
 msgid "Permissions"
 msgstr "ਅਧਿਕਾਰ"
 
-#: folderdiaacltab.cpp:247
+#: folderdiaacltab.cpp:118
+msgid "<b>Note: </b>Renaming requires write permissions on the parent folder."
+msgstr ""
+
+#: folderdiaacltab.cpp:245
 msgid "Custom Permissions"
 msgstr "ਪਸੰਦੀਦਾ ਅਧਿਕਾਰ"
 
-#: folderdiaacltab.cpp:249
+#: folderdiaacltab.cpp:247
 msgid "Custom Permissions (%1)"
 msgstr "ਅਧਿਕਾਰ (%1) ਪਸੰਦ"
 
-#: folderdiaacltab.cpp:340
+#: folderdiaacltab.cpp:339
 msgid "User Id"
 msgstr "ਉਪਭੋਗੀ Id"
 
-#: folderdiaacltab.cpp:352
+#: folderdiaacltab.cpp:351
 msgid "Add Entry..."
 msgstr "ਇੰਦਰਾਜ਼ ਜੋੜੋ..."
 
-#: folderdiaacltab.cpp:353
+#: folderdiaacltab.cpp:352
 msgid "Modify Entry..."
 msgstr "ਇੰਦਰਾਜ਼ ਸੋਧ..."
 
-#: folderdiaacltab.cpp:354
+#: folderdiaacltab.cpp:353
 msgid "Remove Entry"
 msgstr "ਇੰਦਰਾਜ਼ ਹਟਾਓ"
 
-#: folderdiaacltab.cpp:426
+#: folderdiaacltab.cpp:428
 msgid "Error retrieving user permissions."
 msgstr "ਉਪਭੋਗੀ ਅਧਿਕਾਰ ਪਰਾਪਤ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਹੈ।"
 
-#: folderdiaacltab.cpp:431
-msgid "Information not retrieved from server yet, please use \"Check Mail\"."
+#: folderdiaacltab.cpp:430
+#, fuzzy
+msgid ""
+"You might not have enough permissions to see the permissions of this folder."
+msgstr "ਤੁਹਾਨੂੰ ਆਪਣੇ ਰੱਦੀ ਫੋਲਡਰ ਵਿੱਚ ਪੜ੍ਹਨ/ਲਿਖਣ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ।"
+
+#: folderdiaacltab.cpp:435
+#, fuzzy
+msgid ""
+"Information not retrieved from server, you need to use \"Check Mail\" and have "
+"administrative privileges on the folder."
 msgstr "ਸਰਵਰ ਤੋਂ ਜਾਣਕਾਰੀ ਹਾਲੇ ਪਰਾਪਤ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ, \"ਪੱਤਰ ਜਾਂਚ\" ਵਰਤੋਂ ਜੀ।"
 
-#: folderdiaacltab.cpp:446 folderdiaquotatab.cpp:114
+#: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
 msgid "Error: no IMAP account defined for this folder"
 msgstr "ਗਲਤੀ: ਇਸ ਖਾਤੇ ਲਈ ਕੋਈ IMAP ਖਾਤਾ ਪਰਿਭਾਸ਼ਤ ਨਹੀਂ"
 
-#: folderdiaacltab.cpp:452 folderdiaquotatab.cpp:120
+#: folderdiaacltab.cpp:456 folderdiaquotatab.cpp:120
 msgid "Connecting to server %1, please wait..."
 msgstr "ਸਰਵਰ %1 ਨਾਲ ਜੁੜਿਆ ਜਾ ਰਿਹਾ ਹੈ, ਉਡੀਕੋ ਜੀ..."
 
-#: folderdiaacltab.cpp:470 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:843
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
+#: kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "ਸਰਵਰ %1 ਨਾਲ ਜੁੜ ਸਮੇਂ ਗਲਤੀ"
 
-#: folderdiaacltab.cpp:490 folderdiaacltab.cpp:517
+#: folderdiaacltab.cpp:494 folderdiaacltab.cpp:522
 msgid "This IMAP server does not have support for access control lists (ACL)"
 msgstr "ਇਹ IMAP ਸਰਵਰ ਪਹੁੰਚ ਕੰਟਰੋਲ ਸੂਚੀ ACL ਲਈ ਸਹਿਯੋਗੀ ਨਹੀਂ ਹੈ"
 
-#: folderdiaacltab.cpp:519
+#: folderdiaacltab.cpp:524
 #, c-format
 msgid ""
 "Error retrieving access control list (ACL) from server\n"
@@ -3084,15 +3408,15 @@ msgstr ""
 "ਸਰਵਰ ਤੋਂ ਪਹੁੰਚ ਕੰਟਰੋਲ ਸੂਚੀ (ACL) ਪਰਾਪਤ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ\n"
 "%1"
 
-#: folderdiaacltab.cpp:564
+#: folderdiaacltab.cpp:569
 msgid "Modify Permissions"
 msgstr "ਸੋਧੇ ਅਧਿਕਾਰ"
 
-#: folderdiaacltab.cpp:598
+#: folderdiaacltab.cpp:603
 msgid "Add Permissions"
 msgstr "ਅਧਿਕਾਰ ਸ਼ਾਮਲ"
 
-#: folderdiaacltab.cpp:631
+#: folderdiaacltab.cpp:636
 msgid ""
 "Do you really want to remove your own permissions for this folder? You will not "
 "be able to access it afterwards."
@@ -3129,8 +3453,8 @@ msgstr "ਵਰਤੋਂ:"
 msgid "Select Folder"
 msgstr "ਫੋਲਡਰ ਚੁਣੋ"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1831 kmfoldermgr.cpp:45
-#: kmfoldertree.cpp:552
+#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "ਲੋਕਲ ਫੋਲਡਰ"
 
@@ -3158,7 +3482,7 @@ msgid ""
 "this folder.</qt>"
 msgstr ""
 
-#: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:526 snippetdlg.cpp:93
+#: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
 msgid "The selected shortcut is already used, please select a different one."
 msgstr ""
 
@@ -3174,13 +3498,20 @@ msgstr "ਇੱਥੇ ਨਕਲ ਕਰੋ(&C)"
 msgid "C&ancel"
 msgstr "ਰੱਦ ਕਰੋ(&a)"
 
-#: headeritem.cpp:157 headeritem.cpp:164
+#: folderutil.cpp:93
+msgid ""
+"<qt>The folder you deleted was associated with the account <b>%1</b> "
+"which delivered mail into it. The folder the account delivers new mail into was "
+"reset to the main Inbox folder.</qt>"
+msgstr ""
+
+#: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "ਅਣਜਾਣ"
 
-#: headeritem.cpp:171 headerstyle.cpp:140 headerstyle.cpp:238
-#: headerstyle.cpp:442 headerstyle.cpp:625 headerstyle.cpp:778
-#: kmmainwidget.cpp:1057
+#: headeritem.cpp:193 headerstyle.cpp:141 headerstyle.cpp:240
+#: headerstyle.cpp:445 headerstyle.cpp:743 headerstyle.cpp:898
+#: kmmainwidget.cpp:1029
 msgid "No Subject"
 msgstr "ਕੋਈ ਵਿਸ਼ਾ ਨਹੀਂ"
 
@@ -3198,47 +3529,47 @@ msgstr ""
 msgid "Stat&us:"
 msgstr "ਸਥਿਤੀ:"
 
-#: headerlistquicksearch.cpp:72
+#: headerlistquicksearch.cpp:73
 msgid "Any Status"
 msgstr "ਕੋਈ ਵੀ ਹਾਲਤ"
 
-#: headerlistquicksearch.cpp:91
+#: headerlistquicksearch.cpp:93
 #, fuzzy
 msgid "Open Full Search"
 msgstr "ਖੋਜ ਹਟਾਓ"
 
-#: headerstyle.cpp:169 headerstyle.cpp:296 headerstyle.cpp:647
-#: headerstyle.cpp:860
+#: headerstyle.cpp:170 headerstyle.cpp:298 headerstyle.cpp:765
+#: headerstyle.cpp:974
 msgid "[vCard]"
 msgstr "[vCard]"
 
-#: headerstyle.cpp:174 headerstyle.cpp:314 headerstyle.cpp:672
-#: headerstyle.cpp:797
+#: headerstyle.cpp:175 headerstyle.cpp:316 headerstyle.cpp:790
+#: headerstyle.cpp:998
 msgid "CC: "
 msgstr "CC: "
 
-#: headerstyle.cpp:177 headerstyle.cpp:318 headerstyle.cpp:679
-#: headerstyle.cpp:800
+#: headerstyle.cpp:178 headerstyle.cpp:320 headerstyle.cpp:797
+#: headerstyle.cpp:1008
 msgid "BCC: "
 msgstr "BCC: "
 
-#: headerstyle.cpp:272 headerstyle.cpp:685
+#: headerstyle.cpp:274 headerstyle.cpp:803
 msgid "Date: "
 msgstr "ਮਿਤੀ:"
 
-#: headerstyle.cpp:292 headerstyle.cpp:639 headerstyle.cpp:865
+#: headerstyle.cpp:294 headerstyle.cpp:757 headerstyle.cpp:979
 msgid "From: "
 msgstr "ਵਲੋਂ: "
 
-#: headerstyle.cpp:310 headerstyle.cpp:665 headerstyle.cpp:873
+#: headerstyle.cpp:312 headerstyle.cpp:783 headerstyle.cpp:988
 msgid "To: "
 msgstr "ਵੱਲ: "
 
-#: headerstyle.cpp:322
+#: headerstyle.cpp:324
 msgid "Reply to: "
 msgstr "ਜਵਾਬ: "
 
-#: headerstyle.cpp:408
+#: headerstyle.cpp:410
 msgid ""
 "%1% probability of being spam.\n"
 "\n"
@@ -3250,23 +3581,46 @@ msgstr ""
 "ਪੂਰੀ ਰਿਪੋਰਟ:\n"
 "%2"
 
-#: headerstyle.cpp:609
+#: headerstyle.cpp:612
 msgid "Launch IM"
 msgstr "IM ਚਲਾਓ"
 
-#: headerstyle.cpp:642
+#: headerstyle.cpp:660
+msgid "Night"
+msgstr ""
+
+#: headerstyle.cpp:669
+#, fuzzy
+msgid "Morning"
+msgstr "ਚੇਤਾਵਨੀਆਂ"
+
+#: headerstyle.cpp:678
+#, fuzzy
+msgid "Afternoon"
+msgstr "ਬਾਅਦ"
+
+#: headerstyle.cpp:687
+msgid "Evening"
+msgstr ""
+
+#: headerstyle.cpp:724
+#, fuzzy
+msgid "Sender's Current Time:"
+msgstr "ਭੇਜਣ ਵਾਲੇ ਦੀ ਪਛਾਣ(&S):"
+
+#: headerstyle.cpp:760
 msgid "(resent from %1)"
 msgstr "(%1 ਵਲੋਂ ਮੁੜ-ਭੇਜਿਆ)"
 
-#: headerstyle.cpp:694
+#: headerstyle.cpp:812
 msgid "User-Agent: "
 msgstr "ਉਪਭੋਗੀ-ਏਜੰਟ:"
 
-#: headerstyle.cpp:703
+#: headerstyle.cpp:821
 msgid "X-Mailer: "
 msgstr "X-Mailer: "
 
-#: headerstyle.cpp:723
+#: headerstyle.cpp:843
 msgid "Spam Status:"
 msgstr "ਕੂੜਾ ਹਾਲਤ:"
 
@@ -3336,15 +3690,15 @@ msgstr ""
 "<br>ਨ"
 "<br>ਹੀਂ</qt>"
 
-#: identitydialog.cpp:90
+#: identitydialog.cpp:93
 msgid "Edit Identity"
 msgstr "ਪਛਾਣ ਸੋਧ"
 
-#: identitydialog.cpp:118
+#: identitydialog.cpp:121
 msgid "&Your name:"
 msgstr "ਤੁਹਾਡਾ ਨਾਂ(&Y):"
 
-#: identitydialog.cpp:120
+#: identitydialog.cpp:123
 msgid ""
 "<qt>"
 "<h3>Your name</h3>"
@@ -3360,11 +3714,11 @@ msgstr ""
 "<p>ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਖੇਤਰ ਨੂੰ ਖਾਲੀ ਛੱਡ ਦਿੱਤਾ ਤਾਂ, ਤੁਹਾਡਾ ਅਸਲੀ ਨਾਂ ਵਿਖਾਇਆ ਨਹੀਂ "
 "ਜਾਵੇਗਾ, ਸਿਰਫ਼ ਈ-ਮੇਲ ਸਿਰਨਾਵਾਂ ਵਿਖਾਈ ਦੇਵੇਗਾ।</p></qt>"
 
-#: identitydialog.cpp:132
+#: identitydialog.cpp:135
 msgid "Organi&zation:"
 msgstr "ਸੰਗਠਨ(&z):"
 
-#: identitydialog.cpp:134
+#: identitydialog.cpp:137
 msgid ""
 "<qt>"
 "<h3>Organization</h3>"
@@ -3373,38 +3727,65 @@ msgid ""
 "<p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
 
-#: identitydialog.cpp:147
+#: identitydialog.cpp:149
 msgid "&Email address:"
 msgstr "ਈ-ਮੇਲ ਸਿਰਨਾਵਾਂ(&E):"
 
-#: identitydialog.cpp:149
+#: identitydialog.cpp:151
 msgid ""
 "<qt>"
 "<h3>Email address</h3>"
-"<p>This field should have your full email address.</p>"
+"<p>This field should have your full email address</p>"
+"<p>This address is the primary one, used for all outgoing mail. If you have "
+"more than one address, either create a new identity, or add additional alias "
+"addresses in the field below.</p>"
 "<p>If you leave this blank, or get it wrong, people will have trouble replying "
 "to you.</p></qt>"
 msgstr ""
 
-#: identitydialog.cpp:161
+#: identitydialog.cpp:165
+#, fuzzy
+msgid "Email a&liases:"
+msgstr "ਈ-ਮੇਲ ਸਿਰਨਾਵਾਂ(&E):"
+
+#: identitydialog.cpp:167
+msgid ""
+"<qt>"
+"<h3>Email aliases</h3>"
+"<p>This field contains alias addresses that should also be considered as "
+"belonging to this identity (as opposed to representing a different "
+"identity).</p>"
+"<p>Example:</p>"
+"<table>"
+"<tr>"
+"<th>Primary address:</th>"
+"<td>first.last@example.org</td></tr>"
+"<tr>"
+"<th>Aliases:</th>"
+"<td>first@example.org"
+"<br>last@example.org</td></tr></table>"
+"<p>Type one alias address per line.</p></qt>"
+msgstr ""
+
+#: identitydialog.cpp:185
 msgid "Cryptograph&y"
 msgstr ""
 
-#: identitydialog.cpp:168 identitydialog.cpp:192 identitydialog.cpp:217
-#: identitydialog.cpp:243
+#: identitydialog.cpp:192 identitydialog.cpp:216 identitydialog.cpp:241
+#: identitydialog.cpp:267
 msgid "Chang&e..."
 msgstr "ਤਬਦੀਲ(&e)..."
 
-#: identitydialog.cpp:169
+#: identitydialog.cpp:193
 msgid "Your OpenPGP Signature Key"
 msgstr "ਤੁਹਾਡੀ OpenPGP ਦਸਤਖਤ ਕੁੰਜੀ"
 
-#: identitydialog.cpp:170
+#: identitydialog.cpp:194
 msgid ""
 "Select the OpenPGP key which should be used to digitally sign your messages."
 msgstr ""
 
-#: identitydialog.cpp:174
+#: identitydialog.cpp:198
 msgid ""
 "<qt>"
 "<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
@@ -3414,21 +3795,21 @@ msgid ""
 "<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
 
-#: identitydialog.cpp:181
+#: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
 msgstr "OpenPGP ਦਸਤਖਤੀ ਕੁੰਜੀ:"
 
-#: identitydialog.cpp:193
+#: identitydialog.cpp:217
 msgid "Your OpenPGP Encryption Key"
 msgstr ""
 
-#: identitydialog.cpp:194
+#: identitydialog.cpp:218
 msgid ""
 "Select the OpenPGP key which should be used when encrypting to yourself and for "
 "the \"Attach My Public Key\" feature in the composer."
 msgstr ""
 
-#: identitydialog.cpp:199
+#: identitydialog.cpp:223
 msgid ""
 "<qt>"
 "<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
@@ -3440,21 +3821,21 @@ msgid ""
 "<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
 msgstr ""
 
-#: identitydialog.cpp:206
+#: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
 msgstr "OpenPGP ਇੰਕਰਿਪਸ਼ਨ ਕੁੰਜੀ:"
 
-#: identitydialog.cpp:218
+#: identitydialog.cpp:242
 msgid "Your S/MIME Signature Certificate"
 msgstr "ਤੁਹਾਡਾ S/MIME ਦਸਤਖਤ ਸਰਟੀਫਿਕੇਟ"
 
-#: identitydialog.cpp:219
+#: identitydialog.cpp:243
 msgid ""
 "Select the S/MIME certificate which should be used to digitally sign your "
 "messages."
 msgstr ""
 
-#: identitydialog.cpp:223
+#: identitydialog.cpp:247
 msgid ""
 "<qt>"
 "<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
@@ -3463,21 +3844,21 @@ msgid ""
 "emails using S/MIME; normal mail functions will not be affected.</p></qt>"
 msgstr ""
 
-#: identitydialog.cpp:228
+#: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
 msgstr "S/MIME ਦਸਤਖਤੀ ਸਰਟੀਫਿਕੇਟ:"
 
-#: identitydialog.cpp:244
+#: identitydialog.cpp:268
 msgid "Your S/MIME Encryption Certificate"
 msgstr "ਤੁਹਾਡਾ S/MIME ਇਕਰਿਪਸ਼ਨ ਸਰਟੀਫਿਕੇਟ"
 
-#: identitydialog.cpp:245
+#: identitydialog.cpp:269
 msgid ""
 "Select the S/MIME certificate which should be used when encrypting to yourself "
 "and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 
-#: identitydialog.cpp:250
+#: identitydialog.cpp:274
 msgid ""
 "<qt>"
 "<p>The S/MIME certificate you choose here will be used to encrypt messages to "
@@ -3487,23 +3868,23 @@ msgid ""
 "affected.</p></qt>"
 msgstr ""
 
-#: identitydialog.cpp:256
+#: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
 msgstr "S/MIME ਇੰਕਰਿਪਸ਼ਨ ਸਰਟੀਫਿਕੇਟ:"
 
-#: identitydialog.cpp:277
+#: identitydialog.cpp:301
 msgid "Preferred crypto message format:"
 msgstr "ਕਰਪੀਟ ਸੁਨੇਹੇ ਫਾਰਮੈਟ ਪਸੰਦ:"
 
-#: identitydialog.cpp:290
+#: identitydialog.cpp:314
 msgid "&Advanced"
 msgstr "ਤਕਨੀਕੀ(&A)"
 
-#: identitydialog.cpp:300
+#: identitydialog.cpp:324
 msgid "&Reply-To address:"
 msgstr "ਜਵਾਬ ਸਿਰਨਾਵਾਂ(&R):"
 
-#: identitydialog.cpp:302
+#: identitydialog.cpp:326
 msgid ""
 "<qt>"
 "<h3>Reply-To addresses</h3>"
@@ -3515,11 +3896,11 @@ msgid ""
 "<p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
-#: identitydialog.cpp:319
+#: identitydialog.cpp:343
 msgid "&BCC addresses:"
 msgstr "&BCC ਸਿਰਨਾਵੀਂ:"
 
-#: identitydialog.cpp:321
+#: identitydialog.cpp:345
 msgid ""
 "<qt>"
 "<h3>BCC (Blind Carbon Copy) addresses</h3>"
@@ -3532,47 +3913,52 @@ msgid ""
 "<p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
-#: identitydialog.cpp:337
+#: identitydialog.cpp:361
 msgid "D&ictionary:"
 msgstr "ਸ਼ਬਦ-ਕੋਸ਼(&i):"
 
-#: identitydialog.cpp:346
+#: identitydialog.cpp:370
 msgid "Sent-mail &folder:"
 msgstr "ਭੇਜੇ-ਪੱਤਰ ਫੋਲਡਰ(&f):"
 
-#: identitydialog.cpp:355
+#: identitydialog.cpp:379
 msgid "&Drafts folder:"
 msgstr "ਡਰਾਫਟ ਫੋਲਡਰ(&D):"
 
-#: identitydialog.cpp:364
+#: identitydialog.cpp:388
 msgid "&Templates folder:"
 msgstr "ਨਮੂਨਾ ਫੋਲਡਰ(&T):"
 
-#: identitydialog.cpp:369
+#: identitydialog.cpp:393
 msgid "Special &transport:"
 msgstr "ਖਾਸ ਸੰਚਾਰ(&t):"
 
-#: identitydialog.cpp:386 kmfolderdia.cpp:717
+#: identitydialog.cpp:410 kmfolderdia.cpp:808
 msgid "&Use custom message templates"
 msgstr ""
 
-#: identitydialog.cpp:392 kmfolderdia.cpp:725
+#: identitydialog.cpp:416 kmfolderdia.cpp:816
 msgid "&Copy global templates"
 msgstr ""
 
-#: identitydialog.cpp:407
+#: identitydialog.cpp:431
 msgid "&Signature"
 msgstr "ਦਸਤਖਤ(&S)"
 
-#: identitydialog.cpp:411
+#: identitydialog.cpp:435
 msgid "&Picture"
 msgstr "ਤਸਵੀਰ(&P)"
 
-#: identitydialog.cpp:486 identitydialog.cpp:498 kmcomposewin.cpp:4004
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
 msgid "Invalid Email Address"
 msgstr "ਗਲਤ ਈ-ਮੇਲ ਸਿਰਨਾਵਾਂ"
 
-#: identitydialog.cpp:518
+#: identitydialog.cpp:530
+#, fuzzy
+msgid "Invalid Email Alias \"%1\""
+msgstr "ਗਲਤ ਈ-ਮੇਲ ਸਿਰਨਾਵਾਂ"
+
+#: identitydialog.cpp:551
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
 "the configured email address for this identity (%1).\n"
@@ -3580,13 +3966,13 @@ msgid ""
 "verify signatures made with this configuration."
 msgstr ""
 
-#: identitydialog.cpp:527
+#: identitydialog.cpp:560
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID with "
 "the configured email address for this identity (%1)."
 msgstr ""
 
-#: identitydialog.cpp:534
+#: identitydialog.cpp:567
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
 "configured email address for this identity (%1).\n"
@@ -3594,37 +3980,37 @@ msgid ""
 "verify signatures made with this configuration."
 msgstr ""
 
-#: identitydialog.cpp:543
+#: identitydialog.cpp:576
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
 "configured email address for this identity (%1)."
 msgstr ""
 
-#: identitydialog.cpp:551
+#: identitydialog.cpp:584
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "ਕੁੰਜੀ/ਸਰਟੀਫਿਕੇਟ ਵਿੱਚ ਕੋਈ ਈ-ਮੇਲ ਸਿਰਨਾਵਾਂ ਨਹੀਂ ਮਿਲਿਆ"
 
-#: identitydialog.cpp:562
+#: identitydialog.cpp:595
 msgid "The signature file is not valid"
 msgstr "ਦਸਤਖਤ ਫਾਇਲ ਜਾਇਜ਼ ਨਹੀਂ ਹੈ"
 
-#: identitydialog.cpp:582
+#: identitydialog.cpp:615
 msgid "Edit Identity \"%1\""
 msgstr "ਪਛਾਣ \"%1\" ਸੋਧ"
 
-#: identitydialog.cpp:606
+#: identitydialog.cpp:640
 msgid ""
 "The custom sent-mail folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default sent-mail folder will be used."
 msgstr ""
 
-#: identitydialog.cpp:617
+#: identitydialog.cpp:651
 msgid ""
 "The custom drafts folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default drafts folder will be used."
 msgstr ""
 
-#: identitydialog.cpp:628
+#: identitydialog.cpp:662
 msgid ""
 "The custom templates folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default templates folder will be used."
@@ -3645,38 +4031,38 @@ msgstr "ਪਛਾਣ ਨਾਂ"
 msgid "Email Address"
 msgstr "ਈ-ਮੇਲ ਸਿਰਨਾਵਾਂ"
 
-#: imapaccountbase.cpp:291 popaccount.cpp:154
+#: imapaccountbase.cpp:293 popaccount.cpp:154
 msgid "You need to supply a username and a password to access this mailbox."
 msgstr "ਤੁਸੀਂ ਇਸ ਪੱਤਰ-ਬਕਸੇ ਲਈ ਆਪਣਾ ਉਪਭੋਗੀ ਨਾਂ ਅਤੇ ਗੁਪਤ-ਕੋਡ ਨਹੀਂ ਦਿੱਤਾ ਹੈ।"
 
-#: imapaccountbase.cpp:296
+#: imapaccountbase.cpp:298
 msgid "Authorization Dialog"
 msgstr "ਪਰਮਾਣਕਤਾ ਵਾਰਤਾਲਾਪ"
 
-#: imapaccountbase.cpp:297 popaccount.cpp:155
+#: imapaccountbase.cpp:299 popaccount.cpp:155
 msgid "Account:"
 msgstr "ਖਾਤਾ:"
 
-#: imapaccountbase.cpp:318
+#: imapaccountbase.cpp:320
 #, c-format
 msgid "Could not start process for %1."
 msgstr "%1 ਲਈ ਕਾਰਜ ਆਰੰਭ ਨਹੀਂ ਹੋ ਸਕਿਆ"
 
-#: imapaccountbase.cpp:399
+#: imapaccountbase.cpp:403
 msgid "Error while trying to subscribe to %1:"
 msgstr "%1 ਦਾ ਮੈਂਬਰ ਬਣਨ ਦੀ ਕੋਸ਼ਸ਼ ਦੌਰਾਨ ਗਲਤੀ ਹੈ:"
 
-#: imapaccountbase.cpp:637
+#: imapaccountbase.cpp:645
 msgid "Retrieving Namespaces"
 msgstr "ਨਾਂ-ਥਾਂ ਲਈ ਜਾ ਰਹੀ ਹੈ"
 
-#: imapaccountbase.cpp:728
+#: imapaccountbase.cpp:736
 msgid ""
 "KMail has detected a prefix entry in the configuration of the account \"%1\" "
 "which is obsolete with the support of IMAP namespaces."
 msgstr ""
 
-#: imapaccountbase.cpp:742 imapaccountbase.cpp:756
+#: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
 "The configuration was automatically migrated but you should check your account "
 "configuration."
@@ -3684,74 +4070,74 @@ msgstr ""
 "ਸੰਰਚਨਾ ਆਟੋਮੈਟਿਕ ਹੀ ਮਾਈਗਰੇਟ ਕੀਤਾ ਗਿਆ ਸੀ, ਪਰ ਤੁਹਾਨੂੰ ਆਪਣੇ ਖਾਤੇ ਦੀ ਸੰਰਚਨਾ ਦੀ ਜਾਂਚ "
 "ਕਰਨੀ ਚਾਹੀਦੀ ਹੈ।"
 
-#: imapaccountbase.cpp:760
+#: imapaccountbase.cpp:768
 msgid ""
 "It was not possible to migrate your configuration automatically so please check "
 "your account configuration."
 msgstr ""
 
-#: imapaccountbase.cpp:874 imapaccountbase.cpp:875
+#: imapaccountbase.cpp:882 imapaccountbase.cpp:883
 msgid "<unknown>"
 msgstr "<ਅਣਜਾਣ>"
 
-#: imapaccountbase.cpp:876
+#: imapaccountbase.cpp:884
 msgid "Error while uploading message"
 msgstr "ਸੁਨੇਹਾ ਅੱਪਲੋਡ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: imapaccountbase.cpp:878
+#: imapaccountbase.cpp:886
 msgid ""
 "Could not upload the message dated %1 from <i>%2</i> with subject <i>%3</i> "
 "to the server."
 msgstr ""
 
-#: imapaccountbase.cpp:880
+#: imapaccountbase.cpp:888
 #, fuzzy
 msgid "The destination folder was: <b>%1</b>."
 msgstr "ਨਿਯਤ ਫੋਲਡਰ: %1"
 
-#: imapaccountbase.cpp:882
+#: imapaccountbase.cpp:890
 msgid "The server reported:"
 msgstr ""
 
-#: imapaccountbase.cpp:892
+#: imapaccountbase.cpp:900
 #, fuzzy
 msgid "No detailed quota information available."
 msgstr "ਕੋਈ ਹਾਲਤ ਜਾਣਕਾਰੀ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
 
-#: imapaccountbase.cpp:903
+#: imapaccountbase.cpp:911
 msgid "The folder is too close to its quota limit. (%1)"
 msgstr ""
 
-#: imapaccountbase.cpp:905
+#: imapaccountbase.cpp:913
 msgid ""
 "\n"
 "Since you do not have write privileges on this folder, please ask the owner of "
 "the folder to free up some space in it."
 msgstr ""
 
-#: imapaccountbase.cpp:951
+#: imapaccountbase.cpp:959
 msgid ""
 "The connection to the server %1 was unexpectedly closed or timed out. It will "
 "be re-established automatically if possible."
 msgstr ""
 
-#: imapaccountbase.cpp:957
+#: imapaccountbase.cpp:965
 msgid "The connection to account %1 was broken."
 msgstr "ਖਾਤੇ %1 ਨਾਲ ਕੁਨੈਕਸ਼ਣ ਟੁੱਟ ਚੁੱਕਿਆ ਹੈ।"
 
-#: imapaccountbase.cpp:960
+#: imapaccountbase.cpp:968
 msgid "The connection to account %1 timed out."
 msgstr "ਖਾਤੇ %1 ਲਈ ਕੁਨੈਕਸ਼ਨ ਅੰਤਰਾਲ ਖਤਮ ਹੋਇਆ।"
 
-#: imapaccountbase.cpp:1245
+#: imapaccountbase.cpp:1253
 msgid "Error while uploading status of messages to server: "
 msgstr "ਸੁਨੇਹਿਆਂ ਦਾ ਹਾਲਤ ਨੂੰ ਸਰਵਰ ਉੱਤੇ ਭੇਜਣ ਦੌਰਾਨ ਗਲਤੀ ਹੈ: "
 
-#: imapaccountbase.cpp:1290 listjob.cpp:118
+#: imapaccountbase.cpp:1298 listjob.cpp:118
 msgid "retrieving folders"
 msgstr "ਫੋਲਡਰ ਲਏ ਜਾ ਰਹੇ ਹਨ"
 
-#: imapjob.cpp:153 kmfolderimap.cpp:496
+#: imapjob.cpp:153 kmfolderimap.cpp:490
 msgid "Uploading message data"
 msgstr "ਸੁਨੇਹਾ ਡਾਟਾ ਅੱਪਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
@@ -3775,46 +4161,291 @@ msgstr "ਸੁਨੇਹਾ ਵਿਸ਼ੇ ਨਾਲ:"
 msgid "Error while retrieving messages from the server."
 msgstr "ਸਰਵਰ ਤੋਂ ਸੁਨੇਹਾ ਲੈਣ ਦੌਰਾਨ ਗਲਤੀ ਹੈ।"
 
-#: imapjob.cpp:483
+#: imapjob.cpp:485
 msgid "Error while retrieving information on the structure of a message."
 msgstr "ਇੱਕ ਸੁਨੇਹੇ ਦੇ ਢਾਂਚੇ ਉੱਤੇ ਜਾਣਕਾਰੀ ਪਰਾਪਤ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਹੈ।"
 
-#: imapjob.cpp:541
+#: imapjob.cpp:543
 msgid "Uploading message data failed."
 msgstr "ਸੁਨੇਹਾ ਡਾਟਾ ਅੱਪਲੋਡ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਹੈ।"
 
-#: imapjob.cpp:546
+#: imapjob.cpp:548
 msgid "Uploading message data completed."
 msgstr "ਸੁਨੇਹਾ ਅੱਪਲੋਡ ਕਰਨਾ ਮੁਕੰਮਲ ਹੋਇਆ ਹੈ।"
 
-#: imapjob.cpp:650
+#: imapjob.cpp:652
 msgid "Error while copying messages."
 msgstr "ਸੁਨੇਹੇ ਨਕਲ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਹੈ।"
 
-#: keyresolver.cpp:234
+#: importarchivedialog.cpp:36
+#, fuzzy
+msgid "Import Archive"
+msgstr "ਸੂਚੀ ਪੁਰਾਲੇਖ"
+
+#: importarchivedialog.cpp:87
+msgid "Please select an archive file that should be imported."
+msgstr ""
+
+#: importarchivedialog.cpp:88
+#, fuzzy
+msgid "No archive file selected"
+msgstr "ਕੋਈ ਫੋਲਡਰ ਚੁਣਿਆ ਨਹੀਂ ਗਿਆ"
+
+#: importarchivedialog.cpp:93
+#, fuzzy
+msgid "Please select the folder where the archive should be imported to."
+msgstr "ਮਿਆਦ ਪੁੱਗੀ ਵਾਲੇ ਸੁਨੇਹੇ ਭੇਜਣ ਲਈ ਇੱਕ ਫੋਲਡਰ ਚੁਣੋ ਜੀ।"
+
+#: importarchivedialog.cpp:94
+#, fuzzy
+msgid "No target folder selected"
+msgstr "ਕੋਈ ਫੋਲਡਰ ਚੁਣਿਆ ਨਹੀਂ ਗਿਆ"
+
+#: importjob.cpp:80
+msgid "Importing the archive file '%1' into the folder '%2' succeeded."
+msgstr ""
+
+#: importjob.cpp:82
+#, fuzzy, c-format
+msgid ""
+"_n: 1 message was imported.\n"
+"%n messages were imported."
+msgstr ""
+"੧ ਸੁਨੇਹਾ, %1\n"
+"%n ਸੁਨੇਹੇ, %1"
+
+#: importjob.cpp:83
+#, fuzzy
+msgid "Import finished."
+msgstr "vCard ਆਯਾਤ ਅਸਫ਼ਲ ਹੋਇਆ ਹੈ"
+
+#: importjob.cpp:98
+#, fuzzy
+msgid "Failed to import the archive into folder '%1'."
+msgstr "ਫੋਲਡਰ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ"
+
+#: importjob.cpp:105
+#, fuzzy
+msgid "Importing archive failed."
+msgstr "ਕੈਂਚੇ ਫਾਇਲ ਅੱਪਡੇਟ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+
+#: importjob.cpp:114 importjob.cpp:287
+#, fuzzy
+msgid "Unable to create subfolder for folder '%1'."
+msgstr "ਫੋਲਡਰ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ"
+
+#: importjob.cpp:214
+#, fuzzy, c-format
+msgid "Importing folder %1"
+msgstr "ਫੋਲਡਰ ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
+
+#: importjob.cpp:234
+#, fuzzy
+msgid "Failed to add a message to the folder '%1'."
+msgstr "ਸੁਨੇਹੇ ਨੂੰ ਫੋਲਡਰ ਵਿੱਚ ਜੋੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: "
+
+#: importjob.cpp:254
+#, fuzzy
+msgid "Failed to upload a message to the IMAP server."
+msgstr "ਪ੍ਰਾਪਤ ਕੀਤੇ ਸੁਨੇਹੇ ਸਰਵਰ ਉੱਤੇ ਹੀ ਰਹਿਣ ਦਿਓ(&v)"
+
+#: importjob.cpp:337
+msgid "Unexpected subdirectory named '%1'."
+msgstr ""
+
+#: importjob.cpp:371
+msgid "The file '%1' does not appear to be a valid archive."
+msgstr ""
+
+#: importjob.cpp:376
+msgid "Unable to open archive file '%1'"
+msgstr ""
+
+#: importjob.cpp:382
+#, fuzzy
+msgid "Importing Archive"
+msgstr "ਸੂਚੀ ਪੁਰਾਲੇਖ"
+
+#: keyresolver.cpp:306
 msgid ""
 "One or more of your configured OpenPGP encryption keys or S/MIME certificates "
 "is not fully trusted for encryption."
 msgstr ""
 
-#: keyresolver.cpp:240
+#: keyresolver.cpp:309
+msgid ""
+"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
+"\"%1\" is not fully trusted for encryption."
+msgstr ""
+
+#: keyresolver.cpp:315
 msgid ""
 "\n"
 "The following keys are only marginally trusted: \n"
 msgstr ""
 
-#: keyresolver.cpp:244
+#: keyresolver.cpp:319
 msgid ""
 "\n"
 "The following keys or certificates have unknown trust level: \n"
 msgstr ""
 
-#: keyresolver.cpp:248
+#: keyresolver.cpp:323
+msgid ""
+"\n"
+"The following keys or certificates are <b>revoked</b>: \n"
+msgstr ""
+
+#: keyresolver.cpp:327
 #, fuzzy
 msgid "Not Fully Trusted Encryption Keys"
 msgstr "ਨਾ-ਵਰਤਣਯੋਗ ਇੰਕਰਿਪਸ਼ਨ ਕੁੰਜੀਆਂ"
 
-#: keyresolver.cpp:553
+#: keyresolver.cpp:642
+msgid ""
+"_n: "
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+
+#: keyresolver.cpp:647
+msgid ""
+"_n: "
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+
+#: keyresolver.cpp:652
+msgid ""
+"_n: "
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+
+#: keyresolver.cpp:662
+msgid ""
+"_n: "
+"<p>The root certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+
+#: keyresolver.cpp:669
+msgid ""
+"_n: "
+"<p>The root certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+
+#: keyresolver.cpp:676
+msgid ""
+"_n: "
+"<p>The root certificate</p><p align=center><b>%3</b></p>"
+"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p>"
+"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+
+#: keyresolver.cpp:684
+msgid ""
+"_n: "
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+
+#: keyresolver.cpp:691
+msgid ""
+"_n: "
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+
+#: keyresolver.cpp:698
+msgid ""
+"_n: "
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
+"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
+"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+
+#: keyresolver.cpp:707
+msgid ""
+"_n: "
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+
+#: keyresolver.cpp:712
+msgid ""
+"_n: "
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+
+#: keyresolver.cpp:717
+msgid ""
+"_n: "
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+
+#: keyresolver.cpp:724
+#, fuzzy
+msgid "OpenPGP Key Expired"
+msgstr "OpenPGP ਕੁੰਜੀ ਦੀ ਮਿਆਦ ਛੇਤੀ ਹੀ ਪੁੱਗ ਜਾਵੇਗੀ"
+
+#: keyresolver.cpp:725
+#, fuzzy
+msgid "S/MIME Certificate Expired"
+msgstr "S/MIME ਸਰਟੀਫਿਕੇਟ ਦੀ ਮਿਆਦ ਛੇਤੀ ਹੀ ਪੁੱਗ ਜਾਵੇਗੀ"
+
+#: keyresolver.cpp:750
 msgid ""
 "_n: "
 "<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
@@ -3823,7 +4454,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:558
+#: keyresolver.cpp:755
 msgid ""
 "_n: "
 "<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
@@ -3832,7 +4463,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:563
+#: keyresolver.cpp:760
 msgid ""
 "_n: "
 "<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
@@ -3841,7 +4472,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:573
+#: keyresolver.cpp:770
 msgid ""
 "_n: "
 "<p>The root certificate</p><p align=center><b>%3</b></p>"
@@ -3854,7 +4485,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:580
+#: keyresolver.cpp:777
 msgid ""
 "_n: "
 "<p>The root certificate</p><p align=center><b>%3</b></p>"
@@ -3867,7 +4498,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:587
+#: keyresolver.cpp:784
 msgid ""
 "_n: "
 "<p>The root certificate</p><p align=center><b>%3</b></p>"
@@ -3878,7 +4509,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:595
+#: keyresolver.cpp:792
 msgid ""
 "_n: "
 "<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
@@ -3891,7 +4522,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:602
+#: keyresolver.cpp:799
 msgid ""
 "_n: "
 "<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
@@ -3904,7 +4535,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:609
+#: keyresolver.cpp:806
 msgid ""
 "_n: "
 "<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
@@ -3915,7 +4546,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:618
+#: keyresolver.cpp:815
 msgid ""
 "_n: "
 "<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
@@ -3926,7 +4557,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:623
+#: keyresolver.cpp:820
 msgid ""
 "_n: "
 "<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
@@ -3937,7 +4568,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:628
+#: keyresolver.cpp:825
 msgid ""
 "_n: "
 "<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
@@ -3948,15 +4579,15 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:634
+#: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
 msgstr "OpenPGP ਕੁੰਜੀ ਦੀ ਮਿਆਦ ਛੇਤੀ ਹੀ ਪੁੱਗ ਜਾਵੇਗੀ"
 
-#: keyresolver.cpp:635
+#: keyresolver.cpp:833
 msgid "S/MIME Certificate Expires Soon"
 msgstr "S/MIME ਸਰਟੀਫਿਕੇਟ ਦੀ ਮਿਆਦ ਛੇਤੀ ਹੀ ਪੁੱਗ ਜਾਵੇਗੀ"
 
-#: keyresolver.cpp:668
+#: keyresolver.cpp:867
 msgid ""
 "One or more of your configured OpenPGP encryption keys or S/MIME certificates "
 "is not usable for encryption. Please reconfigure your encryption keys and "
@@ -3965,11 +4596,11 @@ msgid ""
 "prompted to specify the keys to use."
 msgstr ""
 
-#: keyresolver.cpp:676 keyresolver.cpp:989 keyresolver.cpp:1016
+#: keyresolver.cpp:875 keyresolver.cpp:1204 keyresolver.cpp:1231
 msgid "Unusable Encryption Keys"
 msgstr "ਨਾ-ਵਰਤਣਯੋਗ ਇੰਕਰਿਪਸ਼ਨ ਕੁੰਜੀਆਂ"
 
-#: keyresolver.cpp:712
+#: keyresolver.cpp:911
 msgid ""
 "One or more of your configured OpenPGP signing keys or S/MIME signing "
 "certificates is not usable for signing. Please reconfigure your signing keys "
@@ -3978,11 +4609,11 @@ msgid ""
 "prompted to specify the keys to use."
 msgstr ""
 
-#: keyresolver.cpp:720 keyresolver.cpp:1043 keyresolver.cpp:1059
+#: keyresolver.cpp:919 keyresolver.cpp:1258 keyresolver.cpp:1274
 msgid "Unusable Signing Keys"
 msgstr "ਨਾ-ਵਰਤਣਯੋਗ ਦਸਤਖਤੀ ਕੁੰਜੀਆਂ"
 
-#: keyresolver.cpp:980
+#: keyresolver.cpp:1195
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
@@ -3992,7 +4623,7 @@ msgid ""
 "be able to read your own messages if you do so."
 msgstr ""
 
-#: keyresolver.cpp:1007
+#: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
@@ -4002,7 +4633,7 @@ msgid ""
 "be able to read your own messages if you do so."
 msgstr ""
 
-#: keyresolver.cpp:1037
+#: keyresolver.cpp:1252
 msgid ""
 "Examination of recipient's signing preferences yielded that the message should "
 "be signed using OpenPGP, at least for some recipients;\n"
@@ -4010,11 +4641,11 @@ msgid ""
 "identity."
 msgstr ""
 
-#: keyresolver.cpp:1044
+#: keyresolver.cpp:1259
 msgid "Do Not OpenPGP-Sign"
 msgstr "OpenPGP-ਦਸਤਖਤ ਨਾ ਕਰੋ"
 
-#: keyresolver.cpp:1053
+#: keyresolver.cpp:1268
 msgid ""
 "Examination of recipient's signing preferences yielded that the message should "
 "be signed using S/MIME, at least for some recipients;\n"
@@ -4022,22 +4653,22 @@ msgid ""
 "identity."
 msgstr ""
 
-#: keyresolver.cpp:1060
+#: keyresolver.cpp:1275
 msgid "Do Not S/MIME-Sign"
 msgstr "S/MIME-ਦਸਤਖਤ ਨਾ ਕਰੋ"
 
-#: keyresolver.cpp:1116
+#: keyresolver.cpp:1331
 msgid ""
 "Examination of recipient's signing preferences showed no common type of "
 "signature matching your available signing keys.\n"
 "Send message without signing?"
 msgstr ""
 
-#: keyresolver.cpp:1120
+#: keyresolver.cpp:1335
 msgid "No signing possible"
 msgstr "ਦਸਤਖਤ ਸੰਭਵ ਨਹੀਂ"
 
-#: keyresolver.cpp:1275
+#: keyresolver.cpp:1490
 msgid ""
 "You did not select an encryption key for yourself (encrypt to self). You will "
 "not be able to decrypt your own message if you encrypt it."
@@ -4045,92 +4676,97 @@ msgstr ""
 "ਤੁਹਾਨੂੰ ਆਪਣੇ ਲਈ ਇੱਕ ਇੰਕਰਿਪਸ਼ਨ ਕੁੰਜੀ ਦੀ ਚੋਣ ਨਹੀਂ ਕਰਨੀ ਚਾਹੀਦੀ ਹੈ (ਆਪਣੇ ਲਈ "
 "ਇੰਕਰਿਪਟ)। ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਨੂੰ ਇੰਕਰਿਪਟ ਕਰ ਦਿੱਤਾ ਤਾਂ ਇਸ ਨੂੰ ਡਿਕਰਿਪਟ ਨਹੀਂ ਕਰ ਸਕੋਗੇ।"
 
-#: keyresolver.cpp:1279 keyresolver.cpp:1303 keyresolver.cpp:1317
+#: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
 msgid "Missing Key Warning"
 msgstr "ਕੁੰਜੀ ਗੁੰਮ ਚੇਤਾਵਨੀ"
 
-#: keyresolver.cpp:1280 keyresolver.cpp:1318 messagecomposer.cpp:885
-#: messagecomposer.cpp:910 messagecomposer.cpp:957
+#: keyresolver.cpp:1495 keyresolver.cpp:1533 messagecomposer.cpp:883
+#: messagecomposer.cpp:908 messagecomposer.cpp:955
 msgid "&Encrypt"
 msgstr "ਇੰਕ੍ਰਿਪਟਡ(&E)"
 
-#: keyresolver.cpp:1296
+#: keyresolver.cpp:1511
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
 
-#: keyresolver.cpp:1299
+#: keyresolver.cpp:1514
 msgid ""
 "You did not select an encryption key for any of the recipients of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
 
-#: keyresolver.cpp:1304 messagecomposer.cpp:933
+#: keyresolver.cpp:1519 messagecomposer.cpp:931
 msgid "Send &Unencrypted"
 msgstr "ਬਿਨ-ਇਨਕਰਿਪਟ ਹੀ ਭੇਜੋ(&U)"
 
-#: keyresolver.cpp:1309
+#: keyresolver.cpp:1524
 msgid ""
 "You did not select an encryption key for one of the recipients: this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
 
-#: keyresolver.cpp:1312
+#: keyresolver.cpp:1527
 msgid ""
 "You did not select encryption keys for some of the recipients: these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
 
-#: keyresolver.cpp:1367
+#: keyresolver.cpp:1585
 msgid "Encryption Key Selection"
 msgstr "ਇੰਕਰਿਪਟ ਕੁੰਜੀ ਚੋਣ"
 
-#: keyresolver.cpp:1408
+#: keyresolver.cpp:1628
+#, fuzzy
 msgid ""
-"_: if in your language something like 'key(s)' isn't possible please use the "
-"plural in the translation\n"
-"There is a problem with the encryption key(s) for \"%1\".\n"
+"_: if in your language something like 'certificate(s)' isn't possible please "
+"use the plural in the translation\n"
+"There is a problem with the encryption certificate(s) for \"%1\".\n"
 "\n"
-"Please re-select the key(s) which should be used for this recipient."
+"Please re-select the certificate(s) which should be used for this recipient."
 msgstr ""
 "\"%1\" ਲਈ ਇੰਕਰਿਪਟ ਕੁੰਜੀਆਂ ਨਾਲ ਸਮੱਸਿਆ ਹੈ।\n"
 "\n"
 "ਮੁੜ ਜਾਂਚ ਕਰੋ ਕਿ ਇਸ ਸਨੇਹੀ ਲਈ ਕਿਹੜੀ ਕੁੰਜੀ ਵਰਤੀ ਜਾਵੇ।"
 
-#: keyresolver.cpp:1452
+#: keyresolver.cpp:1678
+#, fuzzy
 msgid ""
-"_: if in your language something like 'key(s)' isn't possible please use the "
-"plural in the translation\n"
-"No valid and trusted encryption key was found for \"%1\".\n"
-"\n"
-"Select the key(s) which should be used for this recipient."
+"_: if in your language something like 'certificate(s)' isn't possible please "
+"use the plural in the translation\n"
+"<qt>No valid and trusted encryption certificate was found for \"%1\"."
+"<br/>"
+"<br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for external "
+"certificates by clicking the button: search for external certificates.</qt>"
 msgstr ""
 "\"%1\" ਲਈ ਕੋਈ ਜਾਇਜ ਅਤੇ ਭਰੋਸੇਯੋਗ ਇੰਕਰਿਪਟ ਕੁੰਜੀ ਨਹੀਂ ਲੱਭੀ ਹੈ।\n"
 "\n"
 "ਮੁੜ ਜਾਂਚ ਕਰੋ ਕਿ ਇਸ ਸਨੇਹੀ ਲਈ ਕਿਹੜੀ ਕੁੰਜੀ ਵਰਤੀ ਜਾਵੇ।"
 
-#: keyresolver.cpp:1459
+#: keyresolver.cpp:1687
+#, fuzzy
 msgid ""
-"_: if in your language something like 'key(s)' isn't possible please use the "
-"plural in the translation\n"
-"More than one key matches \"%1\".\n"
+"_: if in your language something like 'certificate(s)' isn't possible please "
+"use the plural in the translation\n"
+"More than one certificate matches \"%1\".\n"
 "\n"
-"Select the key(s) which should be used for this recipient."
+"Select the certificate(s) which should be used for this recipient."
 msgstr ""
 "\"%1\" ਨਾਲ ਇੱਕ ਤੋਂ ਵਧੇਰੇ ਕੁੰਜੀਆਂ ਮੇਲ ਖਾਂਦੀਆਂ ਹਨ।\n"
 "\n"
 "ਮੁੜ ਜਾਂਚ ਕਰੋ ਕਿ ਇਸ ਸਨੇਹੀ ਲਈ ਕਿਹੜੀ ਕੁੰਜੀ ਵਰਤੀ ਜਾਵੇ।"
 
-#: keyresolver.cpp:1567
+#: keyresolver.cpp:1800
 msgid "Name Selection"
 msgstr "ਨਾਂ ਚੋਣ"
 
-#: keyresolver.cpp:1567
+#: keyresolver.cpp:1800
 msgid "Which name shall the contact '%1' have in your addressbook?"
 msgstr ""
 
-#: kmaccount.cpp:49 kmaccount.cpp:381 kmsender.cpp:538
+#: kmaccount.cpp:49 kmaccount.cpp:381 kmsender.cpp:539
 #, c-format
 msgid "Executing precommand %1"
 msgstr "ਪਹਿਲਾਂ-ਕਮਾਂਡ %1 ਚਲਾਈ ਜਾ ਰਹੀ ਹੈ"
@@ -4160,11 +4796,11 @@ msgstr ""
 msgid "Checking account: %1"
 msgstr ""
 
-#: kmacctimap.cpp:398 kmfolderimap.cpp:858
+#: kmacctimap.cpp:398 kmfolderimap.cpp:852
 msgid " completed"
 msgstr " ਮੁਕੰਮਲ"
 
-#: kmacctimap.cpp:607 kmheaders.cpp:1275
+#: kmacctimap.cpp:607 kmheaders.cpp:1313
 msgid "Unable to process messages: "
 msgstr "ਸੁਨੇਹਿਆਂ ਉੱਤੇ ਕਾਰਵਾਈ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: "
 
@@ -4195,11 +4831,11 @@ msgstr "ਸੰਚਾਰ ਅਸਫ਼ਲ: %1 ਨੂੰ ਤਾਲਾਬੰਦ ਨ�
 msgid "Moving message %3 of %2 from %1."
 msgstr "%1 ਤੋਂ %2 ਦਾ %3 ਸੁਨੇਹਾ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ।"
 
-#: kmacctlocal.cpp:244
+#: kmacctlocal.cpp:245
 msgid "<qt>Cannot remove mail from mailbox <b>%1</b>:<br>%2</qt>"
 msgstr ""
 
-#: kmacctlocal.cpp:254
+#: kmacctlocal.cpp:255
 msgid ""
 "_n: Fetched 1 message from mailbox %1.\n"
 "Fetched %n messages from mailbox %1."
@@ -4243,83 +4879,92 @@ msgstr "ਨਾ-ਜੁੜਿਆ IMAP(&D)"
 msgid "&Maildir mailbox"
 msgstr "&Maildir ਪੱਤਰ-ਬਕਸਾ"
 
-#: kmailicalifaceimpl.cpp:90 kmfolderdia.cpp:448 newfolderdialog.cpp:125
+#: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "ਪੱਤਰ"
 
-#: kmailicalifaceimpl.cpp:91 kmfolderdia.cpp:449 newfolderdialog.cpp:126
+#: kmailicalifaceimpl.cpp:94 kmfolderdia.cpp:507 newfolderdialog.cpp:131
 msgid "Calendar"
 msgstr "ਕੈਲੰਡਰ"
 
-#: kmailicalifaceimpl.cpp:92 kmfolderdia.cpp:450 newfolderdialog.cpp:127
+#: kmailicalifaceimpl.cpp:95 kmfolderdia.cpp:508 newfolderdialog.cpp:132
 msgid "Contacts"
 msgstr "Contacts"
 
-#: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:451 newfolderdialog.cpp:128
+#: kmailicalifaceimpl.cpp:96 kmfolderdia.cpp:509 newfolderdialog.cpp:133
 msgid "Notes"
 msgstr "ਸੂਚਨਾ"
 
-#: kmailicalifaceimpl.cpp:94 kmfolderdia.cpp:452 newfolderdialog.cpp:129
+#: kmailicalifaceimpl.cpp:97 kmfolderdia.cpp:510 newfolderdialog.cpp:134
 msgid "Tasks"
 msgstr "ਕੰਮ"
 
-#: kmailicalifaceimpl.cpp:95 kmfolderdia.cpp:453 newfolderdialog.cpp:130
+#: kmailicalifaceimpl.cpp:98 kmfolderdia.cpp:511 newfolderdialog.cpp:135
 msgid "Journal"
 msgstr "ਜਰਨਲ"
 
-#: kmailicalifaceimpl.cpp:667
+#: kmailicalifaceimpl.cpp:684
 msgid "%1's %2"
 msgstr ""
 
-#: kmailicalifaceimpl.cpp:681
+#: kmailicalifaceimpl.cpp:700
 #, fuzzy
 msgid "My %1 (%2)"
 msgstr "ਅਸਫਲ: %1 (%2)"
 
-#: kmailicalifaceimpl.cpp:685
+#: kmailicalifaceimpl.cpp:704 kmailicalifaceimpl.cpp:708
 #, c-format
 msgid "My %1"
 msgstr ""
 
-#: kmailicalifaceimpl.cpp:1726
+#: kmailicalifaceimpl.cpp:1777
 msgid ""
 "KMail will now create the required groupware folders as subfolders of %1; if "
 "you do not want this, cancel and the IMAP resource will be disabled"
 msgstr ""
 
-#: kmailicalifaceimpl.cpp:1736
+#: kmailicalifaceimpl.cpp:1787
 msgid "%1: no folder found. It will be created."
 msgstr "%1: ਕੋਈ ਫੋਲਡਰ ਨਹੀਂ ਲੱਭਿਆ ਹੈ। ਇਹ ਬਣਾਇਆ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: kmailicalifaceimpl.cpp:1738
+#: kmailicalifaceimpl.cpp:1789
 msgid "%1: found folder %2. It will be set as the main groupware folder."
 msgstr "%1: ਫੋਲਡਰ %2 ਮਿਲਿਆ ਹੈ। ਇਹ ਮੁੱਖ ਗਰੁੱਪਵੇਅਰ ਫੋਲਡਰ ਵਾਂਗ ਦਿੱਤਾ ਜਾਵੇਗਾ।"
 
-#: kmailicalifaceimpl.cpp:1744
+#: kmailicalifaceimpl.cpp:1795
 msgid ""
 "<qt>KMail found the following groupware folders in %1 and needs to perform the "
 "following operations: %2"
 "<br>If you do not want this, cancel and the IMAP resource will be disabled"
 msgstr ""
 
-#: kmailicalifaceimpl.cpp:1751
+#: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
 msgstr "ਮਿਆਰੀ ਗਰੁੱਪਵੇਅਰ ਫੋਲਡਰ"
 
-#: kmailicalifaceimpl.cpp:1953
+#: kmailicalifaceimpl.cpp:1992
+#, fuzzy
+msgid "Default folder"
+msgstr "ਫੋਲਡਰ ਹਟਾਓ"
+
+#: kmailicalifaceimpl.cpp:1993
+msgid "There are multiple %1 default folders, please choose one:"
+msgstr ""
+
+#: kmailicalifaceimpl.cpp:2019
 msgid "You do not have read/write permission to your %1 folder."
 msgstr "ਤੁਹਾਨੂੰ %1 ਫੋਲਡਰ ਲਈ ਪੜਨ/ਲਿਖਣ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ।"
 
-#: kmailicalifaceimpl.cpp:2007
+#: kmailicalifaceimpl.cpp:2073
 #, fuzzy
 msgid "You do not have read/write permission to your folder."
 msgstr "ਤੁਹਾਨੂੰ %1 ਫੋਲਡਰ ਲਈ ਪੜਨ/ਲਿਖਣ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ।"
 
-#: kmcommands.cpp:300
+#: kmcommands.cpp:304
 msgid "Please wait"
 msgstr "ਉਡੀਕੋ ਜੀ"
 
-#: kmcommands.cpp:302 kmcommands.cpp:403
+#: kmcommands.cpp:306 kmcommands.cpp:407
 #, c-format
 msgid ""
 "_n: Please wait while the message is transferred\n"
@@ -4328,37 +4973,43 @@ msgstr ""
 "ਸੁਨੇਹੇ ਨੂੰ ਭੇਜੇ ਜਾਣ ਤੱਕ ਉਡੀਕੋ ਜੀ\n"
 "%n ਸੁਨੇਹਿਆਂ ਦੇ ਭੇਜੇ ਜਾਣ ਤੱਕ ਉਡੀਕੋ ਜੀ"
 
-#: kmcommands.cpp:594
+#: kmcommands.cpp:598
 msgid "Address copied to clipboard."
 msgstr "ਸਿਰਨਾਵਾਂ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਨਕਲ ਕੀਤਾ।"
 
-#: kmcommands.cpp:601
+#: kmcommands.cpp:605
 msgid "URL copied to clipboard."
 msgstr "URL ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਨਕਲ ਕੀਤਾ।"
 
-#: kmcommands.cpp:638
+#: kmcommands.cpp:642
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr ""
 "<qt> ਫਾਇਲ<b>%1</b> ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਤਬਦੀਲ ਕਰਨਾ ਹੈ?"
 "<br></qt>"
 
-#: kmcommands.cpp:639 kmcommands.cpp:939 kmkernel.cpp:1940
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2050
 msgid "Save to File"
 msgstr "ਫਾਇਲ ਵਿੱਚ ਸੰਭਾਲੋ"
 
-#: kmcommands.cpp:639 kmcommands.cpp:939 kmkernel.cpp:1940
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2050
 msgid "&Replace"
 msgstr "ਤਬਦੀਲ(&R)"
 
-#: kmcommands.cpp:739
+#: kmcommands.cpp:743
 msgid "Message as Plain Text"
 msgstr "ਸਧਾਰਨ ਪਾਠ ਵਾਂਗ ਸੁਨੇਹਾ"
 
-#: kmcommands.cpp:882
+#: kmcommands.cpp:775
+msgid ""
+"*.mbox|email messages (*.mbox)\n"
+"*|all files (*)"
+msgstr ""
+
+#: kmcommands.cpp:908
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:938 kmkernel.cpp:1939
+#: kmcommands.cpp:965 kmkernel.cpp:2049
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -4366,19 +5017,19 @@ msgstr ""
 "ਫਾਇਲ %1 ਮੌਜੂਦ ਹੈ।\n"
 "ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਤਬਦੀਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: kmcommands.cpp:982
+#: kmcommands.cpp:1009
 msgid "Open Message"
 msgstr "ਸੁਨੇਹਾ ਖੋਲ੍ਹੋ"
 
-#: kmcommands.cpp:1020 kmcommands.cpp:1048
+#: kmcommands.cpp:1047 kmcommands.cpp:1075
 msgid "The file does not contain a message."
 msgstr "ਫਾਇਲ ਵਿੱਚ ਇੱਕ ਸੁਨੇਹਾ ਮੌਜੂਦ ਨਹੀਂ ਹੈ।"
 
-#: kmcommands.cpp:1066
+#: kmcommands.cpp:1093
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "ਫਾਇਲ ਵਿੱਚ ਕਈ ਸੁਨੇਹੇ ਹਨ। ਸਿਰਫ਼ ਪਹਿਲਾਂ ਸੁਨੇਹਾ ਹੀ ਵੇਖਾਇਆ ਜਾਵੇਗਾ।"
 
-#: kmcommands.cpp:1363
+#: kmcommands.cpp:1404
 msgid ""
 "\n"
 "This is a MIME digest forward. The content of the message is contained in the "
@@ -4387,84 +5038,84 @@ msgid ""
 "\n"
 msgstr ""
 
-#: kmcommands.cpp:1697 kmheaders.cpp:1407
+#: kmcommands.cpp:1750 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "ਸੁਨੇਹੇ ਫਿਲਟਰ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: kmcommands.cpp:1705 kmheaders.cpp:1415
+#: kmcommands.cpp:1758 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "%2 ਵਿੱਚੋਂ %1 ਸੁਨੇਹੇ ਫਿਲਟਰ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: kmcommands.cpp:1715
+#: kmcommands.cpp:1768
 msgid "Not enough free disk space?"
 msgstr "ਕੀ ਡਿਸਕ ਤੇ ਖਾਲ਼ੀ ਥਾਂ ਨਹੀਂ ਹੈ?"
 
-#: kmcommands.cpp:1881 kmfoldertree.cpp:1891
+#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "ਇਸ ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ"
 
-#: kmcommands.cpp:1883 kmfoldertree.cpp:1893
+#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "ਇਸ ਫੋਲਡਰ ਵਿੱਚ ਨਕਲ"
 
-#: kmcommands.cpp:1959
+#: kmcommands.cpp:2012
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2133
+#: kmcommands.cpp:2186
 msgid "Moving messages"
 msgstr "ਸੁਨੇਹੇ ਭੇਜੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: kmcommands.cpp:2133
+#: kmcommands.cpp:2186
 msgid "Deleting messages"
 msgstr "ਸੁਨੇਹੇ ਹਟਾਏ ਜਾ ਰਹੇ ਹਨ"
 
-#: kmcommands.cpp:2406
+#: kmcommands.cpp:2471
 msgid "Opening URL..."
 msgstr "URL ਖੋਲ੍ਹੋ..."
 
-#: kmcommands.cpp:2413
+#: kmcommands.cpp:2478
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>ਕੀ ਤੁਸੀਂ <b>%1</b> ਨੂੰ ਚਲਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?</qt>"
 
-#: kmcommands.cpp:2414
+#: kmcommands.cpp:2479
 msgid "Execute"
 msgstr "ਚਲਾਓ"
 
-#: kmcommands.cpp:2495
+#: kmcommands.cpp:2561
 msgid "Found no attachments to save."
 msgstr "ਸੰਭਾਲਣ ਲਈ ਕੋਈ ਨੱਥੀ ਨਹੀਂ ਮਿਲਿਆ ਹੈ।"
 
-#: kmcommands.cpp:2508
+#: kmcommands.cpp:2574
 msgid "Save Attachments To"
 msgstr "ਨੱਥੀ ਨੂੰ ਇੰਞ ਸੰਭਾਲੋ"
 
-#: kmcommands.cpp:2528
+#: kmcommands.cpp:2594
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "ਨੱਥੀ.1"
 
-#: kmcommands.cpp:2556
+#: kmcommands.cpp:2622
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "ਨੱਥੀ.%1"
 
-#: kmcommands.cpp:2595
+#: kmcommands.cpp:2661
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr ""
 "ਫਾਇਲ ਨਾਂ %1 ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਦੇ ਉੱਪਰ ਹੀ ਲਿਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: kmcommands.cpp:2597
+#: kmcommands.cpp:2663
 msgid "File Already Exists"
 msgstr "ਫਾਇਲ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ"
 
-#: kmcommands.cpp:2597 util.h:211
+#: kmcommands.cpp:2663 util.h:211
 msgid "&Overwrite"
 msgstr "ਉੱਪਰ ਲਿਖੋ(&O)"
 
-#: kmcommands.cpp:2619
+#: kmcommands.cpp:2685
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
@@ -4472,19 +5123,19 @@ msgstr ""
 "ਸੁਨੇਹੇ ਦਾ ਭਾਗ %1 ਇੰਕਰਿਪਟ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਸੰਭਾਲਣ ਸਮੇਂ ਇੰਕਰਿਪਟ ਹੀ ਰੱਖਣਾ "
 "ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: kmcommands.cpp:2621 kmcommands.cpp:2630
+#: kmcommands.cpp:2687 kmcommands.cpp:2696
 msgid "KMail Question"
 msgstr "ਕੇ-ਮੇਲ ਸਵਾਲ"
 
-#: kmcommands.cpp:2621
+#: kmcommands.cpp:2687
 msgid "Keep Encryption"
 msgstr "ਇੰਕਰਿਪਸ਼ਨ ਰੱਖੋ"
 
-#: kmcommands.cpp:2621 kmcommands.cpp:2630
+#: kmcommands.cpp:2687 kmcommands.cpp:2696
 msgid "Do Not Keep"
 msgstr "ਇੰਕਰਿਪਟ ਨਾ ਕਰੋ"
 
-#: kmcommands.cpp:2628
+#: kmcommands.cpp:2694
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
@@ -4492,11 +5143,11 @@ msgstr ""
 "ਸੁਨੇਹੇ ਦਾ ਭਾਗ %1 ਦਸਤਖਤੀ ਹੈ। ਕੀ ਤੁਸੀਂ ਸੁਨੇਹੇ ਨੂੰ ਸੰਭਾਲਣ ਸਮੇਂ ਦਸਤਖਤਾਂ ਸਮੇਤ ਹੀ "
 "ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: kmcommands.cpp:2630
+#: kmcommands.cpp:2696
 msgid "Keep Signature"
 msgstr "ਦਸਤਖਤ ਰੱਖੋ"
 
-#: kmcommands.cpp:2703
+#: kmcommands.cpp:2769
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -4505,19 +5156,19 @@ msgstr ""
 "ਫਾਇਲ %1 ਨੂੰ ਲਿਖਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ:\n"
 "%2"
 
-#: kmcommands.cpp:2728
+#: kmcommands.cpp:2794
 #, c-format
 msgid "Could not write the file %1."
 msgstr "ਫਾਇਲ %1 ਨੂੰ ਲਿਖਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ।"
 
-#: kmcommands.cpp:2952
+#: kmcommands.cpp:3018
 msgid ""
 "There is no Address Book entry for this email address. Add them to the Address "
 "Book and then add instant messaging addresses using your preferred messaging "
 "client."
 msgstr ""
 
-#: kmcommands.cpp:2955
+#: kmcommands.cpp:3021
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -4527,114 +5178,181 @@ msgstr ""
 " %1\n"
 " ਇਹ ਜਾਣਨਾ ਸੰਭਵ ਨਹੀਂ ਹੋਵੇਗਾ ਕਿ ਕੌਣ ਗੱਲਬਾਤ ਕਰ ਰਿਹਾ ਹੈ।"
 
-#: kmcommands.cpp:3179 kmcomposewin.cpp:5128 objecttreeparser.cpp:1632
+#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
 msgid ""
 "Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
 "this bug."
 msgstr ""
 
-#: kmcommands.cpp:3181 kmcommands.cpp:3186 kmcommands.cpp:3195
-#: kmcommands.cpp:3204 kmcommands.cpp:3222 kmcommands.cpp:3233
-#: kmcommands.cpp:3273 kmcomposewin.cpp:5130 kmcomposewin.cpp:5135
-#: kmcomposewin.cpp:5144 messagecomposer.cpp:558 messagecomposer.cpp:566
-#: messagecomposer.cpp:580 objecttreeparser.cpp:1638
+#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
+#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
+#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
+#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "ਵਾਕੰਸ਼ ਪਰਿਵਰਤਨ ਗਲਤੀ"
 
-#: kmcommands.cpp:3192 kmcomposewin.cpp:5141 objecttreeparser.cpp:1644
+#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
 msgid ""
 "Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
 "did not return a string list. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3201 kmcomposewin.cpp:5150 objecttreeparser.cpp:1652
+#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
 msgid ""
 "No keys have been found. Please check that a valid key path has been set in the "
 "Chiasmus configuration."
 msgstr ""
 
-#: kmcommands.cpp:3208 objecttreeparser.cpp:1659
+#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "ਵਾਕੰਸ਼ ਪਰਿਵਰਤਨ ਡਿਕਰਿਪਸ਼ਨ ਕੁੰਜੀ ਚੋਣ"
 
-#: kmcommands.cpp:3220 objecttreeparser.cpp:1671
+#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
 msgid ""
 "Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
 "bug."
 msgstr ""
 
-#: kmcommands.cpp:3231 objecttreeparser.cpp:1679
+#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3239 kmcommands.cpp:3265 objecttreeparser.cpp:1685
+#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr ""
 
-#: kmcommands.cpp:3270 objecttreeparser.cpp:1691
+#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
 msgid ""
 "Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
 "not return a byte array. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3425
-#, fuzzy
-msgid "This attachment has been deleted."
-msgstr "ਨੱਥੀ ਨੂੰ ਭੇਜਣ ਵਾਲੇ ਦੇ ਸੁਝਾਅ ਮੁਤਾਬਕ ਹੀ ਵੇਖਾਓ।"
-
-#: kmcommands.cpp:3427
-msgid "The attachment '%1' has been deleted."
-msgstr ""
-
-#: kmcommands.cpp:3541
+#: kmcommands.cpp:3581
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3551
+#: kmcommands.cpp:3591
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "ਪੱਤਰ"
 
-#: kmcomposewin.cpp:233
+#: kmcomposewin.cpp:207
+#, fuzzy
+msgid "Select an identity for this message"
+msgstr "ਇਸ ਸੁਨੇਹਾ ਲਈ HTML ਪੇਸ਼ਕਾਰੀ ਚਾਲੂ ਕਰੋ।"
+
+#: kmcomposewin.cpp:211
+msgid "Select the dictionary to use when spell-checking this message"
+msgstr ""
+
+#: kmcomposewin.cpp:216
+msgid "Select the sent-mail folder where a copy of this message will be saved"
+msgstr ""
+
+#: kmcomposewin.cpp:220
+msgid "Select the outgoing account to use for sending this message"
+msgstr ""
+
+#: kmcomposewin.cpp:224
+msgid "Set the \"From:\" email address for this message"
+msgstr ""
+
+#: kmcomposewin.cpp:228
+msgid "Set the \"Reply-To:\" email address for this message"
+msgstr ""
+
+#: kmcomposewin.cpp:248
 msgid "Select email address(es)"
 msgstr "ਈ-ਮੇਲ ਸਿਰਨਾਵਾਂ ਚੁਣੋ"
 
-#: kmcomposewin.cpp:286
+#: kmcomposewin.cpp:295
+#, fuzzy
+msgid "Set a subject for this message"
+msgstr "ਸੁਨੇਹੇ ਦਾ ਵਿਸ਼ਾ ਦਿਓ"
+
+#: kmcomposewin.cpp:297
+msgid "&Identity:"
+msgstr "ਪਛਾਣ(&I):"
+
+#: kmcomposewin.cpp:298
+msgid "&Dictionary:"
+msgstr "ਸ਼ਬਦ-ਕੋਸ਼(&D):"
+
+#: kmcomposewin.cpp:299
+msgid "&Sent-Mail folder:"
+msgstr "ਭੇਜੇ-ਪੱਤਰ ਫੋਲਡਰ(&S):"
+
+#: kmcomposewin.cpp:300
+msgid "&Mail transport:"
+msgstr "ਮੇਲ ਟਰਾਂਸਪੋਰਟ(&M):"
+
+#: kmcomposewin.cpp:301
+msgid ""
+"_: sender address field\n"
+"&From:"
+msgstr "ਵਲੋਂ(&F):"
+
+#: kmcomposewin.cpp:302
+msgid "&Reply to:"
+msgstr "ਜਵਾਬ(&R):"
+
+#: kmcomposewin.cpp:303
+msgid "S&ubject:"
+msgstr "ਵਿਸ਼ਾ(&u):"
+
+#: kmcomposewin.cpp:305
 msgid "Sticky"
 msgstr "ਚਿਪਕਾਉ"
 
-#: kmcomposewin.cpp:367 kmfoldertree.cpp:1681 kmheaders.cpp:138
-#: kmheaders.cpp:183 kmmainwidget.cpp:424 kmmainwidget.cpp:431
-#: kmmainwidget.cpp:438 kmmimeparttree.cpp:67 kmpopfiltercnfrmdlg.cpp:43
+#: kmcomposewin.cpp:308
+msgid "Use the selected value as your identity for future messages"
+msgstr ""
+
+#: kmcomposewin.cpp:311
+msgid "Use the selected value as your sent-mail folder for future messages"
+msgstr ""
+
+#: kmcomposewin.cpp:314
+msgid "Use the selected value as your outgoing account for future messages"
+msgstr ""
+
+#: kmcomposewin.cpp:317
+msgid "Use the selected value as your dictionary for future messages"
+msgstr ""
+
+#: kmcomposewin.cpp:398 kmfoldertree.cpp:1719 kmheaders.cpp:141
+#: kmheaders.cpp:187 kmmainwidget.cpp:416 kmmainwidget.cpp:423
+#: kmmainwidget.cpp:430 kmmimeparttree.cpp:67 kmpopfiltercnfrmdlg.cpp:43
 msgid "Size"
 msgstr "ਆਕਾਰ"
 
-#: kmcomposewin.cpp:368 kmmimeparttree.cpp:66
+#: kmcomposewin.cpp:399 kmmimeparttree.cpp:66
 msgid "Encoding"
 msgstr "ਇੰਕੋਡਿੰਗ"
 
-#: kmcomposewin.cpp:375 kmcomposewin.cpp:3247
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
 msgid "Compress"
 msgstr "ਨਪੀੜੋ"
 
-#: kmcomposewin.cpp:377
+#: kmcomposewin.cpp:408
 msgid "Encrypt"
 msgstr "ਇੰਕ੍ਰਿਪਟ"
 
-#: kmcomposewin.cpp:379
+#: kmcomposewin.cpp:410
 msgid "Sign"
 msgstr "ਦਸਤਖਤ"
 
-#: kmcomposewin.cpp:590 kmcomposewin.cpp:3616
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
 msgid "Name of the attachment:"
 msgstr "ਨੱਥੀ ਦਾ ਨਾਂ:"
 
-#: kmcomposewin.cpp:828
+#: kmcomposewin.cpp:868
 msgid ""
 "Autosaving the message as %1 failed.\n"
 "Reason: %2"
@@ -4642,61 +5360,25 @@ msgstr ""
 "ਸੁਨੇਹੇ ਨੂੰ %1 ਦੇ ਤੌਰ 'ਤੇ ਸਵੈ-ਸੰਭਾਲਣ ਦੌਰਾਨ ਗਲਤੀ ਹੈ।\n"
 "ਕਾਰਨ: %2"
 
-#: kmcomposewin.cpp:832
+#: kmcomposewin.cpp:872
 msgid "Autosaving Failed"
 msgstr "ਸਵੈ-ਸੰਭਾਲਣ ਅਸਫ਼ਲ ਹੈ"
 
-#: kmcomposewin.cpp:970
-msgid "&Identity:"
-msgstr "ਪਛਾਣ(&I):"
-
-#: kmcomposewin.cpp:974
-msgid "&Dictionary:"
-msgstr "ਸ਼ਬਦ-ਕੋਸ਼(&D):"
-
-#: kmcomposewin.cpp:978
-msgid "&Sent-Mail folder:"
-msgstr "ਭੇਜੇ-ਪੱਤਰ ਫੋਲਡਰ(&S):"
-
-#: kmcomposewin.cpp:982
-msgid "&Mail transport:"
-msgstr "ਮੇਲ ਟਰਾਂਸਪੋਰਟ(&M):"
-
-#: kmcomposewin.cpp:986
-msgid ""
-"_: sender address field\n"
-"&From:"
-msgstr "ਵਲੋਂ(&F):"
-
-#: kmcomposewin.cpp:992
-msgid "&Reply to:"
-msgstr "ਜਵਾਬ(&R):"
-
-#: kmcomposewin.cpp:1000
-msgid ""
-"_: recipient address field\n"
-"&To:"
-msgstr "ਵੱਲ(&T):"
-
-#: kmcomposewin.cpp:1002
+#: kmcomposewin.cpp:1042
 msgid "Primary Recipients"
 msgstr "ਮੂਲ ਸੁਨੇਹੀ"
 
-#: kmcomposewin.cpp:1003
+#: kmcomposewin.cpp:1043
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email.</qt>"
 msgstr ""
 "<qt>ਇਸ ਖੇਤਰ ਵਿੱਚ ਦਿੱਤੇ ਈ-ਮੇਲ ਸਿਰਨਾਵੇਂ ਨੂੰ ਈ-ਮੇਲ ਦੀ ਨਕਲ ਭੇਜੀ ਜਾਵੇਗੀ।</qt>"
 
-#: kmcomposewin.cpp:1010
-msgid "&Copy to (CC):"
-msgstr "ਨਕਲ (&CC):"
-
-#: kmcomposewin.cpp:1012
+#: kmcomposewin.cpp:1052
 msgid "Additional Recipients"
 msgstr "ਵਾਧੂ ਪਰਾਪਤ ਕਰਤਾ"
 
-#: kmcomposewin.cpp:1013
+#: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
 "Technically it is the same thing as putting all the addresses in the <b>To:</b> "
@@ -4704,490 +5386,501 @@ msgid ""
 "(CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:1025
-msgid "&Blind copy to (BCC):"
-msgstr "ਲੁਕਵੀਂ ਨਕਲ(&BCC):"
-
-#: kmcomposewin.cpp:1027
+#: kmcomposewin.cpp:1067
 msgid "Hidden Recipients"
 msgstr "ਲੁਕਵੇਂ ਪ੍ਰਾਪਤ ਕਰਤਾ"
 
-#: kmcomposewin.cpp:1028
+#: kmcomposewin.cpp:1068
 msgid ""
 "<qt>Essentially the same thing as the <b>Copy To:</b> "
 "field but differs in that all other recipients do not see who receives a blind "
 "copy.</qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:1060
-msgid "S&ubject:"
-msgstr "ਵਿਸ਼ਾ(&u):"
-
-#: kmcomposewin.cpp:1198 kmcomposewin.cpp:1220
+#: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 msgid "&Send Mail"
 msgstr "ਪੱਤਰ ਭੇਜੋ(&S)"
 
-#: kmcomposewin.cpp:1202 kmcomposewin.cpp:1224
+#: kmcomposewin.cpp:1240 kmcomposewin.cpp:1262
 msgid "&Send Mail Via"
 msgstr "ਇੰਞ ਪੱਤਰ ਭੇਜੋ(&S)"
 
-#: kmcomposewin.cpp:1205 kmcomposewin.cpp:1214 kmcomposewin.cpp:4329
-#: redirectdialog.cpp:83
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "ਬਾਅਦ ਭੇਜੋ(&L)"
 
-#: kmcomposewin.cpp:1207 kmcomposewin.cpp:1217
+#: kmcomposewin.cpp:1245 kmcomposewin.cpp:1255
 msgid "Send &Later Via"
 msgstr "ਇੰਞ ਬਾਅਦ ਭੇਜੋ(&L)"
 
-#: kmcomposewin.cpp:1255
+#: kmcomposewin.cpp:1293
 msgid "Save as &Draft"
 msgstr "ਡਰਾਫਟ ਵਾਂਗ ਸੰਭਾਲੋ(&D)"
 
-#: kmcomposewin.cpp:1258
+#: kmcomposewin.cpp:1296
 msgid "Save as &Template"
 msgstr "ਨਮੂਨੇ ਵਾਂਗ ਸੰਭਾਲੋ(&T)"
 
-#: kmcomposewin.cpp:1261
+#: kmcomposewin.cpp:1299
 msgid "&Insert File..."
 msgstr "ਫਾਇਲ ਸ਼ਾਮਲ(&I)..."
 
-#: kmcomposewin.cpp:1264
+#: kmcomposewin.cpp:1302
 msgid "&Insert File Recent"
 msgstr "ਤਾਜ਼ਾ ਫਾਇਲ ਸ਼ਾਮਲ(&I)"
 
-#: kmcomposewin.cpp:1271
+#: kmcomposewin.cpp:1309
 msgid "&Address Book"
 msgstr "ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ(&A)"
 
-#: kmcomposewin.cpp:1274
+#: kmcomposewin.cpp:1312
 msgid "&New Composer"
 msgstr "ਨਵਾਂ ਪੱਤਰ ਲੇਖਕ(&N)"
 
-#: kmcomposewin.cpp:1278
+#: kmcomposewin.cpp:1316
 msgid "New Main &Window"
 msgstr "ਨਵਾਂ ਮੁੱਖ ਝਰੋਖਾ(&W)"
 
-#: kmcomposewin.cpp:1283
+#: kmcomposewin.cpp:1321
 msgid "Select &Recipients..."
 msgstr "ਸਨੇਹੀ ਚੁਣੋ(&R)..."
 
-#: kmcomposewin.cpp:1285
+#: kmcomposewin.cpp:1323
 msgid "Save &Distribution List..."
 msgstr "ਵੰਡ ਸੂਚੀ ਸੰਭਾਲੋ(&D)..."
 
-#: kmcomposewin.cpp:1307
+#: kmcomposewin.cpp:1345
 msgid "Pa&ste as Quotation"
 msgstr "ਹਵਾਲੇ ਵਾਂਗ ਚੇਪੋ(&s)"
 
-#: kmcomposewin.cpp:1310
+#: kmcomposewin.cpp:1348
 msgid "Paste as Attac&hment"
 msgstr "ਨੱਥੀ ਵਾਂਗ ਚੇਪੋ(&h)"
 
-#: kmcomposewin.cpp:1313
+#: kmcomposewin.cpp:1351
 msgid "Add &Quote Characters"
 msgstr "ਹਵਾਲਾ ਅੱਖਰ ਸ਼ਾਮਲ(&Q)"
 
-#: kmcomposewin.cpp:1316
+#: kmcomposewin.cpp:1356
 msgid "Re&move Quote Characters"
 msgstr "ਹਵਾਲਾ ਅੱਖਰ ਹਟਾਓ(&m)"
 
-#: kmcomposewin.cpp:1320
+#: kmcomposewin.cpp:1362
 msgid "Cl&ean Spaces"
 msgstr "ਖਾਲੀ ਥਾਂ ਸਾਫ"
 
-#. i18n: file kmail.kcfg line 341
-#: kmcomposewin.cpp:1323 kmreaderwin.cpp:683 rc.cpp:779
+#. i18n: file kmail.kcfg line 358
+#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "ਸਥਿਰ ਫੋਂਟ ਵਰਤੋਂ(&x)"
 
-#: kmcomposewin.cpp:1328
+#: kmcomposewin.cpp:1370
 msgid "&Urgent"
 msgstr "ਜ਼ਰੂਰੀ(&U)"
 
-#: kmcomposewin.cpp:1331
+#: kmcomposewin.cpp:1373
 msgid "&Request Disposition Notification"
 msgstr ""
 
-#: kmcomposewin.cpp:1336
+#: kmcomposewin.cpp:1378
 msgid "Se&t Encoding"
 msgstr "ਇਕੋਡਿੰਗ ਦਿਓ(&t)"
 
-#: kmcomposewin.cpp:1339
+#: kmcomposewin.cpp:1381
 msgid "&Wordwrap"
 msgstr "ਸ਼ਬਦ ਸਮੇਟੋ(&W)"
 
-#: kmcomposewin.cpp:1344
+#: kmcomposewin.cpp:1386
 msgid "&Snippets"
 msgstr ""
 
-#: kmcomposewin.cpp:1350
+#: kmcomposewin.cpp:1392
 msgid "&Automatic Spellchecking"
 msgstr "ਆਟੋਮੈਟਿਕ ਸ਼ਬਦ-ਜੋੜ ਜਾਂਚ(&A)"
 
-#: kmcomposewin.cpp:1360
+#: kmcomposewin.cpp:1402
 msgid "Auto-Detect"
 msgstr "ਸਵੈ-ਚਾਲਤ ਖੋਜ"
 
-#: kmcomposewin.cpp:1365
+#: kmcomposewin.cpp:1407
 msgid "Formatting (HTML)"
 msgstr "ਫਾਰਮੈਟ (HTML)"
 
-#: kmcomposewin.cpp:1369
+#: kmcomposewin.cpp:1411
 msgid "&All Fields"
 msgstr "ਸਭ ਖੇਤਰ(&A)"
 
-#: kmcomposewin.cpp:1372
+#: kmcomposewin.cpp:1414
 msgid "&Identity"
 msgstr "ਪਛਾਣ(&I)"
 
-#: kmcomposewin.cpp:1375
+#: kmcomposewin.cpp:1417
 msgid "&Dictionary"
 msgstr "ਸ਼ਬਦ-ਕੋਸ਼(&D)"
 
-#: kmcomposewin.cpp:1378
+#: kmcomposewin.cpp:1420
 msgid "&Sent-Mail Folder"
 msgstr "ਭੇਜੇ-ਪੱਤਰ ਫੋਲਡਰ(&S)"
 
-#: kmcomposewin.cpp:1381
+#: kmcomposewin.cpp:1423
 msgid "&Mail Transport"
 msgstr "ਮੇਲ ਟਰਾਂਸਪੋਰਟ(&M)"
 
-#: kmcomposewin.cpp:1384
+#: kmcomposewin.cpp:1426
 msgid "&From"
 msgstr "ਵੱਲੋਂ(&F)"
 
-#: kmcomposewin.cpp:1387
+#: kmcomposewin.cpp:1429
 msgid "&Reply To"
 msgstr "ਜਵਾਬ(&R)"
 
-#: kmcomposewin.cpp:1391
+#: kmcomposewin.cpp:1433
 msgid "&To"
 msgstr "ਵੱਲੋਂ(&T)"
 
-#: kmcomposewin.cpp:1394
+#: kmcomposewin.cpp:1436
 msgid "&CC"
 msgstr "&CC"
 
-#: kmcomposewin.cpp:1397
+#: kmcomposewin.cpp:1439
 msgid "&BCC"
 msgstr "&BCC"
 
-#: kmcomposewin.cpp:1401
+#: kmcomposewin.cpp:1443
 msgid "S&ubject"
 msgstr "ਵਿਸ਼ਾ(&u)"
 
-#: kmcomposewin.cpp:1406
+#: kmcomposewin.cpp:1448
 msgid "Append S&ignature"
 msgstr "ਦਸਤਖਤ ਸ਼ਾਮਲ(&i)"
 
-#: kmcomposewin.cpp:1409
+#: kmcomposewin.cpp:1451
 #, fuzzy
 msgid "Prepend S&ignature"
 msgstr "ਦਸਤਖਤ ਸ਼ਾਮਲ(&i)"
 
-#: kmcomposewin.cpp:1413
+#: kmcomposewin.cpp:1455
 #, fuzzy
 msgid "Insert Signature At C&ursor Position"
 msgstr "ਕਰਸਰ ਸਥਿਤੀ ਦਿਓ"
 
-#: kmcomposewin.cpp:1417
+#: kmcomposewin.cpp:1459
 msgid "Attach &Public Key..."
 msgstr "ਪਬਲਿਕ ਕੁੰਜੀ ਨੱਥੀ(&P)..."
 
-#: kmcomposewin.cpp:1420
+#: kmcomposewin.cpp:1462
 msgid "Attach &My Public Key"
 msgstr "ਮੇਰੀ ਪਬਲਿਕ ਕੁੰਜੀ ਨੱਥੀ(&M)"
 
-#: kmcomposewin.cpp:1423 kmcomposewin.cpp:2272
+#: kmcomposewin.cpp:1465 kmcomposewin.cpp:2337
 msgid "&Attach File..."
 msgstr "ਫਾਇਲ ਨੱਥੀ ਕਰੋ(&A)..."
 
-#: kmcomposewin.cpp:1426
+#: kmcomposewin.cpp:1468
 msgid "&Remove Attachment"
 msgstr "ਨੱਥੀ ਹਟਾਓ(&R)"
 
-#: kmcomposewin.cpp:1429
+#: kmcomposewin.cpp:1471
 msgid "&Save Attachment As..."
 msgstr "ਨੱਥੀ ਇੰਝ ਸੰਭਾਲੋ(&S)..."
 
-#: kmcomposewin.cpp:1432
+#: kmcomposewin.cpp:1474
 msgid "Attachment Pr&operties"
 msgstr "ਨੱਥੀ ਵਿਸ਼ੇਸ਼ਤਾ(&o)"
 
-#: kmcomposewin.cpp:1442
+#: kmcomposewin.cpp:1484
 msgid "&Spellchecker..."
 msgstr "ਸ਼ਬਦ-ਜੋੜ(&S)..."
 
-#: kmcomposewin.cpp:1446 kmcomposewin.cpp:1449
+#: kmcomposewin.cpp:1488 kmcomposewin.cpp:1491
 msgid "Encrypt Message with Chiasmus..."
 msgstr ""
 
-#: kmcomposewin.cpp:1457
+#: kmcomposewin.cpp:1499
 msgid "&Encrypt Message"
 msgstr "ਸੁਨੇਹਾ ਇੰਕਰਿਪਟ(&E)"
 
-#: kmcomposewin.cpp:1460
+#: kmcomposewin.cpp:1502
 msgid "&Sign Message"
 msgstr "ਸੁਨੇਹਾ ਦਸਤਖਤ(&S)"
 
-#: kmcomposewin.cpp:1507
+#: kmcomposewin.cpp:1549
 msgid "&Cryptographic Message Format"
 msgstr "ਕਰਿਪਟੋਗਰਾਫਿਕਸ ਸੁਨੇਹਾ ਫਾਰਮੈਟ(&C)"
 
-#: kmcomposewin.cpp:1515 kmcomposewin.cpp:4970
+#: kmcomposewin.cpp:1554
+msgid "Select a cryptographic format for this message"
+msgstr ""
+
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
 msgid "Standard"
 msgstr "ਮਿਆਰੀ"
 
-#: kmcomposewin.cpp:1516 kmcomposewin.cpp:4972
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
 msgid "Bulleted List (Disc)"
 msgstr "ਬਿੰਦੀਦਾਰ ਸੂਚੀ (ਡਿਸਕ)"
 
-#: kmcomposewin.cpp:1517 kmcomposewin.cpp:4974
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
 msgid "Bulleted List (Circle)"
 msgstr "ਬਿੰਦੀਦਾਰ ਸੂਚੀ (ਚੱਕਰ)"
 
-#: kmcomposewin.cpp:1518 kmcomposewin.cpp:4976
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
 msgid "Bulleted List (Square)"
 msgstr "ਬਿੰਦੀਦਾਰ ਸੂਚੀ (ਵਰਗ)"
 
-#: kmcomposewin.cpp:1519 kmcomposewin.cpp:4978
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
 msgid "Ordered List (Decimal)"
 msgstr "ਲੜੀਬੱਧ ਸੂਚੀ (ਦਸ਼ਮਲਵ)"
 
-#: kmcomposewin.cpp:1520 kmcomposewin.cpp:4980
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
 msgid "Ordered List (Alpha lower)"
 msgstr "ਲੜੀਬੱਧ ਸੂਚੀ (ਐਲਫਾ ਹੇਠਾਂ)"
 
-#: kmcomposewin.cpp:1521 kmcomposewin.cpp:4982
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
 msgid "Ordered List (Alpha upper)"
 msgstr "ਲੜੀਬੱਧ ਸੂਚੀ (ਐਲਫਾ ਉੱਪਰ)"
 
-#: kmcomposewin.cpp:1523
+#: kmcomposewin.cpp:1566
 msgid "Select Style"
 msgstr "ਸ਼ੈਲੀ ਚੁਣੋ"
 
-#: kmcomposewin.cpp:1537
+#: kmcomposewin.cpp:1569
+#, fuzzy
+msgid "Select a list style"
+msgstr "ਸ਼ੈਲੀ ਚੁਣੋ"
+
+#: kmcomposewin.cpp:1574
+#, fuzzy
+msgid "Select a font"
+msgstr "ਸਭ ਪਾਠ ਚੁਣੋ"
+
+#: kmcomposewin.cpp:1579
+#, fuzzy
+msgid "Select a font size"
+msgstr "ਧੁਨੀ ਫਾਇਲ ਚੁਣੋ"
+
+#: kmcomposewin.cpp:1583
 msgid "Align Left"
 msgstr "ਖੱਬੇ ਇਕਸਾਰ"
 
-#: kmcomposewin.cpp:1541
+#: kmcomposewin.cpp:1587
 msgid "Align Right"
 msgstr "ਸੱਜੇ ਇਕਸਾਰ"
 
-#: kmcomposewin.cpp:1544
+#: kmcomposewin.cpp:1590
 msgid "Align Center"
 msgstr "ਕੇਂਦਰ ਇਕਸਾਰ"
 
-#: kmcomposewin.cpp:1547
+#: kmcomposewin.cpp:1593
 msgid "&Bold"
 msgstr "ਭਾਰੇ(&B)"
 
-#: kmcomposewin.cpp:1550
+#: kmcomposewin.cpp:1596
 msgid "&Italic"
 msgstr "ਤਿਰਛਾ(&I)"
 
-#: kmcomposewin.cpp:1553
+#: kmcomposewin.cpp:1599
 msgid "&Underline"
 msgstr "ਹੇਠਾਂ ਰੇਖਾ(&U)"
 
-#: kmcomposewin.cpp:1556
+#: kmcomposewin.cpp:1602
 msgid "Reset Font Settings"
 msgstr "ਫੋਂਟ ਸੈਟਿੰਗ ਮੁੜ-ਸੈੱਟ"
 
-#: kmcomposewin.cpp:1559
+#: kmcomposewin.cpp:1605
 msgid "Text Color..."
 msgstr "ਪਾਠ ਰੰਗ..."
 
-#: kmcomposewin.cpp:1573
+#: kmcomposewin.cpp:1619
 msgid "Configure KMail..."
 msgstr "ਕੇ-ਮੇਲ ਸੰਰਚਨਾ..."
 
-#: kmcomposewin.cpp:1582
+#: kmcomposewin.cpp:1628
 msgid " Spellcheck: %1 "
 msgstr " ਸ਼ਬਦ-ਜੋੜ ਜਾਂਚ: %1 "
 
-#: kmcomposewin.cpp:1583 kmcomposewin.cpp:1597
+#: kmcomposewin.cpp:1629 kmcomposewin.cpp:1643
 msgid " Column: %1 "
 msgstr " ਕਾਲਮ: %1 "
 
-#: kmcomposewin.cpp:1584 kmcomposewin.cpp:1595
+#: kmcomposewin.cpp:1630 kmcomposewin.cpp:1641
 msgid " Line: %1 "
 msgstr " ਲਾਇਨ: %1 "
 
-#: kmcomposewin.cpp:2188
+#: kmcomposewin.cpp:2252
 msgid "Re&save as Template"
 msgstr ""
 
-#: kmcomposewin.cpp:2189
+#: kmcomposewin.cpp:2253
 msgid "&Save as Draft"
 msgstr "ਡਰਾਫਟ ਵਾਂਗ ਸਾਂਭੋ(&S)"
 
-#: kmcomposewin.cpp:2191
+#: kmcomposewin.cpp:2255
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
 "time."
 msgstr ""
 
-#: kmcomposewin.cpp:2193
+#: kmcomposewin.cpp:2257
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
 "later time."
 msgstr ""
 
-#: kmcomposewin.cpp:2197
+#: kmcomposewin.cpp:2261
 msgid "Do you want to save the message for later or discard it?"
 msgstr ""
 "ਕੀ ਤੁਸੀਂ ਸੁਨੇਹੇ ਨੂੰ ਬਾਅਦ ਵਿੱਚ ਲਈ ਸੰਭਾਲਣਾ ਚਾਹੁੰਦੇ ਹੋ ਜਾਂ ਰੱਦ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: kmcomposewin.cpp:2198
+#: kmcomposewin.cpp:2262
 msgid "Close Composer"
 msgstr "ਕੰਪੋਜ਼ਰ ਬੰਦ ਕਰੋ"
 
-#: kmcomposewin.cpp:2268
+#: kmcomposewin.cpp:2333
 msgid ""
 "The message you have composed seems to refer to an attached file but you have "
 "not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
 
-#: kmcomposewin.cpp:2271
+#: kmcomposewin.cpp:2336
 msgid "File Attachment Reminder"
 msgstr "ਫਾਇਲ ਨੱਥੀ ਰੀਮਾਇਡਰ"
 
-#: kmcomposewin.cpp:2273
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
 msgid "&Send as Is"
 msgstr "ਇੰਝ ਭੇਜੋ(&S)"
 
-#: kmcomposewin.cpp:2350
+#: kmcomposewin.cpp:2415
 msgid ""
 "<qt>"
 "<p>KMail could not recognize the location of the attachment (%1);</p>"
 "<p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:2359
+#: kmcomposewin.cpp:2424
 msgid ""
 "<qt>"
 "<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
 msgstr ""
 
-#: kmcomposewin.cpp:2697
+#: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "ਨੱਥੀ ਫਾਇਲ"
 
 #. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2698 rc.cpp:57
+#: kmcomposewin.cpp:2778 rc.cpp:57
 #, no-c-format
 msgid "&Attach"
 msgstr "ਨੱਥੀ(&A)"
 
-#: kmcomposewin.cpp:2878
+#: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "ਫਾਇਲ ਸ਼ਾਮਿਲ"
 
-#: kmcomposewin.cpp:3048
+#: kmcomposewin.cpp:3129
 msgid ""
 "<qt>"
 "<p>An error occurred while trying to export the key from the backend:</p>"
 "<p><b>%1</b></p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:3052
+#: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
 msgstr "ਕੁੰਜੀ ਨਿਰਯਾਤ ਅਸਫ਼ਲ"
 
-#: kmcomposewin.cpp:3079
+#: kmcomposewin.cpp:3160
 msgid "Exporting key..."
 msgstr "ਕੁੰਜੀ ਨਿਰਯਾਤ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
 
-#: kmcomposewin.cpp:3090
+#: kmcomposewin.cpp:3171
 #, c-format
 msgid "OpenPGP key 0x%1"
 msgstr "OpenPGP ਕੁੰਜੀ 0x%1"
 
-#: kmcomposewin.cpp:3105
+#: kmcomposewin.cpp:3186
 msgid "Attach Public OpenPGP Key"
 msgstr "ਪਬਲਿਕ OpenPGP ਕੁੰਜੀ ਨੱਥੀ"
 
-#: kmcomposewin.cpp:3106
+#: kmcomposewin.cpp:3187
 msgid "Select the public key which should be attached."
 msgstr "ਚੁਣੋ ਕਿ ਕਿਹੜੀ ਕੁੰਜੀ ਨੱਥੀ ਕਰਨੀ ਹੈ।"
 
-#: kmcomposewin.cpp:3128 kmmimeparttree.cpp:137 kmreaderwin.cpp:1967
+#: kmcomposewin.cpp:3209 kmmimeparttree.cpp:135 kmreaderwin.cpp:2032
 msgid ""
 "_: to open\n"
 "Open"
 msgstr "ਖੋਲ੍ਹੋ"
 
-#: kmcomposewin.cpp:3130 kmmimeparttree.cpp:138 kmreaderwin.cpp:1968
+#: kmcomposewin.cpp:3211 kmmimeparttree.cpp:136 kmreaderwin.cpp:2033
 msgid "Open With..."
 msgstr "ਇਸ ਨਾਲ ਖੋਲ੍ਹੋ..."
 
-#: kmcomposewin.cpp:3132
+#: kmcomposewin.cpp:3213
 msgid ""
 "_: to view\n"
 "View"
 msgstr "ਵੇਖੋ"
 
-#: kmcomposewin.cpp:3135
+#: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "ਸਕਰਿਪਟ ਸੋਧ..."
 
-#: kmcomposewin.cpp:3143
+#: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "ਨੱਥੀ ਸ਼ਾਮਲ..."
 
-#: kmcomposewin.cpp:3232 kmcomposewin.cpp:3240
+#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
 msgid "KMail could not compress the file."
 msgstr "ਕੇ-ਮੇਲ ਫਾਇਲ ਨੂੰ ਨਪੀੜ ਨਹੀਂ ਸਕੀ ਹੈ।"
 
-#: kmcomposewin.cpp:3246
+#: kmcomposewin.cpp:3326
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr ""
 "ਨਪੀੜੀ ਫਾਇਲ ਦਾ ਅਕਾਰ ਅਸਲੀ ਨਾਲੋਂ ਵੱਡਾ ਹੈ। ਕੀ ਤੁਸੀਂ ਅਸਲੀ ਨੂੰ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: kmcomposewin.cpp:3247
+#: kmcomposewin.cpp:3327
 msgid "Keep"
 msgstr "ਰੱਖੋ"
 
-#: kmcomposewin.cpp:3313 kmcomposewin.cpp:3321
+#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
 msgid "KMail could not uncompress the file."
 msgstr "ਕੇ-ਮੇਲ ਫਾਇਲ ਨੂੰ ਖੋਲ੍ਹ ਨਹੀਂ ਸਕੀ ਹੈ।"
 
-#: kmcomposewin.cpp:3519
+#: kmcomposewin.cpp:3601
 msgid "Save Attachment As"
 msgstr "ਨੱਥੀ ਇੰਝ ਸੰਭਾਲੋ"
 
-#: kmcomposewin.cpp:3769 kmedit.cpp:178
+#: kmcomposewin.cpp:3856 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "ਪਾਠ ਵਾਂਗ ਸ਼ਾਮਿਲ"
 
-#: kmcomposewin.cpp:3770 kmedit.cpp:179
+#: kmcomposewin.cpp:3857 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "ਨੱਥੀ ਵਾਂਗ ਸ਼ਾਮਲ"
 
-#: kmcomposewin.cpp:3771
+#: kmcomposewin.cpp:3858
 msgid ""
 "Please select whether you want to insert the content as text into the editor, "
 "or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3773
+#: kmcomposewin.cpp:3860
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "ਨੱਥੀ ਵਾਂਗ ਚੇਪੋ(&h)"
 
-#: kmcomposewin.cpp:3848 kmfilterdlg.cpp:705 kmfolderdia.cpp:274
-#: kmfolderdia.cpp:632 kmfoldertree.cpp:1603 managesievescriptsdialog.cpp:280
+#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "ਬੇਨਾਮ"
 
-#: kmcomposewin.cpp:3873
+#: kmcomposewin.cpp:3961
 msgid ""
 "<qt>"
 "<p>You have requested that messages be encrypted to yourself, but the currently "
@@ -5196,11 +5889,11 @@ msgid ""
 "<p>Please select the key(s) to use in the identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:3880
+#: kmcomposewin.cpp:3968
 msgid "Undefined Encryption Key"
 msgstr "ਨਾ-ਪਰਿਭਾਸ਼ਤ ਇੰਕਰਿਪਟ ਕੁੰਜੀ"
 
-#: kmcomposewin.cpp:3924
+#: kmcomposewin.cpp:4015
 msgid ""
 "<qt>"
 "<p>In order to be able to sign this message you first have to define the "
@@ -5208,28 +5901,28 @@ msgid ""
 "<p>Please select the key to use in the identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:3931
+#: kmcomposewin.cpp:4022
 msgid "Undefined Signing Key"
 msgstr "ਨਾ-ਪਰਿਭਾਸ਼ਤ ਦਸਤਖਤੀ ਕੁੰਜੀ"
 
-#: kmcomposewin.cpp:4016
+#: kmcomposewin.cpp:4129
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
 
-#: kmcomposewin.cpp:4018 kmkernel.cpp:1243
+#: kmcomposewin.cpp:4131 kmkernel.cpp:1285
 msgid "Online/Offline"
 msgstr "ਆਨਲਾਇਨ/ਆਫਲਾਇਨ"
 
-#: kmcomposewin.cpp:4033
+#: kmcomposewin.cpp:4146
 msgid ""
 "You must enter your email address in the From: field. You should also set your "
 "email address for all identities, so that you do not have to enter it for each "
 "message."
 msgstr ""
 
-#: kmcomposewin.cpp:4044
+#: kmcomposewin.cpp:4157
 msgid ""
 "You must specify at least one receiver,either in the To: field or as CC or as "
 "BCC."
@@ -5237,166 +5930,197 @@ msgstr ""
 "ਤੁਹਾਨੂੰ ਘੱਟੋ-ਘੱਟ ਇੱਕ ਸੁਨੇਹੀ ਤਾਂ ਦੇਣਾ ਚਾਹੀਦਾ ਹੈ, ਭਾਵੇਂ ਵੱਲ: ਖੇਤਰ ਵਿੱਚ, ਜਾਂ ਨਕਲ "
 "ਜਾਂ ਲੁਕਵੀ ਨਕਲ ਦੇ ਰੂਪ ਵਿੱਚ।"
 
-#: kmcomposewin.cpp:4052
+#: kmcomposewin.cpp:4165
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "ਵੱਲ: ਖੇਤਰ ਖਾਲੀ ਹੈ। ਕੀ ਕਿਵੇਂ ਵੀ ਭੇਜਣਾ ਹੈ?"
 
-#: kmcomposewin.cpp:4054
+#: kmcomposewin.cpp:4167
 msgid "No To: specified"
 msgstr "ਵੱਲ: ਨਹੀਂ ਦਿੱਤਾ"
 
-#: kmcomposewin.cpp:4079
+#: kmcomposewin.cpp:4192
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "ਤੁਸੀਂ ਕੋਈ ਵਿਸ਼ਾ ਨਹੀਂ ਦਿੱਤਾ ਹੈ। ਕੀ ਸੁਨੇਹਾ ਇੰਜ ਹੀ ਭੇਜਣਾ ਹੈ?"
 
-#: kmcomposewin.cpp:4081
+#: kmcomposewin.cpp:4194
 msgid "No Subject Specified"
 msgstr "ਕੋਈ ਵਿਸ਼ਾ ਨਹੀਂ ਦਿੱਤਾ ਗਿਆ"
 
-#: kmcomposewin.cpp:4082
+#: kmcomposewin.cpp:4195
 msgid "S&end as Is"
 msgstr "ਇੰਞ ਭੇਜੋ(&e)"
 
-#: kmcomposewin.cpp:4083
+#: kmcomposewin.cpp:4196
 msgid "&Specify the Subject"
 msgstr "ਵਿਸ਼ਾ ਦਿਓ(&S)"
 
-#: kmcomposewin.cpp:4121
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not sign/encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4122
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4123
+#: kmcomposewin.cpp:4236
 msgid "&Keep markup, do not sign"
 msgstr ""
 
-#: kmcomposewin.cpp:4125
+#: kmcomposewin.cpp:4238
 msgid "Sign/Encrypt (delete markup)"
 msgstr "ਦਸਤਖਤ/ਇੰਕਰਿਪਟ (ਨਿਸ਼ਾਨ ਹਟਾਓ)"
 
-#: kmcomposewin.cpp:4126
+#: kmcomposewin.cpp:4239
 msgid "Encrypt (delete markup)"
 msgstr "ਇੰਕਰਿਪਟ (ਨਿਸ਼ਾਨ ਹਟਾਓ)"
 
-#: kmcomposewin.cpp:4127
+#: kmcomposewin.cpp:4240
 msgid "Sign (delete markup)"
 msgstr "ਦਸਤਖਤ (ਨਿਸ਼ਾਨ ਹਟਾਓ)"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4242
 msgid ""
 "<qt>"
 "<p>Inline signing/encrypting of HTML messages is not possible;</p>"
 "<p>do you want to delete your markup?</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4131
+#: kmcomposewin.cpp:4244
 msgid "Sign/Encrypt Message?"
 msgstr "ਕੀ ਦਸਤਖਤ/ਇੰਕਰਿਪਟ ਸੁਨੇਹਾ?"
 
-#: kmcomposewin.cpp:4180
+#: kmcomposewin.cpp:4293
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
 
-#: kmcomposewin.cpp:4326
+#: kmcomposewin.cpp:4393 kmsender.cpp:114
+msgid "Please create an account for sending and try again."
+msgstr "ਭੇਜਣ ਲਈ ਖਾਤਾ ਬਣਾ ਕੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰੋ ਜੀ।"
+
+#: kmcomposewin.cpp:4456
 msgid "About to send email..."
 msgstr "ਈ-ਮੇਲ ਭੇਜਣ ਬਾਰੇ..."
 
-#: kmcomposewin.cpp:4327
+#: kmcomposewin.cpp:4457
 msgid "Send Confirmation"
 msgstr "ਭੇਜਣ ਬਾਰੇ ਪੁਸ਼ਟੀ"
 
-#: kmcomposewin.cpp:4328 redirectdialog.cpp:82
+#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "ਹੁਣੇ ਭੇਜੋ(&S)"
 
-#: kmcomposewin.cpp:4549
+#: kmcomposewin.cpp:4479
+msgid ""
+"You are trying to send the mail to more than %1 recipients. Send message "
+"anyway?"
+msgstr ""
+
+#: kmcomposewin.cpp:4480
+#, fuzzy
+msgid "Too many receipients"
+msgstr "ਕੋਈ ਸੁਨੇਹੀ ਨਹੀਂ"
+
+#: kmcomposewin.cpp:4482
+#, fuzzy
+msgid "&Edit Recipients"
+msgstr "ਵਾਧੂ ਪਰਾਪਤ ਕਰਤਾ"
+
+#: kmcomposewin.cpp:4728
 msgid "Spellcheck: on"
 msgstr ""
 
-#: kmcomposewin.cpp:4551
+#: kmcomposewin.cpp:4730
 msgid "Spellcheck: off"
 msgstr ""
 
-#: kmcomposewin.cpp:4608
+#: kmcomposewin.cpp:4787
 msgid " Spell check canceled."
 msgstr " ਸ਼ਬਦ-ਜੋੜ ਜਾਂਚ ਰੱਦ ਕੀਤੀ ਗਈ।"
 
-#: kmcomposewin.cpp:4611
+#: kmcomposewin.cpp:4790
 msgid " Spell check stopped."
 msgstr " ਸ਼ਬਦ-ਜੋੜ ਜਾਂਚ ਰੋਕੀ ਗਈ ਹੈ।"
 
-#: kmcomposewin.cpp:4614
+#: kmcomposewin.cpp:4793
 msgid " Spell check complete."
 msgstr " ਸ਼ਬਦ-ਜੋੜ ਜਾਂਚ ਮੁਕੰਮਲ ਹੋਈ ਹੈ।"
 
-#: kmcomposewin.cpp:4798 kmcomposewin.cpp:4806
+#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
 msgid "Spellchecker"
 msgstr "ਸ਼ਬਦ-ਜੋੜ ਜਾਂਚਕ"
 
-#: kmcomposewin.cpp:5115
+#: kmcomposewin.cpp:5304
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
 "You can do this in the Crypto Backends tab of the configure dialog's Security "
 "page."
 msgstr ""
 
-#: kmcomposewin.cpp:5119
+#: kmcomposewin.cpp:5308
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 
-#: kmcomposewin.cpp:5122
+#: kmcomposewin.cpp:5311
 msgid "No Chiasmus Backend Configured"
 msgstr ""
 
-#: kmcomposewin.cpp:5153
+#: kmcomposewin.cpp:5342
 msgid "No Chiasmus Keys Found"
 msgstr ""
 
-#: kmcomposewin.cpp:5157
+#: kmcomposewin.cpp:5346
 msgid "Chiasmus Encryption Key Selection"
 msgstr ""
 
-#: kmcomposewin.cpp:5189
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be signed"
 msgstr "ਸੁਨੇਹਾ %1 ਰਾਹੀਂ ਦਸਤਖਤੀ ਹੈ"
 
-#: kmcomposewin.cpp:5189
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "ਸੁਨੇਹਾ %1 ਰਾਹੀਂ ਦਸਤਖਤੀ ਹੈ"
 
-#: kmcomposewin.cpp:5190
+#: kmcomposewin.cpp:5379
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "OpenPGP ਸੁਨੇਹਾ - ਇੰਕਰਿਪਟਡ"
 
-#: kmcomposewin.cpp:5190
+#: kmcomposewin.cpp:5379
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "ਸੁਨੇਹਾ ਵਿਸ਼ੇ ਨਾਲ:"
 
-#: kmedit.cpp:391
+#: kmedit.cpp:458
 msgid "Unable to start external editor."
 msgstr "ਬਾਹਰੀ ਸੰਪਾਦਕ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਅਸਫ਼ਲ ਹੈ।"
 
-#: kmedit.cpp:442
-msgid "Suggestions"
+#: kmedit.cpp:522
+#, fuzzy
+msgid "No Suggestions"
 msgstr "ਸੁਝਾਅ"
 
-#: kmedit.cpp:494
+#: kmedit.cpp:529
+#, fuzzy
+msgid "Add to Dictionary"
+msgstr "ਸ਼ਬਦ-ਕੋਸ਼(&D)"
+
+#: kmedit.cpp:530
+#, fuzzy
+msgid "Ignore All"
+msgstr "ਅਣਡਿੱਠਾ(&I)"
+
+#: kmedit.cpp:587
 msgid "Automatic spellchecking is not possible on text with markup."
 msgstr "ਨਿਸ਼ਾਨਬੱਧ ਪਾਠ ਵਿੱਚ ਸਵੈ-ਚਾਲਤ ਸ਼ਬਦ-ਜੋੜ ਜਾਂਚ ਸੰਭਵ ਨਹੀਂ ਹੈ।"
 
-#: kmedit.cpp:538
+#: kmedit.cpp:631
 msgid ""
 "The external editor is still running.\n"
 "Abort the external editor or leave it open?"
@@ -5404,33 +6128,38 @@ msgstr ""
 "ਬਾਹਰੀ ਸੰਪਾਦਕ ਹਾਲੇ ਵੀ ਚੱਲ ਰਿਹਾ ਹੈ।\n"
 "ਕੀ ਬਾਹਰੀ ਸੰਪਾਦਕ ਨੂੰ ਅਧੂਰਾ ਛੱਡਣਾ ਹੈ ਜਾਂ ਇਸ ਨੂੰ ਖੁੱਲਾ ਹੀ ਛੱਡਣਾ ਹੈ?"
 
-#: kmedit.cpp:541
+#: kmedit.cpp:634
 msgid "Abort Editor"
 msgstr "ਸੰਪਾਦਕ ਅਧੂਰਾ ਛੱਡੋ"
 
-#: kmedit.cpp:541
+#: kmedit.cpp:634
 msgid "Leave Editor Open"
 msgstr "ਸੰਪਾਦਕ ਨੂੰ ਖੁੱਲ੍ਹਾ ਛੱਡੋ"
 
-#: kmedit.cpp:565
+#: kmedit.cpp:661
 msgid "Spellcheck - KMail"
 msgstr "ਸ਼ਬਦ-ਜੋੜ - ਕੇ-ਮੇਲ"
 
-#: kmedit.cpp:734
+#: kmedit.cpp:884
 msgid ""
 "ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
 "properly configured and in your PATH."
 msgstr ""
 
-#: kmedit.cpp:743
+#: kmedit.cpp:893
 msgid "ISpell/Aspell seems to have crashed."
 msgstr "ISpell/Aspell ਨਸ਼ਟ ਹੋ ਗਿਆ ਜਾਪਦਾ ਹੈ।"
 
-#: kmedit.cpp:752
+#: kmedit.cpp:902
 msgid "No misspellings encountered."
 msgstr "ਕੋਈ ਗਲਤ ਸ਼ਬਦ-ਜੋੜ ਨਹੀਂ ਹੈ।"
 
-#: kmfawidgets.cpp:102
+#: kmfawidgets.cpp:39
+#, fuzzy
+msgid "Open Address Book"
+msgstr "ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਵਿੱਚ ਖੋਲ੍ਹੋ"
+
+#: kmfawidgets.cpp:107
 msgid "Select Sound File"
 msgstr "ਧੁਨੀ ਫਾਇਲ ਚੁਣੋ"
 
@@ -5456,191 +6185,220 @@ msgstr ""
 "<br> ਅਣਜਾਣ ਫਿਲਟਰ ਕਾਰਵਾਈ <b>%1</b> ਹੈ। "
 "<br>ਇਹ ਨੂੰ ਅਣਡਿੱਠਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।</qt>"
 
-#: kmfilteraction.cpp:598
+#: kmfilteraction.cpp:601
 msgid "Confirm Delivery"
 msgstr "ਪਹੁੰਚ ਦੀ ਪੁਸ਼ਟੀ"
 
-#: kmfilteraction.cpp:634
+#: kmfilteraction.cpp:637
 msgid "Set Transport To"
 msgstr "ਸੰਚਾਰ ਵੱਲ ਸੈੱਟ"
 
-#: kmfilteraction.cpp:665
+#: kmfilteraction.cpp:668
 msgid "Set Reply-To To"
 msgstr "ਜਵਾਬ ਦਿਓ"
 
-#: kmfilteraction.cpp:701
+#: kmfilteraction.cpp:704
 msgid "Set Identity To"
 msgstr "ਪਛਾਣ ਦਿਓ"
 
-#: kmfilteraction.cpp:784
+#: kmfilteraction.cpp:787
 msgid "Mark As"
 msgstr "ਇੰਞ ਨਿਸ਼ਾਨਬੱਧ"
 
-#: kmfilteraction.cpp:789
+#: kmfilteraction.cpp:792
 msgid ""
 "_: msg status\n"
 "Important"
 msgstr "ਜ਼ਰੂਰੀ"
 
-#: kmfilteraction.cpp:790
+#: kmfilteraction.cpp:793
 msgid ""
 "_: msg status\n"
 "Read"
 msgstr "ਪੜ੍ਹਿਆ"
 
-#: kmfilteraction.cpp:791
+#: kmfilteraction.cpp:794
 msgid ""
 "_: msg status\n"
 "Unread"
 msgstr "ਅਣ-ਪੜ੍ਹਿਆ"
 
-#: kmfilteraction.cpp:792
+#: kmfilteraction.cpp:795
 msgid ""
 "_: msg status\n"
 "Replied"
 msgstr "ਜਵਾਬ ਦਿੱਤਾ"
 
-#: kmfilteraction.cpp:793
+#: kmfilteraction.cpp:796
 msgid ""
 "_: msg status\n"
 "Forwarded"
 msgstr "ਅੱਗੇ ਭੇਜਿਆ"
 
-#: kmfilteraction.cpp:794
+#: kmfilteraction.cpp:797
 msgid ""
 "_: msg status\n"
 "Old"
 msgstr "ਪੁਰਾਣਾ"
 
-#: kmfilteraction.cpp:795
+#: kmfilteraction.cpp:798
 msgid ""
 "_: msg status\n"
 "New"
 msgstr "ਨਵਾਂ"
 
-#: kmfilteraction.cpp:796
+#: kmfilteraction.cpp:799
 msgid ""
 "_: msg status\n"
 "Watched"
 msgstr "ਵੇਖਿਆ"
 
-#: kmfilteraction.cpp:797
+#: kmfilteraction.cpp:800
 msgid ""
 "_: msg status\n"
 "Ignored"
 msgstr "ਅਣਡਿੱਠਾ"
 
-#: kmfilteraction.cpp:798
+#: kmfilteraction.cpp:801
 msgid ""
 "_: msg status\n"
 "Spam"
 msgstr "ਕੂੜਾ"
 
-#: kmfilteraction.cpp:799
+#: kmfilteraction.cpp:802
 msgid ""
 "_: msg status\n"
 "Ham"
 msgstr "ਹਮ"
 
-#: kmfilteraction.cpp:883
+#: kmfilteraction.cpp:886
 msgid "Send Fake MDN"
 msgstr "ਫ਼ਰਜੀ MDN ਭੇਜੋ"
 
-#: kmfilteraction.cpp:888
+#: kmfilteraction.cpp:891
 msgid ""
 "_: MDN type\n"
 "Ignore"
 msgstr "ਅਣਡਿੱਠਾ"
 
-#: kmfilteraction.cpp:889
+#: kmfilteraction.cpp:892
 msgid ""
 "_: MDN type\n"
 "Displayed"
 msgstr "ਵੇਖਿਆ"
 
-#: kmfilteraction.cpp:890
+#: kmfilteraction.cpp:893
 msgid ""
 "_: MDN type\n"
 "Deleted"
 msgstr "ਹਟਾਇਆ"
 
-#: kmfilteraction.cpp:891
+#: kmfilteraction.cpp:894
 msgid ""
 "_: MDN type\n"
 "Dispatched"
 msgstr "ਭੇਜਿਆ"
 
-#: kmfilteraction.cpp:892
+#: kmfilteraction.cpp:895
 msgid ""
 "_: MDN type\n"
 "Processed"
 msgstr "ਤਿਆਰ ਕੀਤਾ"
 
-#: kmfilteraction.cpp:893
+#: kmfilteraction.cpp:896
 msgid ""
 "_: MDN type\n"
 "Denied"
 msgstr "ਪਾਬੰਦੀ"
 
-#: kmfilteraction.cpp:894
+#: kmfilteraction.cpp:897
 msgid ""
 "_: MDN type\n"
 "Failed"
 msgstr "ਫੇਲ੍ਹ"
 
-#: kmfilteraction.cpp:963
+#: kmfilteraction.cpp:966
 msgid "Remove Header"
 msgstr "ਸਿਰਲੇਖ ਹਟਾਓ"
 
-#: kmfilteraction.cpp:1036
+#: kmfilteraction.cpp:1039
 msgid "Add Header"
 msgstr "ਸਿਰਲੇਖ ਜੋੜ੍ਹੋ"
 
-#: kmfilteraction.cpp:1063
+#: kmfilteraction.cpp:1066
 msgid "With value:"
 msgstr "ਮੁੱਲ ਨਾਲ:"
 
-#: kmfilteraction.cpp:1177
+#: kmfilteraction.cpp:1180
 msgid "Rewrite Header"
 msgstr "ਸਿਰਲੇਖ ਮੁੜ ਲਿਖੋ"
 
-#: kmfilteraction.cpp:1213
+#: kmfilteraction.cpp:1216
 msgid "Replace:"
 msgstr "ਤਬਦੀਲ:"
 
-#: kmfilteraction.cpp:1220
+#: kmfilteraction.cpp:1223
 msgid "With:"
 msgstr "ਨਾਲ:"
 
-#: kmfilteraction.cpp:1340
+#: kmfilteraction.cpp:1343
 msgid "Move Into Folder"
 msgstr "ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ"
 
-#: kmfilteraction.cpp:1390
+#: kmfilteraction.cpp:1393
 msgid "Copy Into Folder"
 msgstr "ਫੋਲਡਰ ਵਿੱਚ ਨਕਲ"
 
-#: kmfilteraction.cpp:1452
+#: kmfilteraction.cpp:1467
 msgid "Forward To"
 msgstr "ਅੱਗੇ ਭੇਜੋ"
 
-#: kmfilteraction.cpp:1565
+#: kmfilteraction.cpp:1508
+msgid "The addressee the message will be forwarded to"
+msgstr ""
+
+#: kmfilteraction.cpp:1509
+msgid "The filter will forward the message to the addressee entered here."
+msgstr ""
+
+#: kmfilteraction.cpp:1515
+#, fuzzy
+msgid "Default Template"
+msgstr "ਨਮੂਨੇ ਵਾਂਗ ਸੰਭਾਲੋ(&T)"
+
+#: kmfilteraction.cpp:1525
+msgid "The template used when forwarding"
+msgstr ""
+
+#: kmfilteraction.cpp:1526
+msgid "Set the forwarding template that will be used with this filter."
+msgstr ""
+
+#: kmfilteraction.cpp:1620
+msgid "Forward to %1 with default template "
+msgstr ""
+
+#: kmfilteraction.cpp:1622
+msgid "Forward to %1 with template %2"
+msgstr ""
+
+#: kmfilteraction.cpp:1643
 msgid "Redirect To"
 msgstr "ਦਿਸ਼ਾ ਬਦਲੋ"
 
-#: kmfilteraction.cpp:1605
+#: kmfilteraction.cpp:1683
 msgid "Execute Command"
 msgstr "ਕਮਾਂਡ ਚਲਾਓ"
 
-#: kmfilteraction.cpp:1702
+#: kmfilteraction.cpp:1780
 msgid "Pipe Through"
 msgstr "ਇਸ ਰਾਹੀਂ ਪਾਈਪ"
 
-#: kmfilteraction.cpp:1809
+#: kmfilteraction.cpp:1887
 msgid "Play Sound"
 msgstr "ਆਵਾਜ਼ ਚਲਾਓ"
 
-#: kmfilterdlg.cpp:51
+#: kmfilterdlg.cpp:55
 msgid ""
 "<qt>"
 "<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
@@ -5648,7 +6406,7 @@ msgid ""
 "the dialog.</p></qt>"
 msgstr ""
 
-#: kmfilterdlg.cpp:57
+#: kmfilterdlg.cpp:61
 msgid ""
 "<qt>"
 "<p>Click this button to create a new filter.</p>"
@@ -5658,7 +6416,7 @@ msgid ""
 "on the <em>Delete</em> button.</p></qt>"
 msgstr ""
 
-#: kmfilterdlg.cpp:64
+#: kmfilterdlg.cpp:68
 msgid ""
 "<qt>"
 "<p>Click this button to copy a filter.</p>"
@@ -5666,7 +6424,7 @@ msgid ""
 "on the <em>Delete</em> button.</p></qt>"
 msgstr ""
 
-#: kmfilterdlg.cpp:68
+#: kmfilterdlg.cpp:72
 msgid ""
 "<qt>"
 "<p>Click this button to <em>delete</em> the currently-selected filter from the "
@@ -5676,7 +6434,7 @@ msgid ""
 "made.</p></qt>"
 msgstr ""
 
-#: kmfilterdlg.cpp:75
+#: kmfilterdlg.cpp:79
 msgid ""
 "<qt>"
 "<p>Click this button to move the currently-selected filter to the <em>top</em> "
@@ -5686,7 +6444,7 @@ msgid ""
 "first.</p></qt>"
 msgstr ""
 
-#: kmfilterdlg.cpp:81
+#: kmfilterdlg.cpp:85
 msgid ""
 "<qt>"
 "<p>Click this button to move the currently-selected filter <em>up</em> "
@@ -5698,7 +6456,7 @@ msgid ""
 "on the <em>Down</em> button.</p></qt>"
 msgstr ""
 
-#: kmfilterdlg.cpp:89
+#: kmfilterdlg.cpp:93
 msgid ""
 "<qt>"
 "<p>Click this button to move the currently-selected filter <em>down</em> "
@@ -5710,7 +6468,7 @@ msgid ""
 "on the <em>Up</em> button.</p></qt>"
 msgstr ""
 
-#: kmfilterdlg.cpp:97
+#: kmfilterdlg.cpp:101
 msgid ""
 "<qt>"
 "<p>Click this button to move the currently-selected filter to the <em>"
@@ -5720,7 +6478,7 @@ msgid ""
 "first.</p></qt>"
 msgstr ""
 
-#: kmfilterdlg.cpp:103
+#: kmfilterdlg.cpp:107
 msgid ""
 "<qt>"
 "<p>Click this button to rename the currently-selected filter.</p>"
@@ -5730,7 +6488,7 @@ msgid ""
 "in the appearing dialog.</p></qt>"
 msgstr ""
 
-#: kmfilterdlg.cpp:110
+#: kmfilterdlg.cpp:114
 msgid ""
 "<qt>"
 "<p>Check this button to force the confirmation dialog to be displayed.</p>"
@@ -5741,148 +6499,158 @@ msgid ""
 "differently.</p></qt>"
 msgstr ""
 
-#: kmfilterdlg.cpp:129
+#: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
 msgstr "POP3 ਫਿਲਟਰ ਨਿਯਮ"
 
-#: kmfilterdlg.cpp:129
+#: kmfilterdlg.cpp:133
 msgid "Filter Rules"
 msgstr "ਫਿਲਟਰ ਨਿਯਮ"
 
-#: kmfilterdlg.cpp:151
+#: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "ਉਪਲੱਬਧ ਫਿਲਟਰ"
 
-#: kmfilterdlg.cpp:164
+#: kmfilterdlg.cpp:168
 msgid "A&dvanced"
 msgstr "ਤਕਨੀਕੀ(&d)"
 
-#: kmfilterdlg.cpp:171
+#: kmfilterdlg.cpp:175
 msgid "Filter Criteria"
 msgstr "ਫਿਲਟਰ ਅਧਾਰ"
 
-#: kmfilterdlg.cpp:175
+#: kmfilterdlg.cpp:179
 msgid "Filter Action"
 msgstr "ਫਿਲਟਰ ਕਾਰਵਾਈ"
 
-#: kmfilterdlg.cpp:178
+#: kmfilterdlg.cpp:182
 msgid "Global Options"
 msgstr "ਮੁੱਢਲੀ ਚੋਣ"
 
-#: kmfilterdlg.cpp:179
+#: kmfilterdlg.cpp:183
 msgid "Always &show matched 'Download Later' messages in confirmation dialog"
 msgstr ""
 
-#: kmfilterdlg.cpp:184
+#: kmfilterdlg.cpp:188
 msgid "Filter Actions"
 msgstr "ਫਿਲਟਰ ਕਾਰਵਾਈ"
 
-#: kmfilterdlg.cpp:189
+#: kmfilterdlg.cpp:193
 msgid "Advanced Options"
 msgstr "ਤਕਨੀਕੀ ਚੋਣ"
 
-#: kmfilterdlg.cpp:197
+#: kmfilterdlg.cpp:201
 msgid "Apply this filter to incoming messages:"
 msgstr "ਆਉਣ ਵਾਲੇ ਸੁਨਹਿਆਂ ਉੱਤੇ ਇਹ ਫਿਲਟਰ ਲਾਗੂ:"
 
-#: kmfilterdlg.cpp:201
+#: kmfilterdlg.cpp:205
 msgid "from all accounts"
 msgstr "ਸਭ ਖਾਤਿਆਂ ਤੋਂ"
 
-#: kmfilterdlg.cpp:204
+#: kmfilterdlg.cpp:208
 msgid "from all but online IMAP accounts"
 msgstr "ਸਭ ਤੋਂ ਪਰ ਆਨਲਾਇਨ IMAP ਖਾਤਿਆਂ ਤੋਂ ਨਹੀਂ"
 
-#: kmfilterdlg.cpp:207
+#: kmfilterdlg.cpp:211
 msgid "from checked accounts only"
 msgstr "ਸਿਰਫ਼ ਚੁਣੇ ਖਾਤਿਆਂ ਲਈ ਹੀ"
 
-#: kmfilterdlg.cpp:213
+#: kmfilterdlg.cpp:217
 msgid "Account Name"
 msgstr "ਖਾਤਾ ਨਾਂ"
 
-#: kmfilterdlg.cpp:220
+#: kmfilterdlg.cpp:224
 msgid "Apply this filter to &sent messages"
 msgstr "ਭੇਜੇ ਸੁਨਹਿਆਂ ਉੱਤੇ ਇਹ ਫਿਲਟਰ ਲਾਗੂ(&s)"
 
-#: kmfilterdlg.cpp:223
+#: kmfilterdlg.cpp:227
 msgid "Apply this filter on manual &filtering"
 msgstr "ਦਸਤੀ ਫਿਲਟਰ ਸਮੇਂ ਇਹ ਫਿਲਟਰ ਲਾਗੂ(&f)"
 
-#: kmfilterdlg.cpp:226
+#: kmfilterdlg.cpp:230
 msgid "If this filter &matches, stop processing here"
 msgstr "ਜੇਕਰ ਇਹ ਫਿਲਟਰ ਮਿਲੇ ਤਾਂ ਕਾਰਵਾਈ ਰੋਕ ਦਿਓ(&m)"
 
-#: kmfilterdlg.cpp:230
+#: kmfilterdlg.cpp:234
 msgid "Add this filter to the Apply Filter menu"
 msgstr "ਫਿਲਟਰ ਮੇਨੂ ਲਾਗੂ ਕਰਨ ਲਈ ਇਹ ਫਿਲਟਰ ਸ਼ਾਮਲ"
 
-#: kmfilterdlg.cpp:232
+#: kmfilterdlg.cpp:236
 msgid "Shortcut:"
 msgstr "ਸ਼ਾਰਟਕੱਟ:"
 
-#: kmfilterdlg.cpp:238
+#: kmfilterdlg.cpp:242
 msgid "Additionally add this filter to the toolbar"
 msgstr "ਸੰਦ-ਪੱਟੀ ਵਿੱਚ ਹੋਰ ਫਿਲਟਰ ਹੋਰ ਜੋੜੋ"
 
-#: kmfilterdlg.cpp:243
+#: kmfilterdlg.cpp:247
 msgid "Icon for this filter:"
 msgstr "ਇਸ ਫਿਲਟਰ ਲਈ ਆਈਕਾਨ:"
 
-#: kmfilterdlg.cpp:608
+#: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "ਉੱਪਰ"
 
-#: kmfilterdlg.cpp:609
+#: kmfilterdlg.cpp:613
 msgid "Down"
 msgstr "ਹੇਠਾਂ"
 
-#: kmfilterdlg.cpp:628
+#: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "ਨਾਂ-ਤਬਦੀਲ..."
 
 #. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:629 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
 #, no-c-format
 msgid "New"
 msgstr "ਨਵਾਂ"
 
-#: kmfilterdlg.cpp:744
+#: kmfilterdlg.cpp:645
+#, fuzzy
+msgid "Select Source Folders"
+msgstr "ਫੋਲਡਰ ਲਈ ਸ਼ਾਰਟਕੱਟ ਚੁਣੋ"
+
+#: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
 "will only be applied when manually filtering and when filtering incoming online "
 "IMAP mail."
 msgstr ""
 
-#: kmfilterdlg.cpp:774
+#: kmfilterdlg.cpp:786
 msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
 msgstr ""
 
-#: kmfilterdlg.cpp:935
+#: kmfilterdlg.cpp:947
 msgid "Rename Filter"
 msgstr "ਫਿਲਟਰ ਨਾਂ-ਬਦਲੋ"
 
-#: kmfilterdlg.cpp:936
+#: kmfilterdlg.cpp:948
 msgid ""
 "Rename filter \"%1\" to:\n"
 "(leave the field empty for automatic naming)"
 msgstr ""
 
-#: kmfilterdlg.cpp:1113
+#: kmfilterdlg.cpp:973
+#, fuzzy
+msgid "Select Folders to Filter"
+msgstr "ਚੁਣੋ ਫੋਲਡਰ ਨਾਲ ਫੋਕਸ"
+
+#: kmfilterdlg.cpp:1136
 msgid "Please select an action."
 msgstr "ਇੱਕ ਕਾਰਵਾਈ ਚੁਣੋ ਜੀ।"
 
-#: kmfilterdlg.cpp:1280
+#: kmfilterdlg.cpp:1303
 msgid "&Download mail"
 msgstr "ਪੱਤਰ ਡਾਊਨਲੋਡ(&D)"
 
-#: kmfilterdlg.cpp:1281
+#: kmfilterdlg.cpp:1304
 msgid "Download mail la&ter"
 msgstr "ਪੱਤਰ ਬਾਅਦ ਵਿੱਚ ਡਾਊਨਲੋਡ(&t)"
 
-#: kmfilterdlg.cpp:1282
+#: kmfilterdlg.cpp:1305
 msgid "D&elete mail from server"
 msgstr "ਸਰਵਰ ਤੋਂ ਪੱਤਰ ਹਟਾਓ(&e)"
 
@@ -5890,10 +6658,28 @@ msgstr "ਸਰਵਰ ਤੋਂ ਪੱਤਰ ਹਟਾਓ(&e)"
 msgid "<qt>Error while creating file <b>%1</b>:<br>%2</qt>"
 msgstr "<qt><b>%1</b> ਫਾਇਲ ਬਣਾਉਣ ਦੌਰਾਨ ਗਲਤੀ:<br>%2</qt>"
 
-#: kmfolder.cpp:272
+#: kmfolder.cpp:276
 msgid "Failed to create folder"
 msgstr "ਫੋਲਡਰ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ"
 
+#: kmfolder.cpp:907
+msgid ""
+"Folder names cannot contain the / (slash) character; please choose another "
+"folder name."
+msgstr ""
+
+#: kmfolder.cpp:913
+msgid ""
+"Folder names cannot start with a . (dot) character; please choose another "
+"folder name."
+msgstr ""
+
+#: kmfolder.cpp:932
+msgid ""
+"Your IMAP server does not allow the character '%1'; please choose another "
+"folder name."
+msgstr ""
+
 #: kmfoldercachedimap.cpp:107
 msgid "Troubleshooting IMAP Cache"
 msgstr "IMAP ਕੈਂਚੇ ਸਮੱਸਿਆ ਨਿਪਟਾਰਾ"
@@ -5942,23 +6728,23 @@ msgstr "ਇਹ ਖਾਤੇ ਦੇ ਸਭ ਫੋਲਡਰ"
 msgid "Refresh &Cache"
 msgstr "ਕੈਂਚੇ ਤਾਜ਼ਾ(&C)"
 
-#: kmfoldercachedimap.cpp:203
+#: kmfoldercachedimap.cpp:216
 msgid ""
 "The UID cache file for folder %1 could not be read. There could be a problem "
 "with file system permission, or it is corrupted."
 msgstr ""
 
-#: kmfoldercachedimap.cpp:452
+#: kmfoldercachedimap.cpp:488
 msgid ""
 "The UID cache file for folder %1 could not be written. There could be a problem "
 "with file system permission."
 msgstr ""
 
-#: kmfoldercachedimap.cpp:562
+#: kmfoldercachedimap.cpp:612
 msgid "You must synchronize with the server before renaming IMAP folders."
 msgstr ""
 
-#: kmfoldercachedimap.cpp:679
+#: kmfoldercachedimap.cpp:735
 msgid ""
 "No account setup for this folder.\n"
 "Please try running a sync before this."
@@ -5966,152 +6752,153 @@ msgstr ""
 "ਇਸ ਫੋਲਡਰ ਲਈ ਕੋਈ ਖਾਤਾ ਸੈਟਅੱਪ ਨਹੀਂ ਕੀਤਾ ਹੈ।\n"
 "ਇਸ ਤੋਂ ਪਹਿਲਾਂ ਸਮਕਾਲੀ ਕਰਨ ਦੀ ਕੋਸ਼ਸ਼ ਕਰੋ ਜੀ।"
 
-#: kmfoldercachedimap.cpp:683
+#: kmfoldercachedimap.cpp:739
 msgid ""
 "Are you sure you want to refresh the IMAP cache of the folder %1 and all its "
 "subfolders?\n"
 "This will remove all changes you have done locally to your folders."
 msgstr ""
 
-#: kmfoldercachedimap.cpp:687 kmmainwidget.cpp:1352
+#: kmfoldercachedimap.cpp:743 kmmainwidget.cpp:1316
 msgid "Refresh IMAP Cache"
 msgstr "IMAP ਕੈਂਚੇ ਤਾਜ਼ਾ"
 
-#: kmfoldercachedimap.cpp:688 kmmainwidget.cpp:1352
+#: kmfoldercachedimap.cpp:744 kmmainwidget.cpp:1316
 msgid "&Refresh"
 msgstr "ਤਾਜ਼ਾ(&R)"
 
-#: kmfoldercachedimap.cpp:711
+#: kmfoldercachedimap.cpp:767
 msgid "The index of this folder has been recreated."
 msgstr "ਇਸ ਫੋਲਡਰ ਲਈ ਤਤਕਰਾ ਮੁੜ ਬਣਾਇਆ ਗਿਆ ਹੈ।"
 
-#: kmfoldercachedimap.cpp:721
+#: kmfoldercachedimap.cpp:777
 msgid ""
 "Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
 "to initial sync state and sync anyway?"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:721
+#: kmfoldercachedimap.cpp:777
 msgid "Reset && Sync"
 msgstr "ਮੁੜ-ਸੈੱਟ ਅਤੇ ਸਮਕਾਲੀ"
 
-#: kmfoldercachedimap.cpp:741
+#: kmfoldercachedimap.cpp:798
 msgid "Synchronization skipped"
 msgstr "ਸਮਕਾਲੀ ਕਾਰਵਾਈ ਛੱਡੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: kmfoldercachedimap.cpp:831
+#: kmfoldercachedimap.cpp:890
 msgid "Synchronizing"
 msgstr "ਸਮਕਾਲੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: kmfoldercachedimap.cpp:850
+#: kmfoldercachedimap.cpp:909
 #, c-format
 msgid "Connecting to %1"
 msgstr "%1 ਨਾਲ ਜੁੜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: kmfoldercachedimap.cpp:872
+#: kmfoldercachedimap.cpp:934
 msgid "Checking permissions"
 msgstr "ਅਧਿਕਾਰ ਦੀ ਜਾਂਚ ਜਾਰੀ ਹੈ"
 
-#: kmfoldercachedimap.cpp:886
+#: kmfoldercachedimap.cpp:956
 msgid "Renaming folder"
 msgstr "ਫੋਲਡਰ ਨਾਂ ਬਦਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: kmfoldercachedimap.cpp:948
+#: kmfoldercachedimap.cpp:1021
 msgid "Retrieving folderlist"
 msgstr "ਫੋਲਡਰ-ਲਿਸਟ ਲਈ ਜਾ ਰਹੀ ਹੈ"
 
-#: kmfoldercachedimap.cpp:952
+#: kmfoldercachedimap.cpp:1026
 msgid "Error while retrieving the folderlist"
 msgstr "ਫੋਲਡਰ-ਸੂਚੀ ਲੈਣ ਦੌਰਾਨ ਗਲਤੀ ਹੈ"
 
-#: kmfoldercachedimap.cpp:959
+#: kmfoldercachedimap.cpp:1035
 msgid "Retrieving subfolders"
 msgstr "ਸਬ-ਫੋਲਡਰ ਲਏ ਜਾ ਰਹੇ ਹਨ"
 
-#: kmfoldercachedimap.cpp:966
+#: kmfoldercachedimap.cpp:1043
 msgid "Deleting folders from server"
 msgstr "ਸਰਵਰ ਤੋਂ ਫੋਲਡਰ ਹਟਾਏ ਜਾ ਰਹੇ ਹਨ"
 
-#: kmfoldercachedimap.cpp:981
+#: kmfoldercachedimap.cpp:1058
 msgid "Retrieving message list"
 msgstr "ਸੁਨੇਹਾ ਲਿਸਟ ਲਈ ਜਾ ਰਹੀ ਹੈ"
 
-#: kmfoldercachedimap.cpp:994
+#: kmfoldercachedimap.cpp:1071
 msgid "No messages to delete..."
 msgstr "ਹਟਾਉਣ ਲਈ ਕੋਈ ਸੁਨੇਹਾ ਨਹੀਂ..."
 
-#: kmfoldercachedimap.cpp:1005
+#: kmfoldercachedimap.cpp:1082
 msgid "Expunging deleted messages"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:1019
-msgid "Retrieving new messages"
-msgstr "ਨਵੇਂ ਸੁਨੇਹੇ ਲਏ ਜਾ ਰਹੇ ਹਨ"
+#: kmfoldercachedimap.cpp:1096
+#, fuzzy, c-format
+msgid ""
+"_n: Retrieving one new message\n"
+"Retrieving %n new messages"
+msgstr ""
+"%1 ਵਿੱਚ ੧ ਨਵਾਂ ਸੁਨੇਹਾ\n"
+" %1 ਵਿੱਚ %n ਨਵੇਂ ਸੁਨੇਹੇ"
 
-#: kmfoldercachedimap.cpp:1031
+#: kmfoldercachedimap.cpp:1108
 msgid "No new messages from server"
 msgstr "ਸਰਵਰ ਉੱਤੇ ਕੋਈ ਨਵਾਂ ਸੁਨੇਹਾ ਨਹੀਂ ਹੈ"
 
-#: kmfoldercachedimap.cpp:1064
+#: kmfoldercachedimap.cpp:1141
 msgid "Checking annotation support"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:1111
+#: kmfoldercachedimap.cpp:1191
 msgid "Retrieving annotations"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:1133
+#: kmfoldercachedimap.cpp:1213
 msgid "Setting annotations"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:1174
+#: kmfoldercachedimap.cpp:1260
 msgid "Setting permissions"
 msgstr "ਅਧਿਕਾਰ ਸੈਟਿੰਗ"
 
-#: kmfoldercachedimap.cpp:1193
+#: kmfoldercachedimap.cpp:1279
 msgid "Retrieving permissions"
 msgstr "ਅਧਿਕਾਰ ਪ੍ਰਾਪਤ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: kmfoldercachedimap.cpp:1203
+#: kmfoldercachedimap.cpp:1306
 msgid "Getting quota information"
 msgstr "ਕੋਟਾ ਜਾਣਕਾਰੀ ਲਈ ਜਾ ਰਹੀ ਹੈ"
 
-#: kmfoldercachedimap.cpp:1218
-msgid "Updating cache file"
-msgstr "ਕੈਂਚੇ ਫਾਇਲ ਅੱਪਡੇਟ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
-
-#: kmfoldercachedimap.cpp:1244
+#: kmfoldercachedimap.cpp:1321
 msgid "Synchronization done"
 msgstr "ਸਮਕਾਲੀ ਕੀਤਾ ਗਿਆ"
 
-#: kmfoldercachedimap.cpp:1326
+#: kmfoldercachedimap.cpp:1464
 msgid "Uploading messages to server"
 msgstr "ਸੁਨੇਹੇ ਸਰਵਰ ਉੱਤੇ ਅੱਪਲੋਡ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: kmfoldercachedimap.cpp:1342
+#: kmfoldercachedimap.cpp:1480
 msgid ""
 "<p>Your access rights to folder <b>%1</b> have been restricted, it will no "
 "longer be possible to add messages to this folder.</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:1344
+#: kmfoldercachedimap.cpp:1482
 msgid "Acces rights revoked"
 msgstr "ਪਹੁੰਚ ਅਧਿਕਾਰ ਵਾਪਸ ਲਏ"
 
-#: kmfoldercachedimap.cpp:1347 kmfoldercachedimap.cpp:1402
-#: kmfoldercachedimap.cpp:1447
+#: kmfoldercachedimap.cpp:1485 kmfoldercachedimap.cpp:1545
+#: kmfoldercachedimap.cpp:1596
 msgid "No messages to upload to server"
 msgstr "ਸਰਵਰ ਉੱਤੇ ਅੱਪਲੋਡ ਕਰਨ ਲਈ ਕੋਈ ਸੁਨੇਹਾ ਨਹੀਂ"
 
-#: kmfoldercachedimap.cpp:1366 kmfoldercachedimap.cpp:1410
+#: kmfoldercachedimap.cpp:1504 kmfoldercachedimap.cpp:1553
 msgid "Uploading status of messages to server"
 msgstr "ਸਰਵਰ ਉੱਤੇ ਸੁਨੇਹਿਆਂ ਦੀ ਹਾਲਤ ਅੱਪਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: kmfoldercachedimap.cpp:1490
+#: kmfoldercachedimap.cpp:1647
 msgid "Creating subfolders on server"
 msgstr "ਸਰਵਰ ਉੱਤੇ ਸਬ-ਫੋਲਡਰ ਬਣਾਏ ਜਾ ਰਹੇ ਹਨ"
 
-#: kmfoldercachedimap.cpp:1546
+#: kmfoldercachedimap.cpp:1707
 msgid ""
 "<qt>"
 "<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
@@ -6119,24 +6906,24 @@ msgid ""
 "<br>UIDs: %2</p></qt>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:1558
+#: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
 msgstr "ਸਰਵਰ ਤੋਂ ਸੁਨੇਹੇ ਹਟਾਏ ਜਾ ਰਹੇ ਹਨ"
 
-#: kmfoldercachedimap.cpp:1592
+#: kmfoldercachedimap.cpp:1758
 msgid "Checking folder validity"
 msgstr "ਫੋਲਡਰ ਪਰਮਾਣਕਿਤਾ ਲਈ ਜਾਂਚ ਜਾਰੀ"
 
-#: kmfoldercachedimap.cpp:1806
+#: kmfoldercachedimap.cpp:1972
 msgid "Folder listing failed in interesting ways."
 msgstr ""
 
-#: kmfoldercachedimap.cpp:1888
+#: kmfoldercachedimap.cpp:2058
 #, c-format
 msgid "Retrieving folders for namespace %1"
 msgstr "ਨਾਂ-ਥਾਂ %1 ਲਈ ਫੋਲਡਰ ਲਏ ਜਾ ਰਹੇ ਹਨ"
 
-#: kmfoldercachedimap.cpp:2130
+#: kmfoldercachedimap.cpp:2300
 msgid ""
 "<qt>"
 "<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
@@ -6146,31 +6933,31 @@ msgstr ""
 "<p>ਇੰਝ ਜਾਪਦਾ ਹੈ ਕਿ ਫੋਲਡਰ <b>%1</b> ਹਟਾਇਆ ਗਿਆ ਸੀ। ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਸਰਵਰ ਤੋਂ "
 "ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?</p></qt>"
 
-#: kmfoldercachedimap.cpp:2411
+#: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
 msgstr "ਅਧੂਰਾ ਛੱਡਿਆ"
 
-#: kmfoldercachedimap.cpp:2592
+#: kmfoldercachedimap.cpp:2812
 msgid ""
 "The IMAP server %1 does not have support for IMAP annotations. The XML storage "
 "cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 
-#: kmfoldercachedimap.cpp:2620
+#: kmfoldercachedimap.cpp:2840
 msgid ""
 "The IMAP server %1 doesn't have support for imap annotations. The XML storage "
 "cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:2729
+#: kmfoldercachedimap.cpp:2951
 msgid "Error while setting annotation: "
 msgstr ""
 
-#: kmfoldercachedimap.cpp:2857 kmfoldercachedimap.cpp:2860
+#: kmfoldercachedimap.cpp:3079 kmfoldercachedimap.cpp:3082
 msgid "lost+found"
 msgstr "ਗੁਆਚੇ+ਲੱਭੇ"
 
-#: kmfoldercachedimap.cpp:2895
+#: kmfoldercachedimap.cpp:3117
 msgid ""
 "<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
 "the server yet, but the folder has been deleted on the server or you do not "
@@ -6179,11 +6966,11 @@ msgid ""
 "to avoid data loss.</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:2901
+#: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
 msgstr "ਅਧੂਰੇ ਪਹੁੰਚ ਅਧਿਕਾਰ"
 
-#: kmfoldercachedimap.cpp:2907
+#: kmfoldercachedimap.cpp:3129
 msgid ""
 "<p>There are new messages in this folder (%1), which have not been uploaded to "
 "the server yet, but the folder has been deleted on the server or you do not "
@@ -6193,55 +6980,62 @@ msgid ""
 "<p>Do you want to move these messages to another folder now?</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:2914 kmkernel.cpp:1801
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1903
 msgid "Do Not Move"
 msgstr "ਨਾ ਭੇਜੋ"
 
-#: kmfoldercachedimap.cpp:2916
+#: kmfoldercachedimap.cpp:3138
 msgid "Move Messages to Folder"
 msgstr "ਸੁਨੇਹੇ ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ"
 
-#: kmfolderdia.cpp:83
+#: kmfolderdia.cpp:84
 msgid "Permissions (ACL)"
 msgstr "ਅਧਿਕਾਰ (ACL)"
 
 #. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:121 rc.cpp:221 snippetwidget.cpp:119
+#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "ਸਧਾਰਨ"
 
-#: kmfolderdia.cpp:124
+#: kmfolderdia.cpp:125
 msgid "Templates"
 msgstr "ਨਮੂਨੇ"
 
-#: kmfolderdia.cpp:133
+#: kmfolderdia.cpp:134
 msgid "Access Control"
 msgstr "ਪਹੁੰਚ ਕੰਟਰੋਲ"
 
-#: kmfolderdia.cpp:140
+#: kmfolderdia.cpp:141
 msgid "Quota"
 msgstr "ਕੋਟਾ"
 
+#: kmfolderdia.cpp:327
+msgid ""
+"Not enough permissions to rename this folder.\n"
+"The parent folder doesn't have write support.\n"
+"A sync is needed after changing the permissions."
+msgstr ""
+
 #. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:299 rc.cpp:239
+#: kmfolderdia.cpp:356 rc.cpp:245
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "ਪਸੰਦੀਦਾ ਅਕਾਰ ਵਰਤੋਂ(&i)"
 
-#: kmfolderdia.cpp:304
+#: kmfolderdia.cpp:361
 msgid "&Normal:"
 msgstr "ਸਧਾਰਨ(&N):"
 
-#: kmfolderdia.cpp:319
+#: kmfolderdia.cpp:376
 msgid "&Unread:"
 msgstr "ਨਾ-ਪੜ੍ਹੇ(&U):"
 
-#: kmfolderdia.cpp:356
+#: kmfolderdia.cpp:413
 msgid "Act on new/unread mail in this folder"
 msgstr "ਇਸ ਫੋਲਡਰ ਵਿੱਚ ਨਵੇਂ/ਨਾ-ਪੜੇ ਪੱਤਰ ਉੱਤੇ ਕਾਰਵਾਈ"
 
-#: kmfolderdia.cpp:358
+#: kmfolderdia.cpp:415
 msgid ""
 "<qt>"
 "<p>If this option is enabled then you will be notified about new/unread mail in "
@@ -6253,49 +7047,49 @@ msgid ""
 "new/unread mail in your trash and spam folder.</p></qt>"
 msgstr ""
 
-#: kmfolderdia.cpp:374
+#: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
 msgstr "ਪੱਤਰ ਜਾਂਚ ਵਿੱਚ ਇਹ ਫੋਲਡਰ ਸ਼ਾਮਲ ਕਰੋ"
 
-#: kmfolderdia.cpp:385
+#: kmfolderdia.cpp:442
 msgid "Keep replies in this folder"
 msgstr "ਦਿੱਤੇ ਜਵਾਬ ਇਸ ਫੋਲਡਰ ਵਿੱਚ ਰੱਖੋ"
 
-#: kmfolderdia.cpp:387
+#: kmfolderdia.cpp:444
 msgid ""
 "Check this option if you want replies you write to mails in this folder to be "
 "put in this same folder after sending, instead of in the configured sent-mail "
 "folder."
 msgstr ""
 
-#: kmfolderdia.cpp:402
+#: kmfolderdia.cpp:459
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr ""
 
-#: kmfolderdia.cpp:404
+#: kmfolderdia.cpp:461
 msgid "Sho&w column:"
 msgstr "ਕਾਲਮ ਵੇਖਾਓ(&w):"
 
 #. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:411 kmheaders.cpp:181 kmheaders.cpp:243 kmheaders.cpp:378
-#: kmheaders.cpp:549 kmheaders.cpp:765 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:287
+#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
+#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
 #, no-c-format
 msgid "Sender"
 msgstr "ਭੇਜਣ ਵਾਲਾ"
 
 #. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:412 kmheaders.cpp:139 kmheaders.cpp:184 kmheaders.cpp:240
-#: kmheaders.cpp:245 kmheaders.cpp:380 kmheaders.cpp:551 kmheaders.cpp:767
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:290
+#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
+#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
+#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
 #, no-c-format
 msgid "Receiver"
 msgstr "ਪ੍ਰਾਪਤ ਕਰਤਾ"
 
-#: kmfolderdia.cpp:423
+#: kmfolderdia.cpp:480
 msgid "&Sender identity:"
 msgstr "ਭੇਜਣ ਵਾਲੇ ਦੀ ਪਛਾਣ(&S):"
 
-#: kmfolderdia.cpp:429
+#: kmfolderdia.cpp:486
 msgid ""
 "Select the sender identity to be used when writing new mail or replying to mail "
 "in this folder. This means that if you are in one of your work folders, you can "
@@ -6304,15 +7098,15 @@ msgid ""
 "configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 
-#: kmfolderdia.cpp:442
+#: kmfolderdia.cpp:500
 msgid "&Folder contents:"
 msgstr "ਫੋਲਡਰ ਹਿੱਸੇ(&F):"
 
-#: kmfolderdia.cpp:475
+#: kmfolderdia.cpp:533
 msgid "Generate free/&busy and activate alarms for:"
 msgstr ""
 
-#: kmfolderdia.cpp:482
+#: kmfolderdia.cpp:540
 msgid ""
 "This setting defines which users sharing this folder should get \"busy\" "
 "periods in their freebusy lists and should see the alarms for the events or "
@@ -6328,28 +7122,39 @@ msgid ""
 "is not known who will go to those events."
 msgstr ""
 
-#: kmfolderdia.cpp:497
+#: kmfolderdia.cpp:555
 msgid "Nobody"
 msgstr "ਕੋਈ ਨਹੀਂ"
 
-#: kmfolderdia.cpp:498
+#: kmfolderdia.cpp:556
 msgid "Admins of This Folder"
 msgstr "ਇਸ ਫੋਲਡਰ ਦਾ ਪਰਸ਼ਾਸ਼ਕ"
 
-#: kmfolderdia.cpp:499
+#: kmfolderdia.cpp:557
 msgid "All Readers of This Folder"
 msgstr "ਇਸ ਫੋਲਡਰ ਨੂੰ ਸਭ ਪੜਨ ਵਾਲੇ"
 
-#: kmfolderdia.cpp:502
+#: kmfolderdia.cpp:560
 msgid ""
 "This setting allows you to disable alarms for folders shared by others. "
 msgstr ""
 
-#: kmfolderdia.cpp:506
-msgid "Block free/&busy and alarms locally"
+#: kmfolderdia.cpp:562
+msgid "Block alarms locally"
+msgstr ""
+
+#: kmfolderdia.cpp:576
+msgid "Share unread state with all users"
 msgstr ""
 
-#: kmfolderdia.cpp:585
+#: kmfolderdia.cpp:579
+msgid ""
+"If enabled, the unread state of messages in this folder will be the same for "
+"all users having access to this folders. If disabled (the default), every user "
+"with access to this folder has her own unread state."
+msgstr ""
+
+#: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
 "general configuration option to hide groupware folders is set. That means that "
@@ -6358,88 +7163,88 @@ msgid ""
 "groupware folders to be able to see it."
 msgstr ""
 
-#: kmfolderdir.cpp:184
+#: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
 msgstr "<qt>ਫੋਲਡਰ <b>%1</b> ਵਿੱਚ ਦਾਖਲ ਨਹੀਂ ਹੋ ਸਕਦੇ।</qt>"
 
-#: kmfolderdir.cpp:192
+#: kmfolderdir.cpp:217
 msgid "<qt>Folder <b>%1</b> is unreadable.</qt>"
 msgstr "<qt>ਫੋਲਡਰ <b>%1</b> ਨਾ-ਪੜ੍ਹਨਯੋਗ ਹੈ।</qt>"
 
-#: kmfolderimap.cpp:251
+#: kmfolderimap.cpp:247
 msgid "Removing folder"
 msgstr "ਫੋਲਡਰ ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: kmfolderimap.cpp:252 searchjob.cpp:270
+#: kmfolderimap.cpp:248 searchjob.cpp:270
 #, c-format
 msgid "URL: %1"
 msgstr "URL: %1"
 
-#: kmfolderimap.cpp:267
+#: kmfolderimap.cpp:263
 msgid "Error while removing a folder."
 msgstr "ਇੱਕ ਫੋਲਡਰ ਹਟਾਉਣ ਦੌਰਾਨ ਗਲਤੀ ਹੈ।"
 
-#: kmfolderimap.cpp:497
+#: kmfolderimap.cpp:491
 #, c-format
 msgid "Destination folder: %1"
 msgstr "ਨਿਯਤ ਫੋਲਡਰ: %1"
 
-#: kmfolderimap.cpp:1068
+#: kmfolderimap.cpp:1069
 msgid "checking"
 msgstr "ਜਾਂਚ ਜਾਰੀ ਹੈ"
 
-#: kmfolderimap.cpp:1118
+#: kmfolderimap.cpp:1119
 msgid "Error while querying the server status."
 msgstr "ਸਰਵਰ ਹਾਲਤ ਦੀ ਕਿਊਰੀ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਹੈ।"
 
-#: kmfolderimap.cpp:1233
+#: kmfolderimap.cpp:1234
 msgid "Retrieving message status"
 msgstr "ਸੁਨੇਹਾ ਹਾਲਤ ਲਈ ਜਾ ਰਹੀ ਹੈ"
 
-#: kmfolderimap.cpp:1248 kmfolderimap.cpp:1343
+#: kmfolderimap.cpp:1249 kmfolderimap.cpp:1344
 msgid "Retrieving messages"
 msgstr "ਸੁਨੇਹੇ ਲਏ ਜਾ ਰਹੇ ਹਨ"
 
-#: kmfolderimap.cpp:1273
+#: kmfolderimap.cpp:1274
 #, c-format
 msgid "Error while listing the contents of the folder %1."
 msgstr "ਫੋਲਡਰ %1 ਦੇ ਭਾਗ ਪਰਾਪਤ ਸੂਚੀਬੱਧ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਹੈ।"
 
-#: kmfolderimap.cpp:1694
+#: kmfolderimap.cpp:1695
 msgid "Error while retrieving messages."
 msgstr "ਸੁਨੇਹੇ ਪਰਾਪਤ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਹੈ।"
 
-#: kmfolderimap.cpp:1763
+#: kmfolderimap.cpp:1764
 msgid "Error while creating a folder."
 msgstr "ਇੱਕ ਫੋਲਡਰ ਬਣਾਉਣ ਦੌਰਾਨ ਗਲਤੀ ਹੈ।"
 
-#: kmfolderimap.cpp:2130
+#: kmfolderimap.cpp:2131
 msgid "updating message counts"
 msgstr "ਸੁਨੇਹਾ ਗਿਣਤੀ ਅੱਪਡੇਟ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: kmfolderimap.cpp:2154
+#: kmfolderimap.cpp:2155
 msgid "Error while getting folder information."
 msgstr "ਫੋਲਡਰ ਜਾਣਕਾਰੀ ਪਰਾਪਤ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਹੈ।"
 
-#: kmfolderindex.cpp:334
+#: kmfolderindex.cpp:369
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
 "including status flags, may be lost. Do you wish to downgrade your index file?"
 msgstr ""
 
-#: kmfolderindex.cpp:337
+#: kmfolderindex.cpp:372
 msgid "Downgrade"
 msgstr "ਡਾਊਨਗਰੇਡ"
 
-#: kmfolderindex.cpp:337
+#: kmfolderindex.cpp:372
 msgid "Do Not Downgrade"
 msgstr "ਡਾਊਨਗਰੇਡ ਨਾ ਕਰੋ"
 
-#: kmfolderindex.cpp:491
+#: kmfolderindex.cpp:529
 msgid ""
 "The mail index for '%1' is corrupted and will be regenerated now, but some "
-"information, including status flags, will be lost."
+"information, like status flags, might get lost."
 msgstr ""
 
 #: kmfoldermaildir.cpp:89
@@ -6458,25 +7263,25 @@ msgstr ""
 msgid "Folder `%1' changed; recreating index."
 msgstr "ਫੋਲਡਰ `%1' ਤਬਦੀਲ ਹੋਇਆ ਹੈ; ਤਤਕਰਾ ਮੁੜ ਬਣਾਇਆ ਜਾ ਰਿਹਾ ਹੈ।"
 
-#: kmfoldermaildir.cpp:252
+#: kmfoldermaildir.cpp:253
 msgid "Could not sync maildir folder."
 msgstr "maildir ਫੋਲਡਰ ਸਮਕਾਲੀ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ।"
 
-#: kmfoldermaildir.cpp:417
+#: kmfoldermaildir.cpp:418
 msgid "Message could not be added to the folder, possibly disk space is low."
 msgstr ""
 "ਸੁਨੇਹਾ ਫੋਲਡਰ ਵਿੱਚ ਜੋੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ, ਸੰਭਵ ਤੌਰ 'ਤੇ ਡਿਸਕ ਥਾਂ ਭਰ ਗਈ ਹੈ।"
 
-#: kmfoldermaildir.cpp:510
+#: kmfoldermaildir.cpp:514
 msgid "KMFolderMaildir::addMsg: abnormally terminating to prevent data loss."
 msgstr ""
 "KMFolderMaildir::addMsg: ਡਾਟਾ ਖਰਾਬ ਹੋਣ ਤੋਂ ਬਚਣ ਲਈ ਅਧੂਰਾ ਬੰਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।"
 
-#: kmfoldermaildir.cpp:884 kmfoldermbox.cpp:794
+#: kmfoldermaildir.cpp:888 kmfoldermbox.cpp:799
 msgid "Writing index file"
 msgstr "ਤਤਕਰਾ ਫਾਇਲ ਲਿਖੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: kmfoldermaildir.cpp:892 kmfoldermbox.cpp:803
+#: kmfoldermaildir.cpp:896 kmfoldermbox.cpp:808
 msgid ""
 "Your outbox contains messages which were most-likely not created by KMail;\n"
 "please remove them from there if you do not want KMail to send them."
@@ -6484,7 +7289,7 @@ msgstr ""
 "ਤੁਹਾਡੇ ਆਉਟ-ਬਕਸੇ ਵਿੱਚ ਸੁਨੇਹੇ ਹਨ, ਜੋ ਕਿ ਕੇ-ਮੇਲ ਵਲੋਂ ਨਹੀਂ ਬਣਾਏ ਜਾਪਦੇ ਹਨ;\n"
 "ਜੇ ਤੁਸੀਂ ਚਾਹੁੰਦੇ ਹੋ ਕਿ ਕੇ-ਮੇਲ ਉਨ੍ਹਾਂ ਨੂੰ ਨਾ ਭੇਜੇ ਤਾਂ ਉਨ੍ਹਾਂ ਨੂੰ ਹਟਾ ਦਿਓ।"
 
-#: kmfoldermbox.cpp:111
+#: kmfoldermbox.cpp:112
 msgid ""
 "Cannot open file \"%1\":\n"
 "%2"
@@ -6492,7 +7297,7 @@ msgstr ""
 "\"%1\" ਫਾਇਲ ਨੂੰ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ:\n"
 "%2"
 
-#: kmfoldermbox.cpp:128
+#: kmfoldermbox.cpp:129
 msgid ""
 "<qt>"
 "<p>The index of folder '%2' seems to be out of date. To prevent message "
@@ -6503,23 +7308,23 @@ msgid ""
 "this problem from happening again.</p></qt>"
 msgstr ""
 
-#: kmfoldermbox.cpp:152 kmfoldermbox.cpp:158
+#: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
 msgstr "ਤਤਕਰਾ ਪੁਰਾਣਾ ਹੋ ਗਿਆ"
 
-#: kmfoldermbox.cpp:165
+#: kmfoldermbox.cpp:166
 msgid "Folder `%1' changed. Recreating index."
 msgstr "ਫੋਲਡਰ '%1' ਤਬਦੀਲ ਹੋ ਗਿਆ ਹੈ। ਤਤਕਰਾ ਮੁੜ ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।"
 
-#: kmfoldermbox.cpp:298
+#: kmfoldermbox.cpp:300
 msgid "Could not sync index file <b>%1</b>: %2"
 msgstr "ਤਤਕਰਾ ਫਾਇਲ <b>%1</b> ਨੂੰ ਸਮਕਾਲੀ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: %2"
 
-#: kmfoldermbox.cpp:298
+#: kmfoldermbox.cpp:300
 msgid "Internal error. Please copy down the details and report a bug."
 msgstr "ਅੰਦਰੂਨ ਗਲਤੀ। ਵੇਰਵੇ ਦੀ ਨਕਲ ਕਰ ਲਵੋ ਅਤੇ ਬੱਗ ਜਾਣਕਾਰੀ ਦਿਓ ਜੀ।"
 
-#: kmfoldermbox.cpp:597
+#: kmfoldermbox.cpp:602
 #, c-format
 msgid ""
 "_n: Creating index file: one message done\n"
@@ -6528,15 +7333,15 @@ msgstr ""
 "index ਫਾਇਲ ਬਣਾਈ ਜਾ ਰਹੀ ਹੈ। ਇੱਕ ਸੁਨੇਹਾ ਬਣਾਇਆ\n"
 "index ਫਾਇਲ ਬਣਾਈ ਜਾ ਰਹੀ ਹੈ। %n ਸੁਨੇਹੇ ਬਣਾਏ"
 
-#: kmfoldermbox.cpp:1038
+#: kmfoldermbox.cpp:1043
 msgid "Could not add message to folder: "
 msgstr "ਸੁਨੇਹੇ ਨੂੰ ਫੋਲਡਰ ਵਿੱਚ ਜੋੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: "
 
-#: kmfoldermbox.cpp:1119
+#: kmfoldermbox.cpp:1127
 msgid "Could not add message to folder:"
 msgstr "ਸੁਨੇਹੇ ਨੂੰ ਫੋਲਡਰ ਵਿੱਚ ਜੋੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ:"
 
-#: kmfoldermbox.cpp:1121
+#: kmfoldermbox.cpp:1129
 msgid "Could not add message to folder (No space left on device?)"
 msgstr "ਫੋਲਡਰ ਵਿੱਚ ਸੁਨੇਹੇ ਜੋੜੇ ਨਹੀਂ ਜਾ ਸਕੇ ਹਨ (ਕੀ ਜੰਤਰ ਉੱਤੇ ਖਾਲੀ ਥਾਂ ਬਚੀ ਹੈ?)"
 
@@ -6544,11 +7349,11 @@ msgstr "ਫੋਲਡਰ ਵਿੱਚ ਸੁਨੇਹੇ ਜੋੜੇ ਨਹੀ�
 msgid "Are you sure you want to expire old messages?"
 msgstr "ਕੀ ਤੁਸੀਂ ਪੁਰਾਣੇ ਸੁਨੇਹੇ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1366
+#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1330
 msgid "Expire Old Messages?"
 msgstr "ਕੀ ਪੁਰਾਣੇ ਸੁਨੇਹਿਆਂ ਦੀ ਮਿਆਦ ਪੁੱਗੀ?"
 
-#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1366
+#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1330
 msgid "Expire"
 msgstr "ਮਿਆਦ"
 
@@ -6560,7 +7365,7 @@ msgstr ""
 "'%1' ਇੱਕ ਫੋਲਡਰ ਨਹੀਂ ਜਾਪਦਾ ਹੈ।\n"
 "ਫਾਇਲ ਨੂੰ ਕਿਤੇ ਹੋਰ ਭੇਜ ਦਿਓ ਜੀ।"
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1325
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1368
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -6568,7 +7373,7 @@ msgstr ""
 "ਫੋਲਡਰ '%1' ਲਈ ਅਧਿਕਾਰ ਗਲਤ ਹਨ।\n"
 "ਜਾਂਚ ਕਰੋ ਕਿ ਤੁਸੀਂ ਇਹ ਫੋਲਡਰ ਦੇ ਭਾਗਾਂ ਨੂੰ ਵੇਖ ਅਤੇ ਸੋਧ ਸਕਦੇ ਹੋ।"
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1317
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1360
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -6587,7 +7392,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "ਫੋਲਡਰ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1611
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1676
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -6595,112 +7400,112 @@ msgstr ""
 "%2 ਵਿੱਚ ਫਾਇਲ `%1' ਨਹੀਂ ਬਣਾਈ ਜਾ ਸਕਦੀ ਹੈ।\n"
 "ਕੇਮੇਲ ਇਸ ਤੋਂ ਬਿਨਾਂ ਸ਼ੁਰੂ ਨਹੀਂ ਹੋ ਸਕਦੀ ਹੈ।"
 
-#: kmfolderseldlg.cpp:96 kmfolderseldlg.cpp:380 kmfolderseldlg.cpp:414
-#: kmfolderseldlg.cpp:416
-msgid "Path"
-msgstr "ਮਾਰਗ"
-
-#: kmfolderseldlg.cpp:283 kmfolderseldlg.cpp:445 kmfolderseldlg.cpp:465
-#: kmfoldertree.cpp:1056 kmfoldertree.cpp:1077
+#: kmfolderseldlg.cpp:25 kmfolderseldlg.cpp:47 kmfoldertree.cpp:1091
+#: kmfoldertree.cpp:1112 treebase.cpp:99
 msgid "&New Subfolder..."
 msgstr "ਨਵਾਂ ਸਬ-ਫੋਲਡਰ(&N)..."
 
-#: kmfolderseldlg.cpp:446 kmfolderseldlg.cpp:466
+#: kmfolderseldlg.cpp:26 kmfolderseldlg.cpp:48
 msgid "Create a new subfolder under the currently selected folder"
 msgstr "ਮੌਜੂਦਾ ਚੁਣੇ ਫੋਲਡਰ ਹੇਠ ਇੱਕ ਨਵਾਂ ਅਧੀਨ-ਫੋਲਡਰ ਬਣਾਓ"
 
-#: kmfoldertree.cpp:386 kmheaders.cpp:128
+#: kmfolderseldlg.cpp:36 kmfolderseldlg.cpp:55
+msgid "You can start typing to filter the list of folders"
+msgstr ""
+
+#: kmfoldertree.cpp:407 kmheaders.cpp:130
 msgid "View Columns"
 msgstr "ਕਾਲਮ ਵੇਖੋ"
 
-#: kmfoldertree.cpp:388
+#: kmfoldertree.cpp:409
 msgid "Unread Column"
 msgstr "ਨਾ-ਪੜ੍ਹਿਆ ਕਾਲਮ"
 
-#: kmfoldertree.cpp:389
+#: kmfoldertree.cpp:410
 msgid "Total Column"
 msgstr "ਕੁੱਲ ਕਾਲਮ"
 
-#: kmfoldertree.cpp:390
+#: kmfoldertree.cpp:411
 #, fuzzy
 msgid "Size Column"
 msgstr "ਕਾਲਮ ਵੇਖੋ"
 
-#: kmfoldertree.cpp:567 kmfoldertree.cpp:1059
+#: kmfoldertree.cpp:591 kmfoldertree.cpp:1094
 msgid "Searches"
 msgstr "ਖੋਜਾਂ"
 
-#: kmfoldertree.cpp:884
+#: kmfoldertree.cpp:920
 msgid "<qt>Go to the next unread message in folder <b>%1</b>?</qt>"
 msgstr "<qt>ਕੀ ਫੋਲਡਰ <b>%1</b> ਵਿੱਚ ਅੱਗੇ ਨਾ-ਪੜ੍ਹੇ ਸੁਨੇਹੇ ਉੱਤੇ ਜਾਣਾ ਹੈ?</qt>"
 
-#: kmfoldertree.cpp:886
+#: kmfoldertree.cpp:922
 msgid "Go to Next Unread Message"
 msgstr "ਅੱਗੇ ਨਾ-ਪੜ੍ਹੇ ਸੁਨੇਹੇ ਉੱਤੇ ਜਾਓ"
 
-#: kmfoldertree.cpp:887
+#: kmfoldertree.cpp:923
 msgid "Go To"
 msgstr "ਜਾਓ"
 
-#: kmfoldertree.cpp:887
+#: kmfoldertree.cpp:923
 msgid "Do Not Go To"
 msgstr "ਨਾ ਜਾਓ"
 
-#: kmfoldertree.cpp:1057 kmmainwidget.cpp:2757
+#: kmfoldertree.cpp:1092 kmmainwidget.cpp:2780
 msgid "&New Folder..."
 msgstr "ਨਵਾਂ ਫੋਲਡਰ(&N)..."
 
-#: kmfoldertree.cpp:1068 kmmainwidget.cpp:2645
+#: kmfoldertree.cpp:1103 kmmainwidget.cpp:2668
 msgid "Check &Mail"
 msgstr "ਪੱਤਰ ਜਾਂਚ(&M)"
 
-#: kmfoldertree.cpp:1084
+#: kmfoldertree.cpp:1119
 msgid "&Copy Folder To"
 msgstr "ਫੋਲਡਰ ਨਕਲ ਕਰੋ(&C)"
 
-#: kmfoldertree.cpp:1090
+#: kmfoldertree.cpp:1125
 msgid "&Move Folder To"
 msgstr "ਫੋਲਡਰ 'ਚ ਭੇਜੋ(&M)"
 
-#: kmfoldertree.cpp:1104
+#: kmfoldertree.cpp:1141
 #, fuzzy
 msgid "Add to Favorite Folders"
 msgstr "ਮਿਆਰੀ ਗਰੁੱਪਵੇਅਰ ਫੋਲਡਰ"
 
-#: kmfoldertree.cpp:1123
-msgid "Subscription..."
+#: kmfoldertree.cpp:1160
+#, fuzzy
+msgid "Serverside Subscription..."
 msgstr "ਮੈਂਬਰੀ..."
 
-#: kmfoldertree.cpp:1126
+#: kmfoldertree.cpp:1163
 msgid "Local Subscription..."
 msgstr "ਲੋਕਲ ਮੈਂਬਰੀ..."
 
-#: kmfoldertree.cpp:1133
+#: kmfoldertree.cpp:1170
 msgid "Refresh Folder List"
 msgstr "ਫੋਲਡਰ ਸੂਚੀ ਤਾਜ਼ਾ ਕਰੋ"
 
-#: kmfoldertree.cpp:1140 kmmainwidget.cpp:3737
+#: kmfoldertree.cpp:1177 kmmainwidget.cpp:3771
 msgid "&Troubleshoot IMAP Cache..."
 msgstr "IMAP ਕੈਚੇ ਸਮੱਸਿਆ ਨਿਪਟਾਰਾ(&T)..."
 
-#: kmfoldertree.cpp:1242
+#: kmfoldertree.cpp:1280
 msgid ""
-"<qt>Cannot create folder <b>%1</b> because of insufficient permissions on the "
-"server. If you think you should be able to create subfolders here, ask your "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
+"the server. If you think you should be able to create subfolders here, ask your "
 "administrator to grant you rights to do so.</qt> "
 msgstr ""
 
-#: kmfoldertree.cpp:1657 kmmainwidget.cpp:420 kmmainwidget.cpp:427
-#: kmmainwidget.cpp:434 kmsearchpattern.h:220
+#: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
+#: kmmainwidget.cpp:426 kmsearchpattern.h:220
 msgid "Unread"
 msgstr "ਨਾ-ਪੜ੍ਹੇ"
 
-#: kmfoldertree.cpp:1670 kmmainwidget.cpp:422 kmmainwidget.cpp:429
-#: kmmainwidget.cpp:436
+#: kmfoldertree.cpp:1708 kmmainwidget.cpp:414 kmmainwidget.cpp:421
+#: kmmainwidget.cpp:428
 msgid "Total"
 msgstr "ਕੁੱਲ"
 
-#: kmfoldertree.cpp:1951
+#: kmfoldertree.cpp:1989
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same "
 "name already exists.</qt>"
@@ -6708,71 +7513,76 @@ msgstr ""
 "<qt>ਫੋਲਡਰ <b>%1</b> ਨੂੰ ਇੱਥੇ ਨਕਲ ਕੀਤਾ ਜਾਂ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ, ਕਿਉਂਕਿ ਇਸ ਨਾਂ "
 "ਨਾਲ ਫੋਲਡਰ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ।</qt>"
 
-#: kmfoldertree.cpp:1961
+#: kmfoldertree.cpp:2000
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> because it is not completely copied "
 "itself.</qt>"
 msgstr ""
 
-#: kmfoldertree.cpp:1970
+#: kmfoldertree.cpp:2010
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>"
 msgstr ""
 
-#: kmfoldertree.cpp:2012
+#: kmfoldertree.cpp:2055
 msgid "Moving the selected folders is not possible"
 msgstr "ਚੁਣੇ ਫੋਲਡਰ ਭੇਜਣੇ ਸੰਭਵ ਨਹੀਂ ਹਨ"
 
-#: kmheaders.cpp:130
+#: kmheaders.cpp:132
 msgid "Status"
 msgstr "ਹਾਲਤ"
 
-#: kmheaders.cpp:131 kmsearchpattern.h:218
+#: kmheaders.cpp:133 kmsearchpattern.h:218
 msgid "Important"
 msgstr "ਖਾਸ"
 
-#: kmheaders.cpp:132
+#: kmheaders.cpp:134
 msgid "Action Item"
 msgstr ""
 
-#: kmheaders.cpp:133
+#: kmheaders.cpp:135
 msgid "Attachment"
 msgstr "ਨੱਥੀ"
 
-#: kmheaders.cpp:134
+#: kmheaders.cpp:136 kmsearchpattern.h:233
+#, fuzzy
+msgid "Invitation"
+msgstr "ਦਸਤਾਵੇਜ਼"
+
+#: kmheaders.cpp:137
 msgid "Spam/Ham"
 msgstr "ਸਮਪ/ਹਮ"
 
-#: kmheaders.cpp:135
+#: kmheaders.cpp:138
 msgid "Watched/Ignored"
 msgstr "ਵੇਖਿਆ/ਅਣਡਿੱਠਾ"
 
-#: kmheaders.cpp:136
+#: kmheaders.cpp:139
 msgid "Signature"
 msgstr "ਦਸਤਖਤ"
 
-#: kmheaders.cpp:180 kmheaders.cpp:775 kmheaders.cpp:2604
-#: kmpopfiltercnfrmdlg.cpp:39 searchwindow.cpp:224
-#: templatesinsertcommand.cpp:142 templatesinsertcommand.cpp:243
+#: kmheaders.cpp:184 kmheaders.cpp:804 kmheaders.cpp:2646
+#: kmpopfiltercnfrmdlg.cpp:39 kmsearchpatternedit.cpp:41 searchwindow.cpp:223
+#: templatesinsertcommand.cpp:145 templatesinsertcommand.cpp:246
 msgid "Subject"
 msgstr "ਵਿਸ਼ਾ"
 
-#: kmheaders.cpp:182 kmheaders.cpp:770 kmheaders.cpp:2599
-#: kmpopfiltercnfrmdlg.cpp:42 searchwindow.cpp:228
-#: templatesinsertcommand.cpp:66 templatesinsertcommand.cpp:167
+#: kmheaders.cpp:186 kmheaders.cpp:799 kmheaders.cpp:2641
+#: kmpopfiltercnfrmdlg.cpp:42 searchwindow.cpp:227
+#: templatesinsertcommand.cpp:66 templatesinsertcommand.cpp:170
 msgid "Date"
 msgstr "ਮਿਤੀ"
 
-#: kmheaders.cpp:772 kmheaders.cpp:2601
+#: kmheaders.cpp:801 kmheaders.cpp:2643
 #, fuzzy
 msgid "Order of Arrival"
 msgstr "ਮਿਤੀ (ਆਉਣ ਕ੍ਰਮ)"
 
-#: kmheaders.cpp:777 kmheaders.cpp:2606
+#: kmheaders.cpp:806 kmheaders.cpp:2648
 msgid " (Status)"
 msgstr " (ਹਾਲਤ)"
 
-#: kmheaders.cpp:1360
+#: kmheaders.cpp:1398
 #, c-format
 msgid ""
 "_n: 1 unsent\n"
@@ -6781,11 +7591,11 @@ msgstr ""
 "1 ਨਾ-ਭੇਜਿਆ\n"
 "%n ਨਾ-ਭੇਜੇ"
 
-#: kmheaders.cpp:1360
+#: kmheaders.cpp:1398
 msgid "0 unsent"
 msgstr "0 ਨਾ-ਭੇਜੇ"
 
-#: kmheaders.cpp:1362
+#: kmheaders.cpp:1400
 #, c-format
 msgid ""
 "_n: 1 unread\n"
@@ -6794,11 +7604,11 @@ msgstr ""
 "੧ ਨਾ-ਪੜ੍ਹਿਆ\n"
 "%n ਨਾ-ਪੜ੍ਹੇ"
 
-#: kmheaders.cpp:1362
+#: kmheaders.cpp:1400
 msgid "0 unread"
 msgstr "0 ਨਾ-ਪੜ੍ਹੇ"
 
-#: kmheaders.cpp:1364
+#: kmheaders.cpp:1402
 msgid ""
 "_n: 1 message, %1.\n"
 "%n messages, %1."
@@ -6806,17 +7616,17 @@ msgstr ""
 "੧ ਸੁਨੇਹਾ, %1\n"
 "%n ਸੁਨੇਹੇ, %1"
 
-#: kmheaders.cpp:1365
+#: kmheaders.cpp:1403
 msgid "0 messages"
 msgstr "0 ਸੁਨੇਹੇ"
 
-#: kmheaders.cpp:1367
+#: kmheaders.cpp:1405
 msgid ""
 "_: %1 = n messages, m unread.\n"
 "%1 Folder is read-only."
 msgstr "%1 ਫੋਲਡਰ ਸਿਰਫ਼ ਪੜ੍ਹਨ ਲਈ ਹੈ।"
 
-#: kmheaders.cpp:1560
+#: kmheaders.cpp:1598
 #, c-format
 msgid ""
 "_n: <qt>Do you really want to delete the selected message?"
@@ -6825,49 +7635,49 @@ msgid ""
 "<br>Once deleted, they cannot be restored.</qt>"
 msgstr ""
 
-#: kmheaders.cpp:1562
+#: kmheaders.cpp:1600
 msgid "Delete Messages"
 msgstr "ਸੁਨੇਹੇ ਹਟਾਓ"
 
-#: kmheaders.cpp:1562
+#: kmheaders.cpp:1600
 msgid "Delete Message"
 msgstr "ਸੁਨੇਹਾ ਹਟਾਓ"
 
-#: kmheaders.cpp:1586
+#: kmheaders.cpp:1624
 msgid "Messages deleted successfully."
 msgstr "ਸੁਨੇਹੇ ਸਫਲਤਾਪੂਰਕ ਹਟਾਏ ਗਏ ਹਨ।"
 
-#: kmheaders.cpp:1586
+#: kmheaders.cpp:1624
 msgid "Messages moved successfully"
 msgstr "ਸੁਨੇਹੇ ਸਫਲਤਾਪੂਰਕ ਹਟਾਏ ਗਏ"
 
-#: kmheaders.cpp:1609
+#: kmheaders.cpp:1647
 msgid "Deleting messages failed."
 msgstr "ਸੁਨੇਹੇ ਹਟਾਉਣੇ ਅਸਫ਼ਲ ਹੈ।"
 
-#: kmheaders.cpp:1609
+#: kmheaders.cpp:1647
 msgid "Moving messages failed."
 msgstr "ਸੁਨੇਹੇ ਭੇਜਣਾ ਅਸਫਲ ਹੈ।"
 
-#: kmheaders.cpp:1612
+#: kmheaders.cpp:1650
 msgid "Deleting messages canceled."
 msgstr "ਸੁਨੇਹੇ ਹਟਾਉਣੇ ਰੱਦ ਕੀਤੇ ਗਏ ਹਨ।"
 
-#: kmheaders.cpp:1612
+#: kmheaders.cpp:1650
 msgid "Moving messages canceled."
 msgstr "ਸੁਨੇਹੇ ਭੇਜਣਾ ਰੱਦ ਕੀਤਾ ਹੈ।"
 
-#: kmheaders.cpp:2431 kmmainwidget.cpp:2977 kmreadermainwin.cpp:470
-#: searchwindow.cpp:833
+#: kmheaders.cpp:2470 kmmainwidget.cpp:2989 kmreadermainwin.cpp:508
+#: searchwindow.cpp:856
 msgid "&Copy To"
 msgstr "ਨਕਲ(&C)"
 
-#: kmheaders.cpp:2434 kmheaders.cpp:2440 kmmainwidget.cpp:2974
-#: searchwindow.cpp:834
+#: kmheaders.cpp:2473 kmheaders.cpp:2479 kmmainwidget.cpp:2986
+#: searchwindow.cpp:857
 msgid "&Move To"
 msgstr "ਇਸ ਤੇ ਭੇਜੋ(&M)"
 
-#: kmheaders.cpp:2774 kmheaders.cpp:2814
+#: kmheaders.cpp:2818 kmheaders.cpp:2858
 msgid ""
 "Failure modifying %1\n"
 "(No space left on device?)"
@@ -6875,85 +7685,97 @@ msgstr ""
 "%1 ਸੋਧ ਕਰਨੀ ਅਸਫ਼ਲ ਹੈ\n"
 "(ਕੀ ਜੰਤਰ ਉੱਤੇ ਕੋਈ ਖਾਲੀ ਥਾਂ ਬਚੀ ਹੈ?)"
 
-#: kmkernel.cpp:684
+#: kmkernel.cpp:712
 msgid "Certificate Signature Request"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਦਸਤਖਤ ਬੇਨਤੀ"
 
-#: kmkernel.cpp:687
+#: kmkernel.cpp:715
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "ਨੱਥੀ ਤੋਂ ਇੱਕ ਸਰਟੀਫਿਕੇਟ ਬਣਾਓ ਅਤੇ ਭੇਜਣ ਵਾਲੇ ਨੂੰ ਵਾਪਸ ਕਰੋ ਜੀ।"
 
-#: kmkernel.cpp:1210
+#: kmkernel.cpp:1246
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "ਕੇ-ਮੇਲ ਆਫਲਾਇਨ ਹੋਣ ਲਈ ਤਿਆਰ ਕੀਤੀ ਗਈ ਹੈ, ਸਭ ਨੈੱਟਵਰਕ ਕੰਮ ਸਸਪੈਂਡ ਕੀਤੇ ਜਾਣਗੇ।"
 
-#: kmkernel.cpp:1220
+#: kmkernel.cpp:1256
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "ਕੇ-ਮੇਲ ਆਨ-ਲਾਇਨ ਹੋਣ ਲਈ ਤਿਆਰ ਕੀਤੀ ਗਈ ਹੈ, ਸਭ ਨੈੱਟਵਰਕ ਕੰਮ ਮੁੜ-ਲਏ ਜਾਣਗੇ।"
 
-#: kmkernel.cpp:1241
+#: kmkernel.cpp:1283
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "ਕੇ-ਮੇਲ ਇਸ ਸਮੇਂ ਆਫਲਾਇਨ ਹੈ। ਤੁਸੀਂ ਕੀ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: kmkernel.cpp:1244 kmmainwidget.cpp:1899
+#: kmkernel.cpp:1286 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "ਆਨਲਾਇਨ ਜਾਓ"
 
-#: kmkernel.cpp:1245 kmmainwidget.cpp:1897
+#: kmkernel.cpp:1287 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "ਆਫਲਾਇਨ ਹੀ ਚੱਲੋ"
 
-#: kmkernel.cpp:1379
+#: kmkernel.cpp:1429
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "ਤੁਹਾਨੂੰ ਆਪਣੇ ਆਉਣ-ਬਕਸੇ ਫੋਲਡਰ ਵਿੱਚ ਪੜ੍ਹਨ/ਲਿਖਣ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ।"
 
-#: kmkernel.cpp:1387
+#: kmkernel.cpp:1437
 msgid "outbox"
 msgstr "ਬਾਹਰੀ-ਬਕਸਾ"
 
-#: kmkernel.cpp:1389
+#: kmkernel.cpp:1439
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "ਤੁਹਾਨੂੰ ਆਪਣੇ ਆਉਟ-ਬਕਸੇ ਫੋਲਡਰ ਵਿੱਚ ਪੜ੍ਹਨ/ਲਿਖਣ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ।"
 
-#: kmkernel.cpp:1406
+#: kmkernel.cpp:1456
 msgid "sent-mail"
 msgstr "ਭੇਜੇ-ਪੱਤਰ"
 
-#: kmkernel.cpp:1408
+#: kmkernel.cpp:1458
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "ਤੁਹਾਨੂੰ ਆਪਣੇ ਪੱਤਰ-ਭੇਜੇ ਫੋਲਡਰ ਵਿੱਚ ਪੜ੍ਹਨ/ਲਿਖਣ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ।"
 
-#: kmkernel.cpp:1415
+#: kmkernel.cpp:1465
 msgid "trash"
 msgstr "ਰੱਦੀ"
 
-#: kmkernel.cpp:1417
+#: kmkernel.cpp:1467
 msgid "You do not have read/write permission to your trash folder."
 msgstr "ਤੁਹਾਨੂੰ ਆਪਣੇ ਰੱਦੀ ਫੋਲਡਰ ਵਿੱਚ ਪੜ੍ਹਨ/ਲਿਖਣ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ।"
 
-#: kmkernel.cpp:1424
+#: kmkernel.cpp:1474
 msgid "drafts"
 msgstr "ਡਰਾਫਟ"
 
-#: kmkernel.cpp:1426
+#: kmkernel.cpp:1476
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "ਤੁਹਾਨੂੰ ਆਪਣੇ ਡਰਾਫਟ ਫੋਲਡਰ ਵਿੱਚ ਪੜ੍ਹਨ/ਲਿਖਣ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ।"
 
-#: kmkernel.cpp:1435
+#: kmkernel.cpp:1485
 msgid "templates"
 msgstr "ਨਮੂਨੇ"
 
-#: kmkernel.cpp:1437
+#: kmkernel.cpp:1487
 msgid "You do not have read/write permission to your templates folder."
 msgstr ""
 
-#: kmkernel.cpp:1480 searchwindow.cpp:255 searchwindow.cpp:490
-#: searchwindow.cpp:633
+#: kmkernel.cpp:1531 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "ਆਖਰੀ ਖੋਜ"
 
-#: kmkernel.cpp:1777
+#: kmkernel.cpp:1716
+msgid ""
+"There is a problem with the mail index of the following folders, the indices "
+"will now be regenerated.\n"
+"This can happen because the index files are out of date, missing or corrupted.\n"
+"Contact your administrator if this happens frequently.\n"
+"Some information, like status flags, might get lost."
+msgstr ""
+
+#: kmkernel.cpp:1721
+msgid "Problem with mail indices"
+msgstr ""
+
+#: kmkernel.cpp:1879
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
 "<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
@@ -6963,7 +7785,7 @@ msgid ""
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1789
+#: kmkernel.cpp:1891
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
 "<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
@@ -6972,15 +7794,15 @@ msgid ""
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1798
+#: kmkernel.cpp:1900
 msgid "Migrate Mail Files?"
 msgstr ""
 
-#: kmkernel.cpp:2023
+#: kmkernel.cpp:2135
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "ਕੇਮੇਲ ਨੂੰ ਹੁਣੇ ਘਾਤਕ ਗਲਤੀ ਆਈ ਹੈ ਅਤੇ ਹੁਣ ਬੰਦ ਹੋ ਰਹੀ ਹੈ"
 
-#: kmkernel.cpp:2025
+#: kmkernel.cpp:2137
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -6991,75 +7813,75 @@ msgstr ""
 "ਗਲਤੀ ਸੀ:\n"
 "%1"
 
-#: kmkernel.cpp:2158 kmmainwidget.cpp:1176
+#: kmkernel.cpp:2270 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "ਰੱਦੀ ਖਾਲੀ ਕਰੋ"
 
-#: kmkernel.cpp:2159
+#: kmkernel.cpp:2271
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "ਕੀ ਤੁਸੀਂ ਸਭ ਖਾਤਿਆਂ ਲਈ ਰੱਦੀ ਫੋਲਡਰ ਖਾਲੀ ਕਰਨੇ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: kmlineeditspell.cpp:105
+#: kmlineeditspell.cpp:134
 msgid "vCard Import Failed"
 msgstr "vCard ਆਯਾਤ ਅਸਫ਼ਲ ਹੋਇਆ ਹੈ"
 
-#: kmlineeditspell.cpp:116
+#: kmlineeditspell.cpp:135
 msgid "<qt>Unable to access <b>%1</b>.</qt>"
 msgstr "<qt><b>%1</b> ਨੂੰ ਵਰਤਣ ਲਈ ਅਸਫ਼ਲ ਹੈ।</qt>"
 
-#: kmlineeditspell.cpp:168 recipientspicker.cpp:578
+#: kmlineeditspell.cpp:194 recipientspicker.cpp:578
 msgid "Recent Addresses"
 msgstr "ਤਾਜ਼ੇ ਸਨੇਹੀ"
 
-#: kmmainwidget.cpp:611
+#: kmmainwidget.cpp:601
 msgid "S&earch:"
 msgstr "ਖੋਜ(&e):"
 
-#: kmmainwidget.cpp:674 kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:664 kmmainwidget.cpp:1686
 msgid "Move Message to Folder"
 msgstr "ਸੁਨੇਹੇ ਨੂੰ ਫੋਲਡਰ 'ਚ ਭੇਜੋ"
 
-#: kmmainwidget.cpp:679 kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:669 kmmainwidget.cpp:1795
 msgid "Copy Message to Folder"
 msgstr "ਸੁਨੇਹੇ ਨੂੰ ਫੋਲਡਰ 'ਚ ਨਕਲ"
 
-#: kmmainwidget.cpp:684 kmmainwidget.cpp:1697
+#: kmmainwidget.cpp:674 kmmainwidget.cpp:1674
 msgid "Jump to Folder"
 msgstr "ਫੋਲਡਰ ਉੱਤੇ ਜਾਓ"
 
-#: kmmainwidget.cpp:743
+#: kmmainwidget.cpp:717
 msgid "Remove Duplicate Messages"
 msgstr "ਦੂਹਰੇ ਸੁਨੇਹੇ ਹਟਾਓ"
 
-#: kmmainwidget.cpp:748
+#: kmmainwidget.cpp:722
 msgid "Abort Current Operation"
 msgstr "ਮੌਜੂਦਾ ਕਾਰਵਾਈ ਅਧੂਰੀ ਛੱਡੋ"
 
-#: kmmainwidget.cpp:753
+#: kmmainwidget.cpp:727
 msgid "Focus on Next Folder"
 msgstr "ਅਗਲੇ ਫੋਲਡਰ ਉੱਤੇ ਫੋਕਸ"
 
-#: kmmainwidget.cpp:758
+#: kmmainwidget.cpp:732
 msgid "Focus on Previous Folder"
 msgstr "ਪਿਛਲੇ ਫੋਲਡਰ ਉੱਤੇ ਫੋਕਸ"
 
-#: kmmainwidget.cpp:763
+#: kmmainwidget.cpp:737
 msgid "Select Folder with Focus"
 msgstr "ਚੁਣੋ ਫੋਲਡਰ ਨਾਲ ਫੋਕਸ"
 
-#: kmmainwidget.cpp:768
+#: kmmainwidget.cpp:742
 msgid "Focus on Next Message"
 msgstr "ਅਗਲੇ ਸੁਨੇਹੇ ਉੱਤੇ ਫੋਕਸ"
 
-#: kmmainwidget.cpp:773
+#: kmmainwidget.cpp:747
 msgid "Focus on Previous Message"
 msgstr "ਪਿਛਲੇ ਸੁਨੇਹੇ ਉੱਤੇ ਫੋਕਸ"
 
-#: kmmainwidget.cpp:778
+#: kmmainwidget.cpp:752
 msgid "Select Message with Focus"
 msgstr "ਕੇਂਦਰ ਨਾਲ ਸੁਨੇਹੇ ਚੁਣੋ"
 
-#: kmmainwidget.cpp:977
+#: kmmainwidget.cpp:951
 msgid ""
 "_n: 1 new message in %1\n"
 "%n new messages in %1"
@@ -7067,76 +7889,88 @@ msgstr ""
 "%1 ਵਿੱਚ ੧ ਨਵਾਂ ਸੁਨੇਹਾ\n"
 " %1 ਵਿੱਚ %n ਨਵੇਂ ਸੁਨੇਹੇ"
 
-#: kmmainwidget.cpp:993
+#: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
 "<b>New mail arrived</b>"
 "<br>%1"
 msgstr "<b>ਨਵਾਂ ਪੱਤਰ ਆਇਆ ਹੈ</b> <br>%1"
 
-#: kmmainwidget.cpp:997
+#: kmmainwidget.cpp:971
 msgid "New mail arrived"
 msgstr "ਨਵੀਂ ਮੇਲ ਆਈ ਹੈ"
 
-#: kmmainwidget.cpp:1128
+#: kmmainwidget.cpp:1100
 #, c-format
 msgid "Properties of Folder %1"
 msgstr "ਫੋਲਡਰ %1 ਦੀ ਵਿਸ਼ੇਸ਼ਤਾ"
 
-#: kmmainwidget.cpp:1149
+#: kmmainwidget.cpp:1124
 msgid "This folder does not have any expiry options set"
 msgstr "ਇਹ ਫੋਲਡਰ ਲਈ ਕੋਈ ਮਿਆਦ ਚੋਣ ਨਹੀਂ ਦਿੱਤੀ ਗਈ ਹੈ।"
 
-#: kmmainwidget.cpp:1157
+#: kmmainwidget.cpp:1132
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr ""
 
-#: kmmainwidget.cpp:1158
+#: kmmainwidget.cpp:1133
 msgid "Expire Folder"
 msgstr "ਫੋਲਡਰ ਮਿਆਦ"
 
-#: kmmainwidget.cpp:1159
+#: kmmainwidget.cpp:1134
 msgid "&Expire"
 msgstr "ਮਿਆਦ(&E)"
 
-#: kmmainwidget.cpp:1176
+#: kmmainwidget.cpp:1151
 msgid "Move to Trash"
 msgstr "ਰੱਦੀ ਵਿੱਚ ਭੇਜੋ"
 
-#: kmmainwidget.cpp:1178
+#: kmmainwidget.cpp:1153
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਫੋਲਡਰ ਨੂੰ ਰੱਦੀ ਵਿੱਚ ਭੇਜਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: kmmainwidget.cpp:1179
+#: kmmainwidget.cpp:1154
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> "
 "to the trash?</qt>"
 msgstr ""
 "<qt>ਕੀ ਤੁਸੀਂ <b>%1</b> ਫੋਲਡਰ ਤੋਂ ਸਭ ਸੁਨੇਹੇ ਰੱਦੀ 'ਚ ਭੇਜਣ ਲਈ ਸਹਿਮਤ ਹੋ?</qt>"
 
-#: kmmainwidget.cpp:1198
+#: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
 msgstr "ਸਭ ਸੁਨੇਹੇ ਰੱਦੀ 'ਚ ਭੇਜੋ"
 
-#: kmmainwidget.cpp:1220
+#: kmmainwidget.cpp:1200
+msgid ""
+"It is not possible to delete this folder right now because it is being "
+"syncronized. Please wait until the syncronization of this folder is complete "
+"and then try again."
+msgstr ""
+
+#: kmmainwidget.cpp:1203
+#, fuzzy
+msgid "Unable to delete folder"
+msgstr "ਫੋਲਡਰ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ"
+
+#: kmmainwidget.cpp:1209
 msgid "Delete Search"
 msgstr "ਖੋਜ ਹਟਾਓ"
 
-#: kmmainwidget.cpp:1221
+#: kmmainwidget.cpp:1210
 msgid ""
 "<qt>Are you sure you want to delete the search <b>%1</b>?"
 "<br>Any messages it shows will still be available in their original folder.</qt>"
 msgstr ""
 
-#: kmmainwidget.cpp:1225
+#: kmmainwidget.cpp:1214
 msgid "Delete Folder"
 msgstr "ਫੋਲਡਰ ਹਟਾਓ"
 
-#: kmmainwidget.cpp:1228
+#: kmmainwidget.cpp:1217
 msgid "<qt>Are you sure you want to delete the empty folder <b>%1</b>?</qt>"
 msgstr "<qt>ਕੀ ਤੁਸੀਂ <b>%1</b> ਖਾਲੀ ਫੋਲਡਰ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?</qt>"
 
-#: kmmainwidget.cpp:1233
+#: kmmainwidget.cpp:1222
 msgid ""
 "<qt>Are you sure you want to delete the empty folder <b>%1</b> "
 "and all its subfolders? Those subfolders might not be empty and their contents "
@@ -7145,7 +7979,7 @@ msgid ""
 "and are permanently deleted.</qt>"
 msgstr ""
 
-#: kmmainwidget.cpp:1242
+#: kmmainwidget.cpp:1231
 msgid ""
 "<qt>Are you sure you want to delete the folder <b>%1</b>"
 ", discarding its contents? "
@@ -7153,7 +7987,7 @@ msgid ""
 "and are permanently deleted.</qt>"
 msgstr ""
 
-#: kmmainwidget.cpp:1249
+#: kmmainwidget.cpp:1238
 msgid ""
 "<qt>Are you sure you want to delete the folder <b>%1</b> "
 "and all its subfolders, discarding their contents? "
@@ -7161,550 +7995,552 @@ msgid ""
 "and are permanently deleted.</qt>"
 msgstr ""
 
-#: kmmainwidget.cpp:1268
-msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
-"reset to the main Inbox folder.</qt>"
-msgstr ""
-
-#: kmmainwidget.cpp:1349
+#: kmmainwidget.cpp:1313
 msgid ""
 "Are you sure you want to refresh the IMAP cache?\n"
 "This will remove all changes that you have done locally to your IMAP folders."
 msgstr ""
 
-#: kmmainwidget.cpp:1365
+#: kmmainwidget.cpp:1329
 msgid "Are you sure you want to expire all old messages?"
 msgstr "ਕੀ ਤੁਸੀਂ ਸਭ ਪੁਰਾਣੇ ਸੁਨੇਹਿਆਂ ਦੀ ਮਿਆਦ ਖਤਮ ਕਰਨੀ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: kmmainwidget.cpp:1389
+#: kmmainwidget.cpp:1353
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
 "the likelihood that your system will be compromised by other present and "
 "anticipated security exploits."
 msgstr ""
 
-#: kmmainwidget.cpp:1392 kmmainwidget.cpp:1416 kmsender.cpp:503
+#: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
 msgstr "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ"
 
-#: kmmainwidget.cpp:1393
+#: kmmainwidget.cpp:1357
 msgid "Use HTML"
 msgstr "HTML ਵਰਤੋਂ"
 
-#: kmmainwidget.cpp:1413
+#: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
 "\"spam\" and may increase the likelihood that your system will be compromised "
 "by other present and anticipated security exploits."
 msgstr ""
 
-#: kmmainwidget.cpp:1417
+#: kmmainwidget.cpp:1381
 msgid "Load External References"
 msgstr "ਬਾਹਰੀ ਹਵਾਲਾ ਲੋਡ"
 
-#: kmmainwidget.cpp:1658
+#: kmmainwidget.cpp:1634
 msgid "Filter on Mailing-List..."
 msgstr "ਮੇਲਿੰਗ ਲਿਸਟ ਉੱਤੇ ਫਿਲਟਰ..."
 
-#: kmmainwidget.cpp:1663
+#: kmmainwidget.cpp:1639
 msgid "Filter on Mailing-List %1..."
 msgstr "%1 ਮੇਲਿੰਗ ਲਿਸਟ ਉੱਤੇ ਫਿਲਟਰ..."
 
-#: kmmainwidget.cpp:1761
+#: kmmainwidget.cpp:1738
 msgid ""
 "KMail's Out of Office Reply functionality relies on server-side filtering. You "
 "have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr "s ਦਫਤਰ ਜਵਾਬ ਚਾਲੂ IMAP ਲਈ ਚਾਲੂ IMAP "
 
-#: kmmainwidget.cpp:1766
+#: kmmainwidget.cpp:1743
 msgid "No Server-Side Filtering Configured"
 msgstr "ਕੋਈ ਸਰਵਰ ਪਾਸੇ ਦੀ ਫਿਲਟਰ ਸੰਰਚਨਾ ਨਹੀਂ ਹੈ"
 
-#: kmmainwidget.cpp:1793
-msgid "Could not start certificate manager; please check your installation."
+#: kmmainwidget.cpp:1770
+#, fuzzy
+msgid ""
+"Could not start certificate manager 'kleopatra'; please check your "
+"installation."
 msgstr ""
+"ਸਰਟੀਫਕੇਟ ਮੈਨੇਜਰ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ। ਆਪਣੀ ਇੰਸਟਾਲੇਸ਼ਨ ਦੀ ਜਾਂਚ ਕਰੋ ਜੀ।"
 
-#: kmmainwidget.cpp:1810
+#: kmmainwidget.cpp:1787
 msgid ""
 "Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
 msgstr ""
 
-#: kmmainwidget.cpp:2485
+#: kmmainwidget.cpp:2508
 msgid "Forward With Custom Template"
 msgstr ""
 
-#: kmmainwidget.cpp:2494
+#: kmmainwidget.cpp:2517
 msgid "Reply With Custom Template"
 msgstr "ਪਸੰਦੀਦਾ ਨਮੂਨੇ ਨਾਲ ਜਵਾਬ ਦਿਓ"
 
-#: kmmainwidget.cpp:2502
+#: kmmainwidget.cpp:2525
 msgid "Reply to All With Custom Template"
 msgstr ""
 
-#: kmmainwidget.cpp:2597 kmmainwidget.cpp:2602 kmmainwidget.cpp:2607
+#: kmmainwidget.cpp:2620 kmmainwidget.cpp:2625 kmmainwidget.cpp:2630
 msgid "(no custom templates)"
 msgstr ""
 
-#: kmmainwidget.cpp:2622 kmmimeparttree.cpp:141
+#: kmmainwidget.cpp:2645 kmmimeparttree.cpp:139
 msgid "Save &As..."
 msgstr "ਇੰਝ ਸੰਭਾਲੋ(&A)..."
 
-#: kmmainwidget.cpp:2629
+#: kmmainwidget.cpp:2652
 msgid "&Compact All Folders"
 msgstr "ਸਭ ਫੋਲਡਰ ਸਮੇਟੋ(&C)"
 
-#: kmmainwidget.cpp:2633
+#: kmmainwidget.cpp:2656
 msgid "&Expire All Folders"
 msgstr "ਸਭ ਫੋਲਡਰਾਂ ਦੀ ਮਿਆਦ ਖਤਮ(&E)"
 
-#: kmmainwidget.cpp:2637
+#: kmmainwidget.cpp:2660
 msgid "&Refresh Local IMAP Cache"
 msgstr "ਲੋਕਲ IMAP ਕੈਚੇ ਤਾਜ਼ਾ(&R)"
 
-#: kmmainwidget.cpp:2641
+#: kmmainwidget.cpp:2664
 msgid "Empty All &Trash Folders"
 msgstr "ਸਭ ਰੱਦੀ ਫੋਲਡਰ ਖਾਲੀ ਕਰੋ(&T)"
 
-#: kmmainwidget.cpp:2649
+#: kmmainwidget.cpp:2672
 #, fuzzy
 msgid "Check Mail in Favorite Folders"
 msgstr "ਇਹ ਫੋਲਡਰ ਵਿੱਚ ਪੱਤਰਾਂ ਦੀ ਜਾਂਚ(&i)"
 
-#: kmmainwidget.cpp:2656
+#: kmmainwidget.cpp:2679
 msgid "Check Mail &In"
 msgstr "ਇਸ ਵਿੱਚ ਪੱਤਰਾਂ ਦੀ ਜਾਂਚ(&I)"
 
-#: kmmainwidget.cpp:2666
+#: kmmainwidget.cpp:2689
 msgid "&Send Queued Messages"
 msgstr "ਕਤਾਰਬੱਧ ਸੁਨੇਹੇ ਭੇਜੋ(&S)"
 
-#: kmmainwidget.cpp:2669
+#: kmmainwidget.cpp:2692
 msgid "Online Status (unknown)"
 msgstr "ਸਤਰ 'ਚ ਹਾਲਤ (ਅਣਜਾਣ)"
 
-#: kmmainwidget.cpp:2673
+#: kmmainwidget.cpp:2696
 msgid "Send Queued Messages Via"
 msgstr "ਕਤਾਰਬੱਧ ਸੁਨੇਹੇ ਇਸ ਰਾਹੀ ਭੇਜੋ"
 
-#: kmmainwidget.cpp:2684
+#: kmmainwidget.cpp:2707
 msgid "&Address Book..."
 msgstr "ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ(&A)..."
 
-#: kmmainwidget.cpp:2689
+#: kmmainwidget.cpp:2712
 msgid "Certificate Manager..."
 msgstr "ਸਰਟੀਫਿਕੇਟ ਮੈਨੇਜਰ..."
 
-#: kmmainwidget.cpp:2694
+#: kmmainwidget.cpp:2717
 msgid "GnuPG Log Viewer..."
 msgstr "GnuPG ਲਾਗ ਦਰਸ਼ਕ..."
 
-#: kmmainwidget.cpp:2699
+#: kmmainwidget.cpp:2722
 msgid "&Import Messages..."
 msgstr "ਸੁਨੇਹੇ ਆਯਾਤ(&I)..."
 
-#: kmmainwidget.cpp:2704
+#: kmmainwidget.cpp:2727
 msgid "&Debug Sieve..."
 msgstr "Sieve ਡੀਬੱਗ(&D)..."
 
-#: kmmainwidget.cpp:2710
+#: kmmainwidget.cpp:2733
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "\"ਦਫ਼ਤਰੋਂ ਬਾਹਰ\" ਜਵਾਬ ਸੋਧ..."
 
-#: kmmainwidget.cpp:2716
+#: kmmainwidget.cpp:2739
 msgid "Filter &Log Viewer..."
 msgstr "ਫਿਲਟਰ ਲਾਗ ਝਲਕਾਰਾ(&L)..."
 
-#: kmmainwidget.cpp:2719
+#: kmmainwidget.cpp:2742
 msgid "&Anti-Spam Wizard..."
 msgstr "ਐਟੀ-ਸਮਪ ਸਹਾਇਕ(&A)..."
 
-#: kmmainwidget.cpp:2721
+#: kmmainwidget.cpp:2744
 msgid "&Anti-Virus Wizard..."
 msgstr "ਐਟੀ-ਵਾਇਰਸ ਸਹਾਇਕ(&A)..."
 
-#: kmmainwidget.cpp:2725 kmreadermainwin.cpp:316
+#: kmmainwidget.cpp:2748 kmreadermainwin.cpp:367
 msgid "&Move to Trash"
 msgstr "ਰੱਦੀ ਵਿੱਚ ਭੇਜੋ(&M)"
 
-#: kmmainwidget.cpp:2726 kmreadermainwin.cpp:317
+#: kmmainwidget.cpp:2749 kmreadermainwin.cpp:368
 msgid "Move message to trashcan"
 msgstr "ਸੁਨੇਹਾ ਰੱਦੀ ਵਿੱਚ ਭੇਜੋ"
 
-#: kmmainwidget.cpp:2738
+#: kmmainwidget.cpp:2761
 msgid "M&ove Thread to Trash"
 msgstr "ਮਾਮਲਾ ਰੱਦੀ 'ਚ ਭੇਜੋ(&o)"
 
-#: kmmainwidget.cpp:2739
+#: kmmainwidget.cpp:2762
 msgid "Move thread to trashcan"
 msgstr "ਮਾਮਲਾ ਰੱਦੀ ਵਿੱਚ ਭੇਜੋ"
 
-#: kmmainwidget.cpp:2743
+#: kmmainwidget.cpp:2766
 msgid "Delete T&hread"
 msgstr "ਮਾਮਲਾ ਹਟਾਓ(&h)"
 
-#: kmmainwidget.cpp:2747
+#: kmmainwidget.cpp:2770
 msgid "&Find Messages..."
 msgstr "ਸੁਨੇਹੇ ਖੋਜ(&F)..."
 
-#: kmmainwidget.cpp:2750
+#: kmmainwidget.cpp:2773
 msgid "&Find in Message..."
 msgstr "ਸੁਨੇਹੇ ਵਿੱਚ ਖੋਜ(&F)..."
 
-#: kmmainwidget.cpp:2753
+#: kmmainwidget.cpp:2776
 msgid "Select &All Messages"
 msgstr "ਸਭ ਸੁਨੇਹੇ ਚੁਣੋ(&A)"
 
-#: kmmainwidget.cpp:2760
+#: kmmainwidget.cpp:2783
 msgid "&Properties"
 msgstr "ਵਿਸ਼ੇਸ਼ਤਾ(&P)"
 
-#: kmmainwidget.cpp:2763
+#: kmmainwidget.cpp:2786
 msgid "&Mailing List Management..."
 msgstr "ਮੇਲਿੰਗ ਲਿਸਟ ਪਰਬੰਧ(&M)..."
 
-#: kmmainwidget.cpp:2772
+#: kmmainwidget.cpp:2795
 msgid "Mark All Messages as &Read"
 msgstr "ਸਭ ਸੁਨੇਹੇ ਪੜ੍ਹੇ ਨਿਸ਼ਾਨਬੱਧ(&R)"
 
-#: kmmainwidget.cpp:2775
+#: kmmainwidget.cpp:2798
 msgid "&Expiration Settings"
 msgstr "ਮਿਆਦ ਸੈਟਿੰਗ(&E)"
 
-#: kmmainwidget.cpp:2778
+#: kmmainwidget.cpp:2801
 msgid "&Compact Folder"
 msgstr "ਫੋਲਡਰ ਸਮੇਟੋ(&C)"
 
-#: kmmainwidget.cpp:2781
+#: kmmainwidget.cpp:2804
 msgid "Check Mail &in This Folder"
 msgstr "ਇਹ ਫੋਲਡਰ ਵਿੱਚ ਪੱਤਰਾਂ ਦੀ ਜਾਂਚ(&i)"
 
-#: kmmainwidget.cpp:2793
+#: kmmainwidget.cpp:2816
+#, fuzzy
+msgid "&Archive Folder..."
+msgstr "ਨਵਾਂ ਫੋਲਡਰ(&N)..."
+
+#: kmmainwidget.cpp:2820
 msgid "Prefer &HTML to Plain Text"
 msgstr "ਸਮਤਲ ਪਾਠ ਨਾਲੋਂ &HTML"
 
-#: kmmainwidget.cpp:2796
+#: kmmainwidget.cpp:2823
 msgid "Load E&xternal References"
 msgstr "ਬਾਹਰੀ ਹਵਾਲਾ ਲੋਡ(&x)"
 
-#: kmmainwidget.cpp:2799
+#: kmmainwidget.cpp:2826
 msgid "&Thread Messages"
 msgstr "ਮਾਮਲਾ ਸੁਨੇਹੇ(&T)"
 
-#: kmmainwidget.cpp:2802
+#: kmmainwidget.cpp:2829
 msgid "Thread Messages also by &Subject"
 msgstr "ਮਾਮਲੇ ਸੁਨੇਹੇ ਵਿਸ਼ੇ ਰਾਹੀਂ ਵੀ(&S)"
 
-#: kmmainwidget.cpp:2805
+#: kmmainwidget.cpp:2832
 msgid "Copy Folder"
 msgstr "ਫੋਲਡਰ ਨਕਲ ਕਰੋ"
 
-#: kmmainwidget.cpp:2807
+#: kmmainwidget.cpp:2834
 msgid "Cut Folder"
 msgstr "ਫੋਲਡਰ ਕੱਟੋ"
 
-#: kmmainwidget.cpp:2809
+#: kmmainwidget.cpp:2836
 msgid "Paste Folder"
 msgstr "ਫੋਲਡਰ ਚੇਪੋ"
 
-#: kmmainwidget.cpp:2812
+#: kmmainwidget.cpp:2839
 msgid "Copy Messages"
 msgstr "ਸੁਨੇਹੇ ਨਕਲ ਕਰੋ"
 
-#: kmmainwidget.cpp:2814
+#: kmmainwidget.cpp:2841
 msgid "Cut Messages"
 msgstr "ਸੁਨੇਹੇ ਕੱਟੋ"
 
-#: kmmainwidget.cpp:2816
+#: kmmainwidget.cpp:2843
 msgid "Paste Messages"
 msgstr "ਸੁਨੇਹੇ ਚੇਪੋ"
 
-#: kmmainwidget.cpp:2820
+#: kmmainwidget.cpp:2847
 msgid "&New Message..."
 msgstr "ਨਵਾਂ ਸੁਨੇਹਾ(&N)..."
 
-#: kmmainwidget.cpp:2823 kmmainwidget.cpp:2915
+#: kmmainwidget.cpp:2850 kmmainwidget.cpp:2927
 msgid "New Message From &Template"
 msgstr ""
 
-#: kmmainwidget.cpp:2831
+#: kmmainwidget.cpp:2858
 msgid "New Message t&o Mailing-List..."
 msgstr "ਮੇਲਿੰਗ ਲਿਸਟ ਲਈ ਨਵਾਂ ਸੁਨੇਹਾ(&o)..."
 
-#: kmmainwidget.cpp:2836 kmreadermainwin.cpp:327 searchwindow.cpp:320
+#: kmmainwidget.cpp:2863 kmreadermainwin.cpp:378 searchwindow.cpp:321
 msgid ""
 "_: Message->\n"
 "&Forward"
 msgstr "ਅੱਗੇ ਭੇਜੋ(&F)"
 
-#: kmmainwidget.cpp:2840 kmreadermainwin.cpp:330 searchwindow.cpp:329
+#: kmmainwidget.cpp:2867 kmreadermainwin.cpp:381 searchwindow.cpp:330
 msgid "&Inline..."
 msgstr "ਸਤਰ ਵਿੱਚ(&I)..."
 
-#: kmmainwidget.cpp:2846 kmreadermainwin.cpp:336 searchwindow.cpp:325
+#: kmmainwidget.cpp:2873 kmreadermainwin.cpp:387 searchwindow.cpp:326
 msgid ""
 "_: Message->Forward->\n"
 "As &Attachment..."
 msgstr "ਨੱਥੀ ਵਾਂਗ(&A)..."
 
-#: kmmainwidget.cpp:2852 kmreadermainwin.cpp:342 searchwindow.cpp:341
+#: kmmainwidget.cpp:2879 kmreadermainwin.cpp:393 searchwindow.cpp:342
 msgid ""
 "_: Message->Forward->\n"
 "As Di&gest..."
 msgstr ""
 
-#: kmmainwidget.cpp:2858 kmreadermainwin.cpp:348 searchwindow.cpp:346
+#: kmmainwidget.cpp:2885 kmreadermainwin.cpp:399 searchwindow.cpp:347
 msgid ""
 "_: Message->Forward->\n"
 "&Redirect..."
 msgstr "ਦਿਸ਼ਾ ਤਬਦੀਲ(&R)..."
 
-#: kmmainwidget.cpp:2885
+#: kmmainwidget.cpp:2897
 msgid "Send A&gain..."
 msgstr "ਮੁੜ ਭੇਜੋ(&g)..."
 
-#: kmmainwidget.cpp:2890
+#: kmmainwidget.cpp:2902
 msgid "&Create Filter"
 msgstr "ਫਿਲਟਰ ਬਣਾਓ(&C)"
 
-#: kmmainwidget.cpp:2893
+#: kmmainwidget.cpp:2905
 msgid "Filter on &Subject..."
 msgstr "ਵਿਸ਼ੇ ਉੱਤੇ ਫਿਲਟਰ(&S)..."
 
-#: kmmainwidget.cpp:2898
+#: kmmainwidget.cpp:2910
 msgid "Filter on &From..."
 msgstr "ਵਲੋਂ ਉੱਤੇ ਫਿਲਟਰ(&F)..."
 
-#: kmmainwidget.cpp:2903
+#: kmmainwidget.cpp:2915
 msgid "Filter on &To..."
 msgstr "ਵੱਲ ਉੱਤੇ ਫਿਲਟਰ(&T)..."
 
-#: kmmainwidget.cpp:2908
+#: kmmainwidget.cpp:2920
 msgid "Filter on Mailing-&List..."
 msgstr "ਮੇਲਿੰਗ ਲਿਸਟ ਉੱਤੇ ਫਿਲਟਰ(&L)..."
 
-#: kmmainwidget.cpp:2921
+#: kmmainwidget.cpp:2933
 msgid "Mark &Thread"
 msgstr "ਮਾਮਲਾ ਨਿਸ਼ਾਨ(&T)"
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2936
 msgid "Mark Thread as &Read"
 msgstr "ਮਾਮਲਾ ਪੜ੍ਹਿਆ ਨਿਸ਼ਾਨਬੱਧ(&R)"
 
-#: kmmainwidget.cpp:2925
+#: kmmainwidget.cpp:2937
 msgid "Mark all messages in the selected thread as read"
 msgstr "ਚੁਣੇ ਮਾਮਲੇ ਵਿੱਚ ਸਭ ਸੁਨੇਹੇ ਪੜ੍ਹੇ ਬਣਾਓ"
 
-#: kmmainwidget.cpp:2930
+#: kmmainwidget.cpp:2942
 msgid "Mark Thread as &New"
 msgstr "ਮਾਮਲਾ ਨਵੇਂ ਨਿਸ਼ਾਨਬੱਧ(&N)"
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2943
 msgid "Mark all messages in the selected thread as new"
 msgstr "ਚੁਣੇ ਮਾਮਲੇ ਵਿੱਚ ਸਭ ਸੁਨੇਹੇ ਨਵੇਂ ਬਣਾਓ"
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2948
 msgid "Mark Thread as &Unread"
 msgstr "ਮਾਮਲਾ ਨਾ-ਪੜ੍ਹਿਆ ਬਣਾਓ(&U)"
 
-#: kmmainwidget.cpp:2937
+#: kmmainwidget.cpp:2949
 msgid "Mark all messages in the selected thread as unread"
 msgstr "ਚੁਣੇ ਮਾਮਲੇ ਵਿੱਚ ਸਭ ਸੁਨੇਹਿਆਂ ਨੂੰ ਨਾ-ਪੜ੍ਹੇ ਬਣਾਓ"
 
-#: kmmainwidget.cpp:2945
+#: kmmainwidget.cpp:2957
 msgid "Mark Thread as &Important"
 msgstr "ਮਾਮਲੇ ਨੂੰ ਖਾਸ ਬਣਾਓ(&I)"
 
-#: kmmainwidget.cpp:2948
+#: kmmainwidget.cpp:2960
 msgid "Remove &Important Thread Mark"
 msgstr ""
 
-#: kmmainwidget.cpp:2951
+#: kmmainwidget.cpp:2963
 #, fuzzy
 msgid "Mark Thread as &Action Item"
 msgstr "ਮਾਮਲਾ ਨਵੇਂ ਨਿਸ਼ਾਨਬੱਧ(&N)"
 
-#: kmmainwidget.cpp:2954
+#: kmmainwidget.cpp:2966
 #, fuzzy
 msgid "Remove &Action Item Thread Mark"
 msgstr "ਖਾਸ ਸੁਨੇਹਾ ਨਿਸ਼ਾਨ ਹਟਾਓ(&I)"
 
-#: kmmainwidget.cpp:2958
+#: kmmainwidget.cpp:2970
 msgid "&Watch Thread"
 msgstr "ਮਾਮਲਾ ਵੇਖਾਓ(&W)"
 
-#: kmmainwidget.cpp:2962
+#: kmmainwidget.cpp:2974
 msgid "&Ignore Thread"
 msgstr "ਮਾਮਲਾ ਅਣਡਿੱਠਾ(&I)"
 
-#: kmmainwidget.cpp:2970
+#: kmmainwidget.cpp:2982
 msgid "Save A&ttachments..."
 msgstr "ਨੱਥੀ ਸੰਭਾਲੋ(&t)..."
 
-#: kmmainwidget.cpp:2980
+#: kmmainwidget.cpp:2992
 msgid "Appl&y All Filters"
 msgstr "ਸਭ ਫਿਲਟਰ ਲਾਗੂ ਕਰੋ(&y)"
 
-#. i18n: file kmail_part.rc line 141
-#: kmmainwidget.cpp:2985 rc.cpp:30 rc.cpp:96
+#. i18n: file kmail_part.rc line 142
+#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "ਫਿਲਟਰ ਲਾਗੂ(&p)"
 
-#: kmmainwidget.cpp:2992
+#: kmmainwidget.cpp:3004
 msgid ""
 "_: View->\n"
 "&Unread Count"
 msgstr "ਨਾ-ਪੜ੍ਹੇ ਗਿਣੋ(&U)"
 
-#: kmmainwidget.cpp:2994
+#: kmmainwidget.cpp:3006
 msgid "Choose how to display the count of unread messages"
 msgstr "ਚੁਣੋ ਕਿ ਅਣ-ਪੜ੍ਹੇ ਸੁਨੇਹਿਆਂ ਦੀ ਗਿਣਤੀ ਕਿਵੇਂ ਵੇਖਾਉਣੀ ਹੈ"
 
-#: kmmainwidget.cpp:2996
+#: kmmainwidget.cpp:3008
 msgid ""
 "_: View->Unread Count\n"
 "View in &Separate Column"
 msgstr "ਵੱਖਰੇ ਕਾਲਮ 'ਚ ਵੇਖਾਓ(&S)"
 
-#: kmmainwidget.cpp:3002
+#: kmmainwidget.cpp:3014
 msgid ""
 "_: View->Unread Count\n"
 "View After &Folder Name"
 msgstr "ਫੋਲਡਰ ਨਾਂ ਵੇਖਾਓ(&F)"
 
-#: kmmainwidget.cpp:3009
+#: kmmainwidget.cpp:3021
 msgid ""
 "_: View->\n"
 "&Total Column"
 msgstr "ਕੁੱਲ ਕਾਲਮ(&T)"
 
-#: kmmainwidget.cpp:3012
+#: kmmainwidget.cpp:3024
 msgid ""
 "Toggle display of column showing the total number of messages in folders."
 msgstr ""
 
-#: kmmainwidget.cpp:3014
+#: kmmainwidget.cpp:3026
 #, fuzzy
 msgid ""
 "_: View->\n"
 "&Size Column"
 msgstr "ਕੁੱਲ ਕਾਲਮ(&T)"
 
-#: kmmainwidget.cpp:3017
+#: kmmainwidget.cpp:3029
 msgid "Toggle display of column showing the total size of messages in folders."
 msgstr ""
 
-#: kmmainwidget.cpp:3020
+#: kmmainwidget.cpp:3032
 msgid ""
 "_: View->\n"
 "&Expand Thread"
 msgstr "ਮਾਮਲਾ ਫੈਲਾਓ(&E)"
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3033
 msgid "Expand the current thread"
 msgstr "ਮੌਜੂਦਾ ਮਾਮਲਾ ਫੈਲਾਓ"
 
-#: kmmainwidget.cpp:3026
+#: kmmainwidget.cpp:3038
 msgid ""
 "_: View->\n"
 "&Collapse Thread"
 msgstr "ਮਾਮਲਾ ਸਮੇਟੋ(&C)"
 
-#: kmmainwidget.cpp:3027
+#: kmmainwidget.cpp:3039
 msgid "Collapse the current thread"
 msgstr "ਮੌਜੂਦਾ ਮਾਮਲਾ ਸਮੇਟੋ"
 
-#: kmmainwidget.cpp:3032
+#: kmmainwidget.cpp:3044
 msgid ""
 "_: View->\n"
 "Ex&pand All Threads"
 msgstr "ਸਭ ਮਾਮਲੇ ਫੈਲਾਓ(&p)"
 
-#: kmmainwidget.cpp:3033
+#: kmmainwidget.cpp:3045
 msgid "Expand all threads in the current folder"
 msgstr "ਮੌਜੂਦਾ ਫੋਲਡਰ ਵਿੱਚਲੇ ਮਾਮਲੇ ਫੈਲਾਓ"
 
-#: kmmainwidget.cpp:3038
+#: kmmainwidget.cpp:3050
 msgid ""
 "_: View->\n"
 "C&ollapse All Threads"
 msgstr "ਸਭ ਮਾਮਲੇ ਸਮੇਟੋ(&o)"
 
-#: kmmainwidget.cpp:3039
+#: kmmainwidget.cpp:3051
 msgid "Collapse all threads in the current folder"
 msgstr "ਮੌਜੂਦਾ ਫੋਲਡਰ ਵਿੱਚ ਸਭ ਮਸਲੇ ਸਮੇਟੋ"
 
-#: kmmainwidget.cpp:3044 kmreadermainwin.cpp:322
+#: kmmainwidget.cpp:3056 kmreadermainwin.cpp:373
 msgid "&View Source"
 msgstr "ਸਰੋਤ ਵੇਖੋ(&V)"
 
-#: kmmainwidget.cpp:3048
+#: kmmainwidget.cpp:3060
 msgid "&Display Message"
 msgstr "ਸੁਨੇਹੇ ਵੇਖਾਓ(&D)"
 
-#: kmmainwidget.cpp:3054
+#: kmmainwidget.cpp:3066
 msgid "&Next Message"
 msgstr "ਅੱਗੇ ਸੁਨੇਹਾ(&N)"
 
-#: kmmainwidget.cpp:3055
+#: kmmainwidget.cpp:3067
 msgid "Go to the next message"
 msgstr "ਅਗਲੇ ਸੁਨੇਹੇ ਉੱਤੇ ਜਾਓ"
 
-#: kmmainwidget.cpp:3059
+#: kmmainwidget.cpp:3071
 msgid "Next &Unread Message"
 msgstr "ਅੱਗੇ ਨਾ-ਪੜ੍ਹਿਆ ਸੁਨੇਹਾ(&N)"
 
-#: kmmainwidget.cpp:3061
+#: kmmainwidget.cpp:3073
 msgid "Go to the next unread message"
 msgstr "ਅਗਲੇ ਨਾ-ਪੜ੍ਹੇ ਸੁਨੇਹੇ ਉੱਤੇ ਜਾਓ"
 
 #. i18n("Go to the next important message") ),
-#: kmmainwidget.cpp:3072
+#: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "ਪਿੱਛੇ ਸੁਨੇਹਾ(&P)"
 
-#: kmmainwidget.cpp:3073
+#: kmmainwidget.cpp:3085
 msgid "Go to the previous message"
 msgstr "ਪਿਛਲੇ ਸੁਨੇਹੇ ਉੱਤੇ ਜਾਓ"
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3089
 msgid "Previous Unread &Message"
 msgstr "ਪਿਛਲੇ ਨਾ-ਪੜ੍ਹੇ ਸੁਨੇਹੇ ਉੱਤੇ ਜਾਓ(&M)"
 
-#: kmmainwidget.cpp:3079
+#: kmmainwidget.cpp:3091
 msgid "Go to the previous unread message"
 msgstr "ਪਿਛਲੇ ਨਾ-ਪੜ੍ਹੇ ਸੁਨੇਹੇ ਉੱਤੇ ਜਾਓ"
 
-#: kmmainwidget.cpp:3091
+#: kmmainwidget.cpp:3103
 msgid "Next Unread &Folder"
 msgstr "ਅੱਗੇ ਨਾ-ਪੜ੍ਹਿਆ ਫੋਲਡਰ(&F)"
 
-#: kmmainwidget.cpp:3092
+#: kmmainwidget.cpp:3104
 msgid "Go to the next folder with unread messages"
 msgstr "ਨਾ-ਪੜ੍ਹੇ ਸੁਨੇਹੇ ਨਾਲ ਅਗਲੇ ਫੋਲਡਰ ਉੱਤੇ ਜਾਓ"
 
-#: kmmainwidget.cpp:3100
+#: kmmainwidget.cpp:3112
 msgid "Previous Unread F&older"
 msgstr "ਪਿੱਛੇ ਨਾ-ਪੜ੍ਹਿਆ ਫੋਲਡਰ(&o)"
 
-#: kmmainwidget.cpp:3101
+#: kmmainwidget.cpp:3113
 msgid "Go to the previous folder with unread messages"
 msgstr "ਨਾ-ਪੜ੍ਹੇ ਸੁਨੇਹਿਆਂ ਨਾਲ ਪਿਛਲੇ ਫੋਲਡਰ ਵਿੱਚ ਜਾਓ"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3120
 msgid ""
 "_: Go->\n"
 "Next Unread &Text"
 msgstr "ਅੱਗੇ ਨਾ-ਪੜ੍ਹਿਆ ਪਾਠ(&T)"
 
-#: kmmainwidget.cpp:3109
+#: kmmainwidget.cpp:3121
 msgid "Go to the next unread text"
 msgstr "ਅੱਗੇ ਨਾ-ਪੜੇ ਪਾਠ ਤੇ ਜਾਓ"
 
-#: kmmainwidget.cpp:3110
+#: kmmainwidget.cpp:3122
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
@@ -7712,51 +8548,55 @@ msgstr ""
 "ਮੌਜੂਦਾ ਸੁਨੇਹੇ ਦੇ ਹੇਠਾਂ ਜਾਓ। ਜੇਕਰ ਮੌਜੂਦਾ ਸੁਨੇਹਾ ਖਤਮ ਹੋ ਗਿਆ ਹੋਵੇ ਤਾਂ ਅਗਲੇ "
 "ਨਾ-ਪੜ੍ਹੇ ਸੁਨੇਹੇ ਉੱਤੇ ਜਾਓ।"
 
-#: kmmainwidget.cpp:3117
+#: kmmainwidget.cpp:3129
+msgid "Show Quick Search"
+msgstr "ਤੇਜ਼ ਖੋਜ ਵੇਖਾਓ"
+
+#: kmmainwidget.cpp:3136
 msgid "Configure &Filters..."
 msgstr "ਫਿਲਟਰ ਸੰਰਚਨਾ(&F)..."
 
-#: kmmainwidget.cpp:3119
+#: kmmainwidget.cpp:3138
 msgid "Configure &POP Filters..."
 msgstr "&POP ਫਿਲਟਰ ਸੰਰਚਨਾ..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3140
 msgid "Manage &Sieve Scripts..."
 msgstr "ਸਿਈਵੀ ਸਕਰਿਪਟ ਪਰਬੰਧ(&S)..."
 
-#: kmmainwidget.cpp:3124
+#: kmmainwidget.cpp:3143
 msgid "KMail &Introduction"
 msgstr "ਕੇ-ਮੇਲ ਜਾਣ ਪਛਾਣ(&I)"
 
-#: kmmainwidget.cpp:3125
+#: kmmainwidget.cpp:3144
 msgid "Display KMail's Welcome Page"
 msgstr "ਕੇਮੇਲ ਦਾ ਸਵਾਗਤੀ ਸਫ਼ਾ ਵੇਖਾਓ"
 
-#: kmmainwidget.cpp:3131
+#: kmmainwidget.cpp:3150
 msgid "Configure &Notifications..."
 msgstr "ਸੂਚਨਾ ਸੰਰਚਨਾ(&N)..."
 
-#: kmmainwidget.cpp:3136
+#: kmmainwidget.cpp:3155
 msgid "&Configure KMail..."
 msgstr "ਕੇਮੇਲ ਸੰਰਚਨਾ(&C)..."
 
-#: kmmainwidget.cpp:3431
+#: kmmainwidget.cpp:3454
 msgid "E&mpty Trash"
 msgstr "ਰੱਦੀ ਖਾਲੀ ਕਰੋ(&m)"
 
-#: kmmainwidget.cpp:3431
+#: kmmainwidget.cpp:3455
 msgid "&Move All Messages to Trash"
 msgstr "ਸਭ ਸੁਨੇਹੇ ਰੱਦੀ 'ਚ ਭੇਜੋ(&M)"
 
-#: kmmainwidget.cpp:3434
+#: kmmainwidget.cpp:3464
 msgid "&Delete Search"
 msgstr "ਖੋਜ ਹਟਾਓ(&D)"
 
-#: kmmainwidget.cpp:3434
+#: kmmainwidget.cpp:3465
 msgid "&Delete Folder"
 msgstr "ਫੋਲਡਰਾਂ ਹਟਾਓ(&D)"
 
-#: kmmainwidget.cpp:3615
+#: kmmainwidget.cpp:3649
 #, c-format
 msgid ""
 "_n: Removed %n duplicate message.\n"
@@ -7765,24 +8605,24 @@ msgstr ""
 "%n ਦੂਹਰਾ ਸੁਨੇਹਿਆਂ ਹਟਾਇਆ ਗਿਆ\n"
 "%n ਦੂਹਰੇ ਸੁਨੇਹੇ ਹਟਾਏ ਗਏ"
 
-#: kmmainwidget.cpp:3617
+#: kmmainwidget.cpp:3651
 msgid "No duplicate messages found."
 msgstr "ਕੋਈ ਦੂਹਰਾ ਸੁਨੇਹਾ ਨਹੀਂ ਲੱਭਾ"
 
-#: kmmainwidget.cpp:3687
+#: kmmainwidget.cpp:3721
 #, c-format
 msgid "Filter %1"
 msgstr "ਫਿਲਟਰ %1"
 
-#: kmmainwidget.cpp:3821
+#: kmmainwidget.cpp:3855
 msgid "Subscription"
 msgstr "ਮੈਂਬਰੀ"
 
-#: kmmainwidget.cpp:3838
+#: kmmainwidget.cpp:3872
 msgid "Local Subscription"
 msgstr "ਲੋਕਲ ਮੈਂਬਰੀ"
 
-#: kmmainwidget.cpp:3971
+#: kmmainwidget.cpp:4007
 #, fuzzy
 msgid "Out of office reply active"
 msgstr "\"ਦਫ਼ਤਰੋਂ ਬਾਹਰ\" ਜਵਾਬ ਸੋਧ..."
@@ -7795,7 +8635,7 @@ msgstr "ਨਵਾਂ ਝਰੋਖਾ(&W)"
 msgid " Initializing..."
 msgstr " ਸ਼ੁਰੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: kmmessage.cpp:1316
+#: kmmessage.cpp:1336
 msgid ""
 "This message contains a request to return a notification about your reception "
 "of the message.\n"
@@ -7803,7 +8643,7 @@ msgid ""
 "response."
 msgstr ""
 
-#: kmmessage.cpp:1321
+#: kmmessage.cpp:1341
 msgid ""
 "This message contains a request to send a notification about your reception of "
 "the message.\n"
@@ -7812,7 +8652,7 @@ msgid ""
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 
-#: kmmessage.cpp:1328
+#: kmmessage.cpp:1348
 msgid ""
 "This message contains a request to send a notification about your reception of "
 "the message,\n"
@@ -7821,7 +8661,7 @@ msgid ""
 "response."
 msgstr ""
 
-#: kmmessage.cpp:1335
+#: kmmessage.cpp:1355
 msgid ""
 "This message contains a request to send a notification about your reception of "
 "the message,\n"
@@ -7830,7 +8670,7 @@ msgid ""
 "response."
 msgstr ""
 
-#: kmmessage.cpp:1341
+#: kmmessage.cpp:1361
 msgid ""
 "This message contains a request to send a notification about your reception of "
 "the message,\n"
@@ -7840,54 +8680,63 @@ msgid ""
 "response."
 msgstr ""
 
-#: kmmessage.cpp:1359 kmmessage.cpp:1366
+#: kmmessage.cpp:1379 kmmessage.cpp:1386
 msgid "Message Disposition Notification Request"
 msgstr ""
 
-#: kmmessage.cpp:1361
+#: kmmessage.cpp:1381
 msgid "Send \"&denied\""
 msgstr "\"ਪਾਬੰਦੀ ਹੈ(&d)\" ਭੇਜੋ"
 
-#: kmmessage.cpp:1361 kmmessage.cpp:1368
+#: kmmessage.cpp:1381 kmmessage.cpp:1388
 msgid "&Send"
 msgstr "ਭੇਜੋ(&S)"
 
-#: kmmessage.cpp:1436
+#: kmmessage.cpp:1458
 msgid ""
 "Header \"Disposition-Notification-Options\" contained required, but unknown "
 "parameter"
 msgstr ""
 
-#: kmmessage.cpp:1628
+#: kmmessage.cpp:1650
 msgid "Receipt: "
 msgstr "ਰਸੀਦ:"
 
-#: kmmessage.cpp:3128 urlhandlermanager.cpp:551
+#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "ਨੱਥੀ: %1"
 
-#: kmmimeparttree.cpp:139 kmreaderwin.cpp:1969
+#: kmmessage.cpp:3199
+#, fuzzy
+msgid "This attachment has been deleted."
+msgstr "ਨੱਥੀ ਨੂੰ ਭੇਜਣ ਵਾਲੇ ਦੇ ਸੁਝਾਅ ਮੁਤਾਬਕ ਹੀ ਵੇਖਾਓ।"
+
+#: kmmessage.cpp:3201
+msgid "The attachment '%1' has been deleted."
+msgstr ""
+
+#: kmmimeparttree.cpp:137 kmreaderwin.cpp:2034
 msgid ""
 "_: to view something\n"
 "View"
 msgstr "ਵੇਖੋ"
 
-#: kmmimeparttree.cpp:147
+#: kmmimeparttree.cpp:145
 msgid "Save All Attachments..."
 msgstr "ਸਭ ਨੱਥੀ ਸੰਭਾਲੋ..."
 
-#: kmmimeparttree.cpp:154 kmreaderwin.cpp:1975 kmreaderwin.cpp:2626
+#: kmmimeparttree.cpp:152 kmreaderwin.cpp:2041 kmreaderwin.cpp:2805
 #, fuzzy
 msgid "Delete Attachment"
 msgstr "ਨੱਥੀ ਹਟਾਓ(&R)"
 
-#: kmmimeparttree.cpp:157 kmreaderwin.cpp:1973 kmreaderwin.cpp:2638
+#: kmmimeparttree.cpp:155 kmreaderwin.cpp:2039 kmreaderwin.cpp:2861
 #, fuzzy
 msgid "Edit Attachment"
 msgstr "ਨੱਥੀ"
 
-#: kmmimeparttree.cpp:370
+#: kmmimeparttree.cpp:368
 msgid "Unspecified Binary Data"
 msgstr "ਨਾ-ਦਿੱਤਾ ਬਾਈਨਰੀ ਡਾਟਾ"
 
@@ -8053,212 +8902,225 @@ msgstr "ਕੋਈ ਵਿਸ਼ਾ ਨਹੀਂ"
 msgid "unknown"
 msgstr "ਅਣਜਾਣ"
 
-#: kmreadermainwin.cpp:477 searchwindow.cpp:352
+#: kmreadermainwin.cpp:515 searchwindow.cpp:353
 msgid "Save Attachments..."
 msgstr "ਨੱਥੀ ਸੰਭਾਲੋ..."
 
-#: kmreaderwin.cpp:562
+#: kmreaderwin.cpp:489
 msgid ""
 "_: View->\n"
 "&Headers"
 msgstr "ਸਿਰਲੇਖ(&H)"
 
-#: kmreaderwin.cpp:563
+#: kmreaderwin.cpp:490
 msgid "Choose display style of message headers"
 msgstr "ਸੁਨੇਹਾ ਸਿਰਲੇਖ ਵੇਖਣ ਸਟਾਇਲ ਚੁਣੋ"
 
-#: kmreaderwin.cpp:568
+#: kmreaderwin.cpp:495
 #, fuzzy
 msgid ""
 "_: View->headers->\n"
 "&Enterprise Headers"
 msgstr "ਸੰਖੇਪ ਸਿਰਲੇਖ(&B)"
 
-#: kmreaderwin.cpp:571
+#: kmreaderwin.cpp:498
 msgid "Show the list of headers in Enterprise style"
 msgstr ""
 
-#: kmreaderwin.cpp:575
+#: kmreaderwin.cpp:502
 msgid ""
 "_: View->headers->\n"
 "&Fancy Headers"
 msgstr "ਫੈਂਨਸੀ ਸਿਰਲੇਖ(&F)"
 
-#: kmreaderwin.cpp:578
+#: kmreaderwin.cpp:505
 msgid "Show the list of headers in a fancy format"
 msgstr ""
 
-#: kmreaderwin.cpp:582
+#: kmreaderwin.cpp:509
 msgid ""
 "_: View->headers->\n"
 "&Brief Headers"
 msgstr "ਸੰਖੇਪ ਸਿਰਲੇਖ(&B)"
 
-#: kmreaderwin.cpp:585
+#: kmreaderwin.cpp:512
 msgid "Show brief list of message headers"
 msgstr "ਸੁਨੇਹਾ ਸਿਰਲੇਖਾਂ ਦੀ ਸੰਖੇਪ ਸੂਚੀ ਵੇਖਾਓ"
 
-#: kmreaderwin.cpp:589
+#: kmreaderwin.cpp:516
 msgid ""
 "_: View->headers->\n"
 "&Standard Headers"
 msgstr "ਮਿਆਰੀ ਸਿਰਲੇਖ(&S)"
 
-#: kmreaderwin.cpp:592
+#: kmreaderwin.cpp:519
 msgid "Show standard list of message headers"
 msgstr "ਸੁਨੇਹਾ ਸਿਰਲੇਖਾਂ ਦੀ ਮਿਆਰੀ ਸੂਚੀ ਵੇਖਾਓ"
 
-#: kmreaderwin.cpp:596
+#: kmreaderwin.cpp:523
 msgid ""
 "_: View->headers->\n"
 "&Long Headers"
 msgstr "ਲੰਮਾ ਸਿਰਲੇਖ(&L)"
 
-#: kmreaderwin.cpp:599
+#: kmreaderwin.cpp:526
 msgid "Show long list of message headers"
 msgstr "ਸੁਨੇਹਾ ਸਿਰਲੇਖਾਂ ਦੀ ਲੰਮੀ ਸੂਚੀ ਵੇਖਾਓ"
 
-#: kmreaderwin.cpp:603
+#: kmreaderwin.cpp:530
 msgid ""
 "_: View->headers->\n"
 "&All Headers"
 msgstr "ਸਭ ਸਿਰਲੇਖ(&A)"
 
-#: kmreaderwin.cpp:606
+#: kmreaderwin.cpp:533
 msgid "Show all message headers"
 msgstr "ਸਭ ਸੁਨੇਹਾ ਸਿਰਲੇਖ ਵੇਖਾਓ"
 
-#: kmreaderwin.cpp:612
+#: kmreaderwin.cpp:539
 msgid ""
 "_: View->\n"
 "&Attachments"
 msgstr "ਨੱਥੀ(&A)"
 
-#: kmreaderwin.cpp:613
+#: kmreaderwin.cpp:540
 msgid "Choose display style of attachments"
 msgstr "ਨੱਥੀ ਵੇਖਾਉਣ ਦਾ ਢੰਗ ਚੁਣੋ"
 
-#: kmreaderwin.cpp:617
+#: kmreaderwin.cpp:544
 msgid ""
 "_: View->attachments->\n"
 "&As Icons"
 msgstr "ਆਈਕਾਨ ਵਾਂਗ(&A)"
 
-#: kmreaderwin.cpp:620
+#: kmreaderwin.cpp:547
 msgid "Show all attachments as icons. Click to see them."
 msgstr "ਸਭ ਨੱਥੀ ਆਈਕਾਨ ਵਾਂਗ ਵੇਖਾਓ। ਇਹਨਾਂ ਨੂੰ ਵੇਖਣ ਲਈ ਦਬਾਓ।"
 
-#: kmreaderwin.cpp:624
+#: kmreaderwin.cpp:551
 msgid ""
 "_: View->attachments->\n"
 "&Smart"
 msgstr "ਚੁਸਤ(&S)"
 
-#: kmreaderwin.cpp:627
+#: kmreaderwin.cpp:554
 msgid "Show attachments as suggested by sender."
 msgstr "ਨੱਥੀ ਨੂੰ ਭੇਜਣ ਵਾਲੇ ਦੇ ਸੁਝਾਅ ਮੁਤਾਬਕ ਹੀ ਵੇਖਾਓ।"
 
-#: kmreaderwin.cpp:631
+#: kmreaderwin.cpp:558
 msgid ""
 "_: View->attachments->\n"
 "&Inline"
 msgstr "ਮੇਲ ਵਿੱਚ ਹੀ(&I)"
 
-#: kmreaderwin.cpp:634
+#: kmreaderwin.cpp:561
 msgid "Show all attachments inline (if possible)"
 msgstr "ਸਭ ਨੱਥੀ ਪੱਤਰ 'ਚ ਹੀ ਵੇਖਾਓ (ਜੇਕਰ ਸੰਭਵ ਹੋਵੇ ਤਾਂ)"
 
-#: kmreaderwin.cpp:638
+#: kmreaderwin.cpp:565
 msgid ""
 "_: View->attachments->\n"
 "&Hide"
 msgstr "ਓਹਲੇ(&H)"
 
-#: kmreaderwin.cpp:641
+#: kmreaderwin.cpp:568
 msgid "Do not show attachments in the message viewer"
 msgstr "ਸੁਨੇਹਾ ਦਰਸ਼ਕ ਵਿੱਚ ਨੱਥੀ ਨਾ ਵੇਖਾਓ "
 
-#: kmreaderwin.cpp:646
+#: kmreaderwin.cpp:572
+#, fuzzy
+msgid ""
+"_: View->attachments->\n"
+"In Header &Only"
+msgstr "ਓਹਲੇ(&H)"
+
+#: kmreaderwin.cpp:575
+#, fuzzy
+msgid "Show Attachments only in the header of the mail"
+msgstr "ਸਭ ਨੱਥੀ ਆਈਕਾਨ ਵਾਂਗ ਵੇਖਾਓ। ਇਹਨਾਂ ਨੂੰ ਵੇਖਣ ਲਈ ਦਬਾਓ।"
+
+#: kmreaderwin.cpp:580
 msgid "&Set Encoding"
 msgstr "ਇਕੋਡਿੰਗ ਦਿਓ(&S)"
 
-#: kmreaderwin.cpp:654
+#: kmreaderwin.cpp:588
 msgid "New Message To..."
 msgstr "ਨਵਾਂ ਸੁਨੇਹਾ ਇਸ ਨੂੰ..."
 
-#: kmreaderwin.cpp:657
+#: kmreaderwin.cpp:591
 msgid "Reply To..."
 msgstr "ਜਵਾਬ..."
 
-#: kmreaderwin.cpp:660
+#: kmreaderwin.cpp:594
 msgid "Forward To..."
 msgstr "ਅੱਗੇ ਭੇਜੋ..."
 
-#: kmreaderwin.cpp:663
+#: kmreaderwin.cpp:597
 msgid "Add to Address Book"
 msgstr "ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਵਿੱਚ ਸ਼ਾਮਿਲ"
 
-#: kmreaderwin.cpp:666
+#: kmreaderwin.cpp:600
 msgid "Open in Address Book"
 msgstr "ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਵਿੱਚ ਖੋਲ੍ਹੋ"
 
-#: kmreaderwin.cpp:670
+#: kmreaderwin.cpp:604
 msgid "Select All Text"
 msgstr "ਸਭ ਪਾਠ ਚੁਣੋ"
 
-#: kmreaderwin.cpp:672
+#: kmreaderwin.cpp:606 kmreaderwin.cpp:1994
 msgid "Copy Link Address"
 msgstr "ਸਬੰਧ ਸਿਰਨਾਵੇਂ ਦੀ ਨਕਲ"
 
-#: kmreaderwin.cpp:674
+#: kmreaderwin.cpp:608
 msgid "Open URL"
 msgstr "URL ਖੋਲ੍ਹੋ"
 
-#: kmreaderwin.cpp:676
+#: kmreaderwin.cpp:610
 msgid "Bookmark This Link"
 msgstr "ਇਹ ਸਬੰਧ ਬੁੱਕਮਾਰਕ ਕਰੋ"
 
-#: kmreaderwin.cpp:680
+#: kmreaderwin.cpp:614
 msgid "Save Link As..."
 msgstr "ਸਬੰਧ ਇੰਜ ਸੰਭਾਲੋ..."
 
-#: kmreaderwin.cpp:687
+#: kmreaderwin.cpp:621
 msgid "Chat &With..."
 msgstr "ਇਸ ਨਾਲ ਗੱਲਬਾਤ..."
 
-#: kmreaderwin.cpp:1294
+#: kmreaderwin.cpp:1258
 msgid "Full namespace support for IMAP"
 msgstr ""
 
-#: kmreaderwin.cpp:1295
+#: kmreaderwin.cpp:1259
 msgid "Offline mode"
 msgstr "ਆਫਲਾਇਨ ਢੰਗ"
 
-#: kmreaderwin.cpp:1296
+#: kmreaderwin.cpp:1260
 msgid "Sieve script management and editing"
 msgstr ""
 
-#: kmreaderwin.cpp:1297
+#: kmreaderwin.cpp:1261
 msgid "Account specific filtering"
 msgstr "ਖਾਤਾ ਖਾਸ ਫਿਲਟਰ ਕਰਨਾ"
 
-#: kmreaderwin.cpp:1298
+#: kmreaderwin.cpp:1262
 msgid "Filtering of incoming mail for online IMAP accounts"
 msgstr "ਆਨਲਾਇਨ IMAP ਖਾਤਿਆਂ ਲਈ ਆਉਣ ਵਾਲੇ ਪੱਤਰਾਂ ਲਈ ਫਿਲਟਰ ਲਗਾਉਣੇ"
 
-#: kmreaderwin.cpp:1299
+#: kmreaderwin.cpp:1263
 msgid "Online IMAP folders can be used when filtering into folders"
 msgstr ""
 
-#: kmreaderwin.cpp:1300
+#: kmreaderwin.cpp:1264
 msgid "Automatically delete older mails on POP servers"
 msgstr "POP ਸਰਵਰ ਤੋਂ ਪੁਰਾਣੇ ਪੱਤਰ ਆਟੋਮੈਟਿਕ ਹੀ ਹਟਾਓ"
 
-#: kmreaderwin.cpp:1338
-msgid "The email client for the K Desktop Environment."
+#: kmreaderwin.cpp:1302
+#, fuzzy
+msgid "The email client for the Trinity Desktop Environment."
 msgstr "ਕੇ ਵੇਹੜਾ ਵਾਤਾਵਰਣ ਲਈ ਈ-ਮੇਲ ਕਲਾਂਇਟ ਹੈ।"
 
-#: kmreaderwin.cpp:1346
+#: kmreaderwin.cpp:1310
 msgid ""
 "<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
 "<p>Please wait . . .</p>&nbsp;"
@@ -8266,7 +9128,7 @@ msgstr ""
 "<h2 style='margin-top: 0px;'>ਫੋਲਡਰ ਭਾਗ ਪ੍ਰਾਪਤ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ</h2>"
 "<p>ਉਡੀਕ ਕਰੋ ਜੀ . . .</p>&nbsp;"
 
-#: kmreaderwin.cpp:1354
+#: kmreaderwin.cpp:1318
 msgid ""
 "<h2 style='margin-top: 0px;'>Offline</h2>"
 "<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
@@ -8276,7 +9138,7 @@ msgstr ""
 "<p>ਕੇ-ਮੇਲ ਇਸ ਸਮੇਂ ਆਫਲਾਇਨ ਢੰਗ ਵਿੱਚ ਹੈ। ਆਨਲਾਇਨ ਜਾਣ ਲਈ <a href=\"kmail:goOnline\">"
 "ਏਥੇ</a> ਦਬਾਓ . . .</p>&nbsp;"
 
-#: kmreaderwin.cpp:1371
+#: kmreaderwin.cpp:1335
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
@@ -8319,13 +9181,13 @@ msgstr ""
 "<p>ਤੁਹਾਡਾ ਧੰਨਵਾਦ,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; ਕੇਮੇਲ ਟੀਮ</p>"
 
-#: kmreaderwin.cpp:1394 kmreaderwin.cpp:1416
+#: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
 msgid ""
 "<li>%1</li>\n"
 msgstr ""
 "<li>%1</li>\n"
 
-#: kmreaderwin.cpp:1399
+#: kmreaderwin.cpp:1363
 msgid ""
 "<p>Please take a moment to fill in the KMail configuration panel at "
 "Settings-&gt;Configure KMail.\n"
@@ -8333,7 +9195,7 @@ msgid ""
 "outgoing mail account.</p>\n"
 msgstr ""
 
-#: kmreaderwin.cpp:1411
+#: kmreaderwin.cpp:1375
 msgid ""
 "<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
 "(compared to KMail %1):</p>\n"
@@ -8341,39 +9203,48 @@ msgstr ""
 "<p><span style='font-size:125%; font-weight:bold;'>ਖਾਸ ਤਬਦੀਲੀਆਂ</span> "
 "(KMail %1 ਦੇ ਮੁਕਾਬਲੇ):</p>\n"
 
-#: kmreaderwin.cpp:1555
+#: kmreaderwin.cpp:1518
 msgid "( body part )"
 msgstr "( ਮੁੱਖ ਭਾਗ)"
 
-#: kmreaderwin.cpp:1854
+#: kmreaderwin.cpp:1890
 msgid "Could not send MDN."
 msgstr "MDN ਨਾ ਭੇਜੋ"
 
-#: kmreaderwin.cpp:1978
+#: kmreaderwin.cpp:1992
+#, fuzzy
+msgid "Copy Email Address"
+msgstr "ਈ-ਮੇਲ ਸਿਰਨਾਵਾਂ"
+
+#: kmreaderwin.cpp:2044
 msgid "Decrypt With Chiasmus..."
 msgstr ""
 
-#: kmreaderwin.cpp:2133 kmreaderwin.cpp:2169 kmreaderwin.cpp:2188
+#: kmreaderwin.cpp:2050
+msgid "Scroll To"
+msgstr ""
+
+#: kmreaderwin.cpp:2208 kmreaderwin.cpp:2244 kmreaderwin.cpp:2264
 #, c-format
 msgid "View Attachment: %1"
 msgstr "ਨੱਥੀ ਝਲਕ: %1"
 
-#: kmreaderwin.cpp:2181
+#: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
 "_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 
-#: kmreaderwin.cpp:2277
+#: kmreaderwin.cpp:2353
 msgid "&Open with '%1'"
 msgstr "'%1' ਨਾਲ ਖੋਲ੍ਹੋ(&O)"
 
-#: kmreaderwin.cpp:2279
+#: kmreaderwin.cpp:2355
 msgid "&Open With..."
 msgstr "ਇਸ ਨਾਲ ਖੋਲ੍ਹੋ(&O)..."
 
-#: kmreaderwin.cpp:2281
+#: kmreaderwin.cpp:2357
 msgid ""
 "Open attachment '%1'?\n"
 "Note that opening an attachment may compromise your system's security."
@@ -8382,36 +9253,36 @@ msgstr ""
 "ਯਾਦ ਰੱਖੋ ਕਿ ਕਿਸੇ ਨੱਥੀ ਨੂੰ ਖੋਲ੍ਹਣ ਨਾਲ ਤੁਹਾਡੇ ਸਿਸਟਮ ਦੀ ਸੁਰੱਖਿਆ ਨੂੰ ਖਤਰਾ ਪੈਦਾ ਹੋ "
 "ਸਕਦਾ ਹੈ।"
 
-#: kmreaderwin.cpp:2286
+#: kmreaderwin.cpp:2362
 msgid "Open Attachment?"
 msgstr "ਕੀ ਨੱਥੀ ਖੋਲ੍ਹਣਾ ਹੈ?"
 
-#: kmreaderwin.cpp:2625
+#: kmreaderwin.cpp:2804
 msgid ""
 "Deleting an attachment might invalidate any digital signature on this message."
 msgstr ""
 
-#: kmreaderwin.cpp:2637
+#: kmreaderwin.cpp:2860
 msgid ""
 "Modifying an attachment might invalidate any digital signature on this message."
 msgstr ""
 
-#: kmreaderwin.cpp:2685
+#: kmreaderwin.cpp:2956
 #, fuzzy
 msgid "Attachments:"
 msgstr "ਨੱਥੀ"
 
-#: kmsearchpattern.cpp:898
+#: kmsearchpattern.cpp:913
 msgid ""
 "_: name used for a virgin filter\n"
 "unknown"
 msgstr "ਅਣਜਾਣ"
 
-#: kmsearchpattern.cpp:904
+#: kmsearchpattern.cpp:919
 msgid "(match any of the following)"
 msgstr "(ਕੋਈ ਵੀ ਮਿਲਦਾ)"
 
-#: kmsearchpattern.cpp:906
+#: kmsearchpattern.cpp:921
 msgid "(match all of the following)"
 msgstr "(ਸਭ ਨਾਲ ਮਿਲਦਾ)"
 
@@ -8450,33 +9321,52 @@ msgstr "<ਦਿਨਾਂ ਵਿੱਚ ਉਮਰ>"
 msgid "Message Status"
 msgstr "ਸੁਨੇਹਾ ਸੂਚੀ"
 
-#: kmsearchpatternedit.cpp:391
+#: kmsearchpatternedit.cpp:42
+#, fuzzy
+msgid "From"
+msgstr "ਵੱਲੋਂ(&F)"
+
+#: kmsearchpatternedit.cpp:43 recipientseditor.cpp:100
+msgid "To"
+msgstr "ਵੱਲ"
+
+#: kmsearchpatternedit.cpp:44 recipientseditor.cpp:102
+msgid "CC"
+msgstr "CC"
+
+#: kmsearchpatternedit.cpp:45
+#, fuzzy
+msgid "Reply To"
+msgstr "ਜਵਾਬ(&R)"
+
+#: kmsearchpatternedit.cpp:46
+#, fuzzy
+msgid "Organization"
+msgstr "ਸੰਗਠਨ:"
+
+#: kmsearchpatternedit.cpp:397
 msgid "Search Criteria"
 msgstr "ਖੋਜ ਸੀਮਾ"
 
-#: kmsearchpatternedit.cpp:408
+#: kmsearchpatternedit.cpp:414
 msgid "Match a&ll of the following"
 msgstr "ਸਭ ਨਾਲ ਮਿਲਦਾ ਹੋਵੇ(&l)"
 
-#: kmsearchpatternedit.cpp:409
+#: kmsearchpatternedit.cpp:415
 msgid "Match an&y of the following"
 msgstr "ਇਹਨਾਂ ਵਿੱਚੋਂ ਕੋਈ ਵੀ ਮਿਲਦਾ ਹੋਵੇ(&y)"
 
-#: kmsender.cpp:114
-msgid "Please create an account for sending and try again."
-msgstr "ਭੇਜਣ ਲਈ ਖਾਤਾ ਬਣਾ ਕੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰੋ ਜੀ।"
-
 #: kmsender.cpp:171
 msgid "Cannot add message to outbox folder"
 msgstr "ਸੁਨੇਹਾ ਬਾਹਰੀ-ਬਕਸਾ ਫੋਲਡਰ ਵਿੱਚ ਸ਼ਾਮਿਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ"
 
-#: kmsender.cpp:373
+#: kmsender.cpp:374
 msgid ""
 "Critical error: Unable to process sent mail (out of space?)Moving failing "
 "message to \"sent-mail\" folder."
 msgstr ""
 
-#: kmsender.cpp:385
+#: kmsender.cpp:386
 msgid ""
 "Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
 "failed.\n"
@@ -8484,14 +9374,14 @@ msgid ""
 "the problem and move the message manually."
 msgstr ""
 
-#: kmsender.cpp:431
+#: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
 "Please set the email address of identity '%1' in the Identities section of the "
 "configuration dialog and then try again."
 msgstr ""
 
-#: kmsender.cpp:453
+#: kmsender.cpp:454
 #, c-format
 msgid ""
 "_n: %n queued message successfully sent.\n"
@@ -8500,43 +9390,43 @@ msgstr ""
 "%n ਕਤਾਰਬੱਧ ਸੁਨੇਹਾ ਸਫਲਤਾਪੂਰਕ ਭੇਜਿਆ ਗਿਆ।\n"
 "%n ਕਤਾਰਬੱਧ ਸੁਨੇਹੇ ਸਫਲਤਾਪੂਰਕ ਭੇਜਿਆ ਗਿਆ।"
 
-#: kmsender.cpp:456
+#: kmsender.cpp:457
 msgid "%1 of %2 queued messages successfully sent."
 msgstr "%2 ਵਿੱਚ %1 ਕਤਾਰਬੱਧ ਸੁਨੇਹਾ ਸਫਲਤਾਪੂਰਕ ਭੇਜਿਆ ਹੈ।"
 
-#: kmsender.cpp:471
+#: kmsender.cpp:472
 msgid "Sending messages"
 msgstr "ਸੁਨੇਹੇ ਭੇਜੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: kmsender.cpp:472
+#: kmsender.cpp:473
 msgid "Initiating sender process..."
 msgstr "ਭੇਜਣ ਕਾਰਵਾਈ ਦੀ ਕਾਰਵਾਈ ਸ਼ੁਰੂ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
 
-#: kmsender.cpp:502
+#: kmsender.cpp:503
 msgid ""
 "You have chosen to send all queued email using an unencrypted transport, do you "
 "want to continue? "
 msgstr ""
 
-#: kmsender.cpp:504
+#: kmsender.cpp:505
 msgid "Send Unencrypted"
 msgstr "ਨਾ-ਇੰਕ੍ਰਿਪਟ ਕੀਤਾ ਹੀ ਭੇਜੋ"
 
-#: kmsender.cpp:556
+#: kmsender.cpp:557
 msgid "Unrecognized transport protocol. Unable to send message."
 msgstr "ਅਣਜਾਣਾ ਟਰਾਂਸਪੋਰਟ ਪਰੋਟੋਕਾਲ ਹੈ। ਸੁਨੇਹਾ ਭੇਜਣ ਵਿੱਚ ਅਸਫ਼ਲ ਹੈ।"
 
-#: kmsender.cpp:597
+#: kmsender.cpp:598
 msgid ""
 "_: %3: subject of message\n"
 "Sending message %1 of %2: %3"
 msgstr "%2 ਵਿੱਚੋਂ %1 ਸੁਨੇਹਾ: %3 ਭੇਜਿਆ ਦਾ ਰਿਹਾ ਹੈ"
 
-#: kmsender.cpp:616
+#: kmsender.cpp:617
 msgid "Failed to send (some) queued messages."
 msgstr "(ਕੁਝ) ਕਤਾਰਬੱਧ ਸੁਨੇਹੇ ਭੇਜਣ ਲਈ ਅਸਫ਼ਲ ਹੈ।"
 
-#: kmsender.cpp:693
+#: kmsender.cpp:694
 msgid ""
 "Sending aborted:\n"
 "%1\n"
@@ -8546,11 +9436,11 @@ msgid ""
 "  %2"
 msgstr ""
 
-#: kmsender.cpp:701 kmsender.cpp:746
+#: kmsender.cpp:702 kmsender.cpp:747
 msgid "Sending aborted."
 msgstr "ਭੇਜਣਾ ਅਧੂਰਾ ਛੱਡਿਆ ਗਿਆ"
 
-#: kmsender.cpp:719
+#: kmsender.cpp:720
 msgid ""
 "<p>Sending failed:</p>"
 "<p>%1</p>"
@@ -8561,19 +9451,19 @@ msgid ""
 "<p>Do you want me to continue sending the remaining messages?</p>"
 msgstr ""
 
-#: kmsender.cpp:729
+#: kmsender.cpp:730
 msgid "Continue Sending"
 msgstr "ਭੇਜਣਾ ਜਾਰੀ ਰੱਖੋ"
 
-#: kmsender.cpp:729
+#: kmsender.cpp:730
 msgid "&Continue Sending"
 msgstr "ਭੇਜਣਾ ਜਾਰੀ ਰੱਖੋ(&C)"
 
-#: kmsender.cpp:730
+#: kmsender.cpp:731
 msgid "&Abort Sending"
 msgstr "ਭੇਜਣ ਅਧੂਰਾ ਛੱਡੋ(&A)"
 
-#: kmsender.cpp:732
+#: kmsender.cpp:733
 msgid ""
 "Sending failed:\n"
 "%1\n"
@@ -8583,11 +9473,11 @@ msgid ""
 " %2"
 msgstr ""
 
-#: kmsender.cpp:930
+#: kmsender.cpp:931
 msgid "Please specify a mailer program in the settings."
 msgstr "ਸੈਟਿੰਗ ਵਿੱਚ ਪੱਤਰ ਕਾਰਜ ਦਿਓ ਜੀ।"
 
-#: kmsender.cpp:931
+#: kmsender.cpp:932
 msgid ""
 "Sending failed:\n"
 "%1\n"
@@ -8597,65 +9487,65 @@ msgid ""
 "  %2"
 msgstr ""
 
-#: kmsender.cpp:979
+#: kmsender.cpp:980
 #, c-format
 msgid "Failed to execute mailer program %1"
 msgstr "ਪੱਤਰ ਕਾਰਜ %1 ਚਲਾਉਣ ਦੌਰਾਨ ਅਸਫਲ"
 
-#: kmsender.cpp:1029
+#: kmsender.cpp:1030
 msgid "Sendmail exited abnormally."
 msgstr "Sendmail ਅਚਾਨਕ ਬੰਦ ਹੋ ਗਈ।"
 
-#: kmsender.cpp:1099
+#: kmsender.cpp:1100
 msgid "You need to supply a username and a password to use this SMTP server."
 msgstr "ਤੁਹਾਨੂੰ ਇਹ SMTP ਸਰਵਰ ਲਈ ਇੱਕ ਉਪਭੋਗੀ ਨਾਂ ਅਤੇ ਇੱਕ ਗੁਪਤ-ਕੋਡ ਦੇਣਾ ਪਵੇਗਾ।"
 
-#: kmstartup.cpp:197
+#: kmstartup.cpp:198
 msgid ""
 "%1 already seems to be running on another display on this machine. Running %2 "
 "more than once can cause the loss of mail. You should not start %1 unless you "
 "are sure that it is not already running."
 msgstr ""
 
-#: kmstartup.cpp:207
+#: kmstartup.cpp:208
 msgid ""
 "%1 seems to be running on another display on this machine. Running %1 and %2 at "
 "the same time can cause the loss of mail. You should not start %2 unless you "
 "are sure that %1 is not running."
 msgstr ""
 
-#: kmstartup.cpp:215
+#: kmstartup.cpp:216
 msgid ""
 "%1 already seems to be running on %2. Running %1 more than once can cause the "
 "loss of mail. You should not start %1 on this computer unless you are sure that "
 "it is not already running on %2."
 msgstr ""
 
-#: kmstartup.cpp:221
+#: kmstartup.cpp:222
 msgid ""
 "%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
 "loss of mail. You should not start %2 on this computer unless you are sure that "
 "%1 is not running on %3."
 msgstr ""
 
-#: kmstartup.cpp:231
+#: kmstartup.cpp:232
 #, c-format
 msgid "Start %1"
 msgstr "%1 ਸ਼ੁਰੂ"
 
-#: kmstartup.cpp:232
+#: kmstartup.cpp:233
 msgid "Exit"
 msgstr "ਬਾਹਰ"
 
-#: kmsystemtray.cpp:337
+#: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "ਨਵਾਂ ਸੁਨੇਹੇ ਹਨ"
 
-#: kmsystemtray.cpp:547
+#: kmsystemtray.cpp:567
 msgid "There are no unread messages"
 msgstr "ਕੋਈ ਨਾ-ਪੜ੍ਹੇ ਸੁਨੇਹੇ ਨਹੀਂ ਹਨ"
 
-#: kmsystemtray.cpp:549
+#: kmsystemtray.cpp:569
 #, c-format
 msgid ""
 "_n: There is 1 unread message.\n"
@@ -8909,51 +9799,56 @@ msgstr "ਸਿਈਵੀ ਸਕਰਿਪਟ ਪਰਬੰਧ"
 msgid "Available Scripts"
 msgstr "ਉਪਲੱਬਧ ਸਕਰਿਪਟਾਂ"
 
-#: managesievescriptsdialog.cpp:116
+#: managesievescriptsdialog.cpp:121
 msgid "No Sieve URL configured"
 msgstr "ਕੋਈ ਸਿਈਵੀ URL ਸੰਰਚਿਤ ਨਹੀਂ"
 
-#: managesievescriptsdialog.cpp:135
+#: managesievescriptsdialog.cpp:140
 msgid "Failed to fetch the list of scripts"
 msgstr ""
 
-#: managesievescriptsdialog.cpp:160
+#: managesievescriptsdialog.cpp:165
 msgid "Delete Script"
 msgstr "ਸਕਰਿਪਟ ਹਟਾਓ"
 
-#: managesievescriptsdialog.cpp:161
+#: managesievescriptsdialog.cpp:166
 msgid "Edit Script..."
 msgstr "ਸਕਰਿਪਟ ਸੋਧ..."
 
-#: managesievescriptsdialog.cpp:164
+#: managesievescriptsdialog.cpp:167
+#, fuzzy
+msgid "Deactivate Script"
+msgstr "ਸਕਰਿਪਟ ਹਟਾਓ"
+
+#: managesievescriptsdialog.cpp:170
 msgid "New Script..."
 msgstr "ਨਵੀਂ ਸਕਰਿਪਟ..."
 
-#: managesievescriptsdialog.cpp:233
+#: managesievescriptsdialog.cpp:256
 msgid "Really delete script \"%1\" from the server?"
 msgstr ""
 
-#: managesievescriptsdialog.cpp:234
+#: managesievescriptsdialog.cpp:257
 msgid "Delete Sieve Script Confirmation"
 msgstr ""
 
-#: managesievescriptsdialog.cpp:278
+#: managesievescriptsdialog.cpp:300
 msgid "New Sieve Script"
 msgstr "ਨਵੀਂ ਸਿਈਵੀ ਸਕਰਿਪਟ"
 
-#: managesievescriptsdialog.cpp:279
+#: managesievescriptsdialog.cpp:301
 msgid "Please enter a name for the new Sieve script:"
 msgstr "ਨਵੀਂ ਸਿਈਵੀ ਸਕਰਿਪਟ ਲਈ ਇੱਕ ਨਵਾਂ ਨਾਂ ਦਿਓ ਜੀ:"
 
-#: managesievescriptsdialog.cpp:293
+#: managesievescriptsdialog.cpp:315
 msgid "Edit Sieve Script"
 msgstr "ਸਿਈਵੀ ਸਕਰਿਪਟ ਸੋਧ"
 
-#: managesievescriptsdialog.cpp:337
+#: managesievescriptsdialog.cpp:367
 msgid "The Sieve script was successfully uploaded."
 msgstr ""
 
-#: managesievescriptsdialog.cpp:338
+#: managesievescriptsdialog.cpp:368
 msgid "Sieve Script Upload"
 msgstr "ਸਿਈਵੀ ਸਕਰਿਪਟ ਅੱਪਲੋਡ"
 
@@ -8963,7 +9858,7 @@ msgid ""
 "&Reply"
 msgstr "ਜਵਾਬ(&R)"
 
-#: messageactions.cpp:48 searchwindow.cpp:311
+#: messageactions.cpp:48 searchwindow.cpp:312
 msgid "&Reply..."
 msgstr "ਜਵਾਬ(&R)..."
 
@@ -8971,11 +9866,11 @@ msgstr "ਜਵਾਬ(&R)..."
 msgid "Reply to A&uthor..."
 msgstr "ਲੇਖਕ ਨੂੰ ਜਵਾਬ(&u)..."
 
-#: messageactions.cpp:58 searchwindow.cpp:313
+#: messageactions.cpp:58 searchwindow.cpp:314
 msgid "Reply to &All..."
 msgstr "ਸਭ ਨੂੰ ਜਵਾਬ(&A)..."
 
-#: messageactions.cpp:63 searchwindow.cpp:316
+#: messageactions.cpp:63 searchwindow.cpp:317
 msgid "Reply to Mailing-&List..."
 msgstr "ਮੇਲਿੰਗ ਲਿਸਟ ਨੂੰ ਜਵਾਬ(&L)..."
 
@@ -9037,7 +9932,7 @@ msgstr "ਖਾਸ ਸੁਨੇਹਾ ਨਿਸ਼ਾਨ ਹਟਾਓ(&I)"
 msgid "&Edit Message"
 msgstr "ਸੁਨੇਹਾ ਸੋਧ(&E)"
 
-#: messagecomposer.cpp:222
+#: messagecomposer.cpp:223
 msgid ""
 "<qt>"
 "<p>Structuring information returned by the Crypto plug-in could not be "
@@ -9045,7 +9940,7 @@ msgid ""
 "<p>Please contact your system administrator.</p></qt>"
 msgstr ""
 
-#: messagecomposer.cpp:226
+#: messagecomposer.cpp:227
 msgid ""
 "<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
 "successfully.</p>"
@@ -9057,7 +9952,7 @@ msgid ""
 "Identity->Advanced tab.</li></ul>"
 msgstr ""
 
-#: messagecomposer.cpp:444
+#: messagecomposer.cpp:445
 msgid ""
 "No suitable encoding could be found for your message.\n"
 "Please set an encoding using the 'Options' menu."
@@ -9065,168 +9960,168 @@ msgstr ""
 "ਤੁਹਾਡੇ ਸੁਨੇਹੇ ਲਈ ਕੋਈ ਢੁੱਕਵੀ ਇੰਕੋਡਿੰਗ ਲੱਭਣ ਲਈ ਅਸਫ਼ਲ ਹੈ।\n"
 "ਕਿਰਪਾ ਕਰਕੇ 'ਚੋਣ' ਮੇਨੂ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਇੱਕ ਇੰਕੋਡਿੰਗ ਦਿਓ।"
 
-#: messagecomposer.cpp:556
+#: messagecomposer.cpp:557
 msgid ""
 "Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
 "bug."
 msgstr ""
 
-#: messagecomposer.cpp:564
+#: messagecomposer.cpp:565
 msgid ""
 "The \"x-encrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:572
+#: messagecomposer.cpp:573
 msgid "Chiasmus Encryption Error"
 msgstr ""
 
-#: messagecomposer.cpp:577
+#: messagecomposer.cpp:578
 msgid ""
 "Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
 "not return a byte array. Please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:638
+#: messagecomposer.cpp:636
 msgid ""
 "The inline OpenPGP crypto message format does not support encryption or signing "
 "of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 
-#: messagecomposer.cpp:642
+#: messagecomposer.cpp:640
 msgid "Insecure Message Format"
 msgstr "ਨਾ-ਸੁਰੱਖਿਅਤ ਸੁਨੇਹਾ ਫਾਰਮੈਟ"
 
-#: messagecomposer.cpp:643
+#: messagecomposer.cpp:641
 msgid "Use Inline OpenPGP"
 msgstr "ਸਤਰ 'ਚ OpenPGP ਵਰਤੋਂ"
 
-#: messagecomposer.cpp:644
+#: messagecomposer.cpp:642
 msgid "Use OpenPGP/MIME"
 msgstr "OpenPGP/MIME ਵਰਤੋਂ"
 
-#: messagecomposer.cpp:760
+#: messagecomposer.cpp:758
 msgid ""
 "Examination of the recipient's signing preferences yielded that you be asked "
 "whether or not to sign this message.\n"
 "Sign this message?"
 msgstr ""
 
-#: messagecomposer.cpp:765 messagecomposer.cpp:788
+#: messagecomposer.cpp:763 messagecomposer.cpp:786
 msgid "Sign Message?"
 msgstr "ਕੀ ਸੁਨੇਹਾ ਉੱਤੇ ਦਸਤਖਤ ਕਰਨੇ ਹਨ?"
 
-#: messagecomposer.cpp:766 messagecomposer.cpp:789
+#: messagecomposer.cpp:764 messagecomposer.cpp:787
 msgid ""
 "_: to sign\n"
 "&Sign"
 msgstr "ਦਸਤਖਤ(&S)"
 
-#: messagecomposer.cpp:767 messagecomposer.cpp:790
+#: messagecomposer.cpp:765 messagecomposer.cpp:788
 msgid "Do &Not Sign"
 msgstr "ਦਸਤਖਤ ਨਾ ਕਰੋ(&N)"
 
-#: messagecomposer.cpp:784
+#: messagecomposer.cpp:782
 msgid ""
 "There are conflicting signing preferences for these recipients.\n"
 "Sign this message?"
 msgstr ""
 
-#: messagecomposer.cpp:806
+#: messagecomposer.cpp:804
 msgid ""
 "You have requested to sign this message, but no valid signing keys have been "
 "configured for this identity."
 msgstr ""
 
-#: messagecomposer.cpp:810
+#: messagecomposer.cpp:808
 msgid "Send Unsigned?"
 msgstr "ਕੀ ਬਿਨ-ਦਸਤਖਤ ਹੀ ਭੇਜਣਾ ਹੈ?"
 
-#: messagecomposer.cpp:811
+#: messagecomposer.cpp:809
 msgid "Send &Unsigned"
 msgstr "ਨਾ-ਦਸਤਖਤੀ ਭੇਜੋ(&U)"
 
-#: messagecomposer.cpp:826
+#: messagecomposer.cpp:824
 msgid ""
 "Some parts of this message will not be signed.\n"
 "Sending only partially signed messages might violate site policy.\n"
 "Sign all parts instead?"
 msgstr ""
 
-#: messagecomposer.cpp:829
+#: messagecomposer.cpp:827
 msgid ""
 "This message will not be signed.\n"
 "Sending unsigned message might violate site policy.\n"
 "Sign message instead?"
 msgstr ""
 
-#: messagecomposer.cpp:833
+#: messagecomposer.cpp:831
 msgid "&Sign All Parts"
 msgstr "ਸਭ ਭਾਗਾਂ ਲਈ ਦਸਤਖਤ(&S)"
 
-#: messagecomposer.cpp:833
+#: messagecomposer.cpp:831
 msgid "&Sign"
 msgstr "ਦਸਤਖਤ(&S)"
 
-#: messagecomposer.cpp:835
+#: messagecomposer.cpp:833
 msgid "Unsigned-Message Warning"
 msgstr "ਨਾ-ਦਸਤਖਤੀ ਸੁਨੇਹਾ ਚੇਤਾਵਨੀ"
 
-#: messagecomposer.cpp:837
+#: messagecomposer.cpp:835
 msgid "Send &As Is"
 msgstr "ਇੰਝ ਭੇਜੋ(&A)"
 
-#: messagecomposer.cpp:875
+#: messagecomposer.cpp:873
 msgid ""
 "Valid trusted encryption keys were found for all recipients.\n"
 "Encrypt this message?"
 msgstr ""
 
-#: messagecomposer.cpp:877
+#: messagecomposer.cpp:875
 msgid ""
 "Examination of the recipient's encryption preferences yielded that you be asked "
 "whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 
-#: messagecomposer.cpp:882 messagecomposer.cpp:909
+#: messagecomposer.cpp:880 messagecomposer.cpp:907
 msgid "Encrypt Message?"
 msgstr "ਕੀ ਸੁਨੇਹਾ ਇਕ੍ਰਿਪਟ ਕਰਨਾ ਹੈ?"
 
-#: messagecomposer.cpp:884
+#: messagecomposer.cpp:882
 msgid "Sign && &Encrypt"
 msgstr "ਦਸਤਖਤ && ਇਕ੍ਰਿਪਟ(&E)"
 
-#: messagecomposer.cpp:887 messagecomposer.cpp:962
+#: messagecomposer.cpp:885 messagecomposer.cpp:960
 msgid "&Sign Only"
 msgstr "ਸਿਰਫ਼ ਦਸਤਖਤ(&S)"
 
-#: messagecomposer.cpp:888 messagecomposer.cpp:963
+#: messagecomposer.cpp:886 messagecomposer.cpp:961
 msgid "&Send As-Is"
 msgstr "ਜਿਵੇਂ ਹੈ ਤਿਵੇਂ ਹੀ ਭੇਜੋ(&S)"
 
-#: messagecomposer.cpp:905
+#: messagecomposer.cpp:903
 msgid ""
 "There are conflicting encryption preferences for these recipients.\n"
 "Encrypt this message?"
 msgstr ""
 
-#: messagecomposer.cpp:911
+#: messagecomposer.cpp:909
 msgid "Do &Not Encrypt"
 msgstr "ਇਕ੍ਰਿਪਟ ਨਾ ਕਰੋ(&N)"
 
-#: messagecomposer.cpp:927
+#: messagecomposer.cpp:925
 msgid ""
 "You have requested to encrypt this message, and to encrypt a copy to yourself, "
 "but no valid trusted encryption keys have been configured for this identity."
 msgstr ""
 
-#: messagecomposer.cpp:932
+#: messagecomposer.cpp:930
 msgid "Send Unencrypted?"
 msgstr "ਕੀ ਬਿਨਾਂ-ਇੰਕਰਿਪਸ਼ਨ ਹੀ ਭੇਜਣਾ ਹੈ?"
 
-#: messagecomposer.cpp:948
+#: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
 "Sending only partially encrypted messages might violate site policy and/or leak "
@@ -9234,7 +10129,7 @@ msgid ""
 "Encrypt all parts instead?"
 msgstr ""
 
-#: messagecomposer.cpp:952
+#: messagecomposer.cpp:950
 msgid ""
 "This message will not be encrypted.\n"
 "Sending unencrypted messages might violate site policy and/or leak sensitive "
@@ -9242,15 +10137,15 @@ msgid ""
 "Encrypt messages instead?"
 msgstr ""
 
-#: messagecomposer.cpp:957
+#: messagecomposer.cpp:955
 msgid "&Encrypt All Parts"
 msgstr "ਸਭ ਭਾਗ ਇਕ੍ਰਿਪਟ"
 
-#: messagecomposer.cpp:959
+#: messagecomposer.cpp:957
 msgid "Unencrypted Message Warning"
 msgstr "ਨਾ-ਇਕ੍ਰਪਿਟਡ ਸੁਨੇਹਾ ਚੇਤਾਵਨੀ"
 
-#: messagecomposer.cpp:2040
+#: messagecomposer.cpp:2038
 msgid ""
 "<qt>"
 "<p>Error: The backend did not return any encoded data.</p>"
@@ -9258,7 +10153,7 @@ msgid ""
 "<br>%2</p></qt>"
 msgstr ""
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2111
 msgid ""
 "<qt>Not all characters fit into the chosen encoding."
 "<br>"
@@ -9268,69 +10163,75 @@ msgstr ""
 "<br> "
 "<br>ਕੀ ਸੁਨੇਹਾ ਕਿਸੇ ਵੀ ਤਰ੍ਹਾਂ ਭੇਜਣਾ ਹੈ?</qt>"
 
-#: messagecomposer.cpp:2115
+#: messagecomposer.cpp:2113
 msgid "Some Characters Will Be Lost"
 msgstr "ਕੁਝ ਅੱਖਰ ਗੁਆਚ ਜਾਣਗੇ"
 
-#: messagecomposer.cpp:2116
+#: messagecomposer.cpp:2114
 msgid "Lose Characters"
 msgstr "ਗੁੰਮ ਅੱਖਰ"
 
-#: messagecomposer.cpp:2116
+#: messagecomposer.cpp:2114
 msgid "Change Encoding"
 msgstr "ਇਕੋਡਿੰਗ ਤਬਦੀਲ"
 
-#: messagecomposer.cpp:2164
+#: messagecomposer.cpp:2149
+msgid ""
+"This message could not be signed, since no valid signing keys have been found; "
+"this should actually never happen, please report this bug."
+msgstr ""
+
+#: messagecomposer.cpp:2168
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2185
+#: messagecomposer.cpp:2195
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2190
+#: messagecomposer.cpp:2200
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2213
+#: messagecomposer.cpp:2223
 msgid ""
 "This message could not be encrypted, since the chosen backend does not seem to "
 "support encryption; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2233 messagecomposer.cpp:2278
+#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2255
+#: messagecomposer.cpp:2271
 msgid ""
 "This message could not be signed and encrypted, since the chosen backend does "
 "not seem to support combined signing and encryption; this should actually never "
 "happen, please report this bug."
 msgstr ""
 
-#: newfolderdialog.cpp:58
+#: newfolderdialog.cpp:59
 msgid "New Folder"
 msgstr "ਨਵਾਂ ਫੋਲਡਰ"
 
-#: newfolderdialog.cpp:65
+#: newfolderdialog.cpp:69
 #, c-format
 msgid "New Subfolder of %1"
 msgstr "%1 ਦਾ ਨਵਾਂ ਸਬ-ਫੋਲਡਰ"
 
-#: newfolderdialog.cpp:81
+#: newfolderdialog.cpp:85
 msgid "Enter a name for the new folder."
 msgstr "ਨਵੇਂ ਫੋਲਡਰ ਲਈ ਨਾਂ ਦਿਓ।"
 
-#: newfolderdialog.cpp:92
+#: newfolderdialog.cpp:96
 msgid "Mailbox &format:"
 msgstr "Mailbox ਫਾਰਮੈਟ(&f):"
 
-#: newfolderdialog.cpp:97
+#: newfolderdialog.cpp:101
 msgid ""
 "Select whether you want to store the messages in this folder as one file per  "
 "message (maildir) or as one big file (mbox). KMail uses maildir by default and "
@@ -9338,133 +10239,120 @@ msgid ""
 "this option as-is."
 msgstr ""
 
-#: newfolderdialog.cpp:119
+#: newfolderdialog.cpp:124
 msgid "Folder &contains:"
 msgstr "ਫੋਲਡਰ ਰੱਖਦਾ ਹੈ(&c):"
 
-#: newfolderdialog.cpp:124
+#: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
 "storage of groupware items such as tasks or notes. The default is mail. If you "
 "are unsure, leave this option as-is."
 msgstr ""
 
-#: newfolderdialog.cpp:160
+#: newfolderdialog.cpp:165
 msgid "Namespace for &folder:"
 msgstr ""
 
-#: newfolderdialog.cpp:165
+#: newfolderdialog.cpp:170
 msgid "Select the personal namespace the folder should be created in."
 msgstr ""
 
-#: newfolderdialog.cpp:188
+#: newfolderdialog.cpp:193
 msgid "Please specify a name for the new folder."
 msgstr "ਨਵੇਂ ਫੋਲਡਰ ਲਈ ਇੱਕ ਨਾਂ ਦਿਓ ਜੀ।"
 
-#: newfolderdialog.cpp:189
+#: newfolderdialog.cpp:194
 msgid "No Name Specified"
 msgstr "ਕੋਈ ਨਾਂ ਨਹੀਂ ਦਿੱਤਾ"
 
-#: newfolderdialog.cpp:198
-msgid ""
-"Folder names cannot contain the / (slash) character; please choose another "
-"folder name."
-msgstr ""
-
-#: newfolderdialog.cpp:204
-msgid ""
-"Folder names cannot start with a . (dot) character; please choose another "
-"folder name."
-msgstr ""
-
-#: newfolderdialog.cpp:223
-msgid ""
-"Your IMAP server does not allow the character '%1'; please choose another "
-"folder name."
-msgstr ""
-
-#: newfolderdialog.cpp:240
+#: newfolderdialog.cpp:216
 msgid "<qt>Failed to create folder <b>%1</b>, folder already exists.</qt>"
 msgstr "<qt>ਫੋਲਡਰ <b>%1</b> ਬਣਾਉਣ ਲਈ ਅਸਫ਼ਲ ਹੈ, ਫੋਲਡਰ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ।</qt>"
 
-#: newfolderdialog.cpp:246
+#: newfolderdialog.cpp:222
 msgid "<qt>Failed to create folder <b>%1</b>.</qt> "
 msgstr "<qt>ਫੋਲਡਰ <b>%1</b> ਬਣਾਉਣ ਲਈ ਅਸਫ਼ਲ ਹੈ।</qt>"
 
-#: objecttreeparser.cpp:450
+#: objecttreeparser.cpp:490
 msgid "Wrong Crypto Plug-In."
 msgstr "ਗਲਤ ਕਰਿਪ-ਟੂ ਪਲੱਗਿੰਨ ਹੈ।"
 
-#: objecttreeparser.cpp:490 objecttreeparser.cpp:1909
+#: objecttreeparser.cpp:594 objecttreeparser.cpp:2130
 msgid "Different results for signatures"
 msgstr "ਦਸਤਖਤਾਂ ਲਈ ਵੱਖਰੇ ਨਤੀਜੇ"
 
-#: objecttreeparser.cpp:573
+#: objecttreeparser.cpp:667
 msgid "The crypto engine returned no cleartext data."
 msgstr ""
 
-#: objecttreeparser.cpp:576 objecttreeparser.cpp:2350
-#: objecttreeparser.cpp:2393
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
+#: objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "ਹਾਲਤ: "
 
-#: objecttreeparser.cpp:583
+#: objecttreeparser.cpp:677
 msgid "(unknown)"
 msgstr "(ਅਣਜਾਣ)"
 
-#: objecttreeparser.cpp:594 objecttreeparser.cpp:748
+#: objecttreeparser.cpp:688 objecttreeparser.cpp:903
 msgid "Crypto plug-in \"%1\" is not initialized."
 msgstr ""
 
-#: objecttreeparser.cpp:598
+#: objecttreeparser.cpp:692
 msgid "Crypto plug-in \"%1\" cannot verify signatures."
 msgstr ""
 
-#: objecttreeparser.cpp:603 objecttreeparser.cpp:756
+#: objecttreeparser.cpp:697 objecttreeparser.cpp:911
 msgid "No appropriate crypto plug-in was found."
 msgstr "ਕੋਈ ਢੁੱਕਵੀਂ ਕਰਿਪ-ਟੂ ਪਲੱਗਇਨ ਨਹੀਂ ਲੱਭੀ ਹੈ।"
 
-#: objecttreeparser.cpp:606
+#: objecttreeparser.cpp:700
 msgid ""
 "_: %1 is either 'OpenPGP' or 'S/MIME'\n"
 "No %1 plug-in was found."
 msgstr "ਕੋਈ %1 ਪਲੱਗਇਨ ਨਹੀਂ ਲੱਭੀ ਹੈ।"
 
-#: objecttreeparser.cpp:610
+#: objecttreeparser.cpp:704
 #, c-format
 msgid ""
 "The message is signed, but the validity of the signature cannot be verified.<br "
 "/>Reason: %1"
 msgstr ""
 
-#: objecttreeparser.cpp:667
+#: objecttreeparser.cpp:737
+#, fuzzy
+msgid "Encrypted data not shown"
+msgstr "ਇਨਕਰਿਪਟ ਕੀਤਾ ਡਾਟਾ ਨਹੀਂ ਵੇਖਾਇਆ।"
+
+#: objecttreeparser.cpp:755
 #, fuzzy
 msgid "This message is encrypted."
 msgstr "OpenPGP ਸੁਨੇਹਾ - ਇੰਕਰਿਪਟਡ"
 
-#: objecttreeparser.cpp:672
+#: objecttreeparser.cpp:760
 #, fuzzy
 msgid "Decrypt Message"
 msgstr "ਸੁਨੇਹਾ ਇੰਕਰਿਪਟ(&E)"
 
-#: objecttreeparser.cpp:731 objecttreeparser.cpp:744 objecttreeparser.cpp:773
+#: objecttreeparser.cpp:886 objecttreeparser.cpp:899 objecttreeparser.cpp:928
 msgid "Encrypted data not shown."
 msgstr "ਇਨਕਰਿਪਟ ਕੀਤਾ ਡਾਟਾ ਨਹੀਂ ਵੇਖਾਇਆ।"
 
-#: objecttreeparser.cpp:734
+#: objecttreeparser.cpp:889
 msgid "Crypto plug-in \"%1\" could not decrypt the data."
 msgstr ""
 
-#: objecttreeparser.cpp:737
+#: objecttreeparser.cpp:892
 #, c-format
 msgid "Error: %1"
 msgstr "ਗਲਤੀ: %1"
 
-#: objecttreeparser.cpp:752
+#: objecttreeparser.cpp:907
 msgid "Crypto plug-in \"%1\" cannot decrypt messages."
 msgstr ""
 
-#: objecttreeparser.cpp:844
+#: objecttreeparser.cpp:1000
 msgid ""
 "<b>Note:</b> This HTML message may contain external references to images etc. "
 "For security/privacy reasons external references are not loaded. If you trust "
@@ -9472,7 +10360,7 @@ msgid ""
 "message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
 
-#: objecttreeparser.cpp:854
+#: objecttreeparser.cpp:1010
 msgid ""
 "<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
 "code is shown. If you trust the sender of this message then you can activate "
@@ -9480,319 +10368,347 @@ msgid ""
 "by clicking here</a>."
 msgstr ""
 
-#: objecttreeparser.cpp:1451
+#: objecttreeparser.cpp:1227
+msgid ""
+"This message is a <i>Toltec</i> Groupware object, it can only be viewed with "
+"Microsoft Outlook in combination with the Toltec connector."
+msgstr ""
+
+#: objecttreeparser.cpp:1239
+#, fuzzy
+msgid "Show Raw Message"
+msgstr "ਸੁਨੇਹਾ ਅੱਗੇ ਭੇਜੋ"
+
+#: objecttreeparser.cpp:1658
 #, c-format
 msgid "Sorry, certificate could not be imported.<br>Reason: %1"
 msgstr ""
 
-#: objecttreeparser.cpp:1461
+#: objecttreeparser.cpp:1668
 msgid "Sorry, no certificates were found in this message."
 msgstr ""
 
-#: objecttreeparser.cpp:1464
+#: objecttreeparser.cpp:1671
 msgid "Certificate import status:"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਆਯਾਤ ਹਾਲਤ:"
 
-#: objecttreeparser.cpp:1467
+#: objecttreeparser.cpp:1674
 #, c-format
 msgid ""
 "_n: 1 new certificate was imported.\n"
 "%n new certificates were imported."
 msgstr ""
 
-#: objecttreeparser.cpp:1470
+#: objecttreeparser.cpp:1677
 #, c-format
 msgid ""
 "_n: 1 certificate was unchanged.\n"
 "%n certificates were unchanged."
 msgstr ""
 
-#: objecttreeparser.cpp:1473
+#: objecttreeparser.cpp:1680
 #, c-format
 msgid ""
 "_n: 1 new secret key was imported.\n"
 "%n new secret keys were imported."
 msgstr ""
 
-#: objecttreeparser.cpp:1476
+#: objecttreeparser.cpp:1683
 #, c-format
 msgid ""
 "_n: 1 secret key was unchanged.\n"
 "%n secret keys were unchanged."
 msgstr ""
 
-#: objecttreeparser.cpp:1485
+#: objecttreeparser.cpp:1692
 msgid "Sorry, no details on certificate import available."
 msgstr "ਮੁਆਫੀ, ਸਰਟੀਫਕੇਟ ਆਯਾਤ ਤੇ ਕੋਈ ਵੇਰਵਾ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ"
 
-#: objecttreeparser.cpp:1488
+#: objecttreeparser.cpp:1695
 msgid "Certificate import details:"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਆਯਾਤ ਵੇਰਵਾ:"
 
-#: objecttreeparser.cpp:1491
+#: objecttreeparser.cpp:1698
 msgid "Failed: %1 (%2)"
 msgstr "ਅਸਫਲ: %1 (%2)"
 
-#: objecttreeparser.cpp:1496
+#: objecttreeparser.cpp:1703
 msgid "New or changed: %1 (secret key available)"
 msgstr "ਨਵਾਂ ਜਾਂ ਤਬਦੀਲ: %1 (ਗੁਪਤ-ਕੁੰਜੀ ਉਪਲੱਬਧ)"
 
-#: objecttreeparser.cpp:1498
+#: objecttreeparser.cpp:1706
 #, c-format
 msgid "New or changed: %1"
 msgstr "ਨਵਾਂ ਜਾਂ ਤਬਦੀਲ: %1"
 
-#: objecttreeparser.cpp:1891
+#: objecttreeparser.cpp:2112
 msgid "Error: Signature not verified"
 msgstr "ਗਲਤੀ: ਦਸਤਖਤ ਜਾਂਚ ਕੀਤੇ ਨਹੀਂ ਹਨ"
 
-#: objecttreeparser.cpp:1894
+#: objecttreeparser.cpp:2115
 msgid "Good signature"
 msgstr "ਵਧੀਆ ਦਸਤਖਤ"
 
-#: objecttreeparser.cpp:1897
+#: objecttreeparser.cpp:2118
 msgid "<b>Bad</b> signature"
 msgstr "<b>ਗਲਤ </b>ਦਸਤਖਤ"
 
-#: objecttreeparser.cpp:1900
+#: objecttreeparser.cpp:2121
 msgid "No public key to verify the signature"
 msgstr "ਦਸਤਖਤ ਜਾਂਚ ਲਈ ਕੋਈ ਪਬਲਿਕ ਕੁੰਜੀ ਨਹੀਂ"
 
-#: objecttreeparser.cpp:1903
+#: objecttreeparser.cpp:2124
 msgid "No signature found"
 msgstr "ਕੋਈ ਦਸਤਖਤ ਉਪਲੱਬਧ ਨਹੀਂ"
 
-#: objecttreeparser.cpp:1906
+#: objecttreeparser.cpp:2127
 msgid "Error verifying the signature"
 msgstr "ਦਸਤਖਤ ਜਾਂਚ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: objecttreeparser.cpp:1929
+#: objecttreeparser.cpp:2150
 msgid "No status information available."
 msgstr "ਕੋਈ ਹਾਲਤ ਜਾਣਕਾਰੀ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
 
-#: objecttreeparser.cpp:1936 objecttreeparser.cpp:2020
+#: objecttreeparser.cpp:2157 objecttreeparser.cpp:2241
 msgid "Good signature."
 msgstr "ਵਧੀਆ ਦਸਤਖਤ ਹਨ।"
 
-#: objecttreeparser.cpp:1957
+#: objecttreeparser.cpp:2178
 msgid "One key has expired."
 msgstr "ਇੱਕ ਕੁੰਜੀ ਦੀ ਮਿਆਦ ਖਤਮ"
 
-#: objecttreeparser.cpp:1961
+#: objecttreeparser.cpp:2182
 msgid "The signature has expired."
 msgstr "ਦਸਤਖਤ ਦੀ ਮਿਆਦ ਗਲਤ"
 
-#: objecttreeparser.cpp:1966
+#: objecttreeparser.cpp:2187
 msgid "Unable to verify: key missing."
 msgstr "ਪੜਤਾਲ ਲਈ ਅਸਮਰੱਥ: ਕੁੰਜੀ ਗੁੰਮ ਹੈ।"
 
-#: objecttreeparser.cpp:1973
+#: objecttreeparser.cpp:2194
 msgid "CRL not available."
 msgstr "CRL ਉਪੱਲਬਧ ਨਹੀ ਹੈ"
 
-#: objecttreeparser.cpp:1977
+#: objecttreeparser.cpp:2198
 msgid "Available CRL is too old."
 msgstr "ਉਪਲੱਬਧ CRL ਬਹੁਤ ਪੁਰਾਣਾ ਹੈ।"
 
-#: objecttreeparser.cpp:1981
+#: objecttreeparser.cpp:2202
 msgid "A policy was not met."
 msgstr "ਇੱਕ ਨੀਤੀ ਨਹੀਂ ਮਿਲੀ ਹੈ।"
 
-#: objecttreeparser.cpp:1985
+#: objecttreeparser.cpp:2206
 msgid "A system error occurred."
 msgstr "ਇੱਕ ਸਿਸਟਮ ਗਲਤੀ ਆਈ ਹੈ"
 
-#: objecttreeparser.cpp:1996
+#: objecttreeparser.cpp:2217
 msgid "One key has been revoked."
 msgstr ""
 
-#: objecttreeparser.cpp:2022
+#: objecttreeparser.cpp:2243
 msgid "<b>Bad</b> signature."
 msgstr "<b>ਗਲਤ</b> ਦਸਤਖਤ ਹੈ।"
 
-#: objecttreeparser.cpp:2049
+#: objecttreeparser.cpp:2270
 #, fuzzy
 msgid "Invalid signature."
 msgstr "ਦਸਤਖਤ ਯੋਗ(&E)"
 
-#: objecttreeparser.cpp:2051
+#: objecttreeparser.cpp:2272
 #, fuzzy
 msgid "Not enough information to check signature validity."
 msgstr "ਦਸਤਖਤ ਜਾਂਚ ਕਰਨ ਲਈ ਲੋੜੀਦੀ ਜਾਣਕਾਰੀ ਨਹੀਂ ਹੈ %1"
 
-#: objecttreeparser.cpp:2060
+#: objecttreeparser.cpp:2281
 #, fuzzy
 msgid "Signature is valid."
 msgstr "ਦਸਤਖਤ"
 
-#: objecttreeparser.cpp:2062
+#: objecttreeparser.cpp:2283
 msgid "Signed by <a href=\"mailto:%1\">%2</a>."
 msgstr ""
 
-#: objecttreeparser.cpp:2066
+#: objecttreeparser.cpp:2287
 msgid "Unknown signature state"
 msgstr ""
 
-#: objecttreeparser.cpp:2070
+#: objecttreeparser.cpp:2291
 #, fuzzy
 msgid "Show Details"
 msgstr "[ਵੇਰਵਾ]"
 
-#: objecttreeparser.cpp:2082
+#: objecttreeparser.cpp:2308
 #, fuzzy
 msgid "No Audit Log available"
 msgstr "ਉਪਲੱਬਧ ਨਹੀਂ"
 
-#: objecttreeparser.cpp:2089
+#: objecttreeparser.cpp:2310
+#, fuzzy, c-format
+msgid "Error Retrieving Audit Log: %1"
+msgstr ""
+"ਸਰਵਰ ਤੋਂ ਕੋਟਾ ਜਾਣਕਾਰੀ ਲੈਣ ਦੌਰਾਨ ਗਲਤੀ\n"
+"%1"
+
+#: objecttreeparser.cpp:2320
 msgid ""
 "_: The Audit Log is a detailed error log from the gnupg backend\n"
 "Show Audit Log"
 msgstr ""
 
-#: objecttreeparser.cpp:2097
+#: objecttreeparser.cpp:2331
 #, fuzzy
 msgid "Hide Details"
 msgstr "[ਵੇਰਵਾ]"
 
-#: objecttreeparser.cpp:2124 objecttreeparser.cpp:2126
+#: objecttreeparser.cpp:2357 objecttreeparser.cpp:2359
 msgid "Encapsulated message"
 msgstr ""
 
-#: objecttreeparser.cpp:2135
+#: objecttreeparser.cpp:2368
+#, fuzzy
+msgid "Please wait while the message is being decrypted..."
+msgstr "OpenPGP ਸੁਨੇਹਾ - ਇੰਕਰਿਪਟਡ"
+
+#: objecttreeparser.cpp:2370
 msgid "Encrypted message"
 msgstr "ਇਕ੍ਰਿਪਟਡ ਸੁਨੇਹਾ"
 
-#: objecttreeparser.cpp:2137
+#: objecttreeparser.cpp:2372
 msgid "Encrypted message (decryption not possible)"
 msgstr "ਇਕ੍ਰਿਪਸ਼ਨ ਸੁਨੇਹਾ (ਡਿਕ੍ਰਿਪਸ਼ਨ ਸੰਭਵ ਨਹੀਂ ਹੈ)"
 
-#: objecttreeparser.cpp:2139
+#: objecttreeparser.cpp:2374
 #, c-format
 msgid "Reason: %1"
 msgstr "ਕਾਰਨ: %1"
 
-#: objecttreeparser.cpp:2194
+#: objecttreeparser.cpp:2384
+#, fuzzy
+msgid "Please wait while the signature is being verified..."
+msgstr "ਦਸਤਖਤੀ ਦੀ ਮਿਆਦ ਦੀ ਜਾਂਚ ਨਹੀਂ ਹੋ ਸਕੀ ਹੈ"
+
+#: objecttreeparser.cpp:2438
 msgid "[Details]"
 msgstr "[ਵੇਰਵਾ]"
 
-#: objecttreeparser.cpp:2233 objecttreeparser.cpp:2235
+#: objecttreeparser.cpp:2477 objecttreeparser.cpp:2479
 #, fuzzy
 msgid "certificate"
 msgstr "ਸਰਟੀਫਿਕੇਟ"
 
-#: objecttreeparser.cpp:2242 objecttreeparser.cpp:2267
+#: objecttreeparser.cpp:2486 objecttreeparser.cpp:2511
 msgid "Warning:"
 msgstr "ਚੇਤਾਵਨੀ:"
 
-#: objecttreeparser.cpp:2244
+#: objecttreeparser.cpp:2488
 msgid "Sender's mail address is not stored in the %1 used for signing."
 msgstr ""
 
-#: objecttreeparser.cpp:2247
+#: objecttreeparser.cpp:2491
 msgid "sender: "
 msgstr "ਭੇਜਣ ਵਾਲਾ: "
 
-#: objecttreeparser.cpp:2250
+#: objecttreeparser.cpp:2494
 msgid "stored: "
 msgstr "ਸੰਭਾਲੇ:"
 
-#: objecttreeparser.cpp:2269
+#: objecttreeparser.cpp:2513
 msgid ""
 "No mail address is stored in the %1 used for signing, so we cannot compare it "
 "to the sender's address %2."
 msgstr ""
 
-#: objecttreeparser.cpp:2292
+#: objecttreeparser.cpp:2536
 #, c-format
 msgid "Not enough information to check signature. %1"
 msgstr "ਦਸਤਖਤ ਜਾਂਚ ਕਰਨ ਲਈ ਲੋੜੀਦੀ ਜਾਣਕਾਰੀ ਨਹੀਂ ਹੈ %1"
 
-#: objecttreeparser.cpp:2309 objecttreeparser.cpp:2387
+#: objecttreeparser.cpp:2553 objecttreeparser.cpp:2631
 msgid "Message was signed with unknown key."
 msgstr "ਸੁਨੇਹਾ ਅਣਜਾਣੀ ਕੁੰਜੀ ਨਾਲ ਦਸਤਖਤੀ ਹੈ।"
 
-#: objecttreeparser.cpp:2311 objecttreeparser.cpp:2425
-#: objecttreeparser.cpp:2469
+#: objecttreeparser.cpp:2555 objecttreeparser.cpp:2669
+#: objecttreeparser.cpp:2713
 #, c-format
 msgid "Message was signed by %1."
 msgstr "ਸੁਨੇਹਾ %1 ਰਾਹੀਂ ਦਸਤਖਤੀ ਹੈ"
 
-#: objecttreeparser.cpp:2318 objecttreeparser.cpp:2327
-#: objecttreeparser.cpp:2338
+#: objecttreeparser.cpp:2562 objecttreeparser.cpp:2571
+#: objecttreeparser.cpp:2582
 #, c-format
 msgid "Message was signed with key %1."
 msgstr "ਸੁਨੇਹਾ %1 ਕੁੰਜੀ ਨਾਲ ਦਸਤਖਤੀ ਹੈ"
 
-#: objecttreeparser.cpp:2321
+#: objecttreeparser.cpp:2565
 msgid "Message was signed on %1 with key %2."
 msgstr ""
 
-#: objecttreeparser.cpp:2330
+#: objecttreeparser.cpp:2574
 msgid "Message was signed by %3 on %1 with key %2"
 msgstr ""
 
-#: objecttreeparser.cpp:2341
+#: objecttreeparser.cpp:2585
 msgid "Message was signed by %2 with key %1."
 msgstr ""
 
-#: objecttreeparser.cpp:2379
+#: objecttreeparser.cpp:2623
 msgid "Message was signed on %1 with unknown key %2."
 msgstr ""
 
-#: objecttreeparser.cpp:2383
+#: objecttreeparser.cpp:2627
 #, c-format
 msgid "Message was signed with unknown key %1."
 msgstr "ਸੁਨੇਹਾ ਅਣਜਾਣ ਕੁੰਜੀ %1 ਨਾਲ ਦਸਤਖਤੀ ਹੈ।"
 
-#: objecttreeparser.cpp:2389
+#: objecttreeparser.cpp:2633
 msgid "The validity of the signature cannot be verified."
 msgstr "ਦਸਤਖਤੀ ਦੀ ਮਿਆਦ ਦੀ ਜਾਂਚ ਨਹੀਂ ਹੋ ਸਕੀ ਹੈ"
 
-#: objecttreeparser.cpp:2421 objecttreeparser.cpp:2465
+#: objecttreeparser.cpp:2665 objecttreeparser.cpp:2709
 msgid "Message was signed by %2 (Key ID: %1)."
 msgstr "ਸੁਨੇਹਾ %2 ਦਸਤਖਤੀ ਹੈ (ਕੁੰਜੀ ID: %1)।"
 
-#: objecttreeparser.cpp:2431
+#: objecttreeparser.cpp:2675
 msgid "The signature is valid, but the key's validity is unknown."
 msgstr ""
 
-#: objecttreeparser.cpp:2435
+#: objecttreeparser.cpp:2679
 msgid "The signature is valid and the key is marginally trusted."
 msgstr ""
 
-#: objecttreeparser.cpp:2439
+#: objecttreeparser.cpp:2683
 msgid "The signature is valid and the key is fully trusted."
 msgstr "ਦਸਤਖਤ ਠੀਕ ਹੈ ਅਤੇ ਕੁੰਜੀ ਪੂਰੀ ਤਰ੍ਹਾਂ ਭਰੋਸੇਯੋਗ ਹੈ।"
 
-#: objecttreeparser.cpp:2443
+#: objecttreeparser.cpp:2687
 msgid "The signature is valid and the key is ultimately trusted."
 msgstr "ਦਸਤਖਤ ਠੀਕ ਹਨ ਅਤੇ ਕੁੰਜੀ ਬੇਅੰਤ ਭਰੋਸੇਯੋਗ ਹੈ।"
 
-#: objecttreeparser.cpp:2447
+#: objecttreeparser.cpp:2691
 msgid "The signature is valid, but the key is untrusted."
 msgstr "ਦਸਤਖਤ ਤਾਂ ਠੀਕ ਹੈ, ਪਰ ਕੀ ਭਰੋਸੇਯੋਗ ਨਹੀਂ ਹੈ"
 
-#: objecttreeparser.cpp:2471
+#: objecttreeparser.cpp:2715
 msgid "Warning: The signature is bad."
 msgstr "ਚੇਤਾਵਨੀ: ਦਸਤਖਤ ਗਲਤ ਹੈ"
 
-#: objecttreeparser.cpp:2495
+#: objecttreeparser.cpp:2739
 msgid "End of signed message"
 msgstr "ਦਸਤਖਤੀ ਸੁਨੇਹਾ ਦਾ ਅੰਤ"
 
-#: objecttreeparser.cpp:2501
+#: objecttreeparser.cpp:2745
 msgid "End of encrypted message"
 msgstr "ਇੰਕਰਿਪਟਡ ਸੁਨੇਹੇ ਦਾ ਅੰਤ"
 
-#: objecttreeparser.cpp:2508
+#: objecttreeparser.cpp:2752
 msgid "End of encapsulated message"
 msgstr ""
 
-#: partNode.cpp:481
+#: partNode.cpp:505
 msgid "internal part"
 msgstr "ਅੰਦਰੂਨੀ ਭਾਗ"
 
-#: partNode.cpp:483
+#: partNode.cpp:507
 msgid "body part"
 msgstr "ਮੁੱਖ ਭਾਗ"
 
@@ -9874,19 +10790,19 @@ msgstr "ਜਾਓ(&G)"
 msgid "F&older"
 msgstr "ਫੋਲਡਰ(&o)"
 
-#. i18n: file kmail_part.rc line 115
+#. i18n: file kmail_part.rc line 116
 #: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
 #, no-c-format
 msgid "&Message"
 msgstr "ਸੁਨੇਹਾ(&M)"
 
-#. i18n: file kmail_part.rc line 121
+#. i18n: file kmail_part.rc line 122
 #: rc.cpp:24 rc.cpp:90 rc.cpp:123
 #, no-c-format
 msgid "Reply Special"
 msgstr "ਖਾਸ ਜਵਾਬ"
 
-#. i18n: file kmail_part.rc line 127
+#. i18n: file kmail_part.rc line 128
 #: rc.cpp:27 rc.cpp:93 rc.cpp:126
 #, no-c-format
 msgid "&Forward"
@@ -10021,158 +10937,170 @@ msgstr ""
 msgid "Never sign/encrypt when sa&ving as draft"
 msgstr ""
 
-#. i18n: file customtemplates_base.ui line 180
-#: rc.cpp:194
+#. i18n: file customtemplates_base.ui line 118
+#: rc.cpp:194 rc.cpp:462
+#, no-c-format
+msgid "How does this work?"
+msgstr ""
+
+#. i18n: file customtemplates_base.ui line 169
+#: rc.cpp:197 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "ਵੱਲ: "
+
+#. i18n: file customtemplates_base.ui line 177
+#: rc.cpp:200 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "CC: "
+
+#. i18n: file customtemplates_base.ui line 234
+#: rc.cpp:203
 #, no-c-format
 msgid "Universal"
 msgstr "ਯੂਨੀਵਰਸਲ"
 
-#. i18n: file customtemplates_base.ui line 185
-#: rc.cpp:197
+#. i18n: file customtemplates_base.ui line 239
+#: rc.cpp:206
 #, no-c-format
 msgid "Reply"
 msgstr "ਜਵਾਬ"
 
-#. i18n: file customtemplates_base.ui line 190
-#: rc.cpp:200
+#. i18n: file customtemplates_base.ui line 244
+#: rc.cpp:209
 #, no-c-format
 msgid "Reply to All"
 msgstr ""
 
-#. i18n: file customtemplates_base.ui line 195
-#: rc.cpp:203
+#. i18n: file customtemplates_base.ui line 249
+#: rc.cpp:212
 #, no-c-format
 msgid "Forward"
 msgstr "ਅੱਗੇ"
 
-#. i18n: file customtemplates_base.ui line 207
-#: rc.cpp:206
+#. i18n: file customtemplates_base.ui line 261
+#: rc.cpp:215
 #, no-c-format
 msgid "Shortc&ut:"
 msgstr ""
 
-#. i18n: file customtemplates_base.ui line 229
-#: rc.cpp:209
+#. i18n: file customtemplates_base.ui line 283
+#: rc.cpp:218
 #, no-c-format
 msgid "&Template type:"
 msgstr ""
 
-#. i18n: file customtemplates_base.ui line 256
-#: rc.cpp:215 rc.cpp:456
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
 #. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:218
+#: rc.cpp:224
 #, no-c-format
 msgid "Folder Properties"
 msgstr "ਫੋਲਡਰ ਪ੍ਰਾਪਰਟੀ"
 
 #. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:227
+#: rc.cpp:233
 #, no-c-format
 msgid "Folder holds a &mailing list"
 msgstr "ਫੋਲਡਰ ਇੱਕ ਮੇਲਿੰਗ ਸੂਚੀ ਰੱਖਦਾ ਹੈ(&m)"
 
 #. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:230
+#: rc.cpp:236
 #, no-c-format
 msgid "List &address:"
 msgstr "ਸਿਰਨਾਵਾਂ ਸੂਚੀ(&a):"
 
 #. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:233
+#: rc.cpp:239
 #, no-c-format
 msgid "N&ormal:"
 msgstr "ਸਧਾਰਨ(&o):"
 
 #. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:236
+#: rc.cpp:242
 #, no-c-format
 msgid "Unr&ead:"
 msgstr "ਨਾ-ਪੜ੍ਹੇ(&e):"
 
 #. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:242
+#: rc.cpp:248
 #, no-c-format
 msgid "Message Expiring"
 msgstr "ਸੁਨੇਹਾ ਮਿਆਦ"
 
 #. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:245
+#: rc.cpp:251
 #, no-c-format
 msgid "E&xpire after:"
 msgstr "ਮਿਆਦ ਸਮਾਪਤ(&x):"
 
 #. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:248
+#: rc.cpp:254
 #, no-c-format
 msgid "Expire &read messages"
 msgstr "ਪੜ੍ਹੇ ਸੁਨੇਹਿਆਂ ਦੀ ਮਿਆਦ(&r)"
 
 #. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:251
+#: rc.cpp:257
 #, no-c-format
 msgid "Expire a&fter:"
 msgstr "ਮਿਆਦ ਸਮਾਪਤ(&f):"
 
 #. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:254
+#: rc.cpp:260
 #, no-c-format
 msgid "Expire &unread messages"
 msgstr "ਨਾ-ਪੜੇ ਸੁਨੇਹਿਆਂ ਦੀ ਮਿਆਦ(&u)"
 
 #. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:257 rc.cpp:266
+#: rc.cpp:263 rc.cpp:272
 #, no-c-format
 msgid "Day(s)"
 msgstr "ਦਿਨ"
 
 #. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:260 rc.cpp:269
+#: rc.cpp:266 rc.cpp:275
 #, no-c-format
 msgid "Week(s)"
 msgstr "ਹਫਤੇ"
 
 #. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:263 rc.cpp:272
+#: rc.cpp:269 rc.cpp:278
 #, no-c-format
 msgid "Month(s)"
 msgstr "ਮਹੀਨੇ"
 
 #. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:275
+#: rc.cpp:281
 #, no-c-format
 msgid "Advanced"
 msgstr "ਤਕਨੀਕੀ"
 
 #. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:278
+#: rc.cpp:284
 #, no-c-format
 msgid "Sender identit&y:"
 msgstr "ਭੇਜਣ ਵਾਲੇ ਦੀ ਪਛਾਣ(&y):"
 
 #. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:281
+#: rc.cpp:287
 #, no-c-format
 msgid "&Storage format:"
 msgstr "ਸੰਭਾਲ ਫਾਰਮੈਟ(&S):"
 
 #. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:284
+#: rc.cpp:290
 #, no-c-format
 msgid "&List displays:"
 msgstr "ਦਰਿਸ਼ ਸੂਚੀ(&L):"
 
 #. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:293
+#: rc.cpp:299
 #, no-c-format
 msgid "Validate certificates using CRLs"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:296
+#: rc.cpp:302
 #, no-c-format
 msgid ""
 "If this option is selected, S/MIME certificates are validated using Certificate "
@@ -10180,13 +11108,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:299
+#: rc.cpp:305
 #, no-c-format
 msgid "Validate certificates online (OCSP)"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:302
+#: rc.cpp:308
 #, no-c-format
 msgid ""
 "If this option is selected, S/MIME certificates are validated online using the "
@@ -10195,19 +11123,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:305
+#: rc.cpp:311
 #, no-c-format
 msgid "Online Certificate Validation"
 msgstr "ਆਨਲਾਈਨ ਸਰਟੀਫਿਕੇਟ ਮਿਆਦ"
 
 #. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:308
+#: rc.cpp:314
 #, no-c-format
 msgid "OCSP responder URL:"
 msgstr "OCSP ਜਵਾਬ-ਕਰਤਾ URL:"
 
 #. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:311
+#: rc.cpp:317
 #, no-c-format
 msgid ""
 "Enter here the address of the server for online validation of certificates "
@@ -10215,25 +11143,25 @@ msgid ""
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:314
+#: rc.cpp:320
 #, no-c-format
 msgid "OCSP responder signature:"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:317
+#: rc.cpp:323
 #, no-c-format
 msgid "Ignore service URL of certificates"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:320
+#: rc.cpp:326
 #, no-c-format
 msgid "Do not check certificate policies"
 msgstr "ਸਰਟੀਫਕੇਟ ਨੀਤੀ ਕਦੇਂ ਨਾ ਜਾਂਚੋਂ"
 
 #. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:323
+#: rc.cpp:329
 #, no-c-format
 msgid ""
 "By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
@@ -10241,13 +11169,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:326
+#: rc.cpp:332
 #, no-c-format
 msgid "Never consult a CRL"
 msgstr "CRL ਕਦੇਂ ਨਾ ਜਾਂਚੋ"
 
 #. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:329
+#: rc.cpp:335
 #, no-c-format
 msgid ""
 "If this option is checked, Certificate Revocation Lists are never used to "
@@ -10255,13 +11183,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:332
+#: rc.cpp:338
 #, no-c-format
 msgid "Fetch missing issuer certificates"
 msgstr "ਗੁੰਮ ਜਾਰੀਕਰਤਾ ਸਰਟੀਫਕੇਟ ਪ੍ਰਾਪਤ ਕਰੋ"
 
 #. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:335
+#: rc.cpp:341
 #, no-c-format
 msgid ""
 "If this option is checked, missing issuer certificates are fetched when "
@@ -10269,37 +11197,37 @@ msgid ""
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:338
+#: rc.cpp:344
 #, no-c-format
 msgid "HTTP Requests"
 msgstr "HTTP ਬੇਨਤੀਆਂ"
 
 #. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:341
+#: rc.cpp:347
 #, no-c-format
 msgid "Do not perform any HTTP requests"
 msgstr "ਕੋਈ HTTP ਬੇਨਤੀਆਂ ਨਾ ਕਰੋ"
 
 #. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:344
+#: rc.cpp:350
 #, no-c-format
 msgid "Entirely disables the use of HTTP for S/MIME."
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:350
+#: rc.cpp:356
 #, no-c-format
 msgid "Use this proxy for HTTP requests: "
 msgstr "HTTP ਬੇਨਤੀਆਂ ਲਈ ਇਹ ਪਰਾਕਸੀ ਵਰਤੋਂ:"
 
 #. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:353
+#: rc.cpp:359
 #, no-c-format
 msgid "Use system HTTP proxy:"
 msgstr "ਸਿਸਟਮ HTTP ਪਰਾਕਸੀ ਵਰਤੋਂ:"
 
 #. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:356
+#: rc.cpp:362
 #, no-c-format
 msgid ""
 "If this option is selected, the value of the HTTP proxy shown on the right "
@@ -10308,7 +11236,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:359
+#: rc.cpp:365
 #, no-c-format
 msgid ""
 "Enter here the location of your HTTP Proxy, which will be used for all HTTP "
@@ -10317,13 +11245,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:362
+#: rc.cpp:368
 #, no-c-format
 msgid "Ignore HTTP CRL distribution point of certificates"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:365
+#: rc.cpp:371
 #, no-c-format
 msgid ""
 "When looking for the location of a CRL, the to-be-tested certificate usually "
@@ -10334,31 +11262,31 @@ msgid ""
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:368
+#: rc.cpp:374
 #, no-c-format
 msgid "LDAP Requests"
 msgstr "LDAP ਬੇਨਤੀਆਂ"
 
 #. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:371
+#: rc.cpp:377
 #, no-c-format
 msgid "Do not perform any LDAP requests"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:374
+#: rc.cpp:380
 #, no-c-format
 msgid "Entirely disables the use of LDAP for S/MIME."
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:377
+#: rc.cpp:383
 #, no-c-format
 msgid "Ignore LDAP CRL distribution point of certificates"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:380
+#: rc.cpp:386
 #, no-c-format
 msgid ""
 "When looking for the location of a CRL, the to-be-tested certificate usually "
@@ -10369,13 +11297,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:383
+#: rc.cpp:389
 #, no-c-format
 msgid "Primary host for LDAP requests:"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:386
+#: rc.cpp:392
 #, no-c-format
 msgid ""
 "Entering a LDAP server here will make all LDAP requests go to that server "
@@ -10388,86 +11316,86 @@ msgid ""
 msgstr ""
 
 #. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:390
+#: rc.cpp:396
 #, no-c-format
 msgid "Add Snippet"
 msgstr ""
 
 #. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:393
+#: rc.cpp:399
 #, fuzzy, no-c-format
 msgid "&Add"
 msgstr "ਸ਼ਾਮਿਲ(&A)..."
 
 #. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:402
+#: rc.cpp:408
 #, no-c-format
 msgid "&Snippet:"
 msgstr ""
 
 #. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:405
+#: rc.cpp:411
 #, fuzzy, no-c-format
 msgid "Group:"
 msgstr "ਗਰੁੱਪਵੇਅਰ(&G)"
 
 #. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:408
+#: rc.cpp:414
 #, fuzzy, no-c-format
 msgid "Snippet Settings"
 msgstr "ਫੋਂਟ ਸੈਟਿੰਗ ਮੁੜ-ਸੈੱਟ"
 
 #. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:411
+#: rc.cpp:417
 #, no-c-format
 msgid "Tooltips"
 msgstr ""
 
 #. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:414
+#: rc.cpp:420
 #, no-c-format
 msgid "Show snippet's text in &tooltip"
 msgstr ""
 
 #. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:417
+#: rc.cpp:423
 #, no-c-format
 msgid ""
 "Decides if a tooltip should be shown containing text from the bookmarked line"
 msgstr ""
 
 #. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:420
+#: rc.cpp:426
 #, no-c-format
 msgid "Variables"
 msgstr ""
 
 #. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:423
+#: rc.cpp:429
 #, no-c-format
 msgid "Input Method for Variables"
 msgstr ""
 
 #. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:426
+#: rc.cpp:432
 #, no-c-format
 msgid "Single dialog for each variable within a snippet"
 msgstr ""
 
 #. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:429
+#: rc.cpp:435
 #, no-c-format
 msgid "An input dialog will be displayed for every variable within a snippet"
 msgstr ""
 
 #. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:432
+#: rc.cpp:438
 #, no-c-format
 msgid "One dialog for all variables within a snippet"
 msgstr ""
 
 #. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:435
+#: rc.cpp:441
 #, no-c-format
 msgid ""
 "A single dialog will be displayed where you can enter the values for all "
@@ -10475,49 +11403,49 @@ msgid ""
 msgstr ""
 
 #. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:438
+#: rc.cpp:444
 #, fuzzy, no-c-format
 msgid "Delimiter:"
 msgstr "ਅਣਸੀਮਤ"
 
 #. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:441
+#: rc.cpp:447
 #, no-c-format
 msgid "TemplatesConfiguration"
 msgstr ""
 
 #. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:447
+#: rc.cpp:453
 #, no-c-format
 msgid "Reply to Sender"
 msgstr "ਭੇਜਣ ਵਾਲੇ ਨੂੰ ਜਵਾਬ"
 
 #. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:450
+#: rc.cpp:456
 #, no-c-format
 msgid "Reply to All / Reply to List"
 msgstr "ਸਭ ਨੂੰ ਜਵਾਬ / ਲਿਸਟ ਨੂੰ ਜਵਾਬ"
 
 #. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:453
+#: rc.cpp:459
 #, no-c-format
 msgid "Forward Message"
 msgstr "ਸੁਨੇਹਾ ਅੱਗੇ ਭੇਜੋ"
 
 #. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:462
+#: rc.cpp:468
 #, no-c-format
 msgid "Warn when trying to send &unsigned messages"
 msgstr "ਚੇਤਾਵਨੀ ਦਿਓ, ਜਦੋਂ ਨਾ-ਦਸਤਖਤੀ ਸੁਨੇਹੇ ਭੇਜੇ ਜਾਣ (&u)"
 
 #. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:465
+#: rc.cpp:471
 #, no-c-format
 msgid "Check to be warned when sending unsigned messages."
 msgstr "ਨਾ-ਦਸਤਖਤੀ ਸੁਨੇਹੇ ਭੇਜਣ ਸਮੇਂ ਚੇਤਾਵਨੀ ਦੇਣ ਲਈ ਜਾਂਚ ਕਰੋ।"
 
 #. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:468
+#: rc.cpp:474
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -10530,19 +11458,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:476
+#: rc.cpp:482
 #, no-c-format
 msgid "&Warn when trying to send unencrypted messages"
 msgstr ""
 
 #. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:479
+#: rc.cpp:485
 #, no-c-format
 msgid "Check to be warned when sending unencrypted messages."
 msgstr ""
 
 #. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:482
+#: rc.cpp:488
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -10555,19 +11483,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:490
+#: rc.cpp:496
 #, no-c-format
 msgid "Warn if &Receiver's Email Address is Not in Certificate"
 msgstr ""
 
 #. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:493
+#: rc.cpp:499
 #, no-c-format
 msgid "Check to be warned if the address is not in the certificate"
 msgstr ""
 
 #. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:496
+#: rc.cpp:502
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -10580,38 +11508,38 @@ msgid ""
 msgstr ""
 
 #. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:504
+#: rc.cpp:510
 #, no-c-format
 msgid "Warn if certificates/keys expire soon (configure thresholds below)"
 msgstr ""
 
 #. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:507
+#: rc.cpp:513
 #, no-c-format
 msgid "For signing"
 msgstr "ਦਸਤਖਤ ਲਈ"
 
 #. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:510
+#: rc.cpp:516
 #, no-c-format
 msgid "For encryption"
 msgstr "ਇਕ੍ਰਿਪਸ਼ਨ ਲਈ"
 
 #. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:513 rc.cpp:527 rc.cpp:541 rc.cpp:555 rc.cpp:569 rc.cpp:583
+#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
 #: rulewidgethandlermanager.cpp:1437
 #, no-c-format
 msgid " days"
 msgstr " ਦਿਨ"
 
 #. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:516 rc.cpp:530 rc.cpp:544 rc.cpp:558 rc.cpp:572 rc.cpp:586
+#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
 #, no-c-format
 msgid "Select the number of days here"
 msgstr "ਦਿਨਾਂ ਦੀ ਗਿਣਤੀ ਇੱਥੋਂ ਚੁਣੋ"
 
 #. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:519
+#: rc.cpp:525
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -10624,7 +11552,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:533
+#: rc.cpp:539
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -10637,7 +11565,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:547
+#: rc.cpp:553
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -10650,7 +11578,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:561
+#: rc.cpp:567
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -10663,7 +11591,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:575 rc.cpp:589
+#: rc.cpp:581 rc.cpp:595
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -10676,55 +11604,55 @@ msgid ""
 msgstr ""
 
 #. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:597
+#: rc.cpp:603
 #, no-c-format
 msgid "For root certificates:"
 msgstr "ਰੂਟ ਸਰਟੀਫਿਕੇਟ ਲਈ:"
 
 #. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:600
+#: rc.cpp:606
 #, no-c-format
 msgid "For intermediate CA certificates:"
 msgstr ""
 
 #. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:603
+#: rc.cpp:609
 #, no-c-format
 msgid "For end-user certificates/keys:"
 msgstr "ਉਪਭੋਗੀ ਸਰਟੀਫਿਕੇਟ/ਕੁੰਜੀਆਂ ਲਈ:"
 
 #. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:606
+#: rc.cpp:612
 #, no-c-format
 msgid "Re-enable All \"Don't Ask Again\" Warnings"
 msgstr "ਸਭ \"ਮੈਨੂੰ ਨਾ ਪੁੱਛੋ\" ਚੇਤਾਵਨੀਆਂ ਮੁੜ-ਯੋਗ"
 
 #. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:609
+#: rc.cpp:615
 #, no-c-format
 msgid "Template content"
 msgstr "ਨਮੂਨਾ ਸਮੱਗਰੀ"
 
 #. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:612
+#: rc.cpp:618
 #, no-c-format
 msgid "Template shortcut"
 msgstr "ਨਮੂਨਾ ਸ਼ਾਰਟਕੱਟ"
 
 #. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:615
+#: rc.cpp:621
 #, no-c-format
 msgid "Template type"
 msgstr "ਨਮੂਨਾ ਕਿਸਮ"
 
-#. i18n: file kmail.kcfg line 59
-#: rc.cpp:618
+#. i18n: file kmail.kcfg line 61
+#: rc.cpp:624
 #, no-c-format
 msgid "Send queued mail on mail check"
 msgstr "ਮੇਲ ਜਾਂਚ ਸਮੇਂ ਕਤਾਰਬੱਧ ਪੱਤਰ ਭੇਜੋ"
 
-#. i18n: file kmail.kcfg line 60
-#: rc.cpp:621
+#. i18n: file kmail.kcfg line 62
+#: rc.cpp:627
 #, no-c-format
 msgid ""
 "<qt>"
@@ -10733,16 +11661,16 @@ msgid ""
 "automatically at all. </p></qt>"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 70
-#: rc.cpp:624
+#. i18n: file kmail.kcfg line 72
+#: rc.cpp:630
 #, no-c-format
 msgid ""
 "Automatically move non-synced mails from folders with insufficient access "
 "rights"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 71
-#: rc.cpp:627
+#. i18n: file kmail.kcfg line 73
+#: rc.cpp:633
 #, no-c-format
 msgid ""
 "If there are new messages in a folder, which have not been uploaded to the "
@@ -10751,14 +11679,14 @@ msgid ""
 "folder."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 76
-#: rc.cpp:630
+#. i18n: file kmail.kcfg line 78
+#: rc.cpp:636
 #, no-c-format
 msgid "Allow local flags in read-only folders"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 85
-#: rc.cpp:633
+#. i18n: file kmail.kcfg line 87
+#: rc.cpp:639
 #, no-c-format
 msgid ""
 "This setting allows administrators to set a minimum delay between two mail "
@@ -10767,42 +11695,42 @@ msgid ""
 "set here."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 91
-#: rc.cpp:637
+#. i18n: file kmail.kcfg line 93
+#: rc.cpp:643
 #, no-c-format
 msgid "The most recently selected folder in the folder selection dialog."
 msgstr "ਫੋਲਡਰ ਚੋਣ ਵਾਰਤਾਲਾਪ ਵਿੱਚ ਤਾਜ਼ਾ ਵਰਤਿਆ ਫੋਲਡਰ।"
 
-#. i18n: file kmail.kcfg line 99
-#: rc.cpp:640
+#. i18n: file kmail.kcfg line 101
+#: rc.cpp:646
 #, no-c-format
 msgid ""
 "Disregard the users umask setting and use \"read-write for the user only\" "
 "instead"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 107
-#: rc.cpp:646
+#. i18n: file kmail.kcfg line 109
+#: rc.cpp:652
 #, no-c-format
 msgid "Policy for showing the system tray icon"
 msgstr "ਸਿਸਟਮ ਟਰੇ ਆਈਕਾਨ ਵੇਖਾਉਣ ਲਈ ਨੀਤੀ"
 
-#. i18n: file kmail.kcfg line 115
-#: rc.cpp:649
+#. i18n: file kmail.kcfg line 117
+#: rc.cpp:655
 #, no-c-format
 msgid ""
 "Close the application when the mainwindow is closed, even if there is a system "
 "tray icon active."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 119
-#: rc.cpp:652
+#. i18n: file kmail.kcfg line 121
+#: rc.cpp:658
 #, no-c-format
 msgid "Verbose new mail notification"
 msgstr "ਨਵਾਂ ਪੱਤਰ ਸੂਚਨਾ ਵੇਖਾਓ"
 
-#. i18n: file kmail.kcfg line 120
-#: rc.cpp:655
+#. i18n: file kmail.kcfg line 122
+#: rc.cpp:661
 #, no-c-format
 msgid ""
 "If this option is enabled then for each folder the number of newly arrived "
@@ -10810,40 +11738,40 @@ msgid ""
 "simple 'New mail arrived' message."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 124
-#: rc.cpp:658
+#. i18n: file kmail.kcfg line 126
+#: rc.cpp:664
 #, no-c-format
 msgid "Specify e&ditor:"
 msgstr "ਸੰਪਾਦਕ ਦਿਓ(&d):"
 
-#. i18n: file kmail.kcfg line 128
-#: rc.cpp:661
+#. i18n: file kmail.kcfg line 130
+#: rc.cpp:667
 #, no-c-format
 msgid "Use e&xternal editor instead of composer"
 msgstr "ਕੰਪੋਜ਼ਰ ਦੀ ਬਜਾਏ ਬਾਹਰੀ ਸੰਪਾਦਕ ਵਰਤੋਂ(&x)"
 
-#. i18n: file kmail.kcfg line 155
-#: rc.cpp:664
+#. i18n: file kmail.kcfg line 157
+#: rc.cpp:670
 #, no-c-format
 msgid ""
 "The threshold for when to warn the user that a folder is nearing its quota "
 "limit."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 164
-#: rc.cpp:667
+#. i18n: file kmail.kcfg line 166
+#: rc.cpp:673
 #, no-c-format
 msgid "Enable groupware functionality"
 msgstr "ਗਰੁੱਪਵੇਅਰ ਸਹੂਲਤ ਯੋਗ"
 
-#. i18n: file kmail.kcfg line 170
-#: rc.cpp:670
+#. i18n: file kmail.kcfg line 172
+#: rc.cpp:676
 #, no-c-format
 msgid "Mangle From:/To: headers in replies to replies"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 171
-#: rc.cpp:673
+#. i18n: file kmail.kcfg line 173
+#: rc.cpp:679
 #, no-c-format
 msgid ""
 "Microsoft Outlook has a number of shortcomings in its implementation of the "
@@ -10851,14 +11779,14 @@ msgid ""
 "with Outlook users not being able to get your replies, try setting this option."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 176
-#: rc.cpp:676
+#. i18n: file kmail.kcfg line 178
+#: rc.cpp:682
 #, no-c-format
 msgid "Send groupware invitations in the mail body"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 177
-#: rc.cpp:679
+#. i18n: file kmail.kcfg line 179
+#: rc.cpp:685
 #, no-c-format
 msgid ""
 "Microsoft Outlook has a number of shortcomings  in its implementation of the "
@@ -10867,16 +11795,34 @@ msgid ""
 "option."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 182
-#: rc.cpp:682
+#. i18n: file kmail.kcfg line 184
+#: rc.cpp:688
 #, no-c-format
 msgid "Exchange compatible invitations naming"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 189
+#. i18n: file kmail.kcfg line 185
 #: rc.cpp:691
 #, no-c-format
 msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
+"has a problem understanding standards-compliant groupware e-mail. Turn this "
+"option on to send groupware invitations in a way that Microsoft Exchange "
+"understands."
+msgstr ""
+
+#. i18n: file kmail.kcfg line 191
+#: rc.cpp:697
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#. i18n: file kmail.kcfg line 197
+#: rc.cpp:703
+#, no-c-format
+msgid ""
 "When this is checked, you will not see the mail composer window. Instead, all "
 "invitation mails are sent automatically. If you want to see the mail before "
 "sending it, you can uncheck this option. However, be aware that the text in the "
@@ -10884,22 +11830,38 @@ msgid ""
 "hand."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 205
-#: rc.cpp:694
+#. i18n: file kmail.kcfg line 213
+#: rc.cpp:706
 #, no-c-format
 msgid "Delete invitation emails after the reply to them has been sent"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 206
-#: rc.cpp:697
+#. i18n: file kmail.kcfg line 214
+#: rc.cpp:709
 #, no-c-format
 msgid ""
 "When this is checked, received invitation emails that have been replied to will "
 "be moved to the Trash folder, once the reply has been successfully sent."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 215
-#: rc.cpp:700
+#. i18n: file kmail.kcfg line 219
+#: rc.cpp:712
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#. i18n: file kmail.kcfg line 224
+#: rc.cpp:715
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#. i18n: file kmail.kcfg line 233
+#: rc.cpp:718
 #, no-c-format
 msgid ""
 "<p>Enabling this makes it possible to store the entries from the Kontact "
@@ -10908,16 +11870,16 @@ msgid ""
 "IMAP resource; this is done in the Trinity Control Center.</p>"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 220
-#: rc.cpp:703
+#. i18n: file kmail.kcfg line 238
+#: rc.cpp:721
 #, no-c-format
 msgid ""
 "<p>Usually you will not have any reason to see the folders that hold the IMAP "
 "resources. But if you need to see them, you can set that here.</p>"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 229
-#: rc.cpp:706
+#. i18n: file kmail.kcfg line 247
+#: rc.cpp:724
 #, no-c-format
 msgid ""
 "<p>If the account used for storing groupware information \"\n"
@@ -10928,8 +11890,8 @@ msgid ""
 "          \"mail via an additional online IMAP account.</p>"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:712
+#. i18n: file kmail.kcfg line 251
+#: rc.cpp:730
 #, no-c-format
 msgid ""
 "<p>Choose the storage format of the groupware folders. "
@@ -10942,22 +11904,22 @@ msgid ""
 "Kolab server or a compatible solution.</li></ul></p>"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 242
-#: rc.cpp:715
+#. i18n: file kmail.kcfg line 260
+#: rc.cpp:733
 #, no-c-format
 msgid ""
 "<p>This chooses the parent of the IMAP resource folders.</p>"
 "<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:718
+#. i18n: file kmail.kcfg line 265
+#: rc.cpp:736
 #, no-c-format
 msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 252
-#: rc.cpp:721
+#. i18n: file kmail.kcfg line 270
+#: rc.cpp:739
 #, no-c-format
 msgid ""
 "<p>If you want to set the folder names of the IMAP storage to your local "
@@ -10968,101 +11930,89 @@ msgid ""
 "<p>So do not set this unless you have to.</p>"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 258
-#: rc.cpp:724
-#, no-c-format
-msgid "Only filter mails received in disconnected IMAP inbox."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 262
-#: rc.cpp:727
+#. i18n: file kmail.kcfg line 276
+#: rc.cpp:742
 #, no-c-format
 msgid "Also filter new mails received in groupware folders."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 267
-#: rc.cpp:730
+#. i18n: file kmail.kcfg line 283
+#: rc.cpp:745
 #, no-c-format
 msgid ""
 "Synchronize groupware changes in DIMAP folders immediately when being online."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:733
+#. i18n: file kmail.kcfg line 292
+#: rc.cpp:748
 #, no-c-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
 "displayed."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:736
+#. i18n: file kmail.kcfg line 299
+#: rc.cpp:751
 #, no-c-format
 msgid "Maximal number of connections per host"
 msgstr "ਪ੍ਰਤੀ ਮੇਜ਼ਾਬਨ ਵੱਧ ਤੋਂ ਵੱਧ ਕੁਨੈਕਸ਼ਨ ਦੀ ਗਿਣਤੀ"
 
-#. i18n: file kmail.kcfg line 284
-#: rc.cpp:739
+#. i18n: file kmail.kcfg line 300
+#: rc.cpp:754
 #, no-c-format
 msgid ""
 "This can be used to restrict the number of connections per host while checking "
 "for new mail. By default the number of connections is unlimited (0)."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:742
+#. i18n: file kmail.kcfg line 308
+#: rc.cpp:757
 #, no-c-format
 msgid "Show quick search line edit"
 msgstr "ਤੇਜ਼ ਖੋਜ ਸਤਰ ਸੋਧ ਵੇਖਾਓ"
 
-#. i18n: file kmail.kcfg line 293
-#: rc.cpp:745
+#. i18n: file kmail.kcfg line 309
+#: rc.cpp:760
 #, no-c-format
 msgid ""
 "This option enables or disables the search line edit above the message list "
 "which can be used to quickly search the information shown in the message list."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 297
-#: rc.cpp:748
-#, fuzzy, no-c-format
-msgid "Show folder quick search line edit"
-msgstr "ਤੇਜ਼ ਖੋਜ ਸਤਰ ਸੋਧ ਵੇਖਾਓ"
-
-#. i18n: file kmail.kcfg line 301
-#: rc.cpp:751
+#. i18n: file kmail.kcfg line 313
+#: rc.cpp:763
 #, no-c-format
 msgid "Hide local inbox if unused"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:754
+#. i18n: file kmail.kcfg line 321
+#: rc.cpp:766
 #, no-c-format
 msgid "Forward Inline As Default."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:757
+#. i18n: file kmail.kcfg line 325
+#: rc.cpp:769
 #, no-c-format
 msgid ""
 "Allow the semicolon charactor (';') to be used as separator in the message "
 "composer."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 316
-#: rc.cpp:760
+#. i18n: file kmail.kcfg line 328
+#: rc.cpp:772
 #, no-c-format
 msgid "Keep original charset when replying or forwarding if possible"
 msgstr "ਜਵਾਬ ਦੇਣ ਜਾਂ ਅੱਗੇ ਭੇਜੇ ਸਮੇਂ ਅਸੀਂ ਅੱਖਰ-ਸਮੂਹ ਰੱਖੋ, ਜੇਕਰ ਸੰਭਵ ਹੋਵੇ"
 
-#. i18n: file kmail.kcfg line 320
-#: rc.cpp:763
+#. i18n: file kmail.kcfg line 332
+#: rc.cpp:775
 #, fuzzy, no-c-format
 msgid "A&utomatically insert signature"
 msgstr "ਆਟੋਮੈਟਿਕ ਦਸਤਖਤ ਜੋੜ੍ਹੋ(&u)"
 
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:766
+#. i18n: file kmail.kcfg line 337
+#: rc.cpp:778
 #, no-c-format
 msgid ""
 "Remember this identity, so that it will be used in future composer windows as "
@@ -11070,44 +12020,67 @@ msgid ""
 "        "
 msgstr ""
 
-#. i18n: file kmail.kcfg line 329
-#: rc.cpp:770
+#. i18n: file kmail.kcfg line 341
+#: rc.cpp:782
 #, no-c-format
 msgid ""
 "Remember this folder for sent items, so that it will be used in future composer "
 "windows as well."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 333
-#: rc.cpp:773
+#. i18n: file kmail.kcfg line 345
+#: rc.cpp:785
 #, no-c-format
 msgid ""
 "Remember this mail transport, so that it will be used in future composer "
 "windows as well."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:776
+#. i18n: file kmail.kcfg line 350
+#: rc.cpp:788
+#, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows as "
+"well.\n"
+"        "
+msgstr ""
+
+#. i18n: file kmail.kcfg line 354
+#: rc.cpp:792
 #, no-c-format
 msgid "Word &wrap at column:"
 msgstr "ਕਾਲਮ ਤੇ ਸ਼ਬਦ ਸਮੇਟੋ(&w):"
 
-#. i18n: file kmail.kcfg line 360
-#: rc.cpp:785
+#. i18n: file kmail.kcfg line 368
+#: rc.cpp:798
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "ਸੁਨੇਹੀ ਸੰਪਾਦਕ ਸਤਰਾਂ ਦੀ ਵੱਧ ਤੋਂ ਵੱਧ ਗਿਣਤੀ ਹੈ।"
+
+#. i18n: file kmail.kcfg line 370
+#: rc.cpp:801 rc.cpp:804
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and ask "
+"for a confirmation before sending the mail. The warning can be turned off."
+msgstr ""
+
+#. i18n: file kmail.kcfg line 390
+#: rc.cpp:810
 #, no-c-format
 msgid ""
 "Turn this option on to make Outlook &#8482; understand attachment names "
 "containing non-English characters"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 386
-#: rc.cpp:791
+#. i18n: file kmail.kcfg line 416
+#: rc.cpp:816
 #, no-c-format
 msgid "Automatically request &message disposition notifications"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 387
-#: rc.cpp:794
+#. i18n: file kmail.kcfg line 417
+#: rc.cpp:819
 #, no-c-format
 msgid ""
 "<qt>"
@@ -11118,28 +12091,28 @@ msgid ""
 "<em>Request Disposition Notification</em>.</p></qt>"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 391
-#: rc.cpp:797
+#. i18n: file kmail.kcfg line 421
+#: rc.cpp:822
 #, no-c-format
 msgid "Use recent addresses for autocompletion"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 392
-#: rc.cpp:800
+#. i18n: file kmail.kcfg line 422
+#: rc.cpp:825
 #, no-c-format
 msgid ""
 "Disable this option if you do not want recently used addresses to appear in the "
 "autocompletion list in the composer's address fields."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 413
-#: rc.cpp:803
+#. i18n: file kmail.kcfg line 443
+#: rc.cpp:828
 #, no-c-format
 msgid "Autosave interval:"
 msgstr "ਸਵੈ ਸੰਭਾਲ ਅੰਤਰਾਲ:"
 
-#. i18n: file kmail.kcfg line 414
-#: rc.cpp:806
+#. i18n: file kmail.kcfg line 444
+#: rc.cpp:831
 #, no-c-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. The "
@@ -11147,93 +12120,111 @@ msgid ""
 "setting it to the value 0."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 418
-#: rc.cpp:809
+#. i18n: file kmail.kcfg line 448
+#: rc.cpp:834
 #, no-c-format
 msgid "Insert signatures above quoted text"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 425
-#: rc.cpp:812
+#. i18n: file kmail.kcfg line 455
+#: rc.cpp:837
 #, no-c-format
 msgid "Replace recognized prefi&x with \"Re:\""
 msgstr ""
 
-#. i18n: file kmail.kcfg line 432
-#: rc.cpp:815
+#. i18n: file kmail.kcfg line 462
+#: rc.cpp:840
 #, no-c-format
 msgid "Replace recognized prefix with \"&Fwd:\""
 msgstr ""
 
-#. i18n: file kmail.kcfg line 436
-#: rc.cpp:818
+#. i18n: file kmail.kcfg line 466
+#: rc.cpp:843
 #, no-c-format
 msgid "Use smart &quoting"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 441
-#: rc.cpp:821
+#. i18n: file kmail.kcfg line 470
+#: rc.cpp:846
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "ਦਸਤਖਤ ਦੀ ਮਿਆਦ ਗਲਤ"
+
+#. i18n: file kmail.kcfg line 474
+#: rc.cpp:849
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#. i18n: file kmail.kcfg line 479
+#: rc.cpp:852
 #, no-c-format
 msgid "Type of addressee selector"
 msgstr "ਸਿਰਨਾਵਾਂ ਚੋਣਕਾਰ ਦੀ ਕਿਸਮ"
 
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:824
+#. i18n: file kmail.kcfg line 481
+#: rc.cpp:855
 #, no-c-format
 msgid ""
 "Sets the type of the dialog for selecting recipients for To,\n"
 "        CC and BCC."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 451
-#: rc.cpp:828
+#. i18n: file kmail.kcfg line 489
+#: rc.cpp:859
 #, no-c-format
 msgid "Type of recipients editor"
 msgstr "ਸੁਨੇਹੀ ਸੰਪਾਦਕ ਕਿਸਮ"
 
-#. i18n: file kmail.kcfg line 453
-#: rc.cpp:831
+#. i18n: file kmail.kcfg line 491
+#: rc.cpp:862
 #, no-c-format
 msgid ""
 "Sets the type of the recipients editor for editing To,\n"
 "        CC and BCC."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 468
-#: rc.cpp:835
+#. i18n: file kmail.kcfg line 506
+#: rc.cpp:866
 #, no-c-format
 msgid "Maximum number of recipient editor lines."
 msgstr "ਸੁਨੇਹੀ ਸੰਪਾਦਕ ਸਤਰਾਂ ਦੀ ਵੱਧ ਤੋਂ ਵੱਧ ਗਿਣਤੀ ਹੈ।"
 
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:838
+#. i18n: file kmail.kcfg line 512
+#: rc.cpp:869
 #, no-c-format
 msgid ""
 "List of message part types to strip off mails that are being forwarded inline."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 478
-#: rc.cpp:841
+#. i18n: file kmail.kcfg line 516
+#: rc.cpp:872
 #, no-c-format
 msgid "The maximum size in MB that email attachments are allowed to have."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 483
-#: rc.cpp:844
+#. i18n: file kmail.kcfg line 521
+#: rc.cpp:875
 #, no-c-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 490
-#: rc.cpp:847
+#. i18n: file kmail.kcfg line 528
+#: rc.cpp:878
 #, no-c-format
 msgid ""
 "Show the GnuPG Audit Log even after crypto operations that completed "
 "successfully."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 530
-#: rc.cpp:850
+#. i18n: file kmail.kcfg line 557
+#: rc.cpp:881
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr "ਜਵਾਬ ਦੇਣ ਜਾਂ ਅੱਗੇ ਭੇਜੇ ਸਮੇਂ ਅਸੀਂ ਅੱਖਰ-ਸਮੂਹ ਰੱਖੋ, ਜੇਕਰ ਸੰਭਵ ਹੋਵੇ"
+
+#. i18n: file kmail.kcfg line 572
+#: rc.cpp:884
 #, no-c-format
 msgid ""
 "Some emails, especially those generated automatically, do not specify the "
@@ -11243,16 +12234,16 @@ msgid ""
 "As a default the encoding configured for the whole system is used."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 536
-#: rc.cpp:853
+#. i18n: file kmail.kcfg line 578
+#: rc.cpp:887
 #, no-c-format
 msgid ""
 "Changing this from its default 'Auto' will force the use of the specified "
 "encoding for all emails, regardless of what they specify themselves."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 542
-#: rc.cpp:859
+#. i18n: file kmail.kcfg line 584
+#: rc.cpp:893
 #, no-c-format
 msgid ""
 "Enable this if you want smileys like :-) appearing in the message text to be "
@@ -11261,72 +12252,86 @@ msgstr ""
 "ਇਹ ਯੋਗ ਕਰੋ, ਜੇ ਤੁਸੀਂ :-) ਵਰਗੇ ਚਿੰਨ੍ਹਾਂ ਨੂੰ ਪਾਠ ਸੁਨੇਹੇ ਵਿੱਚ ਭਾਵਾਂ (ਛੋਟੀਆਂ "
 "ਤਸਵੀਰਾਂ) ਦੇ ਰੂਪ ਵਿੱਚ ਵੇਖਣਾ ਚਾਹੁੰਦੇ ਹੋ।"
 
-#. i18n: file kmail.kcfg line 547
-#: rc.cpp:865
+#. i18n: file kmail.kcfg line 589
+#: rc.cpp:899
 #, no-c-format
 msgid ""
 "Enable this option to show different levels of quoted text. Disable to hide the "
 "levels of quoted text."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 550
-#: rc.cpp:868
+#. i18n: file kmail.kcfg line 592
+#: rc.cpp:902
 #, no-c-format
 msgid "Automatic collapse level:"
 msgstr "ਆਟੋਮੈਟਿਕ ਸਮੇਟਣ ਪੱਧਰ:"
 
-#. i18n: file kmail.kcfg line 558
-#: rc.cpp:871
+#. i18n: file kmail.kcfg line 600
+#: rc.cpp:905
 #, no-c-format
 msgid "Reduce font size for quoted text"
 msgstr "ਹਵਾਲਾ ਪਾਠ ਲਈ ਫੋਂਟ ਅਕਾਰ ਘਟਾਓ"
 
-#. i18n: file kmail.kcfg line 559
-#: rc.cpp:874
+#. i18n: file kmail.kcfg line 601
+#: rc.cpp:908
 #, no-c-format
 msgid "Enable this option to show quoted text with a smaller font."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 570
-#: rc.cpp:877
+#. i18n: file kmail.kcfg line 612
+#: rc.cpp:911
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "ਸਭ ਸੁਨੇਹਾ ਸਿਰਲੇਖ ਵੇਖਾਓ"
+
+#. i18n: file kmail.kcfg line 613
+#: rc.cpp:914
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#. i18n: file kmail.kcfg line 618
+#: rc.cpp:917
 #, no-c-format
 msgid "Show user agent in fancy headers"
 msgstr "ਫੈਂਸੀ ਸਿਰਲੇਖ 'ਚ ਉਪਭੋਗੀ ਏਜੰਟ ਵੇਖਾਓ"
 
-#. i18n: file kmail.kcfg line 571
-#: rc.cpp:880
+#. i18n: file kmail.kcfg line 619
+#: rc.cpp:920
 #, no-c-format
 msgid ""
 "Enable this option to get the User-Agent and X-Mailer header lines displayed "
 "when using fancy headers."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 576
-#: rc.cpp:883
+#. i18n: file kmail.kcfg line 624
+#: rc.cpp:923
 #, no-c-format
 msgid "Allow to delete attachments of existing mails."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 580
-#: rc.cpp:886
+#. i18n: file kmail.kcfg line 628
+#: rc.cpp:926
 #, no-c-format
 msgid "Allow to edit attachments of existing mails."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 585
-#: rc.cpp:889
+#. i18n: file kmail.kcfg line 633
+#: rc.cpp:929
 #, no-c-format
 msgid "Always decrypt messages when viewing or ask befor decrypting"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 599
-#: rc.cpp:892
+#. i18n: file kmail.kcfg line 647
+#: rc.cpp:932
 #, no-c-format
 msgid "Send Message Disposition Notifications with an empty sender."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:895
+#. i18n: file kmail.kcfg line 648
+#: rc.cpp:935
 #, no-c-format
 msgid ""
 "Send Message Disposition Notifications with an empty sender string. Some "
@@ -11334,90 +12339,82 @@ msgid ""
 "problems sending MDNs, uncheck this option."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 606
-#: rc.cpp:898
+#. i18n: file kmail.kcfg line 654
+#: rc.cpp:938
 #, no-c-format
 msgid "Phrases has been converted to templates"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 607
-#: rc.cpp:901
+#. i18n: file kmail.kcfg line 655
+#: rc.cpp:941
 #, no-c-format
 msgid "Old phrases have been converted to templates"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 611
-#: rc.cpp:904
+#. i18n: file kmail.kcfg line 659
+#: rc.cpp:944
 #, no-c-format
 msgid "Message template for new message"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 616
-#: rc.cpp:907
+#. i18n: file kmail.kcfg line 664
+#: rc.cpp:947
 #, no-c-format
 msgid "Message template for reply"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 621
-#: rc.cpp:910
+#. i18n: file kmail.kcfg line 669
+#: rc.cpp:950
 #, no-c-format
 msgid "Message template for reply to all"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 626
-#: rc.cpp:913
+#. i18n: file kmail.kcfg line 674
+#: rc.cpp:953
 #, no-c-format
 msgid "Message template for forward"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 631
-#: rc.cpp:916
+#. i18n: file kmail.kcfg line 679
+#: rc.cpp:956
 #, no-c-format
 msgid "Quote characters"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 640
-#: rc.cpp:919
+#. i18n: file kmail.kcfg line 688
+#: rc.cpp:959
 #, no-c-format
 msgid "Allow out-of-office settings to to be changeable by the user."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 644
-#: rc.cpp:922
+#. i18n: file kmail.kcfg line 692
+#: rc.cpp:962
 #, no-c-format
 msgid ""
 "Allow users to upload out-of-office sieve scripts, but disallow them changin "
 "any settings, such as the domain to react to and the spam reaction switch."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:925
+#. i18n: file kmail.kcfg line 696
+#: rc.cpp:965
 #, no-c-format
 msgid "Send out-of-office replies to mails coming from this domain only."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 652
-#: rc.cpp:928
+#. i18n: file kmail.kcfg line 700
+#: rc.cpp:968
 #, no-c-format
 msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 656
-#: rc.cpp:931
+#. i18n: file kmail.kcfg line 704
+#: rc.cpp:971
 #, no-c-format
 msgid ""
 "Check if there is still an active out-of-office reply configured when starting "
 "KMail."
 msgstr ""
 
-#: recipientseditor.cpp:100
-msgid "To"
-msgstr "ਵੱਲ"
-
-#: recipientseditor.cpp:102
-msgid "CC"
-msgstr "CC"
-
 #: recipientseditor.cpp:104
 msgid "BCC"
 msgstr "BCC"
@@ -11430,43 +12427,43 @@ msgstr "<ਨਾ-ਦੱਸੇ ਪ੍ਰਾਪਤ ਕਰਤਾ ਕਿਸਮ>"
 msgid "Select type of recipient"
 msgstr "ਪ੍ਰਾਪਤ ਕਰਤਾ ਦੀ ਕਿਸਮ ਚੁਣੋ"
 
-#: recipientseditor.cpp:181
+#: recipientseditor.cpp:163
+msgid "Set the list of email addresses to receive this message"
+msgstr ""
+
+#: recipientseditor.cpp:183
 msgid "Remove recipient line"
 msgstr "ਪ੍ਰਾਪਤ ਕਰਤਾ ਸਤਰ ਹਟਾਓ"
 
-#: recipientseditor.cpp:737
+#: recipientseditor.cpp:739
 msgid "<b>To:</b><br/>"
 msgstr "<b>ਵੱਲ:</b><br/>"
 
-#: recipientseditor.cpp:738
+#: recipientseditor.cpp:740
 msgid "<b>CC:</b><br/>"
 msgstr "<b>CC:</b><br/>"
 
-#: recipientseditor.cpp:739
+#: recipientseditor.cpp:741
 msgid "<b>BCC:</b><br/>"
 msgstr "<b>BCC:</b><br/>"
 
-#: recipientseditor.cpp:766
+#: recipientseditor.cpp:768
 msgid "Save List..."
 msgstr "ਸੂਚੀ ਸੰਭਾਲੋ..."
 
-#: recipientseditor.cpp:772
+#: recipientseditor.cpp:774
 msgid "Save recipients as distribution list"
 msgstr ""
 
-#: recipientseditor.cpp:774
-msgid "Se&lect..."
-msgstr "ਚੁਣੋ(&l)..."
-
-#: recipientseditor.cpp:777
+#: recipientseditor.cpp:779
 msgid "Select recipients from address book"
 msgstr "ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਵਿੱਚੋਂ ਸੁਨੇਹਾ ਚੁਣੋ"
 
-#: recipientseditor.cpp:810
+#: recipientseditor.cpp:812
 msgid "No recipients"
 msgstr "ਕੋਈ ਸੁਨੇਹੀ ਨਹੀਂ"
 
-#: recipientseditor.cpp:811
+#: recipientseditor.cpp:813
 #, c-format
 msgid ""
 "_n: 1 recipient\n"
@@ -11475,7 +12472,7 @@ msgstr ""
 "1 ਸੁਨੇਹੀ\n"
 "%n ਸੁਨੇਹੀ"
 
-#: recipientseditor.cpp:914
+#: recipientseditor.cpp:917
 msgid "Truncating recipients list to %1 of %2 entries."
 msgstr ""
 
@@ -11565,11 +12562,11 @@ msgid ""
 "available addresses."
 msgstr ""
 
-#: redirectdialog.cpp:107
+#: redirectdialog.cpp:116
 msgid "You cannot redirect the message without an address."
 msgstr "ਤੁਸੀਂ ਇੱਕ ਸਿਰਨਾਵੇਂ ਬਿਨਾਂ ਸੁਨੇਹੇ ਦਾ ਦਿਸ਼ਾ ਪਰਿਵਰਤਨ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹੋ।"
 
-#: redirectdialog.cpp:108
+#: redirectdialog.cpp:117
 msgid "Empty Redirection Address"
 msgstr ""
 
@@ -11703,64 +12700,64 @@ msgstr "ਖੋਜ ਸਿਰਫ਼(&O):"
 msgid "I&nclude sub-folders"
 msgstr "ਸਬ-ਫੋਲਡਰਾਂ ਸਮੇਤ(&n)"
 
-#: searchwindow.cpp:226
+#: searchwindow.cpp:225
 msgid "Sender/Receiver"
 msgstr "ਭੇਜਣ ਵਾਲਾ/ਪ੍ਰਾਪਤ ਕਰਤਾ"
 
-#: searchwindow.cpp:249
+#: searchwindow.cpp:250
 msgid "Search folder &name:"
 msgstr "ਫੋਲਡਰ ਨਾਂ ਖੋਜ(&N):"
 
-#: searchwindow.cpp:259
+#: searchwindow.cpp:260
 #, fuzzy
 msgid "Op&en Search Folder"
 msgstr "ਖੋਜ ਹਟਾਓ"
 
-#: searchwindow.cpp:268
+#: searchwindow.cpp:269
 #, fuzzy
 msgid "Open &Message"
 msgstr "ਸੁਨੇਹਾ ਖੋਲ੍ਹੋ"
 
-#: searchwindow.cpp:274
+#: searchwindow.cpp:275
 msgid "AMiddleLengthText..."
 msgstr "AMiddleLengthਪਾਠ..."
 
-#: searchwindow.cpp:275
+#: searchwindow.cpp:276
 msgid "Ready."
 msgstr "ਤਿਆਰ ਹੈ।"
 
-#: searchwindow.cpp:356
+#: searchwindow.cpp:357
 msgid "Clear Selection"
 msgstr "ਚੋਣ ਸਾਫ਼"
 
-#: searchwindow.cpp:415
+#: searchwindow.cpp:416
 #, c-format
 msgid ""
 "_n: %n message searched\n"
 "%n messages searched"
 msgstr ""
 
-#: searchwindow.cpp:418
+#: searchwindow.cpp:419
 msgid "Done."
 msgstr "ਮੁਕੰਮਲ"
 
-#: searchwindow.cpp:419
+#: searchwindow.cpp:420
 msgid ""
 "_n: %n match in %1\n"
 "%n matches in %1"
 msgstr ""
 
-#: searchwindow.cpp:422
+#: searchwindow.cpp:423
 msgid "Search canceled."
 msgstr ""
 
-#: searchwindow.cpp:423
+#: searchwindow.cpp:424
 msgid ""
 "_n: %n match so far in %1\n"
 "%n matches so far in %1"
 msgstr ""
 
-#: searchwindow.cpp:427
+#: searchwindow.cpp:428
 #, c-format
 msgid ""
 "_n: %n message\n"
@@ -11769,7 +12766,7 @@ msgstr ""
 " %n ਸੁਨੇਹਾ\n"
 " %n ਸੁਨੇਹੇ"
 
-#: searchwindow.cpp:428
+#: searchwindow.cpp:429
 #, c-format
 msgid ""
 "_n: %n match\n"
@@ -11778,7 +12775,7 @@ msgstr ""
 "%n ਮੇਲ਼\n"
 "%n ਮੇਲ਼"
 
-#: searchwindow.cpp:429
+#: searchwindow.cpp:430
 msgid "Searching in %1. %2 searched so far"
 msgstr ""
 
@@ -11810,19 +12807,19 @@ msgstr ""
 "ਸਿਈਵੀ ਸਹਿਯੋਗ ਬਾਰੇ ਜਾਂਚ-ਪੜਤਾਲ ਜਾਣਕਾਰੀ ਇੱਕਠੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ...\n"
 "\n"
 
-#: sievedebugdialog.cpp:230
+#: sievedebugdialog.cpp:256
 msgid ""
 "Collecting data for account '%1'...\n"
 msgstr ""
 "ਖਾਤਾ '%1' ਲਈ ਡਾਟਾ ਇੱਕਠਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...\n"
 
-#: sievedebugdialog.cpp:231
+#: sievedebugdialog.cpp:257
 msgid ""
 "------------------------------------------------------------\n"
 msgstr ""
 "------------------------------------------------------------\n"
 
-#: sievedebugdialog.cpp:239
+#: sievedebugdialog.cpp:265
 msgid ""
 "(Account does not support Sieve)\n"
 "\n"
@@ -11830,7 +12827,7 @@ msgstr ""
 "(ਖਾਤਾ ਸਿਈਵੀ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ)\n"
 "\n"
 
-#: sievedebugdialog.cpp:266
+#: sievedebugdialog.cpp:278
 msgid ""
 "(Account is not an IMAP account)\n"
 "\n"
@@ -11838,13 +12835,13 @@ msgstr ""
 "(ਖਾਤਾ ਇੱਕ IMAP ਖਾਤਾ ਨਹੀਂ ਹੈ)\n"
 "\n"
 
-#: sievedebugdialog.cpp:286
+#: sievedebugdialog.cpp:298
 msgid ""
 "Contents of script '%1':\n"
 msgstr ""
 "ਸਕਰਿਪਟ '%1' ਦੇ ਭਾਗ:\n"
 
-#: sievedebugdialog.cpp:321
+#: sievedebugdialog.cpp:320
 msgid ""
 "(This script is empty.)\n"
 "\n"
@@ -11852,7 +12849,7 @@ msgstr ""
 "(ਇਹ ਸਕਰਿਪਟ ਖਾਲੀ ਹੈ।)\n"
 "\n"
 
-#: sievedebugdialog.cpp:326
+#: sievedebugdialog.cpp:325
 msgid ""
 "------------------------------------------------------------\n"
 "%1\n"
@@ -11864,23 +12861,23 @@ msgstr ""
 "------------------------------------------------------------\n"
 "\n"
 
-#: sievedebugdialog.cpp:342
+#: sievedebugdialog.cpp:341
 msgid ""
 "Sieve capabilities:\n"
 msgstr ""
 "ਸਿਈਵੀ ਸਮੱਰਥਾ:\n"
 
-#: sievedebugdialog.cpp:346
+#: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(ਕੋਈ ਖਾਸ ਸਮਰੱਥਾ ਉਪਲੱਬਧ ਨਹੀਂ)"
 
-#: sievedebugdialog.cpp:355
+#: sievedebugdialog.cpp:354
 msgid ""
 "Available Sieve scripts:\n"
 msgstr ""
 "ਉਪਲੱਬਧ ਸਿਈਵੀ ਸਕਰਿਪਟਾਂ:\n"
 
-#: sievedebugdialog.cpp:359
+#: sievedebugdialog.cpp:358
 msgid ""
 "(No Sieve scripts available on this server)\n"
 "\n"
@@ -11888,7 +12885,7 @@ msgstr ""
 "(ਇਹ ਸਰਵਰ ਉੱਤੇ ਕੋਈ ਸਿਈਵੀ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ)\n"
 "\n"
 
-#: sievedebugdialog.cpp:367
+#: sievedebugdialog.cpp:366
 msgid ""
 "Active script: %1\n"
 "\n"
@@ -11896,7 +12893,7 @@ msgstr ""
 "ਸਰਗਰਮ ਸਕਰਿਪਟ: %1\n"
 "\n"
 
-#: sievedebugdialog.cpp:394 vacation.cpp:714
+#: sievedebugdialog.cpp:393 vacation.cpp:721
 msgid ""
 "Sieve script installed successfully on the server.\n"
 "Out of Office reply is now active."
@@ -11904,7 +12901,7 @@ msgstr ""
 "ਸਰਵਰ ਉੱਤੇ ਸਿਈਵੀ ਸਕ੍ਰਿਪਟ ਠੀਕ ਤਰ੍ਹਾਂ ਇੰਸਟਾਲ ਕੀਤਾ ਗਿਆ।\n"
 "ਦਫ਼ਤਰੋਂ ਬਾਹਰ ਜਵਾਬ ਹੁਣ ਸਰਗਰਮ ਹੈ।"
 
-#: sievedebugdialog.cpp:396 vacation.cpp:716
+#: sievedebugdialog.cpp:395 vacation.cpp:723
 msgid ""
 "Sieve script installed successfully on the server.\n"
 "Out of Office reply has been deactivated."
@@ -11985,19 +12982,23 @@ msgstr "ਕਮਾਂਡ ਦਿਓ(&p):"
 msgid "New entry:"
 msgstr "ਨਵਾਂ ਇੰਦਰਾਜ਼:"
 
-#: simplestringlisteditor.cpp:205
+#: simplestringlisteditor.cpp:214
 msgid "New Value"
 msgstr "ਨਵਾਂ ਮੁੱਲ"
 
-#: simplestringlisteditor.cpp:225
+#: simplestringlisteditor.cpp:235
 msgid "Change Value"
 msgstr "ਮੁੱਲ ਤਬਦੀਲ"
 
-#: snippetdlg.cpp:71
+#: snippetdlg.cpp:78
 #, fuzzy
 msgid "Sh&ortcut:"
 msgstr "ਸ਼ਾਰਟਕੱਟ:"
 
+#: snippetitem.cpp:133 snippetwidget.cpp:171
+msgid "GROUP"
+msgstr ""
+
 #: snippetwidget.cpp:148
 #, c-format
 msgid "Snippet %1"
@@ -12081,9 +13082,10 @@ msgid "Make value &default"
 msgstr "ਮੂਲ ਵਾਂਗ ਸੈੱਟ(&D)"
 
 #: subscriptiondialog.cpp:376
+#, fuzzy
 msgid ""
-"Currently subscriptions are not used for server %1\n"
-"do you want to enable subscriptions?"
+"Currently subscriptions are not used for server. %1\n"
+"Do you want to enable subscriptions?"
 msgstr ""
 "ਸਰਵਰ %1 ਲਈ ਇਸ ਸਮੇਂ ਮੈਂਬਰੀ ਨਹੀਂ ਵਰਤੀ ਜਾ ਸਕਦੀ ਹੈ\n"
 "ਕੀ ਤੁਸੀਂ ਮੈਂਬਰੀ ਯੋਗ ਕਰਨੀ ਚਾਹੁੰਦੇ ਹੋ?"
@@ -12100,28 +13102,33 @@ msgstr "ਯੋਗ"
 msgid "Do Not Enable"
 msgstr "ਯੋਗ ਨਹੀਂ"
 
-#: templateparser.cpp:238 templateparser.cpp:271
+#: templateparser.cpp:263 templateparser.cpp:296
 msgid "Cannot insert content from file %1: %2"
 msgstr ""
 
-#: templateparser.cpp:1009 templateparser.cpp:1013
+#: templateparser.cpp:970
+#, fuzzy, c-format
+msgid "Attachment %1"
+msgstr "ਨੱਥੀ: %1"
+
+#: templateparser.cpp:1150 templateparser.cpp:1154
 msgid "Pipe command exit with status %1: %2"
 msgstr ""
 
-#: templateparser.cpp:1024 templateparser.cpp:1028
+#: templateparser.cpp:1165 templateparser.cpp:1169
 msgid "Pipe command killed by signal %1: %2"
 msgstr ""
 
-#: templateparser.cpp:1040
+#: templateparser.cpp:1181
 msgid "Pipe command did not finish within %1 seconds: %2"
 msgstr ""
 
-#: templateparser.cpp:1052 templateparser.cpp:1055
+#: templateparser.cpp:1193 templateparser.cpp:1196
 #, c-format
 msgid "Cannot write to process stdin: %1"
 msgstr ""
 
-#: templateparser.cpp:1063
+#: templateparser.cpp:1204
 #, c-format
 msgid "Cannot start pipe command from template: %1"
 msgstr ""
@@ -12173,15 +13180,16 @@ msgstr ""
 "-------------------------------------------------------\n"
 
 #: templatesconfiguration.cpp:392
+#, fuzzy
 msgid ""
 "%REM=\"Default forward template\"%-\n"
 "\n"
 "----------  %1  ----------\n"
 "\n"
 "Subject: %OFULLSUBJECT\n"
-"Date: %ODATE\n"
+"Date: %ODATE, %OTIMELONG\n"
 "From: %OFROMADDR\n"
-"To: %OTOADDR\n"
+"%OADDRESSEESADDR\n"
 "\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
@@ -12199,49 +13207,55 @@ msgstr ""
 "-------------------------------------------------------\n"
 
 #: templatesconfiguration.cpp:511
+#, fuzzy
 msgid ""
 "%REM=\"Default new message template\"%-\n"
-"%BLANK"
+"%BLANK\n"
+"%BLANK\n"
+"%BLANK\n"
 msgstr ""
 "%REM=\"Default new message template\"%-\n"
 "%BLANK"
 
-#: templatesconfiguration.cpp:518
+#: templatesconfiguration.cpp:520
 #, fuzzy
 msgid ""
+"%CURSOR\n"
+"%BLANK\n"
 "%REM=\"Default reply template\"%-\n"
 "On %ODATEEN %OTIMELONGEN you wrote:\n"
 "%QUOTE\n"
-"%CURSOR\n"
 msgstr ""
 "%REM=\"Default reply template\"%-\n"
 "On %ODATEEN %OTIMELONGEN you wrote:\n"
 "%QUOTE\n"
 "%CURSOR\n"
 
-#: templatesconfiguration.cpp:527
+#: templatesconfiguration.cpp:530
 #, fuzzy
 msgid ""
+"%CURSOR\n"
+"%BLANK\n"
 "%REM=\"Default reply all template\"%-\n"
 "On %ODATEEN %OTIMELONGEN %OFROMNAME wrote:\n"
 "%QUOTE\n"
-"%CURSOR\n"
 msgstr ""
 "%REM=\"Default reply all template\"%-\n"
 "On %ODATEEN %OTIMELONGEN %OFROMNAME wrote:\n"
 "%QUOTE\n"
 "%CURSOR\n"
 
-#: templatesconfiguration.cpp:536
+#: templatesconfiguration.cpp:541
+#, fuzzy
 msgid ""
 "%REM=\"Default forward template\"%-\n"
 "\n"
 "----------  Forwarded Message  ----------\n"
 "\n"
 "Subject: %OFULLSUBJECT\n"
-"Date: %ODATE\n"
+"Date: %ODATE, %OTIMELONG\n"
 "From: %OFROMADDR\n"
-"To: %OTOADDR\n"
+"%OADDRESSEESADDR\n"
 "\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
@@ -12278,155 +13292,160 @@ msgstr "ਹਵਾਲਾ ਸੁਨੇਹਾ"
 msgid "Message Text as Is"
 msgstr "ਸੁਨੇਹਾ ਪਾਠ ਇੰਝ"
 
-#: templatesinsertcommand.cpp:62 templatesinsertcommand.cpp:163
+#: templatesinsertcommand.cpp:62 templatesinsertcommand.cpp:166
 msgid "Message Id"
 msgstr "ਸੁਨੇਹਾ Id"
 
-#: templatesinsertcommand.cpp:70 templatesinsertcommand.cpp:171
+#: templatesinsertcommand.cpp:70 templatesinsertcommand.cpp:174
 msgid "Date in Short Format"
 msgstr "ਤਾਰੀਖ ਛੋਟੇ ਫਾਰਮੈਟ ਵਿੱਚ"
 
-#: templatesinsertcommand.cpp:74 templatesinsertcommand.cpp:175
+#: templatesinsertcommand.cpp:74 templatesinsertcommand.cpp:178
 msgid "Date in C Locale"
 msgstr "ਤਾਰੀਖ C ਲੋਕੇਲ 'ਚ"
 
-#: templatesinsertcommand.cpp:78 templatesinsertcommand.cpp:179
+#: templatesinsertcommand.cpp:78 templatesinsertcommand.cpp:182
 msgid "Day of Week"
 msgstr "ਹਫ਼ਤੇ ਦਾ ਦਿਨ"
 
-#: templatesinsertcommand.cpp:82 templatesinsertcommand.cpp:183
+#: templatesinsertcommand.cpp:82 templatesinsertcommand.cpp:186
 msgid "Time"
 msgstr "ਸਮਾਂ"
 
-#: templatesinsertcommand.cpp:86 templatesinsertcommand.cpp:187
+#: templatesinsertcommand.cpp:86 templatesinsertcommand.cpp:190
 msgid "Time in Long Format"
 msgstr "ਸਮਾਂ ਲੰਮੇ ਫਾਰਮੈਟ 'ਚ"
 
-#: templatesinsertcommand.cpp:90 templatesinsertcommand.cpp:191
+#: templatesinsertcommand.cpp:90 templatesinsertcommand.cpp:194
 msgid "Time in C Locale"
 msgstr "ਸਮਾਂ C ਲੋਕੇਲ 'ਚ"
 
-#: templatesinsertcommand.cpp:94 templatesinsertcommand.cpp:195
+#: templatesinsertcommand.cpp:94 templatesinsertcommand.cpp:198
 msgid "To Field Address"
 msgstr "ਵੱਲ ਖੇਤਰ ਸਿਰਨਾਵਾਂ"
 
-#: templatesinsertcommand.cpp:98 templatesinsertcommand.cpp:199
+#: templatesinsertcommand.cpp:98 templatesinsertcommand.cpp:202
 msgid "To Field Name"
 msgstr "ਵੱਲ ਖੇਤਰ ਨਾਂ"
 
-#: templatesinsertcommand.cpp:102 templatesinsertcommand.cpp:203
+#: templatesinsertcommand.cpp:102 templatesinsertcommand.cpp:206
 msgid "To Field First Name"
 msgstr ""
 
-#: templatesinsertcommand.cpp:106 templatesinsertcommand.cpp:207
+#: templatesinsertcommand.cpp:106 templatesinsertcommand.cpp:210
 msgid "To Field Last Name"
 msgstr ""
 
-#: templatesinsertcommand.cpp:110 templatesinsertcommand.cpp:211
+#: templatesinsertcommand.cpp:110 templatesinsertcommand.cpp:214
 msgid "CC Field Address"
 msgstr "ਵੱਲ ਖੇਤਰ ਸਿਰਨਾਵਾਂ"
 
-#: templatesinsertcommand.cpp:114 templatesinsertcommand.cpp:215
+#: templatesinsertcommand.cpp:114 templatesinsertcommand.cpp:218
 msgid "CC Field Name"
 msgstr ""
 
-#: templatesinsertcommand.cpp:118 templatesinsertcommand.cpp:219
+#: templatesinsertcommand.cpp:118 templatesinsertcommand.cpp:222
 msgid "CC Field First Name"
 msgstr ""
 
-#: templatesinsertcommand.cpp:122 templatesinsertcommand.cpp:223
+#: templatesinsertcommand.cpp:122 templatesinsertcommand.cpp:226
 msgid "CC Field Last Name"
 msgstr ""
 
-#: templatesinsertcommand.cpp:126 templatesinsertcommand.cpp:227
+#: templatesinsertcommand.cpp:126 templatesinsertcommand.cpp:230
 msgid "From Field Address"
 msgstr "ਵੱਲੋਂ ਖੇਤਰ ਸਿਰਨਾਵਾਂ"
 
-#: templatesinsertcommand.cpp:130 templatesinsertcommand.cpp:231
+#: templatesinsertcommand.cpp:130 templatesinsertcommand.cpp:234
 msgid "From Field Name"
 msgstr ""
 
-#: templatesinsertcommand.cpp:134 templatesinsertcommand.cpp:235
+#: templatesinsertcommand.cpp:134 templatesinsertcommand.cpp:238
 msgid "From Field First Name"
 msgstr ""
 
-#: templatesinsertcommand.cpp:138 templatesinsertcommand.cpp:239
+#: templatesinsertcommand.cpp:138 templatesinsertcommand.cpp:242
 msgid "From Field Last Name"
 msgstr ""
 
-#: templatesinsertcommand.cpp:146
+#: templatesinsertcommand.cpp:142
+#, fuzzy
+msgid "Addresses of all original recipients"
+msgstr "ਵਾਧੂ ਪਰਾਪਤ ਕਰਤਾ"
+
+#: templatesinsertcommand.cpp:149
 msgid "Quoted Headers"
 msgstr "ਹਵਾਲਾ ਸਿਰਲੇਖ"
 
-#: templatesinsertcommand.cpp:150
+#: templatesinsertcommand.cpp:153
 msgid "Headers as Is"
 msgstr ""
 
-#: templatesinsertcommand.cpp:154 templatesinsertcommand.cpp:247
+#: templatesinsertcommand.cpp:157 templatesinsertcommand.cpp:250
 msgid "Header Content"
 msgstr "ਸਿਰਲੇਖ ਸਮੱਗਰੀ"
 
-#: templatesinsertcommand.cpp:160
+#: templatesinsertcommand.cpp:163
 msgid "Current Message"
 msgstr "ਮੌਜੂਦਾ ਸੁਨੇਹਾ"
 
-#: templatesinsertcommand.cpp:253
+#: templatesinsertcommand.cpp:256
 msgid "Process With External Programs"
 msgstr ""
 
-#: templatesinsertcommand.cpp:256
+#: templatesinsertcommand.cpp:259
 msgid "Insert Result of Command"
 msgstr ""
 
-#: templatesinsertcommand.cpp:260
+#: templatesinsertcommand.cpp:263
 msgid "Pipe Original Message Body and Insert Result as Quoted Text"
 msgstr ""
 
-#: templatesinsertcommand.cpp:264
+#: templatesinsertcommand.cpp:267
 msgid "Pipe Original Message Body and Insert Result as Is"
 msgstr ""
 
-#: templatesinsertcommand.cpp:268
+#: templatesinsertcommand.cpp:271
 msgid "Pipe Original Message with Headers and Insert Result as Is"
 msgstr ""
 
-#: templatesinsertcommand.cpp:272
+#: templatesinsertcommand.cpp:275
 msgid "Pipe Current Message Body and Insert Result as Is"
 msgstr ""
 
-#: templatesinsertcommand.cpp:276
+#: templatesinsertcommand.cpp:279
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
-#: templatesinsertcommand.cpp:285
+#: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr "ਕਰਸਰ ਸਥਿਤੀ ਦਿਓ"
 
-#: templatesinsertcommand.cpp:289
+#: templatesinsertcommand.cpp:292
 msgid "Insert File Content"
 msgstr "ਫਾਇਲ ਸਮੱਗਰੀ ਸ਼ਾਮਲ"
 
-#: templatesinsertcommand.cpp:293
+#: templatesinsertcommand.cpp:296
 msgid "DNL"
 msgstr "DNL"
 
-#: templatesinsertcommand.cpp:297
+#: templatesinsertcommand.cpp:300
 msgid "Template Comment"
 msgstr "ਨਮੂਨਾ ਟਿੱਪਣੀ"
 
-#: templatesinsertcommand.cpp:301
+#: templatesinsertcommand.cpp:304
 msgid "No Operation"
 msgstr "ਕੋਈ ਕਾਰਵਾਈ ਨਹੀਂ"
 
-#: templatesinsertcommand.cpp:305
+#: templatesinsertcommand.cpp:308
 msgid "Clear Generated Message"
 msgstr "ਤਿਆਰ ਕੀਤਾ ਸੁਨੇਹਾ ਸਾਫ਼ ਕਰੋ"
 
-#: templatesinsertcommand.cpp:309
+#: templatesinsertcommand.cpp:312
 msgid "Turn Debug On"
 msgstr ""
 
-#: templatesinsertcommand.cpp:313
+#: templatesinsertcommand.cpp:316
 msgid "Turn Debug Off"
 msgstr ""
 
@@ -12508,61 +13527,71 @@ msgstr ""
 msgid "There is nothing to undo."
 msgstr "ਕੁਝ ਵੀ ਵਾਪਿਸ ਕਰਨ ਲਈ ਨਹੀਂ ਹੈ"
 
-#: urlhandlermanager.cpp:422
+#: urlhandlermanager.cpp:482
 msgid "Turn on HTML rendering for this message."
 msgstr "ਇਸ ਸੁਨੇਹਾ ਲਈ HTML ਪੇਸ਼ਕਾਰੀ ਚਾਲੂ ਕਰੋ।"
 
-#: urlhandlermanager.cpp:424
+#: urlhandlermanager.cpp:484
 msgid "Load external references from the Internet for this message."
 msgstr "ਇਹ ਸੁਨੇਹੇ ਲਈ ਇੰਟਰਨੈੱਟ ਤੋਂ ਬਾਹਰੀ ਹਵਾਲਾ ਲੋਡ ਕਰੋ।"
 
-#: urlhandlermanager.cpp:426
+#: urlhandlermanager.cpp:486
 #, fuzzy
 msgid "Work online."
 msgstr "ਆਨਲਾਇਨ ਕੰਮ ਕਰੋ"
 
-#: urlhandlermanager.cpp:428
+#: urlhandlermanager.cpp:488
 #, fuzzy
 msgid "Decrypt message."
 msgstr "ਇਕ੍ਰਿਪਟਡ ਸੁਨੇਹਾ"
 
-#: urlhandlermanager.cpp:430
+#: urlhandlermanager.cpp:490
 #, fuzzy
 msgid "Show signature details."
 msgstr "ਕੋਈ ਦਸਤਖਤ ਉਪਲੱਬਧ ਨਹੀਂ"
 
-#: urlhandlermanager.cpp:432
+#: urlhandlermanager.cpp:492
 #, fuzzy
 msgid "Hide signature details."
 msgstr "ਵਧੀਆ ਦਸਤਖਤ ਹਨ।"
 
-#: urlhandlermanager.cpp:464
+#: urlhandlermanager.cpp:494
+#, fuzzy
+msgid "Hide attachment list"
+msgstr "ਨੱਥੀ ਇੰਝ ਸੰਭਾਲੋ"
+
+#: urlhandlermanager.cpp:496
+#, fuzzy
+msgid "Show attachment list"
+msgstr "ਨੱਥੀ ਆਈਕਾਨ ਵੇਖਾਓ"
+
+#: urlhandlermanager.cpp:528
 msgid "Expand all quoted text."
 msgstr "ਸਭ ਹਵਾਲਾ ਪਾਠ ਫੈਲਾਓ।"
 
-#: urlhandlermanager.cpp:466
+#: urlhandlermanager.cpp:531
 msgid "Collapse quoted text."
 msgstr "ਹਵਾਲਾ ਪਾਠ ਸਮੇਟੋ।"
 
-#: urlhandlermanager.cpp:487
+#: urlhandlermanager.cpp:554
 msgid "Could not start certificate manager. Please check your installation."
 msgstr ""
 "ਸਰਟੀਫਕੇਟ ਮੈਨੇਜਰ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ। ਆਪਣੀ ਇੰਸਟਾਲੇਸ਼ਨ ਦੀ ਜਾਂਚ ਕਰੋ ਜੀ।"
 
-#: urlhandlermanager.cpp:497
+#: urlhandlermanager.cpp:564
 #, c-format
 msgid "Show certificate 0x%1"
 msgstr "ਸਰਟੀਫਕੇਟ 0x%1 ਵੇਖਾਓ"
 
-#: urlhandlermanager.cpp:552
+#: urlhandlermanager.cpp:693
 msgid "Attachment #%1 (unnamed)"
 msgstr "ਨੱਥੀ #%1 (ਬੇਨਾਮ)"
 
-#: urlhandlermanager.cpp:581
+#: urlhandlermanager.cpp:724
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
-#: vacation.cpp:562
+#: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
 "\n"
@@ -12586,7 +13615,7 @@ msgstr ""
 "ਤੁਹਾਡਾ ਸ਼ੁੱਭਚਿੰਤਕ,\n"
 "<ਆਪਣਾ ਨਾਂ ਤੇ ਈ-ਮੇਲ ਇੱਥੇ ਦਿਓ>\n"
 
-#: vacation.cpp:606
+#: vacation.cpp:612
 msgid ""
 "Your server did not list \"vacation\" in its list of supported Sieve "
 "extensions;\n"
@@ -12594,28 +13623,28 @@ msgid ""
 "Please contact you system administrator."
 msgstr ""
 
-#: vacation.cpp:616
+#: vacation.cpp:622
 msgid "Configure \"Out of Office\" Replies"
 msgstr "\"ਦਫਤਰੋਂ ਬਾਹਰ\" ਜਵਾਬ ਲਈ ਸੰਰਚਨਾ"
 
-#: vacation.cpp:626
+#: vacation.cpp:632
 msgid ""
 "Someone (probably you) changed the vacation script on the server.\n"
 "KMail is no longer able to determine the parameters for the autoreplies.\n"
 "Default values will be used."
 msgstr ""
 
-#: vacation.cpp:651
+#: vacation.cpp:657
 msgid ""
 "There is still an active out-of-office reply configured.\n"
 "Do you want to edit it?"
 msgstr ""
 
-#: vacation.cpp:652
+#: vacation.cpp:658
 msgid "Out-of-office reply still active"
 msgstr ""
 
-#: vacation.cpp:653
+#: vacation.cpp:659
 #, fuzzy
 msgid "Ignore"
 msgstr "ਅਣਡਿੱਠਾ(&I)"
@@ -12628,40 +13657,40 @@ msgstr "ਭੇਜਣ ਲਈ ਛੁੱਟੀ ਜਾਣਕਾਰੀ ਸੰਰਚ�
 msgid "&Activate vacation notifications"
 msgstr "ਛੁੱਟੀ ਸੂਚਨਾ ਸਰਗਰਮ ਕਰੋ(&A)"
 
-#: vacationdialog.cpp:76
+#: vacationdialog.cpp:78
 msgid "&Resend notification only after:"
 msgstr "ਇਸ ਬਾਅਦ ਹੀ ਸੂਚਨਾ ਮੁੜ ਭੇਜੀ ਜਾਵੇ(&R):"
 
-#: vacationdialog.cpp:82
+#: vacationdialog.cpp:84
 msgid "&Send responses for these addresses:"
 msgstr "ਇਹ ਸਿਰਨਾਵੀਆਂ ਨੂੰ ਜਵਾਬ ਭੇਜੋ(&S):"
 
-#: vacationdialog.cpp:87
+#: vacationdialog.cpp:89
 #, fuzzy
 msgid "Do not send vacation replies to spam messages"
 msgstr "ਸੁਨੇਹੇ ਇਕ੍ਰਿਪਟ ਨਾ ਕਰੋ(&D)"
 
-#: vacationdialog.cpp:93
+#: vacationdialog.cpp:95
 msgid "Only react to mail coming from domain"
 msgstr ""
 
-#: vcardviewer.cpp:41
+#: vcardviewer.cpp:45
 msgid "VCard Viewer"
 msgstr "VCard ਦਰਸ਼ਕ"
 
-#: vcardviewer.cpp:42
+#: vcardviewer.cpp:46
 msgid "&Import"
 msgstr "ਆਯਾਤ(&I)"
 
-#: vcardviewer.cpp:42
+#: vcardviewer.cpp:46
 msgid "&Next Card"
 msgstr "ਅੱਗੇ ਕਾਰਡ(&N)"
 
-#: vcardviewer.cpp:42
+#: vcardviewer.cpp:46
 msgid "&Previous Card"
 msgstr "ਪਿਛਲਾ ਕਾਰਡ(&P)"
 
-#: vcardviewer.cpp:62
+#: vcardviewer.cpp:70
 msgid "Failed to parse vCard."
 msgstr "ਵੀਕਾਰਡ ਨੂੰ ਪਾਰਸ ਕਰਨ ਵਿੱਚ ਅਸਫਲ"
 
@@ -12850,7 +13879,7 @@ msgstr "ਹਮ"
 msgid "To Do"
 msgstr "ਕਰਨ-ਲਈ"
 
-#: kmsearchpattern.h:233
+#: kmsearchpattern.h:234
 msgid "Has Attachment"
 msgstr "ਨੱਥੀ ਹੈ"
 
@@ -12858,6 +13887,11 @@ msgstr "ਨੱਥੀ ਹੈ"
 msgid "%1 of %2 %3 used"
 msgstr "%2 %3 ਵਿੱਚੋਂ %1 ਵਰਤੀ"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "ਮਾਰਗ"
+
 #: util.h:208
 msgid ""
 "A file named \"%1\" already exists. Are you sure you want to overwrite it?"
@@ -12868,6 +13902,31 @@ msgstr ""
 msgid "Overwrite File?"
 msgstr "ਕੀ ਫਾਇਲ ਉੱਪਰ ਲਿਖਣਾ ਹੈ?"
 
+#, fuzzy
+#~ msgid "Show folder quick search field"
+#~ msgstr "ਤੇਜ਼ ਖੋਜ ਸਤਰ ਸੋਧ ਵੇਖਾਓ"
+
+#~ msgid "Standard (Ical / Vcard)"
+#~ msgstr "ਮਿਆਰੀ (Ical / Vcard)"
+
+#~ msgid ""
+#~ "_: recipient address field\n"
+#~ "&To:"
+#~ msgstr "ਵੱਲ(&T):"
+
+#~ msgid "&Copy to (CC):"
+#~ msgstr "ਨਕਲ (&CC):"
+
+#~ msgid "&Blind copy to (BCC):"
+#~ msgstr "ਲੁਕਵੀਂ ਨਕਲ(&BCC):"
+
+#~ msgid "Retrieving new messages"
+#~ msgstr "ਨਵੇਂ ਸੁਨੇਹੇ ਲਏ ਜਾ ਰਹੇ ਹਨ"
+
+#, fuzzy
+#~ msgid "Show folder quick search line edit"
+#~ msgstr "ਤੇਜ਼ ਖੋਜ ਸਤਰ ਸੋਧ ਵੇਖਾਓ"
+
 #~ msgid "Op&en"
 #~ msgstr "ਖੋਲ੍ਹੋ(&e)"
 
@@ -13020,6 +14079,3 @@ msgstr "ਕੀ ਫਾਇਲ ਉੱਪਰ ਲਿਖਣਾ ਹੈ?"
 
 #~ msgid "Always"
 #~ msgstr "ਹਮੇਸ਼ਾ"
-
-#~ msgid "After"
-#~ msgstr "ਬਾਅਦ"
diff --git a/tde-i18n-pa/messages/tdepim/kmail_text_calendar_plugin.po b/tde-i18n-pa/messages/tdepim/kmail_text_calendar_plugin.po
index f9f1f1d5912..d9cee9833e2 100644
--- a/tde-i18n-pa/messages/tdepim/kmail_text_calendar_plugin.po
+++ b/tde-i18n-pa/messages/tdepim/kmail_text_calendar_plugin.po
@@ -4,95 +4,280 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail_text_calendar_plugin\n"
-"POT-Creation-Date: 2008-08-19 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-04-20 17:49+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: text_calendar.cpp:326
+#: text_calendar.cpp:343
 #, fuzzy
 msgid "Incidence with no summary"
 msgstr "ਜਵਾਬ: ਬਿਨਾਂ ਵੇਰਵੇ ਦੇ ਵਾਕਿਆ"
 
-#: text_calendar.cpp:330 text_calendar.cpp:341
+#: text_calendar.cpp:347
 #, c-format
 msgid "Answer: %1"
 msgstr "ਜਵਾਬ: %1"
 
-#: text_calendar.cpp:333
+#: text_calendar.cpp:350
 #, c-format
 msgid "Delegated: %1"
 msgstr ""
 
-#: text_calendar.cpp:336
+#: text_calendar.cpp:353
 #, c-format
 msgid "Forwarded: %1"
 msgstr ""
 
-#: text_calendar.cpp:386
+#: text_calendar.cpp:356
+#, c-format
+msgid "Declined Counter Proposal: %1"
+msgstr ""
+
+#: text_calendar.cpp:412
 msgid "Could not save file to KOrganizer"
 msgstr "ਕੇ-ਪ੍ਰਬੰਧਕ ਲਈ ਫਾਇਲ ਸੰਭਾਲ ਨਹੀਂ ਜਾ ਸਕੀ"
 
-#: text_calendar.cpp:415 text_calendar.cpp:556
+#: text_calendar.cpp:437 text_calendar.cpp:443
+msgid "\"%1\" occurred already."
+msgstr ""
+
+#: text_calendar.cpp:439 text_calendar.cpp:456
+msgid "\"%1\" is currently in-progress."
+msgstr ""
+
+#: text_calendar.cpp:445
+msgid "\"%1\", happening all day today, is currently in-progress."
+msgstr ""
+
+#: text_calendar.cpp:454 text_calendar.cpp:466
+msgid "\"%1\" is past due."
+msgstr ""
+
+#: text_calendar.cpp:460
+msgid "\"%1\" has already started."
+msgstr ""
+
+#: text_calendar.cpp:469
+msgid "\"%1\", happening all-day today, is currently in-progress."
+msgstr ""
+
+#: text_calendar.cpp:474
+msgid "\"%1\", happening all day, has already started."
+msgstr ""
+
+#: text_calendar.cpp:486
+msgid "Do you still want to accept the invitation?"
+msgstr ""
+
+#: text_calendar.cpp:488
+msgid "Do you still want to accept the task?"
+msgstr ""
+
+#: text_calendar.cpp:492
+msgid "Do you still want to send conditional acceptance of the invitation?"
+msgstr ""
+
+#: text_calendar.cpp:494
+msgid "Do you still want to send conditional acceptance of the task?"
+msgstr ""
+
+#: text_calendar.cpp:497
+msgid "Do you still want to accept the counter proposal?"
+msgstr ""
+
+#: text_calendar.cpp:499
+msgid "Do you still want to send a counter proposal?"
+msgstr ""
+
+#: text_calendar.cpp:501
+msgid "Do you still want to send a decline response?"
+msgstr ""
+
+#: text_calendar.cpp:503
+msgid "Do you still want to decline the counter proposal?"
+msgstr ""
+
+#: text_calendar.cpp:505
+msgid "Do you still want to record this reponse in your calendar?"
+msgstr ""
+
+#: text_calendar.cpp:508
+msgid "Do you still want to delegate this invitation?"
+msgstr ""
+
+#: text_calendar.cpp:510
+msgid "Do you still want to delegate this task?"
+msgstr ""
+
+#: text_calendar.cpp:514
+msgid "Do you still want to forward this invitation?"
+msgstr ""
+
+#: text_calendar.cpp:516
+msgid "Do you still want to forward this task?"
+msgstr ""
+
+#: text_calendar.cpp:519
+msgid "Do you still want to check your calendar?"
+msgstr ""
+
+#: text_calendar.cpp:522
+msgid "Do you still want to record this invitation in your calendar?"
+msgstr ""
+
+#: text_calendar.cpp:524
+msgid "Do you still want to record this task in your calendar?"
+msgstr ""
+
+#: text_calendar.cpp:529
+msgid "%1?"
+msgstr ""
+
+#: text_calendar.cpp:534
+msgid ""
+"%1\n"
+"%2"
+msgstr ""
+
+#: text_calendar.cpp:556
 msgid "Reaction to Invitation"
 msgstr ""
 
-#. i18n("Decline Counter Proposal")
-#: text_calendar.cpp:416 text_calendar.cpp:557
+#: text_calendar.cpp:557 text_calendar.cpp:702
 msgid "Comment:"
 msgstr ""
 
-#: text_calendar.cpp:441
+#: text_calendar.cpp:587
 msgid "Delegation to organizer is not possible."
 msgstr ""
 
-#: text_calendar.cpp:648
-msgid "Accept incidence"
+#: text_calendar.cpp:701
+msgid "Decline Counter Proposal"
+msgstr ""
+
+#: text_calendar.cpp:734
+msgid ""
+"You have no writable calendar folders for invitations, so storing or saving a "
+"response will not be possible.\n"
+"Please create at least 1 writable events calendar and re-sync."
+msgstr ""
+
+#: text_calendar.cpp:754
+msgid ""
+"The calendar invitation stored in this email message is broken in some way. "
+"Unable to continue."
+msgstr ""
+
+#: text_calendar.cpp:808
+msgid ""
+"The organizer is not expecting a reply to this invitation but you can send them "
+"an email message if you desire.\n"
+"\n"
+"Would you like to send the organizer a message regarding this invitation?\n"
+"Press the [Cancel] button to cancel the recording operation."
+msgstr ""
+
+#: text_calendar.cpp:812
+#, fuzzy
+msgid "Send Email to Organizer"
+msgstr "ਕੇ-ਪ੍ਰਬੰਧਕ ਲਈ ਫਾਇਲ ਸੰਭਾਲ ਨਹੀਂ ਜਾ ਸਕੀ"
+
+#: text_calendar.cpp:813
+msgid "Do Not Send"
+msgstr ""
+
+#: text_calendar.cpp:814
+msgid "Send EMail"
+msgstr ""
+
+#: text_calendar.cpp:823
+#, fuzzy, c-format
+msgid "Re: %1"
+msgstr "ਜਵਾਬ: %1"
+
+#: text_calendar.cpp:880
+msgid "Open Attachment"
+msgstr ""
+
+#: text_calendar.cpp:881
+msgid "Save Attachment As..."
+msgstr ""
+
+#: text_calendar.cpp:901
+#, fuzzy
+msgid "Accept invitation"
 msgstr "ਵਾਕਿਆ ਸਵੀਕਾਰ"
 
-#: text_calendar.cpp:650
-msgid "Accept incidence conditionally"
+#: text_calendar.cpp:903
+#, fuzzy
+msgid "Accept invitation conditionally"
 msgstr "ਵਾਕਿਆ ਸ਼ਰਤਾਂ ਨਾਲ ਸਵੀਕਾਰ"
 
-#: text_calendar.cpp:655
+#: text_calendar.cpp:905
+msgid "Accept counter proposal"
+msgstr ""
+
+#: text_calendar.cpp:907
 msgid "Create a counter proposal..."
 msgstr ""
 
-#: text_calendar.cpp:657
+#: text_calendar.cpp:909
 msgid "Throw mail away"
 msgstr "ਪੱਤਰ ਸੁੱਟ ਦਿਓ"
 
-#: text_calendar.cpp:659
-msgid "Decline incidence"
+#: text_calendar.cpp:911
+#, fuzzy
+msgid "Decline invitation"
 msgstr "ਵਾਕਿਆ ਨਾ-ਮਨਜ਼ੂਰ"
 
-#: text_calendar.cpp:664
+#: text_calendar.cpp:913
+msgid "Decline counter proposal"
+msgstr ""
+
+#: text_calendar.cpp:915
 msgid "Check my calendar..."
 msgstr "ਮੇਰੇ ਕੈਲੰਡਰ ਦੀ ਜਾਂਚ ਕਰੋ..."
 
-#: text_calendar.cpp:666
-msgid "Enter incidence into my calendar"
+#: text_calendar.cpp:917
+#, fuzzy
+msgid "Record response into my calendar"
 msgstr "ਘਟਨਾ ਨੂੰ ਮੇਰੇ ਕੈਲੰਡਰ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰੋ"
 
-#: text_calendar.cpp:668
+#: text_calendar.cpp:919
 #, fuzzy
-msgid "Delegate incidence"
+msgid "Record invitation into my calendar"
+msgstr "ਘਟਨਾ ਨੂੰ ਮੇਰੇ ਕੈਲੰਡਰ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰੋ"
+
+#: text_calendar.cpp:921
+msgid "Move this invitation to my trash folder"
+msgstr ""
+
+#: text_calendar.cpp:923
+#, fuzzy
+msgid "Delegate invitation"
 msgstr "ਵਾਕਿਆ ਨਾ-ਮਨਜ਼ੂਰ"
 
-#: text_calendar.cpp:670
+#: text_calendar.cpp:925
 #, fuzzy
-msgid "Forward incidence"
+msgid "Forward invitation"
 msgstr "ਵਾਕਿਆ ਸਵੀਕਾਰ"
 
-#: text_calendar.cpp:672
-msgid "Remove incidence from my calendar"
+#: text_calendar.cpp:927
+#, fuzzy
+msgid "Remove invitation from my calendar"
 msgstr "ਘਟਨਾ ਨੂੰ ਮੇਰੇ ਕੈਲੰਡਰ ਵਿੱਚੋਂ ਹਟਾਓ"
 
+#: text_calendar.cpp:930
+msgid "Open attachment \"%1\""
+msgstr ""
+
 #: delegateselector.cpp:32
 msgid "Select delegate"
 msgstr ""
@@ -105,10 +290,10 @@ msgstr ""
 msgid "Keep me informed about status changes of this incidence."
 msgstr ""
 
-#: attendeeselector.cpp:31
+#: attendeeselector.cpp:32
 msgid "Select Attendees"
 msgstr ""
 
-#: attendeeselector.cpp:44
+#: attendeeselector.cpp:45
 msgid "Click to add a new attendee"
 msgstr ""
diff --git a/tde-i18n-pa/messages/tdepim/kmail_text_vcard_plugin.po b/tde-i18n-pa/messages/tdepim/kmail_text_vcard_plugin.po
index 9219990c05a..bd1735cb31d 100644
--- a/tde-i18n-pa/messages/tdepim/kmail_text_vcard_plugin.po
+++ b/tde-i18n-pa/messages/tdepim/kmail_text_vcard_plugin.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail_text_vcard_plugin\n"
-"POT-Creation-Date: 2004-12-11 01:22+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-04-20 17:49+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -17,14 +18,43 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "\n"
 
-#: text_vcard.cpp:82
+#: text_vcard.cpp:93
 msgid "Attached business cards"
 msgstr "ਵਪਾਰਿਕ ਕਾਰਡ ਨੱਥੀ ਕਰੋ"
 
-#: text_vcard.cpp:95
+#: text_vcard.cpp:106
 msgid "[Add this contact to the addressbook]"
 msgstr "[ਇਹ ਸੰਪਰਕ ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰੋ]"
 
-#: text_vcard.cpp:134
+#: text_vcard.cpp:176
+#, fuzzy
+msgid "View Business Card"
+msgstr "ਵਪਾਰਿਕ ਕਾਰਡ ਨੱਥੀ ਕਰੋ"
+
+#: text_vcard.cpp:177
+#, fuzzy
+msgid "Save Business Card As..."
+msgstr "ਵਪਾਰਿਕ ਕਾਰਡ ਨੱਥੀ ਕਰੋ"
+
+#: text_vcard.cpp:196
 msgid "Add this contact to the address book."
 msgstr "ਇਹ ਸੰਪਰਕ ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰੋ"
+
+#: text_vcard.cpp:198
+#, fuzzy
+msgid "Add \"%1\" to the address book."
+msgstr "ਇਹ ਸੰਪਰਕ ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰੋ"
+
+#: text_vcard.cpp:208
+#, fuzzy
+msgid "Failed to parse the business card."
+msgstr "ਵਪਾਰਿਕ ਕਾਰਡ ਨੱਥੀ ਕਰੋ"
+
+#: text_vcard.cpp:225
+#, fuzzy
+msgid "Save Business Card"
+msgstr "ਵਪਾਰਿਕ ਕਾਰਡ ਨੱਥੀ ਕਰੋ"
+
+#: text_vcard.cpp:230
+msgid "%1 already exists. Do you want to overwrite it?"
+msgstr ""
diff --git a/tde-i18n-pa/messages/tdepim/kmailcvt.po b/tde-i18n-pa/messages/tdepim/kmailcvt.po
index 876f428c4dc..39f60cf260b 100644
--- a/tde-i18n-pa/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-pa/messages/tdepim/kmailcvt.po
@@ -4,16 +4,29 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2007-12-11 01:17+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-01-17 10:47+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "ਅਮਨਪ੍ਰੀਤ ਸਿੰਘ ਆਲਮ,ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "aalam@redhat.com,aalam@users.sf.net"
+
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
 msgstr "OS X ਪੱਤਰ ਤੋਂ ਆਯਾਤ"
@@ -24,115 +37,181 @@ msgid ""
 "<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
 msgstr ""
 
-#: filter_evolution.cxx:58 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:53 filter_oe.cxx:61
-#: filter_opera.cxx:60 filter_outlook.cxx:45 filter_plain.cxx:45
+#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
+#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
+#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
 #: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
 #: filter_thunderbird.cxx:65
 msgid "No directory selected."
 msgstr "ਕੋਈ ਡਾਇਰੈਕਟਰੀ ਚੁਣੀ ਨਹੀਂ ਹੈ।"
 
-#: filter_evolution.cxx:65 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:54 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:51 filter_sylpheed.cxx:63
+#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
+#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
+#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
 #: filter_thebat.cxx:69 filter_thunderbird.cxx:72
 msgid "No files found for import."
 msgstr "ਆਯਾਤ ਕਰਨ ਲਈ ਕੋਈ ਫਾਇਲ ਨਹੀਂ ਹੈ।"
 
-#: filter_evolution.cxx:125 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:89 filter_mailapp.cxx:63
-#: filter_mbox.cxx:55 filter_opera.cxx:87 filter_outlook.cxx:60
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
 #: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
 #: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
 msgid "Unable to open %1, skipping"
 msgstr "%1 ਨੂੰ ਖੋਲ੍ਹਣ ਲਈ ਅਸਫ਼ਲ, ਅਧੂਰਾ ਛੱਡਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: filter_evolution.cxx:146 filter_mailapp.cxx:71 filter_mbox.cxx:61
-#: filter_opera.cxx:89 filter_outlook.cxx:58
+#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
+#: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
 msgstr "%1 ਤੋਂ ਈ-ਮੇਲਾਂ ਆਯਾਤ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ..."
 
-#: filter_evolution.cxx:77 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:127 filter_mbox.cxx:133
-#: filter_opera.cxx:141 filter_plain.cxx:81 filter_pmail.cxx:79
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
 #: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "%1 ਤੋਂ ਈਮੇਲ ਆਯਾਤ ਕਰਨਾ ਮੁਕੰਮਲ ਹੋਇਆ"
 
-#: filter_mailapp.cxx:130 filter_mbox.cxx:136
+#: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr ""
 
 #: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:138 filter_mbox.cxx:139 filter_oe.cxx:103
-#: filter_opera.cxx:155 filter_plain.cxx:85 filter_sylpheed.cxx:82
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
 #: filter_thebat.cxx:88 filter_thunderbird.cxx:104
 msgid "Finished import, canceled by user."
 msgstr "ਆਯਾਤ ਕਰਨ ਖਤਮ, ਉਪਭੋਗੀ ਨੇ ਖਤਮ ਕੀਤਾ ਹੈ।"
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "ਥੰਡਰਬਰਡ/ਮੌਜੀਲਾ ਲੋਕਲ ਪੱਤਰ ਅਤੇ ਫੋਲਡਰ ਢਾਂਚਾ ਆਯਾਤ"
+#: filter_lnotes.cxx:30
+msgid "Import Lotus Notes Emails"
+msgstr "ਲੋਟਸ ਸੂਚਨਾ ਈ-ਮੇਲ ਅਯਾਤ"
 
-#: filter_thunderbird.cxx:30
+#: filter_lnotes.cxx:32
 msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
+"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
+"<p>This filter will import Structured Text files from an exported Lotus Notes "
+"email client into KMail. Use this filter if you want to import mails from Lotus "
+"or other mailers that use the Lotus Notes Structured Text format.</p>"
+"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
+"your local folder, named using the names of the files the messages came "
+"from.</p>"
 msgstr ""
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "ਫਾਇਲ %1 ਆਯਾਤ ਕਰਨੀ ਸ਼ੁਰੂ..."
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
+msgstr "ਸਭ ਫਾਇਲਾਂ (*)"
 
-#: filter_evolution.cxx:196 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:59
-#: filter_plain.cxx:83 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "%1 ਤੋਂ ਈ-ਮੇਲ ਆਯਾਤ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"
+
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
 #, c-format
+msgid "Message %1"
+msgstr "%1 ਸੁਨੇਹਾ"
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr ""
+
+#: filter_pmail.cxx:33
 msgid ""
-"_n: 1 duplicate message not imported\n"
-"%n duplicate messages not imported"
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
+"C:\\pmail\\mail\\admin</p>"
+"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"folders will be stored under: \"PegasusMail-Import\".</p>"
 msgstr ""
 
-#: filters.cxx:145 filters.cxx:180
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "ਫਾਇਲਾਂ ਦੀ ਗਿਣਤੀ ਜਾਰੀ ਹੈ..."
+
+#: filter_pmail.cxx:69
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"Cannot parse the folder structure; continuing import without subfolder support."
 msgstr ""
 
-#: filters.cxx:153 filters.cxx:188
-msgid "Cannot make folder %1 in KMail"
-msgstr "ਕੇਮੇਲ ਵਿੱਚ ਫੋਲਡਰ %1 ਨਹੀਂ ਬਣਾਇਆ ਜਾ ਸਕਦਾ ਹੈ"
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr ""
 
-#: filters.cxx:156 filters.cxx:191
-msgid "Cannot add message to folder %1 in KMail"
-msgstr "ਕੇਮੇਲ ਵਿੱਚ %1 ਫੋਲਡਰ ਲਈ ਸੁਨੇਹੇ ਜੋੜੇ ਨਹੀਂ ਜਾ ਸਕਦੇ ਹਨ"
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr ""
 
-#: filters.cxx:162 filters.cxx:194
-msgid "Error while adding message to folder %1 in KMail"
-msgstr "ਕੇਮੇਲ ਵਿੱਚ %1 ਫੋਲਡਰ ਤੋਂ ਸੁਨੇਹੇ ਜੋੜਨ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ"
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr ""
 
-#: _translatorinfo.cpp:1
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "%1 ਨੂੰ ਆਯਾਤ ਕੀਤੀ ਜਾ ਰਿਹਾ ਹੈ"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "ਫੋਲਡਰ ਢਾਂਚੇ ਦੀ ਜਾਂਚ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Outlook ਈ-ਮੇਲਾਂ ਆਯਾਤ"
+
+#: filter_outlook.cxx:30
 msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "ਅਮਨਪ੍ਰੀਤ ਸਿੰਘ ਆਲਮ,ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ"
+"<p><b>Outlook email import filter</b></p>"
+"<p>This filter will import mails from a Outlook pst-file. You will need to "
+"locate the folder where the pst-file has been stored by searching for .pst "
+"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
+"<p><b>Note:</b> Emails will be imported into a folder named after the account "
+"they came from, prefixed with OUTLOOK-</p>"
+msgstr ""
 
-#: _translatorinfo.cpp:3
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "ਮੇਲਾਂ ਦੀ ਗਿਣਤੀ ਜਾਰੀ ਹੈ..."
+
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "ਡਾਇਰੈਕਟਰੀਆਂ ਦੀ ਗਿਣਤੀ ਜਾਰੀ ਹੈ..."
+
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "ਫੋਲਡਰਾਂ ਦੀ ਗਿਣਤੀ ਜਾਰੀ ਹੈ..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "ਨਵੀਆਂ ਪੱਤਰ ਫਾਇਲਾਂ ਅਯਾਤ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ..."
+
+#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
+#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
+#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
+#: filter_thunderbird.cxx:101
+#, c-format
 msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "aalam@redhat.com,aalam@users.sf.net"
+"_n: 1 duplicate message not imported\n"
+"%n duplicate messages not imported"
+msgstr ""
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr ""
+
+#: filter_evolution.cxx:33
+msgid ""
+"<p><b>Evolution 1.x import filter</b></p>"
+"<p>Select the base directory of Evolution's mails (usually "
+"~/evolution/local).</p>"
+"<p>Since it is possible to recreate the folder structure, the folders will be "
+"stored under: \"Evolution-Import\".</p>"
+msgstr ""
 
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
@@ -153,136 +232,154 @@ msgid "Import folder %1..."
 msgstr "ਫੋਲਡਰ %1 ਆਯਾਤ..."
 
 #: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:68 filter_plain.cxx:72 filter_sylpheed.cxx:153
+#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
 #: filter_sylpheed.cxx:158
 #, c-format
 msgid "Could not import %1"
 msgstr "%1 ਨੂੰ ਆਯਾਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
 
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "KMail ਆਯਾਤ ਫਿਲਟਰ"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) ੨੦੦੦-੨੦੦੫, KMailCVT ਖੋਜੀ"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "ਅਸਲੀ ਲੇਖਕ"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "ਪਰਬੰਧਕ ਅਤੇ ਨਵੇਂ ਫਿਲਟਰ"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "ਨਵਾਂ GUI & ਸਫ਼ਾਈ"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
+"<p><b>Evolution 2.x import filter</b></p>"
+"<p>Select the base directory of your local Evolution mailfolder (usually "
+"~/.evolution/mail/local/).</p>"
+"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example a maildir): if you do, you will get many new "
+"folders.</p>"
 "<p>Since it is possible to recreate the folder structure, the folders will be "
 "stored under: \"Evolution-Import\".</p>"
 msgstr ""
 
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr ""
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-
-#: filter_opera.cxx:75 filter_outlook.cxx:46 filter_plain.cxx:52
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "ਫਾਇਲਾਂ ਦੀ ਗਿਣਤੀ ਜਾਰੀ ਹੈ..."
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "ਫਾਇਲ %1 ਆਯਾਤ ਕਰਨੀ ਸ਼ੁਰੂ..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:50 filter_plain.cxx:56
-msgid "Importing new mail files..."
-msgstr "ਨਵੀਆਂ ਪੱਤਰ ਫਾਇਲਾਂ ਅਯਾਤ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ..."
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>%1 ਵਲੋਂ ਲਿਖਿਆ ਗਿਆ।</i></p>"
 
-#: kmailcvt.cpp:26
+#: kmailcvt.cpp:28
 msgid "KMailCVT Import Tool"
 msgstr "KMailCVT ਅਯਾਤ ਸੰਦ"
 
-#: kmailcvt.cpp:29
+#: kmailcvt.cpp:31
 msgid "Step 1: Select Filter"
 msgstr "ਪਗ਼ 1: ਫੋਲਡਰ ਚੁਣੋ"
 
-#: kmailcvt.cpp:32
+#: kmailcvt.cpp:34
 msgid "Step 2: Importing..."
 msgstr "ਪਗ਼ 2: ਆਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: kmailcvt.cpp:53
+#: kmailcvt.cpp:76
 msgid "Import in progress"
 msgstr "ਆਯਾਤ ਜਾਰੀ ਹੈ"
 
-#: kmailcvt.cpp:56
+#: kmailcvt.cpp:79
 msgid "Import finished"
 msgstr "ਆਯਾਤ ਮੁਕੰਮਲ"
 
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
+#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+msgid ""
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
+"kmail</i> is installed."
 msgstr ""
 
-#: filter_pmail.cxx:33
+#: filters.cxx:153 filters.cxx:188
+msgid "Cannot make folder %1 in KMail"
+msgstr "ਕੇਮੇਲ ਵਿੱਚ ਫੋਲਡਰ %1 ਨਹੀਂ ਬਣਾਇਆ ਜਾ ਸਕਦਾ ਹੈ"
+
+#: filters.cxx:156 filters.cxx:191
+msgid "Cannot add message to folder %1 in KMail"
+msgstr "ਕੇਮੇਲ ਵਿੱਚ %1 ਫੋਲਡਰ ਲਈ ਸੁਨੇਹੇ ਜੋੜੇ ਨਹੀਂ ਜਾ ਸਕਦੇ ਹਨ"
+
+#: filters.cxx:162 filters.cxx:194
+msgid "Error while adding message to folder %1 in KMail"
+msgstr "ਕੇਮੇਲ ਵਿੱਚ %1 ਫੋਲਡਰ ਤੋਂ ਸੁਨੇਹੇ ਜੋੜਨ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ"
+
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr ""
+
+#: filter_mbox.cxx:30
 msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
+"<p><b>mbox import filter</b></p>"
+"<p>This filter will import mbox files into KMail. Use this filter if you want "
+"to import mails from Ximian Evolution or other mailers that use this "
+"traditional UNIX format.</p>"
+"<p><b>Note:</b> Emails will be imported into folders named after the file they "
+"came from, prefixed with MBOX-</p>"
 msgstr ""
 
-#: filter_pmail.cxx:69
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "mbox ਫਾਇਲਾਂ (*)"
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "ਸਮਤਲ ਪਾਠ ਈ-ਮੇਲਾਂ ਆਯਾਤ"
+
+#: filter_plain.cxx:29
 msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, prefixed "
+"by PLAIN-</p>"
+"<p>This filter will import all .msg, .eml and .txt emails.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
+#: filter_oe.cxx:40
+msgid "Import Outlook Express Emails"
 msgstr ""
 
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
+#: filter_oe.cxx:42
+msgid ""
+"<p><b>Outlook Express 4/5/6 import filter</b></p>"
+"<p>You will need to locate the folder where the mailbox has been stored by "
+"searching for .dbx or .mbx files under "
+"<ul>"
+"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
+"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
+"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
+"your local folder.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
+#: filter_oe.cxx:67
+#, c-format
+msgid "No Outlook Express mailboxes found in directory %1."
 msgstr ""
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_oe.cxx:82
+msgid "Import folder structure..."
+msgstr "ਫੋਲਡਰ ਢਾਂਚਾ ਆਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
+
+#: filter_oe.cxx:101
+msgid "Finished importing Outlook Express emails"
+msgstr ""
+
+#: filter_oe.cxx:119
 #, c-format
-msgid "Importing %1"
-msgstr "%1 ਨੂੰ ਆਯਾਤ ਕੀਤੀ ਜਾ ਰਿਹਾ ਹੈ"
+msgid "Unable to open mailbox %1"
+msgstr ""
 
-#: filter_lnotes.cxx:110 filter_pmail.cxx:279
+#: filter_oe.cxx:130
 #, c-format
-msgid "Message %1"
-msgstr "%1 ਸੁਨੇਹਾ"
+msgid "Importing OE4 Mailbox %1"
+msgstr ""
 
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "ਫੋਲਡਰ ਢਾਂਚੇ ਦੀ ਜਾਂਚ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
+#: filter_oe.cxx:144
+#, c-format
+msgid "Importing OE5+ Mailbox %1"
+msgstr ""
+
+#: filter_oe.cxx:150
+#, c-format
+msgid "Importing OE5+ Folder file %1"
+msgstr "OE5+ ਫੋਲਡਰ ਫਾਇਲ %1 ਆਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
 #. i18n: file kimportpagedlg.ui line 91
 #: rc.cpp:3
@@ -358,23 +455,32 @@ msgstr ""
 msgid "Remove &duplicate messages during import"
 msgstr ""
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
 msgstr ""
 
-#: filter_mbox.cxx:30
+#: filter_thebat.cxx:35
 msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
+"<p><b>The Bat! import filter</b></p>"
+"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
+"import.</p>"
+"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
+"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
+"<p>Since it is possible to recreate the folder structure, the folders will be "
+"stored under: \"TheBat-Import\" in your local account.</p>"
 msgstr ""
 
-#: filter_mbox.cxx:49
-msgid "mbox Files (*)"
-msgstr "mbox ਫਾਇਲਾਂ (*)"
+#: filter_kmail_archive.cxx:24
+msgid "Import KMail Archive File"
+msgstr ""
+
+#: filter_kmail_archive.cxx:26
+msgid ""
+"<p><b>KMail Archive File Import Filter</b></p>"
+"<p>This filter will import archives files previously exported by KMail.</p>"
+"<p>Archive files contain a complete folder subtree compressed into a single "
+"file.</p>"
+msgstr ""
 
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
@@ -385,157 +491,64 @@ msgid ""
 "<p><b>KMail import filter</b></p>"
 "<p>Select the base directory of the KMail mailfolder you want to import.</p>"
 "<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck in a "
-"continuous loop. </p>"
+"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
+"in a continuous loop. </p>"
 "<p>This filter does not import KMail mailfolders with mbox files.</p>"
 "<p>Since it is possible to recreate the folder structure, the folders will be "
 "stored under: \"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr ""
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "ਥੰਡਰਬਰਡ/ਮੌਜੀਲਾ ਲੋਕਲ ਪੱਤਰ ਅਤੇ ਫੋਲਡਰ ਢਾਂਚਾ ਆਯਾਤ"
 
-#: filter_evolution_v2.cxx:31
+#: filter_thunderbird.cxx:30
 msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
+"<p><b>Thunderbird/Mozilla import filter</b></p>"
+"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
+"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
 "<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
+"contain mbox-files (for example, a maildir): if you do, you will get many new "
 "folders.</p>"
 "<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-
-#: filter_oe.cxx:40
-msgid "Import Outlook Express Emails"
-msgstr ""
-
-#: filter_oe.cxx:42
-msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
-"your local folder.</p>"
-msgstr ""
-
-#: filter_oe.cxx:68
-#, c-format
-msgid "No Outlook Express mailboxes found in directory %1."
-msgstr ""
-
-#: filter_oe.cxx:83
-msgid "Import folder structure..."
-msgstr "ਫੋਲਡਰ ਢਾਂਚਾ ਆਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#: filter_oe.cxx:102
-msgid "Finished importing Outlook Express emails"
-msgstr ""
-
-#: filter_oe.cxx:120
-#, c-format
-msgid "Unable to open mailbox %1"
-msgstr ""
-
-#: filter_oe.cxx:131
-#, c-format
-msgid "Importing OE4 Mailbox %1"
-msgstr ""
-
-#: filter_oe.cxx:145
-#, c-format
-msgid "Importing OE5+ Mailbox %1"
-msgstr ""
-
-#: filter_oe.cxx:151
-#, c-format
-msgid "Importing OE5+ Folder file %1"
-msgstr "OE5+ ਫੋਲਡਰ ਫਾਇਲ %1 ਆਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
-
-#: filter_lnotes.cxx:30
-msgid "Import Lotus Notes Emails"
-msgstr "ਲੋਟਸ ਸੂਚਨਾ ਈ-ਮੇਲ ਅਯਾਤ"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
-msgstr ""
-
-#: filter_lnotes.cxx:56
-msgid "All Files (*)"
-msgstr "ਸਭ ਫਾਇਲਾਂ (*)"
-
-#: filter_lnotes.cxx:65
-#, c-format
-msgid "Importing emails from %1"
-msgstr "%1 ਤੋਂ ਈ-ਮੇਲ ਆਯਾਤ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"
-
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
+"stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
 
-#: filter_thebat.cxx:35
-msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
 msgstr ""
 
-#: kselfilterpage.cpp:76
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>%1 ਵਲੋਂ ਲਿਖਿਆ ਗਿਆ।</i></p>"
-
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Outlook ਈ-ਮੇਲਾਂ ਆਯਾਤ"
-
-#: filter_outlook.cxx:30
+#: filter_opera.cxx:30
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
+"<p><b>Opera email import filter</b></p>"
+"<p>This filter will import mails from Opera mail folder. Use this filter if you "
+"want to import all mails within a account in the Opera maildir.</p>"
+"<p>Select the directory of the account (usually "
+"~/.opera/mail/store/account*).</p>"
 "<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"they came from, prefixed with OPERA-</p>"
 msgstr ""
 
-#: filter_outlook.cxx:47
-msgid "Counting mail..."
-msgstr "ਮੇਲਾਂ ਦੀ ਗਿਣਤੀ ਜਾਰੀ ਹੈ..."
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
 
-#: filter_outlook.cxx:48
-msgid "Counting directories..."
-msgstr "ਡਾਇਰੈਕਟਰੀਆਂ ਦੀ ਗਿਣਤੀ ਜਾਰੀ ਹੈ..."
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "KMail ਆਯਾਤ ਫਿਲਟਰ"
 
-#: filter_outlook.cxx:49
-msgid "Counting folders..."
-msgstr "ਫੋਲਡਰਾਂ ਦੀ ਗਿਣਤੀ ਜਾਰੀ ਹੈ..."
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) ੨੦੦੦-੨੦੦੫, KMailCVT ਖੋਜੀ"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "ਸਮਤਲ ਪਾਠ ਈ-ਮੇਲਾਂ ਆਯਾਤ"
+#: main.cpp:36
+msgid "Original author"
+msgstr "ਅਸਲੀ ਲੇਖਕ"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "ਪਰਬੰਧਕ ਅਤੇ ਨਵੇਂ ਫਿਲਟਰ"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "ਨਵਾਂ GUI & ਸਫ਼ਾਈ"
diff --git a/tde-i18n-pa/messages/tdepim/kmobile.po b/tde-i18n-pa/messages/tdepim/kmobile.po
index 971a44f7ce9..83cc01ed0f5 100644
--- a/tde-i18n-pa/messages/tdepim/kmobile.po
+++ b/tde-i18n-pa/messages/tdepim/kmobile.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmobile\n"
-"POT-Creation-Date: 2005-07-25 01:39+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-01-17 10:47+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-pa/messages/tdepim/knotes.po b/tde-i18n-pa/messages/tdepim/knotes.po
index de5b5000efc..e23c54bad9d 100644
--- a/tde-i18n-pa/messages/tdepim/knotes.po
+++ b/tde-i18n-pa/messages/tdepim/knotes.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: knotes\n"
-"POT-Creation-Date: 2008-01-26 01:19+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-01-17 10:47+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -82,35 +83,35 @@ msgstr "ਵੇਹੜੇ ਤੋਂ"
 msgid "Walk Through Notes"
 msgstr "ਸੂਚਨਾਵਾਂ 'ਚ ਜਾਓ"
 
-#: knote.cpp:379
+#: knote.cpp:396
 msgid "<qt>Do you really want to delete note <b>%1</b>?</qt>"
 msgstr "<qt>ਕੀ ਤੁਸੀਂ <b>%1</b> ਸੂਚਨਾ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?</qt>"
 
-#: knote.cpp:380
+#: knote.cpp:397
 msgid "Confirm Delete"
 msgstr "ਹਟਾਉਣ ਦੀ ਪੁਸ਼ਟੀ"
 
-#: knote.cpp:690
+#: knote.cpp:711
 msgid "Please enter the new name:"
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਨਵਾਂ ਨਾਂ ਦਿਓ:"
 
-#: knote.cpp:762
+#: knote.cpp:804
 msgid "Send \"%1\""
 msgstr "\"%1\" ਭੇਜੋ"
 
-#: knote.cpp:771
+#: knote.cpp:814
 msgid "The host cannot be empty."
 msgstr "ਮੇਜ਼ਬਾਨ ਖਾਲੀ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ।"
 
-#: knote.cpp:800
+#: knote.cpp:843
 msgid "Unable to start the mail process."
 msgstr "ਪੱਤਰ ਕਾਰਵਾਈ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਅਸਮਰੱਥ ਹੈ।"
 
-#: knote.cpp:829
+#: knote.cpp:871
 msgid "Save note as plain text"
 msgstr "ਸੂਚਨਾ ਨੂੰ ਸਧਾਰਨ ਪਾਠ ਵਾਂਗ ਸੰਭਾਲੋ"
 
-#: knote.cpp:844
+#: knote.cpp:890
 msgid ""
 "<qt>A file named <b>%1</b> already exists."
 "<br>Are you sure you want to overwrite it?</qt>"
@@ -118,7 +119,7 @@ msgstr ""
 "<qt>ਇੱਕ ਫਾਇਲ <b>%1</b> ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। "
 "<br>ਕੀ ਤੁਸੀਂ ਇਸ ਉੱਤੇ ਲਿਖਣ ਲਈ ਸਹਿਮਤ ਹੋ?<qt>"
 
-#: knote.cpp:933
+#: knote.cpp:981
 msgid "&All Desktops"
 msgstr "ਸਭ ਵੇਹੜੇ(&A)"
 
@@ -266,79 +267,87 @@ msgstr "ਪੋਰਟ(&P):"
 msgid "&Style:"
 msgstr "ਸ਼ੈਲੀ(&S):"
 
-#: knoteedit.cpp:69
+#: knoteedit.cpp:71
 msgid "Bold"
 msgstr "ਗੂੜੇ"
 
-#: knoteedit.cpp:73
+#: knoteedit.cpp:75
 msgid "Underline"
 msgstr "ਹੇਠਾਂ ਰੇਖਾ"
 
-#: knoteedit.cpp:75
+#: knoteedit.cpp:77
 msgid "Strike Out"
 msgstr "ਵਿੰਨੇ"
 
-#: knoteedit.cpp:83
+#: knoteedit.cpp:85
 msgid "Align Left"
 msgstr "ਖੱਬੇ ਇਕਸਾਰ"
 
-#: knoteedit.cpp:87
+#: knoteedit.cpp:89
 msgid "Align Center"
 msgstr "ਕੇਂਦਰ ਇਕਸਾਰ"
 
-#: knoteedit.cpp:90
+#: knoteedit.cpp:92
 msgid "Align Right"
 msgstr "ਸੱਜੇ ਇਕਸਾਰ"
 
-#: knoteedit.cpp:93
+#: knoteedit.cpp:95
 msgid "Align Block"
 msgstr ""
 
-#: knoteedit.cpp:102
+#: knoteedit.cpp:104
 msgid "List"
 msgstr "ਸੂਚੀ"
 
-#: knoteedit.cpp:108
+#: knoteedit.cpp:110
 msgid "Superscript"
 msgstr "ਘਾਤ"
 
-#: knoteedit.cpp:111
+#: knoteedit.cpp:113
 msgid "Subscript"
 msgstr "ਪੈਰ ਵਿੱਚ"
 
-#: knoteedit.cpp:130
+#: knoteedit.cpp:132
 msgid "Text Color..."
 msgstr "ਪਾਠ ਰੰਗ..."
 
-#: knoteedit.cpp:133
+#: knoteedit.cpp:135
 msgid "Text Font"
 msgstr "ਪਾਠ ਫੋਂਟ"
 
-#: knoteedit.cpp:138
+#: knoteedit.cpp:140
 msgid "Text Size"
 msgstr "ਪਾਠ ਆਕਾਰ"
 
+#: knoteedit.cpp:543
+msgid "Check Spelling..."
+msgstr ""
+
+#: knoteedit.cpp:550
+msgid "Allow Tabulations"
+msgstr ""
+
 #: knotehostdlg.cpp:53
 msgid "Hostname or IP address:"
 msgstr ""
 
-#: knoteprinter.cpp:117
+#: knoteprinter.cpp:120
 #, c-format
 msgid "Print %1"
 msgstr "%1 ਛਾਪੋ"
 
-#: knoteprinter.cpp:133
+#: knoteprinter.cpp:136
 #, c-format
 msgid ""
 "_n: Print Note\n"
 "Print %n notes"
 msgstr ""
 
-#: knotesalarm.cpp:74
+#: knotesalarm.cpp:75
 msgid "The following notes triggered alarms:"
 msgstr ""
 
-#: knotesalarm.cpp:74
+#: knotesalarm.cpp:75
 msgid "Alarm"
 msgstr "ਅਲਾਰਮ"
 
@@ -370,11 +379,11 @@ msgstr "ਸਭ ਸੂਚਨਾਵਾਂ ਵੇਖਾਓ"
 msgid "Hide All Notes"
 msgstr "ਸਭ ਸੂਚਨਾਵਾਂ ਓਹਲੇ"
 
-#: knotesapp.cpp:544
+#: knotesapp.cpp:567
 msgid "Settings"
 msgstr "ਸਥਾਪਨ"
 
-#: knotesapp.cpp:686
+#: knotesapp.cpp:734
 msgid "No Notes"
 msgstr "ਕੋਈ ਸੂਚਨਾ ਨਹੀਂ ਹੈ"
 
@@ -406,7 +415,7 @@ msgid "Original KNotes Author"
 msgstr "ਅਸਲੀ KNotes ਲੇਖਕ"
 
 #: main.cpp:104
-msgid "Ported KNotes to TDE 2"
+msgid "Ported KNotes to KDE 2"
 msgstr ""
 
 #: main.cpp:105
@@ -414,7 +423,7 @@ msgid "Network Interface"
 msgstr "ਨੈੱਟਵਰਕ ਇੰਟਰਫੇਸ"
 
 #: main.cpp:106
-msgid "Started TDE Resource Framework Integration"
+msgid "Started KDE Resource Framework Integration"
 msgstr ""
 
 #: main.cpp:108
diff --git a/tde-i18n-pa/messages/tdepim/konsolekalendar.po b/tde-i18n-pa/messages/tdepim/konsolekalendar.po
index 36b704cfc78..bd104a97812 100644
--- a/tde-i18n-pa/messages/tdepim/konsolekalendar.po
+++ b/tde-i18n-pa/messages/tdepim/konsolekalendar.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: konsolekalendar\n"
-"POT-Creation-Date: 2006-06-07 04:03+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-04-20 17:51+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,74 +28,74 @@ msgid ""
 "Your emails"
 msgstr "aalam@users.sf.net"
 
-#: konsolekalendar.cpp:85
+#: konsolekalendar.cpp:86
 #, c-format
 msgid "Create Calendar <Dry Run>: %1"
 msgstr ""
 
-#: konsolekalendar.cpp:95
+#: konsolekalendar.cpp:96
 #, c-format
 msgid "Create Calendar <Verbose>: %1"
 msgstr "<Verbose> ਕੈਲੰਡਰ ਬਣਾਓ: %1"
 
-#: konsolekalendar.cpp:116
+#: konsolekalendar.cpp:117
 msgid "View Events <Dry Run>:"
 msgstr "ਘਟਨਾ ਵੇਖੋ <Dry Run>:"
 
-#: konsolekalendar.cpp:144
+#: konsolekalendar.cpp:145
 msgid "View Event <Verbose>:"
 msgstr "ਘਟਨਾ ਵੇਖੋ <Verbose>:"
 
-#: konsolekalendar.cpp:246
+#: konsolekalendar.cpp:247
 msgid "Sorry, export to HTML by UID is not supported yet"
 msgstr ""
 
-#: konsolekalendar.cpp:269
+#: konsolekalendar.cpp:270
 msgid "Events:"
 msgstr "ਘਟਨਾਵਾਂ:"
 
-#: konsolekalendar.cpp:273
+#: konsolekalendar.cpp:274
 #, c-format
 msgid "Events: %1"
 msgstr "ਘਟਨਾਵਾਂ: %1"
 
-#: konsolekalendar.cpp:276
+#: konsolekalendar.cpp:277
 msgid "Events: %1 - %2"
 msgstr ""
 
-#: konsolekalendar.cpp:436 konsolekalendaradd.cpp:144
+#: konsolekalendar.cpp:437 konsolekalendaradd.cpp:144
 #: konsolekalendarchange.cpp:134 konsolekalendarchange.cpp:161
 #: konsolekalendardelete.cpp:99
 #, c-format
 msgid "  What:  %1"
 msgstr "  ਕੀ:  %1"
 
-#: konsolekalendar.cpp:440 konsolekalendaradd.cpp:148
+#: konsolekalendar.cpp:441 konsolekalendaradd.cpp:148
 #: konsolekalendarchange.cpp:138 konsolekalendarchange.cpp:165
 #: konsolekalendardelete.cpp:103
 #, c-format
 msgid "  Begin: %1"
 msgstr "  ਸ਼ੁਰੂ: %1"
 
-#: konsolekalendar.cpp:444 konsolekalendaradd.cpp:152
+#: konsolekalendar.cpp:445 konsolekalendaradd.cpp:152
 #: konsolekalendarchange.cpp:142 konsolekalendarchange.cpp:169
 #: konsolekalendardelete.cpp:107
 #, c-format
 msgid "  End:   %1"
 msgstr "  ਸਮਾਪਤ:   %1"
 
-#: konsolekalendar.cpp:449 konsolekalendaradd.cpp:157
+#: konsolekalendar.cpp:450 konsolekalendaradd.cpp:157
 msgid "  No Time Associated with Event"
 msgstr ""
 
-#: konsolekalendar.cpp:453 konsolekalendaradd.cpp:161
+#: konsolekalendar.cpp:454 konsolekalendaradd.cpp:161
 #: konsolekalendarchange.cpp:146 konsolekalendarchange.cpp:173
 #: konsolekalendardelete.cpp:111
 #, c-format
 msgid "  Desc:  %1"
 msgstr ""
 
-#: konsolekalendar.cpp:457 konsolekalendaradd.cpp:165
+#: konsolekalendar.cpp:458 konsolekalendaradd.cpp:165
 #: konsolekalendarchange.cpp:150 konsolekalendarchange.cpp:177
 #: konsolekalendardelete.cpp:115
 #, c-format
diff --git a/tde-i18n-pa/messages/tdepim/kontact.po b/tde-i18n-pa/messages/tdepim/kontact.po
index d4cbb659091..8733b801ace 100644
--- a/tde-i18n-pa/messages/tdepim/kontact.po
+++ b/tde-i18n-pa/messages/tdepim/kontact.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kontact\n"
-"POT-Creation-Date: 2008-07-24 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-01-17 10:54+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -63,27 +64,27 @@ msgstr "<p><b>ਅਨੁਵਾਦਕ:</b></p>"
 msgid "%1 License"
 msgstr "%1 ਲਾਇਸੈਂਸ"
 
-#: src/iconsidepane.cpp:456
+#: src/iconsidepane.cpp:447
 msgid "Icon Size"
 msgstr "ਆਈਕਾਨ ਆਕਾਰ"
 
-#: src/iconsidepane.cpp:457
+#: src/iconsidepane.cpp:448
 msgid "Large"
 msgstr "ਵੱਡਾ"
 
-#: src/iconsidepane.cpp:459
+#: src/iconsidepane.cpp:450
 msgid "Normal"
 msgstr "ਸਧਾਰਨ"
 
-#: src/iconsidepane.cpp:461
+#: src/iconsidepane.cpp:452
 msgid "Small"
 msgstr "ਛੋਟਾ"
 
-#: src/iconsidepane.cpp:467
+#: src/iconsidepane.cpp:458
 msgid "Show Icons"
 msgstr "ਆਈਕਾਨ ਵੇਖਾਓ"
 
-#: src/iconsidepane.cpp:470
+#: src/iconsidepane.cpp:461
 msgid "Show Text"
 msgstr "ਪਾਠ ਵੇਖਾਓ"
 
@@ -91,7 +92,7 @@ msgstr "ਪਾਠ ਵੇਖਾਓ"
 msgid "kontactconfig"
 msgstr "kontactconfig"
 
-#: src/kcmkontact.cpp:92 src/mainwindow.cpp:292
+#: src/kcmkontact.cpp:92 src/mainwindow.cpp:301
 msgid "TDE Kontact"
 msgstr "TDE ਕੇ-ਸੰਪਰਕ"
 
@@ -99,96 +100,99 @@ msgstr "TDE ਕੇ-ਸੰਪਰਕ"
 msgid "(c), 2003 Cornelius Schumacher"
 msgstr "(c), 2003 Cornelius Schumacher"
 
-#: src/main.cpp:47
+#: src/main.cpp:48
 msgid "TDE personal information manager"
 msgstr "TDE ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਮੈਨੇਜਰ"
 
-#: src/main.cpp:125
+#: src/main.cpp:147
 msgid "Kontact"
 msgstr "ਕੇ-ਸੰਪਰਕ"
 
-#: src/main.cpp:126
+#: src/main.cpp:148
 #, fuzzy
-msgid "(C) 2001-2008 The Kontact developers"
+msgid ""
+"(C) 2008-2010 The Trinity Desktop Project\n"
+"(C) 2001-2008 The Kontact developers"
 msgstr "(C) 2001-2004 ਕੇ-ਸੰਪਰਕ ਖੋਜੀ"
 
-#: src/main.cpp:135
+#: src/main.cpp:157
 msgid "Original Author"
 msgstr "ਅਸਲੀ ਲੇਖਕ"
 
-#: src/mainwindow.cpp:100
+#: src/mainwindow.cpp:101
 #, fuzzy
 msgid "Select Components ..."
 msgstr "ਭਾਗ ਚੁਣੋ..."
 
-#: src/mainwindow.cpp:260
+#: src/mainwindow.cpp:139
+#, c-format
+msgid "Switch to plugin %1"
+msgstr ""
+
+#: src/mainwindow.cpp:269
 msgid ""
 "<h2 style='text-align:center; margin-top: 0px; margin-bottom: 0px'>%1</h2>"
 msgstr ""
 "<h2 style='text-align:center; margin-top: 0px; margin-bottom: 0px'>%1</h2>"
 
-#: src/mainwindow.cpp:261
+#: src/mainwindow.cpp:270
 msgid "Loading Kontact..."
 msgstr "ਕੇ-ਸੰਪਰਕ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: src/mainwindow.cpp:271
+#: src/mainwindow.cpp:280
 msgid " Initializing..."
 msgstr " ਸ਼ੁਰੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: src/mainwindow.cpp:293
+#: src/mainwindow.cpp:302
 msgid "Get Organized!"
 msgstr "ਪਰਬੰਧਨ ਪਰਾਪਤ!"
 
-#: src/mainwindow.cpp:294
+#: src/mainwindow.cpp:303
 msgid "The TDE Personal Information Management Suite"
 msgstr "TDE ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਪਰਬੰਧਨ ਸਾਫਟਵੇਅਰ"
 
-#: src/mainwindow.cpp:328
+#: src/mainwindow.cpp:337
 msgid "New"
 msgstr "ਨਵਾਂ"
 
-#: src/mainwindow.cpp:337
+#: src/mainwindow.cpp:346
 #, fuzzy
 msgid "Synchronize"
 msgstr "ਆਈਕਾਨ ਆਕਾਰ"
 
-#: src/mainwindow.cpp:341
+#: src/mainwindow.cpp:350
 msgid "Configure Kontact..."
 msgstr "ਕੇ-ਸੰਪਰਕ ਸੰਰਚਨਾ..."
 
-#: src/mainwindow.cpp:344
+#: src/mainwindow.cpp:353
 #, fuzzy
 msgid "Configure &Profiles..."
 msgstr "ਸੰਖੇਪ ਝਲਕ ਸੰਰਚਨਾ (&C)..."
 
-#: src/mainwindow.cpp:347
+#: src/mainwindow.cpp:356
 msgid "&Kontact Introduction"
 msgstr "ਕੇ-ਸੰਪਰਕ ਜਾਣ ਪਛਾਣ(&K)"
 
-#: src/mainwindow.cpp:349
+#: src/mainwindow.cpp:358
 msgid "&Tip of the Day"
 msgstr "ਅੱਜ ਦਾ ਇਸ਼ਾਰਾ(&T)"
 
-#: src/mainwindow.cpp:351
-msgid "&Request Feature..."
-msgstr "ਲੋੜੀਦੇ ਫੀਚਰ(&R)..."
-
-#: src/mainwindow.cpp:683
+#: src/mainwindow.cpp:784
 msgid "Application is running standalone. Foregrounding..."
 msgstr "ਕਾਰਜ ਇੱਕਲਾ ਹੀ ਚੱਲ ਰਿਹਾ ਹੈ। ਪੇਸ਼ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: src/mainwindow.cpp:695
+#: src/mainwindow.cpp:796
 #, c-format
 msgid "Cannot load part for %1."
 msgstr "%1 ਦਾ ਭਾਗ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: src/mainwindow.cpp:749
+#: src/mainwindow.cpp:851
 msgid ""
 "_: Plugin dependent window title\n"
 "%1 - Kontact"
 msgstr "%1 - ਕਸੰਪਰਕ"
 
-#: src/mainwindow.cpp:1062
+#: src/mainwindow.cpp:1170
 msgid ""
 "<h2 style='text-align:center; margin-top: 0px;'>Welcome to Kontact %1</h2>"
 "<p>%1</p><table align=\"center\">"
@@ -223,34 +227,34 @@ msgstr ""
 "<br><span id=\"subtext\"><nobr>%1</td></tr></table><p style=\"margin-bottom: "
 "0px\"> <a href=\"%1\">ਜਾਣ ਪਛਾਣ ਨੂੰ ਛੱਡ ਦਿਓ</a></p>"
 
-#: src/mainwindow.cpp:1074
+#: src/mainwindow.cpp:1182
 msgid ""
 "Kontact handles your e-mail, addressbook, calendar, to-do list and more."
 msgstr ""
 "ਕੇ-ਸੰਪਰਕ ਤੁਹਾਡੇ ਈ-ਮੇਲ, ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ, ਕੈਲੰਡਰ, ਕਰਨ ਲਈ ਕੰਮ ਅਤੇ ਹੋਰ ਬਹੁਤ ਕੁਝ ਨੂੰ "
 "ਸੰਭਾਲ ਸਕਦਾ ਹੈ।"
 
-#: src/mainwindow.cpp:1080
+#: src/mainwindow.cpp:1188
 msgid "Read Manual"
 msgstr "ਦਸਤਾਵੇਜ਼ ਪੜੋ"
 
-#: src/mainwindow.cpp:1081
+#: src/mainwindow.cpp:1189
 msgid "Learn more about Kontact and its components"
 msgstr "ਕੇ-ਸੰਪਰਕ ਅਤੇ ਇਸ ਦੇ ਭਾਗਾਂ ਬਾਰੇ ਵਧੇਰੇ ਜਾਣਕਾਰੀ ਲਈ ਦਸਤਾਵੇਜ਼ ਵੇਖੋ"
 
-#: src/mainwindow.cpp:1087
+#: src/mainwindow.cpp:1195
 msgid "Visit Kontact Website"
 msgstr "ਕੇ-ਸੰਪਰਕ ਦੀ ਵੈਬਸਾਇਟ ਵੇਖੋ"
 
-#: src/mainwindow.cpp:1088
+#: src/mainwindow.cpp:1196
 msgid "Access online resources and tutorials"
 msgstr "ਆਨਲਾਇਨ ਸਰੋਤ ਅਤੇ ਸਹਾਇਕ ਵਰਤੋਂ"
 
-#: src/mainwindow.cpp:1094
+#: src/mainwindow.cpp:1202
 msgid "Configure Kontact as Groupware Client"
 msgstr "ਕੇ-ਸੰਪਰਕ ਨੂੰ ਗਰੁੱਪਵੇਅਰ ਕਲਾਂਇਟ ਦੇ ਤੌਰ 'ਤੇ ਸੰਰਚਨਾ"
 
-#: src/mainwindow.cpp:1095
+#: src/mainwindow.cpp:1203
 msgid "Prepare Kontact for use in corporate networks"
 msgstr "ਕੇ-ਸੰਪਰਕ ਨੂੰ ਕਾਰਪੋਰੇਟ ਨੈਟਵਰਕ ਵਿੱਚ ਵਰਤਣ ਲਈ ਤਿਆਰ"
 
@@ -373,6 +377,16 @@ msgstr "ਆਈਕਾਨ ਢੰਗ ਵਿੱਚ ਸ਼ੁਰੂ ਕਰੋ"
 msgid "List all possible modules and exit"
 msgstr "ਸਭ ਭਾਗ ਵੇਖਾਉ ਅਤੇ ਬੰਦ ਕਰੋ"
 
+#: interfaces/uniqueapphandler.cpp:191
+#, fuzzy
+msgid "List all possible profiles and exit"
+msgstr "ਸਭ ਭਾਗ ਵੇਖਾਉ ਅਤੇ ਬੰਦ ਕਰੋ"
+
+#: interfaces/uniqueapphandler.cpp:192
+#, fuzzy
+msgid "Start with a specific Kontact profile"
+msgstr "ਖਾਸ ਕੇ-ਸੰਪਰਕ ਭਾਗ ਨਾਲ ਸ਼ੁਰੂ ਕਰੋ"
+
 #: plugins/akregator/akregator_plugin.cpp:57
 #: plugins/newsticker/kcmkontactknt.cpp:380
 msgid "New Feed..."
@@ -391,15 +405,15 @@ msgstr ""
 msgid "Synchronize Contacts"
 msgstr "ਸੰਪਰਕ ਵੇਖਾਓ(&C)"
 
-#: plugins/kaddressbook/kaddressbook_plugin.cpp:160
-#: plugins/korganizer/korganizerplugin.cpp:194
-#: plugins/korganizer/todoplugin.cpp:208
+#: plugins/kaddressbook/kaddressbook_plugin.cpp:159
+#: plugins/korganizer/korganizerplugin.cpp:219
+#: plugins/korganizer/todoplugin.cpp:210
 msgid "Drops of multiple mails are not supported."
 msgstr "ਬਹੁਤੇ ਪੱਤਰ ਹਟਾਉਣ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
 
-#: plugins/kaddressbook/kaddressbook_plugin.cpp:174
-#: plugins/korganizer/korganizerplugin.cpp:211
-#: plugins/korganizer/todoplugin.cpp:226
+#: plugins/kaddressbook/kaddressbook_plugin.cpp:173
+#: plugins/korganizer/korganizerplugin.cpp:236
+#: plugins/korganizer/todoplugin.cpp:228
 msgid "Cannot handle drop events of type '%1'."
 msgstr "'%1' ਕਿਸਮ ਦੀ ਘਟਨਾ ਲਈ ਹਟਾਉਣ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
 
@@ -597,22 +611,28 @@ msgstr "ਸਭ ਕਰਨ ਲਈ ਵੇਖਾਓ"
 msgid "Show today's to-dos only"
 msgstr "ਅੱਜ ਦੇ ਕਰਨ ਲਈ ਹੀ ਵੇਖਾਓ"
 
-#: plugins/korganizer/korganizerplugin.cpp:63
+#: plugins/korganizer/korganizerplugin.cpp:67
 msgid "New Event..."
 msgstr "ਨਵੀਂ ਘਟਨਾ..."
 
-#: plugins/korganizer/korganizerplugin.cpp:67
+#: plugins/korganizer/korganizerplugin.cpp:71
 #, fuzzy
 msgid "Synchronize Calendar"
 msgstr "ਸਰਗਰਮ ਕੈਲੰਡਰ"
 
-#: plugins/korganizer/korganizerplugin.cpp:179
-#: plugins/korganizer/todoplugin.cpp:180
+#: plugins/korganizer/korganizerplugin.cpp:184
+#: plugins/korganizer/todoplugin.cpp:176
 msgid "Meeting"
 msgstr "ਮੀਟਿੰਗ"
 
-#: plugins/korganizer/korganizerplugin.cpp:197
-#: plugins/korganizer/todoplugin.cpp:211
+#: plugins/korganizer/korganizerplugin.cpp:198
+#: plugins/korganizer/todoplugin.cpp:190
+#, fuzzy, c-format
+msgid "Note: %1"
+msgstr "ਪੜਨ ਸੂਚੀ: \"%1\""
+
+#: plugins/korganizer/korganizerplugin.cpp:222
+#: plugins/korganizer/todoplugin.cpp:213
 msgid ""
 "From: %1\n"
 "To: %2\n"
@@ -622,8 +642,8 @@ msgstr ""
 "ਵੱਲ: %2\n"
 "ਵਿਸ਼ਾ: %3"
 
-#: plugins/korganizer/korganizerplugin.cpp:205
-#: plugins/korganizer/todoplugin.cpp:220
+#: plugins/korganizer/korganizerplugin.cpp:230
+#: plugins/korganizer/todoplugin.cpp:222
 #, c-format
 msgid "Mail: %1"
 msgstr "ਪੱਤਰ: %1"
@@ -633,23 +653,23 @@ msgstr "ਪੱਤਰ: %1"
 msgid "Calendar"
 msgstr "ਸਰਗਰਮ ਕੈਲੰਡਰ"
 
-#: plugins/korganizer/summarywidget.cpp:173
+#: plugins/korganizer/summarywidget.cpp:164
 #: plugins/specialdates/sdsummarywidget.cpp:445
 msgid "Today"
 msgstr "ਅੱਜ"
 
-#: plugins/korganizer/summarywidget.cpp:177
+#: plugins/korganizer/summarywidget.cpp:168
 #: plugins/specialdates/sdsummarywidget.cpp:447
 msgid "Tomorrow"
 msgstr "ਕੱਲ"
 
-#: plugins/korganizer/summarywidget.cpp:236
+#: plugins/korganizer/summarywidget.cpp:227
 msgid ""
 "_: Time from - to\n"
 "%1 - %2"
 msgstr "%1 - %2"
 
-#: plugins/korganizer/summarywidget.cpp:252
+#: plugins/korganizer/summarywidget.cpp:243
 #, c-format
 msgid ""
 "_n: No appointments pending within the next day\n"
@@ -658,15 +678,15 @@ msgstr ""
 "ਅਗਲੇ ਦਿਨ ਵਿੱਚ ਕੋਈ ਬਕਾਇਆ ਮੁਲਾਕਾਤ ਨਹੀਂ ਹੈ\n"
 "ਅਗਲੇ %n ਦਿਨਾਂ ਵਿੱਚ ਕੋਈ ਬਕਾਇਆ ਮੁਲਾਕਾਤ ਨਹੀਂ ਹੈ"
 
-#: plugins/korganizer/summarywidget.cpp:281
+#: plugins/korganizer/summarywidget.cpp:272
 msgid "&Edit Appointment..."
 msgstr ""
 
-#: plugins/korganizer/summarywidget.cpp:283
+#: plugins/korganizer/summarywidget.cpp:274
 msgid "&Delete Appointment"
 msgstr ""
 
-#: plugins/korganizer/summarywidget.cpp:300
+#: plugins/korganizer/summarywidget.cpp:291
 msgid "Edit Appointment: \"%1\""
 msgstr "ਰੁਝੇਵਾਂ ਸੋਧ: \"%1\""
 
@@ -678,49 +698,44 @@ msgstr "ਨਵਾਂ ਕੰਮ..."
 msgid "Synchronize To-do List"
 msgstr ""
 
-#: plugins/korganizer/todoplugin.cpp:192
-#, fuzzy, c-format
-msgid "Note: %1"
-msgstr "ਪੜਨ ਸੂਚੀ: \"%1\""
-
 #: plugins/korganizer/todosummarywidget.cpp:63
 #, fuzzy
 msgid "To-do"
 msgstr "ਕਾਰਜ"
 
-#: plugins/korganizer/todosummarywidget.cpp:117
+#: plugins/korganizer/todosummarywidget.cpp:116
 msgid "overdue"
 msgstr "ਬਕਾਇਆ"
 
-#: plugins/korganizer/todosummarywidget.cpp:125
+#: plugins/korganizer/todosummarywidget.cpp:124
 msgid "in progress"
 msgstr "ਕਾਰਵਾਈ ਅਧੀਨ"
 
-#: plugins/korganizer/todosummarywidget.cpp:131
+#: plugins/korganizer/todosummarywidget.cpp:130
 msgid "starts today"
 msgstr "ਅੱਜ ਸ਼ੁਰੂਆਤ"
 
-#: plugins/korganizer/todosummarywidget.cpp:137
+#: plugins/korganizer/todosummarywidget.cpp:136
 msgid "ends today"
 msgstr "ਅੱਜ ਸਮਾਪਤੀ"
 
-#: plugins/korganizer/todosummarywidget.cpp:188
+#: plugins/korganizer/todosummarywidget.cpp:187
 msgid "No to-dos pending"
 msgstr "ਕੋਈ ਕੰਮ ਬਾਕੀ ਨਹੀਂ"
 
-#: plugins/korganizer/todosummarywidget.cpp:230
+#: plugins/korganizer/todosummarywidget.cpp:229
 msgid "&Edit To-do..."
 msgstr ""
 
-#: plugins/korganizer/todosummarywidget.cpp:232
+#: plugins/korganizer/todosummarywidget.cpp:231
 msgid "&Delete To-do"
 msgstr ""
 
-#: plugins/korganizer/todosummarywidget.cpp:236
+#: plugins/korganizer/todosummarywidget.cpp:235
 msgid "&Mark To-do Completed"
 msgstr ""
 
-#: plugins/korganizer/todosummarywidget.cpp:257
+#: plugins/korganizer/todosummarywidget.cpp:256
 msgid "Edit To-do: \"%1\""
 msgstr "ਕਰਨ ਲਈ ਸੋਧ: \"%1\""
 
@@ -820,7 +835,7 @@ msgstr "Hotsync ਲਾਗ %1 ਨੂੰ ਖੋਲਣ ਵਿੱਚ ਅਸਮਰੱ
 msgid "New News Feed"
 msgstr "ਨਵਾਂ ਖ਼ਬਰ ਫੀਡ"
 
-#: plugins/knotes/knotes_part_p.h:136 plugins/newsticker/kcmkontactknt.cpp:66
+#: plugins/knotes/knotes_part_p.h:137 plugins/newsticker/kcmkontactknt.cpp:66
 msgid "Name:"
 msgstr "ਨਾਂ:"
 
@@ -907,7 +922,7 @@ msgid "Copy URL to Clipboard"
 msgstr "URL ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਨਕਲ"
 
 #: plugins/specialdates/kcmsdsummary.cpp:90
-#: plugins/specialdates/specialdates_plugin.cpp:59
+#: plugins/specialdates/specialdates_plugin.cpp:61
 msgid "Special Dates Summary"
 msgstr "ਖਾਸ ਮਿਤੀ ਸੰਖੇਪ"
 
@@ -961,19 +976,19 @@ msgstr "ਮੂਲ ਕੇ-ਪਰਬੰਧਕ ਸਰੋਤ"
 msgid "Active Calendar"
 msgstr "ਸਰਗਰਮ ਕੈਲੰਡਰ"
 
-#: plugins/specialdates/sdsummarywidget.cpp:289
+#: plugins/specialdates/sdsummarywidget.cpp:290
 msgid "BIRTHDAY"
 msgstr "ਜਨਮਦਿਨ"
 
-#: plugins/specialdates/sdsummarywidget.cpp:304
+#: plugins/specialdates/sdsummarywidget.cpp:305
 msgid "ANNIVERSARY"
 msgstr "ਵਰੇ ਗੰਢ"
 
-#: plugins/specialdates/sdsummarywidget.cpp:319
+#: plugins/specialdates/sdsummarywidget.cpp:320
 msgid "HOLIDAY"
 msgstr "ਛੁੱਟੀ"
 
-#: plugins/specialdates/sdsummarywidget.cpp:337
+#: plugins/specialdates/sdsummarywidget.cpp:338
 msgid "SPECIAL OCCASION"
 msgstr "ਖਾਸ ਮੌਕਾ"
 
@@ -1036,12 +1051,13 @@ msgstr "ਸੰਪਰਕ ਵੇਖਾਓ(&C)"
 msgid "Mail to:\"%1\""
 msgstr "ਪੱਤਰ: \"%1\""
 
-#: plugins/specialdates/specialdates_plugin.cpp:61
+#: plugins/specialdates/specialdates_plugin.cpp:63
 msgid "Kontact Special Dates Summary"
 msgstr "ਕੇ-ਸੰਪਰਕ ਖਾਸ ਮਿਤੀ ਸੰਖੇਪ"
 
-#: plugins/specialdates/specialdates_plugin.cpp:63
-msgid "(c) 2004-2005 The TDE PIM Team"
+#: plugins/specialdates/specialdates_plugin.cpp:65
+#, fuzzy
+msgid "(c) 2004-2005 The KDE PIM Team"
 msgstr "(c) 2004-2005 TDE PIM ਟੀਮ"
 
 #: plugins/summary/kcmkontactsummary.cpp:98
@@ -1078,15 +1094,15 @@ msgstr "ਅੱਗੇ ਕੀ ਹੈ?"
 msgid "Synchronize All"
 msgstr ""
 
-#: plugins/summary/summaryview_plugin.cpp:109
+#: plugins/summary/summaryview_plugin.cpp:112
 msgid "Kontact Summary"
 msgstr "ਕੇ-ਸੰਪਰਕ ਸੰਖੇਪ"
 
-#: plugins/summary/summaryview_plugin.cpp:111
+#: plugins/summary/summaryview_plugin.cpp:114
 msgid "Kontact Summary View"
 msgstr "ਕੇ-ਸੰਪਰਕ ਸੰਖੇਪ ਦਿੱਖ"
 
-#: plugins/summary/summaryview_plugin.cpp:113
+#: plugins/summary/summaryview_plugin.cpp:116
 msgid "(c) 2003 The Kontact developers"
 msgstr "(c) 2003 ਕੇ-ਸੰਪਰਕ ਖੋਜੀ"
 
@@ -1126,7 +1142,7 @@ msgstr "ਮੌਸਮ ਜਾਣਕਾਰੀ"
 msgid "Improvements and more code cleanups"
 msgstr "ਸੁਧਾਰ ਅਤੇ ਹੋਰ ਕੋਡ ਸੁਧਾਈ"
 
-#: plugins/knotes/knotes_part_p.h:121
+#: plugins/knotes/knotes_part_p.h:122
 msgid "Edit Note"
 msgstr "ਸੂਚਨਾ ਸੋਧ"
 
@@ -1142,6 +1158,9 @@ msgid ""
 "Your emails"
 msgstr "aalam@users.sf.net"
 
+#~ msgid "&Request Feature..."
+#~ msgstr "ਲੋੜੀਦੇ ਫੀਚਰ(&R)..."
+
 #~ msgid "New Messages"
 #~ msgstr "ਨਵੇਂ ਸੁਨੇਹੇ"
 
diff --git a/tde-i18n-pa/messages/tdepim/korganizer.po b/tde-i18n-pa/messages/tdepim/korganizer.po
index 4af3bd75c91..c2a19024b27 100644
--- a/tde-i18n-pa/messages/tdepim/korganizer.po
+++ b/tde-i18n-pa/messages/tdepim/korganizer.po
@@ -5,44 +5,30 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: korganizer\n"
-"POT-Creation-Date: 2008-08-19 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-01-17 10:53+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: actionmanager.cpp:467 actionmanager.cpp:1447 actionmanager.cpp:1475
-#: koeventpopupmenu.cpp:52 kotodoview.cpp:453
-msgid "&Show"
-msgstr "ਵੇਖਾਓ(&S)"
-
-#: actionmanager.cpp:470 actionmanager.cpp:1448 actionmanager.cpp:1476
-#: koeventpopupmenu.cpp:54 kotodoview.cpp:455 resourceview.cpp:599
-msgid "&Edit..."
-msgstr "ਸੋਧ(&E)..."
-
-#: koeventpopupmenu.cpp:76
-msgid "&Toggle Reminder"
-msgstr "ਯਾਦ-ਪੱਤਰ ਤਬਦੀਲ(&T)"
-
-#: koeventpopupmenu.cpp:81
-msgid "&Dissociate This Occurrence"
-msgstr ""
-
-#: koeventpopupmenu.cpp:84
-msgid "&Dissociate Future Occurrences"
-msgstr ""
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ"
 
-#: koeventpopupmenu.cpp:88
-#, fuzzy
-msgid "Send as iCalendar..."
-msgstr "&vਕੈਲੰਡਰ..."
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "aalam@users.sf.net"
 
-#: koeditordetails.cpp:194
+#: koeditordetails.cpp:192
 msgid ""
 "Displays information about current attendees. To edit an attendee, select it in "
 "this list and modify the values in the area below. Clicking on a column title "
@@ -51,92 +37,1297 @@ msgid ""
 msgstr ""
 
 #. i18n: file publishdialog_base.ui line 28
-#: koeditordetails.cpp:201 koprefsdialog.cpp:1063 rc.cpp:417 rc.cpp:1859
+#: koeditordetails.cpp:199 koprefsdialog.cpp:1106 rc.cpp:420 rc.cpp:2162
 #, no-c-format
 msgid "Name"
 msgstr "ਨਾਂ"
 
-#. i18n: file koeditoralarms_base.ui line 282
-#: koeditoralarms.cpp:89 koeditordetails.cpp:202 koprefsdialog.cpp:865
-#: rc.cpp:223 rc.cpp:420 rc.cpp:1862 rc.cpp:1937
+#. i18n: file koeditoralarms_base.ui line 288
+#: koeditoralarms.cpp:119 koeditordetails.cpp:200 koprefsdialog.cpp:903
+#: rc.cpp:223 rc.cpp:423 rc.cpp:2120 rc.cpp:2165
 #, no-c-format
 msgid "Email"
 msgstr "ਈ-ਪੱਤਰ"
 
-#: koeditordetails.cpp:203
+#: koeditordetails.cpp:201
 msgid "Role"
 msgstr "ਕੰਮ"
 
-#: koeditordetails.cpp:204
+#: koeditordetails.cpp:202
 msgid "Status"
 msgstr "ਸਥਿਤੀ"
 
-#: koeditordetails.cpp:205
+#: koeditordetails.cpp:203
 msgid "RSVP"
 msgstr "RSVP"
 
-#: koeditordetails.cpp:206
+#: koeditordetails.cpp:204
 #, fuzzy
 msgid "Delegated to"
 msgstr "ਕੰਮ-ਕਾਰ ਹਟਾਓ"
 
-#: koeditordetails.cpp:207
+#: koeditordetails.cpp:205
 #, fuzzy
 msgid "Delegated from"
 msgstr "ਕੰਮ-ਕਾਰ ਹਟਾਓ"
 
-#: koeditordetails.cpp:311 koeditorfreebusy.cpp:760
+#: koeditordetails.cpp:331 koeditorfreebusy.cpp:785
 msgid ""
 "%1 does not look like a valid email address. Are you sure you want to invite "
 "this participant?"
 msgstr ""
 
-#: koeditordetails.cpp:313 koeditorfreebusy.cpp:762
+#: koeditordetails.cpp:333 koeditorfreebusy.cpp:787
 #, fuzzy
 msgid "Invalid email address"
 msgstr "ਵਾਧੂ ਈ-ਪੱਤਰ ਸਿਰਨਾਵੇਂ:"
 
-#: koviewmanager.cpp:334
+#: koprefs.cpp:87
+msgid ""
+"_: Default export file\n"
+"calendar.html"
+msgstr "calendar.html"
+
+#: koprefs.cpp:162
+msgid "Appointment"
+msgstr "ਮੁਲਾਕਾਤ"
+
+#: koprefs.cpp:162
+msgid "Business"
+msgstr "ਵਪਾਰਿਕ"
+
+#: koprefs.cpp:163
+msgid "Meeting"
+msgstr "ਮੀਟਿੰਗ"
+
+#: koprefs.cpp:163
+msgid "Phone Call"
+msgstr "ਫੋਨ ਕਾਲ"
+
+#: koprefs.cpp:163
+msgid "Education"
+msgstr "ਵਿਦਿਅਕ"
+
+#: koprefs.cpp:164 printing/calprintpluginbase.cpp:286
+msgid "Holiday"
+msgstr "ਛੁੱਟੀ"
+
+#: koprefs.cpp:164
+msgid "Vacation"
+msgstr "ਲੰਮੀ ਛੁੱਟੀ"
+
+#: koprefs.cpp:164
+msgid "Special Occasion"
+msgstr "ਖਾਸ ਮੌਕਾ"
+
+#: koprefs.cpp:165
+msgid "Personal"
+msgstr "ਨਿੱਜੀ"
+
+#: koprefs.cpp:165
+msgid "Travel"
+msgstr "ਯਾਤਰਾ"
+
+#: koprefs.cpp:166
+msgid "Birthday"
+msgstr "ਜਨਮ ਦਿਨ"
+
+#: koeventviewer.cpp:63
+msgid "Open the message in KMail"
+msgstr ""
+
+#: koeventviewer.cpp:65
+#, c-format
+msgid "Send an email message to %1"
+msgstr ""
+
+#: koeventviewer.cpp:67
+msgid "Lookup the contact in KAddressbook"
+msgstr ""
+
+#: koeventviewer.cpp:73
 #, fuzzy
-msgid "Merged calendar"
-msgstr "ਮਿਲਾਨ ਕੈਲੰਡਰ '%1'"
+msgid "View attachment \"%1\""
+msgstr "ਨੱਥੀ ਸੋਧ"
 
-#: koviewmanager.cpp:336
-msgid "Calendars Side by Side"
+#: koeventviewer.cpp:76
+msgid "Launch a viewer on the link"
 msgstr ""
 
-#: filtereditdialog.cpp:51
-msgid "Edit Calendar Filters"
-msgstr "ਕੈਲੰਡਰ ਫਿਲਟਰ ਸੋਧ"
+#: koeventviewer.cpp:175
+#, fuzzy
+msgid "Open Attachment"
+msgstr "ਨੱਥੀ ਸ਼ਾਮਿਲ ਕਰੋ"
 
-#: filtereditdialog.cpp:99
-msgid "Press this button to define a new filter."
-msgstr "ਨਵਾਂ ਫਿਲਟਰ ਜੋੜਨ ਲਈ ਇਹ ਬਟਨ ਦਬਾਓ।"
+#: koeventviewer.cpp:176
+#, fuzzy
+msgid "Save Attachment As..."
+msgstr "ਨੱਥੀ"
 
-#: filtereditdialog.cpp:100
-msgid "Press this button to remove the currently active filter."
-msgstr "ਮੌਜੂਦਾ ਸਰਗਰਮ ਫਿਲਟਰ ਨੂੰ ਹਟਾਉਣ ਲਈ ਇਹ ਬਟਨ ਦਬਾਉ।"
+#: koeventviewerdialog.cpp:33
+msgid "Event Viewer"
+msgstr "ਘਟਨਾ ਦਰਸ਼ਕ"
 
-#: filtereditdialog.cpp:189
+#: aboutdata.cpp:32
+msgid "KOrganizer"
+msgstr "ਕੇ-ਪਰਬੰਧਕ"
+
+#: aboutdata.cpp:33
+msgid "A Personal Organizer for TDE"
+msgstr "TDE ਲਈ ਨਿੱਜੀ ਪਰਬੰਧਕ"
+
+#: aboutdata.cpp:41
+#, fuzzy
+msgid "Current Developer/Maintainer"
+msgstr "ਮੌਜੂਦਾ ਪਰਬੰਧਕ"
+
+#: aboutdata.cpp:43
+#, fuzzy
+msgid "Previous maintainer"
+msgstr "ਪਿਛਲਾ ਮਹੀਨਾ"
+
+#: aboutdata.cpp:45
+msgid "Co-Maintainer"
+msgstr "ਸਹਿ-ਪਰਬੰਧਕ"
+
+#: aboutdata.cpp:47
+msgid "Original Author"
+msgstr "ਅਸਲੀ ਲੇਖਕ"
+
+#: kdatenavigator.cpp:190
+msgid ""
+"_: start/end week number of line in date picker\n"
+"%1/%2"
+msgstr "%1/%2"
+
+#: kotodoviewitem.cpp:140
+msgid "--"
+msgstr "--"
+
+#: koeditorgeneraljournal.cpp:63
+msgid "Sets the title of this journal."
+msgstr "ਇਸ ਰੋਜ਼ਨਾਮਚੇ ਦੇ ਸਿਰਲੇਖ ਦਿੰਦਾ ਹੈ।"
+
+#: koeditorgeneral.cpp:108 koeditorgeneraljournal.cpp:64
+msgid "T&itle:"
+msgstr "ਸਿਰਲੇਖ:"
+
+#: koeditorgeneraljournal.cpp:83
+msgid "&Date:"
+msgstr "ਮਿਤੀ:"
+
+#: koeditorgeneraljournal.cpp:92
+msgid "&Time: "
+msgstr "ਸਮਾਂ(&T): "
+
+#: koeditorgeneraljournal.cpp:198
+msgid "Please specify a valid date, for example '%1'."
+msgstr "ਕਿਰਪਾ ਕਰਕੇ ਇੱਕ ਜਾਇਜ ਮਿਤੀ ਦਿਓ, ਉਦਾਹਰਨ ਲਈ '%1'"
+
+#: plugins/datenums/configdialog.cpp:38
+msgid "Configure Day Numbers"
+msgstr "ਦਿਨ ਗਿਣਤੀ ਸੰਰਚਨਾ"
+
+#: plugins/datenums/configdialog.cpp:45
+msgid "Show Date Number"
+msgstr "ਮਿਤੀ ਅੰਕ ਵੇਖਾਓ"
+
+#: plugins/datenums/configdialog.cpp:48
+msgid "Show day number"
+msgstr "ਦਿਨ ਅੰਕ ਵੇਖਾਓ"
+
+#: plugins/datenums/configdialog.cpp:49
+msgid "Show days to end of year"
+msgstr "ਸਾਲ ਦੇ ਅੰਤ ਦੇ ਦਿਨ ਵੇਖਾਓ"
+
+#: plugins/datenums/configdialog.cpp:50
+msgid "Show both"
+msgstr "ਦੋਵੇਂ ਵੇਖਾਓ"
+
+#: plugins/datenums/datenums.cpp:59
+msgid ""
+"_: dayOfYear / daysTillEndOfYear\n"
+"%1 / %2"
+msgstr "%1 / %2"
+
+#: plugins/datenums/datenums.cpp:71
+msgid "This plugin provides numbers of days and weeks."
+msgstr "ਇਹ ਪਲੱਗਿੰਨ ਦਿਨ ਅਤੇ ਹਫ਼ਤੇ ਉਪਲੱਬਧ ਕਰਵਾਉਦੀ ਹੈ।"
+
+#: plugins/hebrew/configdialog.cpp:29
+msgid "Configure Holidays"
+msgstr "ਛੁੱਟੀਆਂ ਸੰਰਚਨਾ"
+
+#: plugins/hebrew/configdialog.cpp:37
+msgid "Use Israeli holidays"
+msgstr "ਇਜ਼ਾਰਾਈਲੀ ਛੁੱਟੀਆਂ ਵਰਤੋਂ"
+
+#: plugins/hebrew/configdialog.cpp:41
+msgid "Show weekly parsha"
+msgstr "ਹਫ਼ਤਾ ਪਾਰਸਹਾ ਵੇਖੋ"
+
+#: plugins/hebrew/configdialog.cpp:45
+msgid "Show day of Omer"
+msgstr "ਓਮਰ ਦਾ ਦਿਨ ਵੇਖਾਓ"
+
+#: plugins/hebrew/configdialog.cpp:49
+msgid "Show Chol HaMoed"
+msgstr "Chol HaMoed ਵੇਖਾਓ"
+
+#: plugins/hebrew/holiday.cpp:63
+msgid ""
+"_: These are Jewish holidays and mostly do not have translations. They may have "
+"different spellings in your language; otherwise, just translate the sound to "
+"your characters\n"
+"Sh. HaHodesh"
+msgstr "Sh. HaHodesh"
+
+#: plugins/hebrew/holiday.cpp:69
+msgid "Erev Pesach"
+msgstr "Erev Pesach"
+
+#: plugins/hebrew/holiday.cpp:79
+msgid "Sh. HaGadol"
+msgstr "Sh. HaGadol"
+
+#: plugins/hebrew/holiday.cpp:87
+msgid "Pesach"
+msgstr "Pesach"
+
+#: plugins/hebrew/holiday.cpp:98 plugins/hebrew/holiday.cpp:262
+msgid "Chol Hamoed"
+msgstr "Chol Hamoed"
+
+#: plugins/hebrew/holiday.cpp:103
+msgid "Yom HaShoah"
+msgstr "Yom HaShoah"
+
+#: plugins/hebrew/holiday.cpp:127 plugins/hebrew/holiday.cpp:133
+#: plugins/hebrew/holiday.cpp:144
+msgid "Yom HaAtzmaut"
+msgstr "Yom HaAtzmaut"
+
+#: plugins/hebrew/holiday.cpp:129 plugins/hebrew/holiday.cpp:142
+msgid "Yom HaZikaron"
+msgstr "Yom HaZikaron"
+
+#: plugins/hebrew/holiday.cpp:151
+msgid "Yom Yerushalayim"
+msgstr "Yom Yerushalayim"
+
+#: plugins/hebrew/holiday.cpp:154
+msgid "Lag BaOmer"
+msgstr "Lag BaOmer"
+
+#: plugins/hebrew/holiday.cpp:179
+msgid "Erev Shavuot"
+msgstr "Erev Shavuot"
+
+#: plugins/hebrew/holiday.cpp:184
+msgid "Shavuot"
+msgstr "Shavuot"
+
+#: plugins/hebrew/holiday.cpp:193
+msgid "Tzom Tammuz"
+msgstr "Tzom Tammuz"
+
+#: plugins/hebrew/holiday.cpp:200
+msgid "Sh. Hazon"
+msgstr "Sh. Hazon"
+
+#: plugins/hebrew/holiday.cpp:202
+msgid "Sh. Nahamu"
+msgstr "Sh. Nahamu"
+
+#: plugins/hebrew/holiday.cpp:206
+msgid "Tisha B'Av"
+msgstr "Tisha B'Av"
+
+#: plugins/hebrew/holiday.cpp:211
+msgid "S'lichot"
+msgstr "S'lichot"
+
+#: plugins/hebrew/holiday.cpp:213
+msgid "Erev R.H."
+msgstr "Erev R.H."
+
+#: plugins/hebrew/holiday.cpp:221
+msgid "Rosh Hashana"
+msgstr "Rosh Hashana"
+
+#: plugins/hebrew/holiday.cpp:225 plugins/hebrew/holiday.cpp:238
+msgid "Sh. Shuvah"
+msgstr "Sh. Shuvah"
+
+#: plugins/hebrew/holiday.cpp:227 plugins/hebrew/holiday.cpp:231
+msgid "Tzom Gedalia"
+msgstr "Tzom Gedalia"
+
+#: plugins/hebrew/holiday.cpp:241
+msgid "Erev Y.K."
+msgstr "Erev Y.K."
+
+#: plugins/hebrew/holiday.cpp:244
+msgid "Yom Kippur"
+msgstr "Yom Kippur"
+
+#: plugins/hebrew/holiday.cpp:247
+msgid "Erev Sukkot"
+msgstr "Erev Sukkot"
+
+#: plugins/hebrew/holiday.cpp:253
+msgid "Sukkot"
+msgstr "Sukkot"
+
+#: plugins/hebrew/holiday.cpp:265
+msgid "Hoshana Rabah"
+msgstr "Hoshana Rabah"
+
+#: plugins/hebrew/holiday.cpp:268
+msgid "Shmini Atzeret"
+msgstr "Shmini Atzeret"
+
+#: plugins/hebrew/holiday.cpp:272
+msgid "Simchat Torah"
+msgstr "Simchat Torah"
+
+#: plugins/hebrew/holiday.cpp:281
+msgid "Erev Hanukah"
+msgstr "Erev Hanukah"
+
+#: plugins/hebrew/holiday.cpp:283 plugins/hebrew/holiday.cpp:289
+msgid "Hanukah"
+msgstr "Hanukah"
+
+#: plugins/hebrew/holiday.cpp:293
+msgid "Tzom Tevet"
+msgstr "Tzom Tevet"
+
+#: plugins/hebrew/holiday.cpp:304 plugins/hebrew/holiday.cpp:312
+#: plugins/hebrew/holiday.cpp:316 plugins/hebrew/holiday.cpp:320
+msgid "Sh. Shirah"
+msgstr "Sh. Shirah"
+
+#: plugins/hebrew/holiday.cpp:317
+msgid "Tu B'Shvat"
+msgstr "Tu B'Shvat"
+
+#: plugins/hebrew/holiday.cpp:330 plugins/hebrew/holiday.cpp:341
+#: plugins/hebrew/holiday.cpp:349
+msgid "Sh. Shekalim"
+msgstr "Sh. Shekalim"
+
+#: plugins/hebrew/holiday.cpp:338
+msgid "Purim Katan"
+msgstr "Purim Katan"
+
+#: plugins/hebrew/holiday.cpp:356 plugins/hebrew/holiday.cpp:373
+msgid "Ta'anit Ester"
+msgstr "Ta'anit Ester"
+
+#: plugins/hebrew/holiday.cpp:364 plugins/hebrew/holiday.cpp:368
+msgid "Sh. Zachor"
+msgstr "Sh. Zachor"
+
+#: plugins/hebrew/holiday.cpp:370
+msgid "Erev Purim"
+msgstr "Erev Purim"
+
+#: plugins/hebrew/holiday.cpp:376
+msgid "Purim"
+msgstr "Purim"
+
+#: plugins/hebrew/holiday.cpp:380 plugins/hebrew/holiday.cpp:384
+msgid "Shushan Purim"
+msgstr "Shushan Purim"
+
+#: plugins/hebrew/holiday.cpp:394
+msgid "Sh. Parah"
+msgstr "Sh. Parah"
+
+#: plugins/hebrew/holiday.cpp:403
+msgid "Sh. HaHodesh"
+msgstr "Sh. HaHodesh"
+
+#: plugins/hebrew/holiday.cpp:428
+msgid " Omer"
+msgstr " Omer"
+
+#: plugins/hebrew/parsha.cpp:33
+msgid ""
+"_: These are weekly readings and do not have translations. They may have "
+"different spellings in your language; otherwise, just translate the sound to "
+"your characters\n"
+"Bereshit"
+msgstr "Bereshit"
+
+#: plugins/hebrew/parsha.cpp:33
+msgid "Noach"
+msgstr "Noach"
+
+#: plugins/hebrew/parsha.cpp:33
+msgid "Lech L'cha"
+msgstr "Lech L'cha"
+
+#: plugins/hebrew/parsha.cpp:34
+msgid "Vayera"
+msgstr "Vayera"
+
+#: plugins/hebrew/parsha.cpp:34
+msgid "Chaye Sarah"
+msgstr "Chaye Sarah"
+
+#: plugins/hebrew/parsha.cpp:34
+msgid "Toldot"
+msgstr "Toldot"
+
+#: plugins/hebrew/parsha.cpp:35
+msgid "Vayetze"
+msgstr "Vayetze"
+
+#: plugins/hebrew/parsha.cpp:35
+msgid "Vayishlach"
+msgstr "Vayishlach"
+
+#: plugins/hebrew/parsha.cpp:35
+msgid "Vayeshev"
+msgstr "Vayeshev"
+
+#: plugins/hebrew/parsha.cpp:36
+msgid "Miketz"
+msgstr "Miketz"
+
+#: plugins/hebrew/parsha.cpp:36
+msgid "Vayigash"
+msgstr "Vayigash"
+
+#: plugins/hebrew/parsha.cpp:36
+msgid "Vayechi"
+msgstr "Vayechi"
+
+#: plugins/hebrew/parsha.cpp:37
+msgid "Shemot"
+msgstr "Shemot"
+
+#: plugins/hebrew/parsha.cpp:37
+msgid "Vaera"
+msgstr "Vaera"
+
+#: plugins/hebrew/parsha.cpp:37
+msgid "Bo"
+msgstr "Bo"
+
+#: plugins/hebrew/parsha.cpp:37
+msgid "Beshalach"
+msgstr "Beshalach"
+
+#: plugins/hebrew/parsha.cpp:38
+msgid "Yitro"
+msgstr "Yitro"
+
+#: plugins/hebrew/parsha.cpp:38
+msgid "Mishpatim"
+msgstr "Mishpatim"
+
+#: plugins/hebrew/parsha.cpp:38
+msgid "Terumah"
+msgstr "Terumah"
+
+#: plugins/hebrew/parsha.cpp:39
+msgid "Tetzaveh"
+msgstr "Tetzaveh"
+
+#: plugins/hebrew/parsha.cpp:39
+msgid "Ki Tisa"
+msgstr "Ki Tisa"
+
+#: plugins/hebrew/parsha.cpp:39
+msgid "Vayakhel"
+msgstr "Vayakhel"
+
+#: plugins/hebrew/parsha.cpp:40
+msgid "Pekudei"
+msgstr "Pekudei"
+
+#: plugins/hebrew/parsha.cpp:40
+msgid "Vayikra"
+msgstr "Vayikra"
+
+#: plugins/hebrew/parsha.cpp:40
+msgid "Tzav"
+msgstr "Tzav"
+
+#: plugins/hebrew/parsha.cpp:41
+msgid "Shemini"
+msgstr "Shemini"
+
+#: plugins/hebrew/parsha.cpp:41
+msgid "Tazria"
+msgstr "Tazria"
+
+#: plugins/hebrew/parsha.cpp:41
+msgid "Metzora"
+msgstr "Metzora"
+
+#: plugins/hebrew/parsha.cpp:42
+msgid "Acharei Mot"
+msgstr "Acharei Mot"
+
+#: plugins/hebrew/parsha.cpp:42
+msgid "Kedoshim"
+msgstr "Kedoshim"
+
+#: plugins/hebrew/parsha.cpp:42
+msgid "Emor"
+msgstr "Emor"
+
+#: plugins/hebrew/parsha.cpp:43
+msgid "Behar"
+msgstr "Behar"
+
+#: plugins/hebrew/parsha.cpp:43
+msgid "Bechukotai"
+msgstr "Bechukotai"
+
+#: plugins/hebrew/parsha.cpp:43
+msgid "Bemidbar"
+msgstr "Bemidbar"
+
+#: plugins/hebrew/parsha.cpp:44
+msgid "Naso"
+msgstr "Naso"
+
+#: plugins/hebrew/parsha.cpp:44
+msgid "Behaalotcha"
+msgstr "Behaalotcha"
+
+#: plugins/hebrew/parsha.cpp:44
+msgid "Shelach"
+msgstr "Shelach"
+
+#: plugins/hebrew/parsha.cpp:45
+msgid "Korach"
+msgstr "Korach"
+
+#: plugins/hebrew/parsha.cpp:45
+msgid "Chukat"
+msgstr "Chukat"
+
+#: plugins/hebrew/parsha.cpp:45
+msgid "Balak"
+msgstr "Balak"
+
+#: plugins/hebrew/parsha.cpp:46
+msgid "Pinchas"
+msgstr "Pinchas"
+
+#: plugins/hebrew/parsha.cpp:46
+msgid "Matot"
+msgstr "Matot"
+
+#: plugins/hebrew/parsha.cpp:46
+msgid "Masei"
+msgstr "Masei"
+
+#: plugins/hebrew/parsha.cpp:47
+msgid "Devarim"
+msgstr "Devarim"
+
+#: plugins/hebrew/parsha.cpp:47
+msgid "Vaetchanan"
+msgstr "Vaetchanan"
+
+#: plugins/hebrew/parsha.cpp:47
+msgid "Ekev"
+msgstr "Ekev"
+
+#: plugins/hebrew/parsha.cpp:48
+msgid "Reeh"
+msgstr "Reeh"
+
+#: plugins/hebrew/parsha.cpp:48
+msgid "Shoftim"
+msgstr "Shoftim"
+
+#: plugins/hebrew/parsha.cpp:48
+msgid "Ki Tetze"
+msgstr "Ki Tetze"
+
+#: plugins/hebrew/parsha.cpp:49
+msgid "Ki Tavo"
+msgstr "Ki Tavo"
+
+#: plugins/hebrew/parsha.cpp:49
+msgid "Nitzavim"
+msgstr "Nitzavim"
+
+#: plugins/hebrew/parsha.cpp:49
+msgid "Vayelech"
+msgstr "Vayelech"
+
+#: plugins/hebrew/parsha.cpp:50
+msgid "Haazinu"
+msgstr "Haazinu"
+
+#: plugins/hebrew/hebrew.cpp:103
+msgid "This plugin provides the date in the Jewish calendar."
+msgstr ""
+
+#: plugins/printing/journal/journalprint.h:43
+msgid "Print &journal"
+msgstr ""
+
+#: plugins/printing/journal/journalprint.h:44
+msgid "Prints all journals for a given date range"
+msgstr ""
+
+#: plugins/printing/journal/journalprint.cpp:130
+msgid "Journal entries"
+msgstr "ਰੋਜ਼ਾਨਾਮਚਾ ਇੰਦਰਾਜ਼"
+
+#: plugins/printing/whatsnext/whatsnextprint.h:42
+msgid "Print What's Next"
+msgstr "ਅੱਗੇ ਕੀ ਹੈ ਛਾਪੋ"
+
+#: plugins/printing/whatsnext/whatsnextprint.h:43
+msgid "Prints a list of all upcoming events and todos."
+msgstr ""
+
+#: plugins/printing/list/listprint.h:42
+msgid "Print list"
+msgstr "ਸੂਚੀ ਛਾਪੋ"
+
+#: plugins/printing/list/listprint.h:43
+msgid "Prints a list of events and to-dos"
+msgstr ""
+
+#: plugins/printing/year/yearprint.h:42
+msgid "Print &Year"
+msgstr ""
+
+#: plugins/printing/year/yearprint.h:43
+msgid "Prints a calendar for an entire year"
+msgstr ""
+
+#: kowhatsnextview.cpp:283 plugins/printing/year/yearprint.cpp:175
+msgid ""
+"_: date from - to\n"
+"%1 - %2"
+msgstr "%1 - %2"
+
+#: plugins/printing/year/yearprint.cpp:177
+msgid ""
+"_: date from -\n"
+"to\n"
+"%1 -\n"
+"%2"
+msgstr ""
+
+#: plugins/exchange/exchange.cpp:109 plugins/exchange/exchange.cpp:145
+#: plugins/exchange/exchange.cpp:148 plugins/exchange/exchange.cpp:164
+#: plugins/exchange/exchange.cpp:168 plugins/exchange/exchange.cpp:222
+#: plugins/exchange/exchange.cpp:224 plugins/exchange/exchangeconfig.cpp:35
+#: plugins/exchange/exchangedialog.cpp:34
+msgid "Exchange Plugin"
+msgstr "ਐਕਸ਼ਚੇਜ਼ ਪਲੱਗਿੰਨ"
+
+#: plugins/exchange/exchangedialog.cpp:39
+msgid "Start date:"
+msgstr "ਸ਼ੁਰੂ ਮਿਤੀ:"
+
+#: plugins/exchange/exchangedialog.cpp:46
+msgid "End date:"
+msgstr "ਅੰਤ ਮਿਤੀ:"
+
+#: plugins/exchange/exchange.cpp:72
+msgid "&Download..."
+msgstr "ਡਾਊਨਲੋਡ..."
+
+#: plugins/exchange/exchange.cpp:75
+msgid "&Upload Event..."
+msgstr "ਘਟਨਾ ਅੱਪਲੋਡ..."
+
+#: plugins/exchange/exchange.cpp:83
+msgid "De&lete Event"
+msgstr "ਘਟਨਾ ਹਟਾਉ"
+
+#: plugins/exchange/exchange.cpp:89
+msgid "&Configure..."
+msgstr "ਸੰਰਚਨਾ..."
+
+#: plugins/exchange/exchange.cpp:104
+msgid ""
+"This plugin imports and export calendar events from/to a Microsoft Exchange "
+"2000 Server."
+msgstr ""
+
+#: plugins/exchange/exchange.cpp:145 plugins/exchange/exchange.cpp:164
+msgid "Please select an appointment."
+msgstr "ਕਿਰਪਾ ਕਰਕੇ ਇੱਕ ਮੁਲਾਕਾਤ ਚੁਣੋ।"
+
+#: plugins/exchange/exchange.cpp:148
+msgid "Exchange Upload is EXPERIMENTAL, you may lose data on this appointment!"
+msgstr ""
+
+#: plugins/exchange/exchange.cpp:148
+msgid "&Upload"
+msgstr "ਅੱਪਲੋਡ(&U)"
+
+#: plugins/exchange/exchange.cpp:168
+msgid ""
+"Exchange Delete is EXPERIMENTAL, if this is a recurring event it will delete "
+"all instances!"
+msgstr ""
+
+#: plugins/exchange/exchange.cpp:195
+msgid "No Error"
+msgstr "ਕੋਈ ਗਲਤੀ ਨਹੀਂ"
+
+#: plugins/exchange/exchange.cpp:198
+msgid "The Exchange server could not be reached or returned an error."
+msgstr "ਐਕਸ਼ਚੇਜ਼ ਸਰਵਰ ਦੀ ਵਰਤੋਂ ਕੀਤੀ ਨਹੀਂ ਜਾ ਸਕੀ ਹੈ ਜਾਂ ਇੱਕ ਗਲਤੀ ਆਈ ਹੈ।"
+
+#: plugins/exchange/exchange.cpp:201
+msgid "Server response could not be interpreted."
+msgstr "ਸਰਵਰ ਜਵਾਬ ਨੂੰ ਇੰਟਰਪਰੇ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ।"
+
+#: plugins/exchange/exchange.cpp:204
+msgid "Appointment data could not be interpreted."
+msgstr ""
+
+#: plugins/exchange/exchange.cpp:207
+msgid "This should not happen: trying to upload wrong type of event."
+msgstr ""
+
+#: plugins/exchange/exchange.cpp:210
+msgid "An error occurred trying to write an appointment to the server."
+msgstr ""
+
+#: plugins/exchange/exchange.cpp:213
+msgid "Trying to delete an event that is not present on the server."
+msgstr ""
+
+#: plugins/exchange/exchange.cpp:217
+msgid "Unknown Error"
+msgstr "ਅਣਜਾਣੀ ਗਲਤੀ"
+
+#: plugins/exchange/exchangeconfig.cpp:46
+msgid "Exchange server:"
+msgstr "ਐਕਸ਼ਚੇਜ਼ ਸਰਵਰ:"
+
+#: plugins/exchange/exchangeconfig.cpp:50
+msgid "Port:"
+msgstr "ਪੋਰਟ:"
+
+#: plugins/exchange/exchangeconfig.cpp:54
+msgid "User:"
+msgstr "ਉਪਭੋਗੀ:"
+
+#. i18n: file kogroupwareprefspage.ui line 205
+#: plugins/exchange/exchangeconfig.cpp:59 rc.cpp:317 rc.cpp:1912
+#, no-c-format
+msgid "Password:"
+msgstr "ਗੁਪਤ-ਕੋਡ:"
+
+#: plugins/exchange/exchangeconfig.cpp:63
+msgid "Determine mailbox automatically"
+msgstr ""
+
+#: plugins/exchange/exchangeconfig.cpp:68
+msgid "Mailbox URL:"
+msgstr "ਮੇਲ-ਬਕਸਾ URL:"
+
+#: plugins/timespanview/timespanview.cpp:54
+msgid "&Timespan"
+msgstr "ਸਮਾਂ ਅੰਤਰਾਲ(&T)"
+
+#: plugins/timespanview/timespanview.cpp:64
+msgid "This plugin provides a Gantt-like Timespan view."
+msgstr ""
+
+#: plugins/timespanview/timespanview.cpp:69
+msgid "Timespan View Plugin"
+msgstr "ਸਮਾਂ-ਅੰਤਰਾਲ ਝਲਕ ਪਲੱਗਿੰਨ"
+
+#: kolistview.cpp:208 korgac/alarmdialog.cpp:130 kotodoview.cpp:386
+#: plugins/timespanview/timespanwidget.cpp:51
+#: printing/calprintdefaultplugins.cpp:1212
+#: printing/calprintdefaultplugins.cpp:1296
+msgid "Summary"
+msgstr "ਸੰਖੇਪ"
+
+#: plugins/projectview/koprojectview.cpp:80
+#: plugins/timespanview/timespanwidget.cpp:65
+msgid "Zoom In"
+msgstr "ਆਕਾਰ ਵਧਾਓ"
+
+#: plugins/projectview/koprojectview.cpp:84
+#: plugins/timespanview/timespanwidget.cpp:69
+msgid "Zoom Out"
+msgstr "ਆਕਾਰ ਘਟਾਓ"
+
+#: plugins/timespanview/timespanwidget.cpp:73
+msgid "Center View"
+msgstr "ਕੇਂਦਰੀ ਝਲਕ"
+
+#: plugins/projectview/koprojectview.cpp:76
+msgid "Project View"
+msgstr "ਪਰੋਜੈੱਕਟ ਝਲਕ"
+
+#: plugins/projectview/koprojectview.cpp:88
+msgid "Select Mode"
+msgstr "ਢੰਗ ਚੁਣੋ"
+
+#: plugins/projectview/koprojectview.cpp:109
+msgid "main task"
+msgstr "ਮੁੱਖ ਕੰਮ"
+
+#: plugins/projectview/projectview.cpp:55
+msgid "&Project"
+msgstr "ਪ੍ਰੋਜੈਕਟ(&P)"
+
+#: plugins/projectview/projectview.cpp:65
+msgid "This plugin provides a Gantt diagram as project view."
+msgstr ""
+
+#: plugins/projectview/projectview.cpp:70
+msgid "Project View Plugin"
+msgstr "ਪ੍ਰੋਜੈਕਟ ਦਰਿਸ਼ ਪਲੱਗਿੰਨ"
+
+#: calendarview.cpp:264
+msgid ""
+"<p><em>No Item Selected</em></p>"
+"<p>Select an event, to-do or journal entry to view its details here.</p>"
+msgstr ""
+
+#: calendarview.cpp:270
+msgid ""
+"View the details of events, journal entries or to-dos selected in KOrganizer's "
+"main view here."
+msgstr ""
+
+#: calendarview.cpp:456
+msgid "No calendars found, unable to merge the file into your calendar."
+msgstr ""
+
+#: calendarview.cpp:490
+msgid "Could not load calendar '%1'."
+msgstr ""
+
+#: calendarview.cpp:719
+msgid ""
+"The timezone setting was changed. Do you want to keep the absolute time of the "
+"items in your calendar, which will show them to be at a different time than "
+"before, or move them to be at the old time also in the new timezone?"
+msgstr ""
+
+#: calendarview.cpp:723
+msgid "Keep Absolute Times?"
+msgstr "ਕੀ ਅਸਲ ਸਮਾਂ ਹੈ?"
+
+#: calendarview.cpp:724
+msgid "Keep Times"
+msgstr "ਸਮੇਂ ਰੱਖੋ"
+
+#: calendarview.cpp:725
+msgid "Move Times"
+msgstr "ਸਮੇਂ ਏਧਰ ਓਧਰ"
+
+#: calendarview.cpp:779
+msgid "To-do completed: %1 (%2)"
+msgstr "ਕੰਮ-ਕਾਰ ਮੁਕੰਮਲ: %1 (%2)"
+
+#: calendarview.cpp:790
 #, c-format
-msgid "New Filter %1"
-msgstr "ਨਵਾਂ ਫਿਲਟਰ %1"
+msgid "Journal of %1"
+msgstr "%1 ਦਾ ਰੋਜ਼ਨਾਮਚਾ"
 
-#: filtereditdialog.cpp:201 koeditorattachments.cpp:377 koeventeditor.cpp:381
-#: kotodoeditor.cpp:327
-msgid "This item will be permanently deleted."
-msgstr "ਇਹ ਇਕਾਈ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾ ਦਿੱਤੀ ਜਾਵੇਗੀ।"
+#: calendarview.cpp:845
+msgid ""
+"The item \"%1\" is filtered by your current filter rules, so it will be hidden "
+"and not appear in the view."
+msgstr ""
 
-#: filtereditdialog.cpp:201
-msgid "Delete Confirmation"
-msgstr "ਹਟਾਉਣ ਪੁਸ਼ਟੀ"
+#: calendarview.cpp:848
+msgid "Filter Applied"
+msgstr "ਫਿਲਟਰ ਲਾਗੂ ਹੈ"
 
-#: koeditorfreebusy.cpp:177
-#, fuzzy, c-format
-msgid "Location: %1"
-msgstr "ਟਿਕਾਣਾ: "
+#: calendarview.cpp:904
+msgid "The item \"%1\" will be permanently deleted."
+msgstr ""
+
+#: calendarview.cpp:905 calendarview.cpp:929 calendarview.cpp:966
+#: calendarview.cpp:2338 calendarview.cpp:2401 calendarview.cpp:2409
+#: koeventeditor.cpp:393 kojournaleditor.cpp:202 kotodoeditor.cpp:329
+msgid "KOrganizer Confirmation"
+msgstr "ਕੇ-ਪਰਬੰਧਕ ਪੁਸ਼ਟੀ"
 
-#: koeditorfreebusy.cpp:229
+#: calendarview.cpp:924
+msgid ""
+"The item \"%1\" has sub-to-dos. Do you want to cut just this item and make all "
+"its sub-to-dos independent, or cut the to-do with all its sub-to-dos?"
+msgstr ""
+
+#: calendarview.cpp:930
+#, fuzzy
+msgid "Cut Only This"
+msgstr "ਸਿਰਫ਼ ਇਹ ਹੀ ਹਟਾਓ"
+
+#: calendarview.cpp:931
+msgid "Cut All"
+msgstr ""
+
+#: calendarview.cpp:962
+msgid ""
+"The item \"%1\" has sub-to-dos. Do you want to copy just this item or copy the "
+"to-do with all its sub-to-dos?"
+msgstr ""
+
+#: calendarview.cpp:967
+#, fuzzy
+msgid "Copy Only This"
+msgstr "ਸਿਰਫ਼ ਇਹ ਹੀ ਹਟਾਓ"
+
+#: calendarview.cpp:968
+#, fuzzy
+msgid "Copy All"
+msgstr "ਨਕਲ(&C)"
+
+#: calendarview.cpp:1064
+msgid "Paste failed: unable to determine a valid target date."
+msgstr ""
+
+#: calendarview.cpp:1394
+msgid ""
+"Unable to turn sub-to-do into a top-level to-do, because it cannot be locked."
+msgstr ""
+
+#: calendarview.cpp:1419
+msgid "Make sub-to-dos independent"
+msgstr ""
+
+#: calendarview.cpp:1504
+msgid "Dissociate occurrence"
+msgstr ""
+
+#: calendarview.cpp:1516
+msgid "Dissociating the occurrence failed."
+msgstr ""
+
+#: calendarview.cpp:1517 calendarview.cpp:1547
+msgid "Dissociating Failed"
+msgstr ""
+
+#: calendarview.cpp:1538
+msgid "Dissociate future occurrences"
+msgstr ""
+
+#: calendarview.cpp:1546
+msgid "Dissociating the future occurrences failed."
+msgstr ""
+
+#: calendarview.cpp:1564 calendarview.cpp:1638 calendarview.cpp:1710
+msgid "No item selected."
+msgstr "ਕੋਈ ਇਕਾਈ ਚੁਣੀ ਨਹੀਂ ਗਈ ਹੈ।"
+
+#: calendarview.cpp:1585 calendarview.cpp:1658
+msgid "The item information was successfully sent."
+msgstr ""
+
+#: calendarview.cpp:1586
+msgid "Publishing"
+msgstr "ਪਰਕਾਸ਼ਤ"
+
+#: calendarview.cpp:1588
+msgid "Unable to publish the item '%1'"
+msgstr "'%1' ਇਕਾਈ ਪਰਕਾਸ਼ਤ ਕਰਨ ਵਿੱਚ ਅਸਫਲ ਹੈ।"
+
+#: calendarview.cpp:1639 calendarview.cpp:1659
+#, fuzzy
+msgid "Forwarding"
+msgstr "ਅੱਗੇ ਜਾਓ(&F)"
+
+#: calendarview.cpp:1664
+#, fuzzy
+msgid "Unable to forward the item '%1'"
+msgstr "'%1' ਇਕਾਈ ਪਰਕਾਸ਼ਤ ਕਰਨ ਵਿੱਚ ਅਸਫਲ ਹੈ।"
+
+#: calendarview.cpp:1665
+#, fuzzy
+msgid "Forwarding Error"
+msgstr "ਅੱਗੇ ਜਾਓ(&F)"
+
+#: calendarview.cpp:1688
+msgid "The free/busy information was successfully sent."
+msgstr ""
+
+#: calendarview.cpp:1689 calendarview.cpp:1732
+msgid "Sending Free/Busy"
+msgstr "ਵਿਹਲਾ/ਰੁਝਿਆ ਭੇਜੀ ਰਹੀ ਹੈ"
+
+#: calendarview.cpp:1691
+msgid "Unable to publish the free/busy data."
+msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਡਾਟਾ ਪਰਕਾਸ਼ਤ ਕਰਨ ਲਈ ਅਸਫ਼ਲ ਹੈ।"
+
+#: calendarview.cpp:1716
+msgid "The item has no attendees."
+msgstr ""
+
+#: calendarview.cpp:1728
+msgid ""
+"The groupware message for item '%1'was successfully sent.\n"
+"Method: %2"
+msgstr ""
+
+#: calendarview.cpp:1737
+msgid ""
+"_: Groupware message sending failed. %2 is "
+"request/reply/add/cancel/counter/etc.\n"
+"Unable to send the item '%1'.\n"
+"Method: %2"
+msgstr ""
+
+#: calendarview.cpp:1812
+msgid "*.ics|ICalendars"
+msgstr "*.ics|I-ਕੈਲੰਡਰ"
+
+#: calendarview.cpp:1820 calendarview.cpp:1848
+msgid "Do you want to overwrite %1?"
+msgstr ""
+
+#: calendarview.cpp:1833
+msgid "The journal entries can not be exported to a vCalendar file."
+msgstr ""
+
+#: calendarview.cpp:1834
+msgid "Data Loss Warning"
+msgstr "ਡਾਟਾ ਗੁੰਮਣ ਚੇਤਾਵਨੀ"
+
+#: actionmanager.cpp:996 calendarview.cpp:1834
+msgid "Proceed"
+msgstr "ਜਾਰੀ ਰੱਖੋ"
+
+#: calendarview.cpp:1839
+msgid "*.vcs|vCalendars"
+msgstr "*.vcs|ਵੀ-ਕੈਲੰਡਰ"
+
+#: calendarview.cpp:1870
+msgid "&Previous Day"
+msgstr "ਪਿੱਛੇ ਦਿਨ(&P)"
+
+#: calendarview.cpp:1871
+msgid "&Next Day"
+msgstr "ਅੱਗੇ ਦਿਨ(&N)"
+
+#: calendarview.cpp:1873
+msgid "&Previous Week"
+msgstr "ਪਿੱਛੇ ਹਫਤਾ(&P)"
+
+#: calendarview.cpp:1874
+msgid "&Next Week"
+msgstr "ਅੱਗੇ ਹਫਤਾ(&N)"
+
+#: calendarview.cpp:1984 calendarview.cpp:2017
+msgid "No filter"
+msgstr "ਫਿਲਟਰ ਨਹੀਂ"
+
+#: calendarview.cpp:2215
+msgid "No resources found. We can not edit the item."
+msgstr ""
+
+#: calendarview.cpp:2333
+msgid ""
+"The item \"%1\" has sub-to-dos. Do you want to delete just this item and make "
+"all its sub-to-dos independent, or delete the to-do with all its sub-to-dos?"
+msgstr ""
+
+#: calendarview.cpp:2339
+msgid "Delete Only This"
+msgstr "ਸਿਰਫ਼ ਇਹ ਹੀ ਹਟਾਓ"
+
+#: calendarview.cpp:2342
+msgid "Deleting sub-to-dos"
+msgstr "ਵਾਧੂ ਕੰਮ-ਕਾਰ ਹਟਾਓ"
+
+#: calendarview.cpp:2367
+msgid ""
+"The item \"%1\" is marked read-only and cannot be deleted; it probably belongs "
+"to a read-only calendar resource."
+msgstr ""
+
+#: calendarview.cpp:2371
+msgid "Removing not possible"
+msgstr "ਹਟਾਉਣਾ ਸੰਭਵ ਨਹੀਂ ਹੈ"
+
+#: calendarview.cpp:2398
+msgid ""
+"The calendar item \"%1\" recurs over multiple dates; are you sure you want to "
+"delete it and all its recurrences?"
+msgstr ""
+
+#: calendarview.cpp:2404
+msgid ""
+"The calendar item \"%1\" recurs over multiple dates. Do you want to delete only "
+"the current one on %2, only all future recurrences, or all its recurrences?"
+msgstr ""
+
+#: calendarview.cpp:2409
+msgid "Delete C&urrent"
+msgstr "ਮੌਜੂਦਾ ਹਟਾਓ"
+
+#: calendarview.cpp:2410
+msgid "Delete &Future"
+msgstr "ਭਵਿੱਖਤ ਹਟਾਓ"
+
+#: calendarview.cpp:2411
+msgid "Delete &All"
+msgstr "ਸਭ ਹਟਾਉ"
+
+#: calendarview.cpp:2514
+msgid "Delete all completed to-dos?"
+msgstr ""
+
+#: calendarview.cpp:2514
+msgid "Purge To-dos"
+msgstr ""
+
+#: calendarview.cpp:2514
+msgid "Purge"
+msgstr ""
+
+#: calendarview.cpp:2518
+msgid "Purging completed to-dos"
+msgstr ""
+
+#: calendarview.cpp:2533
+msgid "Unable to purge to-dos with uncompleted children."
+msgstr ""
+
+#: calendarview.cpp:2534
+msgid "Delete To-do"
+msgstr "ਕੰਮ-ਕਾਰ ਹਟਾਓ"
+
+#: calendarview.cpp:2545
+msgid "Unable to edit \"%1\" because it is locked by another process."
+msgstr ""
+
+#: calendarview.cpp:2579
+#, c-format
+msgid "Unable to copy the item to %1."
+msgstr "'%1' ਲਈ ਇਕਾਈ ਨੂੰ ਨਕਲ ਕਰਨ ਵਿੱਚ ਅਸਫਲ ਹੈ।"
+
+#: calendarview.cpp:2580
+msgid "Copying Failed"
+msgstr "ਨਕਲ ਅਸਫਲ ਰਹੀ"
+
+#: calendarview.cpp:2623
+#, c-format
+msgid "Unable to move the item to %1."
+msgstr "'%1' ਵਿੱਚ ਇਕਾਈ ਭੇਜਣ ਵਿੱਚ ਅਸਫਲ ਹੈ।"
+
+#: calendarview.cpp:2624
+msgid "Moving Failed"
+msgstr "ਭੇਜਣਾ ਅਸਫਲ"
+
+#: calendarview.cpp:2699
+msgid "Cutting Recurring Item"
+msgstr ""
+
+#: calendarview.cpp:2701
+msgid ""
+"The item you try to cut is a recurring item. Do you want to cut only this "
+"single occurrence, only future items, or all items in the recurrence?"
+msgstr ""
+
+#: calendarview.cpp:2706
+msgid "Copying Recurring Item"
+msgstr ""
+
+#: calendarview.cpp:2708
+msgid ""
+"The item you try to copy is a recurring item. Do you want to copy only this "
+"single occurrence, only future items, or all items in the recurrence?"
+msgstr ""
+
+#: calendarview.cpp:2712
+msgid "Changing Recurring Item"
+msgstr ""
+
+#: calendarview.cpp:2714
+msgid ""
+"The item you try to change is a recurring item. Shall the changes be applied "
+"only to this single occurrence, only to the future items, or to all items in "
+"the recurrence?"
+msgstr ""
+
+#: calendarview.cpp:2722
+msgid "Only &This Item"
+msgstr "ਸਿਰਫ ਇਹ ਇਕਾਈ ਹੀ(&T)"
+
+#: calendarview.cpp:2722
+msgid "Only &Future Items"
+msgstr "ਸਿਰਫ ਭਵਿੱਖਤ ਇਕਾਈਆਂ ਹੀ(&F)"
+
+#: calendarview.cpp:2722
+msgid "&All Occurrences"
+msgstr "ਸਭ ਮੌਜੂਦਗੀਆਂ(&A)"
+
+#: calendarview.cpp:2738 koagenda.cpp:1123
+msgid "Dissociate event from recurrence"
+msgstr ""
+
+#: calendarview.cpp:2744
+msgid ""
+"Unable to add the exception item to the calendar. No change will be done."
+msgstr ""
+
+#: calendarview.cpp:2745 calendarview.cpp:2766
+msgid "Error Occurred"
+msgstr "ਗਲਤੀ ਆਈ ਹੈ"
+
+#: calendarview.cpp:2759
+msgid "Split future recurrences"
+msgstr "ਭਵਿੱਖ ਮੌਜੂਦਾ ਵੰਡੋ"
+
+#: calendarview.cpp:2765
+msgid "Unable to add the future items to the calendar. No change will be done."
+msgstr ""
+
+#: koviewmanager.cpp:405
+#, fuzzy
+msgid "Merged calendar"
+msgstr "ਮਿਲਾਨ ਕੈਲੰਡਰ '%1'"
+
+#: koviewmanager.cpp:407
+msgid "Calendars Side by Side"
+msgstr ""
+
+#: koeditorfreebusy.cpp:178
+#, fuzzy
+msgid "Freebusy Period"
+msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਪਰਾਪਤੀ ਗੁਪਤ-ਕੋਡ"
+
+#: koeditorfreebusy.cpp:181
+#, fuzzy
+msgid "Summary:"
+msgstr "ਸੰਖੇਪ"
+
+#: koeditorattachments.cpp:218 koeditorfreebusy.cpp:186
+#, fuzzy
+msgid "Location:"
+msgstr "ਸਥਿਤੀ(&L):"
+
+#: koeditorfreebusy.cpp:190
+#, fuzzy
+msgid "Start:"
+msgstr "ਸ਼ੁਰੂ:"
+
+#: koeditorfreebusy.cpp:193
+#, fuzzy
+msgid "End:"
+msgstr "ਅੰਤ:"
+
+#: koeditorfreebusy.cpp:247
 msgid ""
 "Sets the zoom level on the Gantt chart. 'Hour' shows a range of several hours, "
 "'Day' shows a range of a few days, 'Week' shows a range of a few months, and "
@@ -144,82 +1335,80 @@ msgid ""
 "appropriate for the current event or to-do."
 msgstr ""
 
-#: koeditorfreebusy.cpp:236
+#: koeditorfreebusy.cpp:254
 msgid "Scale: "
 msgstr "ਪੈਮਾਨਾ: "
 
-#: koeditorfreebusy.cpp:242
+#: koeditorfreebusy.cpp:260
 msgid "Hour"
 msgstr "ਘੰਟਾ"
 
-#: koeditorfreebusy.cpp:243
+#: koeditorfreebusy.cpp:261
 msgid "Day"
 msgstr "ਦਿਨ"
 
-#: koeditorfreebusy.cpp:244
+#: koeditorfreebusy.cpp:262
 msgid "Week"
 msgstr "ਹਫਤਾ"
 
-#: koeditorfreebusy.cpp:245
+#: koeditorfreebusy.cpp:263
 msgid "Month"
 msgstr "ਮਹੀਨਾ"
 
-#: koeditorfreebusy.cpp:246
+#: koeditorfreebusy.cpp:264
 msgid "Automatic"
 msgstr "ਸਵੈ-ਚਾਲਿਤ"
 
-#: koeditorfreebusy.cpp:252
+#: koeditorfreebusy.cpp:270
 msgid "Center on Start"
 msgstr "ਸ਼ੁਰੂ ਤੇ ਕੇਂਦਰ"
 
-#: koeditorfreebusy.cpp:254
+#: koeditorfreebusy.cpp:272
 msgid "Centers the Gantt chart on the start time and day of this event."
 msgstr ""
 
-#: koeditorfreebusy.cpp:261
+#: koeditorfreebusy.cpp:279
 msgid "Pick Date"
 msgstr "ਮਿਤੀ ਚੁਣੋ"
 
-#: koeditorfreebusy.cpp:263
+#: koeditorfreebusy.cpp:281
 msgid "Moves the event to a date and time when all the attendees are free."
 msgstr ""
 
-#: koeditorfreebusy.cpp:272
+#: koeditorfreebusy.cpp:290
 msgid ""
 "Reloads Free/Busy data for all attendees from the corresponding servers."
 msgstr ""
 
-#: koeditorfreebusy.cpp:279
+#: koeditorfreebusy.cpp:297
 msgid ""
 "Shows the free/busy status of all attendees. Double-clicking on an attendees "
 "entry in the list will allow you to enter the location of their Free/Busy "
 "Information."
 msgstr ""
 
-#: koeditorfreebusy.cpp:286
+#: koeditorfreebusy.cpp:304
 #, fuzzy
 msgid "Attendee"
 msgstr "ਸਰੋਤੇ(&n)"
 
-#: koeditorfreebusy.cpp:529
+#: koeditorfreebusy.cpp:547
 msgid "The meeting already has suitable start/end times."
 msgstr ""
 
-#: koeditorfreebusy.cpp:535
+#: koeditorfreebusy.cpp:552
 msgid ""
-"The meeting has been moved to\n"
-"Start: %1\n"
-"End: %2."
+"<qt>The next available time slot for the meeting is:"
+"<br>Start: %1"
+"<br>End: %2"
+"<br>Would you like to move the meeting to this time slot?</qt>"
 msgstr ""
-"ਮੀਟਿੰਗ ਤਬਦੀਲ ਹੋਈ ਹੈ\n"
-"ਸ਼ੁਰੂ: %1\n"
-"ਅੰਤ: %2."
 
-#: koeditorfreebusy.cpp:540
+#: koeditorfreebusy.cpp:564
 msgid "No suitable date found."
 msgstr "ਕੋਈ ਠੀਕ ਮਿਤੀ ਨਹੀਂ ਲੱਭੀ ਹੈ।"
 
-#: koeditorfreebusy.cpp:675
+#: koeditorfreebusy.cpp:700
 msgid ""
 "Of the %1 participants, %2 have accepted, %3 have tentatively accepted, and %4 "
 "have declined."
@@ -227,598 +1416,709 @@ msgstr ""
 "%1 ਸਰੋਤਿਆਂ ਵਿੱਚੋਂ, %2 ਨੇ ਸਵੀਕਾਰ ਕੀਤਾ ਹੈ, %3 ਨੇ ਆਰਜ਼ੀ ਸਵੀਕਾਰ ਕੀਤਾ ਹੈ ਅਤੇ %4 ਨੇ ਨਾ "
 "ਮਨਜ਼ੂਰ ਕਰ ਦਿੱਤਾ ਹੈ।"
 
-#: koeditorfreebusy.cpp:898
+#: koeditorfreebusy.cpp:957
 msgid ""
 "You are changing the organiser of this event, who is also attending, do you "
 "want to change that attendee as well?"
 msgstr ""
 
-#: koeditorrecurrence.cpp:91
-msgid ""
-"The number of the week from the beginning of the month on which this event or "
-"to-do should recur."
+#: importdialog.cpp:41 previewdialog.cpp:53
+#, fuzzy
+msgid "Import Calendar/Event"
+msgstr "ਕੈਲੰਡਰ ਆਯਾਤ"
+
+#: importdialog.cpp:48
+msgid "Import calendar/event at '%1' into KOrganizer."
 msgstr ""
 
-#: koeditorrecurrence.cpp:95 koeditorrecurrence.cpp:259
-msgid "1st"
-msgstr "1ਹਿਲਾਂ"
+#: importdialog.cpp:57
+msgid "Add as new calendar"
+msgstr "ਨਵੇਂ ਕੈਲੰਡਰ ਵਾਂਗ ਸ਼ਾਮਿਲ"
 
-#: koeditorrecurrence.cpp:96 koeditorrecurrence.cpp:260
-msgid "2nd"
-msgstr "2ਜਾ"
+#: importdialog.cpp:59
+msgid "Merge into existing calendar"
+msgstr "ਮੌਜੂਦਾ ਕੈਲੰਡਰ ਵਿੱਚ ਮਿਲਾਨ"
 
-#: koeditorrecurrence.cpp:97 koeditorrecurrence.cpp:261
-msgid "3rd"
-msgstr "3ਜਾ"
+#: importdialog.cpp:62
+msgid "Open in separate window"
+msgstr "ਵੱਖਰੇ ਝਰੋਖੇ ਵਿੱਚ ਖੋਲੋ"
 
-#: koeditorrecurrence.cpp:98 koeditorrecurrence.cpp:262
-msgid "4th"
-msgstr "4ਵਾਂ"
+#: actionmanager.cpp:255
+#, fuzzy
+msgid "Import &Event/Calendar (ICS-/VCS-File)..."
+msgstr "ਕੈਲੰਡਰ ਅਯਾਤ(&C)..."
 
-#: koeditorrecurrence.cpp:99 koeditorrecurrence.cpp:263
-msgid "5th"
-msgstr "5ਵਾਂ"
+#: actionmanager.cpp:257
+#, fuzzy
+msgid "&Import From UNIX Ical tool (.calendar-File)"
+msgstr "UN&IX Ical ਸੰਦ ਤੋਂ ਆਯਾਤ"
 
-#: koeditorrecurrence.cpp:100 koeditorrecurrence.cpp:290
-msgid "Last"
-msgstr "ਅੰਤਿਮ"
+#: actionmanager.cpp:259
+msgid "Get &Hot New Stuff..."
+msgstr ""
 
-#: koeditorrecurrence.cpp:101 koeditorrecurrence.cpp:291
-msgid "2nd Last"
-msgstr "2ਜਾ ਆਖਰੀ"
+#: actionmanager.cpp:263
+msgid "Export &Web Page..."
+msgstr "ਵੈੱਬ ਸਫ਼ਾ ਨਿਰਯਾਤ..."
 
-#: koeditorrecurrence.cpp:102 koeditorrecurrence.cpp:292
-msgid "3rd Last"
-msgstr "3ਜਾ ਆਖਰੀ"
+#: actionmanager.cpp:266
+msgid "&iCalendar..."
+msgstr ""
 
-#: koeditorrecurrence.cpp:103 koeditorrecurrence.cpp:293
-msgid "4th Last"
-msgstr "4ਵਾਂ ਆਖਰੀ"
+#: actionmanager.cpp:269
+msgid "&vCalendar..."
+msgstr "&vਕੈਲੰਡਰ..."
 
-#: koeditorrecurrence.cpp:104 koeditorrecurrence.cpp:294
-msgid "5th Last"
-msgstr "5ਵਾਂ ਆਖਰੀ"
+#: actionmanager.cpp:272
+msgid "Upload &Hot New Stuff..."
+msgstr ""
 
-#: koeditorrecurrence.cpp:112
-msgid "The weekday on which this event or to-do should recur."
+#: actionmanager.cpp:278
+msgid "Archive O&ld Entries..."
 msgstr ""
 
-#: koeditorrecurrence.cpp:126
-msgid "The month during which this event or to-do should recur."
+#: actionmanager.cpp:280
+msgid ""
+"_: delete completed to-dos\n"
+"Pur&ge Completed To-dos"
 msgstr ""
 
-#: koeditorrecurrence.cpp:143
-msgid "Sets how often this event or to-do should recur."
+#: actionmanager.cpp:338
+msgid "What's &Next"
+msgstr "ਅੱਗੇ ਕੀ ਹੈ(&N)"
+
+#: actionmanager.cpp:342
+msgid "&Day"
+msgstr "ਦਿਨ(&D)"
+
+#: actionmanager.cpp:351
+#, c-format
+msgid ""
+"_n: &Next Day\n"
+"Ne&xt %n Days"
 msgstr ""
+"ਅਗਲਾ ਦਿਨ(&N)\n"
+"ਅਗਲੇ %n ਦਿਨ(&x)"
 
-#: koeditorrecurrence.cpp:167 koeditorrecurrence.cpp:181
-#: koeditorrecurrence.cpp:232 koeditorrecurrence.cpp:405
-msgid "&Recur every"
-msgstr "ਦੁਹਰਾਓ(&R)"
+#: actionmanager.cpp:353
+msgid "W&ork Week"
+msgstr "ਹਫਤਾ ਕੰਮ(&o)"
 
-#. i18n: file koeditoralarms_base.ui line 70
-#: koeditorgeneral.cpp:230 koeditorrecurrence.cpp:167
-#: korgac/alarmdialog.cpp:122 rc.cpp:178 rc.cpp:1892
-#, no-c-format
-msgid "day(s)"
-msgstr "ਦਿਨ"
+#: actionmanager.cpp:357
+msgid "&Week"
+msgstr "ਹਫਤਾ(&W)"
 
-#: koeditorrecurrence.cpp:181
-msgid "week(s) on:"
-msgstr "ਹਫ਼ਤੇ 'ਤੇ:"
+#: actionmanager.cpp:361
+msgid "&Month"
+msgstr "ਮਹੀਨਾ(&M)"
 
-#: koeditorrecurrence.cpp:199
-msgid "Day of the week on which this event or to-do should recur."
-msgstr ""
+#: actionmanager.cpp:365
+msgid "&List"
+msgstr "ਸੂਚੀ(&L)"
 
-#: koeditorrecurrence.cpp:232
-msgid "month(s)"
-msgstr "ਮਹੀਨੇ"
+#: actionmanager.cpp:369
+msgid "&To-do List"
+msgstr "ਕੰਮ ਸੂਚੀ(&T)"
 
-#: koeditorrecurrence.cpp:244
-msgid "&Recur on the"
-msgstr ""
+#: actionmanager.cpp:373
+msgid "&Journal"
+msgstr "ਰੋਜ਼ਨਾਮਚਾ(&J)"
 
-#: koeditorrecurrence.cpp:249
-msgid ""
-"Sets a specific day of the month on which this event or to-do should recur."
-msgstr ""
+#: actionmanager.cpp:377
+#, fuzzy
+msgid "&Timeline View"
+msgstr "ਕੇਂਦਰੀ ਝਲਕ"
 
-#: koeditorrecurrence.cpp:254 koeditorrecurrence.cpp:430
-msgid "The day of the month on which this event or to-do should recur."
-msgstr ""
+#: actionmanager.cpp:383
+msgid "&Refresh"
+msgstr "ਤਾਜ਼ਾ(&R)"
 
-#: koeditorrecurrence.cpp:264
-msgid "6th"
-msgstr "6ਵਾਂ"
+#: actionmanager.cpp:391
+msgid "F&ilter"
+msgstr "ਫਿਲਟਰ"
 
-#: koeditorrecurrence.cpp:265
-msgid "7th"
-msgstr "7ਵਾਂ"
+#: actionmanager.cpp:406
+msgid "Zoom In Horizontally"
+msgstr "ਖਿਤਿਜੀ ਆਕਾਰ ਵੱਡਾ"
 
-#: koeditorrecurrence.cpp:266
-msgid "8th"
-msgstr "8ਵਾਂ"
+#: actionmanager.cpp:409
+msgid "Zoom Out Horizontally"
+msgstr "ਖਿਤਿਜੀ ਆਕਾਰ ਛੋਟਾ"
 
-#: koeditorrecurrence.cpp:267
-msgid "9th"
-msgstr "9ਵਾਂ"
+#: actionmanager.cpp:412
+msgid "Zoom In Vertically"
+msgstr "ਲੰਬਕਾਰੀ ਆਕਾਰ ਵੱਡਾ"
 
-#: koeditorrecurrence.cpp:268
-msgid "10th"
-msgstr "10ਵਾਂ"
+#: actionmanager.cpp:415
+msgid "Zoom Out Vertically"
+msgstr "ਲੰਬਕਾਰੀ ਆਕਾਰ ਛੋਟਾ"
 
-#: koeditorrecurrence.cpp:269
-msgid "11th"
-msgstr "11ਵਾਂ"
+#: actionmanager.cpp:424
+msgid "Go to &Today"
+msgstr "ਅੱਜ ਤੇ ਜਾਓ(&T)"
 
-#: koeditorrecurrence.cpp:270
-msgid "12th"
-msgstr "12ਵਾਂ"
+#: actionmanager.cpp:428
+msgid "Go &Backward"
+msgstr "ਪਿੱਛੇ ਵੱਲ ਜਾਓ(&B)"
 
-#: koeditorrecurrence.cpp:271
-msgid "13th"
-msgstr "13ਵਾਂ"
+#: actionmanager.cpp:440
+msgid "Go &Forward"
+msgstr "ਅੱਗੇ ਜਾਓ(&F)"
 
-#: koeditorrecurrence.cpp:272
-msgid "14th"
-msgstr "14ਵਾਂ"
+#: actionmanager.cpp:450
+msgid "New E&vent..."
+msgstr "ਨਵੀਂ ਘਟਨਾ(&v)..."
 
-#: koeditorrecurrence.cpp:273
-msgid "15th"
-msgstr "15ਵਾਂ"
+#: actionmanager.cpp:454 kotodoview.cpp:464
+msgid "New &To-do..."
+msgstr "ਨਵਾਂ ਕੰਮ (&T)..."
 
-#: koeditorrecurrence.cpp:274
-msgid "16th"
-msgstr "16ਵਾਂ"
+#: actionmanager.cpp:458 kotodoview.cpp:466
+msgid "New Su&b-to-do..."
+msgstr ""
 
-#: koeditorrecurrence.cpp:275
-msgid "17th"
-msgstr "17ਵਾਂ"
+#: actionmanager.cpp:464
+msgid "New &Journal..."
+msgstr "ਨਵਾਂ ਰੋਜ਼ਨਾਮਚਾ(&J)..."
 
-#: koeditorrecurrence.cpp:276
-msgid "18th"
-msgstr "18ਵਾਂ"
+#: actionmanager.cpp:469 actionmanager.cpp:1461 actionmanager.cpp:1489
+#: koeventpopupmenu.cpp:53 kotodoview.cpp:454
+msgid "&Show"
+msgstr "ਵੇਖਾਓ(&S)"
 
-#: koeditorrecurrence.cpp:277
-msgid "19th"
-msgstr "19ਵਾਂ"
+#: actionmanager.cpp:472 actionmanager.cpp:1462 actionmanager.cpp:1490
+#: koeventpopupmenu.cpp:55 kotodoview.cpp:456 resourceview.cpp:715
+msgid "&Edit..."
+msgstr "ਸੋਧ(&E)..."
 
-#: koeditorrecurrence.cpp:278
-msgid "20th"
-msgstr "20ਵਾਂ"
+#: actionmanager.cpp:479
+msgid "&Make Sub-to-do Independent"
+msgstr ""
 
-#: koeditorrecurrence.cpp:279
-msgid "21st"
-msgstr "21ਵਾਂ"
+#: actionmanager.cpp:498
+msgid "&Publish Item Information..."
+msgstr ""
 
-#: koeditorrecurrence.cpp:280
-msgid "22nd"
-msgstr "22ਵਾਂ"
+#: actionmanager.cpp:503
+msgid "Send &Invitation to Attendees"
+msgstr ""
 
-#: koeditorrecurrence.cpp:281
-msgid "23rd"
-msgstr "23ਵਾਂ"
+#: actionmanager.cpp:511
+msgid "Re&quest Update"
+msgstr "ਬੇਨਤੀ ਅੱਪਡੇਟ(&q)"
 
-#: koeditorrecurrence.cpp:282
-msgid "24th"
-msgstr "24ਵਾਂ"
+#: actionmanager.cpp:518
+msgid "Send &Cancelation to Attendees"
+msgstr ""
 
-#: koeditorrecurrence.cpp:283
-msgid "25th"
-msgstr "25ਵਾਂ"
+#: actionmanager.cpp:525
+msgid "Send Status &Update"
+msgstr "ਹਾਲਤ ਅੱਪਡੇਟ ਭੇਜੋ(&U)"
 
-#: koeditorrecurrence.cpp:284
-msgid "26th"
-msgstr "26ਵਾਂ"
+#: actionmanager.cpp:533
+msgid ""
+"_: counter proposal\n"
+"Request Chan&ge"
+msgstr "ਬੇਨਤੀ ਤਬਦੀਲ(&g)"
 
-#: koeditorrecurrence.cpp:285
-msgid "27th"
-msgstr "27ਵਾਂ"
+#: actionmanager.cpp:540
+#, fuzzy
+msgid "&Send as iCalendar..."
+msgstr "&vਕੈਲੰਡਰ..."
 
-#: koeditorrecurrence.cpp:286
-msgid "28th"
-msgstr "28ਵਾਂ"
+#: actionmanager.cpp:545
+msgid "&Mail Free Busy Information..."
+msgstr "ਵਿਹਲਾ-ਰੁਝਿਆ ਜਾਣਕਾਰੀ ਪੱਤਰ(&M)..."
 
-#: koeditorrecurrence.cpp:287
-msgid "29th"
-msgstr "29ਵਾਂ"
+#: actionmanager.cpp:550
+msgid "&Upload Free Busy Information"
+msgstr "ਵਿਹਲਾ-ਰੁਝਿਆ ਜਾਣਕਾਰੀ ਅੱਪਲੋਡ ਕਰੋ(&U)"
 
-#: koeditorrecurrence.cpp:288
-msgid "30th"
-msgstr "30ਵਾਂ"
+#: actionmanager.cpp:556
+msgid "&Addressbook"
+msgstr "ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ(&A)"
 
-#: koeditorrecurrence.cpp:289
-msgid "31st"
-msgstr "31ਵਾਂ"
+#: actionmanager.cpp:567
+msgid "Show Date Navigator"
+msgstr "ਮਿਤੀ ਬਕਸਾ ਵੇਖਾਓ"
 
-#: koeditorrecurrence.cpp:325
-msgid "day"
-msgstr "ਦਿਨ"
+#: actionmanager.cpp:570
+msgid "Show To-do View"
+msgstr "ਕੰਮ ਕਾਰ ਝਲਕ ਵੇਖਾਓ"
 
-#: koeditorrecurrence.cpp:332
-msgid ""
-"Sets a weekday and specific week in the month on which this event or to-do "
-"should recur"
-msgstr ""
+#: actionmanager.cpp:573
+msgid "Show Item Viewer"
+msgstr "ਘਟਨਾ ਝਲਕ ਵੇਖਾਓ"
 
-#: koeditorrecurrence.cpp:405
-msgid "year(s)"
-msgstr "ਸਾਲ"
+#: actionmanager.cpp:592
+msgid "Show Resource View"
+msgstr "ਸਰੋਤ ਝਲਕ ਵੇਖਾਓ"
 
-#: koeditorrecurrence.cpp:419
-msgid ""
-"_: part before XXX of 'Recur on day XXX of month YYY'\n"
-"&Recur on day "
-msgstr "ਦਿਨ ਤੇ ਦੁਹਰਾਉ(&R)"
+#: actionmanager.cpp:595
+msgid "Show &Resource Buttons"
+msgstr "ਸਰੋਤ ਬਟਨ ਵੇਖਾਓ(&R)"
 
-#: koeditorrecurrence.cpp:421
-msgid "&Day "
-msgstr "ਦਿਨ "
+#: actionmanager.cpp:610
+msgid "Configure &Date && Time..."
+msgstr "ਮਿਤੀ ਅਤੇ ਸਮਾਂ ਸੰਰਚਨਾ(&D)..."
 
-#: koeditorrecurrence.cpp:425
-msgid ""
-"Sets a specific day in a specific month on which this event or to-do should "
-"recur."
-msgstr ""
+#: actionmanager.cpp:617
+msgid "Manage View &Filters..."
+msgstr "ਵੇਖਣ ਫਿਲਟਰ ਪਰਬੰਧਨ(&F)..."
 
-#: koeditorrecurrence.cpp:434
-msgid ""
-"_: part between XXX and YYY of 'Recur on day XXX of month YYY'\n"
-" &of "
-msgstr " &of "
+#: actionmanager.cpp:620
+msgid "Manage C&ategories..."
+msgstr "ਵਰਗ ਪਰਬੰਧਨ(&a)..."
 
-#: koeditorrecurrence.cpp:448
-msgid ""
-"_: Part before XXX in 'Recur on NNN. WEEKDAY of MONTH', short version\n"
-"&On"
-msgstr "&On"
+#: actionmanager.cpp:624
+msgid "&Configure Calendar..."
+msgstr "ਕੈਲੰਡਰ ਸੰਰਚਨਾ(&C)..."
 
-#: koeditorrecurrence.cpp:450
+#: actionmanager.cpp:649 actionmanager.cpp:651
+msgid "Filter: "
+msgstr "ਫਿਲਟਰ:"
+
+#: actionmanager.cpp:713 actionmanager.cpp:801 actionmanager.cpp:1191
+#: previewdialog.cpp:140
+msgid "*.vcs *.ics|Calendar Files"
+msgstr "*.vcs *.ics|ਕੈਲੰਡਰ ਫਾਇਲਾਂ"
+
+#: actionmanager.cpp:752
+#, fuzzy
 msgid ""
-"_: Part before XXX in 'Recur on NNN. WEEKDAY of MONTH'\n"
-"&On the"
+"You have no .calendar file in your home directory.\n"
+"Import cannot proceed.\n"
 msgstr ""
+"ਤੁਹਾਡੀ ਡਾਇਰੈਕਟਰੀ ਵਿੱਚ ical ਫਾਇਲ ਨਹੀਂ ਹੈ।\n"
+"ਆਯਾਤ ਸੰਭਵ ਨਹੀਂ ਹੈ।\n"
 
-#: koeditorrecurrence.cpp:454
+#: actionmanager.cpp:775
 msgid ""
-"Sets a specific day in a specific week of a specific month on which this event "
-"or to-do should recur."
+"KOrganizer successfully imported and merged your .calendar file from ical into "
+"the currently opened calendar."
 msgstr ""
 
-#: koeditorrecurrence.cpp:465
+#: actionmanager.cpp:781
 msgid ""
-"_: part between WEEKDAY and MONTH in 'Recur on NNN. WEEKDAY of MONTH'\n"
-" o&f "
-msgstr "ਬੰਦ(&f)"
+"KOrganizer encountered some unknown fields while parsing your .calendar ical "
+"file, and had to discard them; please check to see that all your relevant data "
+"was correctly imported."
+msgstr ""
 
-#: koeditorrecurrence.cpp:480
-msgid "Day #"
-msgstr "ਦਿਨ #"
+#: actionmanager.cpp:785
+msgid "ICal Import Successful with Warning"
+msgstr "ICal ਆਯਾਤ ਚੇਤਾਵਨੀ ਨਾਲ ਸਫਲ ਰਿਹਾ ਹੈ।"
 
-#: koeditorrecurrence.cpp:482
-msgid "Recur on &day #"
+#: actionmanager.cpp:788
+msgid ""
+"KOrganizer encountered an error parsing your .calendar file from ical; import "
+"has failed."
 msgstr ""
 
-#: koeditorrecurrence.cpp:484
+#: actionmanager.cpp:792
 msgid ""
-"Sets a specific day within the year on which this event or to-do should recur."
+"KOrganizer does not think that your .calendar file is a valid ical calendar; "
+"import has failed."
 msgstr ""
 
-#: koeditorrecurrence.cpp:495
-msgid ""
-"_: part after NNN of 'Recur on day #NNN of the year'\n"
-" of the &year"
-msgstr " ਸਾਲ ਦੇ (&y)"
+#: actionmanager.cpp:874
+msgid "New calendar '%1'."
+msgstr "ਨਵਾਂ ਕੈਲੰਡਰ '%1'"
 
-#: koeditorrecurrence.cpp:498
-msgid ""
-"_: part after NNN of 'Recur on day #NNN of the year', short version\n"
-" of the year"
-msgstr " ਦਾ ਸਾਲ"
+#: actionmanager.cpp:909
+msgid "Cannot download calendar from '%1'."
+msgstr "'%1' ਤੋਂ ਕੈਲੰਡਰ ਡਾਊਨਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: koeditorrecurrence.cpp:581
-msgid "E&xceptions"
-msgstr "ਅਪਵਾਦ(&x)"
+#: actionmanager.cpp:947
+msgid "Added calendar resource for URL '%1'."
+msgstr ""
 
-#: koeditorrecurrence.cpp:591
+#: actionmanager.cpp:955
+msgid "Unable to create calendar resource '%1'."
+msgstr "'%1' ਕੈਲੰਡਰ ਸਰੋਤ ਬਣਾਉਣ ਲਈ ਅਸਫ਼ਲ ਹੈ।"
+
+#: actionmanager.cpp:966
+msgid "Merged calendar '%1'."
+msgstr "ਮਿਲਾਨ ਕੈਲੰਡਰ '%1'"
+
+#: actionmanager.cpp:969
+msgid "Opened calendar '%1'."
+msgstr "ਖੁੱਲਾ ਕੈਲੰਡਰ '%1'"
+
+#: actionmanager.cpp:994
 msgid ""
-"A date that should be considered an exception to the recurrence rules for this "
-"event or to-do."
+"Your calendar will be saved in iCalendar format. Use 'Export vCalendar' to save "
+"in vCalendar format."
 msgstr ""
 
-#. i18n: file koeditoralarms_base.ui line 546
-#: koeditorrecurrence.cpp:596 rc.cpp:253 rc.cpp:1967
-#, no-c-format
-msgid "&Add"
-msgstr "ਸ਼ਾਮਿਲ(&A)"
+#: actionmanager.cpp:996
+msgid "Format Conversion"
+msgstr "ਪ੍ਰਤੀਰੂਪ ਤਬਦੀਲੀ"
 
-#: koeditorrecurrence.cpp:598
-msgid ""
-"Add this date as an exception to the recurrence rules for this event or to-do."
+#: actionmanager.cpp:1020
+msgid "Cannot upload calendar to '%1'"
+msgstr "'%1' ਤੇ ਕੈਲੰਡਰ ਅੱਪਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ"
+
+#: actionmanager.cpp:1033
+msgid "Saved calendar '%1'."
+msgstr "ਕੈਲੰਡਰ '%1' ਸੰਭਾਲਿਆ ਹੈ।"
+
+#: actionmanager.cpp:1064
+msgid "Do you want to overwrite file \"%1\""
 msgstr ""
 
-#: koeditorrecurrence.cpp:601
-msgid "&Change"
-msgstr "ਤਬਦੀਲ(&C)"
+#: actionmanager.cpp:1098
+msgid "Could not upload file."
+msgstr "ਫਾਇਲ ਨੂੰ ਅੱਪਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: koeditorrecurrence.cpp:603
-msgid "Replace the currently selected date with this date."
+#: actionmanager.cpp:1139
+#, c-format
+msgid "Unable to save calendar to the file %1."
 msgstr ""
 
-#: koeditorrecurrence.cpp:607
+#: actionmanager.cpp:1164
 msgid ""
-"Delete the currently selected date from the list of dates that should be "
-"considered exceptions to the recurrence rules for this event or to-do."
+"The calendar has been modified.\n"
+"Do you want to save it?"
 msgstr ""
+"ਕੈਲੰਡਰ ਸੋਧਿਆ ਗਿਆ ਹੈ।\n"
+"ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਸੰਭਾਲਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: koeditorrecurrence.cpp:614
+#: actionmanager.cpp:1267
+#, c-format
 msgid ""
-"Displays current dates that are being considered exceptions to the recurrence "
-"rules for this event or to-do."
+"_n: &Next Day\n"
+"&Next %n Days"
 msgstr ""
+"ਅਗਲੇ ਦਿਨ(&N)\n"
+"ਅਗਲੇ %n ਦਿਨ (&N)"
 
-#: koeditorrecurrence.cpp:678
-msgid "Edit Exceptions"
-msgstr "ਅਪਵਾਦ ਸੋਧ"
+#: actionmanager.cpp:1301
+msgid "Could not start control module for date and time format."
+msgstr ""
 
-#: koeditorrecurrence.cpp:702
-msgid "Recurrence Range"
-msgstr "ਆਵਰਤੀ ਸੀਮਾ"
+#: actionmanager.cpp:1447
+msgid "&Show Event"
+msgstr "ਘਟਨਾ ਵੇਖਾਓ"
+
+#: actionmanager.cpp:1448
+msgid "&Edit Event..."
+msgstr "ਘਟਨ ਸੋਧ(&E)..."
+
+#: actionmanager.cpp:1449
+msgid "&Delete Event"
+msgstr "ਘਟਨਾ ਹਟਾਓ"
+
+#: actionmanager.cpp:1453
+msgid "&Show To-do"
+msgstr "ਕੰਮ-ਕਾਰ ਵੇਖਾਓ"
+
+#: actionmanager.cpp:1454
+msgid "&Edit To-do..."
+msgstr "ਕੰਮ-ਕਾਰ ਸੋਧ..."
+
+#: actionmanager.cpp:1455
+msgid "&Delete To-do"
+msgstr "ਕੰਮ-ਕਾਰ ਹਟਾਓ"
 
-#: koeditorrecurrence.cpp:705
+#: actionmanager.cpp:1579
 msgid ""
-"Sets a range for which these recurrence rules will apply to this event or "
-"to-do."
+"\"%1\" is read-only. Please select a writable calendar before attempting to "
+"create a new item."
 msgstr ""
 
-#: koeditorrecurrence.cpp:713
-msgid "Begin on:"
-msgstr "ਸ਼ੁਰੂ:"
+#: actionmanager.cpp:1582
+#, fuzzy
+msgid "Read-only calendar"
+msgstr "ਕੈਲੰਡਰ ਛਾਪੋ"
 
-#: koeditorrecurrence.cpp:715
-msgid "The date on which the recurrences for this event or to-do should begin."
+#: actionmanager.cpp:1612
+msgid ""
+"You have no active, writable event folder so saving will not be possible.\n"
+"Please create or activate at least one writable event folder and try again."
 msgstr ""
 
-#: koeditorrecurrence.cpp:722
-msgid "&No ending date"
-msgstr "ਕੋਈ ਸਮਾਪਤੀ ਮਿਤੀ ਨਹੀਂ(&N)"
-
-#: koeditorrecurrence.cpp:724
-msgid "Sets the event or to-do to recur forever."
+#: actionmanager.cpp:1616
+msgid ""
+"You have no active, writable to-do (task) folders so saving will not be "
+"possible.\n"
+"Please create or activate at least one writable to-do folder and try again."
 msgstr ""
 
-#: koeditorrecurrence.cpp:731
-msgid "End &after"
-msgstr "ਬਾਅਦ ਮੁਕੰਮਲ(&a)"
+#: actionmanager.cpp:1620
+msgid ""
+"You have no active, writable journal folder so saving will not be possible.\n"
+"Please create or activate at least one writable journal folder and try again."
+msgstr ""
 
-#: koeditorrecurrence.cpp:733
+#: actionmanager.cpp:1624
 msgid ""
-"Sets the event or to-do to stop recurring after a certain number of "
-"occurrences."
+"You have no active, writable calendar folder so saving will not be possible.\n"
+"Please create or activate at least one writable calendar folder and try again."
 msgstr ""
 
-#: koeditorrecurrence.cpp:738
-msgid "Number of times the event or to-do should recur before stopping."
+#: actionmanager.cpp:1630
+#, fuzzy
+msgid "No writable calendar"
+msgstr "ਕੋਈ ਠੀਕ ਮਿਤੀ ਨਹੀਂ ਲੱਭੀ ਹੈ।"
+
+#: actionmanager.cpp:1671 actionmanager.cpp:1794
+msgid "Attach as &link"
 msgstr ""
 
-#: koeditorrecurrence.cpp:744
-msgid "&occurrence(s)"
-msgstr "ਦੁਹਰਾਉ(&o)"
+#: actionmanager.cpp:1672 actionmanager.cpp:1795
+#, fuzzy
+msgid "Attach &inline"
+msgstr "ਨੱਥੀ"
 
-#: koeditorrecurrence.cpp:752
-msgid "End &on:"
-msgstr "ਮੁਕੰਮਲ:"
+#: actionmanager.cpp:1673
+msgid "Attach inline &without attachments"
+msgstr ""
 
-#: koeditorrecurrence.cpp:754
-msgid "Sets the event or to-do to stop recurring on a certain date."
+#: actionmanager.cpp:1675 actionmanager.cpp:1797 koeditorattachments.cpp:601
+msgid "C&ancel"
 msgstr ""
 
-#: koeditorrecurrence.cpp:761
-msgid "Date after which the event or to-do should stop recurring"
+#: actionmanager.cpp:1705
+msgid "Removing attachments from an email might invalidate its signature."
 msgstr ""
 
-#: koeditorrecurrence.cpp:825
-#, c-format
-msgid "Begins on: %1"
-msgstr "ਸ਼ੁਰੂ: %1"
+#: actionmanager.cpp:1706
+#, fuzzy
+msgid "Remove Attachments"
+msgstr "ਨੱਥੀ"
 
-#: koeditorrecurrence.cpp:833
-msgid "Edit Recurrence Range"
-msgstr "ਆਵਰਤੀ ਸੀਮਾ ਸੋਧ"
+#: actionmanager.cpp:1895
+msgid "Undo (%1)"
+msgstr "ਵਾਪਿਸ (%1)"
 
-#: koeditorrecurrence.cpp:880
-msgid "Sets the type of recurrence this event or to-do should have."
+#: actionmanager.cpp:1907
+msgid "Redo (%1)"
+msgstr "ਮੁੜ ਵਾਪਿਸ(%1)"
+
+#: actionmanager.cpp:1919
+msgid ""
+"The calendar contains unsaved changes. Do you want to save them before exiting?"
 msgstr ""
 
-#: koeditorrecurrence.cpp:882
-msgid "Daily"
-msgstr "ਰੋਜ਼"
+#: actionmanager.cpp:1924
+msgid "Unable to save the calendar. Do you still want to close this window?"
+msgstr ""
 
-#: koeditorrecurrence.cpp:883
-msgid "Weekly"
-msgstr "ਹਫਤਾਵਾਰੀ"
+#: actionmanager.cpp:1945
+msgid "Unable to exit. Saving still in progress."
+msgstr ""
 
-#: koeditorrecurrence.cpp:884
-msgid "Monthly"
-msgstr "ਮਹੀਨਾਵਾਰੀ"
+#: actionmanager.cpp:1984
+msgid ""
+"Saving of '%1' failed. Check that the resource is properly configured.\n"
+"Ignore problem and continue without saving or cancel save?"
+msgstr ""
 
-#: koeditorrecurrence.cpp:885
-msgid "Yearly"
-msgstr "ਸਾਲਨਾ"
+#: actionmanager.cpp:1987
+msgid "Save Error"
+msgstr "ਸੰਭਾਲਣ ਗਲਤੀ"
 
-#: koeditorrecurrence.cpp:897
-msgid "&Daily"
-msgstr "ਰੋਜ਼(&D)"
+#: actionmanager.cpp:2009
+msgid "URL '%1' is invalid."
+msgstr "URL '%1' ਠੀਕ ਨਹੀਂ ਹੈ।"
 
-#: koeditorrecurrence.cpp:899
-msgid ""
-"Sets the event or to-do to recur daily according to the specified rules."
+#: actionmanager.cpp:2025
+#, fuzzy
+msgid "Unable to open the calendar"
+msgstr "'%1' ਕੈਲੰਡਰ ਸਰੋਤ ਬਣਾਉਣ ਲਈ ਅਸਫ਼ਲ ਹੈ।"
+
+#: archivedialog.cpp:55
+msgid "Archive/Delete Past Events and To-dos"
 msgstr ""
 
-#: koeditorrecurrence.cpp:901
-msgid "&Weekly"
-msgstr "ਹਫਤਾਵਾਰੀ(&W)"
+#: archivedialog.cpp:57
+msgid "&Archive"
+msgstr ""
 
-#: koeditorrecurrence.cpp:903
+#: archivedialog.cpp:66
 msgid ""
-"Sets the event or to-do to recur weekly according to the specified rules."
+"Archiving saves old items into the given file and then deletes them in the "
+"current calendar. If the archive file already exists they will be added. (<a "
+"href=\"whatsthis:In order to add an archive to your calendar, use the "
+"&quot;Merge Calendar&quot; function. You can view an archive by opening it in "
+"KOrganizer like any other calendar. It is not saved in a special format, but as "
+"vCalendar.\">How to restore</a>)"
 msgstr ""
 
-#: koeditorrecurrence.cpp:905
-msgid "&Monthly"
-msgstr "ਮਹੀਨਾਵਾਰੀ(&M)"
+#: archivedialog.cpp:82
+msgid "Archive now items older than:"
+msgstr ""
 
-#: koeditorrecurrence.cpp:907
+#: archivedialog.cpp:87
 msgid ""
-"Sets the event or to-do to recur monthly according to the specified rules."
+"The date before which items should be archived. All older events and to-dos "
+"will be saved and deleted, the newer (and events exactly on that date) will be "
+"kept."
 msgstr ""
 
-#: koeditorrecurrence.cpp:909
-msgid "&Yearly"
-msgstr "ਸਾਲਨਾ(&Y)"
+#: archivedialog.cpp:96
+msgid "Automaticall&y archive items older than:"
+msgstr ""
 
-#: koeditorrecurrence.cpp:911
+#: archivedialog.cpp:99
 msgid ""
-"Sets the event or to-do to recur yearly according to the specified rules."
+"If this feature is enabled, KOrganizer will regularly check if events and "
+"to-dos have to be archived; this means you will not need to use this dialog box "
+"again, except to change the settings."
 msgstr ""
 
-#: koeditorrecurrence.cpp:973
-msgid "&Enable recurrence"
-msgstr "ਆਵਰਤੀ ਯੋਗ(&E)"
-
-#: koeditorrecurrence.cpp:975
+#: archivedialog.cpp:107
 msgid ""
-"Enables recurrence for this event or to-do according to the specified rules."
+"The age of the events and to-dos to archive. All older items will be saved and "
+"deleted, the newer will be kept."
 msgstr ""
 
-#: koeditorrecurrence.cpp:982
-msgid "Appointment Time "
-msgstr "ਮੁਲਾਕਾਤ ਸਮਾਂ"
+#: archivedialog.cpp:112
+msgid "Day(s)"
+msgstr "ਦਿਨ"
 
-#: koeditorrecurrence.cpp:985
-msgid "Displays appointment time information."
-msgstr "ਮੁਲਾਕਾਤ ਸਮਾਂ ਜਾਣਕਾਰੀ ਵੇਖਾਓ।"
+#: archivedialog.cpp:113
+msgid "Week(s)"
+msgstr "ਹਫਤੇ"
 
-#: koeditorrecurrence.cpp:1004
-msgid "Recurrence Rule"
-msgstr "ਆਵਰਤੀ ਨਿਯਮ"
+#: archivedialog.cpp:114
+msgid "Month(s)"
+msgstr "ਮਹੀਨੇ"
 
-#: koeditorrecurrence.cpp:1006
-msgid ""
-"Options concerning the type of recurrence this event or to-do should have."
+#: archivedialog.cpp:119
+msgid "Archive &file:"
 msgstr ""
 
-#: koeditorrecurrence.cpp:1043
-msgid "Recurrence Range..."
-msgstr "ਆਵਰਤੀ ਸੀਮਾ..."
+#: archivedialog.cpp:123
+msgid "*.ics|iCalendar Files"
+msgstr "*.ics|i ਕੈਲੰਡਰ ਫਾਇਲਾਂ"
 
-#: koeditorrecurrence.cpp:1046 koeditorrecurrence.cpp:1063
+#: archivedialog.cpp:125
 msgid ""
-"Options concerning the time range during which this event or to-do should "
-"recur."
+"The path of the archive. The events and to-dos will be added to the archive "
+"file, so any events that are already in the file will not be modified or "
+"deleted. You can later load or merge the file like any other calendar. It is "
+"not saved in a special format, it uses the iCalendar format. "
 msgstr ""
 
-#: koeditorrecurrence.cpp:1055
-msgid "Exceptions..."
-msgstr "ਅਪਵਾਦ..."
+#: archivedialog.cpp:134
+msgid "Type of Items to Archive"
+msgstr "ਪੁਰਾਲੇਖ ਬਣਾਉਣ ਲਈ ਇਕਾਈਆਂ ਦੀ ਕਿਸਮ"
+
+#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 141
+#: archivedialog.cpp:136 rc.cpp:990 searchdialog.cpp:72
+#, no-c-format
+msgid "&Events"
+msgstr "ਘਟਨਾ(&E)"
+
+#: archivedialog.cpp:137
+#, fuzzy
+msgid "Completed &To-dos"
+msgstr "ਕੰਮ-ਕਾਰ ਹਟਾਓ"
 
-#: koeditorrecurrence.cpp:1395
+#: archivedialog.cpp:139
 msgid ""
-"The end date '%1' of the recurrence must be after the start date '%2' of the "
-"event."
+"Here you can select which items should be archived. Events are archived if they "
+"ended before the date given above; to-dos are archived if they were finished "
+"before the date."
 msgstr ""
 
-#: koeditorrecurrence.cpp:1409
+#: archivedialog.cpp:144
+msgid "&Delete only, do not save"
+msgstr "ਸਿਰਫ ਹਟਾਉ, ਸੰਭਾਲੋ ਨਾ"
+
+#: archivedialog.cpp:147
 msgid ""
-"A weekly recurring event or task has to have at least one weekday associated "
-"with it."
+"Select this option to delete old events and to-dos without saving them. It is "
+"not possible to recover the events later."
 msgstr ""
 
-#: koeditorrecurrence.cpp:1443
-#, fuzzy
-msgid "Recurrence"
-msgstr "ਆਵਰਤੀ"
+#: archivedialog.cpp:211
+msgid ""
+"The archive file name is not valid.\n"
+msgstr ""
+"ਪੁਰਾਲੇਖ ਫਾਇਲ ਨਹੀਂ ਦਿੱਤਾ ਗਿਆ ਹੈ।\n"
 
-#: koincidenceeditor.cpp:73
-msgid "&Templates..."
-msgstr "ਨਮੂਨੇ(&T)..."
+#: koagendaview.cpp:320 koagendaview.cpp:815 multiagendaview.cpp:62
+msgid "All Day"
+msgstr "ਸਭ ਦਿਨ"
 
-#: koincidenceeditor.cpp:86
-msgid "Atte&ndees"
-msgstr "ਸਰੋਤੇ(&n)"
+#: koeditorgeneralevent.cpp:99 koeditorgeneraltodo.cpp:100
+msgid "Date && Time"
+msgstr "ਮਿਤੀ ਤੇ ਸਮਾਂ"
 
-#: koincidenceeditor.cpp:88
-msgid ""
-"The Attendees tab allows you to Add or Remove Attendees to/from this event or "
-"to-do."
+#: koeditorgeneralevent.cpp:101
+msgid "Sets options related to the date and time of the event or to-do."
 msgstr ""
 
-#: koincidenceeditor.cpp:172
-msgid "Unable to find template '%1'."
-msgstr "'%1' ਨਮੂਨੇ ਨੂੰ ਲੋਡ ਕਰਨ ਵਿੱਚ ਅਸਫਲ ਹੈ।"
+#: koeditorgeneralevent.cpp:111
+msgid "&Start:"
+msgstr "ਸ਼ੁਰੂ:"
 
-#: koincidenceeditor.cpp:177
-msgid "Error loading template file '%1'."
-msgstr ""
+#: koeditorgeneralevent.cpp:121
+msgid "&End:"
+msgstr "ਅੰਤ:"
 
-#: koincidenceeditor.cpp:376 koincidenceeditor.cpp:377
-msgid "Counter proposal"
-msgstr ""
+#: koeditorgeneralevent.cpp:131
+#, fuzzy
+msgid "All-&day"
+msgstr "ਸਭ ਦਿਨ"
 
-#: koeditoralarms.cpp:83
-msgid "Reminder Dialog"
-msgstr "ਯਾਦਪੱਤਰ ਵਾਰਤਾਲਾਪ"
+#: koeditorgeneralevent.cpp:150 koeditorgeneraltodo.cpp:157
+#, fuzzy
+msgid "Recurrence:"
+msgstr "ਆਵਰਤੀ"
 
-#. i18n: file koeditoralarms_base.ui line 271
-#: koeditoralarms.cpp:86 rc.cpp:220 rc.cpp:1934
-#, no-c-format
-msgid "Program"
-msgstr "ਕਾਰਜ"
+#: koeditorgeneralevent.cpp:162 koeditorgeneraltodo.cpp:169
+#, fuzzy
+msgid "Reminder:"
+msgstr "ਯਾਦ ਪੱਤਰ"
 
-#: koeditoralarms.cpp:92
-msgid "Audio"
-msgstr "ਆਡੀਓ"
+#: koeditorgeneralevent.cpp:182
+msgid "S&how time as:"
+msgstr "ਸਮਾਂ ਵੇਖਾਓ:"
 
-#: koeditoralarms.cpp:95 koprefsdialog.cpp:175
-msgid "Unknown"
-msgstr "ਅਣਜਾਣ"
+#: koeditorgeneralevent.cpp:183
+msgid "Sets how this time will appear on your Free/Busy information."
+msgstr ""
 
-#: koeditoralarms.cpp:106 printing/calprintdefaultplugins.cpp:310
-msgid ""
-"_: N days/hours/minutes before/after the start/end\n"
-"%1 before the start"
-msgstr "%1 ਤੋਂ ਬਾਅਦ ਸ਼ੁਰੂ"
+#: koeditorgeneralevent.cpp:190
+msgid "Busy"
+msgstr "ਰੁਝਿਆ"
 
-#: koeditoralarms.cpp:109 printing/calprintdefaultplugins.cpp:313
-msgid ""
-"_: N days/hours/minutes before/after the start/end\n"
-"%1 after the start"
-msgstr "%1 ਤੋਂ ਬਾਅਦ ਸ਼ੁਰੂ"
+#: koeditorgeneralevent.cpp:191
+msgid "Free"
+msgstr "ਵਿਹਲਾ"
 
-#: koeditoralarms.cpp:114 printing/calprintdefaultplugins.cpp:318
-msgid ""
-"_: N days/hours/minutes before/after the start/end\n"
-"%1 before the end"
-msgstr "%1 ਖਤਮ ਤੋਂ ਪਹਿਲਾਂ"
+#: koeditorgeneralevent.cpp:205
+msgid "You have not yet definitely responded to this invitation."
+msgstr ""
 
-#: koeditoralarms.cpp:117 printing/calprintdefaultplugins.cpp:321
-msgid ""
-"_: N days/hours/minutes before/after the start/end\n"
-"%1 after the end"
-msgstr "%1 ਦਾ ਬਾਅਦ ਭੇਜੋ"
+#: kocounterdialog.cpp:37 koeditorgeneralevent.cpp:208
+msgid "Accept"
+msgstr "ਸਵੀਕਾਰ"
+
+#: kocounterdialog.cpp:37 koeditorgeneralevent.cpp:212
+msgid "Decline"
+msgstr "ਨਾ-ਮਨਜ਼ੂਰ"
 
-#: koeditoralarms.cpp:126 printing/calprintdefaultplugins.cpp:330
+#: koeditorgeneralevent.cpp:434 koeditorgeneralevent.cpp:448
+#: printing/calprintdefaultplugins.cpp:155
+msgid "Duration: "
+msgstr "ਅੰਤਰਾਲ:"
+
+#: koeditorgeneralevent.cpp:435
 #, c-format
 msgid ""
-"_n: 1 day\n"
-"%n days"
+"_n: 1 Day\n"
+"%n Days"
 msgstr ""
 "1 ਦਿਨ\n"
 "%n ਦਿਨ"
 
-#: koeditoralarms.cpp:129 koeditorgeneralevent.cpp:432
-#: printing/calprintdefaultplugins.cpp:333
+#: koeditoralarms.cpp:173 koeditorgeneralevent.cpp:450
+#: printing/calprintdefaultplugins.cpp:352
 #, c-format
 msgid ""
 "_n: 1 hour\n"
@@ -827,8 +2127,12 @@ msgstr ""
 "1 ਘੰਟਾ\n"
 "%n ਘੰਟੇ"
 
-#: koeditoralarms.cpp:132 koeditorgeneralevent.cpp:439
-#: printing/calprintdefaultplugins.cpp:336
+#: koeditorgeneralevent.cpp:454
+msgid ", "
+msgstr ", "
+
+#: koeditoralarms.cpp:176 koeditorgeneralevent.cpp:457
+#: printing/calprintdefaultplugins.cpp:355
 #, c-format
 msgid ""
 "_n: 1 minute\n"
@@ -837,81 +2141,48 @@ msgstr ""
 "1 ਮਿੰਟ\n"
 "%n ਮਿੰਟ"
 
-#: koeditoralarms.cpp:148
-msgid "Edit Reminders"
-msgstr "ਯਾਦ ਪੱਤਰ ਸੋਧ"
-
-#: koagendaitem.cpp:560
-msgid "Attendee \"%1\" added to the calendar item \"%2\""
-msgstr ""
-
-#: koagendaitem.cpp:560
-#, fuzzy
-msgid "Attendee added"
-msgstr "ਦਰਸ਼ਕ ਹਟਾਏ ਗਏ"
-
-#: koagendaitem.cpp:819 koagendaitem.cpp:917
-msgid "%1 - %2"
-msgstr "%1 - %2"
-
-#: koagendaitem.cpp:828
-#, c-format
-msgid "- %1"
-msgstr "- %1"
-
-#: incidencechanger.cpp:61
+#: koeditorgeneralevent.cpp:465
 msgid ""
-"Some attendees were removed from the incidence. Shall cancel messages be sent "
-"to these attendees?"
+"Shows the duration of the event or to-do with the current start and end dates "
+"and times."
 msgstr ""
 
-#: incidencechanger.cpp:63
-msgid "Attendees Removed"
-msgstr "ਦਰਸ਼ਕ ਹਟਾਏ ਗਏ"
+#: koeditorgeneralevent.cpp:482
+msgid "From: %1   To: %2   %3"
+msgstr "ਵਲੋਂ: %1   ਵੱਲ: %2   %3"
 
-#: incidencechanger.cpp:63
-msgid "Send Messages"
-msgstr "ਸੁਨੇਹੇ ਭੇਜੋ"
+#: koeditorgeneralevent.cpp:495
+msgid "Please specify a valid start time, for example '%1'."
+msgstr "ਕਿਰਪਾ ਕਰਕੇ ਇੱਕ ਜਾਇਜ ਸ਼ੁਰੂ ਸਮਾਂ ਦਿਓ, ਉਦਾਹਰਨ ਲਈ '%1'"
 
-#: incidencechanger.cpp:63 kogroupware.cpp:279 kogroupware.cpp:291
-#: kogroupware.cpp:299
-msgid "Do Not Send"
-msgstr "ਨਾ ਭੇਜੋ"
+#: koeditorgeneralevent.cpp:502
+msgid "Please specify a valid end time, for example '%1'."
+msgstr "ਕਿਰਪਾ ਕਰਕੇ ਇੱਕ ਜਾਇਜ ਅੰਤ ਸਮਾਂ ਦਿਓ, ਉਦਾਹਰਨ ਲਈ '%1'"
 
-#: incidencechanger.cpp:344 kodialogmanager.cpp:113
-msgid "Unable to save %1 \"%2\"."
-msgstr "%1 \"%2\" ਨੂੰ ਸੰਭਾਲਣ ਵਿੱਚ ਅਸਫਲ ਹੈ।"
+#: koeditorgeneralevent.cpp:510
+msgid "Please specify a valid start date, for example '%1'."
+msgstr "ਕਿਰਪਾ ਕਰਕੇ ਇੱਕ ਜਾਇਜ ਸ਼ੁਰੂ ਮਿਤੀ ਦਿਓ, ਉਦਾਹਰਨ ਲਈ '%1'"
 
-#: importdialog.cpp:41
-msgid "Import Calendar"
-msgstr "ਕੈਲੰਡਰ ਆਯਾਤ"
+#: koeditorgeneralevent.cpp:517
+msgid "Please specify a valid end date, for example '%1'."
+msgstr "ਕਿਰਪਾ ਕਰਕੇ ਇੱਕ ਜਾਇਜ ਅੰਤ ਮਿਤੀ ਦਿਓ, ਉਦਾਹਰਨ ਲਈ '%1"
 
-#: importdialog.cpp:48
-msgid "Import calendar at '%1' into KOrganizer."
+#: koeditorgeneralevent.cpp:533
+msgid ""
+"The event ends before it starts.\n"
+"Please correct dates and times."
 msgstr ""
 
-#: importdialog.cpp:57
-msgid "Add as new calendar"
-msgstr "ਨਵੇਂ ਕੈਲੰਡਰ ਵਾਂਗ ਸ਼ਾਮਿਲ"
-
-#: importdialog.cpp:59
-msgid "Merge into existing calendar"
-msgstr "ਮੌਜੂਦਾ ਕੈਲੰਡਰ ਵਿੱਚ ਮਿਲਾਨ"
-
-#: importdialog.cpp:62
-msgid "Open in separate window"
-msgstr "ਵੱਖਰੇ ਝਰੋਖੇ ਵਿੱਚ ਖੋਲੋ"
-
-#: koprefsdialog.cpp:99
+#: koprefsdialog.cpp:103
 msgid "Saving Calendar"
 msgstr "ਕੈਲੰਡਰ ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: koprefsdialog.cpp:161
+#: koprefsdialog.cpp:165
 msgid "Timezone:"
 msgstr "ਸਮਾਂ ਖੇਤਰ:"
 
 #. i18n: file korganizer.kcfg line 135
-#: koprefsdialog.cpp:162 rc.cpp:567 rc.cpp:1154
+#: koprefsdialog.cpp:166 rc.cpp:570 rc.cpp:1200
 #, no-c-format
 msgid ""
 "Select your timezone from the list of locations on this drop down box. If your "
@@ -919,145 +2190,161 @@ msgid ""
 "automatically adjust for daylight savings."
 msgstr ""
 
-#: koprefsdialog.cpp:206
+#: koeditoralarms.cpp:125 koeditorattachments.cpp:198 koprefsdialog.cpp:179
+msgid "Unknown"
+msgstr "ਅਣਜਾਣ"
+
+#: koprefsdialog.cpp:210
 msgid "[No selection]"
 msgstr "[ ਕੋਈ ਚੋਣ ਨਹੀਂ]"
 
 #. i18n: file korganizer.kcfg line 138
-#: koprefsdialog.cpp:255 rc.cpp:570 rc.cpp:1157
+#: koprefsdialog.cpp:259 rc.cpp:573 rc.cpp:1203
 #, no-c-format
 msgid "Use holiday region:"
 msgstr "ਛੁੱਟੀ ਸਮਾਂ ਵਰਤੋਂ:"
 
 #. i18n: file korganizer.kcfg line 139
-#: koprefsdialog.cpp:256 rc.cpp:573 rc.cpp:1160
+#: koprefsdialog.cpp:260 rc.cpp:576 rc.cpp:1206
 #, no-c-format
 msgid ""
 "Select from which region you want to use the holidays here. Defined holidays "
 "are shown as non-working days in the date navigator, the agenda view, etc."
 msgstr ""
 
-#: koprefsdialog.cpp:292
+#: koprefsdialog.cpp:296
 msgid "(None)"
 msgstr "(ਕੁਝ ਨਹੀਂ)"
 
-#: koprefsdialog.cpp:319
-msgid "1 minute"
-msgstr "1 ਮਿੰਟ"
+#: koprefsdialog.cpp:323
+#, fuzzy
+msgid "Reminders"
+msgstr "ਯਾਦ ਪੱਤਰ"
 
-#: koprefsdialog.cpp:319
-msgid "5 minutes"
-msgstr "5 ਮਿੰਟ"
+#: koprefsdialog.cpp:328
+msgid "Default reminder time:"
+msgstr "ਮੂਲ ਯਾਦ ਪੱਤਰ ਸਮਾਂ:"
 
-#: koprefsdialog.cpp:320
-msgid "10 minutes"
-msgstr "10 ਮਿੰਟ"
+#. i18n: file koeditoralarms_base.ui line 66
+#: koeditorgeneral.cpp:232 koprefsdialog.cpp:335 korgac/alarmdialog.cpp:157
+#: rc.cpp:172 rc.cpp:2069
+#, no-c-format
+msgid "minute(s)"
+msgstr "ਮਿੰਟ"
 
-#: koprefsdialog.cpp:320
-msgid "15 minutes"
-msgstr "15 ਮਿੰਟ"
+#. i18n: file koeditoralarms_base.ui line 71
+#: koeditorgeneral.cpp:233 koprefsdialog.cpp:336 korgac/alarmdialog.cpp:158
+#: rc.cpp:175 rc.cpp:2072
+#, no-c-format
+msgid "hour(s)"
+msgstr "ਘੰਟੇ"
 
-#: koprefsdialog.cpp:321
-msgid "30 minutes"
-msgstr "30 ਮਿੰਟ"
+#. i18n: file koeditoralarms_base.ui line 76
+#: koeditorgeneral.cpp:234 koeditorrecurrence.cpp:167 koprefsdialog.cpp:337
+#: korgac/alarmdialog.cpp:159 rc.cpp:178 rc.cpp:2075
+#, no-c-format
+msgid "day(s)"
+msgstr "ਦਿਨ"
 
-#: koprefsdialog.cpp:322
-msgid "Default reminder time:"
-msgstr "ਮੂਲ ਯਾਦ ਪੱਤਰ ਸਮਾਂ:"
+#: koprefsdialog.cpp:349
+msgid ""
+"*.ogg *.wav *.mp3 *.wma *.flac *.aiff *.raw *.au *.ra|Audio Files (*.ogg *.wav "
+"*.mp3 *.wma *.flac *.aiff *.raw *.au *.ra)"
+msgstr ""
 
-#: koprefsdialog.cpp:325 koprefsdialog.cpp:328
-msgid "Enter the default reminder time here."
+#: koprefsdialog.cpp:363
+msgid "Enable reminders by default:"
 msgstr ""
 
-#: koprefsdialog.cpp:336
+#: koprefsdialog.cpp:371
 msgid "Working Hours"
 msgstr "ਕਾਰਜਕਾਰੀ ਘੰਟੇ"
 
-#: koprefsdialog.cpp:352
+#: koprefsdialog.cpp:387
 msgid ""
 "Check this box to make KOrganizer mark the working hours for this day of the "
 "week. If this is a work day for you, check this box, or the working hours will "
 "not be marked with color."
 msgstr ""
 
-#: koprefsdialog.cpp:473
+#: koprefsdialog.cpp:514
 msgid "Date Navigator"
 msgstr "ਮਿਤੀ ਬਕਸਾ"
 
-#: koprefsdialog.cpp:482
+#: koprefsdialog.cpp:524
 msgid "Agenda View"
 msgstr "ਕਾਰਜ-ਸੂਚੀ ਦਰਿਸ਼"
 
-#: koprefsdialog.cpp:488
+#: koprefsdialog.cpp:530
 msgid ""
 "_: suffix in the hour size spin box\n"
 " pixel"
 msgstr " ਪਿਕਸਲ"
 
-#: koprefsdialog.cpp:495
+#: koprefsdialog.cpp:537
 msgid ""
 "_: suffix in the N days spin box\n"
 " days"
 msgstr " ਦਿਨ"
 
-#: koprefsdialog.cpp:520
+#: koprefsdialog.cpp:558
 msgid "Month View"
 msgstr "ਮਹੀਨਾ ਦਰਿਸ਼"
 
-#: koprefsdialog.cpp:532
+#: koprefsdialog.cpp:568
 msgid "To-do View"
 msgstr "ਕੰਮ-ਕਾਰ ਦਰਿਸ਼"
 
-#: koprefsdialog.cpp:577 koprefsdialog.cpp:585
+#: koprefsdialog.cpp:613 koprefsdialog.cpp:621
 msgid "Event text"
 msgstr "ਘਟਨਾ ਪਾਠ"
 
 #. i18n: file filteredit_base.ui line 193
-#: kolistview.cpp:216 koprefsdialog.cpp:666 kotodoview.cpp:395 rc.cpp:141
-#: rc.cpp:2117
+#: kolistview.cpp:221 koprefsdialog.cpp:703 kotodoview.cpp:394 rc.cpp:141
+#: rc.cpp:2225
 #, no-c-format
 msgid "Categories"
 msgstr "ਵਰਗ"
 
-#: koprefsdialog.cpp:673
+#: koprefsdialog.cpp:711
 msgid ""
 "Select here the event category you want to modify. You can change the selected "
 "category color using the button below."
 msgstr ""
 
-#: koprefsdialog.cpp:680
+#: koprefsdialog.cpp:718
 msgid ""
 "Choose here the color of the event category selected using the combo box above."
 msgstr ""
 
-#: koprefsdialog.cpp:686
+#: koprefsdialog.cpp:724
 msgid "Resources"
 msgstr "ਸਰੋਤ"
 
-#: koprefsdialog.cpp:692
+#: koprefsdialog.cpp:730
 msgid ""
 "Select here resource you want to modify. You can change the selected resource "
 "color using the button below."
 msgstr ""
 
-#: koprefsdialog.cpp:699
+#: koprefsdialog.cpp:737
 msgid ""
 "Choose here the color of the resource selected using the combo box above."
 msgstr ""
 
-#: koprefsdialog.cpp:844
+#: koprefsdialog.cpp:882
 msgid "Scheduler Mail Client"
 msgstr ""
 
-#: koprefsdialog.cpp:847
+#: koprefsdialog.cpp:885
 msgid "Mail client"
 msgstr "ਪੱਤਰ ਕਲਾਂਇਟ"
 
-#: koprefsdialog.cpp:852
+#: koprefsdialog.cpp:890
 msgid "Additional email addresses:"
 msgstr "ਵਾਧੂ ਈ-ਪੱਤਰ ਸਿਰਨਾਵੀਂ:"
 
-#: koprefsdialog.cpp:853
+#: koprefsdialog.cpp:891
 msgid ""
 "Add, edit or remove additional e-mails addresses here. These email addresses "
 "are the ones you have in addition to the one set in personal preferences. If "
@@ -1065,270 +2352,209 @@ msgid ""
 "to list this address here so KOrganizer can recognize it as yours."
 msgstr ""
 
-#: koprefsdialog.cpp:868
+#: koprefsdialog.cpp:906
 msgid "Additional email address:"
 msgstr "ਵਾਧੂ ਈ-ਪੱਤਰ ਸਿਰਨਾਵੇਂ:"
 
-#: koprefsdialog.cpp:869
+#: koprefsdialog.cpp:907
 msgid ""
 "Edit additional e-mails addresses here. To edit an address select it from the "
 "list above or press the \"New\" button below. These email addresses are the "
 "ones you have in addition to the one set in personal preferences."
 msgstr ""
 
-#: koprefsdialog.cpp:881
+#: koprefsdialog.cpp:919
 msgid "New"
 msgstr "ਨਵਾਂ"
 
-#: koprefsdialog.cpp:882
+#: koprefsdialog.cpp:920
 msgid ""
 "Press this button to add a new entry to the additional e-mail addresses list. "
 "Use the edit box above to edit the new entry."
 msgstr ""
 
-#: koprefsdialog.cpp:929 publishdialog.cpp:102
+#: koprefsdialog.cpp:967 publishdialog.cpp:102
 msgid "(EmptyEmail)"
 msgstr "(ਖਾਲੀ ਈ-ਪੱਤਰ)"
 
-#: koprefsdialog.cpp:1080
+#: koprefsdialog.cpp:1123
 msgid "Configure &Plugin..."
 msgstr "ਪਲੱਗਿੰਨ ਸੰਰਚਨਾ(&P)..."
 
-#: koprefsdialog.cpp:1081
+#: koprefsdialog.cpp:1124
 msgid ""
 "This button allows you to configure the plugin that you have selected in the "
 "list above"
 msgstr ""
 
-#: koprefsdialog.cpp:1142
+#: koprefsdialog.cpp:1185
 msgid "Unable to configure this plugin"
 msgstr "ਇਹ ਪਲੱਗਿੰਨ ਸੰਰਚਨਾ ਕਰਨ ਤੋਂ ਆਯੋਗ"
 
-#: history.cpp:185
-#, c-format
-msgid "Delete %1"
-msgstr "   ਹਟਾਓ    %1"
-
-#: history.cpp:214
-#, c-format
-msgid "Add %1"
-msgstr "   ਸ਼ਾਮਿਲ    %1"
-
-#: history.cpp:251
-#, c-format
-msgid "Edit %1"
-msgstr "   ਸੋਧ   %1"
-
-#: freebusymanager.cpp:228
-msgid ""
-"<qt>No URL configured for uploading your free/busy list. Please set it in "
-"KOrganizer's configuration dialog, on the \"Free/Busy\" page. "
-"<br>Contact your system administrator for the exact URL and the account "
-"details.</qt>"
-msgstr ""
-
-#: freebusymanager.cpp:232
-msgid "No Free/Busy Upload URL"
-msgstr ""
-
-#: freebusymanager.cpp:239
-msgid "<qt>The target URL '%1' provided is invalid.</qt>"
-msgstr ""
-
-#: freebusymanager.cpp:240
-msgid "Invalid URL"
-msgstr ""
-
-#: freebusymanager.cpp:330
-msgid ""
-"<qt>The software could not upload your free/busy list to the URL '%1'. There "
-"might be a problem with the access rights, or you specified an incorrect URL. "
-"The system said: <em>%2</em>."
-"<br>Please check the URL or contact your system administrator.</qt>"
-msgstr ""
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "aalam@users.sf.net"
-
-#: koeditorgeneral.cpp:104
-msgid "Owner:"
-msgstr "ਮਾਲਕ:"
-
-#: koeditorgeneral.cpp:108
-msgid "Sets the Title of this event or to-do."
-msgstr ""
-
-#: koeditorgeneral.cpp:109 koeditorgeneraljournal.cpp:63
-msgid "T&itle:"
-msgstr "ਸਿਰਲੇਖ:"
-
-#: koeditorgeneral.cpp:127
-msgid "Sets where the event or to-do will take place."
-msgstr ""
-
-#: koeditorgeneral.cpp:128
-msgid "&Location:"
-msgstr "ਸਥਿਤੀ(&L):"
+#: searchdialog.cpp:49
+msgid "Find Events"
+msgstr "ਘਟਨਾ ਖੋਜ"
 
-#: koeditorgeneral.cpp:144
-msgid ""
-"Allows you to select the categories that this event or to-do belongs to."
-msgstr ""
+#: searchdialog.cpp:50
+msgid "&Find"
+msgstr "ਖੋਜ(&F)"
 
-#: koeditorgeneral.cpp:145
-#, fuzzy
-msgid "Categories:"
-msgstr "ਵਰਗ"
+#: searchdialog.cpp:62
+msgid "&Search for:"
+msgstr "ਖੋਜ ਲਈ:"
 
-#: koeditorgeneral.cpp:154
-#, fuzzy
-msgid "&Select..."
-msgstr "ਸਿਰਨਾਵੀਂ ਚੁਣੋ..."
+#: searchdialog.cpp:70
+msgid "Search For"
+msgstr "ਖੋਜ"
 
-#: koeditorgeneral.cpp:164
-msgid "Acc&ess:"
-msgstr ""
+#: searchdialog.cpp:73
+msgid "To-&dos"
+msgstr "ਕੰਮ-ਕਾਰ(&d)"
 
-#: koeditorgeneral.cpp:165
-msgid ""
-"Sets whether the access to this event or to-do is restricted. Please note that "
-"KOrganizer currently does not use this setting, so the implementation of the "
-"restrictions will depend on the groupware server. This means that events or "
-"to-dos marked as private or confidential may be visible to others."
-msgstr ""
+#: searchdialog.cpp:74
+msgid "&Journal entries"
+msgstr "ਰੋਜ਼ਨਾਮਚਾ ਇੰਦਰਾਜ਼"
 
-#: koeditorgeneral.cpp:186
-msgid ""
-"Sets the description for this event or to-do. This will be displayed in a "
-"reminder if one is set, as well as in a tooltip when you hover over the event."
-msgstr ""
+#: exportwebdialog.cpp:143 searchdialog.cpp:79
+msgid "Date Range"
+msgstr "ਮਿਤੀ ਸੀਮਾ"
 
-#: koeditorgeneral.cpp:210
-msgid "No reminders configured"
-msgstr ""
+#: searchdialog.cpp:87
+msgid "Fr&om:"
+msgstr "ਵੱਲੋਂ:"
 
-#: koeditorgeneral.cpp:216
-msgid "&Reminder:"
-msgstr ""
+#: searchdialog.cpp:91
+msgid "&To:"
+msgstr "ਵੱਲ(&T):"
 
-#: koeditorgeneral.cpp:218
-msgid "Activates a reminder for this event or to-do."
+#: searchdialog.cpp:95
+msgid "E&vents have to be completely included"
 msgstr ""
 
-#: koeditorgeneral.cpp:220
-msgid "Sets how long before the event occurs the reminder will be triggered."
+#: searchdialog.cpp:98
+msgid "Include to-dos &without due date"
 msgstr ""
 
-#. i18n: file koeditoralarms_base.ui line 60
-#: koeditorgeneral.cpp:228 korgac/alarmdialog.cpp:120 rc.cpp:172 rc.cpp:1886
-#, no-c-format
-msgid "minute(s)"
-msgstr "ਮਿੰਟ"
+#: searchdialog.cpp:102
+msgid "Search In"
+msgstr "ਇਸ ਵਿੱਚ ਖੋਜ"
 
-#. i18n: file koeditoralarms_base.ui line 65
-#: koeditorgeneral.cpp:229 korgac/alarmdialog.cpp:121 rc.cpp:175 rc.cpp:1889
-#, no-c-format
-msgid "hour(s)"
-msgstr "ਘੰਟੇ"
+#: searchdialog.cpp:105
+msgid "Su&mmaries"
+msgstr "ਸੰਖੇਪ"
 
-#: koeditorgeneral.cpp:237
-msgid "Advanced"
-msgstr "ਤਕਨੀਕੀ"
+#: searchdialog.cpp:107
+msgid "Desc&riptions"
+msgstr "ਵੇਰਵਾ"
 
-#: koeditorgeneral.cpp:322 koeditorgeneral.cpp:399
-msgid "Owner: "
-msgstr "ਮਾਲਕ: "
+#: searchdialog.cpp:108
+msgid "Cate&gories"
+msgstr "ਵਰਗ"
 
-#: koeditorgeneral.cpp:357
-#, c-format
+#: searchdialog.cpp:149
 msgid ""
-"_n: 1 advanced reminder configured\n"
-"%n advanced reminders configured"
+"Invalid search expression, cannot perform the search. Please enter a search "
+"expression using the wildcard characters '*' and '?' where needed."
 msgstr ""
 
-#: koeditorgeneral.cpp:384
-msgid "1 advanced reminder configured"
+#: searchdialog.cpp:162
+msgid "No events were found matching your search expression."
 msgstr ""
 
-#: koeditorgeneral.cpp:422
-#, fuzzy, c-format
-msgid "Calendar: %1"
-msgstr "ਕੈਲੰਡਰ"
+#: konewstuff.cpp:48
+msgid "Could not load calendar."
+msgstr "ਕੈਲੰਡਰ ਲੋਡ ਨਹੀਂ ਹੋ ਸਕਿਆ ਹੈ।"
 
-#: koeditorgeneral.cpp:496
-#, c-format
-msgid ""
-"_n: One attendee\n"
-"%n attendees"
+#: konewstuff.cpp:63
+msgid "The downloaded events will be merged into your current calendar."
 msgstr ""
 
-#: koeditorgeneralevent.cpp:102 koeditorgeneraltodo.cpp:102
-msgid "Date && Time"
-msgstr "ਮਿਤੀ ਤੇ ਸਮਾਂ"
-
-#: koeditorgeneraltodo.cpp:107
+#: koeditorgeneraltodo.cpp:105
 msgid "Sets options for due and start dates and times for this to-do."
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:114
+#: koeditorgeneraltodo.cpp:112
 msgid "Sets the start date for this to-do"
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:115
+#: koeditorgeneraltodo.cpp:113
 msgid "Sta&rt:"
 msgstr "ਸ਼ੁਰੂ:"
 
-#: koeditorgeneraltodo.cpp:128
+#: koeditorgeneraltodo.cpp:126
 msgid "Sets the start time for this to-do."
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:132
+#: koeditorgeneraltodo.cpp:130
 msgid "Sets the due date for this to-do."
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:133
+#: koeditorgeneraltodo.cpp:131
 msgid "&Due:"
 msgstr "ਬਕਾਇਆ(&D):"
 
-#: koeditorgeneraltodo.cpp:148
+#: koeditorgeneraltodo.cpp:145
 msgid "Sets the due time for this to-do."
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:152
+#: koeditorgeneraltodo.cpp:149
 msgid "Ti&me associated"
 msgstr "ਸੰਬੰਧਿਤ ਸਮਾਂ"
 
-#: koeditorgeneraltodo.cpp:154
+#: koeditorgeneraltodo.cpp:151
 msgid ""
 "Sets whether or not this to-do's start and due dates have times associated with "
 "them."
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:172
-msgid "Sets the current completion status of this to-do as a percentage."
+#: koeditorgeneraltodo.cpp:189
+#, fuzzy
+msgid "&Completed:"
+msgstr "ਮੁਕੰਮਲ"
+
+#: koeditorgeneraltodo.cpp:194
+msgid "Toggle between 0% and 100% complete"
+msgstr ""
+
+#: koeditorgeneraltodo.cpp:196
+#, c-format
+msgid ""
+"Click this checkbox to toggle the completed percentage of the to-do between 0% "
+"or 100%"
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:178
+#: koeditorgeneraltodo.cpp:204
+msgid "Select the completed percentage"
+msgstr ""
+
+#: koeditorgeneraltodo.cpp:206
+msgid "Use this combobox to set the completion percentage of the to-do."
+msgstr ""
+
+#: koeditorgeneraltodo.cpp:209
 #, no-c-format
 msgid ""
 "_: Percent complete\n"
 "%1 %"
 msgstr "%1 %"
 
-#: koeditorgeneraltodo.cpp:184 koeditorgeneraltodo.cpp:544
-msgid "co&mpleted"
+#: koeditorgeneraltodo.cpp:215
+#, fuzzy
+msgid ""
+"_: completed on\n"
+"on"
 msgstr "ਮੁਕੰਮਲ"
 
-#: koeditorgeneraltodo.cpp:197
+#: koeditorgeneraltodo.cpp:230
+msgid "&Priority:"
+msgstr "ਦਰਜਾ(&P):"
+
+#: koeditorgeneraltodo.cpp:235
+#, fuzzy
+msgid "Set the priority of the to-do"
+msgstr "ਇਸ ਰੋਜ਼ਨਾਮਚੇ ਦੇ ਸਿਰਲੇਖ ਦਿੰਦਾ ਹੈ।"
+
+#: koeditorgeneraltodo.cpp:237
 msgid ""
 "Sets the priority of this to-do on a scale from one to nine, with one being the "
 "highest priority, five being a medium priority, and nine being the lowest. In "
@@ -1336,908 +2562,895 @@ msgid ""
 "appropriate scale."
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:203
-msgid "&Priority:"
-msgstr "ਦਰਜਾ(&P):"
-
-#: koeditorgeneraltodo.cpp:207
+#: koeditorgeneraltodo.cpp:241
 msgid "unspecified"
 msgstr "ਨਾ-ਨਿਰਧਾਰਿਤ"
 
-#: koeditorgeneraltodo.cpp:208 kotodoview.cpp:417
+#: koeditorgeneraltodo.cpp:242 kotodoview.cpp:418
 msgid "1 (highest)"
 msgstr "1 (ਉੱਚ)"
 
-#: koeditorgeneraltodo.cpp:209 kotodoview.cpp:418
+#: koeditorgeneraltodo.cpp:243 kotodoview.cpp:419
 msgid "2"
 msgstr "2"
 
-#: koeditorgeneraltodo.cpp:210 kotodoview.cpp:419
+#: koeditorgeneraltodo.cpp:244 kotodoview.cpp:420
 msgid "3"
 msgstr "3"
 
-#: koeditorgeneraltodo.cpp:211 kotodoview.cpp:420
+#: koeditorgeneraltodo.cpp:245 kotodoview.cpp:421
 msgid "4"
 msgstr "4"
 
-#: koeditorgeneraltodo.cpp:212 kotodoview.cpp:421
+#: koeditorgeneraltodo.cpp:246 kotodoview.cpp:422
 msgid "5 (medium)"
 msgstr "5 (ਮੱਧਮ)"
 
-#: koeditorgeneraltodo.cpp:213 kotodoview.cpp:422
+#: koeditorgeneraltodo.cpp:247 kotodoview.cpp:423
 msgid "6"
 msgstr "6"
 
-#: koeditorgeneraltodo.cpp:214 kotodoview.cpp:423
+#: koeditorgeneraltodo.cpp:248 kotodoview.cpp:424
 msgid "7"
 msgstr "7"
 
-#: koeditorgeneraltodo.cpp:215 kotodoview.cpp:424
+#: koeditorgeneraltodo.cpp:249 kotodoview.cpp:425
 msgid "8"
 msgstr "8"
 
-#: koeditorgeneraltodo.cpp:216 kotodoview.cpp:425
+#: koeditorgeneraltodo.cpp:250 kotodoview.cpp:426
 msgid "9 (lowest)"
 msgstr "9 (ਨਿਊਨਤਮ)"
 
-#: koeditorgeneraltodo.cpp:451
+#: koeditorgeneraltodo.cpp:492
 msgid "Please specify a valid due date."
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:456
+#: koeditorgeneraltodo.cpp:497
 msgid "Please specify a valid due time."
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:464
+#: koeditorgeneraltodo.cpp:505
 msgid "Please specify a valid start date."
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:469
+#: koeditorgeneraltodo.cpp:510
 msgid "Please specify a valid start time."
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:486
+#: koeditorgeneraltodo.cpp:527
 msgid "The start date cannot be after the due date."
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:508
+#: koeditorgeneraltodo.cpp:572
 #, c-format
 msgid "Start: %1"
 msgstr "ਸ਼ੁਰੂ: %1"
 
-#: koeditorgeneraltodo.cpp:516
+#: koeditorgeneraltodo.cpp:580
 #, c-format
 msgid "   Due: %1"
 msgstr "   ਬਕਾਇਆ: %1"
 
-#: koeditorgeneraltodo.cpp:537
-msgid "co&mpleted on"
-msgstr "ਮੁਕੰਮਲ"
+#: exportwebdialog.cpp:73
+msgid "Export Calendar as Web Page"
+msgstr "ਕੈਲੰਡਰ ਨੂੰ ਵੈੱਬ ਸਫ਼ੇ ਦੇ ਤੌਰ ਤੇ ਨਿਰਯਾਤ"
 
-#: kogroupware.cpp:168
-#, c-format
-msgid "Error message: %1"
+#: exportwebdialog.cpp:131
+msgid ""
+"You are about to set all preferences to default values. All custom "
+"modifications will be lost."
 msgstr ""
+"ਤੁਸੀਂ ਸਭ ਪਸੰਦਾਂ ਨੂੰ ਮੂਲ ਬਣਾਉਣ ਜਾ ਰਹੇ ਹੋ। ਸਭ ਕੀਤੀਆਂ ਸੋਧਾਂ ਹਟਾ ਦਿੱਤੀਆਂ ਜਾਣਗੀਆਂ।"
 
-#: kogroupware.cpp:172
-msgid "Error while processing an invitation or update."
-msgstr ""
+#: exportwebdialog.cpp:132
+msgid "Setting Default Preferences"
+msgstr "ਮੂਲ ਪਸੰਦ ਸਥਾਪਨ"
 
-#: kogroupware.cpp:271
-msgid "event"
-msgstr "ਘਟਨਾ"
+#: exportwebdialog.cpp:133
+msgid "Reset to Defaults"
+msgstr "ਮੂਲ ਪਰਾਪਤ ਕਰੋ"
 
-#: kogroupware.cpp:272
-msgid "task"
-msgstr "ਕੰਮ"
+#: exportwebdialog.cpp:140 koeventeditor.cpp:122 kojournaleditor.cpp:76
+#: kotodoeditor.cpp:100
+msgid "General"
+msgstr "ਸਧਾਰਨ"
 
-#: kogroupware.cpp:273
-msgid "journal entry"
-msgstr "ਰੋਜ਼ਨਾਮਚਾ ਇੰਦਰਾਜ਼"
+#: exportwebdialog.cpp:148
+msgid "View Type"
+msgstr "ਦਰਿਸ਼ ਕਿਸਮ"
 
-#: kogroupware.cpp:275
+#: exportwebdialog.cpp:161
+msgid "Destination"
+msgstr "ਨਿਯਤ"
+
+#: exportwebdialog.cpp:178
+msgid "To-dos"
+msgstr "ਕੰਮ-ਕਾਰ"
+
+#: exportwebdialog.cpp:199
+msgid "Events"
+msgstr "ਘਟਨਾ"
+
+#: datenavigatorcontainer.cpp:52
 msgid ""
-"This %1 includes other people. Should email be sent out to the attendees?"
+"<qt>"
+"<p>Select the dates you want to display in KOrganizer's main view here. Hold "
+"down the mouse button to select more than one day.</p>"
+"<p>Press the top buttons to browse to the next / previous months or years.</p>"
+"<p>Each line shows a week. The number in the left column is the number of the "
+"week in the year. Press it to select the whole week.</p></qt>"
 msgstr ""
 
-#: kogroupware.cpp:279
-msgid "Group Scheduling Email"
-msgstr ""
+#: journalentry.cpp:92
+msgid "[Add Journal Entry]"
+msgstr "[ਰੋਜ਼ਨਾਮਚਾ ਇੰਦਰਾਜ਼ ਸ਼ਾਮਲ]"
 
-#: kogroupware.cpp:279
-msgid "Send Email"
-msgstr "ਈ-ਪੱਤਰ ਭੇਜੋ"
+#: journalentry.cpp:191
+msgid "Sets the Title of this journal entry."
+msgstr "ਇਸ ਰੋਜ਼ਨਾਮਚੇ ਦਾ ਸਿਰਲੇਖ ਦਿਓ।"
 
-#: kogroupware.cpp:289
-msgid "Do you want to send a status update to the organizer of this task?"
-msgstr ""
+#: journalentry.cpp:193
+msgid "&Title: "
+msgstr "ਸਿਰਲੇਖ(&T):"
 
-#: kogroupware.cpp:291 kogroupware.cpp:299
-msgid "Send Update"
-msgstr "ਅੱਪਡੇਟ ਭੇਜੋ"
+#: journalentry.cpp:202
+msgid "Ti&me: "
+msgstr "ਸਮਾਂ(&m):"
 
-#: kogroupware.cpp:295
-msgid ""
-"Your status as an attendee of this event changed. Do you want to send a status "
-"update to the organizer of this event?"
+#: journalentry.cpp:208
+msgid "Determines whether this journal entry has a time associated with it"
 msgstr ""
 
-#: kogroupware.cpp:302
-msgid ""
-"You are not the organizer of this event. Deleting it will bring your calendar "
-"out of sync with the organizers calendar. Do you really want to delete it?"
+#: journalentry.cpp:210
+msgid "Sets the time associated with this journal entry"
 msgstr ""
 
-#: kogroupware.cpp:307
-msgid ""
-"You are not the organizer of this event. Editing it will bring your calendar "
-"out of sync with the organizers calendar. Do you really want to edit it?"
-msgstr ""
+#: journalentry.cpp:217 journalentry.cpp:218
+msgid "Delete this journal entry"
+msgstr "ਇਹ ਰੋਜ਼ਨਾਮਚਾ ਇੰਦਰਾਜ਼ ਹਟਾਓ"
 
-#: kogroupware.cpp:323
-msgid "<No summary given>"
-msgstr "<ਕੋਈ ਜਾਣਕਾਰੀ ਨਹੀਂ>"
+#: journalentry.cpp:225
+msgid "Edit this journal entry"
+msgstr "ਇਹ ਰੋਜ਼ਨਾਮਚਾ ਇੰਦਰਾਜ਼ ਸੋਧ"
 
-#: kogroupware.cpp:342 mailscheduler.cpp:89
-#, c-format
-msgid "Counter proposal: %1"
+#: journalentry.cpp:226
+msgid "Opens an editor dialog for this journal entry"
 msgstr ""
 
-#: kogroupware.cpp:344
-msgid "Proposed new meeting time: %1 - %2"
-msgstr ""
+#: journalentry.cpp:234
+#, fuzzy
+msgid "Print this journal entry"
+msgstr "ਇਹ ਰੋਜ਼ਨਾਮਚਾ ਇੰਦਰਾਜ਼ ਸੋਧ"
 
-#: publishdialog.cpp:43
-msgid "Select Addresses"
-msgstr "ਸਿਰਨਾਵੀਂ ਚੁਣੋ"
+#: journalentry.cpp:235
+#, fuzzy
+msgid "Opens the print dialog for this journal entry"
+msgstr "ਇਸ ਰੋਜ਼ਨਾਮਚੇ ਦਾ ਸਿਰਲੇਖ ਦਿਓ।"
 
-#: publishdialog.cpp:101
-msgid "(EmptyName)"
-msgstr "(ਖਾਲੀ ਨਾਂ)"
+#: koeditoralarms.cpp:113
+msgid "Reminder Dialog"
+msgstr "ਯਾਦਪੱਤਰ ਵਾਰਤਾਲਾਪ"
 
-#: kocorehelper.cpp:43 kodaymatrix.cpp:283 komonthview.cpp:913
-msgid ""
-"_: delimiter for joining holiday names\n"
-", "
-msgstr ""
+#. i18n: file koeditoralarms_base.ui line 277
+#: koeditoralarms.cpp:116 rc.cpp:220 rc.cpp:2117
+#, no-c-format
+msgid "Program"
+msgstr "ਕਾਰਜ"
 
-#: kolistview.cpp:205 korgac/alarmdialog.cpp:97 kotodoview.cpp:387
-#: plugins/timespanview/timespanwidget.cpp:51
-#: printing/calprintdefaultplugins.cpp:1003
-#: printing/calprintdefaultplugins.cpp:1085
-msgid "Summary"
-msgstr "ਸੰਖੇਪ"
+#: koeditoralarms.cpp:122
+msgid "Audio"
+msgstr "ਆਡੀਓ"
 
-#: kolistview.cpp:206 korgac/alarmdialog.cpp:81
-msgid "Reminder"
-msgstr "ਯਾਦ ਪੱਤਰ"
+#: koeditoralarms.cpp:137 printing/calprintdefaultplugins.cpp:329
+msgid ""
+"_: N days/hours/minutes before/after the start/end\n"
+"%1 before the start"
+msgstr "%1 ਤੋਂ ਬਾਅਦ ਸ਼ੁਰੂ"
 
-#: kolistview.cpp:207 kotodoview.cpp:388
-msgid "Recurs"
-msgstr "ਦੁਹਰਾਉ"
+#: koeditoralarms.cpp:141 printing/calprintdefaultplugins.cpp:332
+msgid ""
+"_: N days/hours/minutes before/after the start/end\n"
+"%1 after the start"
+msgstr "%1 ਤੋਂ ਬਾਅਦ ਸ਼ੁਰੂ"
 
-#: kolistview.cpp:208 printing/calprintdefaultplugins.cpp:1004
-msgid "Start Date"
-msgstr "ਸ਼ੁਰੂ ਮਿਤੀ"
+#: koeditoralarms.cpp:148
+#, fuzzy
+msgid ""
+"_: N days/hours/minutes before/after the due date\n"
+"%1 before the to-do is due"
+msgstr "%1 ਖਤਮ ਤੋਂ ਪਹਿਲਾਂ"
 
-#: kolistview.cpp:210
-msgid "Start Time"
-msgstr "ਸ਼ੁਰੂ ਸਮਾਂ"
+#: koeditoralarms.cpp:151 printing/calprintdefaultplugins.cpp:337
+msgid ""
+"_: N days/hours/minutes before/after the start/end\n"
+"%1 before the end"
+msgstr "%1 ਖਤਮ ਤੋਂ ਪਹਿਲਾਂ"
 
-#: kolistview.cpp:212
-msgid "End Date"
-msgstr "ਅੰਤ ਮਿਤੀ"
+#: koeditoralarms.cpp:157
+#, fuzzy
+msgid ""
+"_: N days/hours/minutes before/after the due date\n"
+"%1 after the to-do is due"
+msgstr "%1 ਦਾ ਬਾਅਦ ਭੇਜੋ"
 
-#: kolistview.cpp:214
-msgid "End Time"
-msgstr "ਅੰਤ ਸਮਾਂ"
+#: koeditoralarms.cpp:160 printing/calprintdefaultplugins.cpp:340
+msgid ""
+"_: N days/hours/minutes before/after the start/end\n"
+"%1 after the end"
+msgstr "%1 ਦਾ ਬਾਅਦ ਭੇਜੋ"
 
-#: eventarchiver.cpp:104
+#: koeditoralarms.cpp:170 printing/calprintdefaultplugins.cpp:349
 #, c-format
-msgid "There are no items before %1"
+msgid ""
+"_n: 1 day\n"
+"%n days"
 msgstr ""
+"1 ਦਿਨ\n"
+"%n ਦਿਨ"
 
-#: eventarchiver.cpp:131
+#: koeditoralarms.cpp:193
+#, fuzzy
+msgid "Advanced Reminders"
+msgstr "ਯਾਦ ਪੱਤਰ ਸੋਧ"
+
+#: koeditoralarms.cpp:204
 msgid ""
-"Delete all items before %1 without saving?\n"
-"The following items will be deleted:"
+"_: Add a new alarm to the alarm list.\n"
+"&Add"
 msgstr ""
 
-#: eventarchiver.cpp:134
-msgid "Delete Old Items"
-msgstr "ਪੁਰਾਣੀ ਘਟਨਾਵਾਂ ਹਟਾਉ"
-
-#: eventarchiver.cpp:202
-#, c-format
-msgid "Cannot write archive file %1."
+#: koeditoralarms.cpp:460
+msgid "before the to-do starts"
 msgstr ""
 
-#: eventarchiver.cpp:211
-msgid "Cannot write archive to final destination."
+#: koeditoralarms.cpp:461
+msgid "after the to-do starts"
 msgstr ""
 
-#: kotodoview.cpp:218
-msgid "Cannot move to-do to itself or a child of itself."
+#: koeditoralarms.cpp:462
+msgid "before the to-do is due"
 msgstr ""
 
-#: kotodoview.cpp:219
-msgid "Drop To-do"
-msgstr "ਕੰਮ-ਕਾਰ ਹਟਾਓ"
+#: koeditoralarms.cpp:463
+msgid "after the to-do is due"
+msgstr ""
 
-#: kotodoview.cpp:231
-msgid "Unable to change to-do's parent, because the to-do cannot be locked."
+#: koeditoralarms.cpp:466
+msgid "Select the reminder trigger relative to the start or due time"
 msgstr ""
 
-#: kotodoview.cpp:279
+#: koeditoralarms.cpp:469
 msgid ""
-"Unable to add attendees to the to-do, because the to-do cannot be locked."
+"Use this combobox to specify if you want the reminder to trigger before or "
+"after the start or due time."
 msgstr ""
 
-#: kotodoview.cpp:369
-msgid "To-dos:"
-msgstr "ਕੰਮ-ਕਾਰ:"
-
-#: kotodoview.cpp:373
-msgid "Click to add a new to-do"
-msgstr "ਨਵਾਂ ਕੰਮ-ਕਾਰ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਦਬਾਉ"
-
-#: kotodoview.cpp:389 printing/calprintdefaultplugins.cpp:1006
-#: printing/calprintdefaultplugins.cpp:1077
-msgid "Priority"
-msgstr "ਦਰਜਾ"
+#: kocorehelper.cpp:47 kodaymatrix.cpp:287 komonthview.cpp:1006
+msgid ""
+"_: delimiter for joining holiday names\n"
+", "
+msgstr ""
 
-#: kotodoview.cpp:391 printing/calprintdefaultplugins.cpp:1092
-msgid "Complete"
-msgstr "ਮੁਕੰਮਲ"
+#: printing/calprintdefaultplugins.cpp:142
+#: printing/calprintdefaultplugins.cpp:171
+#: printing/calprintdefaultplugins.cpp:190
+msgid "Start date: "
+msgstr ""
 
-#: kotodoview.cpp:393
-msgid "Due Date/Time"
+#: printing/calprintdefaultplugins.cpp:146
+#: printing/calprintdefaultplugins.cpp:175
+msgid "No start date"
 msgstr ""
 
-#: kotodoview.cpp:397
-msgid "Sort Id"
-msgstr "ਕ੍ਰਮਬੱਧ Id"
+#: printing/calprintdefaultplugins.cpp:151
+msgid "End date: "
+msgstr ""
 
-#: kotodoview.cpp:416
+#: printing/calprintdefaultplugins.cpp:158
+#, c-format
 msgid ""
-"_: Unspecified priority\n"
-"unspecified"
-msgstr "ਨਾ-ਪ੍ਰਭਾਸ਼ਿਤ"
-
-#: actionmanager.cpp:452 kotodoview.cpp:463
-msgid "New &To-do..."
-msgstr "ਨਵਾਂ ਕੰਮ (&T)..."
-
-#: actionmanager.cpp:456 kotodoview.cpp:465
-msgid "New Su&b-to-do..."
+"_n: 1 hour \n"
+"%n hours "
 msgstr ""
+"1 ਘੰਟਾ \n"
+"%n ਘੰਟੇ "
 
-#: kotodoview.cpp:467
-msgid "&Make this To-do Independent"
+#: printing/calprintdefaultplugins.cpp:161
+#, c-format
+msgid ""
+"_n: 1 minute \n"
+"%n minutes "
 msgstr ""
+"1 ਮਿੰਟ \n"
+"%n ਮਿੰਟ "
 
-#: kotodoview.cpp:469
-msgid "Make all Sub-to-dos &Independent"
+#: printing/calprintdefaultplugins.cpp:164
+msgid "No end date"
 msgstr ""
 
-#: kotodoview.cpp:472
-msgid "&Copy To"
-msgstr "ਨਕਲ(&C)"
+#: printing/calprintdefaultplugins.cpp:180
+msgid "Due date: "
+msgstr ""
 
-#: kotodoview.cpp:473
-msgid "&Move To"
-msgstr "ਭੇਜੋ(&M)"
+#: printing/calprintdefaultplugins.cpp:184
+msgid "No due date"
+msgstr ""
 
-#: kotodoview.cpp:475
+#: printing/calprintdefaultplugins.cpp:298
 msgid ""
-"_: delete completed to-dos\n"
-"Pur&ge Completed"
+"_: except for listed dates\n"
+" except"
 msgstr ""
 
-#: kotodoview.cpp:484
-msgid "&New To-do..."
-msgstr "ਨਵਾਂ ਕੰਮ ਕਾਰ(&N)"
-
-#: kotodoview.cpp:486
-msgid ""
-"_: delete completed to-dos\n"
-"&Purge Completed"
+#: printing/calprintdefaultplugins.cpp:306
+msgid "Repeats: "
 msgstr ""
 
-#: koagendaview.cpp:290 koagendaview.cpp:771 multiagendaview.cpp:58
-msgid "All Day"
-msgstr "ਸਭ ਦਿਨ"
+#: printing/calprintdefaultplugins.cpp:313
+msgid "No reminders"
+msgstr ""
 
-#: koagendaview.cpp:588
+#: printing/calprintdefaultplugins.cpp:316
+#, c-format
 msgid ""
-"_: short_weekday date (e.g. Mon 13)\n"
-"%1 %2"
-msgstr "%1 %2"
+"_n: Reminder: \n"
+"%n reminders: "
+msgstr ""
 
-#: koagendaview.cpp:1402
-msgid "Unable to modify this to-do, because it cannot be locked."
+#: printing/calprintdefaultplugins.cpp:359
+#: printing/calprintdefaultplugins.cpp:604
+msgid ""
+"_: Spacer for the joined list of categories\n"
+", "
 msgstr ""
 
-#: kowhatsnextview.cpp:100
-msgid "What's Next?"
-msgstr "ਅੱਗੇ ਕੀ ਹੈ?"
+#: printing/calprintdefaultplugins.cpp:366
+msgid "Organizer: "
+msgstr ""
 
-#: kowhatsnextview.cpp:107
-msgid ""
-"_: Date from - to\n"
-"%1 - %2"
-msgstr "%1 - %2"
+#: printing/calprintdefaultplugins.cpp:376
+msgid "Location: "
+msgstr "ਟਿਕਾਣਾ: "
 
-#: kowhatsnextview.cpp:123
-msgid "Events:"
-msgstr "ਘਟਨਾਵਾਂ:"
+#: printing/calprintdefaultplugins.cpp:435
+msgid "Description:"
+msgstr "ਵੇਰਵਾ:"
 
-#: kowhatsnextview.cpp:159
-msgid "To-do:"
-msgstr "ਕੰਮ-ਕਾਰ:"
+#: printing/calprintdefaultplugins.cpp:441
+msgid "Notes:"
+msgstr ""
 
-#: kowhatsnextview.cpp:198 kowhatsnextview.cpp:219
-msgid "Events and to-dos that need a reply:"
+#: printing/calprintdefaultplugins.cpp:454
+msgid "No Subitems"
 msgstr ""
 
-#: kowhatsnextview.cpp:282 plugins/printing/year/yearprint.cpp:174
+#: printing/calprintdefaultplugins.cpp:458
+#, fuzzy
 msgid ""
-"_: date from - to\n"
-"%1 - %2"
-msgstr "%1 - %2"
+"_n: 1 Subitem:\n"
+"%1 Subitems:"
+msgstr ""
+"1 ਮਿੰਟ\n"
+"%n ਮਿੰਟ"
 
-#: kowhatsnextview.cpp:287
+#: printing/calprintdefaultplugins.cpp:475
 msgid ""
-"_: date, from - to\n"
-"%1, %2 - %3"
-msgstr "%1, %2 - %3"
-
-#: kowhatsnextview.cpp:315
-msgid "  (Due: %1)"
+"_: no status\n"
+"none"
 msgstr ""
 
-#: kocounterdialog.cpp:36
-msgid "Counter-Event Viewer"
+#: printing/calprintdefaultplugins.cpp:477
+msgid ""
+"_: unknown status\n"
+"unknown"
 msgstr ""
 
-#: kocounterdialog.cpp:37 koeditorgeneralevent.cpp:213
-msgid "Decline"
-msgstr "ਨਾ-ਮਨਜ਼ੂਰ"
-
-#: kocounterdialog.cpp:37 koeditorgeneralevent.cpp:209
-msgid "Accept"
-msgstr "ਸਵੀਕਾਰ"
-
-#: koprefs.cpp:87
+#: printing/calprintdefaultplugins.cpp:484
+#, fuzzy
 msgid ""
-"_: Default export file\n"
-"calendar.html"
-msgstr "calendar.html"
-
-#: koprefs.cpp:163
-msgid "Appointment"
-msgstr "ਮੁਲਾਕਾਤ"
-
-#: koprefs.cpp:163
-msgid "Business"
-msgstr "ਵਪਾਰਿਕ"
-
-#: koprefs.cpp:164
-msgid "Meeting"
-msgstr "ਮੀਟਿੰਗ"
-
-#: koprefs.cpp:164
-msgid "Phone Call"
-msgstr "ਫੋਨ ਕਾਲ"
-
-#: koprefs.cpp:164
-msgid "Education"
-msgstr "ਵਿਦਿਅਕ"
-
-#: koprefs.cpp:165 printing/calprintpluginbase.cpp:279
-msgid "Holiday"
-msgstr "ਛੁੱਟੀ"
-
-#: koprefs.cpp:165
-msgid "Vacation"
-msgstr "ਲੰਮੀ ਛੁੱਟੀ"
-
-#: koprefs.cpp:165
-msgid "Special Occasion"
-msgstr "ਖਾਸ ਮੌਕਾ"
-
-#: koprefs.cpp:166
-msgid "Personal"
-msgstr "ਨਿੱਜੀ"
+"Start Date: %1\n"
+msgstr "ਸ਼ੁਰੂ ਮਿਤੀ"
 
-#: koprefs.cpp:166
-msgid "Travel"
-msgstr "ਯਾਤਰਾ"
+#: printing/calprintdefaultplugins.cpp:489
+#, fuzzy
+msgid ""
+"Start Time: %1\n"
+msgstr "ਸ਼ੁਰੂ ਸਮਾਂ"
 
-#: koprefs.cpp:167
-msgid "Birthday"
-msgstr "ਜਨਮ ਦਿਨ"
+#: printing/calprintdefaultplugins.cpp:496
+#, fuzzy
+msgid ""
+"Due Date: %1\n"
+msgstr "ਮਿਆਦ"
 
-#: calendarview.cpp:262
+#: printing/calprintdefaultplugins.cpp:501
 msgid ""
-"<p><em>No Item Selected</em></p>"
-"<p>Select an event, to-do or journal entry to view its details here.</p>"
+"_: subitem due time\n"
+"Due Time: %1\n"
 msgstr ""
 
-#: calendarview.cpp:268
+#: printing/calprintdefaultplugins.cpp:506
 msgid ""
-"View the details of events, journal entries or to-dos selected in KOrganizer's "
-"main view here."
+"_n: subitem counter\n"
+"%1: "
 msgstr ""
 
-#: calendarview.cpp:421
-msgid "Could not load calendar '%1'."
+#: printing/calprintdefaultplugins.cpp:514
+msgid ""
+"_: subitem Status: statusString\n"
+"Status: %1\n"
 msgstr ""
 
-#: calendarview.cpp:644
+#: printing/calprintdefaultplugins.cpp:517
 msgid ""
-"The timezone setting was changed. Do you want to keep the absolute time of the "
-"items in your calendar, which will show them to be at a different time than "
-"before, or move them to be at the old time also in the new timezone?"
+"_: subitem Priority: N\n"
+"Priority: %1\n"
 msgstr ""
 
-#: calendarview.cpp:648
-msgid "Keep Absolute Times?"
-msgstr "ਕੀ ਅਸਲ ਸਮਾਂ ਹੈ?"
-
-#: calendarview.cpp:649
-msgid "Keep Times"
-msgstr "ਸਮੇਂ ਰੱਖੋ"
-
-#: calendarview.cpp:650
-msgid "Move Times"
-msgstr "ਸਮੇਂ ਏਧਰ ਓਧਰ"
+#: printing/calprintdefaultplugins.cpp:519
+msgid ""
+"_: subitem Secrecy: secrecyString\n"
+"Secrecy: %1\n"
+msgstr ""
 
-#: calendarview.cpp:718
-msgid "To-do completed: %1 (%2)"
-msgstr "ਕੰਮ-ਕਾਰ ਮੁਕੰਮਲ: %1 (%2)"
+#: printing/calprintdefaultplugins.cpp:522
+msgid "Subitems:"
+msgstr ""
 
-#: calendarview.cpp:729
-#, c-format
-msgid "Journal of %1"
-msgstr "%1 ਦਾ ਰੋਜ਼ਨਾਮਚਾ"
+#: printing/calprintdefaultplugins.cpp:532
+#, fuzzy
+msgid "No Attachments"
+msgstr "ਨੱਥੀ"
 
-#: calendarview.cpp:782
+#: printing/calprintdefaultplugins.cpp:535
 msgid ""
-"The item \"%1\" is filtered by your current filter rules, so it will be hidden "
-"and not appear in the view."
+"_n: 1 Attachment:\n"
+"%1 Attachments:"
 msgstr ""
 
-#: calendarview.cpp:785
-msgid "Filter Applied"
-msgstr "ਫਿਲਟਰ ਲਾਗੂ ਹੈ"
-
-#: calendarview.cpp:840
-msgid "The item \"%1\" will be permanently deleted."
+#: printing/calprintdefaultplugins.cpp:541
+msgid ""
+"_: Spacer for list of attachments\n"
+"  "
 msgstr ""
 
-#: calendarview.cpp:841 calendarview.cpp:1979 calendarview.cpp:2041
-#: calendarview.cpp:2049 koeditorattachments.cpp:379 koeventeditor.cpp:382
-#: kojournaleditor.cpp:201 kotodoeditor.cpp:328
-msgid "KOrganizer Confirmation"
-msgstr "ਕੇ-ਪਰਬੰਧਕ ਪੁਸ਼ਟੀ"
+#: printing/calprintdefaultplugins.cpp:555
+msgid "No Attendees"
+msgstr ""
 
-#: calendarview.cpp:1164
+#: printing/calprintdefaultplugins.cpp:557
+#, c-format
 msgid ""
-"Unable to turn sub-to-do into a top-level to-do, because it cannot be locked."
+"_n: 1 Attendee:\n"
+"%n Attendees:"
 msgstr ""
 
-#: calendarview.cpp:1187
-msgid "Make sub-to-dos independent"
+#: printing/calprintdefaultplugins.cpp:564
+msgid ""
+"_: Formatting of an attendee: 'Name (Role): Status', e.g. 'Reinhold Kainhofer "
+"<reinhold@kainhofer.com> (Participant): Awaiting Response'\n"
+"%1 (%2): %3"
 msgstr ""
 
-#: calendarview.cpp:1254
-msgid "Dissociate occurrence"
+#: printing/calprintdefaultplugins.cpp:568
+msgid "Attendees:"
 msgstr ""
 
-#: calendarview.cpp:1264
-msgid "Dissociating the occurrence failed."
+#: printing/calprintdefaultplugins.cpp:575
+#, c-format
+msgid "Status: %1"
 msgstr ""
 
-#: calendarview.cpp:1265 calendarview.cpp:1292
-msgid "Dissociating Failed"
+#: printing/calprintdefaultplugins.cpp:579
+#, c-format
+msgid "Secrecy: %1"
 msgstr ""
 
-#: calendarview.cpp:1282
-msgid "Dissociate future occurrences"
+#: printing/calprintdefaultplugins.cpp:585
+msgid "Show as: Busy"
 msgstr ""
 
-#: calendarview.cpp:1291
-msgid "Dissociating the future occurrences failed."
+#: printing/calprintdefaultplugins.cpp:587
+msgid "Show as: Free"
 msgstr ""
 
-#: calendarview.cpp:1309 calendarview.cpp:1380 calendarview.cpp:1441
-msgid "No item selected."
-msgstr "ਕੋਈ ਇਕਾਈ ਚੁਣੀ ਨਹੀਂ ਗਈ ਹੈ।"
-
-#: calendarview.cpp:1330 calendarview.cpp:1393
-msgid "The item information was successfully sent."
+#: printing/calprintdefaultplugins.cpp:593
+msgid "This task is overdue!"
 msgstr ""
 
-#: calendarview.cpp:1331
-msgid "Publishing"
-msgstr "ਪਰਕਾਸ਼ਤ"
-
-#: calendarview.cpp:1333
-msgid "Unable to publish the item '%1'"
-msgstr "'%1' ਇਕਾਈ ਪਰਕਾਸ਼ਤ ਕਰਨ ਵਿੱਚ ਅਸਫਲ ਹੈ।"
+#: printing/calprintdefaultplugins.cpp:599
+msgid "Settings: "
+msgstr ""
 
-#: calendarview.cpp:1394
-#, fuzzy
-msgid "Forwarding"
-msgstr "ਅੱਗੇ ਜਾਓ(&F)"
+#: printing/calprintdefaultplugins.cpp:603
+msgid "Categories: "
+msgstr ""
 
-#: calendarview.cpp:1396
+#: printing/calprintdefaultplugins.cpp:754
 #, fuzzy
-msgid "Unable to forward the item '%1'"
-msgstr "'%1' ਇਕਾਈ ਪਰਕਾਸ਼ਤ ਕਰਨ ਵਿੱਚ ਅਸਫਲ ਹੈ।"
+msgid "Today's Events"
+msgstr "ਘਟਨਾ ਖੋਜ"
 
-#: calendarview.cpp:1419
-msgid "The free/busy information was successfully sent."
+#: printing/calprintdefaultplugins.cpp:776 printing/calprintpluginbase.cpp:986
+#: printing/calprintpluginbase.cpp:1010
+msgid ""
+"_: summary, location\n"
+"%1, %2"
 msgstr ""
 
-#: calendarview.cpp:1420 calendarview.cpp:1463
-msgid "Sending Free/Busy"
-msgstr "ਵਿਹਲਾ/ਰੁਝਿਆ ਭੇਜੀ ਰਹੀ ਹੈ"
-
-#: calendarview.cpp:1422
-msgid "Unable to publish the free/busy data."
-msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਡਾਟਾ ਪਰਕਾਸ਼ਤ ਕਰਨ ਲਈ ਅਸਫ਼ਲ ਹੈ।"
-
-#: calendarview.cpp:1447
-msgid "The item has no attendees."
+#: printing/calprintdefaultplugins.cpp:935
+msgid ""
+"_: date from-to\n"
+"%1 - %2"
 msgstr ""
 
-#: calendarview.cpp:1459
+#: printing/calprintdefaultplugins.cpp:937
 msgid ""
-"The groupware message for item '%1'was successfully sent.\n"
-"Method: %2"
+"_: date from-\n"
+"to\n"
+"%1 -\n"
+"%2"
 msgstr ""
 
-#: calendarview.cpp:1468
+#: printing/calprintdefaultplugins.cpp:958
 msgid ""
-"_: Groupware message sending failed. %2 is "
-"request/reply/add/cancel/counter/etc.\n"
-"Unable to send the item '%1'.\n"
-"Method: %2"
+"_: date from - to (week number)\n"
+"%1 - %2 (Week %3)"
 msgstr ""
 
-#: calendarview.cpp:1541
-msgid "*.ics|ICalendars"
-msgstr "*.ics|I-ਕੈਲੰਡਰ"
-
-#: calendarview.cpp:1554
-msgid "The journal entries can not be exported to a vCalendar file."
+#: printing/calprintdefaultplugins.cpp:960
+msgid ""
+"_: date from -\n"
+"to (week number)\n"
+"%1 -\n"
+"%2 (Week %3)"
 msgstr ""
 
-#: calendarview.cpp:1555
-msgid "Data Loss Warning"
-msgstr "ਡਾਟਾ ਗੁੰਮਣ ਚੇਤਾਵਨੀ"
-
-#: actionmanager.cpp:992 calendarview.cpp:1555
-msgid "Proceed"
-msgstr "ਜਾਰੀ ਰੱਖੋ"
+#: komonthview.cpp:978 printing/calprintdefaultplugins.cpp:1123
+msgid ""
+"_: monthname year\n"
+"%1 %2"
+msgstr "%1 %2"
 
-#: calendarview.cpp:1560
-msgid "*.vcs|vCalendars"
-msgstr "*.vcs|ਵੀ-ਕੈਲੰਡਰ"
+#: printing/calprintdefaultplugins.cpp:1213
+msgid "Start Date"
+msgstr "ਸ਼ੁਰੂ ਮਿਤੀ"
 
-#: calendarview.cpp:1583
-msgid "&Previous Day"
-msgstr "ਪਿੱਛੇ ਦਿਨ(&P)"
+#: printing/calprintdefaultplugins.cpp:1214
+msgid "Due Date"
+msgstr "ਮਿਆਦ"
 
-#: calendarview.cpp:1584
-msgid "&Next Day"
-msgstr "ਅੱਗੇ ਦਿਨ(&N)"
+#: kotodoview.cpp:388 printing/calprintdefaultplugins.cpp:1215
+#: printing/calprintdefaultplugins.cpp:1289
+msgid "Priority"
+msgstr "ਦਰਜਾ"
 
-#: calendarview.cpp:1586
-msgid "&Previous Week"
-msgstr "ਪਿੱਛੇ ਹਫਤਾ(&P)"
+#: printing/calprintdefaultplugins.cpp:1216
+msgid "Percent Complete"
+msgstr "ਪ੍ਰਤੀਸ਼ਤ ਮੁਕੰਮਲ"
 
-#: calendarview.cpp:1587
-msgid "&Next Week"
-msgstr "ਅੱਗੇ ਹਫਤਾ(&N)"
+#: printing/calprintdefaultplugins.cpp:1222
+msgid "Ascending"
+msgstr "ਵੱਧਦਾ ਕ੍ਰਮ"
 
-#: calendarview.cpp:1683 calendarview.cpp:1716
-msgid "No filter"
-msgstr "ਫਿਲਟਰ ਨਹੀਂ"
+#: printing/calprintdefaultplugins.cpp:1223
+msgid "Descending"
+msgstr "ਘੱਟਦਾ ਕ੍ਰਮ"
 
-#: calendarview.cpp:1974
-msgid ""
-"The item \"%1\" has sub-to-dos. Do you want to delete just this item and make "
-"all its sub-to-dos independent, or delete the to-do with all its sub-to-dos?"
+#: printing/calprintdefaultplugins.cpp:1232
+msgid "To-do list"
 msgstr ""
 
-#: calendarview.cpp:1980
-msgid "Delete Only This"
-msgstr "ਸਿਰਫ਼ ਇਹ ਹੀ ਹਟਾਓ"
+#: kotodoview.cpp:390 printing/calprintdefaultplugins.cpp:1303
+msgid "Complete"
+msgstr "ਮੁਕੰਮਲ"
 
-#: calendarview.cpp:1983
-msgid "Deleting sub-to-dos"
-msgstr "ਵਾਧੂ ਕੰਮ-ਕਾਰ ਹਟਾਓ"
+#: printing/calprintdefaultplugins.cpp:1311
+msgid "Due"
+msgstr "ਬਕਾਇਆ"
 
-#: calendarview.cpp:2007
-msgid ""
-"The item \"%1\" is marked read-only and cannot be deleted; it probably belongs "
-"to a read-only calendar resource."
+#: printing/calprinter.cpp:133
+msgid "Unable to print, no valid print style was returned."
 msgstr ""
 
-#: calendarview.cpp:2011
-msgid "Removing not possible"
-msgstr "ਹਟਾਉਣਾ ਸੰਭਵ ਨਹੀਂ ਹੈ"
-
-#: calendarview.cpp:2038
-msgid ""
-"The calendar item \"%1\" recurs over multiple dates; are you sure you want to "
-"delete it and all its recurrences?"
+#: printing/calprinter.cpp:134
+msgid "Printing error"
 msgstr ""
 
-#: calendarview.cpp:2044
-msgid ""
-"The calendar item \"%1\" recurs over multiple dates. Do you want to delete only "
-"the current one on %2, only all future recurrences, or all its recurrences?"
-msgstr ""
+#: printing/calprinter.cpp:155
+msgid "Print Calendar"
+msgstr "ਕੈਲੰਡਰ ਛਾਪੋ"
 
-#: calendarview.cpp:2049
-msgid "Delete C&urrent"
-msgstr "ਮੌਜੂਦਾ ਹਟਾਓ"
+#: printing/calprinter.cpp:179
+msgid "Print Style"
+msgstr "ਛਪਾਈ ਸ਼ੈਲੀ"
 
-#: calendarview.cpp:2050
-msgid "Delete &Future"
-msgstr "ਭਵਿੱਖਤ ਹਟਾਓ"
+#: printing/calprinter.cpp:193
+msgid "Page &orientation:"
+msgstr "ਸਫ਼ਾ ਸਥਿਤੀ:"
 
-#: calendarview.cpp:2051
-msgid "Delete &All"
-msgstr "ਸਭ ਹਟਾਉ"
+#: printing/calprinter.cpp:198
+msgid "Use Default Orientation of Selected Style"
+msgstr "ਚੁਣੀ ਸ਼ੈਲੀ ਲਈ ਮੂਲ ਸਥਿਤੀ ਵਰਤੋਂ"
 
-#: calendarview.cpp:2133
-msgid "Delete all completed to-dos?"
-msgstr ""
+#: printing/calprinter.cpp:199
+msgid "Use Printer Default"
+msgstr "ਪਰਿੰਟਰ ਮੂਲ ਵਰਤੋਂ"
 
-#: calendarview.cpp:2133
-msgid "Purge To-dos"
-msgstr ""
+#: printing/calprinter.cpp:237 printing/calprinter.cpp:239
+msgid "&Preview"
+msgstr "ਨਮੂਨਾ(&P)"
 
-#: calendarview.cpp:2133
-msgid "Purge"
-msgstr ""
+#: printing/cellitem.cpp:36
+msgid "<undefined>"
+msgstr "<ਨਾ-ਪ੍ਰਭਾਸ਼ਿਤ>"
 
-#: calendarview.cpp:2137
-msgid "Purging completed to-dos"
+#: printing/calprintpluginbase.cpp:142
+msgid "This printing style does not have any configuration options."
 msgstr ""
 
-#: calendarview.cpp:2152
-msgid "Unable to purge to-dos with uncompleted children."
+#: printing/calprintpluginbase.cpp:563
+#, c-format
+msgid ""
+"_: print date: formatted-datetime\n"
+"printed: %1"
 msgstr ""
 
-#: calendarview.cpp:2153
-msgid "Delete To-do"
-msgstr "ਕੰਮ-ਕਾਰ ਹਟਾਓ"
+#: printing/calprintpluginbase.cpp:908
+msgid ""
+"_: starttime - endtime summary\n"
+"%1-%2 %3"
+msgstr ""
 
-#: calendarview.cpp:2168
-msgid "Unable to edit item: it is locked by another process."
+#: printing/calprintpluginbase.cpp:914
+msgid ""
+"_: starttime - endtime summary, location\n"
+"%1-%2 %3, %4"
 msgstr ""
 
-#: calendarview.cpp:2201
-#, c-format
-msgid "Unable to copy the item to %1."
-msgstr "'%1' ਲਈ ਇਕਾਈ ਨੂੰ ਨਕਲ ਕਰਨ ਵਿੱਚ ਅਸਫਲ ਹੈ।"
+#: printing/calprintpluginbase.cpp:935
+msgid ""
+"_: weekday month date\n"
+"%1 %2 %3"
+msgstr "%1 %2 %3"
 
-#: calendarview.cpp:2202
-msgid "Copying Failed"
-msgstr "ਨਕਲ ਅਸਫਲ ਰਹੀ"
+#: printing/calprintpluginbase.cpp:1018 printing/calprintpluginbase.cpp:1022
+#, fuzzy
+msgid "%1 (Due: %2)"
+msgstr "   ਬਕਾਇਆ: %1"
 
-#: calendarview.cpp:2243
+#: printing/calprintpluginbase.cpp:1029
 #, c-format
-msgid "Unable to move the item to %1."
-msgstr "'%1' ਵਿੱਚ ਇਕਾਈ ਭੇਜਣ ਵਿੱਚ ਅਸਫਲ ਹੈ।"
-
-#: calendarview.cpp:2244
-msgid "Moving Failed"
-msgstr "ਭੇਜਣਾ ਅਸਫਲ"
+msgid "To-do: %1"
+msgstr "ਕੰਮ-ਕਾਰ: %1"
 
-#: komailclient.cpp:188
-msgid "No running instance of KMail found."
-msgstr ""
+#: printing/calprintpluginbase.cpp:1575
+msgid "%1%"
+msgstr "%1%"
 
-#: kdatenavigator.cpp:187
+#: printing/calprintpluginbase.cpp:1679
 msgid ""
-"_: start/end week number of line in date picker\n"
-"%1/%2"
-msgstr "%1/%2"
-
-#: navigatorbar.cpp:71
-msgid "Previous year"
-msgstr "ਪਿਛਲਾ ਸਾਲ"
-
-#: navigatorbar.cpp:77
-msgid "Previous month"
-msgstr "ਪਿਛਲਾ ਮਹੀਨਾ"
-
-#: navigatorbar.cpp:84
-msgid "Next month"
-msgstr "ਅਗਲਾ ਮਹੀਨਾ"
+"_: Description - date\n"
+"%1 - %2"
+msgstr "%1 - %2"
 
-#: navigatorbar.cpp:90
-msgid "Next year"
-msgstr "ਅਗਲਾ ਸਾਲ"
+#: printing/calprintpluginbase.cpp:1700
+#, c-format
+msgid "Person: %1"
+msgstr "ਵਿਅਕਤੀ: %1"
 
-#: navigatorbar.cpp:97
-msgid "Select a month"
-msgstr "ਇੱਕ ਮਹੀਨਾ ਚੁਣੋ"
+#: printing/calprintpluginbase.cpp:1701
+#, c-format
+msgid "%1"
+msgstr "%1"
 
-#: komonthview.cpp:883 navigatorbar.cpp:161
-#: printing/calprintdefaultplugins.cpp:917
+#: printing/calprintpluginbase.cpp:1719
 msgid ""
-"_: monthname year\n"
-"%1 %2"
-msgstr "%1 %2"
+"_: Date range: Month dayStart - dayEnd\n"
+"%1 %2 - %3"
+msgstr "%1 %2 - %3"
 
-#: datenavigatorcontainer.cpp:51
+#: printing/calprintpluginbase.cpp:1724
 msgid ""
-"<qt>"
-"<p>Select the dates you want to display in KOrganizer's main view here. Hold "
-"down the mouse button to select more than one day.</p>"
-"<p>Press the top buttons to browse to the next / previous months or years.</p>"
-"<p>Each line shows a week. The number in the left column is the number of the "
-"week in the year. Press it to select the whole week.</p></qt>"
+"_: Date range: monthStart dayStart - monthEnd dayEnd\n"
+"%1 %2 - %3 %4"
+msgstr "%1 %2 - %3 %4"
+
+#: printing/calprintdefaultplugins.h:47
+msgid "Print &incidence"
 msgstr ""
 
-#: journalentry.cpp:92
-msgid "[Add Journal Entry]"
-msgstr "[ਰੋਜ਼ਨਾਮਚਾ ਇੰਦਰਾਜ਼ ਸ਼ਾਮਲ]"
+#: printing/calprintdefaultplugins.h:51
+msgid "Prints an incidence on one page"
+msgstr ""
 
-#: journalentry.cpp:191
-msgid "Sets the Title of this journal entry."
-msgstr "ਇਸ ਰੋਜ਼ਨਾਮਚੇ ਦਾ ਸਿਰਲੇਖ ਦਿਓ।"
+#: printing/calprintdefaultplugins.h:99
+msgid "Print da&y"
+msgstr "ਦਿਨ ਛਾਪੋ(&y)"
 
-#: journalentry.cpp:193
-msgid "&Title: "
-msgstr "ਸਿਰਲੇਖ(&T):"
+#: printing/calprintdefaultplugins.h:103
+msgid "Prints all events of a single day on one page"
+msgstr ""
 
-#: journalentry.cpp:202
-msgid "Ti&me: "
-msgstr "ਸਮਾਂ(&m):"
+#: printing/calprintdefaultplugins.h:136
+msgid "Print &week"
+msgstr "ਹਫ਼ਤਾ ਛਾਪੋ(&w)"
 
-#: journalentry.cpp:208
-msgid "Determines whether this journal entry has a time associated with it"
+#: printing/calprintdefaultplugins.h:140
+msgid "Prints all events of one week on one page"
 msgstr ""
 
-#: journalentry.cpp:210
-msgid "Sets the time associated with this journal entry"
-msgstr ""
+#: printing/calprintdefaultplugins.h:178
+msgid "Print mont&h"
+msgstr "ਮਹੀਨਾ ਛਾਪੋ(&h)"
 
-#: journalentry.cpp:217 journalentry.cpp:218
-msgid "Delete this journal entry"
-msgstr "ਇਹ ਰੋਜ਼ਨਾਮਚਾ ਇੰਦਰਾਜ਼ ਹਟਾਓ"
+#: printing/calprintdefaultplugins.h:182
+msgid "Prints all events of one month on one page"
+msgstr ""
 
-#: journalentry.cpp:225
-msgid "Edit this journal entry"
-msgstr "ਇਹ ਰੋਜ਼ਨਾਮਚਾ ਇੰਦਰਾਜ਼ ਸੋਧ"
+#: printing/calprintdefaultplugins.h:221
+msgid "Print to-&dos"
+msgstr "ਕੰਮ ਛਾਪੋ(&d)"
 
-#: journalentry.cpp:226
-msgid "Opens an editor dialog for this journal entry"
+#: printing/calprintdefaultplugins.h:225
+msgid "Prints all to-dos in a (tree-like) list"
 msgstr ""
 
-#: journalentry.cpp:234
-#, fuzzy
-msgid "Print this journal entry"
-msgstr "ਇਹ ਰੋਜ਼ਨਾਮਚਾ ਇੰਦਰਾਜ਼ ਸੋਧ"
+#: komonthview.cpp:427
+msgid ""
+"_: 'Month day' for month view cells\n"
+"%1 %2"
+msgstr "%1 %2"
 
-#: journalentry.cpp:235
-#, fuzzy
-msgid "Opens the print dialog for this journal entry"
-msgstr "ਇਸ ਰੋਜ਼ਨਾਮਚੇ ਦਾ ਸਿਰਲੇਖ ਦਿਓ।"
+#: filtereditdialog.cpp:51
+msgid "Edit Calendar Filters"
+msgstr "ਕੈਲੰਡਰ ਫਿਲਟਰ ਸੋਧ"
 
-#: korgac/alarmdockwindow.cpp:56 korgac/korgacmain.cpp:65
-#: korgac/korgacmain.cpp:66
-msgid "KOrganizer Reminder Daemon"
-msgstr "ਕੇ-ਪਰਬੰਧਕ ਯਾਦਪੱਤਰ ਡਾਈਮੋਨ"
+#: filtereditdialog.cpp:99
+msgid "Press this button to define a new filter."
+msgstr "ਨਵਾਂ ਫਿਲਟਰ ਜੋੜਨ ਲਈ ਇਹ ਬਟਨ ਦਬਾਓ।"
 
-#: korgac/korgacmain.cpp:70 korgac/korgacmain.cpp:72
-msgid "Maintainer"
-msgstr "ਪਰਬੰਧਕ"
+#: filtereditdialog.cpp:100
+msgid "Press this button to remove the currently active filter."
+msgstr "ਮੌਜੂਦਾ ਸਰਗਰਮ ਫਿਲਟਰ ਨੂੰ ਹਟਾਉਣ ਲਈ ਇਹ ਬਟਨ ਦਬਾਉ।"
 
-#: korgac/alarmdockwindow.cpp:67
-msgid "Suspend All"
-msgstr "ਸਭ ਮੁਅਤੱਲ"
+#: filtereditdialog.cpp:189
+#, c-format
+msgid "New Filter %1"
+msgstr "ਨਵਾਂ ਫਿਲਟਰ %1"
 
-#: korgac/alarmdockwindow.cpp:68
-msgid "Dismiss All"
-msgstr "ਸਭ ਰੱਦ"
+#: filtereditdialog.cpp:201 koeventeditor.cpp:392 kotodoeditor.cpp:328
+msgid "This item will be permanently deleted."
+msgstr "ਇਹ ਇਕਾਈ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾ ਦਿੱਤੀ ਜਾਵੇਗੀ।"
 
-#: korgac/alarmdockwindow.cpp:73
-msgid "Reminders Enabled"
-msgstr "ਯਾਦਪੱਤਰ ਯੋਗ ਹੈ"
+#: filtereditdialog.cpp:201
+msgid "Delete Confirmation"
+msgstr "ਹਟਾਉਣ ਪੁਸ਼ਟੀ"
 
-#: korgac/alarmdockwindow.cpp:75
-msgid "Start Reminder Daemon at Login"
-msgstr "ਲਾਗਿੰਨ ਸਮੇਂ ਯਾਦ-ਪੱਤਰ ਡਾਈਮੋਨ ਚਲਾਓ"
+#: timezone.cpp:39
+msgid "KOrganizer Timezone Test"
+msgstr "ਕੇ-ਪਰਬੰਧਕ ਸਮਾਂ-ਖੇਤਰ ਜਾਂਚ"
 
-#: korgac/alarmdockwindow.cpp:113
-#, c-format
+#: tips.cpp:3
 msgid ""
-"_n: There is 1 active reminder.\n"
-"There are %n active reminders."
+"<p>...that you can synchronize your calendar data with the data on a Palm Pilot "
+"by using <a href=\"http://www.slac.com/pilone/kpilot_home\">KPilot</a>?\n"
+"</p>\n"
 msgstr ""
 
-#: korgac/alarmdockwindow.cpp:180
+#: tips.cpp:9
 msgid ""
-"Do you want to start the KOrganizer reminder daemon at login (note that you "
-"will not get reminders whilst the daemon is not running)?"
+"<p>...that it is possible to show the current time in the calendar? Enable the "
+"current time line in the dialog which appears after selecting <b>Settings</b>"
+", <b>Configure KOrganizer...</b> from the menu bar.\n"
+"</p>\n"
 msgstr ""
 
-#: korgac/alarmdockwindow.cpp:182
-msgid "Close KOrganizer Reminder Daemon"
+#: tips.cpp:15
+msgid ""
+"<p>...that KOrganizer supports Microsoft Exchange? Add the <b>"
+"Microsoft&reg; Exchange 2000 resource</b> using the <b>Resource View</b> "
+"from the KOrganizer sidebar.\n"
+"</p>\n"
 msgstr ""
 
-#: korgac/alarmdockwindow.cpp:183
-msgid "Start"
-msgstr "ਸ਼ੁਰੂ"
-
-#: korgac/alarmdockwindow.cpp:183
-msgid "Do Not Start"
-msgstr "ਸ਼ੁਰੂ ਨਾ ਕਰੋ"
-
-#: korgac/testalarmdlg.cpp:37
-msgid "TestKabc"
-msgstr "TestKabc"
-
-#: korgac/alarmdialog.cpp:82
-#, fuzzy
-msgid "Dismiss all"
-msgstr "ਸਭ ਰੱਦ"
+#: tips.cpp:21
+msgid ""
+"<p>...that you can select whether the week starts on Monday or on Sunday in the "
+"Trinity Control Center? KOrganizer uses this setting. Look at Regional & "
+"Accessibility->Country/Region & Languages in the Trinity Control Center, or "
+"select <b>Settings</b>,\n"
+"<b>Configure Date & Time...</b> from the menu bar. Select the Time & Dates "
+"tab.\n"
+"</p>\n"
+msgstr ""
 
-#: koeditorgeneralevent.cpp:158 korgac/alarmdialog.cpp:82
-msgid "Edit..."
-msgstr "ਸੋਧ..."
+#: tips.cpp:28
+msgid ""
+"<p>...that you can edit to-dos quickly by right clicking on the property you "
+"wish to change; like the priority, the category or the date?\n"
+"</p>\n"
+msgstr ""
 
-#: korgac/alarmdialog.cpp:82
-msgid "Suspend"
-msgstr "ਮੁਅਤੱਲ"
+#: tips.cpp:34
+msgid ""
+"<p>...that you can view and edit a calendar from the shell with "
+"konsolekalendar? Run <b>konsolekalendar --help</b> for the available options.\n"
+"</p>\n"
+msgstr ""
 
-#: korgac/alarmdialog.cpp:86
-#, fuzzy
-msgid "Dismiss"
-msgstr "ਸਭ ਰੱਦ"
+#: tips.cpp:40
+msgid ""
+"<p>...that your calender can display birthdays from your address book? It is "
+"even possible to set up reminders for them. To activate this, add the "
+"corresponding 'birthdays' resource to your calender.\n"
+"</p>\n"
+msgstr ""
 
-#: korgac/alarmdialog.cpp:92
-msgid "The following events triggered reminders:"
+#: tips.cpp:46
+msgid ""
+"<p>...that you can store your calendar on an FTP server? Use the standard file "
+"dialog to save the calendar to a URL like "
+"<b>ftp://username@ftpserver/filename</b>. You can make your calendar active and "
+"load and save it as if it were local, or add it permanently to your resources "
+"list, using the remote file resource. Just make sure that no two KOrganizer "
+"applications are working on the same file, at the same time.\n"
+"</p>\n"
 msgstr ""
 
-#: korgac/alarmdialog.cpp:98 printing/calprintdefaultplugins.cpp:1100
-msgid "Due"
-msgstr "ਬਕਾਇਆ"
+#: tips.cpp:52
+msgid ""
+"<p>...that you can create hierarchical to-dos by clicking with the right mouse "
+"button on an existing to-do and selecting <b>New Sub-to-do</b> "
+"from the context menu?\n"
+"</p>\n"
+msgstr ""
 
-#: korgac/alarmdialog.cpp:114
-msgid "Suspend &duration:"
+#: tips.cpp:58
+msgid ""
+"<p>...that a color can be assigned to each category? Events with a certain "
+"category will be shown in that color. You can assign these in the section <b>"
+"Colors</b> within the dialog which appears after selecting <b>Settings</b>, <b>"
+"Configure KOrganizer...</b> from the menu bar.\n"
+"</p>\n"
 msgstr ""
 
-#: korgac/alarmdialog.cpp:123
-msgid "week(s)"
-msgstr "ਹਫਤਾ"
+#: tips.cpp:64
+msgid ""
+"<p>...that you can view and edit a calendar with Konqueror? Just click on the "
+"calendar file to make Konqueror open it.\n"
+"</p>\n"
+msgstr ""
 
-#: korgac/alarmdialog.cpp:251
-msgid "Could not start KOrganizer."
+#: tips.cpp:70
+msgid ""
+"<p>...that it is possible to add an attachment to an event or to-do? To do so, "
+"add a link to the <b>Attachments</b> tab within the <b>Edit Event</b> or <b>"
+"Edit To-do</b> dialog.\n"
+"</p>\n"
 msgstr ""
 
-#: korganizer.cpp:290 kotimelineview.cpp:55 kotimelineview.cpp:123
-#: resourceview.cpp:227 resourceview.cpp:278
-msgid "Calendar"
-msgstr "ਕੈਲੰਡਰ"
+#: tips.cpp:76
+msgid ""
+"<p>...that you can export your calendar to HTML? Select <b>File</b>, <b>"
+"Export</b>, <b>Export Web Page...</b> from the menu bar to open the <b>"
+"Export calendar as web page</b> dialog.\n"
+"</p>\n"
+msgstr ""
 
-#: korganizer.cpp:298
-msgid "New Calendar"
-msgstr "ਨਵਾਂ ਕੈਲੰਡਰ"
+#: tips.cpp:82
+msgid ""
+"<p>...that you can purge completed to-dos in one step? Go to the <b>File</b> "
+"menu and choose <b>Purge Completed</b>.\n"
+msgstr ""
 
-#: korganizer.cpp:302
-msgid "read-only"
-msgstr "ਪੜਨ ਲਈ"
+#: tips.cpp:87
+msgid ""
+"<p>...that you can create a new sub-to-do by pasting a to-do while another one "
+"is selected?\n"
+"</p>\n"
+msgstr ""
 
 #: freebusyurldialog.cpp:40
 msgid "Edit Free/Busy Location"
@@ -2247,70 +3460,70 @@ msgstr "ਵਿਹਲਾ/ਰੁਝਿਆ ਸਥਿਤੀ ਸੋਧ"
 msgid "Location of Free/Busy information for %1 <%2>:"
 msgstr ""
 
-#: koattendeeeditor.cpp:63
+#: koattendeeeditor.cpp:73
 msgid ""
 "Sets the identity corresponding to the organizer of this to-do or event. "
 "Identities can be set in the 'Personal' section of the KOrganizer "
 "configuration, or in the 'Security & Privacy'->'Password & User Account' "
-"section of the Trinity Control Center. In addition, identities are gathered from "
-"your KMail settings and from your address book. If you choose to set it "
-"globally for TDE in the Control Center, be sure to check 'Use email settings "
+"section of the Trinity Control Center. In addition, identities are gathered "
+"from your KMail settings and from your address book. If you choose to set it "
+"globally for KDE in the Control Center, be sure to check 'Use email settings "
 "from Control Center' in the 'Personal' section of the KOrganizer configuration."
 msgstr ""
 
-#: koattendeeeditor.cpp:75 koattendeeeditor.cpp:283
+#: koattendeeeditor.cpp:85 koattendeeeditor.cpp:292
 msgid "Identity as organizer:"
 msgstr "ਪਰਬੰਧਕ ਦੇ ਤੌਰ ਤੇ ਪਛਾਣ:"
 
-#: koattendeeeditor.cpp:89
+#: koattendeeeditor.cpp:99
 msgid ""
 "Edits the name of the attendee selected in the list above, or adds a new "
 "attendee if there are no attendeesin the list."
 msgstr ""
 
-#: koattendeeeditor.cpp:94
+#: koattendeeeditor.cpp:104
 msgid "Na&me:"
 msgstr "ਨਾਂ:"
 
-#: koattendeeeditor.cpp:99
+#: koattendeeeditor.cpp:109
 msgid "Click to add a new attendee"
 msgstr "ਨਵਾਂ ਸਰੋਤਾ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਦਬਾਉ"
 
-#: koattendeeeditor.cpp:106
+#: koattendeeeditor.cpp:117
 msgid "Edits the role of the attendee selected in the list above."
 msgstr "ਉੱਪਰੀ ਸੂਚੀ ਵਿੱਚ ਚੁਣੇ ਸਰੋਤੇ ਦੇ ਫ਼ਰਜ਼ ਵਿੱਚ ਸੋਧ"
 
-#: koattendeeeditor.cpp:110
+#: koattendeeeditor.cpp:121
 msgid "Ro&le:"
 msgstr "ਫ਼ਰਜ਼:"
 
-#: koattendeeeditor.cpp:124
+#: koattendeeeditor.cpp:135
 msgid ""
 "Edits the current attendance status of the attendee selected in the list above."
 msgstr ""
 
-#: koattendeeeditor.cpp:128
+#: koattendeeeditor.cpp:139
 msgid "Stat&us:"
 msgstr "ਸਥਿਤੀ:"
 
-#: koattendeeeditor.cpp:151
+#: koattendeeeditor.cpp:162
 msgid ""
 "Edits whether to send an email to the attendee selected in the list above to "
 "request a response concerning attendance."
 msgstr ""
 
-#: koattendeeeditor.cpp:154
+#: koattendeeeditor.cpp:165
 msgid "Re&quest response"
 msgstr "ਬੇਨਤੀ ਤੇ ਜਵਾਬ"
 
 #. i18n: file filteredit_base.ui line 29
-#: koattendeeeditor.cpp:161 rc.cpp:99 rc.cpp:429 rc.cpp:441 rc.cpp:1481
-#: rc.cpp:1871 rc.cpp:2075
+#: koattendeeeditor.cpp:172 rc.cpp:99 rc.cpp:432 rc.cpp:444 rc.cpp:1848
+#: rc.cpp:2174 rc.cpp:2183
 #, no-c-format
 msgid "&New"
 msgstr "ਨਵਾਂ(&N)"
 
-#: koattendeeeditor.cpp:163
+#: koattendeeeditor.cpp:174
 msgid ""
 "Adds a new attendee to the list. Once the attendee is added, you will be able "
 "to edit the attendee's name, role, attendance status, and whether or not the "
@@ -2318,560 +3531,942 @@ msgid ""
 "your addressbook, click the 'Select Addressee' button instead."
 msgstr ""
 
-#: koattendeeeditor.cpp:175
+#: koattendeeeditor.cpp:186
 msgid "Removes the attendee selected in the list above."
 msgstr "ਚੁਣੇ ਪਰਤੀਨਿਧ ਨੂੰ ਸੂਚੀ ਵਿੱਚੋਂ ਹਟਾਓ।"
 
-#: koattendeeeditor.cpp:179
+#: koattendeeeditor.cpp:190
 msgid "Select Addressee..."
 msgstr "ਸਿਰਨਾਵੀਂ ਚੁਣੋ..."
 
-#: koattendeeeditor.cpp:182
+#: koattendeeeditor.cpp:193
 msgid "Opens your address book, allowing you to select new attendees from it."
 msgstr ""
 
-#: koattendeeeditor.cpp:263
+#: koattendeeeditor.cpp:265
+msgid "Please edit the example attendee, before adding more."
+msgstr ""
+
+#: koattendeeeditor.cpp:272 koattendeeeditor.cpp:551
 msgid "Firstname Lastname"
 msgstr "ਪਹਿਲਾਂ-ਨਾਂ ਆਖਰੀ-ਨਾਂ"
 
-#: koattendeeeditor.cpp:264
+#: koattendeeeditor.cpp:273
 msgid "name"
 msgstr "ਨਾਂ"
 
-#: koattendeeeditor.cpp:303
+#: koattendeeeditor.cpp:312
 #, c-format
 msgid "Organizer: %1"
 msgstr "ਪਰਬੰਧਕ:  %1"
 
-#: koattendeeeditor.cpp:399
+#: koattendeeeditor.cpp:480
 #, fuzzy, c-format
 msgid "Delegated to %1"
 msgstr "   ਹਟਾਓ    %1"
 
-#: koattendeeeditor.cpp:401
+#: koattendeeeditor.cpp:482
 #, fuzzy, c-format
 msgid "Delegated from %1"
 msgstr "   ਹਟਾਓ    %1"
 
-#: koattendeeeditor.cpp:403
+#: koattendeeeditor.cpp:484
 #, fuzzy
 msgid "Not delegated"
 msgstr "ਕੋਈ ਇਕਾਈ ਚੁਣੀ ਨਹੀਂ ਗਈ ਹੈ।"
 
-#: kojournaleditor.cpp:47
-msgid "Edit Journal Entry"
-msgstr "ਰੋਜ਼ਨਾਮਚਾ ਇੰਦਰਾਜ਼ ਸੋਧ"
+#: koeventeditor.cpp:124 koeventeditor.cpp:146
+msgid ""
+"The General tab allows you to set the most common options for the event."
+msgstr ""
 
-#: exportwebdialog.cpp:139 koeventeditor.cpp:122 kojournaleditor.cpp:74
-#: kotodoeditor.cpp:97
-msgid "General"
-msgstr "ਸਧਾਰਨ"
+#: koeventeditor.cpp:135 kotodoeditor.cpp:112
+msgid "Details"
+msgstr "ਵੇਰਵਾ"
 
-#: koeventeditor.cpp:147 kojournaleditor.cpp:84 kotodoeditor.cpp:123
+#: koeventeditor.cpp:144 kojournaleditor.cpp:86 kotodoeditor.cpp:124
 msgid "&General"
 msgstr "ਸਧਾਰਨ(&G)"
 
-#: kojournaleditor.cpp:200
-msgid "This journal entry will be permanently deleted."
+#. i18n: file ./printing/calprintincidenceconfig_base.ui line 59
+#: koeventeditor.cpp:182 rc.cpp:1650
+#, no-c-format
+msgid "&Attendees"
 msgstr ""
 
-#: kojournaleditor.cpp:216
-msgid "Template does not contain a valid journal."
+#: koeventeditor.cpp:184
+msgid ""
+"The Free/Busy tab allows you to see whether other attendees are free or busy "
+"during your event."
 msgstr ""
 
-#: actionmanager.cpp:253
-msgid "Import &Calendar..."
-msgstr "ਕੈਲੰਡਰ ਅਯਾਤ(&C)..."
+#: koeventeditor.cpp:208
+msgid "Edit Event"
+msgstr "ਘਟਨਾ ਸੋਧ"
 
-#: actionmanager.cpp:255
-msgid "&Import From UNIX Ical tool"
-msgstr "UN&IX Ical ਸੰਦ ਤੋਂ ਆਯਾਤ"
+#: koeventeditor.cpp:216
+msgid "New Event"
+msgstr "ਨਵੀਂ ਘਟਨਾ"
 
-#: actionmanager.cpp:257
-msgid "Get &Hot New Stuff..."
+#: koeventeditor.cpp:277
+msgid ""
+"You didn't change the event, thus no counter proposal has been sent to the "
+"organizer."
 msgstr ""
 
-#: actionmanager.cpp:261
-msgid "Export &Web Page..."
-msgstr "ਵੈੱਬ ਸਫ਼ਾ ਨਿਰਯਾਤ..."
+#: koeventeditor.cpp:277
+#, fuzzy
+msgid "No changes"
+msgstr "ਐਕਸ਼ਚੇਜ਼"
 
-#: actionmanager.cpp:264
-msgid "&iCalendar..."
+#: koeventeditor.cpp:288
+#, c-format
+msgid "My counter proposal for: %1"
 msgstr ""
 
-#: actionmanager.cpp:267
-msgid "&vCalendar..."
-msgstr "&vਕੈਲੰਡਰ..."
+#: koeventeditor.cpp:401
+msgid "Template does not contain a valid event."
+msgstr ""
 
-#: actionmanager.cpp:270
-msgid "Upload &Hot New Stuff..."
+#: kogroupware.cpp:166
+#, c-format
+msgid "Error message: %1"
 msgstr ""
 
-#: actionmanager.cpp:276
-msgid "Archive O&ld Entries..."
+#: kogroupware.cpp:170
+msgid "Error while processing an invitation or update."
 msgstr ""
 
-#: actionmanager.cpp:278
+#: kogroupware.cpp:285
 msgid ""
-"_: delete completed to-dos\n"
-"Pur&ge Completed To-dos"
+"You changed the invitation \"%1\".\n"
+"Do you want to email the attendees an update message?"
 msgstr ""
 
-#: actionmanager.cpp:336
-msgid "What's &Next"
-msgstr "ਅੱਗੇ ਕੀ ਹੈ(&N)"
+#: kogroupware.cpp:292
+msgid ""
+"You removed the invitation \"%1\".\n"
+"Do you want to email the attendees that the event is canceled?"
+msgstr ""
 
-#: actionmanager.cpp:340
-msgid "&Day"
-msgstr "ਦਿਨ(&D)"
+#: kogroupware.cpp:296
+msgid ""
+"You removed the invitation \"%1\".\n"
+"Do you want to email the attendees that the todo is canceled?"
+msgstr ""
 
-#: actionmanager.cpp:349
-#, c-format
+#: kogroupware.cpp:303
 msgid ""
-"_n: &Next Day\n"
-"Ne&xt %n Days"
+"The event \"%1\" includes other people.\n"
+"Do you want to email the invitation to the attendees?"
 msgstr ""
-"ਅਗਲਾ ਦਿਨ(&N)\n"
-"ਅਗਲੇ %n ਦਿਨ(&x)"
 
-#: actionmanager.cpp:351
-msgid "W&ork Week"
-msgstr "ਹਫਤਾ ਕੰਮ(&o)"
+#: kogroupware.cpp:307
+msgid ""
+"The todo \"%1\" includes other people.\n"
+"Do you want to email the invitation to the attendees?"
+msgstr ""
 
-#: actionmanager.cpp:355
-msgid "&Week"
-msgstr "ਹਫਤਾ(&W)"
+#: kogroupware.cpp:311
+msgid ""
+"This incidence includes other people. Should an email be sent to the attendees?"
+msgstr ""
 
-#: actionmanager.cpp:359
-msgid "&Month"
-msgstr "ਮਹੀਨਾ(&M)"
+#: kogroupware.cpp:321 kogroupware.cpp:363
+msgid "Group Scheduling Email"
+msgstr ""
 
-#: actionmanager.cpp:363
-msgid "&List"
-msgstr "ਸੂਚੀ(&L)"
+#: kogroupware.cpp:322
+msgid "Send Email"
+msgstr "ਈ-ਪੱਤਰ ਭੇਜੋ"
 
-#: actionmanager.cpp:367
-msgid "&To-do List"
-msgstr "ਕੰਮ ਸੂਚੀ(&T)"
+#: incidencechanger.cpp:76 kogroupware.cpp:322 kogroupware.cpp:334
+#: kogroupware.cpp:341 kogroupware.cpp:364
+msgid "Do Not Send"
+msgstr "ਨਾ ਭੇਜੋ"
 
-#: actionmanager.cpp:371
-msgid "&Journal"
-msgstr "ਰੋਜ਼ਨਾਮਚਾ(&J)"
+#: kogroupware.cpp:332
+msgid "Do you want to send a status update to the organizer of this task?"
+msgstr ""
 
-#: actionmanager.cpp:375
+#: kogroupware.cpp:334 kogroupware.cpp:341 kogroupware.cpp:364
+msgid "Send Update"
+msgstr "ਅੱਪਡੇਟ ਭੇਜੋ"
+
+#: kogroupware.cpp:338
+msgid ""
+"Your status as an attendee of this event changed. Do you want to send a status "
+"update to the event organizer?"
+msgstr ""
+
+#: kogroupware.cpp:359
+msgid ""
+"You had previously accepted an invitation to this event. Do you want to send an "
+"updated response to the organizer declining the invitation?"
+msgstr ""
+
+#: kogroupware.cpp:367
+msgid ""
+"You are not the organizer of this event. Editing it will bring your calendar "
+"out of sync with the organizer's calendar. Do you really want to edit it?"
+msgstr ""
+
+#: kogroupware.cpp:384
+msgid "<No summary given>"
+msgstr "<ਕੋਈ ਜਾਣਕਾਰੀ ਨਹੀਂ>"
+
+#: kogroupware.cpp:404 mailscheduler.cpp:89
+#, c-format
+msgid "Counter proposal: %1"
+msgstr ""
+
+#: kogroupware.cpp:406
+msgid "Proposed new meeting time: %1 - %2"
+msgstr ""
+
+#: statusdialog.cpp:41
+msgid "Set Your Status"
+msgstr "ਆਪਣੀ ਸਥਿਤੀ ਦਿਓ"
+
+#: statusdialog.cpp:49
+msgid "Set your status"
+msgstr "ਆਪਣੀ ਸਥਿਤੀ ਦਿਓ"
+
+#: history.cpp:185
+#, c-format
+msgid "Delete %1"
+msgstr "   ਹਟਾਓ    %1"
+
+#: history.cpp:214
+#, c-format
+msgid "Add %1"
+msgstr "   ਸ਼ਾਮਿਲ    %1"
+
+#: history.cpp:251
+#, c-format
+msgid "Edit %1"
+msgstr "   ਸੋਧ   %1"
+
+#: koeventpopupmenu.cpp:77
+msgid "&Toggle Reminder"
+msgstr "ਯਾਦ-ਪੱਤਰ ਤਬਦੀਲ(&T)"
+
+#: koeventpopupmenu.cpp:82
+msgid "&Dissociate This Occurrence"
+msgstr ""
+
+#: koeventpopupmenu.cpp:85
+msgid "&Dissociate Future Occurrences"
+msgstr ""
+
+#: koeventpopupmenu.cpp:89
 #, fuzzy
-msgid "&Timeline View"
-msgstr "ਕੇਂਦਰੀ ਝਲਕ"
+msgid "Send as iCalendar..."
+msgstr "&vਕੈਲੰਡਰ..."
 
-#: actionmanager.cpp:381
-msgid "&Refresh"
-msgstr "ਤਾਜ਼ਾ(&R)"
+#: korgac/testalarmdlg.cpp:39
+msgid "TestKabc"
+msgstr "TestKabc"
 
-#: actionmanager.cpp:389
-msgid "F&ilter"
-msgstr "ਫਿਲਟਰ"
+#: korgac/alarmdockwindow.cpp:56 korgac/korgacmain.cpp:65
+#: korgac/korgacmain.cpp:66
+msgid "KOrganizer Reminder Daemon"
+msgstr "ਕੇ-ਪਰਬੰਧਕ ਯਾਦਪੱਤਰ ਡਾਈਮੋਨ"
 
-#: actionmanager.cpp:404
-msgid "Zoom In Horizontally"
-msgstr "ਖਿਤਿਜੀ ਆਕਾਰ ਵੱਡਾ"
+#: korgac/korgacmain.cpp:70 korgac/korgacmain.cpp:72
+msgid "Maintainer"
+msgstr "ਪਰਬੰਧਕ"
 
-#: actionmanager.cpp:407
-msgid "Zoom Out Horizontally"
-msgstr "ਖਿਤਿਜੀ ਆਕਾਰ ਛੋਟਾ"
+#: korgac/alarmdockwindow.cpp:67
+msgid "Suspend All"
+msgstr "ਸਭ ਮੁਅਤੱਲ"
 
-#: actionmanager.cpp:410
-msgid "Zoom In Vertically"
-msgstr "ਲੰਬਕਾਰੀ ਆਕਾਰ ਵੱਡਾ"
+#: korgac/alarmdialog.cpp:104 korgac/alarmdockwindow.cpp:68
+msgid "Dismiss All"
+msgstr "ਸਭ ਰੱਦ"
 
-#: actionmanager.cpp:413
-msgid "Zoom Out Vertically"
-msgstr "ਲੰਬਕਾਰੀ ਆਕਾਰ ਛੋਟਾ"
+#: korgac/alarmdockwindow.cpp:73
+msgid "Reminders Enabled"
+msgstr "ਯਾਦਪੱਤਰ ਯੋਗ ਹੈ"
 
-#: actionmanager.cpp:422
-msgid "Go to &Today"
-msgstr "ਅੱਜ ਤੇ ਜਾਓ(&T)"
+#: korgac/alarmdockwindow.cpp:75
+msgid "Start Reminder Daemon at Login"
+msgstr "ਲਾਗਿੰਨ ਸਮੇਂ ਯਾਦ-ਪੱਤਰ ਡਾਈਮੋਨ ਚਲਾਓ"
 
-#: actionmanager.cpp:426
-msgid "Go &Backward"
-msgstr "ਪਿੱਛੇ ਵੱਲ ਜਾਓ(&B)"
+#: korgac/alarmdockwindow.cpp:134
+#, c-format
+msgid ""
+"_n: There is 1 active reminder.\n"
+"There are %n active reminders."
+msgstr ""
 
-#: actionmanager.cpp:438
-msgid "Go &Forward"
-msgstr "ਅੱਗੇ ਜਾਓ(&F)"
+#: korgac/alarmdockwindow.cpp:201
+msgid ""
+"Do you want to start the KOrganizer reminder daemon at login (note that you "
+"will not get reminders whilst the daemon is not running)?"
+msgstr ""
 
-#: actionmanager.cpp:448
-msgid "New E&vent..."
-msgstr "ਨਵੀਂ ਘਟਨਾ(&v)..."
+#: korgac/alarmdockwindow.cpp:203
+msgid "Close KOrganizer Reminder Daemon"
+msgstr ""
 
-#: actionmanager.cpp:462
-msgid "New &Journal..."
-msgstr "ਨਵਾਂ ਰੋਜ਼ਨਾਮਚਾ(&J)..."
+#: korgac/alarmdockwindow.cpp:204
+msgid "Start"
+msgstr "ਸ਼ੁਰੂ"
 
-#: actionmanager.cpp:477
-msgid "&Make Sub-to-do Independent"
+#: korgac/alarmdockwindow.cpp:204
+msgid "Do Not Start"
+msgstr "ਸ਼ੁਰੂ ਨਾ ਕਰੋ"
+
+#: kolistview.cpp:209 korgac/alarmdialog.cpp:102
+msgid "Reminder"
+msgstr "ਯਾਦ ਪੱਤਰ"
+
+#: korgac/alarmdialog.cpp:104
+msgid "Edit..."
+msgstr "ਸੋਧ..."
+
+#: korgac/alarmdialog.cpp:104
+#, fuzzy
+msgid "Dismiss Reminder"
+msgstr "ਯਾਦ ਪੱਤਰ ਸੋਧ"
+
+#: korgac/alarmdialog.cpp:116
+msgid "Suspend"
+msgstr "ਮੁਅਤੱਲ"
+
+#: korgac/alarmdialog.cpp:122
+msgid "The following items triggered reminders:"
 msgstr ""
 
-#: actionmanager.cpp:496
-msgid "&Publish Item Information..."
+#: korgac/alarmdialog.cpp:131
+#, fuzzy
+msgid "Date, Time"
+msgstr "ਮਿਤੀ ਤੇ ਸਮਾਂ"
+
+#: korgac/alarmdialog.cpp:151
+msgid "Suspend &duration:"
 msgstr ""
 
-#: actionmanager.cpp:501
-msgid "Send &Invitation to Attendees"
+#: korgac/alarmdialog.cpp:160
+msgid "week(s)"
+msgstr "ਹਫਤਾ"
+
+#: koeditorgeneral.cpp:396 korgac/alarmdialog.cpp:190
+msgid ""
+"_: elipsis\n"
+"..."
 msgstr ""
 
-#: actionmanager.cpp:508
-msgid "Re&quest Update"
-msgstr "ਬੇਨਤੀ ਅੱਪਡੇਟ(&q)"
+#: korgac/alarmdialog.cpp:330
+msgid "\"%1\" is a read-only item so modifications are not possible."
+msgstr ""
 
-#: actionmanager.cpp:515
-msgid "Send &Cancelation to Attendees"
+#: korgac/alarmdialog.cpp:338
+msgid "Could not start KOrganizer so editing is not possible."
 msgstr ""
 
-#: actionmanager.cpp:522
-msgid "Send Status &Update"
-msgstr "ਹਾਲਤ ਅੱਪਡੇਟ ਭੇਜੋ(&U)"
+#: korgac/alarmdialog.cpp:352
+msgid ""
+"An internal KOrganizer error occurred attempting to start the incidence editor"
+msgstr ""
 
-#: actionmanager.cpp:529
+#: koagendaview.cpp:629
 msgid ""
-"_: counter proposal\n"
-"Request Chan&ge"
-msgstr "ਬੇਨਤੀ ਤਬਦੀਲ(&g)"
+"_: short_weekday date (e.g. Mon 13)\n"
+"%1 %2"
+msgstr "%1 %2"
 
-#: actionmanager.cpp:536
-#, fuzzy
-msgid "&Send as iCalendar..."
-msgstr "&vਕੈਲੰਡਰ..."
+#: koagendaview.cpp:1569
+msgid "Unable to modify this to-do, because it cannot be locked."
+msgstr ""
 
-#: actionmanager.cpp:541
-msgid "&Mail Free Busy Information..."
-msgstr "ਵਿਹਲਾ-ਰੁਝਿਆ ਜਾਣਕਾਰੀ ਪੱਤਰ(&M)..."
+#: koagendaview.cpp:1756 korganizer.cpp:290 kotimelineview.cpp:55
+#: kotimelineview.cpp:123 kotodoview.cpp:395 resourceview.cpp:270
+#: resourceview.cpp:321
+msgid "Calendar"
+msgstr "ਕੈਲੰਡਰ"
 
-#: actionmanager.cpp:546
-msgid "&Upload Free Busy Information"
-msgstr "ਵਿਹਲਾ-ਰੁਝਿਆ ਜਾਣਕਾਰੀ ਅੱਪਲੋਡ ਕਰੋ(&U)"
+#: koeditorrecurrence.cpp:91
+msgid ""
+"The number of the week from the beginning of the month on which this event or "
+"to-do should recur."
+msgstr ""
 
-#: actionmanager.cpp:552
-msgid "&Addressbook"
-msgstr "ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ(&A)"
+#: koeditorrecurrence.cpp:95 koeditorrecurrence.cpp:259
+msgid "1st"
+msgstr "1ਹਿਲਾਂ"
 
-#: actionmanager.cpp:563
-msgid "Show Date Navigator"
-msgstr "ਮਿਤੀ ਬਕਸਾ ਵੇਖਾਓ"
+#: koeditorrecurrence.cpp:96 koeditorrecurrence.cpp:260
+msgid "2nd"
+msgstr "2ਜਾ"
 
-#: actionmanager.cpp:566
-msgid "Show To-do View"
-msgstr "ਕੰਮ ਕਾਰ ਝਲਕ ਵੇਖਾਓ"
+#: koeditorrecurrence.cpp:97 koeditorrecurrence.cpp:261
+msgid "3rd"
+msgstr "3ਜਾ"
 
-#: actionmanager.cpp:569
-msgid "Show Item Viewer"
-msgstr "ਘਟਨਾ ਝਲਕ ਵੇਖਾਓ"
+#: koeditorrecurrence.cpp:98 koeditorrecurrence.cpp:262
+msgid "4th"
+msgstr "4ਵਾਂ"
 
-#: actionmanager.cpp:588
-msgid "Show Resource View"
-msgstr "ਸਰੋਤ ਝਲਕ ਵੇਖਾਓ"
+#: koeditorrecurrence.cpp:99 koeditorrecurrence.cpp:263
+msgid "5th"
+msgstr "5ਵਾਂ"
 
-#: actionmanager.cpp:591
-msgid "Show &Resource Buttons"
-msgstr "ਸਰੋਤ ਬਟਨ ਵੇਖਾਓ(&R)"
+#: koeditorrecurrence.cpp:100 koeditorrecurrence.cpp:290
+msgid "Last"
+msgstr "ਅੰਤਿਮ"
 
-#: actionmanager.cpp:606
-msgid "Configure &Date && Time..."
-msgstr "ਮਿਤੀ ਅਤੇ ਸਮਾਂ ਸੰਰਚਨਾ(&D)..."
+#: koeditorrecurrence.cpp:101 koeditorrecurrence.cpp:291
+msgid "2nd Last"
+msgstr "2ਜਾ ਆਖਰੀ"
 
-#: actionmanager.cpp:613
-msgid "Manage View &Filters..."
-msgstr "ਵੇਖਣ ਫਿਲਟਰ ਪਰਬੰਧਨ(&F)..."
+#: koeditorrecurrence.cpp:102 koeditorrecurrence.cpp:292
+msgid "3rd Last"
+msgstr "3ਜਾ ਆਖਰੀ"
 
-#: actionmanager.cpp:616
-msgid "Manage C&ategories..."
-msgstr "ਵਰਗ ਪਰਬੰਧਨ(&a)..."
+#: koeditorrecurrence.cpp:103 koeditorrecurrence.cpp:293
+msgid "4th Last"
+msgstr "4ਵਾਂ ਆਖਰੀ"
 
-#: actionmanager.cpp:620
-msgid "&Configure Calendar..."
-msgstr "ਕੈਲੰਡਰ ਸੰਰਚਨਾ(&C)..."
+#: koeditorrecurrence.cpp:104 koeditorrecurrence.cpp:294
+msgid "5th Last"
+msgstr "5ਵਾਂ ਆਖਰੀ"
 
-#: actionmanager.cpp:645 actionmanager.cpp:647
-msgid "Filter: "
-msgstr "ਫਿਲਟਰ:"
+#: koeditorrecurrence.cpp:112
+msgid "The weekday on which this event or to-do should recur."
+msgstr ""
 
-#: actionmanager.cpp:709 actionmanager.cpp:797 actionmanager.cpp:1182
-msgid "*.vcs *.ics|Calendar Files"
-msgstr "*.vcs *.ics|ਕੈਲੰਡਰ ਫਾਇਲਾਂ"
+#: koeditorrecurrence.cpp:126
+msgid "The month during which this event or to-do should recur."
+msgstr ""
+
+#: koeditorrecurrence.cpp:143
+msgid "Sets how often this event or to-do should recur."
+msgstr ""
 
-#: actionmanager.cpp:748
+#: koeditorrecurrence.cpp:167 koeditorrecurrence.cpp:181
+#: koeditorrecurrence.cpp:232 koeditorrecurrence.cpp:405
+msgid "&Recur every"
+msgstr "ਦੁਹਰਾਓ(&R)"
+
+#: koeditorrecurrence.cpp:181
+msgid "week(s) on:"
+msgstr "ਹਫ਼ਤੇ 'ਤੇ:"
+
+#: koeditorrecurrence.cpp:199
+msgid "Day of the week on which this event or to-do should recur."
+msgstr ""
+
+#: koeditorrecurrence.cpp:232
+msgid "month(s)"
+msgstr "ਮਹੀਨੇ"
+
+#: koeditorrecurrence.cpp:244
+msgid "&Recur on the"
+msgstr ""
+
+#: koeditorrecurrence.cpp:249
 msgid ""
-"You have no ical file in your home directory.\n"
-"Import cannot proceed.\n"
+"Sets a specific day of the month on which this event or to-do should recur."
 msgstr ""
-"ਤੁਹਾਡੀ ਡਾਇਰੈਕਟਰੀ ਵਿੱਚ ical ਫਾਇਲ ਨਹੀਂ ਹੈ।\n"
-"ਆਯਾਤ ਸੰਭਵ ਨਹੀਂ ਹੈ।\n"
 
-#: actionmanager.cpp:771
+#: koeditorrecurrence.cpp:254 koeditorrecurrence.cpp:430
+msgid "The day of the month on which this event or to-do should recur."
+msgstr ""
+
+#: koeditorrecurrence.cpp:264
+msgid "6th"
+msgstr "6ਵਾਂ"
+
+#: koeditorrecurrence.cpp:265
+msgid "7th"
+msgstr "7ਵਾਂ"
+
+#: koeditorrecurrence.cpp:266
+msgid "8th"
+msgstr "8ਵਾਂ"
+
+#: koeditorrecurrence.cpp:267
+msgid "9th"
+msgstr "9ਵਾਂ"
+
+#: koeditorrecurrence.cpp:268
+msgid "10th"
+msgstr "10ਵਾਂ"
+
+#: koeditorrecurrence.cpp:269
+msgid "11th"
+msgstr "11ਵਾਂ"
+
+#: koeditorrecurrence.cpp:270
+msgid "12th"
+msgstr "12ਵਾਂ"
+
+#: koeditorrecurrence.cpp:271
+msgid "13th"
+msgstr "13ਵਾਂ"
+
+#: koeditorrecurrence.cpp:272
+msgid "14th"
+msgstr "14ਵਾਂ"
+
+#: koeditorrecurrence.cpp:273
+msgid "15th"
+msgstr "15ਵਾਂ"
+
+#: koeditorrecurrence.cpp:274
+msgid "16th"
+msgstr "16ਵਾਂ"
+
+#: koeditorrecurrence.cpp:275
+msgid "17th"
+msgstr "17ਵਾਂ"
+
+#: koeditorrecurrence.cpp:276
+msgid "18th"
+msgstr "18ਵਾਂ"
+
+#: koeditorrecurrence.cpp:277
+msgid "19th"
+msgstr "19ਵਾਂ"
+
+#: koeditorrecurrence.cpp:278
+msgid "20th"
+msgstr "20ਵਾਂ"
+
+#: koeditorrecurrence.cpp:279
+msgid "21st"
+msgstr "21ਵਾਂ"
+
+#: koeditorrecurrence.cpp:280
+msgid "22nd"
+msgstr "22ਵਾਂ"
+
+#: koeditorrecurrence.cpp:281
+msgid "23rd"
+msgstr "23ਵਾਂ"
+
+#: koeditorrecurrence.cpp:282
+msgid "24th"
+msgstr "24ਵਾਂ"
+
+#: koeditorrecurrence.cpp:283
+msgid "25th"
+msgstr "25ਵਾਂ"
+
+#: koeditorrecurrence.cpp:284
+msgid "26th"
+msgstr "26ਵਾਂ"
+
+#: koeditorrecurrence.cpp:285
+msgid "27th"
+msgstr "27ਵਾਂ"
+
+#: koeditorrecurrence.cpp:286
+msgid "28th"
+msgstr "28ਵਾਂ"
+
+#: koeditorrecurrence.cpp:287
+msgid "29th"
+msgstr "29ਵਾਂ"
+
+#: koeditorrecurrence.cpp:288
+msgid "30th"
+msgstr "30ਵਾਂ"
+
+#: koeditorrecurrence.cpp:289
+msgid "31st"
+msgstr "31ਵਾਂ"
+
+#: koeditorrecurrence.cpp:325
+msgid "day"
+msgstr "ਦਿਨ"
+
+#: koeditorrecurrence.cpp:332
 msgid ""
-"KOrganizer successfully imported and merged your .calendar file from ical into "
-"the currently opened calendar."
+"Sets a weekday and specific week in the month on which this event or to-do "
+"should recur"
 msgstr ""
 
-#: actionmanager.cpp:777
+#: koeditorrecurrence.cpp:405
+msgid "year(s)"
+msgstr "ਸਾਲ"
+
+#: koeditorrecurrence.cpp:419
 msgid ""
-"KOrganizer encountered some unknown fields while parsing your .calendar ical "
-"file, and had to discard them; please check to see that all your relevant data "
-"was correctly imported."
+"_: part before XXX of 'Recur on day XXX of month YYY'\n"
+"&Recur on day "
+msgstr "ਦਿਨ ਤੇ ਦੁਹਰਾਉ(&R)"
+
+#: koeditorrecurrence.cpp:421
+msgid "&Day "
+msgstr "ਦਿਨ "
+
+#: koeditorrecurrence.cpp:425
+msgid ""
+"Sets a specific day in a specific month on which this event or to-do should "
+"recur."
 msgstr ""
 
-#: actionmanager.cpp:781
-msgid "ICal Import Successful with Warning"
-msgstr "ICal ਆਯਾਤ ਚੇਤਾਵਨੀ ਨਾਲ ਸਫਲ ਰਿਹਾ ਹੈ।"
+#: koeditorrecurrence.cpp:434
+msgid ""
+"_: part between XXX and YYY of 'Recur on day XXX of month YYY'\n"
+" &of "
+msgstr " &of "
 
-#: actionmanager.cpp:784
+#: koeditorrecurrence.cpp:448
 msgid ""
-"KOrganizer encountered an error parsing your .calendar file from ical; import "
-"has failed."
+"_: Part before XXX in 'Recur on NNN. WEEKDAY of MONTH', short version\n"
+"&On"
+msgstr "&On"
+
+#: koeditorrecurrence.cpp:450
+msgid ""
+"_: Part before XXX in 'Recur on NNN. WEEKDAY of MONTH'\n"
+"&On the"
 msgstr ""
 
-#: actionmanager.cpp:788
+#: koeditorrecurrence.cpp:454
 msgid ""
-"KOrganizer does not think that your .calendar file is a valid ical calendar; "
-"import has failed."
+"Sets a specific day in a specific week of a specific month on which this event "
+"or to-do should recur."
 msgstr ""
 
-#: actionmanager.cpp:870
-msgid "New calendar '%1'."
-msgstr "ਨਵਾਂ ਕੈਲੰਡਰ '%1'"
+#: koeditorrecurrence.cpp:465
+msgid ""
+"_: part between WEEKDAY and MONTH in 'Recur on NNN. WEEKDAY of MONTH'\n"
+" o&f "
+msgstr "ਬੰਦ(&f)"
 
-#: actionmanager.cpp:905
-msgid "Cannot download calendar from '%1'."
-msgstr "'%1' ਤੋਂ ਕੈਲੰਡਰ ਡਾਊਨਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
+#: koeditorrecurrence.cpp:480
+msgid "Day #"
+msgstr "ਦਿਨ #"
 
-#: actionmanager.cpp:943
-msgid "Added calendar resource for URL '%1'."
+#: koeditorrecurrence.cpp:482
+msgid "Recur on &day #"
 msgstr ""
 
-#: actionmanager.cpp:951
-msgid "Unable to create calendar resource '%1'."
-msgstr "'%1' ਕੈਲੰਡਰ ਸਰੋਤ ਬਣਾਉਣ ਲਈ ਅਸਫ਼ਲ ਹੈ।"
+#: koeditorrecurrence.cpp:484
+msgid ""
+"Sets a specific day within the year on which this event or to-do should recur."
+msgstr ""
 
-#: actionmanager.cpp:962
-msgid "Merged calendar '%1'."
-msgstr "ਮਿਲਾਨ ਕੈਲੰਡਰ '%1'"
+#: koeditorrecurrence.cpp:495
+msgid ""
+"_: part after NNN of 'Recur on day #NNN of the year'\n"
+" of the &year"
+msgstr " ਸਾਲ ਦੇ (&y)"
 
-#: actionmanager.cpp:965
-msgid "Opened calendar '%1'."
-msgstr "ਖੁੱਲਾ ਕੈਲੰਡਰ '%1'"
+#: koeditorrecurrence.cpp:498
+msgid ""
+"_: part after NNN of 'Recur on day #NNN of the year', short version\n"
+" of the year"
+msgstr " ਦਾ ਸਾਲ"
+
+#: koeditorrecurrence.cpp:581
+msgid "E&xceptions"
+msgstr "ਅਪਵਾਦ(&x)"
 
-#: actionmanager.cpp:990
+#: koeditorrecurrence.cpp:591
 msgid ""
-"Your calendar will be saved in iCalendar format. Use 'Export vCalendar' to save "
-"in vCalendar format."
+"A date that should be considered an exception to the recurrence rules for this "
+"event or to-do."
 msgstr ""
 
-#: actionmanager.cpp:992
-msgid "Format Conversion"
-msgstr "ਪ੍ਰਤੀਰੂਪ ਤਬਦੀਲੀ"
+#: koeditorrecurrence.cpp:597
+msgid ""
+"_: Add a new recurrence to the recurrence list\n"
+"&Add"
+msgstr ""
 
-#: actionmanager.cpp:1016
-msgid "Cannot upload calendar to '%1'"
-msgstr "'%1' ਤੇ ਕੈਲੰਡਰ ਅੱਪਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ"
+#: koeditorrecurrence.cpp:599
+msgid ""
+"Add this date as an exception to the recurrence rules for this event or to-do."
+msgstr ""
 
-#: actionmanager.cpp:1029
-msgid "Saved calendar '%1'."
-msgstr "ਕੈਲੰਡਰ '%1' ਸੰਭਾਲਿਆ ਹੈ।"
+#: koeditorrecurrence.cpp:602
+msgid "&Change"
+msgstr "ਤਬਦੀਲ(&C)"
 
-#: actionmanager.cpp:1089
-msgid "Could not upload file."
-msgstr "ਫਾਇਲ ਨੂੰ ਅੱਪਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
+#: koeditorrecurrence.cpp:604
+msgid "Replace the currently selected date with this date."
+msgstr ""
 
-#: actionmanager.cpp:1130
-#, c-format
-msgid "Unable to save calendar to the file %1."
+#: koeditorrecurrence.cpp:608
+msgid ""
+"Delete the currently selected date from the list of dates that should be "
+"considered exceptions to the recurrence rules for this event or to-do."
 msgstr ""
 
-#: actionmanager.cpp:1155
+#: koeditorrecurrence.cpp:615
 msgid ""
-"The calendar has been modified.\n"
-"Do you want to save it?"
+"Displays current dates that are being considered exceptions to the recurrence "
+"rules for this event or to-do."
 msgstr ""
-"ਕੈਲੰਡਰ ਸੋਧਿਆ ਗਿਆ ਹੈ।\n"
-"ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਸੰਭਾਲਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: actionmanager.cpp:1258
-#, c-format
+#: koeditorrecurrence.cpp:679
+msgid "Edit Exceptions"
+msgstr "ਅਪਵਾਦ ਸੋਧ"
+
+#: koeditorrecurrence.cpp:703
+msgid "Recurrence Range"
+msgstr "ਆਵਰਤੀ ਸੀਮਾ"
+
+#: koeditorrecurrence.cpp:706
 msgid ""
-"_n: &Next Day\n"
-"&Next %n Days"
+"Sets a range for which these recurrence rules will apply to this event or "
+"to-do."
 msgstr ""
-"ਅਗਲੇ ਦਿਨ(&N)\n"
-"ਅਗਲੇ %n ਦਿਨ (&N)"
 
-#: actionmanager.cpp:1292
-msgid "Could not start control module for date and time format."
+#: koeditorrecurrence.cpp:714
+msgid "Begin on:"
+msgstr "ਸ਼ੁਰੂ:"
+
+#: koeditorrecurrence.cpp:716
+msgid "The date on which the recurrences for this event or to-do should begin."
 msgstr ""
 
-#: actionmanager.cpp:1433
-msgid "&Show Event"
-msgstr "ਘਟਨਾ ਵੇਖਾਓ"
+#: koeditorrecurrence.cpp:723
+msgid "&No ending date"
+msgstr "ਕੋਈ ਸਮਾਪਤੀ ਮਿਤੀ ਨਹੀਂ(&N)"
 
-#: actionmanager.cpp:1434
-msgid "&Edit Event..."
-msgstr "ਘਟਨ ਸੋਧ(&E)..."
+#: koeditorrecurrence.cpp:725
+msgid "Sets the event or to-do to recur forever."
+msgstr ""
 
-#: actionmanager.cpp:1435
-msgid "&Delete Event"
-msgstr "ਘਟਨਾ ਹਟਾਓ"
+#: koeditorrecurrence.cpp:732
+msgid "End &after"
+msgstr "ਬਾਅਦ ਮੁਕੰਮਲ(&a)"
 
-#: actionmanager.cpp:1439
-msgid "&Show To-do"
-msgstr "ਕੰਮ-ਕਾਰ ਵੇਖਾਓ"
+#: koeditorrecurrence.cpp:734
+msgid ""
+"Sets the event or to-do to stop recurring after a certain number of "
+"occurrences."
+msgstr ""
 
-#: actionmanager.cpp:1440
-msgid "&Edit To-do..."
-msgstr "ਕੰਮ-ਕਾਰ ਸੋਧ..."
+#: koeditorrecurrence.cpp:739
+msgid "Number of times the event or to-do should recur before stopping."
+msgstr ""
 
-#: actionmanager.cpp:1441
-msgid "&Delete To-do"
-msgstr "ਕੰਮ-ਕਾਰ ਹਟਾਓ"
+#: koeditorrecurrence.cpp:745
+msgid "&occurrence(s)"
+msgstr "ਦੁਹਰਾਉ(&o)"
 
-#: actionmanager.cpp:1560 actionmanager.cpp:1675
-msgid "Attach as &link"
+#: koeditorrecurrence.cpp:753
+msgid "End &on:"
+msgstr "ਮੁਕੰਮਲ:"
+
+#: koeditorrecurrence.cpp:755
+msgid "Sets the event or to-do to stop recurring on a certain date."
 msgstr ""
 
-#: actionmanager.cpp:1561 actionmanager.cpp:1676
-#, fuzzy
-msgid "Attach &inline"
-msgstr "ਨੱਥੀ"
+#: koeditorrecurrence.cpp:762
+msgid "Date after which the event or to-do should stop recurring"
+msgstr ""
 
-#: actionmanager.cpp:1562
-msgid "Attach inline &without attachments"
+#: koeditorrecurrence.cpp:826
+#, c-format
+msgid "Begins on: %1"
+msgstr "ਸ਼ੁਰੂ: %1"
+
+#: koeditorrecurrence.cpp:834
+msgid "Edit Recurrence Range"
+msgstr "ਆਵਰਤੀ ਸੀਮਾ ਸੋਧ"
+
+#: koeditorrecurrence.cpp:881
+msgid "Sets the type of recurrence this event or to-do should have."
 msgstr ""
 
-#: actionmanager.cpp:1564 actionmanager.cpp:1678
-msgid "C&ancel"
+#: koeditorrecurrence.cpp:883
+msgid "Daily"
+msgstr "ਰੋਜ਼"
+
+#: koeditorrecurrence.cpp:884
+msgid "Weekly"
+msgstr "ਹਫਤਾਵਾਰੀ"
+
+#: koeditorrecurrence.cpp:885
+msgid "Monthly"
+msgstr "ਮਹੀਨਾਵਾਰੀ"
+
+#: koeditorrecurrence.cpp:886
+msgid "Yearly"
+msgstr "ਸਾਲਨਾ"
+
+#: koeditorrecurrence.cpp:898
+msgid "&Daily"
+msgstr "ਰੋਜ਼(&D)"
+
+#: koeditorrecurrence.cpp:900
+msgid ""
+"Sets the event or to-do to recur daily according to the specified rules."
 msgstr ""
 
-#: actionmanager.cpp:1594
-msgid "Removing attachments from an email might invalidate its signature."
+#: koeditorrecurrence.cpp:902
+msgid "&Weekly"
+msgstr "ਹਫਤਾਵਾਰੀ(&W)"
+
+#: koeditorrecurrence.cpp:904
+msgid ""
+"Sets the event or to-do to recur weekly according to the specified rules."
 msgstr ""
 
-#: actionmanager.cpp:1595
-#, fuzzy
-msgid "Remove Attachments"
-msgstr "ਨੱਥੀ"
+#: koeditorrecurrence.cpp:906
+msgid "&Monthly"
+msgstr "ਮਹੀਨਾਵਾਰੀ(&M)"
 
-#: actionmanager.cpp:1764
-msgid "Undo (%1)"
-msgstr "ਵਾਪਿਸ (%1)"
+#: koeditorrecurrence.cpp:908
+msgid ""
+"Sets the event or to-do to recur monthly according to the specified rules."
+msgstr ""
 
-#: actionmanager.cpp:1776
-msgid "Redo (%1)"
-msgstr "ਮੁੜ ਵਾਪਿਸ(%1)"
+#: koeditorrecurrence.cpp:910
+msgid "&Yearly"
+msgstr "ਸਾਲਨਾ(&Y)"
 
-#: actionmanager.cpp:1788
+#: koeditorrecurrence.cpp:912
 msgid ""
-"The calendar contains unsaved changes. Do you want to save them before exiting?"
+"Sets the event or to-do to recur yearly according to the specified rules."
 msgstr ""
 
-#: actionmanager.cpp:1793
-msgid "Unable to save the calendar. Do you still want to close this window?"
+#: koeditorrecurrence.cpp:974
+msgid "&Enable recurrence"
+msgstr "ਆਵਰਤੀ ਯੋਗ(&E)"
+
+#: koeditorrecurrence.cpp:976
+msgid ""
+"Enables recurrence for this event or to-do according to the specified rules."
 msgstr ""
 
-#: actionmanager.cpp:1814
-msgid "Unable to exit. Saving still in progress."
+#: koeditorrecurrence.cpp:983
+msgid "Appointment Time "
+msgstr "ਮੁਲਾਕਾਤ ਸਮਾਂ"
+
+#: koeditorrecurrence.cpp:986
+msgid "Displays appointment time information."
+msgstr "ਮੁਲਾਕਾਤ ਸਮਾਂ ਜਾਣਕਾਰੀ ਵੇਖਾਓ।"
+
+#: koeditorrecurrence.cpp:1005
+msgid "Recurrence Rule"
+msgstr "ਆਵਰਤੀ ਨਿਯਮ"
+
+#: koeditorrecurrence.cpp:1007
+msgid ""
+"Options concerning the type of recurrence this event or to-do should have."
 msgstr ""
 
-#: actionmanager.cpp:1853
+#: koeditorrecurrence.cpp:1044
+msgid "Recurrence Range..."
+msgstr "ਆਵਰਤੀ ਸੀਮਾ..."
+
+#: koeditorrecurrence.cpp:1047 koeditorrecurrence.cpp:1064
 msgid ""
-"Saving of '%1' failed. Check that the resource is properly configured.\n"
-"Ignore problem and continue without saving or cancel save?"
+"Options concerning the time range during which this event or to-do should "
+"recur."
 msgstr ""
 
-#: actionmanager.cpp:1856
-msgid "Save Error"
-msgstr "ਸੰਭਾਲਣ ਗਲਤੀ"
+#: koeditorrecurrence.cpp:1056
+msgid "Exceptions..."
+msgstr "ਅਪਵਾਦ..."
 
-#: actionmanager.cpp:1867
-msgid "URL '%1' is invalid."
-msgstr "URL '%1' ਠੀਕ ਨਹੀਂ ਹੈ।"
+#: koeditorrecurrence.cpp:1396
+msgid ""
+"The end date '%1' of the recurrence must be after the start date '%2' of the "
+"event."
+msgstr ""
+
+#: koeditorrecurrence.cpp:1410
+msgid ""
+"A weekly recurring event or task has to have at least one weekday associated "
+"with it."
+msgstr ""
+
+#: koeditorrecurrence.cpp:1637
+#, fuzzy
+msgid "Recurrence"
+msgstr "ਆਵਰਤੀ"
 
 #. i18n: file korganizer_part.rc line 11
-#: rc.cpp:6 rc.cpp:54 rc.cpp:1496 rc.cpp:1544
+#: rc.cpp:6 rc.cpp:54 rc.cpp:1041 rc.cpp:2018
 #, no-c-format
 msgid "&Import"
 msgstr "ਆਯਾਤ(&I)"
 
 #. i18n: file korganizer_part.rc line 18
-#: rc.cpp:9 rc.cpp:57 rc.cpp:1499 rc.cpp:1547
+#: rc.cpp:9 rc.cpp:57 rc.cpp:1044 rc.cpp:2021
 #, no-c-format
 msgid "&Export"
 msgstr "ਨਿਰਯਾਤ(&E)"
 
 #. i18n: file korganizer_part.rc line 73
-#: rc.cpp:21 rc.cpp:69 rc.cpp:1511 rc.cpp:1559
+#: rc.cpp:21 rc.cpp:69 rc.cpp:1056 rc.cpp:2033
 #, no-c-format
 msgid "&Go"
 msgstr "ਜਾਓ(&G)"
 
 #. i18n: file korganizer_part.rc line 80
-#: rc.cpp:24 rc.cpp:72 rc.cpp:1514 rc.cpp:1562
+#: rc.cpp:24 rc.cpp:72 rc.cpp:1059 rc.cpp:2036
 #, no-c-format
 msgid "&Actions"
 msgstr "ਕਾਰਵਾਈ(&A)"
 
 #. i18n: file korganizer_part.rc line 95
-#: rc.cpp:27 rc.cpp:75 rc.cpp:1517 rc.cpp:1565
+#: rc.cpp:27 rc.cpp:75 rc.cpp:1062 rc.cpp:2039
 #, no-c-format
 msgid "S&chedule"
 msgstr "ਕਾਰਜ-ਸੂਚੀ(&c)"
 
 #. i18n: file korganizer_part.rc line 108
-#: rc.cpp:33 rc.cpp:81 rc.cpp:1523 rc.cpp:1571
+#: rc.cpp:33 rc.cpp:81 rc.cpp:1068 rc.cpp:2045
 #, no-c-format
 msgid "&Sidebar"
 msgstr "ਬਾਹੀ(&S)"
 
 #. i18n: file korganizer_part.rc line 131
-#: rc.cpp:39 rc.cpp:87 rc.cpp:1529 rc.cpp:1577
+#: rc.cpp:39 rc.cpp:87 rc.cpp:1074 rc.cpp:2051
 #, no-c-format
 msgid "Main"
 msgstr "ਮੁੱਖ"
 
 #. i18n: file korganizer_part.rc line 140
-#: rc.cpp:42 rc.cpp:90 rc.cpp:1532 rc.cpp:1580
+#: rc.cpp:42 rc.cpp:90 rc.cpp:1077 rc.cpp:2054
 #, no-c-format
 msgid "Views"
 msgstr "ਦਰਿਸ਼"
 
 #. i18n: file korganizer_part.rc line 154
-#: rc.cpp:45 rc.cpp:93 rc.cpp:1535 rc.cpp:1583
+#: rc.cpp:45 rc.cpp:93 rc.cpp:1080 rc.cpp:2057
 #, no-c-format
 msgid "Schedule"
 msgstr "ਕਾਰਜ-ਸੂਚੀ"
 
 #. i18n: file korganizer_part.rc line 160
-#: rc.cpp:48 rc.cpp:96 rc.cpp:1538 rc.cpp:1586
+#: rc.cpp:48 rc.cpp:96 rc.cpp:1083 rc.cpp:2060
 #, no-c-format
 msgid "Filters Toolbar"
 msgstr "ਫਿਲਟਰ ਸੰਦ-ਪੱਟੀ"
 
 #. i18n: file filteredit_base.ui line 45
-#: rc.cpp:105 rc.cpp:2081
+#: rc.cpp:105 rc.cpp:2189
 #, no-c-format
 msgid "Filter Details"
 msgstr "ਫਿਲਟਰ ਵੇਰਵਾ"
 
 #. i18n: file filteredit_base.ui line 64
-#: rc.cpp:108 rc.cpp:423 rc.cpp:1865 rc.cpp:2084
+#: rc.cpp:108 rc.cpp:426 rc.cpp:2168 rc.cpp:2192
 #, no-c-format
 msgid "Name:"
 msgstr "ਨਾਂ:"
 
 #. i18n: file filteredit_base.ui line 79
-#: rc.cpp:111 rc.cpp:2087
+#: rc.cpp:111 rc.cpp:2195
 #, no-c-format
 msgid "Hide &recurring events and to-dos"
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 82
-#: rc.cpp:114 rc.cpp:2090
+#: rc.cpp:114 rc.cpp:2198
 #, no-c-format
 msgid ""
 "Select this option if you do not want to show recurring events and to-dos in "
@@ -2880,13 +4475,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 90
-#: rc.cpp:117 rc.cpp:2093
+#: rc.cpp:117 rc.cpp:2201
 #, no-c-format
 msgid "Hide co&mpleted to-dos"
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 93
-#: rc.cpp:120 rc.cpp:2096
+#: rc.cpp:120 rc.cpp:2204
 #, no-c-format
 msgid ""
 "If this box is checked, the filter will hide all to-do items from the list, "
@@ -2895,13 +4490,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 129
-#: rc.cpp:123 rc.cpp:2099
+#: rc.cpp:123 rc.cpp:2207
 #, no-c-format
 msgid "Days after completion:"
 msgstr "ਮੁਕੰਮਲ ਕਰਨ ਉਪਰੰਤ ਦਿਨ:"
 
 #. i18n: file filteredit_base.ui line 135
-#: rc.cpp:126 rc.cpp:2102
+#: rc.cpp:126 rc.cpp:2210
 #, no-c-format
 msgid ""
 "This option will allow you to select which completed to-dos should be hidden. "
@@ -2910,13 +4505,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 152
-#: rc.cpp:129 rc.cpp:2105
+#: rc.cpp:129 rc.cpp:2213
 #, no-c-format
 msgid "Immediately"
 msgstr "ਤੁਰੰਤ"
 
 #. i18n: file filteredit_base.ui line 155
-#: rc.cpp:132 rc.cpp:2108
+#: rc.cpp:132 rc.cpp:2216
 #, no-c-format
 msgid ""
 "Here you can give the number of days a to-do item has to be completed to be "
@@ -2926,13 +4521,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 182
-#: rc.cpp:135 rc.cpp:2111
+#: rc.cpp:135 rc.cpp:2219
 #, no-c-format
 msgid "Hide &inactive to-dos"
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 185
-#: rc.cpp:138 rc.cpp:2114
+#: rc.cpp:138 rc.cpp:2222
 #, no-c-format
 msgid ""
 "This option hides all to-dos from your list, where the start date has not been "
@@ -2940,13 +4535,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 235
-#: rc.cpp:144 rc.cpp:2120
+#: rc.cpp:144 rc.cpp:2228
 #, no-c-format
 msgid "Show all except selected"
 msgstr "ਸਭ, ਪਰ ਚੁਣੇ ਛੱਡ ਕੇ ਵੇਖਾਓ"
 
 #. i18n: file filteredit_base.ui line 244
-#: rc.cpp:147 rc.cpp:2123
+#: rc.cpp:147 rc.cpp:2231
 #, no-c-format
 msgid ""
 "When this option is enabled, this filter will show all items which do <i>not</i> "
@@ -2954,13 +4549,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 252
-#: rc.cpp:150 rc.cpp:2126
+#: rc.cpp:150 rc.cpp:2234
 #, no-c-format
 msgid "Show only selected"
 msgstr "ਸਿਰਫ ਚੁਣੇ ਹੀ ਵੇਖਾਓ"
 
 #. i18n: file filteredit_base.ui line 261
-#: rc.cpp:153 rc.cpp:2129
+#: rc.cpp:153 rc.cpp:2237
 #, no-c-format
 msgid ""
 "When this option is enabled, this filter will show all items containing at "
@@ -2968,19 +4563,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 269
-#: rc.cpp:156 rc.cpp:2132
+#: rc.cpp:156 rc.cpp:2240
 #, no-c-format
 msgid "Change..."
 msgstr "ਤਬਦੀਲ..."
 
 #. i18n: file filteredit_base.ui line 282
-#: rc.cpp:159 rc.cpp:2135
+#: rc.cpp:159 rc.cpp:2243
 #, no-c-format
 msgid "Hide to-dos not assigned to me"
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 289
-#: rc.cpp:162 rc.cpp:2138
+#: rc.cpp:162 rc.cpp:2246
 #, no-c-format
 msgid ""
 "This option hides all to-dos from your list which are assigned to someone else."
@@ -2990,184 +4585,180 @@ msgid ""
 msgstr ""
 
 #. i18n: file koeditoralarms_base.ui line 16
-#: rc.cpp:166 rc.cpp:1880
+#: rc.cpp:166 rc.cpp:2063
 #, no-c-format
 msgid "Alarms"
 msgstr "ਅਲਾਰਮ"
 
 #. i18n: file koeditoralarms_base.ui line 30
-#: rc.cpp:169 rc.cpp:262 rc.cpp:1883 rc.cpp:1976
+#: rc.cpp:169 rc.cpp:259 rc.cpp:2066 rc.cpp:2156
 #, no-c-format
 msgid "Time Offset"
 msgstr ""
 
-#. i18n: file koeditoralarms_base.ui line 80
-#: rc.cpp:181 rc.cpp:1895
+#. i18n: file koeditoralarms_base.ui line 86
+#: koeditorgeneral.cpp:240 koeditorgeneral.cpp:439 koeditorgeneral.cpp:444
+#: rc.cpp:181 rc.cpp:2078
 #, no-c-format
 msgid "before the start"
 msgstr ""
 
-#. i18n: file koeditoralarms_base.ui line 85
-#: rc.cpp:184 rc.cpp:1898
+#. i18n: file koeditoralarms_base.ui line 91
+#: rc.cpp:184 rc.cpp:2081
 #, no-c-format
 msgid "after the start"
 msgstr ""
 
-#. i18n: file koeditoralarms_base.ui line 90
-#: rc.cpp:187 rc.cpp:1901
+#. i18n: file koeditoralarms_base.ui line 96
+#: rc.cpp:187 rc.cpp:2084
 #, no-c-format
 msgid "before the end"
 msgstr ""
 
-#. i18n: file koeditoralarms_base.ui line 95
-#: rc.cpp:190 rc.cpp:1904
+#. i18n: file koeditoralarms_base.ui line 101
+#: rc.cpp:190 rc.cpp:2087
 #, no-c-format
 msgid "after the end"
 msgstr ""
 
-#. i18n: file koeditoralarms_base.ui line 128
-#: rc.cpp:193 rc.cpp:1907
+#. i18n: file koeditoralarms_base.ui line 134
+#: rc.cpp:193 rc.cpp:2090
 #, no-c-format
 msgid "&How often:"
 msgstr "ਕਿੰਨੀ ਵਾਰ:"
 
-#. i18n: file koeditoralarms_base.ui line 142
-#: rc.cpp:196 rc.cpp:1910
+#. i18n: file koeditoralarms_base.ui line 148
+#: rc.cpp:196 rc.cpp:2093
 #, no-c-format
 msgid " time(s)"
 msgstr " ਸਮਾਂ"
 
-#. i18n: file koeditoralarms_base.ui line 159
-#: rc.cpp:199 rc.cpp:1913
+#. i18n: file koeditoralarms_base.ui line 165
+#: rc.cpp:199 rc.cpp:2096
 #, no-c-format
 msgid "&Interval:"
 msgstr "ਅੰਤਰਾਲ"
 
-#. i18n: file koeditoralarms_base.ui line 178
-#: rc.cpp:202 rc.cpp:1916
+#. i18n: file koeditoralarms_base.ui line 184
+#: rc.cpp:202 rc.cpp:2099
 #, no-c-format
 msgid "&Repeat:"
 msgstr ""
 
-#. i18n: file koeditoralarms_base.ui line 189
-#: rc.cpp:205 rc.cpp:1919
+#. i18n: file koeditoralarms_base.ui line 195
+#: rc.cpp:205 rc.cpp:2102
 #, no-c-format
 msgid "every "
 msgstr "ਹਰ "
 
-#. i18n: file koeditoralarms_base.ui line 192
-#: rc.cpp:208 rc.cpp:1922
+#. i18n: file koeditoralarms_base.ui line 198
+#: rc.cpp:208 rc.cpp:2105
 #, no-c-format
 msgid " minute(s)"
 msgstr ""
 
-#. i18n: file koeditoralarms_base.ui line 210
-#: rc.cpp:211 rc.cpp:259 rc.cpp:1925 rc.cpp:1973
+#. i18n: file koeditoralarms_base.ui line 216
+#: rc.cpp:211 rc.cpp:256 rc.cpp:2108 rc.cpp:2153
 #, no-c-format
 msgid "Type"
 msgstr "ਕਿਸਮ"
 
-#. i18n: file koeditoralarms_base.ui line 252
-#: rc.cpp:214 rc.cpp:1928
+#. i18n: file koeditoralarms_base.ui line 258
+#: rc.cpp:214 rc.cpp:2111
 #, no-c-format
 msgid "&Reminder Dialog"
 msgstr ""
 
-#. i18n: file koeditoralarms_base.ui line 263
-#: rc.cpp:217 rc.cpp:1931
+#. i18n: file koeditoralarms_base.ui line 269
+#: rc.cpp:217 rc.cpp:2114
 #, no-c-format
 msgid "A&udio"
 msgstr ""
 
-#. i18n: file koeditoralarms_base.ui line 341
-#: rc.cpp:226 rc.cpp:1940
+#. i18n: file koeditoralarms_base.ui line 347
+#: rc.cpp:226 rc.cpp:2123
 #, no-c-format
 msgid "Reminder Dialog &text:"
 msgstr ""
 
-#. i18n: file koeditoralarms_base.ui line 373
-#: rc.cpp:229 rc.cpp:1943
+#. i18n: file koeditoralarms_base.ui line 379
+#: rc.cpp:229 rc.cpp:2126
 #, no-c-format
 msgid "Audio &file:"
 msgstr ""
 
-#. i18n: file koeditoralarms_base.ui line 384
-#: rc.cpp:232 rc.cpp:1946
+#. i18n: file koeditoralarms_base.ui line 390
+#: rc.cpp:232 rc.cpp:2129
 #, no-c-format
 msgid "audio/x-wav audio/x-mp3 application/ogg"
 msgstr ""
 
-#. i18n: file koeditoralarms_base.ui line 425
-#: rc.cpp:235 rc.cpp:1949
+#. i18n: file koeditoralarms_base.ui line 431
+#: rc.cpp:235 rc.cpp:2132
 #, no-c-format
 msgid "&Program file:"
 msgstr ""
 
-#. i18n: file koeditoralarms_base.ui line 436
-#: rc.cpp:238 rc.cpp:1952
+#. i18n: file koeditoralarms_base.ui line 442
+#: rc.cpp:238 rc.cpp:2135
 #, no-c-format
 msgid "*.*|All files"
 msgstr "*.*|ਸਭ ਫਾਇਲਾਂ"
 
-#. i18n: file koeditoralarms_base.ui line 444
-#: rc.cpp:241 rc.cpp:1955
+#. i18n: file koeditoralarms_base.ui line 450
+#: rc.cpp:241 rc.cpp:2138
 #, no-c-format
 msgid "Program ar&guments:"
 msgstr ""
 
-#. i18n: file koeditoralarms_base.ui line 493
-#: rc.cpp:244 rc.cpp:1958
+#. i18n: file koeditoralarms_base.ui line 499
+#: rc.cpp:244 rc.cpp:2141
 #, no-c-format
 msgid "Email &message text:"
 msgstr ""
 
-#. i18n: file koeditoralarms_base.ui line 514
-#: rc.cpp:247 rc.cpp:1961
+#. i18n: file koeditoralarms_base.ui line 520
+#: rc.cpp:247 rc.cpp:2144
 #, no-c-format
 msgid "Email &address(es):"
 msgstr ""
 
-#. i18n: file koeditoralarms_base.ui line 538
-#: rc.cpp:250 rc.cpp:1964
-#, no-c-format
-msgid "&Remove..."
-msgstr "ਹਟਾਉ..."
-
-#. i18n: file koeditoralarms_base.ui line 554
-#: rc.cpp:256 rc.cpp:1970
+#. i18n: file koeditoralarms_base.ui line 560
+#: rc.cpp:253 rc.cpp:2150
 #, no-c-format
 msgid "D&uplicate"
 msgstr ""
 
-#. i18n: file koeditoralarms_base.ui line 599
-#: rc.cpp:265 rc.cpp:1979
+#. i18n: file koeditoralarms_base.ui line 605
+#: rc.cpp:262 rc.cpp:2159
 #, no-c-format
 msgid "Repeat"
 msgstr "ਦੁਹਰਾਓ"
 
 #. i18n: file kogroupwareprefspage.ui line 31
-#: rc.cpp:268 rc.cpp:891
+#: rc.cpp:265 rc.cpp:1860
 #, no-c-format
 msgid "P&ublish"
 msgstr "ਪਰਕਾਸ਼ਤ(&u)"
 
 #. i18n: file kogroupwareprefspage.ui line 42
-#: rc.cpp:271 rc.cpp:894
+#: rc.cpp:268 rc.cpp:1863
 #, no-c-format
 msgid ""
 "By publishing Free/Busy information, you allow others to take your calendar "
 "into account when inviting you for a meeting. Only the times you have already "
-"busy are published, not why they are busy."
+"busy are published, not why they are busy. For Kolab2 Server leave this "
+"disabled (the information is generated on the server)."
 msgstr ""
 
 #. i18n: file kogroupwareprefspage.ui line 53
-#: rc.cpp:274 rc.cpp:897
+#: rc.cpp:271 rc.cpp:1866
 #, no-c-format
 msgid "Publish your free/&busy information automatically"
 msgstr ""
 
 #. i18n: file kogroupwareprefspage.ui line 58
-#: rc.cpp:277 rc.cpp:900
+#: rc.cpp:274 rc.cpp:1869
 #, no-c-format
 msgid ""
 "Check this box to upload your Free/Busy information automatically.\n"
@@ -3179,13 +4770,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file kogroupwareprefspage.ui line 74
-#: rc.cpp:282 rc.cpp:905
+#: rc.cpp:279 rc.cpp:1874
 #, no-c-format
 msgid "Minimum time between uploads (in minutes):"
 msgstr ""
 
 #. i18n: file kogroupwareprefspage.ui line 80
-#: rc.cpp:285 rc.cpp:288 rc.cpp:908 rc.cpp:911
+#: rc.cpp:282 rc.cpp:285 rc.cpp:1877 rc.cpp:1880
 #, no-c-format
 msgid ""
 "Configure minimum the interval of time in minutes between each upload here. "
@@ -3194,13 +4785,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file kogroupwareprefspage.ui line 109
-#: rc.cpp:291 rc.cpp:914
+#: rc.cpp:288 rc.cpp:1883
 #, no-c-format
 msgid "Publish"
 msgstr "ਪ੍ਰਕਾਸ਼ਿਤ"
 
 #. i18n: file kogroupwareprefspage.ui line 115
-#: rc.cpp:294 rc.cpp:297 rc.cpp:303 rc.cpp:917 rc.cpp:920 rc.cpp:926
+#: rc.cpp:291 rc.cpp:294 rc.cpp:300 rc.cpp:1886 rc.cpp:1889 rc.cpp:1895
 #, no-c-format
 msgid ""
 "Configure the number of calendar days you wish to be published and available to "
@@ -3208,36 +4799,34 @@ msgid ""
 msgstr ""
 
 #. i18n: file kogroupwareprefspage.ui line 140
-#: rc.cpp:300 rc.cpp:923
+#: rc.cpp:297 rc.cpp:1892
 #, no-c-format
 msgid "days of free/busy information"
 msgstr "ਵਿਹਲਾ/ਰੁਝਿਆ ਜਾਣਕਾਰੀ ਦੇ ਦਿਨ"
 
 #. i18n: file kogroupwareprefspage.ui line 170
-#: rc.cpp:306 rc.cpp:372 rc.cpp:929 rc.cpp:995
+#: rc.cpp:303 rc.cpp:367 rc.cpp:1898 rc.cpp:1962
 #, no-c-format
 msgid "Server Information"
 msgstr "ਸਰਵਰ ਜਾਣਕਾਰੀ"
 
-#. i18n: file kogroupwareprefspage.ui line 186
-#: rc.cpp:309 rc.cpp:346 rc.cpp:932 rc.cpp:969
+#. i18n: file kogroupwareprefspage.ui line 185
+#: rc.cpp:306 rc.cpp:342 rc.cpp:1901 rc.cpp:1937
 #, no-c-format
 msgid ""
 "Enter the URL for the server on which your Free/Busy information shall be "
 "published here.\n"
-"Ask the server administrator for this information.\n"
-"Here is a Kolab2 server URL example: "
-"\"webdavs://kolab2.com/freebusy/joe@kolab2.com.ifb\""
+"Ask the server administrator for this information."
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 194
-#: rc.cpp:314 rc.cpp:937
+#. i18n: file kogroupwareprefspage.ui line 193
+#: rc.cpp:310 rc.cpp:1905
 #, no-c-format
 msgid "Remember p&assword"
 msgstr "ਗੁਪਤ-ਕੋਡ ਯਾਦ ਰੱਖੋ(&a)"
 
-#. i18n: file kogroupwareprefspage.ui line 198
-#: rc.cpp:317 rc.cpp:413 rc.cpp:940 rc.cpp:1036
+#. i18n: file kogroupwareprefspage.ui line 197
+#: rc.cpp:313 rc.cpp:416 rc.cpp:1908 rc.cpp:2011
 #, no-c-format
 msgid ""
 "Check this box to make KOrganizer remember your password and skip asking you "
@@ -3247,22 +4836,16 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 206
-#: plugins/exchange/exchangeconfig.cpp:59 rc.cpp:321 rc.cpp:944
-#, no-c-format
-msgid "Password:"
-msgstr "ਗੁਪਤ-ਕੋਡ:"
-
-#. i18n: file kogroupwareprefspage.ui line 212
-#: rc.cpp:324 rc.cpp:327 rc.cpp:404 rc.cpp:407 rc.cpp:947 rc.cpp:950
-#: rc.cpp:1027 rc.cpp:1030
+#. i18n: file kogroupwareprefspage.ui line 211
+#: rc.cpp:320 rc.cpp:323 rc.cpp:407 rc.cpp:410 rc.cpp:1915 rc.cpp:1918
+#: rc.cpp:2002 rc.cpp:2005
 #, no-c-format
 msgid "Enter your groupware server login password here."
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 239
-#: rc.cpp:330 rc.cpp:338 rc.cpp:388 rc.cpp:396 rc.cpp:953 rc.cpp:961
-#: rc.cpp:1011 rc.cpp:1019
+#. i18n: file kogroupwareprefspage.ui line 238
+#: rc.cpp:326 rc.cpp:334 rc.cpp:391 rc.cpp:399 rc.cpp:1921 rc.cpp:1929
+#: rc.cpp:1986 rc.cpp:1994
 #, no-c-format
 msgid ""
 "Enter the login information relative to your account on the server here.\n"
@@ -3272,40 +4855,40 @@ msgid ""
 "also be different. In the last case enter your UID."
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 247
-#: rc.cpp:335 rc.cpp:958
+#. i18n: file kogroupwareprefspage.ui line 246
+#: rc.cpp:331 rc.cpp:1926
 #, no-c-format
 msgid "Username:"
 msgstr "ਉਪਭੋਗੀ ਨਾਂ:"
 
-#. i18n: file kogroupwareprefspage.ui line 274
-#: rc.cpp:343 rc.cpp:375 rc.cpp:966 rc.cpp:998
+#. i18n: file kogroupwareprefspage.ui line 273
+#: rc.cpp:339 rc.cpp:370 rc.cpp:1934 rc.cpp:1965
 #, no-c-format
 msgid "Server URL:"
 msgstr "ਸਰਵਰ URL:"
 
-#. i18n: file kogroupwareprefspage.ui line 311
-#: rc.cpp:351 rc.cpp:974
+#. i18n: file kogroupwareprefspage.ui line 309
+#: rc.cpp:346 rc.cpp:1941
 #, no-c-format
 msgid "&Retrieve"
 msgstr "ਪਰਾਪਤ ਕਰੋ"
 
-#. i18n: file kogroupwareprefspage.ui line 322
-#: rc.cpp:354 rc.cpp:977
+#. i18n: file kogroupwareprefspage.ui line 320
+#: rc.cpp:349 rc.cpp:1944
 #, no-c-format
 msgid ""
 "By retrieving Free/Busy information that others have published, you can take "
 "their calendar into account when inviting them to a meeting."
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 333
-#: rc.cpp:357 rc.cpp:980
+#. i18n: file kogroupwareprefspage.ui line 331
+#: rc.cpp:352 rc.cpp:1947
 #, no-c-format
 msgid "Retrieve other peoples' free/&busy information automatically"
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 336
-#: rc.cpp:360 rc.cpp:983
+#. i18n: file kogroupwareprefspage.ui line 334
+#: rc.cpp:355 rc.cpp:1950
 #, no-c-format
 msgid ""
 "Check this box to retrieve other peoples' Free/Busy information automatically. "
@@ -3313,21 +4896,21 @@ msgid ""
 "possible."
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 347
-#: rc.cpp:363 rc.cpp:986
+#. i18n: file kogroupwareprefspage.ui line 345
+#: rc.cpp:358 rc.cpp:1953
 #, no-c-format
 msgid "Use full email &address for retrieval"
 msgstr "ਪਰਾਪਤੀ ਲਈ ਪੂਰੇ ਈ-ਪੱਤਰ ਸਿਰਨਾਵੇਂ ਵਰਤੋਂ(&a)"
 
-#. i18n: file kogroupwareprefspage.ui line 350
-#: rc.cpp:366 rc.cpp:989
+#. i18n: file kogroupwareprefspage.ui line 348
+#: rc.cpp:361 rc.cpp:1956
 #, no-c-format
 msgid ""
 "Set this to retrieve user@domain.ifb instead of user.ifb from the server"
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 353
-#: rc.cpp:369 rc.cpp:992
+#. i18n: file kogroupwareprefspage.ui line 351
+#: rc.cpp:364 rc.cpp:1959
 #, no-c-format
 msgid ""
 "Check this box to download a free/busy file in the format \"user@domain.ifb\" "
@@ -3336,54 +4919,58 @@ msgid ""
 "you are not sure about how to configure this option."
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 388
-#: rc.cpp:378 rc.cpp:383 rc.cpp:1001 rc.cpp:1006
+#. i18n: file kogroupwareprefspage.ui line 390
+#: rc.cpp:373 rc.cpp:382 rc.cpp:1968 rc.cpp:1977
 #, no-c-format
 msgid ""
 "Enter the URL for the server on which the Free/Busy information is published "
 "here.\n"
 "Ask the server administrator for this information.\n"
-"Here is a Kolab2 server URL example: \"webdavs://kolab2.com/freebusy/\""
+"Here is a Kolab2 Server URL example: \"https://kolab2.example.com/freebusy/\"\n"
+"Here is a generic server example: \"http://myserver.net/%u@%d/?internal.ics\"\n"
+"%u expands to the username, and %d expands to the domain name.\n"
+"Alternatively, you can specify a full path to the Free/Busy file,\n"
+"For example: \"https://kolab2.example.com/freebusy/user.xfb\""
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 440
-#: rc.cpp:393 rc.cpp:1016
+#. i18n: file kogroupwareprefspage.ui line 446
+#: rc.cpp:396 rc.cpp:1991
 #, no-c-format
 msgid "User&name:"
 msgstr "ਉਪਭੋਗੀ ਨਾਂ(&n):"
 
-#. i18n: file kogroupwareprefspage.ui line 456
-#: rc.cpp:401 rc.cpp:1024
+#. i18n: file kogroupwareprefspage.ui line 462
+#: rc.cpp:404 rc.cpp:1999
 #, no-c-format
 msgid "Passwor&d:"
 msgstr "ਗੁਪਤ-ਕੋਡ(&d):"
 
-#. i18n: file kogroupwareprefspage.ui line 486
-#: rc.cpp:410 rc.cpp:1033
+#. i18n: file kogroupwareprefspage.ui line 492
+#: rc.cpp:413 rc.cpp:2008
 #, no-c-format
 msgid "Re&member password"
 msgstr "ਗੁਪਤ-ਕੋਡ ਯਾਦ ਰੱਖੋ"
 
 #. i18n: file publishdialog_base.ui line 65
-#: rc.cpp:426 rc.cpp:1868
+#: rc.cpp:429 rc.cpp:2171
 #, no-c-format
 msgid "Email:"
 msgstr "ਈ-ਪੱਤਰ:"
 
 #. i18n: file publishdialog_base.ui line 94
-#: rc.cpp:432 rc.cpp:1874
+#: rc.cpp:435 rc.cpp:2177
 #, no-c-format
 msgid "Select &Addressee..."
 msgstr "ਸਿਰਨਾਵੀਂ ਚੁਣੋ..."
 
 #. i18n: file template_management_dialog_base.ui line 16
-#: rc.cpp:438 rc.cpp:1478
+#: rc.cpp:441 rc.cpp:1845
 #, no-c-format
 msgid "Template Management"
 msgstr "ਨਮੂਨਾ ਪਰਬੰਧ"
 
 #. i18n: file template_management_dialog_base.ui line 57
-#: rc.cpp:447 rc.cpp:1487
+#: rc.cpp:450 rc.cpp:1854
 #, no-c-format
 msgid ""
 "Select a template and click <b>Apply Template</b> to apply it to the current "
@@ -3392,19 +4979,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file template_management_dialog_base.ui line 65
-#: rc.cpp:450 rc.cpp:1490 templatemanagementdialog.cpp:50
+#: rc.cpp:453 rc.cpp:1857 templatemanagementdialog.cpp:50
 #, no-c-format
 msgid "Apply Template"
 msgstr "ਨਮੂਨੇ ਲਾਗੂ"
 
 #. i18n: file korganizer.kcfg line 11
-#: rc.cpp:453 rc.cpp:1040
+#: rc.cpp:456 rc.cpp:1086
 #, no-c-format
 msgid "Enable automatic saving of manually opened calendar files"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 12
-#: rc.cpp:456 rc.cpp:1043
+#: rc.cpp:459 rc.cpp:1089
 #, no-c-format
 msgid ""
 "Check this box to save your calendar file automatically when you exit "
@@ -3414,13 +5001,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 16
-#: rc.cpp:459 rc.cpp:1046
+#: rc.cpp:462 rc.cpp:1092
 #, no-c-format
 msgid "Save &interval in minutes"
 msgstr "ਅੰਤਰਾਲ ਮਿੰਟ 'ਚ ਸੰਭਾਲੋ(&i)"
 
 #. i18n: file korganizer.kcfg line 17
-#: rc.cpp:462 rc.cpp:1049
+#: rc.cpp:465 rc.cpp:1095
 #, no-c-format
 msgid ""
 "Set the interval between automatic saving of calendar events in minutes here. "
@@ -3429,55 +5016,55 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 22
-#: rc.cpp:465 rc.cpp:1052
+#: rc.cpp:468 rc.cpp:1098
 #, no-c-format
 msgid "Confirm deletes"
 msgstr "ਹਟਾਉ ਦੀ ਪੁਸ਼ਟੀ"
 
 #. i18n: file korganizer.kcfg line 23
-#: rc.cpp:468 rc.cpp:1055
+#: rc.cpp:471 rc.cpp:1101
 #, no-c-format
 msgid "Check this box to display a confirmation dialog when deleting items."
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 28
-#: rc.cpp:471 rc.cpp:1058
+#: rc.cpp:474 rc.cpp:1104
 #, no-c-format
 msgid "Archive events"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 32
-#: rc.cpp:474 rc.cpp:1061
+#: rc.cpp:477 rc.cpp:1107
 #, no-c-format
 msgid "Archive to-dos"
 msgstr "ਪੁਰਾਣੇ ਕੰਮ ਕਾਰ"
 
 #. i18n: file korganizer.kcfg line 37
-#: rc.cpp:477 rc.cpp:1064
+#: rc.cpp:480 rc.cpp:1110
 #, no-c-format
 msgid "Regularly archive events"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 41
-#: rc.cpp:480 rc.cpp:1067
+#: rc.cpp:483 rc.cpp:1113
 #, no-c-format
 msgid "What to do when archiving"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 44
-#: rc.cpp:483 rc.cpp:1070
+#: rc.cpp:486 rc.cpp:1116
 #, no-c-format
 msgid "Delete old events"
 msgstr "ਪੁਰਾਣੀ ਘਟਨਾਵਾਂ ਹਟਾਉ"
 
 #. i18n: file korganizer.kcfg line 47
-#: rc.cpp:486 rc.cpp:1073
+#: rc.cpp:489 rc.cpp:1119
 #, no-c-format
 msgid "Archive old events to a separate file"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 53
-#: rc.cpp:489 rc.cpp:1076
+#: rc.cpp:492 rc.cpp:1122
 #, no-c-format
 msgid ""
 "If auto-archiving is enabled, events older than this amount will be archived. "
@@ -3485,43 +5072,43 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 57
-#: rc.cpp:492 rc.cpp:1079
+#: rc.cpp:495 rc.cpp:1125
 #, no-c-format
 msgid "The unit in which the expiry time is expressed."
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 60
-#: rc.cpp:495 rc.cpp:1082
+#: rc.cpp:498 rc.cpp:1128
 #, no-c-format
 msgid "In days"
 msgstr "ਦਿਨਾਂ ਵਿੱਚ"
 
 #. i18n: file korganizer.kcfg line 63
-#: rc.cpp:498 rc.cpp:1085
+#: rc.cpp:501 rc.cpp:1131
 #, no-c-format
 msgid "In weeks"
 msgstr "ਹਫਤਿਆਂ ਵਿੱਚ"
 
 #. i18n: file korganizer.kcfg line 66
-#: rc.cpp:501 rc.cpp:1088
+#: rc.cpp:504 rc.cpp:1134
 #, no-c-format
 msgid "In months"
 msgstr "ਮਹੀਨਿਆਂ ਵਿੱਚ"
 
 #. i18n: file korganizer.kcfg line 72
-#: rc.cpp:504 rc.cpp:1091
+#: rc.cpp:507 rc.cpp:1137
 #, no-c-format
 msgid "URL of the file where old events should be archived"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 76
-#: rc.cpp:507 rc.cpp:1094
+#: rc.cpp:510 rc.cpp:1140
 #, no-c-format
 msgid "Export to HTML with every save"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 77
-#: rc.cpp:510 rc.cpp:1097
+#: rc.cpp:513 rc.cpp:1143
 #, no-c-format
 msgid ""
 "Check this box to export the calendar to an HTML-file every time you save it. "
@@ -3530,19 +5117,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 81
-#: rc.cpp:513 rc.cpp:1100
+#: rc.cpp:516 rc.cpp:1146
 #, no-c-format
 msgid "New Events, To-dos and Journal Entries Should"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 84
-#: rc.cpp:516 rc.cpp:1103
+#: rc.cpp:519 rc.cpp:1149
 #, no-c-format
 msgid "Be added to the standard resource"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 85
-#: rc.cpp:519 rc.cpp:1106
+#: rc.cpp:522 rc.cpp:1152
 #, no-c-format
 msgid ""
 "Select this option to always record new events, to-dos and journal entries "
@@ -3550,13 +5137,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 88
-#: rc.cpp:522 rc.cpp:1109
+#: rc.cpp:525 rc.cpp:1155
 #, no-c-format
 msgid "Be asked which resource to use"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 89
-#: rc.cpp:525 rc.cpp:1112
+#: rc.cpp:528 rc.cpp:1158
 #, no-c-format
 msgid ""
 "Select this option to choose the resource to be used to record the item each "
@@ -3566,13 +5153,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 98
-#: rc.cpp:528 rc.cpp:1115
+#: rc.cpp:531 rc.cpp:1161
 #, no-c-format
 msgid "Send copy to owner when mailing events"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 99
-#: rc.cpp:531 rc.cpp:1118
+#: rc.cpp:534 rc.cpp:1164
 #, no-c-format
 msgid ""
 "Check this box to get a copy of all e-mail messages that KOrganizer sends at "
@@ -3580,28 +5167,28 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 103
-#: rc.cpp:534 rc.cpp:1121
+#: rc.cpp:537 rc.cpp:1167
 #, no-c-format
 msgid "Use email settings from Control Center"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 104
-#: rc.cpp:537 rc.cpp:1124
+#: rc.cpp:540 rc.cpp:1170
 #, no-c-format
 msgid ""
 "Check this box to use the TDE-wide e-mail settings, which are defined using the "
-"Trinity Control Center &quot;Password & User Account&quot; Module. Uncheck this box "
-"to be able to specify your full name and e-mail."
+"Trinity Control Center &quot;Password & User Account&quot; Module. Uncheck this "
+"box to be able to specify your full name and e-mail."
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 108
-#: rc.cpp:540 rc.cpp:1127
+#: rc.cpp:543 rc.cpp:1173
 #, no-c-format
 msgid "Full &name"
 msgstr "ਪੂਰਾ ਨਾਂ(&n)"
 
 #. i18n: file korganizer.kcfg line 109
-#: rc.cpp:543 rc.cpp:1130
+#: rc.cpp:546 rc.cpp:1176
 #, no-c-format
 msgid ""
 "Enter your full name here. This name will be displayed as \"Organizer\" in "
@@ -3609,13 +5196,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 113
-#: rc.cpp:546 rc.cpp:1133
+#: rc.cpp:549 rc.cpp:1179
 #, no-c-format
 msgid "E&mail address"
 msgstr "ਈ-ਪੱਤਰ ਸਿਰਨਾਵਾਂ(&m)"
 
 #. i18n: file korganizer.kcfg line 114
-#: rc.cpp:549 rc.cpp:1136
+#: rc.cpp:552 rc.cpp:1182
 #, no-c-format
 msgid ""
 "Enter here your e-mail address. This e-mail address will be used to identify "
@@ -3623,19 +5210,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 118
-#: rc.cpp:552 rc.cpp:1139
+#: rc.cpp:555 rc.cpp:1185
 #, no-c-format
 msgid "Mail Client"
 msgstr "ਮੇਲ ਕਲਾਂਈਟ"
 
 #. i18n: file korganizer.kcfg line 121
-#: rc.cpp:555 rc.cpp:1142
+#: rc.cpp:558 rc.cpp:1188
 #, no-c-format
 msgid "KMail"
 msgstr "ਕੇਮੇਲ"
 
 #. i18n: file korganizer.kcfg line 122
-#: rc.cpp:558 rc.cpp:1145
+#: rc.cpp:561 rc.cpp:1191
 #, no-c-format
 msgid ""
 "Select this option to use KMail as the mail transport. The mail transport is "
@@ -3643,13 +5230,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 125
-#: rc.cpp:561 rc.cpp:1148
+#: rc.cpp:564 rc.cpp:1194
 #, no-c-format
 msgid "Sendmail"
 msgstr "Sendmail"
 
 #. i18n: file korganizer.kcfg line 126
-#: rc.cpp:564 rc.cpp:1151
+#: rc.cpp:567 rc.cpp:1197
 #, no-c-format
 msgid ""
 "Select this option to use sendmail as the mail transport. The mail transport is "
@@ -3658,13 +5245,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 142
-#: rc.cpp:576 rc.cpp:1163
+#: rc.cpp:579 rc.cpp:1209
 #, no-c-format
 msgid "Default appointment time"
 msgstr "ਮੂਲ ਮੁਲਾਕਾਤ ਸਮਾਂ"
 
 #. i18n: file korganizer.kcfg line 143
-#: rc.cpp:579 rc.cpp:1166
+#: rc.cpp:582 rc.cpp:1212
 #, no-c-format
 msgid ""
 "Enter the default time for events here. The default is used if you do not "
@@ -3672,52 +5259,144 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 147
-#: rc.cpp:582 rc.cpp:1169
+#: rc.cpp:585 rc.cpp:1215
 #, no-c-format
 msgid "Default duration of new appointment (HH:MM)"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 148
-#: rc.cpp:585 rc.cpp:1172
+#: rc.cpp:588 rc.cpp:1218
 #, no-c-format
 msgid ""
 "Enter default duration for events here. The default is used if you do not "
 "supply an end time."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 152
-#: rc.cpp:588 rc.cpp:1175
+#. i18n: file korganizer.kcfg line 153
+#: rc.cpp:591 rc.cpp:1221
+#, fuzzy, no-c-format
+msgid "Default reminder time"
+msgstr "ਮੂਲ ਯਾਦ ਪੱਤਰ ਸਮਾਂ:"
+
+#. i18n: file korganizer.kcfg line 154
+#: rc.cpp:594 rc.cpp:1224
 #, no-c-format
-msgid "Default Reminder Time"
-msgstr "ਮੂਲ ਮੁਲਾਕਾਤ ਸਮਾਂ"
+msgid ""
+"Enter the default reminder time for all newly created items. The time unit is "
+"specified in the adjacent combobox."
+msgstr ""
 
-#. i18n: file korganizer.kcfg line 153
-#: rc.cpp:591 rc.cpp:1178
+#. i18n: file korganizer.kcfg line 155
+#: rc.cpp:597 rc.cpp:1227
+#, fuzzy, no-c-format
+msgid "Default time for reminders"
+msgstr "ਮੂਲ ਯਾਦ ਪੱਤਰ ਸਮਾਂ:"
+
+#. i18n: file korganizer.kcfg line 159
+#: rc.cpp:600 rc.cpp:1230
 #, no-c-format
-msgid "Enter the reminder time here."
-msgstr "ਅਲਾਰਮ ਸਮਾਂ ਇੱਥੇ ਦਿਓ।"
+msgid ""
+"Enter the default reminder time units for all newly created items. The time is "
+"specified in the adjacent spinbox."
+msgstr ""
 
 #. i18n: file korganizer.kcfg line 160
-#: rc.cpp:594 rc.cpp:1181
+#: rc.cpp:603 rc.cpp:1233
+#, fuzzy, no-c-format
+msgid "Default time unit for reminders"
+msgstr "ਮੂਲ ਯਾਦ ਪੱਤਰ ਸਮਾਂ:"
+
+#. i18n: file korganizer.kcfg line 164
+#: rc.cpp:606 rc.cpp:1236
+#, no-c-format
+msgid "Enable a default sound file for audio reminders"
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 165
+#: rc.cpp:609 rc.cpp:1239
+#, no-c-format
+msgid ""
+"Check this box if you want to enable the specified file to be used as the "
+"default sound file for new reminders. You can always specify another file in "
+"the Advanced Reminder accessible from the Event or To-do editors."
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 169
+#: rc.cpp:612 rc.cpp:1242
+#, fuzzy, no-c-format
+msgid "Default audio file"
+msgstr "ਮੂਲ ਕੈਲੰਡਰ"
+
+#. i18n: file korganizer.kcfg line 170
+#: rc.cpp:615 rc.cpp:1245
+#, no-c-format
+msgid ""
+"Set a file to be used as the default sound file for new reminders. You can "
+"always specify another file in the Advanced Reminder accessible from the Event "
+"or To-do editors."
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 173
+#: rc.cpp:618 rc.cpp:1248
+#, no-c-format
+msgid "Enable reminders for new Events"
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 174
+#: rc.cpp:621 rc.cpp:1251
+#, no-c-format
+msgid ""
+"Check this box if you want to enable reminders for all newly created Events. "
+"You can always turn-off the reminders in the Event editor dialog."
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 175
+#: rc.cpp:624 rc.cpp:1254
+#, no-c-format
+msgid "By default, enable reminders for new events"
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 179
+#: rc.cpp:627 rc.cpp:1257
+#, no-c-format
+msgid "Enable reminders for new To-dos"
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 180
+#: rc.cpp:630 rc.cpp:1260
+#, no-c-format
+msgid ""
+"Check this box if you want to enable reminders for all newly created To-dos. "
+"You can always turn-off the reminders in the To-do editor dialog."
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 181
+#: rc.cpp:633 rc.cpp:1263
+#, no-c-format
+msgid "By default, enable reminders for new to-dos"
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 188
+#: rc.cpp:636 rc.cpp:1266
 #, no-c-format
 msgid "Hour size"
 msgstr "ਘੰਟਾ ਆਕਾਰ"
 
-#. i18n: file korganizer.kcfg line 161
-#: rc.cpp:597 rc.cpp:1184
+#. i18n: file korganizer.kcfg line 189
+#: rc.cpp:639 rc.cpp:1269
 #, no-c-format
 msgid ""
 "Select on this spin box the height of the hour rows in the schedule view."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 167
-#: rc.cpp:600 rc.cpp:1187
+#. i18n: file korganizer.kcfg line 195
+#: rc.cpp:642 rc.cpp:1272
 #, no-c-format
 msgid "Show events that recur daily in date navigator"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 168
-#: rc.cpp:603 rc.cpp:1190
+#. i18n: file korganizer.kcfg line 196
+#: rc.cpp:645 rc.cpp:1275
 #, no-c-format
 msgid ""
 "Check this box to show the days containing daily recurring events in bold "
@@ -3725,14 +5404,14 @@ msgid ""
 "(non daily recurring) events."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 172
-#: rc.cpp:606 rc.cpp:1193
+#. i18n: file korganizer.kcfg line 200
+#: rc.cpp:648 rc.cpp:1278
 #, no-c-format
 msgid "Show events that recur weekly in date navigator"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 173
-#: rc.cpp:609 rc.cpp:1196
+#. i18n: file korganizer.kcfg line 201
+#: rc.cpp:651 rc.cpp:1281
 #, no-c-format
 msgid ""
 "Check this box to show the days containing weekly recurring events in bold "
@@ -3740,56 +5419,70 @@ msgid ""
 "(non weekly recurring) events."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 177
-#: rc.cpp:612 rc.cpp:1199
+#. i18n: file korganizer.kcfg line 205
+#: rc.cpp:654 rc.cpp:1284
+#, no-c-format
+msgid "Week numbers select a work week when in work week view"
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 206
+#: rc.cpp:657 rc.cpp:1287
+#, no-c-format
+msgid ""
+"Check this box to select a work week when clicking on date navigator's week "
+"numbers or uncheck it to chose the whole week."
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 210
+#: rc.cpp:660 rc.cpp:1290
 #, no-c-format
 msgid "Enable tooltips displaying summary of events"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 178
-#: rc.cpp:615 rc.cpp:1202
+#. i18n: file korganizer.kcfg line 211
+#: rc.cpp:663 rc.cpp:1293
 #, no-c-format
 msgid ""
 "Check this box to display an event summary tooltip when hovering the mouse over "
 "an event."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 182
-#: rc.cpp:618 rc.cpp:1205
+#. i18n: file korganizer.kcfg line 215
+#: rc.cpp:666 rc.cpp:1296
 #, no-c-format
 msgid "Show to-dos in day, week and month views"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 183
-#: rc.cpp:621 rc.cpp:1208
+#. i18n: file korganizer.kcfg line 216
+#: rc.cpp:669 rc.cpp:1299
 #, no-c-format
 msgid ""
 "Check this box to display to-dos in the day, week, and month view. This is "
 "helpful when you have a lot of (recurring) to-dos."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 187
-#: rc.cpp:624 rc.cpp:1211
+#. i18n: file korganizer.kcfg line 220
+#: rc.cpp:672 rc.cpp:1302
 #, no-c-format
 msgid "Enable scrollbars in month view cells"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 188
-#: rc.cpp:627 rc.cpp:1214
+#. i18n: file korganizer.kcfg line 221
+#: rc.cpp:675 rc.cpp:1305
 #, no-c-format
 msgid ""
 "Check this box to display scrollbars when clicking on a cell in the month view; "
 "they will only appear when needed though."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 192
-#: rc.cpp:630 rc.cpp:1217
+#. i18n: file korganizer.kcfg line 225
+#: rc.cpp:678 rc.cpp:1308
 #, no-c-format
 msgid "Time range selection in agenda view starts event editor"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 193
-#: rc.cpp:633 rc.cpp:1220
+#. i18n: file korganizer.kcfg line 226
+#: rc.cpp:681 rc.cpp:1311
 #, no-c-format
 msgid ""
 "Check this box to start the event editor automatically when you select a time "
@@ -3797,183 +5490,169 @@ msgid ""
 "the start time to the end time of the event you are about to plan."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 198
-#: rc.cpp:636 rc.cpp:1223
+#. i18n: file korganizer.kcfg line 231
+#: rc.cpp:684 rc.cpp:1314
 #, no-c-format
 msgid "Show current-time (Marcus Bains) line"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 199
-#: rc.cpp:639 rc.cpp:1226
+#. i18n: file korganizer.kcfg line 232
+#: rc.cpp:687 rc.cpp:1317
 #, no-c-format
 msgid ""
 "Check this box to display a red line in the day or week view indicating the "
 "current-time line (Marcus Bains line)."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 203
-#: rc.cpp:642 rc.cpp:1229
+#. i18n: file korganizer.kcfg line 236
+#: rc.cpp:690 rc.cpp:1320
 #, no-c-format
 msgid "Show seconds on current-time line"
 msgstr "ਮੌਜੂਦਾ ਸਮਾਂ ਸਤਰ ਵਿੱਚ ਸਕਿੰਟ ਵੇਖਾਓ"
 
-#. i18n: file korganizer.kcfg line 204
-#: rc.cpp:645 rc.cpp:1232
+#. i18n: file korganizer.kcfg line 237
+#: rc.cpp:693 rc.cpp:1323
 #, no-c-format
 msgid "Check this box if you want to show seconds on the current-time line."
 msgstr ""
 "ਇਹ ਬਕਸੇ ਦੀ ਚੋਣ ਕਰੋ, ਜੇਕਰ ਤੁਸੀਂ ਮੌਜੂਦਾ ਸਮਾਂ ਸਤਰ ਵਿੱਚ ਸਕਿੰਟ ਵੇਖਣਾ ਚਾਹੁੰਦੇ ਹੋ।"
 
-#. i18n: file korganizer.kcfg line 209
-#: rc.cpp:648 rc.cpp:1235
+#. i18n: file korganizer.kcfg line 242
+#: rc.cpp:696 rc.cpp:1326
 #, no-c-format
 msgid "Colors used in agenda view"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 210
-#: rc.cpp:651 rc.cpp:1238
+#. i18n: file korganizer.kcfg line 243
+#: rc.cpp:699 rc.cpp:1329
 #, no-c-format
 msgid "Choose the colors of the agenda view items."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 213
-#: rc.cpp:654 rc.cpp:1241
+#. i18n: file korganizer.kcfg line 246
+#: rc.cpp:702 rc.cpp:756 rc.cpp:1332 rc.cpp:1386
 #, no-c-format
 msgid "Category inside, calendar outside"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 216
-#: rc.cpp:657 rc.cpp:1244
+#. i18n: file korganizer.kcfg line 249
+#: rc.cpp:705 rc.cpp:759 rc.cpp:1335 rc.cpp:1389
 #, no-c-format
 msgid "Calendar inside, category outside"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 219
-#: rc.cpp:660 rc.cpp:1247
+#. i18n: file korganizer.kcfg line 252
+#: rc.cpp:708 rc.cpp:762 rc.cpp:1338 rc.cpp:1392
 #, no-c-format
 msgid "Only category"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 222
-#: rc.cpp:663 rc.cpp:1250
+#. i18n: file korganizer.kcfg line 255
+#: rc.cpp:711 rc.cpp:765 rc.cpp:1341 rc.cpp:1395
 #, fuzzy, no-c-format
 msgid "Only calendar"
 msgstr "ਕੈਲੰਡਰ ਛਾਪੋ"
 
-#. i18n: file korganizer.kcfg line 229
-#: rc.cpp:666 rc.cpp:1253
+#. i18n: file korganizer.kcfg line 262
+#: rc.cpp:714 rc.cpp:1344
 #, no-c-format
 msgid "Agenda View Calendar Display"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 232
-#: rc.cpp:669 rc.cpp:1256
+#. i18n: file korganizer.kcfg line 265
+#: rc.cpp:717 rc.cpp:1347
 #, no-c-format
 msgid "Merge all calendars into one view"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 235
-#: rc.cpp:672 rc.cpp:1259
+#. i18n: file korganizer.kcfg line 268
+#: rc.cpp:720 rc.cpp:1350
 #, no-c-format
 msgid "Show calendars side by side"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 238
-#: rc.cpp:675 rc.cpp:1262
+#. i18n: file korganizer.kcfg line 271
+#: rc.cpp:723 rc.cpp:1353
 #, no-c-format
 msgid "Switch between views with tabs"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 247
-#: rc.cpp:678 rc.cpp:1265
+#. i18n: file korganizer.kcfg line 278
+#: rc.cpp:726 rc.cpp:1356
 #, no-c-format
 msgid "Day begins at"
 msgstr "ਦਿਨ ਸ਼ੁਰੂ ਹੁੰਦਾ ਹੈ"
 
-#. i18n: file korganizer.kcfg line 248
-#: rc.cpp:681 rc.cpp:1268
+#. i18n: file korganizer.kcfg line 279
+#: rc.cpp:729 rc.cpp:1359
 #, no-c-format
 msgid ""
 "Enter the start time for events here. This time should be the earliest time "
 "that you use for events, as it will be displayed at the top."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 253
-#: rc.cpp:684 rc.cpp:1271
+#. i18n: file korganizer.kcfg line 284
+#: rc.cpp:732 rc.cpp:1362
 #, no-c-format
 msgid "Daily starting hour"
 msgstr "ਰੋਜ਼ ਸ਼ੁਰੂ ਘੰਟਾ"
 
-#. i18n: file korganizer.kcfg line 254
-#: rc.cpp:687 rc.cpp:1274
+#. i18n: file korganizer.kcfg line 285
+#: rc.cpp:735 rc.cpp:1365
 #, no-c-format
 msgid ""
 "Enter the start time for the working hours here. The working hours will be "
 "marked with color by KOrganizer."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 258
-#: rc.cpp:690 rc.cpp:1277
+#. i18n: file korganizer.kcfg line 289
+#: rc.cpp:738 rc.cpp:1368
 #, no-c-format
 msgid "Daily ending hour"
 msgstr "ਰੋਜ਼ ਅੰਤ ਘੰਟਾ"
 
-#. i18n: file korganizer.kcfg line 259
-#: rc.cpp:693 rc.cpp:1280
+#. i18n: file korganizer.kcfg line 290
+#: rc.cpp:741 rc.cpp:1371
 #, no-c-format
 msgid ""
 "Enter the ending time for the working hours here. The working hours will be "
 "marked with color by KOrganizer."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 266
-#: rc.cpp:696 rc.cpp:1283
+#. i18n: file korganizer.kcfg line 297
+#: rc.cpp:744 rc.cpp:1374
 #, no-c-format
 msgid "Exclude holidays"
 msgstr "ਛੁੱਟੀਆਂ ਬਗੈਰ"
 
-#. i18n: file korganizer.kcfg line 267
-#: rc.cpp:699 rc.cpp:1286
+#. i18n: file korganizer.kcfg line 298
+#: rc.cpp:747 rc.cpp:1377
 #, no-c-format
 msgid ""
 "Check this box to prevent KOrganizer from marking the working hours on "
 "holidays."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 272
-#: rc.cpp:702 rc.cpp:1289
+#. i18n: file korganizer.kcfg line 303
+#: rc.cpp:750 rc.cpp:1380
 #, no-c-format
-msgid "Month view uses category colors"
+msgid "Colors used in month view"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 273
-#: rc.cpp:705 rc.cpp:1292
+#. i18n: file korganizer.kcfg line 304
+#: rc.cpp:753 rc.cpp:1383
 #, no-c-format
-msgid ""
-"Check this box to make the month view use the category colors of an item."
+msgid "Choose the colors of the month view items."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 278
-#: rc.cpp:708 rc.cpp:1295
-#, no-c-format
-msgid "Month view uses resource colors"
-msgstr ""
-
-#. i18n: file korganizer.kcfg line 279
-#: rc.cpp:711 rc.cpp:1298
-#, no-c-format
-msgid ""
-"Check this box to make the month view use the resource colors of an item."
-msgstr ""
-
-#. i18n: file korganizer.kcfg line 284
-#: rc.cpp:714 rc.cpp:1301
+#. i18n: file korganizer.kcfg line 323
+#: rc.cpp:768 rc.cpp:1398
 #, no-c-format
 msgid "Month view uses full window"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 285
-#: rc.cpp:717 rc.cpp:1304
+#. i18n: file korganizer.kcfg line 324
+#: rc.cpp:771 rc.cpp:1401
 #, no-c-format
 msgid ""
 "Check this box to use the full KOrganizer window when displaying the month "
@@ -3982,14 +5661,14 @@ msgid ""
 "resources list, will not be displayed."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 289
-#: rc.cpp:720 rc.cpp:1307
+#. i18n: file korganizer.kcfg line 328
+#: rc.cpp:774 rc.cpp:1404
 #, no-c-format
 msgid "To-do list view uses full window"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 290
-#: rc.cpp:723 rc.cpp:1310
+#. i18n: file korganizer.kcfg line 329
+#: rc.cpp:777 rc.cpp:1407
 #, no-c-format
 msgid ""
 "Check this box to use the full KOrganizer window when displaying the to-do list "
@@ -3998,28 +5677,28 @@ msgid ""
 "resources list, will not be displayed."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 295
-#: rc.cpp:726 rc.cpp:1313
+#. i18n: file korganizer.kcfg line 334
+#: rc.cpp:780 rc.cpp:1410
 #, no-c-format
 msgid "Record completed to-dos in journal entries"
 msgstr "ਜਰਨਲ ਇੰਦਰਾਜ਼ਾਂ ਵਿੱਚ ਪੂਰੇ ਕਰਨ ਲਈ ਰਿਕਾਰਡ"
 
-#. i18n: file korganizer.kcfg line 296
-#: rc.cpp:729 rc.cpp:1316
+#. i18n: file korganizer.kcfg line 335
+#: rc.cpp:783 rc.cpp:1413
 #, no-c-format
 msgid ""
 "Check this box to record the completion of a to-do in a new entry of your "
 "journal automatically."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 305
-#: rc.cpp:732 rc.cpp:1319
+#. i18n: file korganizer.kcfg line 344
+#: rc.cpp:786 rc.cpp:1416
 #, no-c-format
 msgid "Next x days"
 msgstr "ਅੱਗੇ x ਦਿਨ"
 
-#. i18n: file korganizer.kcfg line 306
-#: rc.cpp:735 rc.cpp:1322
+#. i18n: file korganizer.kcfg line 345
+#: rc.cpp:789 rc.cpp:1419
 #, no-c-format
 msgid ""
 "Select on this spin box the number of &quot;x&quot; days to be displayed in the "
@@ -4027,14 +5706,14 @@ msgid ""
 "&quot;Next X Days&quot; menu item from the &quot;View&quot; menu."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 348
-#: rc.cpp:738 rc.cpp:1325
+#. i18n: file korganizer.kcfg line 387
+#: rc.cpp:792 rc.cpp:1422
 #, no-c-format
 msgid "Use Groupware communication"
 msgstr "ਗਰੁੱਪਵੇਅਰ ਸੰਚਾਰ ਵਰਤੋਂ"
 
-#. i18n: file korganizer.kcfg line 349
-#: rc.cpp:741 rc.cpp:1328
+#. i18n: file korganizer.kcfg line 388
+#: rc.cpp:795 rc.cpp:1425
 #, no-c-format
 msgid ""
 "Check this box to enable automatic generation of mails when creating, updating "
@@ -4043,111 +5722,111 @@ msgid ""
 "a TDE Kolab client)."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 357
-#: rc.cpp:744 rc.cpp:1331
+#. i18n: file korganizer.kcfg line 396
+#: rc.cpp:798 rc.cpp:1428
 #, no-c-format
 msgid "Send Outlook-like pseudo counter proposals"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 365
-#: rc.cpp:747 rc.cpp:1334
+#. i18n: file korganizer.kcfg line 404
+#: rc.cpp:801 rc.cpp:1431
 #, no-c-format
 msgid "Holiday color"
 msgstr "ਛੁੱਟੀ ਰੰਗ"
 
-#. i18n: file korganizer.kcfg line 366
-#: rc.cpp:750 rc.cpp:1337
+#. i18n: file korganizer.kcfg line 405
+#: rc.cpp:804 rc.cpp:1434
 #, no-c-format
 msgid ""
 "Select the holiday color here. The holiday color will be used for the holiday "
 "name in the month view and the holiday number in the date navigator."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 370
-#: rc.cpp:753 rc.cpp:1340
+#. i18n: file korganizer.kcfg line 409
+#: rc.cpp:807 rc.cpp:1437
 #, no-c-format
 msgid "Highlight color"
 msgstr "ਉਭਾਰਨ ਰੰਗ"
 
-#. i18n: file korganizer.kcfg line 371
-#: rc.cpp:756 rc.cpp:1343
+#. i18n: file korganizer.kcfg line 410
+#: rc.cpp:810 rc.cpp:1440
 #, no-c-format
 msgid ""
 "Select the highlight color here. The highlight color will be used for marking "
 "the currently selected area in your agenda and in the date navigator."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 375
-#: rc.cpp:759 rc.cpp:1346
+#. i18n: file korganizer.kcfg line 414
+#: rc.cpp:813 rc.cpp:1443
 #, no-c-format
 msgid "Agenda view background color"
 msgstr "ਏਜੰਟਾ ਝਲਕ ਪਿੱਠਭੂਮੀ ਰੰਗ"
 
-#. i18n: file korganizer.kcfg line 376
-#: rc.cpp:762 rc.cpp:1349
+#. i18n: file korganizer.kcfg line 415
+#: rc.cpp:816 rc.cpp:1446
 #, no-c-format
 msgid "Select the agenda view background color here."
 msgstr "ਏਜੰਡਾ ਝਲਕ ਪਿੱਠਭੂਮੀ ਰੰਗ ਇੱਥੇ ਚੁਣੋ।"
 
-#. i18n: file korganizer.kcfg line 380
-#: rc.cpp:765 rc.cpp:1352
+#. i18n: file korganizer.kcfg line 419
+#: rc.cpp:819 rc.cpp:1449
 #, no-c-format
 msgid "Working hours color"
 msgstr "ਕਾਰਜਕਾਰੀ ਘੰਟੇ ਰੰਗ"
 
-#. i18n: file korganizer.kcfg line 381
-#: rc.cpp:768 rc.cpp:1355
+#. i18n: file korganizer.kcfg line 420
+#: rc.cpp:822 rc.cpp:1452
 #, no-c-format
 msgid "Select the working hours color for the agenda view here."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 385
-#: rc.cpp:771 rc.cpp:1358
+#. i18n: file korganizer.kcfg line 424
+#: rc.cpp:825 rc.cpp:1455
 #, no-c-format
 msgid "To-do due today color"
 msgstr "ਅੱਜ ਬਕਾਇਆ ਕਰਨ ਲਈ ਰੰਗ"
 
-#. i18n: file korganizer.kcfg line 386
-#: rc.cpp:774 rc.cpp:1361
+#. i18n: file korganizer.kcfg line 425
+#: rc.cpp:828 rc.cpp:1458
 #, no-c-format
 msgid "Select the to-do due today color here."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 390
-#: rc.cpp:777 rc.cpp:1364
+#. i18n: file korganizer.kcfg line 429
+#: rc.cpp:831 rc.cpp:1461
 #, no-c-format
 msgid "To-do overdue color"
 msgstr "ਕਰਨ ਲਈ ਮਿਆਦ ਪੁੱਗੀ ਰੰਗ"
 
-#. i18n: file korganizer.kcfg line 391
-#: rc.cpp:780 rc.cpp:1367
+#. i18n: file korganizer.kcfg line 430
+#: rc.cpp:834 rc.cpp:1464
 #, no-c-format
 msgid "Select the to-do overdue color here."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 395
-#: rc.cpp:783 rc.cpp:1370
+#. i18n: file korganizer.kcfg line 434
+#: rc.cpp:837 rc.cpp:1467
 #, no-c-format
-msgid "Default event color"
-msgstr "ਮੂਲ ਘਟਨਾ ਰੰਗ"
+msgid "\"No category\" color (for \"Only category\" drawing schemes)"
+msgstr ""
 
-#. i18n: file korganizer.kcfg line 396
-#: rc.cpp:786 rc.cpp:1373
+#. i18n: file korganizer.kcfg line 435
+#: rc.cpp:840 rc.cpp:1470
 #, no-c-format
 msgid ""
-"Select the default event color here. The default event color will be used for "
-"events categories in your agenda. Note that you can specify a separate color "
-"for each event category below."
+"Select a color to use for the \"no category\" or \"unset category\" situation, "
+"when an item does not belong to any category. This color is used when drawing "
+"items in the agenda or month views using the \"Only category\" scheme."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 414
-#: rc.cpp:789 rc.cpp:1376
+#. i18n: file korganizer.kcfg line 453
+#: rc.cpp:843 rc.cpp:1473
 #, no-c-format
 msgid "Time bar"
 msgstr "ਸਮਾਂ ਪੱਟੀ"
 
-#. i18n: file korganizer.kcfg line 415
-#: rc.cpp:792 rc.cpp:1379
+#. i18n: file korganizer.kcfg line 454
+#: rc.cpp:846 rc.cpp:1476
 #, no-c-format
 msgid ""
 "Press this button to configure the time bar font. The time bar is the widget "
@@ -4155,14 +5834,14 @@ msgid ""
 "Font&quot; dialog, allowing you to choose the hour font for the time bar."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 418
-#: rc.cpp:795 rc.cpp:1382
+#. i18n: file korganizer.kcfg line 457
+#: rc.cpp:849 rc.cpp:1479
 #, no-c-format
 msgid "Agenda view"
 msgstr "ਕਾਰਜ-ਸੂਚੀ ਦਰਿਸ਼"
 
-#. i18n: file korganizer.kcfg line 419
-#: rc.cpp:798 rc.cpp:1385
+#. i18n: file korganizer.kcfg line 458
+#: rc.cpp:852 rc.cpp:1482
 #, no-c-format
 msgid ""
 "Press this button to configure the agenda view font. This button will open the "
@@ -4170,14 +5849,14 @@ msgid ""
 "in the agenda view."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 422
-#: rc.cpp:801 rc.cpp:1388
+#. i18n: file korganizer.kcfg line 461
+#: rc.cpp:855 rc.cpp:1485
 #, no-c-format
 msgid "Current-time line"
 msgstr "ਮੌਜੂਦਾ ਸਮਾਂ ਸਤਰ"
 
-#. i18n: file korganizer.kcfg line 423
-#: rc.cpp:804 rc.cpp:1391
+#. i18n: file korganizer.kcfg line 462
+#: rc.cpp:858 rc.cpp:1488
 #, no-c-format
 msgid ""
 "Press this button to configure the current-time line font. This button will "
@@ -4185,14 +5864,14 @@ msgid ""
 "the current-time line in the agenda view."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 426
-#: rc.cpp:807 rc.cpp:1394
+#. i18n: file korganizer.kcfg line 465
+#: rc.cpp:861 rc.cpp:1491
 #, no-c-format
 msgid "Month view"
 msgstr "ਮਹੀਨਾ ਦਰਿਸ਼"
 
-#. i18n: file korganizer.kcfg line 427
-#: rc.cpp:810 rc.cpp:1397
+#. i18n: file korganizer.kcfg line 466
+#: rc.cpp:864 rc.cpp:1494
 #, no-c-format
 msgid ""
 "Press this button to configure the month view font. This button will open the "
@@ -4200,56 +5879,56 @@ msgid ""
 "in the month view."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 445
-#: rc.cpp:813 rc.cpp:1400
+#. i18n: file korganizer.kcfg line 484
+#: rc.cpp:867 rc.cpp:1497
 #, no-c-format
 msgid "Free/Busy Publish URL"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਪਰਕਾਸ਼ਤ URL"
 
-#. i18n: file korganizer.kcfg line 446
-#: rc.cpp:816 rc.cpp:1403
+#. i18n: file korganizer.kcfg line 485
+#: rc.cpp:870 rc.cpp:1500
 #, no-c-format
 msgid "URL for publishing free/busy information"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 449
-#: rc.cpp:819 rc.cpp:1406
+#. i18n: file korganizer.kcfg line 488
+#: rc.cpp:873 rc.cpp:1503
 #, no-c-format
 msgid "Free/Busy Publish Username"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਪਰਕਾਸ਼ਨ ਉਪਭੋਗੀ ਨਾਂ"
 
-#. i18n: file korganizer.kcfg line 450
-#: rc.cpp:822 rc.cpp:1409
+#. i18n: file korganizer.kcfg line 489
+#: rc.cpp:876 rc.cpp:1506
 #, no-c-format
 msgid "Username for publishing free/busy information"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਜਾਣਕਾਰੀ ਪਰਕਾਸ਼ਤ ਕਰਨ ਲਈ ਉਪਭੋਗੀ ਨਾਂ"
 
-#. i18n: file korganizer.kcfg line 453
-#: rc.cpp:825 rc.cpp:1412
+#. i18n: file korganizer.kcfg line 492
+#: rc.cpp:879 rc.cpp:1509
 #, no-c-format
 msgid "Free/Busy Publish Password"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਪਰਕਾਸ਼ਨ ਗੁਪਤ-ਕੋਡ"
 
-#. i18n: file korganizer.kcfg line 454
-#: rc.cpp:828 rc.cpp:1415
+#. i18n: file korganizer.kcfg line 493
+#: rc.cpp:882 rc.cpp:1512
 #, no-c-format
 msgid "Password for publishing free/busy information"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਜਾਣਕਾਰੀ ਪਰਕਾਸ਼ਨ ਲਈ ਗੁਪਤ-ਕੋਡ ਹੈ"
 
-#. i18n: file korganizer.kcfg line 461
-#: rc.cpp:831 rc.cpp:1418
+#. i18n: file korganizer.kcfg line 500
+#: rc.cpp:885 rc.cpp:1515
 #, no-c-format
 msgid "Enable Automatic Free/Busy Retrieval"
 msgstr "ਸਵੈ-ਚਾਲਤ ਵੇਹਲਾ/ਰੁਝਿਆ ਪ੍ਰਾਪਤੀ ਯੋਗ"
 
-#. i18n: file korganizer.kcfg line 466
-#: rc.cpp:834 rc.cpp:1421
+#. i18n: file korganizer.kcfg line 505
+#: rc.cpp:888 rc.cpp:1518
 #, no-c-format
 msgid "Check whether hostname and retrieval email address match"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 467
-#: rc.cpp:837 rc.cpp:1424
+#. i18n: file korganizer.kcfg line 506
+#: rc.cpp:891 rc.cpp:1521
 #, no-c-format
 msgid ""
 "With this setting you can configure whether the domain part of the free/busy "
@@ -4258,14 +5937,14 @@ msgid ""
 "joe@mydomain.com on the server www.yourdomain.com won't work."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 472
-#: rc.cpp:840 rc.cpp:1427
+#. i18n: file korganizer.kcfg line 511
+#: rc.cpp:894 rc.cpp:1524
 #, no-c-format
 msgid "Use full email address for retrieval"
 msgstr "ਪਰਾਪਤੀ ਲਈ ਪੂਰੇ ਈ-ਪੱਤਰ ਸਿਰਨਾਵੇਂ ਇਸਤੇਮਾਲ ਕਰੋ"
 
-#. i18n: file korganizer.kcfg line 473
-#: rc.cpp:843 rc.cpp:1430
+#. i18n: file korganizer.kcfg line 512
+#: rc.cpp:897 rc.cpp:1527
 #, no-c-format
 msgid ""
 "With this setting, you can change the filename that will be fetched from the "
@@ -4274,352 +5953,370 @@ msgid ""
 "user.ifb, for example nn.ifb."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 478
-#: rc.cpp:846 rc.cpp:1433
+#. i18n: file korganizer.kcfg line 517
+#: rc.cpp:900 rc.cpp:1530
 #, no-c-format
 msgid "Free/Busy Retrieval URL"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਪਰਾਪਤੀ URL"
 
-#. i18n: file korganizer.kcfg line 481
-#: rc.cpp:849 rc.cpp:1436
+#. i18n: file korganizer.kcfg line 520
+#: rc.cpp:903 rc.cpp:1533
 #, no-c-format
 msgid "Free/Busy Retrieval Username"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਪ੍ਰਾਪਤੀ ਉਪਭੋਗੀ ਨਾਂ"
 
-#. i18n: file korganizer.kcfg line 484
-#: rc.cpp:852 rc.cpp:1439
+#. i18n: file korganizer.kcfg line 523
+#: rc.cpp:906 rc.cpp:1536
 #, no-c-format
 msgid "Free/Busy Retrieval Password"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਪਰਾਪਤੀ ਗੁਪਤ-ਕੋਡ"
 
-#. i18n: file korganizer.kcfg line 485
-#: rc.cpp:855 rc.cpp:1442
+#. i18n: file korganizer.kcfg line 524
+#: rc.cpp:909 rc.cpp:1539
 #, no-c-format
 msgid "Password for retrieving free/busy information"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਜਾਣਕਾਰੀ ਪਰਾਪਤ ਕਰਨ ਲਈ ਗੁਪਤ-ਕੋਡ"
 
-#. i18n: file korganizer.kcfg line 495
-#: rc.cpp:858 rc.cpp:1445
+#. i18n: file korganizer.kcfg line 534
+#: rc.cpp:912 rc.cpp:1542
 #, fuzzy, no-c-format
 msgid "Default email attachment method"
 msgstr "ਮੂਲ ਮੁਲਾਕਾਤ ਸਮਾਂ"
 
-#. i18n: file korganizer.kcfg line 496
-#: rc.cpp:861 rc.cpp:1448
+#. i18n: file korganizer.kcfg line 535
+#: rc.cpp:915 rc.cpp:1545
 #, no-c-format
 msgid "The default way of attaching dropped emails to an event"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 499
-#: rc.cpp:864 rc.cpp:882 rc.cpp:1451 rc.cpp:1469
+#. i18n: file korganizer.kcfg line 538
+#: rc.cpp:918 rc.cpp:936 rc.cpp:1548 rc.cpp:1566
 #, no-c-format
 msgid "Always ask"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 502
-#: rc.cpp:867 rc.cpp:885 rc.cpp:1454 rc.cpp:1472
+#. i18n: file korganizer.kcfg line 541
+#: rc.cpp:921 rc.cpp:939 rc.cpp:1551 rc.cpp:1569
 #, no-c-format
 msgid "Only attach link to message"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 505
-#: rc.cpp:870 rc.cpp:888 rc.cpp:1457 rc.cpp:1475
+#. i18n: file korganizer.kcfg line 544
+#: rc.cpp:924 rc.cpp:942 rc.cpp:1554 rc.cpp:1572
 #, no-c-format
 msgid "Attach complete message"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 508
-#: rc.cpp:873 rc.cpp:1460
+#. i18n: file korganizer.kcfg line 547
+#: rc.cpp:927 rc.cpp:1557
 #, no-c-format
 msgid "Attach message without attachments"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 514
-#: rc.cpp:876 rc.cpp:1463
+#. i18n: file korganizer.kcfg line 553
+#: rc.cpp:930 rc.cpp:1560
 #, fuzzy, no-c-format
 msgid "Default todo attachment method"
 msgstr "ਮੂਲ ਮੁਲਾਕਾਤ ਸਮਾਂ"
 
-#. i18n: file korganizer.kcfg line 515
-#: rc.cpp:879 rc.cpp:1466
+#. i18n: file korganizer.kcfg line 554
+#: rc.cpp:933 rc.cpp:1563
 #, no-c-format
 msgid "The default way of attaching dropped emails to a task"
 msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 32
-#: rc.cpp:1589 rc.cpp:1802 rc.cpp:1835
-#, no-c-format
-msgid "Include to-&dos that are due on the printed day(s)"
-msgstr ""
-
-#. i18n: file ./printing/calprintdayconfig_base.ui line 35
-#: rc.cpp:1592
+#. i18n: file ./plugins/printing/journal/calprintjournalconfig_base.ui line 18
+#: rc.cpp:945
 #, no-c-format
-msgid ""
-"You should check this option if you want to print to-dos which are due on one "
-"of the dates which are in the supplied date range."
-msgstr ""
+msgid "CalPrintJournal_Base"
+msgstr "CalPrintJournal_Base"
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 43
-#: rc.cpp:1595 rc.cpp:1736 rc.cpp:1808 rc.cpp:1988 rc.cpp:2045 rc.cpp:2063
+#. i18n: file ./plugins/printing/journal/calprintjournalconfig_base.ui line 32
+#: rc.cpp:948 rc.cpp:966 rc.cpp:978 rc.cpp:1665 rc.cpp:1737 rc.cpp:1794
 #, no-c-format
 msgid "Date && Time Range"
 msgstr "ਮਿਤੀ ਤੇ ਸਮਾਂ ਸੀਮਾ"
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 88
-#: rc.cpp:1598 rc.cpp:1664 rc.cpp:1739 rc.cpp:1991 rc.cpp:2054 rc.cpp:2066
+#. i18n: file ./plugins/printing/journal/calprintjournalconfig_base.ui line 46
+#: rc.cpp:951
+#, no-c-format
+msgid "&All journal entries"
+msgstr "ਸਭ ਰੋਜ਼ਨਾਮਚਾ ਇੰਦਰਾਜ਼(&A)"
+
+#. i18n: file ./plugins/printing/journal/calprintjournalconfig_base.ui line 60
+#: rc.cpp:954
+#, no-c-format
+msgid "Date &range:"
+msgstr "ਮਿਤੀ ਸੀਮਾ(&r):"
+
+#. i18n: file ./plugins/printing/journal/calprintjournalconfig_base.ui line 96
+#: rc.cpp:957 rc.cpp:969 rc.cpp:981 rc.cpp:1593 rc.cpp:1668 rc.cpp:1797
 #, no-c-format
 msgid "&Start date:"
 msgstr "ਸ਼ੁਰੂ ਮਿਤੀ(&S):"
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 94
-#: rc.cpp:1601 rc.cpp:1619 rc.cpp:1667
+#. i18n: file ./plugins/printing/journal/calprintjournalconfig_base.ui line 115
+#: rc.cpp:960 rc.cpp:972 rc.cpp:984 rc.cpp:1599 rc.cpp:1698 rc.cpp:1833
 #, no-c-format
-msgid ""
-"If you want to print more days at once, you can define a range of dates with "
-"this option and the <i>End date</i> option. This option is used to define the "
-"start date."
-msgstr ""
+msgid "&End date:"
+msgstr "ਅੰਤ ਮਿਤੀ(&E):"
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 102
-#: rc.cpp:1604 rc.cpp:1748
+#. i18n: file ./plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui line 18
+#: rc.cpp:963
 #, no-c-format
-msgid "End ti&me:"
-msgstr "ਅੰਤ ਸਮਾਂ(&m):"
+msgid "CalPrintWhatsNext_Base"
+msgstr "CalPrintWhatsNext_Base"
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 108
-#: rc.cpp:1607
+#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 18
+#: rc.cpp:975
 #, no-c-format
-msgid ""
-"It is possible to print only those events which are inside a given timerange. "
-"With this time selection box you can define the end of this time range. The "
-"start time should be defined with the <i>Start time</i> "
-"option. Note you can automatically modify these settings if you check <i>"
-"Extend time range to include all events</i>."
-msgstr ""
+msgid "CalPrintList_Base"
+msgstr "CalPrintList_Base"
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 126
-#: rc.cpp:1610
+#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 130
+#: rc.cpp:987
 #, no-c-format
-msgid ""
-"It's possible to print only those events which are inside a given timerange. "
-"With this time selection box you can define the end of this time range. The "
-"start time should be defined with the <i>Start time</i> "
-"option. Note you can automatically modify these settings if you check <i>"
-"Extend time range to include all events</i>."
+msgid "Print Incidences of Type"
 msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 134
-#: rc.cpp:1613
+#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 149
+#: rc.cpp:993
 #, no-c-format
-msgid "E&xtend time range to include all events"
+msgid "&To-dos"
+msgstr "ਕੰਮ-ਕਾਰ(&T)"
+
+#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 157
+#: rc.cpp:996
+#, no-c-format
+msgid "&Journals"
+msgstr "ਰੋਜ਼ਨਾਮਚਾ(&J)"
+
+#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 18
+#: rc.cpp:999
+#, no-c-format
+msgid "CalPrintYear_Base"
 msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 137
-#: rc.cpp:1616
+#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 32
+#: rc.cpp:1002
 #, no-c-format
-msgid ""
-"Check this option to automatically determine the required time range, so all "
-"events will be shown."
+msgid "Yearly print options"
 msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 166
-#: rc.cpp:1622
+#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 46
+#: rc.cpp:1005
 #, no-c-format
-msgid ""
-"It's possible to print only those events which are inside a given timerange. "
-"With this time selection box you can define the start of this time range. The "
-"end time should be defined with the <i>End time</i> option. Note you can "
-"automatically modify these settings if you check <i>"
-"Extend time range to include all events</i>."
+msgid "Print &Year:"
 msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 174
-#: rc.cpp:1625 rc.cpp:1757
+#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 57
+#: rc.cpp:1008
 #, no-c-format
-msgid "Start &time:"
-msgstr "ਸ਼ੁਰੂ ਸਮਾਂ(&t):"
+msgid "Number of &pages:"
+msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 180
-#: rc.cpp:1628
+#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 123
+#: rc.cpp:1011
 #, no-c-format
-msgid ""
-"It is possible to print only those events which are inside a given timerange. "
-"With this time selection box you can define the start of this time range. The "
-"end time should be defined with the <i>End time</i> option. Note you can "
-"automatically modify these settings if you check <i>"
-"Extend time range to include all events</i>."
+msgid "Display Options"
 msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 191
-#: rc.cpp:1631 rc.cpp:1637 rc.cpp:1673
+#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 134
+#: rc.cpp:1014
 #, no-c-format
-msgid ""
-"If you want to print more days at once, you can define a range of dates with "
-"this option and the <i>Start date</i> option. This option is used to define the "
-"end date."
+msgid "Show sub-day events as:"
 msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 199
-#: rc.cpp:1634 rc.cpp:1670 rc.cpp:1769 rc.cpp:1994 rc.cpp:2057 rc.cpp:2069
+#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 142
+#: rc.cpp:1017
 #, no-c-format
-msgid "&End date:"
-msgstr "ਅੰਤ ਮਿਤੀ(&E):"
+msgid "Show holidays as:"
+msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 215
-#: rc.cpp:1640 rc.cpp:1727 rc.cpp:1775
+#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 148
+#: rc.cpp:1020 rc.cpp:1026
 #, no-c-format
-msgid "&Use colors"
-msgstr "ਰੰਗ ਵਰਤੋਂ(&U)"
+msgid "Text"
+msgstr "ਪਾਠ"
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 218
-#: rc.cpp:1643 rc.cpp:1730
+#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 153
+#: rc.cpp:1023 rc.cpp:1029
 #, no-c-format
-msgid ""
-"If you want to use colors to distinguish certain categories on the print, check "
-"this option."
+msgid "Time Boxes"
 msgstr ""
 
+#. i18n: file ./plugins/exchange/exchangeui.rc line 5
+#: rc.cpp:1032
+#, no-c-format
+msgid "Exchange"
+msgstr "ਐਕਸ਼ਚੇਜ਼"
+
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 29
-#: rc.cpp:1646
+#: rc.cpp:1575
 #, no-c-format
 msgid "&Title:"
 msgstr "ਸਿਰਲੇਖ(&T):"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 40
-#: rc.cpp:1649
+#: rc.cpp:1578
 #, no-c-format
 msgid "To-do List"
 msgstr "ਕੰਮ ਸੂਚੀ"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 48
-#: rc.cpp:1652
+#: rc.cpp:1581
 #, no-c-format
 msgid "To-dos to Print"
 msgstr "ਛਾਪਣ ਲਈ ਕੰਮ ਸੂਚੀ"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 59
-#: rc.cpp:1655
+#: rc.cpp:1584
 #, no-c-format
 msgid "Print &all to-dos"
 msgstr "ਸਭ ਕੰਮ-ਕਾਰ ਛਾਪੋ(&A)"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 73
-#: rc.cpp:1658
+#: rc.cpp:1587
 #, no-c-format
 msgid "Print &unfinished to-dos only"
 msgstr ""
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 84
-#: rc.cpp:1661
+#: rc.cpp:1590
 #, no-c-format
 msgid "Print only to-dos due in the &range:"
 msgstr ""
 
+#. i18n: file ./printing/calprinttodoconfig_base.ui line 145
+#: rc.cpp:1596 rc.cpp:1800 rc.cpp:1818
+#, no-c-format
+msgid ""
+"If you want to print more days at once, you can define a range of dates with "
+"this option and the <i>End date</i> option. This option is used to define the "
+"start date."
+msgstr ""
+
+#. i18n: file ./printing/calprinttodoconfig_base.ui line 181
+#: rc.cpp:1602 rc.cpp:1830 rc.cpp:1836
+#, no-c-format
+msgid ""
+"If you want to print more days at once, you can define a range of dates with "
+"this option and the <i>Start date</i> option. This option is used to define the "
+"end date."
+msgstr ""
+
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 210
-#: rc.cpp:1676 rc.cpp:1712
+#: rc.cpp:1605 rc.cpp:1641
 #, no-c-format
 msgid "Include Information"
 msgstr "ਸ਼ਾਮਲ ਜਾਣਕਾਰੀ"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 224
-#: rc.cpp:1679
+#: rc.cpp:1608
 #, no-c-format
 msgid "&Priority"
 msgstr "ਦਰਜਾ(&P)"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 235
-#: rc.cpp:1682
+#: rc.cpp:1611
 #, no-c-format
 msgid "&Description"
 msgstr "ਵੇਰਵਾ(&D)"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 246
-#: rc.cpp:1685
+#: rc.cpp:1614
 #, no-c-format
 msgid "Due date"
 msgstr "ਮਿਆਦ"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 260
-#: rc.cpp:1688
+#: rc.cpp:1617
 #, no-c-format
 msgid "Per&centage completed"
 msgstr "ਫੀ-ਸਦੀ ਮੁਕੰਮਲ(&c)"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 290
-#: rc.cpp:1691
+#: rc.cpp:1620
 #, no-c-format
 msgid "Sorting Options"
 msgstr "ਸੂਚੀਬੱਧ ਚੋਣ"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 304
-#: rc.cpp:1694
+#: rc.cpp:1623
 #, no-c-format
 msgid "Sort field:"
 msgstr "ਸੂਚੀਬੱਧ ਖੇਤਰ:"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 323
-#: rc.cpp:1697
+#: rc.cpp:1626
 #, no-c-format
 msgid "Sort direction:"
 msgstr "ਸੂਚੀਬੱਧ ਦਿਸ਼ਾ:"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 375
-#: rc.cpp:1700
+#: rc.cpp:1629
 #, no-c-format
 msgid "Other Options"
 msgstr "ਹੋਰ ਚੋਣ"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 386
-#: rc.cpp:1703
+#: rc.cpp:1632
 #, no-c-format
 msgid "Co&nnect sub-to-dos with its parent"
 msgstr ""
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 397
-#: rc.cpp:1706
+#: rc.cpp:1635
 #, no-c-format
 msgid "Strike &out completed to-do summaries"
 msgstr ""
 
 #. i18n: file ./printing/calprintincidenceconfig_base.ui line 18
-#: rc.cpp:1709
+#: rc.cpp:1638
 #, no-c-format
 msgid "CalPrintIncidence_Base"
 msgstr ""
 
 #. i18n: file ./printing/calprintincidenceconfig_base.ui line 43
-#: rc.cpp:1715
+#: rc.cpp:1644
 #, no-c-format
 msgid "Detai&ls (visiblility, secrecy, etc.)"
 msgstr ""
 
 #. i18n: file ./printing/calprintincidenceconfig_base.ui line 51
-#: rc.cpp:1718
+#: rc.cpp:1647
 #, no-c-format
 msgid "&Notes, Subitems"
 msgstr ""
 
-#. i18n: file ./printing/calprintincidenceconfig_base.ui line 59
-#: koeventeditor.cpp:197 rc.cpp:1721
-#, no-c-format
-msgid "&Attendees"
-msgstr ""
-
 #. i18n: file ./printing/calprintincidenceconfig_base.ui line 67
-#: rc.cpp:1724
+#: rc.cpp:1653
 #, no-c-format
 msgid "Attach&ments"
 msgstr "ਨੱਥੀ"
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 18
-#: rc.cpp:1733
+#. i18n: file ./printing/calprintincidenceconfig_base.ui line 77
+#: rc.cpp:1656 rc.cpp:1704 rc.cpp:1839
+#, no-c-format
+msgid "&Use colors"
+msgstr "ਰੰਗ ਵਰਤੋਂ(&U)"
+
+#. i18n: file ./printing/calprintincidenceconfig_base.ui line 80
+#: rc.cpp:1659 rc.cpp:1842
+#, no-c-format
+msgid ""
+"If you want to use colors to distinguish certain categories on the print, check "
+"this option."
+msgstr ""
+
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 18
+#: rc.cpp:1662
 #, no-c-format
 msgid "CalPrintWeek_Base"
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 83
-#: rc.cpp:1742 rc.cpp:1745
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 83
+#: rc.cpp:1671 rc.cpp:1674
 #, no-c-format
 msgid ""
 "Here you can choose which events should be printed based on their date. This "
@@ -4627,20 +6324,32 @@ msgid ""
 "End date</i> to enter the end date of the daterange."
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 108
-#: rc.cpp:1751 rc.cpp:1754
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 102
+#: rc.cpp:1677 rc.cpp:1803
+#, no-c-format
+msgid "End ti&me:"
+msgstr "ਅੰਤ ਸਮਾਂ(&m):"
+
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 108
+#: rc.cpp:1680 rc.cpp:1683
 #, no-c-format
 msgid "All events which start later than the given time will not be printed."
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 157
-#: rc.cpp:1760 rc.cpp:1763
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 151
+#: rc.cpp:1686 rc.cpp:1824
+#, no-c-format
+msgid "Start &time:"
+msgstr "ਸ਼ੁਰੂ ਸਮਾਂ(&t):"
+
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 157
+#: rc.cpp:1689 rc.cpp:1692
 #, no-c-format
 msgid "All events which start earlier than the given time will not be printed."
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 186
-#: rc.cpp:1766 rc.cpp:1772
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 186
+#: rc.cpp:1695 rc.cpp:1701
 #, no-c-format
 msgid ""
 "Here you can choose which events should be printed based on their date. This "
@@ -4648,41 +6357,41 @@ msgid ""
 "Start date</i> to enter the start date of the daterange."
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 213
-#: rc.cpp:1778
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 213
+#: rc.cpp:1707
 #, no-c-format
 msgid ""
 "The timetable view supports colors. If you want to make use of colors you "
 "should check this option. The category colors will be used."
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 221
-#: rc.cpp:1781
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 221
+#: rc.cpp:1710
 #, no-c-format
 msgid "Print Layout"
 msgstr "ਛਾਪਣ ਖਾਕਾ"
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 232
-#: rc.cpp:1784
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 232
+#: rc.cpp:1713
 #, no-c-format
 msgid "Print as &Filofax page"
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 238
-#: rc.cpp:1787
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 238
+#: rc.cpp:1716
 #, no-c-format
 msgid ""
 "The Filofax view prints one week per page, so all days have a large surface."
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 246
-#: rc.cpp:1790
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 246
+#: rc.cpp:1719
 #, no-c-format
 msgid "Print as &timetable view"
 msgstr "ਛਾਪਣ ਲਈ ਸਮਾਂ-ਸਾਰਣੀ ਝਲਕ(&t)"
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 249
-#: rc.cpp:1793
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 249
+#: rc.cpp:1722
 #, no-c-format
 msgid ""
 "This view is similar to the weekview in KOrganizer. The week is printed in "
@@ -4690,14 +6399,14 @@ msgid ""
 "<i>Use Colors</i>."
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 257
-#: rc.cpp:1796
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 257
+#: rc.cpp:1725
 #, no-c-format
 msgid "Print as split week view"
 msgstr "ਵੰਡਿਆ ਹਫ਼ਤਾ ਝਲਕ ਵਾਂਗ ਛਾਪੋ"
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 260
-#: rc.cpp:1799
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 260
+#: rc.cpp:1728
 #, no-c-format
 msgid ""
 "This view is similar to the week view in KOrganizer. The only difference with "
@@ -4705,8 +6414,14 @@ msgid ""
 "split week view in portrait."
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 276
-#: rc.cpp:1805 rc.cpp:1838
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 273
+#: rc.cpp:1731 rc.cpp:1764 rc.cpp:1788
+#, no-c-format
+msgid "Include to-&dos that are due on the printed day(s)"
+msgstr ""
+
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 276
+#: rc.cpp:1734 rc.cpp:1767
 #, no-c-format
 msgid ""
 "Check this option if you want to have to-dos on the print, placed by their due "
@@ -4714,13 +6429,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 57
-#: rc.cpp:1811
+#: rc.cpp:1740
 #, no-c-format
 msgid "&Start month:"
 msgstr "ਸ਼ੁਰੂਆਤੀ ਮਹੀਨਾ(&S):"
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 63
-#: rc.cpp:1814
+#: rc.cpp:1743
 #, no-c-format
 msgid ""
 "When you want to print more months at once, you can define a month range. This "
@@ -4729,7 +6444,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 71
-#: rc.cpp:1817 rc.cpp:1820
+#: rc.cpp:1746 rc.cpp:1749
 #, no-c-format
 msgid ""
 "When you want to print more months at once, you can define a month range. This "
@@ -4738,13 +6453,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 93
-#: rc.cpp:1823
+#: rc.cpp:1752
 #, no-c-format
 msgid "&End month:"
 msgstr "ਅੰਤ ਮਹੀਨਾ(&E):"
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 99
-#: rc.cpp:1826 rc.cpp:1829 rc.cpp:1832
+#: rc.cpp:1755 rc.cpp:1758 rc.cpp:1761
 #, no-c-format
 msgid ""
 "When you want to print more months at once, you can define a month range. This "
@@ -4753,25 +6468,25 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 162
-#: rc.cpp:1841
+#: rc.cpp:1770
 #, no-c-format
 msgid "Print week &numbers"
 msgstr ""
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 165
-#: rc.cpp:1844
+#: rc.cpp:1773
 #, no-c-format
 msgid "Enable this to print week numbers at the left of each row."
 msgstr ""
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 173
-#: rc.cpp:1847
+#: rc.cpp:1776
 #, no-c-format
 msgid "Print daily re&curring to-dos and events"
 msgstr "ਦੁਹਾਰਉ ਘਟਨਾ "
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 176
-#: rc.cpp:1850
+#: rc.cpp:1779
 #, no-c-format
 msgid ""
 "With this option it is possible to leave out the daily recurring to-dos and "
@@ -4780,1127 +6495,561 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 184
-#: rc.cpp:1853
+#: rc.cpp:1782
 #, no-c-format
 msgid "Print weekl&y recurring to-dos and events"
 msgstr ""
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 187
-#: rc.cpp:1856
+#: rc.cpp:1785
 #, no-c-format
 msgid ""
 "Similar to \"Print daily recurring to-dos and events\". Weekly to-dos and "
 "events will be omitted when making a print of the selected month."
 msgstr ""
 
-#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 18
-#: rc.cpp:1985
-#, no-c-format
-msgid "CalPrintList_Base"
-msgstr "CalPrintList_Base"
-
-#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 130
-#: rc.cpp:1997
-#, no-c-format
-msgid "Print Incidences of Type"
-msgstr ""
-
-#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 141
-#: archivedialog.cpp:136 rc.cpp:2000 searchdialog.cpp:72
-#, no-c-format
-msgid "&Events"
-msgstr "ਘਟਨਾ(&E)"
-
-#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 149
-#: archivedialog.cpp:137 rc.cpp:2003
-#, no-c-format
-msgid "&To-dos"
-msgstr "ਕੰਮ-ਕਾਰ(&T)"
-
-#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 157
-#: rc.cpp:2006
-#, no-c-format
-msgid "&Journals"
-msgstr "ਰੋਜ਼ਨਾਮਚਾ(&J)"
-
-#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 18
-#: rc.cpp:2009
-#, no-c-format
-msgid "CalPrintYear_Base"
-msgstr ""
-
-#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 32
-#: rc.cpp:2012
-#, no-c-format
-msgid "Yearly print options"
-msgstr ""
-
-#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 46
-#: rc.cpp:2015
-#, no-c-format
-msgid "Print &Year:"
-msgstr ""
-
-#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 57
-#: rc.cpp:2018
-#, no-c-format
-msgid "Number of &pages:"
-msgstr ""
-
-#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 123
-#: rc.cpp:2021
+#. i18n: file ./printing/calprintdayconfig_base.ui line 35
+#: rc.cpp:1791
 #, no-c-format
-msgid "Display Options"
+msgid ""
+"You should check this option if you want to print to-dos which are due on one "
+"of the dates which are in the supplied date range."
 msgstr ""
 
-#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 134
-#: rc.cpp:2024
+#. i18n: file ./printing/calprintdayconfig_base.ui line 108
+#: rc.cpp:1806
 #, no-c-format
-msgid "Show sub-day events as:"
+msgid ""
+"It is possible to print only those events which are inside a given timerange. "
+"With this time selection box you can define the end of this time range. The "
+"start time should be defined with the <i>Start time</i> "
+"option. Note you can automatically modify these settings if you check <i>"
+"Extend time range to include all events</i>."
 msgstr ""
 
-#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 142
-#: rc.cpp:2027
+#. i18n: file ./printing/calprintdayconfig_base.ui line 126
+#: rc.cpp:1809
 #, no-c-format
-msgid "Show holidays as:"
+msgid ""
+"It's possible to print only those events which are inside a given timerange. "
+"With this time selection box you can define the end of this time range. The "
+"start time should be defined with the <i>Start time</i> "
+"option. Note you can automatically modify these settings if you check <i>"
+"Extend time range to include all events</i>."
 msgstr ""
 
-#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 148
-#: rc.cpp:2030 rc.cpp:2036
-#, no-c-format
-msgid "Text"
-msgstr "ਪਾਠ"
-
-#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 153
-#: rc.cpp:2033 rc.cpp:2039
+#. i18n: file ./printing/calprintdayconfig_base.ui line 134
+#: rc.cpp:1812
 #, no-c-format
-msgid "Time Boxes"
+msgid "E&xtend time range to include all events"
 msgstr ""
 
-#. i18n: file ./plugins/printing/journal/calprintjournalconfig_base.ui line 18
-#: rc.cpp:2042
-#, no-c-format
-msgid "CalPrintJournal_Base"
-msgstr "CalPrintJournal_Base"
-
-#. i18n: file ./plugins/printing/journal/calprintjournalconfig_base.ui line 46
-#: rc.cpp:2048
-#, no-c-format
-msgid "&All journal entries"
-msgstr "ਸਭ ਰੋਜ਼ਨਾਮਚਾ ਇੰਦਰਾਜ਼(&A)"
-
-#. i18n: file ./plugins/printing/journal/calprintjournalconfig_base.ui line 60
-#: rc.cpp:2051
-#, no-c-format
-msgid "Date &range:"
-msgstr "ਮਿਤੀ ਸੀਮਾ(&r):"
-
-#. i18n: file ./plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui line 18
-#: rc.cpp:2060
-#, no-c-format
-msgid "CalPrintWhatsNext_Base"
-msgstr "CalPrintWhatsNext_Base"
-
-#. i18n: file ./plugins/exchange/exchangeui.rc line 5
-#: rc.cpp:2072
+#. i18n: file ./printing/calprintdayconfig_base.ui line 137
+#: rc.cpp:1815
 #, no-c-format
-msgid "Exchange"
-msgstr "ਐਕਸ਼ਚੇਜ਼"
-
-#: konewstuff.cpp:48
-msgid "Could not load calendar."
-msgstr "ਕੈਲੰਡਰ ਲੋਡ ਨਹੀਂ ਹੋ ਸਕਿਆ ਹੈ।"
-
-#: konewstuff.cpp:63
-msgid "The downloaded events will be merged into your current calendar."
-msgstr ""
-
-#: koeditorattachments.cpp:107
-msgid "[Binary data]"
-msgstr "[ਬਾਈਨਰੀ ਡਾਟਾ]"
-
-#: koeditorattachments.cpp:194 printing/calprintdefaultplugins.cpp:417
-msgid "Attachments:"
-msgstr ""
-
-#: koeditorattachments.cpp:199
-msgid ""
-"Displays a list of current items (files, mail, etc.) that have been associated "
-"with this event or to-do. "
-msgstr ""
-
-#: koeditorattachments.cpp:225
-msgid "&Attach File..."
-msgstr ""
-
-#: koeditorattachments.cpp:226
 msgid ""
-"Shows a dialog used to select an attachment to add to this event or to-do as "
-"link as inline data."
-msgstr ""
-
-#: koeditorattachments.cpp:229
-msgid "Attach &Link..."
+"Check this option to automatically determine the required time range, so all "
+"events will be shown."
 msgstr ""
 
-#: koeditorattachments.cpp:230
+#. i18n: file ./printing/calprintdayconfig_base.ui line 166
+#: rc.cpp:1821
+#, no-c-format
 msgid ""
-"Shows a dialog used to select an attachment to add to this event or to-do as "
-"link."
+"It's possible to print only those events which are inside a given timerange. "
+"With this time selection box you can define the start of this time range. The "
+"end time should be defined with the <i>End time</i> option. Note you can "
+"automatically modify these settings if you check <i>"
+"Extend time range to include all events</i>."
 msgstr ""
 
-#: koeditorattachments.cpp:243
+#. i18n: file ./printing/calprintdayconfig_base.ui line 180
+#: rc.cpp:1827
+#, no-c-format
 msgid ""
-"Removes the attachment selected in the list above from this event or to-do."
-msgstr ""
-
-#: koeditorattachments.cpp:272
-msgid "Do you want to link to the attachments, or include them in the event?"
+"It is possible to print only those events which are inside a given timerange. "
+"With this time selection box you can define the start of this time range. The "
+"end time should be defined with the <i>End time</i> option. Note you can "
+"automatically modify these settings if you check <i>"
+"Extend time range to include all events</i>."
 msgstr ""
 
-#: koeditorattachments.cpp:273
-msgid "Attach as link?"
+#: koeditorgeneral.cpp:107
+msgid "Sets the Title of this event or to-do."
 msgstr ""
 
-#: koeditorattachments.cpp:273
-msgid "As Link"
+#: koeditorgeneral.cpp:126
+msgid "Sets where the event or to-do will take place."
 msgstr ""
 
-#: koeditorattachments.cpp:273
-msgid "As File"
-msgstr ""
+#: koeditorgeneral.cpp:127
+msgid "&Location:"
+msgstr "ਸਥਿਤੀ(&L):"
 
-#: koeditorattachments.cpp:315 koeditorattachments.cpp:340
+#: koeditorgeneral.cpp:143
 msgid ""
-"URL (e.g. a web page) or file to be attached (only the link will be attached, "
-"not the file itself):"
-msgstr ""
-
-#: koeditorattachments.cpp:317 koeditorattachments.cpp:325
-#: koeditorattachments.cpp:348
-msgid "Add Attachment"
-msgstr "ਨੱਥੀ ਸ਼ਾਮਿਲ ਕਰੋ"
-
-#: koeditorattachments.cpp:342
-msgid "Edit Attachment"
-msgstr "ਨੱਥੀ ਸੋਧ"
-
-#: koeditorattachments.cpp:348
-msgid "File to be attached:"
+"Allows you to select the categories that this event or to-do belongs to."
 msgstr ""
 
-#: koeditorattachments.cpp:378
+#: koeditorgeneral.cpp:144
 #, fuzzy
-msgid "The selected items will be permanently deleted."
-msgstr "ਇਹ ਇਕਾਈ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾ ਦਿੱਤੀ ਜਾਵੇਗੀ।"
-
-#: searchdialog.cpp:49
-msgid "Find Events"
-msgstr "ਘਟਨਾ ਖੋਜ"
-
-#: searchdialog.cpp:50
-msgid "&Find"
-msgstr "ਖੋਜ(&F)"
-
-#: searchdialog.cpp:62
-msgid "&Search for:"
-msgstr "ਖੋਜ ਲਈ:"
-
-#: searchdialog.cpp:70
-msgid "Search For"
-msgstr "ਖੋਜ"
-
-#: searchdialog.cpp:73
-msgid "To-&dos"
-msgstr "ਕੰਮ-ਕਾਰ(&d)"
-
-#: searchdialog.cpp:74
-msgid "&Journal entries"
-msgstr "ਰੋਜ਼ਨਾਮਚਾ ਇੰਦਰਾਜ਼"
-
-#: exportwebdialog.cpp:142 searchdialog.cpp:79
-msgid "Date Range"
-msgstr "ਮਿਤੀ ਸੀਮਾ"
-
-#: searchdialog.cpp:87
-msgid "Fr&om:"
-msgstr "ਵੱਲੋਂ:"
-
-#: searchdialog.cpp:91
-msgid "&To:"
-msgstr "ਵੱਲ(&T):"
-
-#: searchdialog.cpp:95
-msgid "E&vents have to be completely included"
-msgstr ""
-
-#: searchdialog.cpp:98
-msgid "Include to-dos &without due date"
-msgstr ""
-
-#: searchdialog.cpp:102
-msgid "Search In"
-msgstr "ਇਸ ਵਿੱਚ ਖੋਜ"
-
-#: searchdialog.cpp:105
-msgid "Su&mmaries"
-msgstr "ਸੰਖੇਪ"
-
-#: searchdialog.cpp:107
-msgid "Desc&riptions"
-msgstr "ਵੇਰਵਾ"
-
-#: searchdialog.cpp:108
-msgid "Cate&gories"
+msgid "Categories:"
 msgstr "ਵਰਗ"
 
-#: searchdialog.cpp:149
-msgid ""
-"Invalid search expression, cannot perform the search. Please enter a search "
-"expression using the wildcard characters '*' and '?' where needed."
-msgstr ""
-
-#: searchdialog.cpp:162
-msgid "No events were found matching your search expression."
-msgstr ""
-
-#: exportwebdialog.cpp:73
-msgid "Export Calendar as Web Page"
-msgstr "ਕੈਲੰਡਰ ਨੂੰ ਵੈੱਬ ਸਫ਼ੇ ਦੇ ਤੌਰ ਤੇ ਨਿਰਯਾਤ"
-
-#: exportwebdialog.cpp:130
-msgid ""
-"You are about to set all preferences to default values. All custom "
-"modifications will be lost."
-msgstr ""
-"ਤੁਸੀਂ ਸਭ ਪਸੰਦਾਂ ਨੂੰ ਮੂਲ ਬਣਾਉਣ ਜਾ ਰਹੇ ਹੋ। ਸਭ ਕੀਤੀਆਂ ਸੋਧਾਂ ਹਟਾ ਦਿੱਤੀਆਂ ਜਾਣਗੀਆਂ।"
-
-#: exportwebdialog.cpp:131
-msgid "Setting Default Preferences"
-msgstr "ਮੂਲ ਪਸੰਦ ਸਥਾਪਨ"
-
-#: exportwebdialog.cpp:132
-msgid "Reset to Defaults"
-msgstr "ਮੂਲ ਪਰਾਪਤ ਕਰੋ"
-
-#: exportwebdialog.cpp:147
-msgid "View Type"
-msgstr "ਦਰਿਸ਼ ਕਿਸਮ"
-
-#: exportwebdialog.cpp:158
-msgid "Destination"
-msgstr "ਨਿਯਤ"
-
-#: exportwebdialog.cpp:175
-msgid "To-dos"
-msgstr "ਕੰਮ-ਕਾਰ"
-
-#: exportwebdialog.cpp:196
-msgid "Events"
-msgstr "ਘਟਨਾ"
-
-#: aboutdata.cpp:32
-msgid "KOrganizer"
-msgstr "ਕੇ-ਪਰਬੰਧਕ"
-
-#: aboutdata.cpp:33
-msgid "A Personal Organizer for TDE"
-msgstr "TDE ਲਈ ਨਿੱਜੀ ਪਰਬੰਧਕ"
-
-#: aboutdata.cpp:40
-msgid "Current Maintainer"
-msgstr "ਮੌਜੂਦਾ ਪਰਬੰਧਕ"
-
-#: aboutdata.cpp:42
-msgid "Co-Maintainer"
-msgstr "ਸਹਿ-ਪਰਬੰਧਕ"
-
-#: aboutdata.cpp:44
-msgid "Original Author"
-msgstr "ਅਸਲੀ ਲੇਖਕ"
-
-#: resourceview.cpp:234
-#, fuzzy
-msgid "Add calendar"
-msgstr "ਨਵੇਂ ਕੈਲੰਡਰ ਵਾਂਗ ਸ਼ਾਮਿਲ"
-
-#: resourceview.cpp:236
-msgid ""
-"<qt>"
-"<p>Press this button to add a resource to KOrganizer.</p>"
-"<p>Events, journal entries and to-dos are retrieved and stored on resources. "
-"Available resources include groupware servers, local files, journal entries as "
-"blogs on a server, etc... </p>"
-"<p>If you have more than one active resource, when creating incidents you will "
-"either automatically use the default resource or be prompted to select the "
-"resource to use.</p></qt>"
-msgstr ""
-
-#: resourceview.cpp:249
+#: koeditorgeneral.cpp:153
 #, fuzzy
-msgid "Edit calendar settings"
-msgstr "ਕੈਲੰਡਰ ਫਿਲਟਰ ਸੋਧ"
+msgid "Select..."
+msgstr "ਸਿਰਨਾਵੀਂ ਚੁਣੋ..."
 
-#: resourceview.cpp:251
-msgid ""
-"Press this button to edit the resource currently selected on the KOrganizer "
-"resources list above."
+#: koeditorgeneral.cpp:163
+msgid "Acc&ess:"
 msgstr ""
 
-#: resourceview.cpp:256
-#, fuzzy
-msgid "Remove calendar"
-msgstr "ਸਰਗਰਮ ਕੈਲੰਡਰ"
-
-#: resourceview.cpp:258
+#: koeditorgeneral.cpp:164
 msgid ""
-"Press this button to delete the resource currently selected on the KOrganizer "
-"resources list above."
+"Sets whether the access to this event or to-do is restricted. Please note that "
+"KOrganizer currently does not use this setting, so the implementation of the "
+"restrictions will depend on the groupware server. This means that events or "
+"to-dos marked as private or confidential may be visible to others."
 msgstr ""
 
-#: resourceview.cpp:266
+#: koeditorgeneral.cpp:185
 msgid ""
-"<qt>"
-"<p>Select on this list the active KOrganizer resources. Check the resource box "
-"to make it active. Press the \"Add...\" button below to add new resources to "
-"the list.</p>"
-"<p>Events, journal entries and to-dos are retrieved and stored on resources. "
-"Available resources include groupware servers, local files, journal entries as "
-"blogs on a server, etc...</p>"
-"<p>If you have more than one active resource, when creating incidents you will "
-"either automatically use the default resource or be prompted to select the "
-"resource to use.</p></qt>"
+"Sets the description for this event or to-do. This will be displayed in a "
+"reminder if one is set, as well as in a tooltip when you hover over the event."
 msgstr ""
 
-#: resourceview.cpp:326
-#, fuzzy
-msgid "Add Subresource"
-msgstr "%1 ਸਰੋਤ"
-
-#: resourceview.cpp:327
-#, fuzzy
-msgid "Please enter a name for the new subresource"
-msgstr "ਕਿਰਪਾ ਕਰਕੇ ਨਵੇਂ ਨਮੂਨੇ ਲਈ ਇੱਕ ਨਾਂ ਦਿਓ:"
-
-#: resourceview.cpp:333
-#, fuzzy
-msgid "<qt>Unable to create subresource <b>%1</b>.</qt>"
-msgstr "'%1' ਕੈਲੰਡਰ ਸਰੋਤ ਬਣਾਉਣ ਲਈ ਅਸਫ਼ਲ ਹੈ।"
-
-#: resourceview.cpp:341
-msgid "Resource Configuration"
-msgstr "ਸਰੋਤ ਸੰਰਚਨਾ"
-
-#: resourceview.cpp:342
-msgid "Please select type of the new resource:"
-msgstr "ਨਵੇਂ ਸਰੋਤ ਦੀ ਕਿਸਮ ਚੁਣੋ ਜੀ:"
-
-#: resourceview.cpp:352
-msgid "<qt>Unable to create resource of type <b>%1</b>.</qt>"
+#: koeditorgeneral.cpp:202
+msgid "Enable reminders for this event or to-do."
 msgstr ""
 
-#: resourceview.cpp:357
-msgid "%1 resource"
-msgstr "%1 ਸਰੋਤ"
-
-#: resourceview.cpp:371
+#: koeditorgeneral.cpp:203
 #, fuzzy
-msgid "Unable to create the resource."
-msgstr "'%1' ਕੈਲੰਡਰ ਸਰੋਤ ਬਣਾਉਣ ਲਈ ਅਸਫ਼ਲ ਹੈ।"
+msgid "Enable reminders"
+msgstr "ਯਾਦ ਪੱਤਰ ਸੋਧ"
 
-#: resourceview.cpp:484
+#: koeditorgeneral.cpp:209
 msgid ""
-"<qt>Do you really want to remove the subresource <b>%1</b>"
-"? Note that its contents will be completely deleted. This operation cannot be "
-"undone. </qt>"
-msgstr ""
-
-#: resourceview.cpp:487
-msgid "<qt>Do you really want to remove the resource <b>%1</b>?</qt>"
+"Push this button to create an advanced set of reminders for this event or "
+"to-do."
 msgstr ""
 
-#: resourceview.cpp:497
-msgid "You cannot delete your standard resource."
+#: koeditorgeneral.cpp:211
+msgid "Set an advanced reminder"
 msgstr ""
 
-#: resourceview.cpp:504
+#: koeditorgeneral.cpp:220
 msgid ""
-"<qt>Failed to remove the subresource <b>%1</b>. The reason could be that it is "
-"a built-in one which cannot be removed, or that the removal of the underlying "
-"storage folder failed.</qt>"
-msgstr ""
-
-#: resourceview.cpp:581
-msgid "Re&load"
-msgstr "ਮੁੜ-ਪਰਾਪਤ(&U)"
-
-#: resourceview.cpp:589
-msgid "Show &Info"
-msgstr "ਜਾਣਕਾਰੀ ਵੇਖਾਓ"
-
-#: resourceview.cpp:593
-msgid "&Assign Color"
-msgstr ""
-
-#: resourceview.cpp:595
-msgid "&Disable Color"
-msgstr "ਰੰਗ ਆਯੋਗ"
-
-#: resourceview.cpp:596
-msgid "Resources Colors"
-msgstr "ਸਰੋਤ ਰੰਗ"
-
-#: resourceview.cpp:603
-msgid "Use as &Default Calendar"
-msgstr "ਮੂਲ ਕੈਲੰਡਰ ਵਾਂਗ ਵਰਤੋਂ"
-
-#: resourceview.cpp:609
-msgid "&Add..."
-msgstr "ਸ਼ਾਮਿਲ(&A)..."
-
-#: printing/calprinter.cpp:133
-msgid "Unable to print, no valid print style was returned."
+"Set the time before the event starts when the reminder will be triggered."
 msgstr ""
 
-#: printing/calprinter.cpp:134
-msgid "Printing error"
+#: koeditorgeneral.cpp:221
+msgid "Set the start time trigger offset"
 msgstr ""
 
-#: printing/calprinter.cpp:155
-msgid "Print Calendar"
-msgstr "ਕੈਲੰਡਰ ਛਾਪੋ"
-
-#: printing/calprinter.cpp:179
-msgid "Print Style"
-msgstr "ਛਪਾਈ ਸ਼ੈਲੀ"
-
-#: printing/calprinter.cpp:193
-msgid "Page &orientation:"
-msgstr "ਸਫ਼ਾ ਸਥਿਤੀ:"
-
-#: printing/calprinter.cpp:198
-msgid "Use Default Orientation of Selected Style"
-msgstr "ਚੁਣੀ ਸ਼ੈਲੀ ਲਈ ਮੂਲ ਸਥਿਤੀ ਵਰਤੋਂ"
-
-#: printing/calprinter.cpp:199
-msgid "Use Printer Default"
-msgstr "ਪਰਿੰਟਰ ਮੂਲ ਵਰਤੋਂ"
-
-#: printing/calprinter.cpp:237 printing/calprinter.cpp:239
-msgid "&Preview"
-msgstr "ਨਮੂਨਾ(&P)"
-
-#: printing/calprintdefaultplugins.cpp:134
-#: printing/calprintdefaultplugins.cpp:163
-#: printing/calprintdefaultplugins.cpp:182
-msgid "Start date: "
-msgstr ""
-
-#: printing/calprintdefaultplugins.cpp:139
-#: printing/calprintdefaultplugins.cpp:168
-msgid "No start date"
-msgstr ""
-
-#: printing/calprintdefaultplugins.cpp:144
-msgid "End date: "
-msgstr ""
-
-#: koeditorgeneralevent.cpp:416 koeditorgeneralevent.cpp:430
-#: printing/calprintdefaultplugins.cpp:147
-msgid "Duration: "
-msgstr "ਅੰਤਰਾਲ:"
-
-#: printing/calprintdefaultplugins.cpp:150
-#, c-format
-msgid ""
-"_n: 1 hour \n"
-"%n hours "
-msgstr ""
-"1 ਘੰਟਾ \n"
-"%n ਘੰਟੇ "
-
-#: printing/calprintdefaultplugins.cpp:153
-#, c-format
+#: koeditorgeneral.cpp:223
 msgid ""
-"_n: 1 minute \n"
-"%n minutes "
+"Set the time before the to-do is due when the reminder will be triggered."
 msgstr ""
-"1 ਮਿੰਟ \n"
-"%n ਮਿੰਟ "
 
-#: printing/calprintdefaultplugins.cpp:156
-msgid "No end date"
+#: koeditorgeneral.cpp:224
+msgid "Set the due time trigger offset"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:173
-msgid "Due date: "
+#: koeditorgeneral.cpp:242 koeditorgeneral.cpp:447
+msgid "before the due time"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:176
-msgid "No due date"
+#: koeditorgeneral.cpp:429 koeditorgeneral.cpp:468
+#, c-format
+msgid "Triggers %1"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:288
-msgid "Repeats: "
-msgstr ""
+#: koeditorgeneral.cpp:500
+#, fuzzy, c-format
+msgid "Calendar: %1"
+msgstr "ਕੈਲੰਡਰ"
 
-#: printing/calprintdefaultplugins.cpp:294
-msgid "No reminders"
-msgstr ""
+#: koeditorgeneral.cpp:582
+#, fuzzy
+msgid "No attendees"
+msgstr "ਸਰੋਤੇ(&n)"
 
-#: printing/calprintdefaultplugins.cpp:297
+#: koeditorgeneral.cpp:584
 #, c-format
 msgid ""
-"_n: Reminder: \n"
-"%n reminders: "
+"_n: One attendee\n"
+"%n attendees"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:340
-#: printing/calprintdefaultplugins.cpp:475
+#: eventarchiver.cpp:101
 msgid ""
-"_: Spacer for the joined list of categories\n"
-", "
+"Unable to archive to-do \"%1\" because at least one of its sub-to-dos does not "
+"meet the archival requirements."
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:347
-msgid "Organizer: "
-msgstr ""
-
-#: printing/calprintdefaultplugins.cpp:357
-msgid "Location: "
-msgstr "ਟਿਕਾਣਾ: "
-
-#: printing/calprintdefaultplugins.cpp:392
-msgid "Description:"
-msgstr "ਵੇਰਵਾ:"
-
-#: printing/calprintdefaultplugins.cpp:398
-msgid "Notes:"
-msgstr ""
-
-#: printing/calprintdefaultplugins.cpp:408
-msgid "Subitems:"
-msgstr ""
-
-#: printing/calprintdefaultplugins.cpp:426
-msgid "No Attendees"
-msgstr ""
+#: eventarchiver.cpp:103
+#, fuzzy
+msgid "Archive To-do"
+msgstr "ਪੁਰਾਣੇ ਕੰਮ ਕਾਰ"
 
-#: printing/calprintdefaultplugins.cpp:428
-#, c-format
+#: eventarchiver.cpp:120
 msgid ""
-"_n: 1 Attendee:\n"
-"%n Attendees:"
+"There are no incidences available to archive before the specified cut-off date "
+"%1. Archiving will not be performed."
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:435
+#: eventarchiver.cpp:148
 msgid ""
-"_: Formatting of an attendee: 'Name (Role): Status', e.g. 'Reinhold Kainhofer "
-"<reinhold@kainhofer.com> (Participant): Awaiting Response'\n"
-"%1 (%2): %3"
-msgstr ""
-
-#: printing/calprintdefaultplugins.cpp:439
-msgid "Attendees:"
+"Delete all items before %1 without saving?\n"
+"The following items will be deleted:"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:446
-#, c-format
-msgid "Status: %1"
-msgstr ""
+#: eventarchiver.cpp:151
+msgid "Delete Old Items"
+msgstr "ਪੁਰਾਣੀ ਘਟਨਾਵਾਂ ਹਟਾਉ"
 
-#: printing/calprintdefaultplugins.cpp:450
+#: eventarchiver.cpp:219
 #, c-format
-msgid "Secrecy: %1"
-msgstr ""
-
-#: printing/calprintdefaultplugins.cpp:456
-msgid "Show as: Busy"
-msgstr ""
-
-#: printing/calprintdefaultplugins.cpp:458
-msgid "Show as: Free"
-msgstr ""
-
-#: printing/calprintdefaultplugins.cpp:464
-msgid "This task is overdue!"
-msgstr ""
-
-#: printing/calprintdefaultplugins.cpp:470
-msgid "Settings: "
+msgid "Cannot write archive file %1."
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:474
-msgid "Categories: "
+#: eventarchiver.cpp:228
+msgid "Cannot write archive to final destination."
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:741
-msgid ""
-"_: date from-to\n"
-"%1 - %2"
+#: korganizer_options.h:35
+msgid "Import the given calendars as new resources into the default calendar"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:743
+#: korganizer_options.h:37
 msgid ""
-"_: date from-\n"
-"to\n"
-"%1 -\n"
-"%2"
+"Merge the given calendars into the standard calendar (i.e. copy the events)"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:760
-msgid ""
-"_: date from - to (week number)\n"
-"%1 - %2 (Week %3)"
+#: korganizer_options.h:39
+msgid "Open the given calendars in a new window"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:762
+#: korganizer_options.h:40
 msgid ""
-"_: date from -\n"
-"to (week number)\n"
-"%1 -\n"
-"%2 (Week %3)"
+"Calendar files or urls. Unless -i, -o or -m is explicitly specified, the user "
+"will be asked whether to import, merge or open in a separate window."
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:1005
-msgid "Due Date"
-msgstr "ਮਿਆਦ"
-
-#: printing/calprintdefaultplugins.cpp:1007
-msgid "Percent Complete"
-msgstr "ਪ੍ਰਤੀਸ਼ਤ ਮੁਕੰਮਲ"
-
-#: printing/calprintdefaultplugins.cpp:1013
-msgid "Ascending"
-msgstr "ਵੱਧਦਾ ਕ੍ਰਮ"
-
-#: printing/calprintdefaultplugins.cpp:1014
-msgid "Descending"
-msgstr "ਘੱਟਦਾ ਕ੍ਰਮ"
-
-#: printing/calprintdefaultplugins.cpp:1023
-msgid "To-do list"
-msgstr ""
+#: kolistview.cpp:212 kotodoview.cpp:387
+msgid "Recurs"
+msgstr "ਦੁਹਰਾਉ"
 
-#: printing/calprintpluginbase.cpp:135
-msgid "This printing style does not have any configuration options."
-msgstr ""
+#: kolistview.cpp:215
+#, fuzzy
+msgid "Start Date/Time"
+msgstr "ਸ਼ੁਰੂ ਮਿਤੀ"
 
-#: printing/calprintpluginbase.cpp:887
-msgid ""
-"_: weekday month date\n"
-"%1 %2 %3"
-msgstr "%1 %2 %3"
+#: kolistview.cpp:218
+#, fuzzy
+msgid "End Date/Time"
+msgstr "ਅੰਤ ਮਿਤੀ"
 
-#: printing/calprintpluginbase.cpp:949
-#, c-format
-msgid "To-do: %1"
-msgstr "ਕੰਮ-ਕਾਰ: %1"
+#: korgplugins.cpp:37
+msgid "KOrgPlugins"
+msgstr "ਕੇ-ਪਰਬੰਧਕ-ਪਲੱਗਿੰਨ"
 
-#: printing/calprintpluginbase.cpp:1495
-msgid "%1%"
-msgstr "%1%"
+#: koeditorattachments.cpp:143
+msgid "[Binary data]"
+msgstr "[ਬਾਈਨਰੀ ਡਾਟਾ]"
 
-#: printing/calprintpluginbase.cpp:1599
-msgid ""
-"_: Description - date\n"
-"%1 - %2"
-msgstr "%1 - %2"
+#: koeditorattachments.cpp:168 koeditorattachments.cpp:672
+msgid "Add Attachment"
+msgstr "ਨੱਥੀ ਸ਼ਾਮਿਲ ਕਰੋ"
 
-#: printing/calprintpluginbase.cpp:1620
-#, c-format
-msgid "Person: %1"
-msgstr "ਵਿਅਕਤੀ: %1"
+#: koeditorattachments.cpp:186
+#, fuzzy
+msgid "Attachment name"
+msgstr "ਨੱਥੀ"
 
-#: printing/calprintpluginbase.cpp:1621
-#, c-format
-msgid "%1"
-msgstr "%1"
+#: koeditorattachments.cpp:187
+#, fuzzy
+msgid "Give the attachment a name"
+msgstr "ਮੂਲ ਮੁਲਾਕਾਤ ਸਮਾਂ"
 
-#: printing/calprintpluginbase.cpp:1639
-msgid ""
-"_: Date range: Month dayStart - dayEnd\n"
-"%1 %2 - %3"
-msgstr "%1 %2 - %3"
+#: koeditorattachments.cpp:189
+msgid "Type any string you desire here for the name of the attachment"
+msgstr ""
 
-#: printing/calprintpluginbase.cpp:1644
-msgid ""
-"_: Date range: monthStart dayStart - monthEnd dayEnd\n"
-"%1 %2 - %3 %4"
-msgstr "%1 %2 - %3 %4"
+#: koeditorattachments.cpp:195
+#, fuzzy
+msgid "Type:"
+msgstr "ਕਿਸਮ"
 
-#: printing/cellitem.cpp:36
-msgid "<undefined>"
-msgstr "<ਨਾ-ਪ੍ਰਭਾਸ਼ਿਤ>"
+#: koeditorattachments.cpp:204
+#, fuzzy
+msgid "Store attachment inline"
+msgstr "ਨੱਥੀ"
 
-#: printing/calprintdefaultplugins.h:45
-msgid "Print &incidence"
+#: koeditorattachments.cpp:207
+msgid "Store the attachment file inside the calendar"
 msgstr ""
 
-#: printing/calprintdefaultplugins.h:46
-msgid "Prints an incidence on one page"
+#: koeditorattachments.cpp:210
+msgid ""
+"Checking this option will cause the attachment to be stored inside your "
+"calendar, which can take a lot of space depending on the size of the "
+"attachment. If this option is not checked, then only a link pointing to the "
+"attachment will be stored.  Do not use a link for attachments that change often "
+"or may be moved (or removed) from their current location."
 msgstr ""
 
-#: printing/calprintdefaultplugins.h:85
-msgid "Print da&y"
-msgstr "ਦਿਨ ਛਾਪੋ(&y)"
-
-#: printing/calprintdefaultplugins.h:86
-msgid "Prints all events of a single day on one page"
+#: koeditorattachments.cpp:221
+msgid "Provide a location for the attachment file"
 msgstr ""
 
-#: printing/calprintdefaultplugins.h:110
-msgid "Print &week"
-msgstr "ਹਫ਼ਤਾ ਛਾਪੋ(&w)"
-
-#: printing/calprintdefaultplugins.h:111
-msgid "Prints all events of one week on one page"
+#: koeditorattachments.cpp:224
+msgid ""
+"Enter the path to the attachment file or use the file browser by pressing the "
+"adjacent button"
 msgstr ""
 
-#: printing/calprintdefaultplugins.h:139
-msgid "Print mont&h"
-msgstr "ਮਹੀਨਾ ਛਾਪੋ(&h)"
-
-#: printing/calprintdefaultplugins.h:140
-msgid "Prints all events of one month on one page"
+#: koeditorattachments.cpp:234
+msgid "Size:"
 msgstr ""
 
-#: printing/calprintdefaultplugins.h:166
-msgid "Print to-&dos"
-msgstr "ਕੰਮ ਛਾਪੋ(&d)"
+#: koeditorattachments.cpp:258
+#, fuzzy
+msgid "New attachment"
+msgstr "ਨੱਥੀ ਸ਼ਾਮਿਲ ਕਰੋ"
 
-#: printing/calprintdefaultplugins.h:167
-msgid "Prints all to-dos in a (tree-like) list"
+#: koeditorattachments.cpp:457
+msgid "Attachments:"
 msgstr ""
 
-#: koeventeditor.cpp:124 koeventeditor.cpp:149
+#: koeditorattachments.cpp:462
 msgid ""
-"The General tab allows you to set the most common options for the event."
+"Displays a list of current items (files, mail, etc.) that have been associated "
+"with this event or to-do. "
 msgstr ""
 
-#: koeventeditor.cpp:138 kotodoeditor.cpp:109
-msgid "Details"
-msgstr "ਵੇਰਵਾ"
-
-#: koeventeditor.cpp:179 kotodoeditor.cpp:148
-msgid "Rec&urrence"
-msgstr "ਆਵਰਤੀ"
+#: koeditorattachments.cpp:474
+#, fuzzy
+msgid "Add an attachment"
+msgstr "ਨੱਥੀ ਸ਼ਾਮਿਲ ਕਰੋ"
 
-#: koeventeditor.cpp:182
+#: koeditorattachments.cpp:476
 msgid ""
-"The Recurrence tab allows you to set options on how often this event recurs."
+"Shows a dialog used to select an attachment to add to this event or to-do as "
+"link or as inline data."
 msgstr ""
 
-#: koeventeditor.cpp:199
+#: koeditorattachments.cpp:486
 msgid ""
-"The Free/Busy tab allows you to see whether other attendees are free or busy "
-"during your event."
+"Removes the attachment selected in the list above from this event or to-do."
 msgstr ""
 
-#: koeventeditor.cpp:219
-msgid "Edit Event"
-msgstr "ਘਟਨਾ ਸੋਧ"
-
-#: koeventeditor.cpp:227
-msgid "New Event"
-msgstr "ਨਵੀਂ ਘਟਨਾ"
-
-#: koeventeditor.cpp:285
-msgid ""
-"You didn't change the event, thus no counter proposal has been sent to the "
-"organizer."
+#: koeditorattachments.cpp:585
+msgid "&Link here"
 msgstr ""
 
-#: koeventeditor.cpp:285
+#: koeditorattachments.cpp:593 koeditorattachments.cpp:596
 #, fuzzy
-msgid "No changes"
-msgstr "ਐਕਸ਼ਚੇਜ਼"
-
-#: koeventeditor.cpp:295
-#, c-format
-msgid "My counter proposal for: %1"
-msgstr ""
+msgid "&Copy Here"
+msgstr "ਨਕਲ(&C)"
 
-#: koeventeditor.cpp:390
-msgid "Template does not contain a valid event."
+#: koeditorattachments.cpp:721
+msgid "<qt>Do you really want to remove these attachments?<p>%1</qt>"
 msgstr ""
 
-#: timezone.cpp:39
-msgid "KOrganizer Timezone Test"
-msgstr "ਕੇ-ਪਰਬੰਧਕ ਸਮਾਂ-ਖੇਤਰ ਜਾਂਚ"
-
-#: kotodoeditor.cpp:173
-msgid "Edit To-do"
-msgstr "ਕੰਮ-ਕਾਰ ਸੋਧ"
-
-#: kotodoeditor.cpp:182
-msgid "New To-do"
-msgstr "ਨਵਾਂ ਕੰਮ-ਕਾਰ"
+#: koeditorattachments.cpp:722
+#, fuzzy
+msgid "Remove Attachment?"
+msgstr "ਨੱਥੀ"
 
-#: kotodoeditor.cpp:343
-msgid "Template does not contain a valid to-do."
+#: koagendaitem.cpp:565
+msgid "Attendee \"%1\" added to the calendar item \"%2\""
 msgstr ""
 
-#: stdcalendar.cpp:74
-msgid "Active Calendar"
-msgstr "ਸਰਗਰਮ ਕੈਲੰਡਰ"
-
-#: stdcalendar.cpp:83
-msgid "Default Calendar"
-msgstr "ਮੂਲ ਕੈਲੰਡਰ"
+#: koagendaitem.cpp:565
+#, fuzzy
+msgid "Attendee added"
+msgstr "ਦਰਸ਼ਕ ਹਟਾਏ ਗਏ"
 
-#: stdcalendar.cpp:98
-msgid "Birthdays"
-msgstr "ਜਨਮ ਦਿਨ"
+#: koagendaitem.cpp:841 koagendaitem.cpp:939
+msgid "%1 - %2"
+msgstr "%1 - %2"
 
-#: statusdialog.cpp:41
-msgid "Set Your Status"
-msgstr "ਆਪਣੀ ਸਥਿਤੀ ਦਿਓ"
+#: koagendaitem.cpp:850
+#, c-format
+msgid "- %1"
+msgstr "- %1"
 
-#: statusdialog.cpp:49
-msgid "Set your status"
-msgstr "ਆਪਣੀ ਸਥਿਤੀ ਦਿਓ"
+#: kowhatsnextview.cpp:101
+msgid "What's Next?"
+msgstr "ਅੱਗੇ ਕੀ ਹੈ?"
 
-#: kotodoviewitem.cpp:125
-msgid "--"
-msgstr "--"
+#: kowhatsnextview.cpp:108
+msgid ""
+"_: Date from - to\n"
+"%1 - %2"
+msgstr "%1 - %2"
 
-#: korganizer_options.h:35
-msgid "Import the given calendars as new resources into the default calendar"
-msgstr ""
+#: kowhatsnextview.cpp:124
+msgid "Events:"
+msgstr "ਘਟਨਾਵਾਂ:"
 
-#: korganizer_options.h:37
-msgid ""
-"Merge the given calendars into the standard calendar (i.e. copy the events)"
-msgstr ""
+#: kowhatsnextview.cpp:160
+msgid "To-do:"
+msgstr "ਕੰਮ-ਕਾਰ:"
 
-#: korganizer_options.h:39
-msgid "Open the given calendars in a new window"
+#: kowhatsnextview.cpp:199 kowhatsnextview.cpp:220
+msgid "Events and to-dos that need a reply:"
 msgstr ""
 
-#: korganizer_options.h:40
+#: kowhatsnextview.cpp:288
 msgid ""
-"Calendar files or urls. Unless -i, -o or -m is explicitly specified, the user "
-"will be asked whether to import, merge or open in a separate window."
-msgstr ""
+"_: date, from - to\n"
+"%1, %2 - %3"
+msgstr "%1, %2 - %3"
 
-#: koeditorgeneralevent.cpp:104
-msgid "Sets options related to the date and time of the event or to-do."
+#: kowhatsnextview.cpp:316
+msgid "  (Due: %1)"
 msgstr ""
 
-#: koeditorgeneralevent.cpp:114
-msgid "&Start:"
-msgstr "ਸ਼ੁਰੂ:"
-
-#: koeditorgeneralevent.cpp:125
-msgid "&End:"
-msgstr "ਅੰਤ:"
-
-#: koeditorgeneralevent.cpp:135
-#, fuzzy
-msgid "All-&day"
-msgstr "ਸਭ ਦਿਨ"
-
-#: koeditorgeneralevent.cpp:163
-#, fuzzy
-msgid "Reminder:"
-msgstr "ਯਾਦ ਪੱਤਰ"
+#: navigatorbar.cpp:75
+msgid "Previous year"
+msgstr "ਪਿਛਲਾ ਸਾਲ"
 
-#: koeditorgeneralevent.cpp:183
-msgid "S&how time as:"
-msgstr "ਸਮਾਂ ਵੇਖਾਓ:"
+#: navigatorbar.cpp:81
+msgid "Previous month"
+msgstr "ਪਿਛਲਾ ਮਹੀਨਾ"
 
-#: koeditorgeneralevent.cpp:184
-msgid "Sets how this time will appear on your Free/Busy information."
-msgstr ""
+#: navigatorbar.cpp:88
+msgid "Next month"
+msgstr "ਅਗਲਾ ਮਹੀਨਾ"
 
-#: koeditorgeneralevent.cpp:191
-msgid "Busy"
-msgstr "ਰੁਝਿਆ"
+#: navigatorbar.cpp:94
+msgid "Next year"
+msgstr "ਅਗਲਾ ਸਾਲ"
 
-#: koeditorgeneralevent.cpp:192
-msgid "Free"
-msgstr "ਵਿਹਲਾ"
+#: navigatorbar.cpp:101
+msgid "Select a month"
+msgstr "ਇੱਕ ਮਹੀਨਾ ਚੁਣੋ"
 
-#: koeditorgeneralevent.cpp:206
-msgid "You have not yet definitely responded to this invitation."
-msgstr ""
+#: navigatorbar.cpp:108
+#, fuzzy
+msgid "Select a year"
+msgstr "ਇੱਕ ਮਹੀਨਾ ਚੁਣੋ"
 
-#: koeditorgeneralevent.cpp:417
-#, c-format
+#: navigatorbar.cpp:177
+#, fuzzy, c-format
 msgid ""
-"_n: 1 Day\n"
-"%n Days"
-msgstr ""
-"1 ਦਿਨ\n"
-"%n ਦਿਨ"
-
-#: koeditorgeneralevent.cpp:436
-msgid ", "
-msgstr ", "
+"_: monthname\n"
+"%1"
+msgstr "%1 %2"
 
-#: koeditorgeneralevent.cpp:447
+#: navigatorbar.cpp:178
+#, c-format
 msgid ""
-"Shows the duration of the event or to-do with the current start and end dates "
-"and times."
+"_: 4 digit year\n"
+"%1"
 msgstr ""
 
-#: koeditorgeneralevent.cpp:464
-msgid "From: %1   To: %2   %3"
-msgstr "ਵਲੋਂ: %1   ਵੱਲ: %2   %3"
-
-#: koeditorgeneralevent.cpp:477
-msgid "Please specify a valid start time, for example '%1'."
-msgstr "ਕਿਰਪਾ ਕਰਕੇ ਇੱਕ ਜਾਇਜ ਸ਼ੁਰੂ ਸਮਾਂ ਦਿਓ, ਉਦਾਹਰਨ ਲਈ '%1'"
-
-#: koeditorgeneralevent.cpp:484
-msgid "Please specify a valid end time, for example '%1'."
-msgstr "ਕਿਰਪਾ ਕਰਕੇ ਇੱਕ ਜਾਇਜ ਅੰਤ ਸਮਾਂ ਦਿਓ, ਉਦਾਹਰਨ ਲਈ '%1'"
-
-#: koeditorgeneralevent.cpp:492
-msgid "Please specify a valid start date, for example '%1'."
-msgstr "ਕਿਰਪਾ ਕਰਕੇ ਇੱਕ ਜਾਇਜ ਸ਼ੁਰੂ ਮਿਤੀ ਦਿਓ, ਉਦਾਹਰਨ ਲਈ '%1'"
+#: publishdialog.cpp:43
+msgid "Select Addresses"
+msgstr "ਸਿਰਨਾਵੀਂ ਚੁਣੋ"
 
-#: koeditorgeneralevent.cpp:499
-msgid "Please specify a valid end date, for example '%1'."
-msgstr "ਕਿਰਪਾ ਕਰਕੇ ਇੱਕ ਜਾਇਜ ਅੰਤ ਮਿਤੀ ਦਿਓ, ਉਦਾਹਰਨ ਲਈ '%1"
+#: publishdialog.cpp:101
+msgid "(EmptyName)"
+msgstr "(ਖਾਲੀ ਨਾਂ)"
 
-#: koeditorgeneralevent.cpp:513
-msgid ""
-"The event ends before it starts.\n"
-"Please correct dates and times."
+#: kotodoview.cpp:216
+msgid "Cannot move to-do to itself or a child of itself."
 msgstr ""
 
-#: koeventviewerdialog.cpp:33
-msgid "Event Viewer"
-msgstr "ਘਟਨਾ ਦਰਸ਼ਕ"
-
-#: archivedialog.cpp:55
-msgid "Archive/Delete Past Events and To-dos"
-msgstr ""
+#: kotodoview.cpp:217
+msgid "Drop To-do"
+msgstr "ਕੰਮ-ਕਾਰ ਹਟਾਓ"
 
-#: archivedialog.cpp:57
-msgid "&Archive"
+#: kotodoview.cpp:230
+msgid "Unable to change to-do's parent, because the to-do cannot be locked."
 msgstr ""
 
-#: archivedialog.cpp:66
+#: kotodoview.cpp:278
 msgid ""
-"Archiving saves old items into the given file and then deletes them in the "
-"current calendar. If the archive file already exists they will be added. (<a "
-"href=\"whatsthis:In order to add an archive to your calendar, use the "
-"&quot;Merge Calendar&quot; function. You can view an archive by opening it in "
-"KOrganizer like any other calendar. It is not saved in a special format, but as "
-"vCalendar.\">How to restore</a>)"
+"Unable to add attendees to the to-do, because the to-do cannot be locked."
 msgstr ""
 
-#: archivedialog.cpp:82
-msgid "Archive now items older than:"
-msgstr ""
+#: kotodoview.cpp:368
+msgid "To-dos:"
+msgstr "ਕੰਮ-ਕਾਰ:"
 
-#: archivedialog.cpp:87
-msgid ""
-"The date before which items should be archived. All older events and to-dos "
-"will be saved and deleted, the newer (and events exactly on that date) will be "
-"kept."
-msgstr ""
+#: kotodoview.cpp:372
+msgid "Click to add a new to-do"
+msgstr "ਨਵਾਂ ਕੰਮ-ਕਾਰ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਦਬਾਉ"
 
-#: archivedialog.cpp:96
-msgid "Automaticall&y archive items older than:"
+#: kotodoview.cpp:392
+msgid "Due Date/Time"
 msgstr ""
 
-#: archivedialog.cpp:99
-msgid ""
-"If this feature is enabled, KOrganizer will regularly check if events and "
-"to-dos have to be archived; this means you will not need to use this dialog box "
-"again, except to change the settings."
-msgstr ""
+#: kotodoview.cpp:397
+msgid "Sort Id"
+msgstr "ਕ੍ਰਮਬੱਧ Id"
 
-#: archivedialog.cpp:107
+#: kotodoview.cpp:417
 msgid ""
-"The age of the events and to-dos to archive. All older items will be saved and "
-"deleted, the newer will be kept."
-msgstr ""
-
-#: archivedialog.cpp:112
-msgid "Day(s)"
-msgstr "ਦਿਨ"
-
-#: archivedialog.cpp:113
-msgid "Week(s)"
-msgstr "ਹਫਤੇ"
-
-#: archivedialog.cpp:114
-msgid "Month(s)"
-msgstr "ਮਹੀਨੇ"
+"_: Unspecified priority\n"
+"unspecified"
+msgstr "ਨਾ-ਪ੍ਰਭਾਸ਼ਿਤ"
 
-#: archivedialog.cpp:119
-msgid "Archive &file:"
+#: kotodoview.cpp:468
+msgid "&Make this To-do Independent"
 msgstr ""
 
-#: archivedialog.cpp:123
-msgid "*.ics|iCalendar Files"
-msgstr "*.ics|i ਕੈਲੰਡਰ ਫਾਇਲਾਂ"
-
-#: archivedialog.cpp:125
-msgid ""
-"The path of the archive. The events and to-dos will be added to the archive "
-"file, so any events that are already in the file will not be modified or "
-"deleted. You can later load or merge the file like any other calendar. It is "
-"not saved in a special format, it uses the iCalendar format. "
+#: kotodoview.cpp:470
+msgid "Make all Sub-to-dos &Independent"
 msgstr ""
 
-#: archivedialog.cpp:134
-msgid "Type of Items to Archive"
-msgstr "ਪੁਰਾਲੇਖ ਬਣਾਉਣ ਲਈ ਇਕਾਈਆਂ ਦੀ ਕਿਸਮ"
-
-#: archivedialog.cpp:139
-msgid ""
-"Here you can select which items should be archived. Events are archived if they "
-"ended before the date given above; to-dos are archived if they were finished "
-"before the date."
-msgstr ""
+#: kotodoview.cpp:473
+msgid "&Copy To"
+msgstr "ਨਕਲ(&C)"
 
-#: archivedialog.cpp:144
-msgid "&Delete only, do not save"
-msgstr "ਸਿਰਫ ਹਟਾਉ, ਸੰਭਾਲੋ ਨਾ"
+#: kotodoview.cpp:474
+msgid "&Move To"
+msgstr "ਭੇਜੋ(&M)"
 
-#: archivedialog.cpp:147
+#: kotodoview.cpp:476
 msgid ""
-"Select this option to delete old events and to-dos without saving them. It is "
-"not possible to recover the events later."
+"_: delete completed to-dos\n"
+"Pur&ge Completed"
 msgstr ""
 
-#: archivedialog.cpp:211
-msgid ""
-"The archive file name is not valid.\n"
-msgstr ""
-"ਪੁਰਾਲੇਖ ਫਾਇਲ ਨਹੀਂ ਦਿੱਤਾ ਗਿਆ ਹੈ।\n"
+#: kotodoview.cpp:485
+msgid "&New To-do..."
+msgstr "ਨਵਾਂ ਕੰਮ ਕਾਰ(&N)"
 
-#: komonthview.cpp:349
+#: kotodoview.cpp:487
 msgid ""
-"_: 'Month day' for month view cells\n"
-"%1 %2"
-msgstr "%1 %2"
-
-#: koeditorgeneraljournal.cpp:62
-msgid "Sets the title of this journal."
-msgstr "ਇਸ ਰੋਜ਼ਨਾਮਚੇ ਦੇ ਸਿਰਲੇਖ ਦਿੰਦਾ ਹੈ।"
+"_: delete completed to-dos\n"
+"&Purge Completed"
+msgstr ""
 
-#: koeditorgeneraljournal.cpp:82
-msgid "&Date:"
-msgstr "ਮਿਤੀ:"
+#: previewdialog.cpp:54
+#, fuzzy
+msgid "&Merge into existing calendar"
+msgstr "ਮੌਜੂਦਾ ਕੈਲੰਡਰ ਵਿੱਚ ਮਿਲਾਨ"
 
-#: koeditorgeneraljournal.cpp:91
-msgid "&Time: "
-msgstr "ਸਮਾਂ(&T): "
+#: previewdialog.cpp:73
+#, fuzzy
+msgid "&Add as new calendar..."
+msgstr "ਨਵੇਂ ਕੈਲੰਡਰ ਵਾਂਗ ਸ਼ਾਮਿਲ"
 
-#: koeditorgeneraljournal.cpp:197
-msgid "Please specify a valid date, for example '%1'."
-msgstr "ਕਿਰਪਾ ਕਰਕੇ ਇੱਕ ਜਾਇਜ ਮਿਤੀ ਦਿਓ, ਉਦਾਹਰਨ ਲਈ '%1'"
+#: previewdialog.cpp:75
+#, fuzzy
+msgid "&Add as new calendar"
+msgstr "ਨਵੇਂ ਕੈਲੰਡਰ ਵਾਂਗ ਸ਼ਾਮਿਲ"
 
-#: korgplugins.cpp:37
-msgid "KOrgPlugins"
-msgstr "ਕੇ-ਪਰਬੰਧਕ-ਪਲੱਗਿੰਨ"
+#: previewdialog.cpp:141
+#, fuzzy
+msgid "Select path for new calendar"
+msgstr "ਨਵੇਂ ਕੈਲੰਡਰ ਵਾਂਗ ਸ਼ਾਮਿਲ"
 
 #: templatemanagementdialog.cpp:50
 msgid "Manage Templates"
@@ -5930,828 +7079,424 @@ msgstr "ਦੁਹਰਾ ਨਮੂਨਾ ਨਾਂ"
 msgid "Overwrite"
 msgstr "ਉੱਪਰ ਲਿਖੋ"
 
-#: tips.cpp:3
+#: incidencechanger.cpp:74
 msgid ""
-"<p>...that you can synchronize your calendar data with the data on a Palm Pilot "
-"by using <a href=\"http://www.slac.com/pilone/kpilot_home\">KPilot</a>?\n"
-"</p>\n"
+"Some attendees were removed from the incidence. Shall cancel messages be sent "
+"to these attendees?"
 msgstr ""
 
-#: tips.cpp:9
-msgid ""
-"<p>...that it is possible to show the current time in the calendar? Enable the "
-"current time line in the dialog which appears after selecting <b>Settings</b>"
-", <b>Configure KOrganizer...</b> from the menu bar.\n"
-"</p>\n"
-msgstr ""
+#: incidencechanger.cpp:76
+msgid "Attendees Removed"
+msgstr "ਦਰਸ਼ਕ ਹਟਾਏ ਗਏ"
 
-#: tips.cpp:15
-msgid ""
-"<p>...that KOrganizer supports Microsoft Exchange? Add the <b>"
-"Microsoft&reg; Exchange 2000 resource</b> using the <b>Resource View</b> "
-"from the KOrganizer sidebar.\n"
-"</p>\n"
-msgstr ""
+#: incidencechanger.cpp:76
+msgid "Send Messages"
+msgstr "ਸੁਨੇਹੇ ਭੇਜੋ"
 
-#: tips.cpp:21
-msgid ""
-"<p>...that you can select whether the week starts on Monday or on Sunday in the "
-"Trinity Control Center? KOrganizer uses this setting. Look at Regional & "
-"Accessibility->Country/Region & Languages in the Trinity Control Center, or select "
-"<b>Settings</b>,\n"
-"<b>Configure Date & Time...</b> from the menu bar. Select the Time & Dates "
-"tab.\n"
-"</p>\n"
-msgstr ""
+#: incidencechanger.cpp:388
+#, fuzzy
+msgid "No calendars found, unable to save %1 \"%2\"."
+msgstr "%1 \"%2\" ਨੂੰ ਸੰਭਾਲਣ ਵਿੱਚ ਅਸਫਲ ਹੈ।"
 
-#: tips.cpp:28
-msgid ""
-"<p>...that you can edit to-dos quickly by right clicking on the property you "
-"wish to change; like the priority, the category or the date?\n"
-"</p>\n"
-msgstr ""
+#: incidencechanger.cpp:439 kodialogmanager.cpp:113
+msgid "Unable to save %1 \"%2\"."
+msgstr "%1 \"%2\" ਨੂੰ ਸੰਭਾਲਣ ਵਿੱਚ ਅਸਫਲ ਹੈ।"
 
-#: tips.cpp:34
-msgid ""
-"<p>...that you can view and edit a calendar from the shell with "
-"konsolekalendar? Run <b>konsolekalendar --help</b> for the available options.\n"
-"</p>\n"
-msgstr ""
+#: incidencechanger.cpp:443
+#, fuzzy
+msgid "Unable to save %1 \"%2\" to calendar %3."
+msgstr "%1 \"%2\" ਨੂੰ ਸੰਭਾਲਣ ਵਿੱਚ ਅਸਫਲ ਹੈ।"
 
-#: tips.cpp:40
+#: incidencechanger.cpp:461
 msgid ""
-"<p>...that you can import birthdays from your address book? There is a resource "
-"available which connects the birthdays to your calendar; it is even possible to "
-"set a reminder for each event.\n"
-"</p>\n"
+"Attempt to send the scheduling message failed. Please check your Group "
+"Scheduling settings. Contact your system administrator for more help."
 msgstr ""
 
-#: tips.cpp:46
-msgid ""
-"<p>...that you can store your calendar on an FTP server? Use the standard file "
-"dialog to save the calendar to a URL like "
-"<b>ftp://username@ftpserver/filename</b>. You can make your calendar active and "
-"load and save it as if it were local, or add it permanently to your resources "
-"list, using the remote file resource. Just make sure that no two KOrganizer "
-"applications are working on the same file, at the same time.\n"
-"</p>\n"
-msgstr ""
+#: kojournaleditor.cpp:47
+msgid "Edit Journal Entry"
+msgstr "ਰੋਜ਼ਨਾਮਚਾ ਇੰਦਰਾਜ਼ ਸੋਧ"
 
-#: tips.cpp:52
-msgid ""
-"<p>...that you can create hierarchical to-dos by clicking with the right mouse "
-"button on an existing to-do and selecting <b>New Sub-to-do</b> "
-"from the context menu?\n"
-"</p>\n"
+#: kojournaleditor.cpp:201
+msgid "This journal entry will be permanently deleted."
 msgstr ""
 
-#: tips.cpp:58
-msgid ""
-"<p>...that a color can be assigned to each category? Events with a certain "
-"category will be shown in that color. You can assign these in the section <b>"
-"Colors</b> within the dialog which appears after selecting <b>Settings</b>, <b>"
-"Configure KOrganizer...</b> from the menu bar.\n"
-"</p>\n"
+#: kojournaleditor.cpp:217
+msgid "Template does not contain a valid journal."
 msgstr ""
 
-#: tips.cpp:64
-msgid ""
-"<p>...that you can view and edit a calendar with Konqueror? Just click on the "
-"calendar file to make Konqueror open it.\n"
-"</p>\n"
+#: koagenda.cpp:946
+msgid "Unable to lock item for modification. You cannot make any changes."
 msgstr ""
 
-#: tips.cpp:70
+#: koagenda.cpp:948
+msgid "Locking Failed"
+msgstr "ਤਾਲਾਬੰਦੀ ਅਸਫਲ"
+
+#: freebusymanager.cpp:236
 msgid ""
-"<p>...that it is possible to add an attachment to an event or to-do? To do so, "
-"add a link to the <b>Attachments</b> tab within the <b>Edit Event</b> or <b>"
-"Edit To-do</b> dialog.\n"
-"</p>\n"
+"<qt>No URL configured for uploading your free/busy list. Please set it in "
+"KOrganizer's configuration dialog, on the \"Free/Busy\" page. "
+"<br>Contact your system administrator for the exact URL and the account "
+"details.</qt>"
 msgstr ""
 
-#: tips.cpp:76
-msgid ""
-"<p>...that you can export your calendar to HTML? Select <b>File</b>, <b>"
-"Export</b>, <b>Export Web Page...</b> from the menu bar to open the <b>"
-"Export calendar as web page</b> dialog.\n"
-"</p>\n"
+#: freebusymanager.cpp:240
+msgid "No Free/Busy Upload URL"
 msgstr ""
 
-#: tips.cpp:82
-msgid ""
-"<p>...that you can purge completed to-dos in one step? Go to the <b>File</b> "
-"menu and choose <b>Purge Completed</b>.\n"
+#: freebusymanager.cpp:247
+msgid "<qt>The target URL '%1' provided is invalid.</qt>"
 msgstr ""
 
-#: tips.cpp:87
-msgid ""
-"<p>...that you can create a new sub-to-do by pasting a to-do while another one "
-"is selected?\n"
-"</p>\n"
+#: freebusymanager.cpp:248
+msgid "Invalid URL"
 msgstr ""
 
-#: plugins/datenums/datenums.cpp:59
+#: freebusymanager.cpp:352
 msgid ""
-"_: dayOfYear / daysTillEndOfYear\n"
-"%1 / %2"
-msgstr "%1 / %2"
-
-#: plugins/datenums/datenums.cpp:71
-msgid "This plugin provides numbers of days and weeks."
-msgstr "ਇਹ ਪਲੱਗਿੰਨ ਦਿਨ ਅਤੇ ਹਫ਼ਤੇ ਉਪਲੱਬਧ ਕਰਵਾਉਦੀ ਹੈ।"
-
-#: plugins/datenums/configdialog.cpp:38
-msgid "Configure Day Numbers"
-msgstr "ਦਿਨ ਗਿਣਤੀ ਸੰਰਚਨਾ"
-
-#: plugins/datenums/configdialog.cpp:45
-msgid "Show Date Number"
-msgstr "ਮਿਤੀ ਅੰਕ ਵੇਖਾਓ"
-
-#: plugins/datenums/configdialog.cpp:48
-msgid "Show day number"
-msgstr "ਦਿਨ ਅੰਕ ਵੇਖਾਓ"
+"<qt>The software could not upload your free/busy list to the URL '%1'. There "
+"might be a problem with the access rights, or you specified an incorrect URL. "
+"The system said: <em>%2</em>."
+"<br>Please check the URL or contact your system administrator.</qt>"
+msgstr ""
 
-#: plugins/datenums/configdialog.cpp:49
-msgid "Show days to end of year"
-msgstr "ਸਾਲ ਦੇ ਅੰਤ ਦੇ ਦਿਨ ਵੇਖਾਓ"
+#: komailclient.cpp:247
+msgid "No running instance of KMail found."
+msgstr ""
 
-#: plugins/datenums/configdialog.cpp:50
-msgid "Show both"
-msgstr "ਦੋਵੇਂ ਵੇਖਾਓ"
+#: kotodoeditor.cpp:160
+msgid "Edit To-do"
+msgstr "ਕੰਮ-ਕਾਰ ਸੋਧ"
 
-#: plugins/projectview/koprojectview.cpp:76
-msgid "Project View"
-msgstr "ਪਰੋਜੈੱਕਟ ਝਲਕ"
+#: kotodoeditor.cpp:169
+msgid "New To-do"
+msgstr "ਨਵਾਂ ਕੰਮ-ਕਾਰ"
 
-#: plugins/projectview/koprojectview.cpp:80
-#: plugins/timespanview/timespanwidget.cpp:65
-msgid "Zoom In"
-msgstr "ਆਕਾਰ ਵਧਾਓ"
+#: kotodoeditor.cpp:344
+msgid "Template does not contain a valid to-do."
+msgstr ""
 
-#: plugins/projectview/koprojectview.cpp:84
-#: plugins/timespanview/timespanwidget.cpp:69
-msgid "Zoom Out"
-msgstr "ਆਕਾਰ ਘਟਾਓ"
+#: kocounterdialog.cpp:36
+msgid "Counter-Event Viewer"
+msgstr ""
 
-#: plugins/projectview/koprojectview.cpp:88
-msgid "Select Mode"
-msgstr "ਢੰਗ ਚੁਣੋ"
+#: korganizer.cpp:298
+msgid "New Calendar"
+msgstr "ਨਵਾਂ ਕੈਲੰਡਰ"
 
-#: plugins/projectview/koprojectview.cpp:109
-msgid "main task"
-msgstr "ਮੁੱਖ ਕੰਮ"
+#: korganizer.cpp:302
+msgid "read-only"
+msgstr "ਪੜਨ ਲਈ"
 
-#: plugins/projectview/projectview.cpp:55
-msgid "&Project"
-msgstr "ਪ੍ਰੋਜੈਕਟ(&P)"
+#: resourceview.cpp:73
+msgid "My %1 (%2)"
+msgstr ""
 
-#: plugins/projectview/projectview.cpp:65
-msgid "This plugin provides a Gantt diagram as project view."
+#: resourceview.cpp:75 resourceview.cpp:78
+#, c-format
+msgid "My %1"
 msgstr ""
 
-#: plugins/projectview/projectview.cpp:70
-msgid "Project View Plugin"
-msgstr "ਪ੍ਰੋਜੈਕਟ ਦਰਿਸ਼ ਪਲੱਗਿੰਨ"
+#: resourceview.cpp:277
+#, fuzzy
+msgid "Add calendar"
+msgstr "ਨਵੇਂ ਕੈਲੰਡਰ ਵਾਂਗ ਸ਼ਾਮਿਲ"
 
-#: plugins/hebrew/parsha.cpp:33
+#: resourceview.cpp:279
 msgid ""
-"_: These are weekly readings and do not have translations. They may have "
-"different spellings in your language; otherwise, just translate the sound to "
-"your characters\n"
-"Bereshit"
-msgstr "Bereshit"
-
-#: plugins/hebrew/parsha.cpp:33
-msgid "Noach"
-msgstr "Noach"
-
-#: plugins/hebrew/parsha.cpp:33
-msgid "Lech L'cha"
-msgstr "Lech L'cha"
-
-#: plugins/hebrew/parsha.cpp:34
-msgid "Vayera"
-msgstr "Vayera"
-
-#: plugins/hebrew/parsha.cpp:34
-msgid "Chaye Sarah"
-msgstr "Chaye Sarah"
-
-#: plugins/hebrew/parsha.cpp:34
-msgid "Toldot"
-msgstr "Toldot"
-
-#: plugins/hebrew/parsha.cpp:35
-msgid "Vayetze"
-msgstr "Vayetze"
-
-#: plugins/hebrew/parsha.cpp:35
-msgid "Vayishlach"
-msgstr "Vayishlach"
-
-#: plugins/hebrew/parsha.cpp:35
-msgid "Vayeshev"
-msgstr "Vayeshev"
-
-#: plugins/hebrew/parsha.cpp:36
-msgid "Miketz"
-msgstr "Miketz"
-
-#: plugins/hebrew/parsha.cpp:36
-msgid "Vayigash"
-msgstr "Vayigash"
-
-#: plugins/hebrew/parsha.cpp:36
-msgid "Vayechi"
-msgstr "Vayechi"
-
-#: plugins/hebrew/parsha.cpp:37
-msgid "Shemot"
-msgstr "Shemot"
-
-#: plugins/hebrew/parsha.cpp:37
-msgid "Vaera"
-msgstr "Vaera"
-
-#: plugins/hebrew/parsha.cpp:37
-msgid "Bo"
-msgstr "Bo"
-
-#: plugins/hebrew/parsha.cpp:37
-msgid "Beshalach"
-msgstr "Beshalach"
-
-#: plugins/hebrew/parsha.cpp:38
-msgid "Yitro"
-msgstr "Yitro"
-
-#: plugins/hebrew/parsha.cpp:38
-msgid "Mishpatim"
-msgstr "Mishpatim"
-
-#: plugins/hebrew/parsha.cpp:38
-msgid "Terumah"
-msgstr "Terumah"
-
-#: plugins/hebrew/parsha.cpp:39
-msgid "Tetzaveh"
-msgstr "Tetzaveh"
-
-#: plugins/hebrew/parsha.cpp:39
-msgid "Ki Tisa"
-msgstr "Ki Tisa"
-
-#: plugins/hebrew/parsha.cpp:39
-msgid "Vayakhel"
-msgstr "Vayakhel"
-
-#: plugins/hebrew/parsha.cpp:40
-msgid "Pekudei"
-msgstr "Pekudei"
-
-#: plugins/hebrew/parsha.cpp:40
-msgid "Vayikra"
-msgstr "Vayikra"
-
-#: plugins/hebrew/parsha.cpp:40
-msgid "Tzav"
-msgstr "Tzav"
-
-#: plugins/hebrew/parsha.cpp:41
-msgid "Shemini"
-msgstr "Shemini"
-
-#: plugins/hebrew/parsha.cpp:41
-msgid "Tazria"
-msgstr "Tazria"
-
-#: plugins/hebrew/parsha.cpp:41
-msgid "Metzora"
-msgstr "Metzora"
-
-#: plugins/hebrew/parsha.cpp:42
-msgid "Acharei Mot"
-msgstr "Acharei Mot"
-
-#: plugins/hebrew/parsha.cpp:42
-msgid "Kedoshim"
-msgstr "Kedoshim"
-
-#: plugins/hebrew/parsha.cpp:42
-msgid "Emor"
-msgstr "Emor"
-
-#: plugins/hebrew/parsha.cpp:43
-msgid "Behar"
-msgstr "Behar"
-
-#: plugins/hebrew/parsha.cpp:43
-msgid "Bechukotai"
-msgstr "Bechukotai"
-
-#: plugins/hebrew/parsha.cpp:43
-msgid "Bemidbar"
-msgstr "Bemidbar"
-
-#: plugins/hebrew/parsha.cpp:44
-msgid "Naso"
-msgstr "Naso"
-
-#: plugins/hebrew/parsha.cpp:44
-msgid "Behaalotcha"
-msgstr "Behaalotcha"
-
-#: plugins/hebrew/parsha.cpp:44
-msgid "Shelach"
-msgstr "Shelach"
-
-#: plugins/hebrew/parsha.cpp:45
-msgid "Korach"
-msgstr "Korach"
-
-#: plugins/hebrew/parsha.cpp:45
-msgid "Chukat"
-msgstr "Chukat"
-
-#: plugins/hebrew/parsha.cpp:45
-msgid "Balak"
-msgstr "Balak"
-
-#: plugins/hebrew/parsha.cpp:46
-msgid "Pinchas"
-msgstr "Pinchas"
-
-#: plugins/hebrew/parsha.cpp:46
-msgid "Matot"
-msgstr "Matot"
-
-#: plugins/hebrew/parsha.cpp:46
-msgid "Masei"
-msgstr "Masei"
-
-#: plugins/hebrew/parsha.cpp:47
-msgid "Devarim"
-msgstr "Devarim"
-
-#: plugins/hebrew/parsha.cpp:47
-msgid "Vaetchanan"
-msgstr "Vaetchanan"
-
-#: plugins/hebrew/parsha.cpp:47
-msgid "Ekev"
-msgstr "Ekev"
-
-#: plugins/hebrew/parsha.cpp:48
-msgid "Reeh"
-msgstr "Reeh"
-
-#: plugins/hebrew/parsha.cpp:48
-msgid "Shoftim"
-msgstr "Shoftim"
-
-#: plugins/hebrew/parsha.cpp:48
-msgid "Ki Tetze"
-msgstr "Ki Tetze"
-
-#: plugins/hebrew/parsha.cpp:49
-msgid "Ki Tavo"
-msgstr "Ki Tavo"
-
-#: plugins/hebrew/parsha.cpp:49
-msgid "Nitzavim"
-msgstr "Nitzavim"
-
-#: plugins/hebrew/parsha.cpp:49
-msgid "Vayelech"
-msgstr "Vayelech"
+"<qt>"
+"<p>Press this button to add a resource to KOrganizer.</p>"
+"<p>Events, journal entries and to-dos are retrieved and stored on resources. "
+"Available resources include groupware servers, local files, journal entries as "
+"blogs on a server, etc... </p>"
+"<p>If you have more than one active resource, when creating incidents you will "
+"either automatically use the default resource or be prompted to select the "
+"resource to use.</p></qt>"
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:50
-msgid "Haazinu"
-msgstr "Haazinu"
+#: resourceview.cpp:292
+#, fuzzy
+msgid "Edit calendar settings"
+msgstr "ਕੈਲੰਡਰ ਫਿਲਟਰ ਸੋਧ"
 
-#: plugins/hebrew/holiday.cpp:63
+#: resourceview.cpp:294
 msgid ""
-"_: These are Jewish holidays and mostly do not have translations. They may have "
-"different spellings in your language; otherwise, just translate the sound to "
-"your characters\n"
-"Sh. HaHodesh"
-msgstr "Sh. HaHodesh"
-
-#: plugins/hebrew/holiday.cpp:69
-msgid "Erev Pesach"
-msgstr "Erev Pesach"
-
-#: plugins/hebrew/holiday.cpp:79
-msgid "Sh. HaGadol"
-msgstr "Sh. HaGadol"
-
-#: plugins/hebrew/holiday.cpp:87
-msgid "Pesach"
-msgstr "Pesach"
-
-#: plugins/hebrew/holiday.cpp:98 plugins/hebrew/holiday.cpp:262
-msgid "Chol Hamoed"
-msgstr "Chol Hamoed"
-
-#: plugins/hebrew/holiday.cpp:103
-msgid "Yom HaShoah"
-msgstr "Yom HaShoah"
-
-#: plugins/hebrew/holiday.cpp:127 plugins/hebrew/holiday.cpp:133
-#: plugins/hebrew/holiday.cpp:144
-msgid "Yom HaAtzmaut"
-msgstr "Yom HaAtzmaut"
-
-#: plugins/hebrew/holiday.cpp:129 plugins/hebrew/holiday.cpp:142
-msgid "Yom HaZikaron"
-msgstr "Yom HaZikaron"
-
-#: plugins/hebrew/holiday.cpp:151
-msgid "Yom Yerushalayim"
-msgstr "Yom Yerushalayim"
-
-#: plugins/hebrew/holiday.cpp:154
-msgid "Lag BaOmer"
-msgstr "Lag BaOmer"
-
-#: plugins/hebrew/holiday.cpp:179
-msgid "Erev Shavuot"
-msgstr "Erev Shavuot"
-
-#: plugins/hebrew/holiday.cpp:184
-msgid "Shavuot"
-msgstr "Shavuot"
-
-#: plugins/hebrew/holiday.cpp:193
-msgid "Tzom Tammuz"
-msgstr "Tzom Tammuz"
-
-#: plugins/hebrew/holiday.cpp:200
-msgid "Sh. Hazon"
-msgstr "Sh. Hazon"
-
-#: plugins/hebrew/holiday.cpp:202
-msgid "Sh. Nahamu"
-msgstr "Sh. Nahamu"
-
-#: plugins/hebrew/holiday.cpp:206
-msgid "Tisha B'Av"
-msgstr "Tisha B'Av"
-
-#: plugins/hebrew/holiday.cpp:211
-msgid "S'lichot"
-msgstr "S'lichot"
-
-#: plugins/hebrew/holiday.cpp:213
-msgid "Erev R.H."
-msgstr "Erev R.H."
-
-#: plugins/hebrew/holiday.cpp:221
-msgid "Rosh Hashana"
-msgstr "Rosh Hashana"
-
-#: plugins/hebrew/holiday.cpp:225 plugins/hebrew/holiday.cpp:238
-msgid "Sh. Shuvah"
-msgstr "Sh. Shuvah"
-
-#: plugins/hebrew/holiday.cpp:227 plugins/hebrew/holiday.cpp:231
-msgid "Tzom Gedalia"
-msgstr "Tzom Gedalia"
-
-#: plugins/hebrew/holiday.cpp:241
-msgid "Erev Y.K."
-msgstr "Erev Y.K."
-
-#: plugins/hebrew/holiday.cpp:244
-msgid "Yom Kippur"
-msgstr "Yom Kippur"
-
-#: plugins/hebrew/holiday.cpp:247
-msgid "Erev Sukkot"
-msgstr "Erev Sukkot"
-
-#: plugins/hebrew/holiday.cpp:253
-msgid "Sukkot"
-msgstr "Sukkot"
-
-#: plugins/hebrew/holiday.cpp:265
-msgid "Hoshana Rabah"
-msgstr "Hoshana Rabah"
-
-#: plugins/hebrew/holiday.cpp:268
-msgid "Shmini Atzeret"
-msgstr "Shmini Atzeret"
-
-#: plugins/hebrew/holiday.cpp:272
-msgid "Simchat Torah"
-msgstr "Simchat Torah"
-
-#: plugins/hebrew/holiday.cpp:281
-msgid "Erev Hanukah"
-msgstr "Erev Hanukah"
-
-#: plugins/hebrew/holiday.cpp:283 plugins/hebrew/holiday.cpp:289
-msgid "Hanukah"
-msgstr "Hanukah"
-
-#: plugins/hebrew/holiday.cpp:293
-msgid "Tzom Tevet"
-msgstr "Tzom Tevet"
-
-#: plugins/hebrew/holiday.cpp:304 plugins/hebrew/holiday.cpp:312
-#: plugins/hebrew/holiday.cpp:316 plugins/hebrew/holiday.cpp:320
-msgid "Sh. Shirah"
-msgstr "Sh. Shirah"
-
-#: plugins/hebrew/holiday.cpp:317
-msgid "Tu B'Shvat"
-msgstr "Tu B'Shvat"
-
-#: plugins/hebrew/holiday.cpp:330 plugins/hebrew/holiday.cpp:341
-#: plugins/hebrew/holiday.cpp:349
-msgid "Sh. Shekalim"
-msgstr "Sh. Shekalim"
-
-#: plugins/hebrew/holiday.cpp:338
-msgid "Purim Katan"
-msgstr "Purim Katan"
-
-#: plugins/hebrew/holiday.cpp:356 plugins/hebrew/holiday.cpp:373
-msgid "Ta'anit Ester"
-msgstr "Ta'anit Ester"
-
-#: plugins/hebrew/holiday.cpp:364 plugins/hebrew/holiday.cpp:368
-msgid "Sh. Zachor"
-msgstr "Sh. Zachor"
-
-#: plugins/hebrew/holiday.cpp:370
-msgid "Erev Purim"
-msgstr "Erev Purim"
-
-#: plugins/hebrew/holiday.cpp:376
-msgid "Purim"
-msgstr "Purim"
-
-#: plugins/hebrew/holiday.cpp:380 plugins/hebrew/holiday.cpp:384
-msgid "Shushan Purim"
-msgstr "Shushan Purim"
-
-#: plugins/hebrew/holiday.cpp:394
-msgid "Sh. Parah"
-msgstr "Sh. Parah"
-
-#: plugins/hebrew/holiday.cpp:403
-msgid "Sh. HaHodesh"
-msgstr "Sh. HaHodesh"
+"Press this button to edit the resource currently selected on the KOrganizer "
+"resources list above."
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:428
-msgid " Omer"
-msgstr " Omer"
+#: resourceview.cpp:299
+#, fuzzy
+msgid "Remove calendar"
+msgstr "ਸਰਗਰਮ ਕੈਲੰਡਰ"
 
-#: plugins/hebrew/configdialog.cpp:29
-msgid "Configure Holidays"
-msgstr "ਛੁੱਟੀਆਂ ਸੰਰਚਨਾ"
+#: resourceview.cpp:301
+msgid ""
+"Press this button to delete the resource currently selected on the KOrganizer "
+"resources list above."
+msgstr ""
 
-#: plugins/hebrew/configdialog.cpp:37
-msgid "Use Israeli holidays"
-msgstr "ਇਜ਼ਾਰਾਈਲੀ ਛੁੱਟੀਆਂ ਵਰਤੋਂ"
+#: resourceview.cpp:309
+msgid ""
+"<qt>"
+"<p>Select on this list the active KOrganizer resources. Check the resource box "
+"to make it active. Press the \"Add...\" button below to add new resources to "
+"the list.</p>"
+"<p>Events, journal entries and to-dos are retrieved and stored on resources. "
+"Available resources include groupware servers, local files, journal entries as "
+"blogs on a server, etc...</p>"
+"<p>If you have more than one active resource, when creating incidents you will "
+"either automatically use the default resource or be prompted to select the "
+"resource to use.</p></qt>"
+msgstr ""
 
-#: plugins/hebrew/configdialog.cpp:41
-msgid "Show weekly parsha"
-msgstr "ਹਫ਼ਤਾ ਪਾਰਸਹਾ ਵੇਖੋ"
+#: resourceview.cpp:370
+#, fuzzy
+msgid "Add Subresource"
+msgstr "%1 ਸਰੋਤ"
 
-#: plugins/hebrew/configdialog.cpp:45
-msgid "Show day of Omer"
-msgstr "ਓਮਰ ਦਾ ਦਿਨ ਵੇਖਾਓ"
+#: resourceview.cpp:371
+#, fuzzy
+msgid "Please enter a name for the new subresource"
+msgstr "ਕਿਰਪਾ ਕਰਕੇ ਨਵੇਂ ਨਮੂਨੇ ਲਈ ਇੱਕ ਨਾਂ ਦਿਓ:"
 
-#: plugins/hebrew/configdialog.cpp:49
-msgid "Show Chol HaMoed"
-msgstr "Chol HaMoed ਵੇਖਾਓ"
+#: resourceview.cpp:379
+#, fuzzy
+msgid "<qt>Unable to create subresource <b>%1</b>.</qt>"
+msgstr "'%1' ਕੈਲੰਡਰ ਸਰੋਤ ਬਣਾਉਣ ਲਈ ਅਸਫ਼ਲ ਹੈ।"
 
-#: plugins/hebrew/hebrew.cpp:103
-msgid "This plugin provides the date in the Jewish calendar."
-msgstr ""
+#: resourceview.cpp:387
+msgid "Resource Configuration"
+msgstr "ਸਰੋਤ ਸੰਰਚਨਾ"
 
-#: plugins/timespanview/timespanview.cpp:54
-msgid "&Timespan"
-msgstr "ਸਮਾਂ ਅੰਤਰਾਲ(&T)"
+#: resourceview.cpp:388
+msgid "Please select type of the new resource:"
+msgstr "ਨਵੇਂ ਸਰੋਤ ਦੀ ਕਿਸਮ ਚੁਣੋ ਜੀ:"
 
-#: plugins/timespanview/timespanview.cpp:64
-msgid "This plugin provides a Gantt-like Timespan view."
+#: resourceview.cpp:401
+msgid "<qt>Unable to create resource of type <b>%1</b>.</qt>"
 msgstr ""
 
-#: plugins/timespanview/timespanview.cpp:69
-msgid "Timespan View Plugin"
-msgstr "ਸਮਾਂ-ਅੰਤਰਾਲ ਝਲਕ ਪਲੱਗਿੰਨ"
-
-#: plugins/timespanview/timespanwidget.cpp:73
-msgid "Center View"
-msgstr "ਕੇਂਦਰੀ ਝਲਕ"
-
-#: plugins/printing/list/listprint.h:42
-msgid "Print list"
-msgstr "ਸੂਚੀ ਛਾਪੋ"
+#: resourceview.cpp:417
+#, fuzzy
+msgid "Unable to create the resource."
+msgstr "'%1' ਕੈਲੰਡਰ ਸਰੋਤ ਬਣਾਉਣ ਲਈ ਅਸਫ਼ਲ ਹੈ।"
 
-#: plugins/printing/list/listprint.h:43
-msgid "Prints a list of events and to-dos"
+#: resourceview.cpp:542
+msgid ""
+"<qt>You may not delete your standard calendar resource."
+"<p>You can change the standard calendar resource in the Trinity Control Center "
+"using the TDE Resource settings under the TDE Components area.</qt>"
 msgstr ""
 
-#: plugins/printing/year/yearprint.cpp:176
+#: resourceview.cpp:552
 msgid ""
-"_: date from -\n"
-"to\n"
-"%1 -\n"
-"%2"
+"This is a groupware folder so you can always re-subscribe to the folder later "
+"as you desire."
 msgstr ""
 
-#: plugins/printing/year/yearprint.h:42
-msgid "Print &Year"
+#: resourceview.cpp:555
+msgid ""
+"The contents will not be removed so you can always re-add this calendar later "
+"as you desire."
 msgstr ""
 
-#: plugins/printing/year/yearprint.h:43
-msgid "Prints a calendar for an entire year"
+#: resourceview.cpp:562
+msgid ""
+"<qt>Do you really want to remove the calendar <b>%1</b>?"
+"<p><b>Note:</b> %2</qt>"
 msgstr ""
 
-#: plugins/printing/journal/journalprint.h:43
-msgid "Print &journal"
+#: resourceview.cpp:573
+msgid ""
+"<qt>Failed to remove the subresource <b>%1</b>. The reason could be that it is "
+"a built-in one which cannot be removed, or that the removal of the underlying "
+"storage folder failed.</qt>"
 msgstr ""
 
-#: plugins/printing/journal/journalprint.h:44
-msgid "Prints all journals for a given date range"
+#: resourceview.cpp:601
+msgid "Cannot rename someone else's calendar folder."
 msgstr ""
 
-#: plugins/printing/journal/journalprint.cpp:126
-msgid "Journal entries"
-msgstr "ਰੋਜ਼ਾਨਾਮਚਾ ਇੰਦਰਾਜ਼"
-
-#: plugins/printing/whatsnext/whatsnextprint.h:42
-msgid "Print What's Next"
-msgstr "ਅੱਗੇ ਕੀ ਹੈ ਛਾਪੋ"
+#: resourceview.cpp:609
+#, fuzzy
+msgid "Rename Subresource"
+msgstr "%1 ਸਰੋਤ"
 
-#: plugins/printing/whatsnext/whatsnextprint.h:43
-msgid "Prints a list of all upcoming events and todos."
+#: resourceview.cpp:610
+msgid ""
+"<qt>Enter a new name for the subresource"
+"<p><b>Note:</b> the new name will take affect after the next sync.</qt>"
 msgstr ""
 
-#: plugins/exchange/exchange.cpp:109 plugins/exchange/exchange.cpp:145
-#: plugins/exchange/exchange.cpp:148 plugins/exchange/exchange.cpp:164
-#: plugins/exchange/exchange.cpp:168 plugins/exchange/exchange.cpp:222
-#: plugins/exchange/exchange.cpp:224 plugins/exchange/exchangeconfig.cpp:35
-#: plugins/exchange/exchangedialog.cpp:34
-msgid "Exchange Plugin"
-msgstr "ਐਕਸ਼ਚੇਜ਼ ਪਲੱਗਿੰਨ"
+#: resourceview.cpp:622
+msgid ""
+"Communication with KMail failed when attempting to change the folder name."
+msgstr ""
 
-#: plugins/exchange/exchangeconfig.cpp:46
-msgid "Exchange server:"
-msgstr "ਐਕਸ਼ਚੇਜ਼ ਸਰਵਰ:"
+#: resourceview.cpp:635
+#, fuzzy
+msgid "<qt>Cannot edit the subresource <b>%1</b>.</qt>"
+msgstr "'%1' ਕੈਲੰਡਰ ਸਰੋਤ ਬਣਾਉਣ ਲਈ ਅਸਫ਼ਲ ਹੈ।"
 
-#: plugins/exchange/exchangeconfig.cpp:50
-msgid "Port:"
-msgstr "ਪੋਰਟ:"
+#: resourceview.cpp:691
+msgid "Re&load"
+msgstr "ਮੁੜ-ਪਰਾਪਤ(&U)"
 
-#: plugins/exchange/exchangeconfig.cpp:54
-msgid "User:"
-msgstr "ਉਪਭੋਗੀ:"
+#: resourceview.cpp:699
+msgid "Show &Info"
+msgstr "ਜਾਣਕਾਰੀ ਵੇਖਾਓ"
 
-#: plugins/exchange/exchangeconfig.cpp:63
-msgid "Determine mailbox automatically"
+#: resourceview.cpp:703
+msgid "&Assign Color"
 msgstr ""
 
-#: plugins/exchange/exchangeconfig.cpp:68
-msgid "Mailbox URL:"
-msgstr "ਮੇਲ-ਬਕਸਾ URL:"
+#: resourceview.cpp:705
+msgid "&Disable Color"
+msgstr "ਰੰਗ ਆਯੋਗ"
 
-#: plugins/exchange/exchangedialog.cpp:39
-msgid "Start date:"
-msgstr "ਸ਼ੁਰੂ ਮਿਤੀ:"
+#: resourceview.cpp:706
+msgid "Resources Colors"
+msgstr "ਸਰੋਤ ਰੰਗ"
 
-#: plugins/exchange/exchangedialog.cpp:46
-msgid "End date:"
-msgstr "ਅੰਤ ਮਿਤੀ:"
+#: resourceview.cpp:712
+#, fuzzy
+msgid "&Rename..."
+msgstr "ਹਟਾਉ..."
 
-#: plugins/exchange/exchange.cpp:72
-msgid "&Download..."
-msgstr "ਡਾਊਨਲੋਡ..."
+#: resourceview.cpp:720
+msgid "Use as &Default Calendar"
+msgstr "ਮੂਲ ਕੈਲੰਡਰ ਵਾਂਗ ਵਰਤੋਂ"
 
-#: plugins/exchange/exchange.cpp:75
-msgid "&Upload Event..."
-msgstr "ਘਟਨਾ ਅੱਪਲੋਡ..."
+#: resourceview.cpp:726
+msgid "&Add..."
+msgstr "ਸ਼ਾਮਿਲ(&A)..."
 
-#: plugins/exchange/exchange.cpp:83
-msgid "De&lete Event"
-msgstr "ਘਟਨਾ ਹਟਾਉ"
+#: koincidenceeditor.cpp:75
+msgid "&Templates..."
+msgstr "ਨਮੂਨੇ(&T)..."
 
-#: plugins/exchange/exchange.cpp:89
-msgid "&Configure..."
-msgstr "ਸੰਰਚਨਾ..."
+#: koincidenceeditor.cpp:88
+msgid "Atte&ndees"
+msgstr "ਸਰੋਤੇ(&n)"
 
-#: plugins/exchange/exchange.cpp:104
+#: koincidenceeditor.cpp:90
 msgid ""
-"This plugin imports and export calendar events from/to a Microsoft Exchange "
-"2000 Server."
+"The Attendees tab allows you to Add or Remove Attendees to/from this event or "
+"to-do."
 msgstr ""
 
-#: plugins/exchange/exchange.cpp:145 plugins/exchange/exchange.cpp:164
-msgid "Please select an appointment."
-msgstr "ਕਿਰਪਾ ਕਰਕੇ ਇੱਕ ਮੁਲਾਕਾਤ ਚੁਣੋ।"
+#: koincidenceeditor.cpp:174
+msgid "Unable to find template '%1'."
+msgstr "'%1' ਨਮੂਨੇ ਨੂੰ ਲੋਡ ਕਰਨ ਵਿੱਚ ਅਸਫਲ ਹੈ।"
 
-#: plugins/exchange/exchange.cpp:148
-msgid "Exchange Upload is EXPERIMENTAL, you may lose data on this appointment!"
+#: koincidenceeditor.cpp:179
+msgid "Error loading template file '%1'."
 msgstr ""
 
-#: plugins/exchange/exchange.cpp:148
-msgid "&Upload"
-msgstr "ਅੱਪਲੋਡ(&U)"
+#: koincidenceeditor.cpp:394 koincidenceeditor.cpp:395
+#, fuzzy
+msgid "Create to-do"
+msgstr "ਕੰਮ-ਕਾਰ ਹਟਾਓ"
 
-#: plugins/exchange/exchange.cpp:168
-msgid ""
-"Exchange Delete is EXPERIMENTAL, if this is a recurring event it will delete "
-"all instances!"
+#: koincidenceeditor.cpp:404 koincidenceeditor.cpp:405
+msgid "Counter proposal"
 msgstr ""
 
-#: plugins/exchange/exchange.cpp:195
-msgid "No Error"
-msgstr "ਕੋਈ ਗਲਤੀ ਨਹੀਂ"
+#: stdcalendar.cpp:74
+msgid "Active Calendar"
+msgstr "ਸਰਗਰਮ ਕੈਲੰਡਰ"
 
-#: plugins/exchange/exchange.cpp:198
-msgid "The Exchange server could not be reached or returned an error."
-msgstr "ਐਕਸ਼ਚੇਜ਼ ਸਰਵਰ ਦੀ ਵਰਤੋਂ ਕੀਤੀ ਨਹੀਂ ਜਾ ਸਕੀ ਹੈ ਜਾਂ ਇੱਕ ਗਲਤੀ ਆਈ ਹੈ।"
+#: stdcalendar.cpp:83
+msgid "Default Calendar"
+msgstr "ਮੂਲ ਕੈਲੰਡਰ"
 
-#: plugins/exchange/exchange.cpp:201
-msgid "Server response could not be interpreted."
-msgstr "ਸਰਵਰ ਜਵਾਬ ਨੂੰ ਇੰਟਰਪਰੇ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ।"
+#: stdcalendar.cpp:98
+msgid "Birthdays"
+msgstr "ਜਨਮ ਦਿਨ"
 
-#: plugins/exchange/exchange.cpp:204
-msgid "Appointment data could not be interpreted."
-msgstr ""
+#, fuzzy
+#~ msgid "Location: %1"
+#~ msgstr "ਟਿਕਾਣਾ: "
 
-#: plugins/exchange/exchange.cpp:207
-msgid "This should not happen: trying to upload wrong type of event."
-msgstr ""
+#~ msgid ""
+#~ "The meeting has been moved to\n"
+#~ "Start: %1\n"
+#~ "End: %2."
+#~ msgstr ""
+#~ "ਮੀਟਿੰਗ ਤਬਦੀਲ ਹੋਈ ਹੈ\n"
+#~ "ਸ਼ੁਰੂ: %1\n"
+#~ "ਅੰਤ: %2."
 
-#: plugins/exchange/exchange.cpp:210
-msgid "An error occurred trying to write an appointment to the server."
-msgstr ""
+#~ msgid "&Add"
+#~ msgstr "ਸ਼ਾਮਿਲ(&A)"
 
-#: plugins/exchange/exchange.cpp:213
-msgid "Trying to delete an event that is not present on the server."
-msgstr ""
+#~ msgid "1 minute"
+#~ msgstr "1 ਮਿੰਟ"
 
-#: plugins/exchange/exchange.cpp:217
-msgid "Unknown Error"
-msgstr "ਅਣਜਾਣੀ ਗਲਤੀ"
+#~ msgid "5 minutes"
+#~ msgstr "5 ਮਿੰਟ"
 
-#: koagenda.cpp:906
-msgid "Unable to lock item for modification. You cannot make any changes."
-msgstr ""
+#~ msgid "10 minutes"
+#~ msgstr "10 ਮਿੰਟ"
 
-#: koagenda.cpp:908
-msgid "Locking Failed"
-msgstr "ਤਾਲਾਬੰਦੀ ਅਸਫਲ"
+#~ msgid "15 minutes"
+#~ msgstr "15 ਮਿੰਟ"
 
-#: koagenda.cpp:1054
-msgid ""
-"The item you try to change is a recurring item. Shall the changes be applied "
-"only to this single occurrence, only to the future items, or to all items in "
-"the recurrence?"
-msgstr ""
+#~ msgid "30 minutes"
+#~ msgstr "30 ਮਿੰਟ"
 
-#: koagenda.cpp:1057
-msgid "Changing Recurring Item"
-msgstr ""
+#~ msgid "Owner:"
+#~ msgstr "ਮਾਲਕ:"
 
-#: koagenda.cpp:1058
-msgid "Only &This Item"
-msgstr "ਸਿਰਫ ਇਹ ਇਕਾਈ ਹੀ(&T)"
+#~ msgid "Advanced"
+#~ msgstr "ਤਕਨੀਕੀ"
 
-#: koagenda.cpp:1058
-msgid "Only &Future Items"
-msgstr "ਸਿਰਫ ਭਵਿੱਖਤ ਇਕਾਈਆਂ ਹੀ(&F)"
+#~ msgid "Owner: "
+#~ msgstr "ਮਾਲਕ: "
 
-#: koagenda.cpp:1058
-msgid "&All Occurrences"
-msgstr "ਸਭ ਮੌਜੂਦਗੀਆਂ(&A)"
+#~ msgid "co&mpleted"
+#~ msgstr "ਮੁਕੰਮਲ"
 
-#: koagenda.cpp:1073
-msgid "Dissociate event from recurrence"
-msgstr ""
+#~ msgid "event"
+#~ msgstr "ਘਟਨਾ"
 
-#: koagenda.cpp:1087
-msgid ""
-"Unable to add the exception item to the calendar. No change will be done."
-msgstr ""
+#~ msgid "task"
+#~ msgstr "ਕੰਮ"
 
-#: koagenda.cpp:1088 koagenda.cpp:1115
-msgid "Error Occurred"
-msgstr "ਗਲਤੀ ਆਈ ਹੈ"
+#~ msgid "journal entry"
+#~ msgstr "ਰੋਜ਼ਨਾਮਚਾ ਇੰਦਰਾਜ਼"
 
-#: koagenda.cpp:1101
-msgid "Split future recurrences"
-msgstr "ਭਵਿੱਖ ਮੌਜੂਦਾ ਵੰਡੋ"
+#~ msgid "End Time"
+#~ msgstr "ਅੰਤ ਸਮਾਂ"
 
-#: koagenda.cpp:1114
-msgid "Unable to add the future items to the calendar. No change will be done."
-msgstr ""
+#, fuzzy
+#~ msgid "Dismiss all"
+#~ msgstr "ਸਭ ਰੱਦ"
+
+#, fuzzy
+#~ msgid "Dismiss"
+#~ msgstr "ਸਭ ਰੱਦ"
+
+#~ msgid "Default Reminder Time"
+#~ msgstr "ਮੂਲ ਮੁਲਾਕਾਤ ਸਮਾਂ"
+
+#~ msgid "Enter the reminder time here."
+#~ msgstr "ਅਲਾਰਮ ਸਮਾਂ ਇੱਥੇ ਦਿਓ।"
+
+#~ msgid "Default event color"
+#~ msgstr "ਮੂਲ ਘਟਨਾ ਰੰਗ"
+
+#, fuzzy
+#~ msgid "The selected items will be permanently deleted."
+#~ msgstr "ਇਹ ਇਕਾਈ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾ ਦਿੱਤੀ ਜਾਵੇਗੀ।"
+
+#~ msgid "%1 resource"
+#~ msgstr "%1 ਸਰੋਤ"
+
+#~ msgid "Rec&urrence"
+#~ msgstr "ਆਵਰਤੀ"
 
 #~ msgid "Zoom to Fit"
 #~ msgstr "ਅਨੁਕੂਲ ਆਕਾਰ"
diff --git a/tde-i18n-pa/messages/tdepim/korn.po b/tde-i18n-pa/messages/tdepim/korn.po
index b163b4d9e2b..6538976447c 100644
--- a/tde-i18n-pa/messages/tdepim/korn.po
+++ b/tde-i18n-pa/messages/tdepim/korn.po
@@ -4,16 +4,29 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: korn\n"
-"POT-Creation-Date: 2008-07-08 01:22+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-01-17 10:48+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: maildir_proto.h:47 qmail_proto.cpp:38 qmail_proto.h:50
+msgid "Path:"
+msgstr "ਮਾਰਗ:"
+
+#: mbox_proto.cpp:37 mbox_proto.h:44
+msgid "File:"
+msgstr "ਫਾਇਲ:"
+
+#: process_proto.h:40
+msgid "Program: "
+msgstr ""
+
 #: tdeio_proto.h:97
 msgid "Server:"
 msgstr "ਸਰਵਰ:"
@@ -34,7 +47,7 @@ msgstr "ਮੇਲਬਕਸਾ:"
 msgid "Password:"
 msgstr "ਗੁਪਤ-ਕੋਡ:"
 
-#: imap_proto.cpp:59 tdeio_proto.h:102 nntp_proto.cpp:43 pop3_proto.cpp:58
+#: imap_proto.cpp:59 nntp_proto.cpp:43 pop3_proto.cpp:58 tdeio_proto.h:102
 msgid "Save password"
 msgstr "ਗੁਪਤ-ਕੋਡ ਸੰਭਾਲੋ"
 
@@ -42,18 +55,6 @@ msgstr "ਗੁਪਤ-ਕੋਡ ਸੰਭਾਲੋ"
 msgid "Authentication:"
 msgstr "ਪ੍ਰਮਾਣਕਿਤਾ:"
 
-#: maildir_proto.h:47 qmail_proto.cpp:38 qmail_proto.h:50
-msgid "Path:"
-msgstr "ਮਾਰਗ:"
-
-#: mbox_proto.cpp:37 mbox_proto.h:44
-msgid "File:"
-msgstr "ਫਾਇਲ:"
-
-#: process_proto.h:40
-msgid "Program: "
-msgstr ""
-
 #: _translatorinfo.cpp:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
@@ -162,59 +163,6 @@ msgstr "ਗੁਪਤ-ਕੋਡ"
 msgid "Authentication"
 msgstr "ਪਰਮਾਣਕਿਤਾ"
 
-#: tdeio.cpp:211
-msgid "url is not valid"
-msgstr ""
-
-#: tdeio_count.cpp:89 tdeio_count.cpp:90
-#, c-format
-msgid "Not able to open a tdeio slave for %1."
-msgstr ""
-
-#: tdeio_count.cpp:204 tdeio_count.cpp:254
-msgid "Got unknown job; something must be wrong..."
-msgstr ""
-
-#: tdeio_count.cpp:210 tdeio_count.cpp:211
-#, c-format
-msgid "The next TDEIO-error occurred by counting: %1"
-msgstr ""
-
-#: tdeio_delete.cpp:110
-msgid "Could not get a connected slave; I cannot delete this way..."
-msgstr ""
-
-#: tdeio_delete.cpp:185
-#, c-format
-msgid "An error occurred when deleting email: %1."
-msgstr ""
-
-#: tdeio_read.cpp:77 tdeio_read.cpp:91
-msgid "Unknown job returned; I will try if this one will do... "
-msgstr ""
-
-#: tdeio_read.cpp:80
-#, c-format
-msgid "An error occurred when fetching the requested email: %1."
-msgstr ""
-
-#: tdeio_single_subject.cpp:128 tdeio_single_subject.cpp:137
-msgid "Got invalid job; something strange happened?"
-msgstr ""
-
-#: tdeio_single_subject.cpp:141
-msgid "Error when fetching %1: %2"
-msgstr ""
-
-#: tdeio_subjects.cpp:66
-msgid "Already a slave pending."
-msgstr ""
-
-#: tdeio_subjects.cpp:104 tdeio_subjects.cpp:105
-#, c-format
-msgid "Not able to open a tdeio-slave for %1."
-msgstr ""
-
 #: kmail_proto.cpp:199
 msgid "KMail name"
 msgstr "ਕੇ-ਮੇਲ ਨਾਂ"
@@ -602,3 +550,56 @@ msgstr "ਪੁਸ਼ਟੀ"
 #: subjectsdlg.cpp:427
 msgid "Deleting mail; please wait...."
 msgstr "ਪੱਤਰ ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ; ਉਡੀਕੋ ਜੀ..."
+
+#: tdeio.cpp:211
+msgid "url is not valid"
+msgstr ""
+
+#: tdeio_count.cpp:89 tdeio_count.cpp:90
+#, c-format
+msgid "Not able to open a tdeio slave for %1."
+msgstr ""
+
+#: tdeio_count.cpp:204 tdeio_count.cpp:254
+msgid "Got unknown job; something must be wrong..."
+msgstr ""
+
+#: tdeio_count.cpp:210 tdeio_count.cpp:211
+#, c-format
+msgid "The next TDEIO-error occurred by counting: %1"
+msgstr ""
+
+#: tdeio_delete.cpp:110
+msgid "Could not get a connected slave; I cannot delete this way..."
+msgstr ""
+
+#: tdeio_delete.cpp:185
+#, c-format
+msgid "An error occurred when deleting email: %1."
+msgstr ""
+
+#: tdeio_read.cpp:77 tdeio_read.cpp:91
+msgid "Unknown job returned; I will try if this one will do... "
+msgstr ""
+
+#: tdeio_read.cpp:80
+#, c-format
+msgid "An error occurred when fetching the requested email: %1."
+msgstr ""
+
+#: tdeio_single_subject.cpp:128 tdeio_single_subject.cpp:137
+msgid "Got invalid job; something strange happened?"
+msgstr ""
+
+#: tdeio_single_subject.cpp:141
+msgid "Error when fetching %1: %2"
+msgstr ""
+
+#: tdeio_subjects.cpp:66
+msgid "Already a slave pending."
+msgstr ""
+
+#: tdeio_subjects.cpp:104 tdeio_subjects.cpp:105
+#, c-format
+msgid "Not able to open a tdeio-slave for %1."
+msgstr ""
diff --git a/tde-i18n-pa/messages/tdepim/kres_birthday.po b/tde-i18n-pa/messages/tdepim/kres_birthday.po
index 0e6b89aae38..3dbd7e31dc4 100644
--- a/tde-i18n-pa/messages/tdepim/kres_birthday.po
+++ b/tde-i18n-pa/messages/tdepim/kres_birthday.po
@@ -4,48 +4,54 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kres_birthday\n"
-"POT-Creation-Date: 2005-12-15 03:11+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-01-17 10:48+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: resourcekabc.cpp:168
+#: resourcetdeabc.cpp:76
+#, fuzzy
+msgid "Birthdays"
+msgstr "ਜਨਮਦਿਨ"
+
+#: resourcetdeabc.cpp:172
 msgid "%1's birthday"
 msgstr "%1ਦਾ ਜਨਮਦਿਨ"
 
-#: resourcekabc.cpp:209
+#: resourcetdeabc.cpp:213
 msgid "Birthday"
 msgstr "ਜਨਮਦਿਨ"
 
-#: resourcekabc.cpp:267
+#: resourcetdeabc.cpp:279
 msgid ""
 "_: insert names of both spouses\n"
 "%1's & %2's anniversary"
 msgstr "%1 ਅਤੇ %2 ਦੀ ਵਰ੍ਹੇ ਗੰਢ"
 
-#: resourcekabc.cpp:269
+#: resourcetdeabc.cpp:282
 msgid ""
 "_: only one spouse in addressbook, insert the name\n"
 "%1's anniversary"
 msgstr "%1ਦੀ ਵਰ੍ਹੇ ਗੰਢ"
 
-#: resourcekabc.cpp:314
+#: resourcetdeabc.cpp:327
 msgid "Anniversary"
 msgstr "ਵਰ੍ਹੇ ਗੰਢ"
 
-#: resourcekabcconfig.cpp:41
+#: resourcetdeabcconfig.cpp:41
 msgid "Set reminder"
 msgstr "ਯਾਦਪੱਤਰ ਦਿਓ"
 
-#: resourcekabcconfig.cpp:45
+#: resourcetdeabcconfig.cpp:45
 msgid "Reminder before (in days):"
 msgstr ""
 
-#: resourcekabcconfig.cpp:55
+#: resourcetdeabcconfig.cpp:55
 msgid "Filter by categories"
 msgstr ""
diff --git a/tde-i18n-pa/messages/tdepim/kres_blogging.po b/tde-i18n-pa/messages/tdepim/kres_blogging.po
index 55fbd50a881..38b4bd1cd8f 100644
--- a/tde-i18n-pa/messages/tdepim/kres_blogging.po
+++ b/tde-i18n-pa/messages/tdepim/kres_blogging.po
@@ -4,16 +4,21 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kres_blogging\n"
-"POT-Creation-Date: 2005-02-02 01:26+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-01-17 10:48+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: kcal_resourceblogging.cpp:44
+msgid "Blogs"
+msgstr ""
+
 #: kcal_resourcebloggingconfig.cpp:35
 msgid ""
 "Currently, the blogging resource is only read-only. You will not be able to add "
diff --git a/tde-i18n-pa/messages/tdepim/kres_exchange.po b/tde-i18n-pa/messages/tdepim/kres_exchange.po
index 150ec435b33..1e7548d7bfd 100644
--- a/tde-i18n-pa/messages/tdepim/kres_exchange.po
+++ b/tde-i18n-pa/messages/tdepim/kres_exchange.po
@@ -5,16 +5,21 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kres_exchange\n"
-"POT-Creation-Date: 2006-03-25 04:00+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-04-20 17:51+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: resourceexchange.cpp:94
+msgid "Exchange Server"
+msgstr ""
+
 #: resourceexchangeconfig.cpp:42
 msgid "Host:"
 msgstr "ਹੋਸਟ:"
diff --git a/tde-i18n-pa/messages/tdepim/kres_featureplan.po b/tde-i18n-pa/messages/tdepim/kres_featureplan.po
index ec42e71779b..f99de7a39bc 100644
--- a/tde-i18n-pa/messages/tdepim/kres_featureplan.po
+++ b/tde-i18n-pa/messages/tdepim/kres_featureplan.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kres_featureplan\n"
-"POT-Creation-Date: 2005-01-16 01:25+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-04-20 17:51+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-pa/messages/tdepim/kres_kolab.po b/tde-i18n-pa/messages/tdepim/kres_kolab.po
index 274e20b5199..3280752f46d 100644
--- a/tde-i18n-pa/messages/tdepim/kres_kolab.po
+++ b/tde-i18n-pa/messages/tdepim/kres_kolab.po
@@ -5,90 +5,92 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kres_kolab\n"
-"POT-Creation-Date: 2008-02-29 01:41+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-04-20 17:51+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tdeabc/resourcekolab.cpp:205
-msgid "Loading contacts..."
-msgstr "ਸੰਪਰਕ ਲੋਡ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ..."
+#: kcal/resourcekolab.cpp:77 knotes/resourcekolab.cpp:58
+#: tdeabc/resourcekolab.cpp:86
+msgid "Kolab Server"
+msgstr ""
 
-#: kcal/resourcekolab.cpp:171
+#: kcal/resourcekolab.cpp:170
 msgid "Loading tasks..."
 msgstr "ਕੰਮ ਲੋਡ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ..."
 
-#: kcal/resourcekolab.cpp:172
+#: kcal/resourcekolab.cpp:171
 msgid "Loading journals..."
 msgstr "ਜਰਨਲ ਲੋਡ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ..."
 
-#: kcal/resourcekolab.cpp:173
+#: kcal/resourcekolab.cpp:172
 msgid "Loading events..."
 msgstr "ਘਟਨਾਵਾਂ ਲੋਡ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ..."
 
-#: kcal/resourcekolab.cpp:376
+#: kcal/resourcekolab.cpp:426
 #, c-format
 msgid "Copy of: %1"
 msgstr "ਇਸ ਦੀ ਨਕਲ: %1"
 
-#: kcal/resourcekolab.cpp:525
+#: kcal/resourcekolab.cpp:598
 msgid "Choose the folder where you want to store this event"
 msgstr ""
 
-#: kcal/resourcekolab.cpp:527
+#: kcal/resourcekolab.cpp:601
 msgid "Choose the folder where you want to store this task"
 msgstr ""
 
-#: kcal/resourcekolab.cpp:529
+#: kcal/resourcekolab.cpp:603
 msgid "Choose the folder where you want to store this incidence"
 msgstr ""
 
-#: kcal/resourcekolab.cpp:532
+#: kcal/resourcekolab.cpp:607
 #, c-format
 msgid "<b>Summary:</b> %1"
 msgstr ""
 
-#: kcal/resourcekolab.cpp:534
+#: kcal/resourcekolab.cpp:609
 #, c-format
 msgid "<b>Location:</b> %1"
 msgstr ""
 
-#: kcal/resourcekolab.cpp:537
+#: kcal/resourcekolab.cpp:612
 msgid "<b>Start:</b> %1, %2"
 msgstr ""
 
-#: kcal/resourcekolab.cpp:540
+#: kcal/resourcekolab.cpp:615
 #, c-format
 msgid "<b>Start:</b> %1"
 msgstr ""
 
-#: kcal/resourcekolab.cpp:546
+#: kcal/resourcekolab.cpp:621
 msgid "<b>End:</b> %1, %2"
 msgstr ""
 
-#: kcal/resourcekolab.cpp:549
+#: kcal/resourcekolab.cpp:624
 #, c-format
 msgid "<b>End:</b> %1"
 msgstr ""
 
-#: kcal/resourcekolab.cpp:1085
+#: kcal/resourcekolab.cpp:1247
 msgid "Calendar"
 msgstr ""
 
-#: kcal/resourcekolab.cpp:1085
+#: kcal/resourcekolab.cpp:1247
 msgid "Tasks"
 msgstr ""
 
-#: kcal/resourcekolab.cpp:1085
+#: kcal/resourcekolab.cpp:1247
 msgid "Journals"
 msgstr ""
 
-#: kcal/resourcekolab.cpp:1086
+#: kcal/resourcekolab.cpp:1248
 msgid "Which kind of subresource should this be?"
 msgstr ""
 
@@ -111,15 +113,38 @@ msgstr ""
 msgid "Internal kolab data: Do not delete this mail."
 msgstr "ਅੰਦਰੂਨੀ kolab ਡਾਟਾ: ਇਹ ਪੱਤਰ ਨਾ ਹਟਾਓ।"
 
-#: shared/resourcekolabbase.cpp:230
+#: shared/resourcekolabbase.cpp:237
+msgid ""
+"You have no writable event folders so saving will not be possible.\n"
+"Please create or activate at least one writable event folder and try again."
+msgstr ""
+
+#: shared/resourcekolabbase.cpp:241
 msgid ""
-"No writable resource was found, saving will not be possible. Reconfigure KMail "
-"first."
+"You have no writable task folders so saving will not be possible.\n"
+"Please create or activate at least one writable task folder and try again."
 msgstr ""
-"ਕੋਈ ਲਿਖਣਯੋਗ ਸਰੋਤ ਨਹੀਂ ਮਿਲਿਆ ਹੈ, ਸੰਭਾਲਣ ਸੰਭਵ ਨਹੀਂ ਹੋਵੇਗਾ। ਕੇ-ਮੇਲ ਨੂੰ ਪਹਿਲਾਂ ਮੁੜ "
-"ਸੰਰਚਿਤ ਕਰੋ।"
 
-#: shared/resourcekolabbase.cpp:239
+#: shared/resourcekolabbase.cpp:245
+msgid ""
+"You have no writable calendar folder so saving will not be possible.\n"
+"Please create or activate at least one writable calendar folder and try again."
+msgstr ""
+
+#: shared/resourcekolabbase.cpp:249
+msgid ""
+"You have no writable notes folders so saving will not be possible.\n"
+"Please create or activate at least one writable notes folder and try again."
+msgstr ""
+
+#: shared/resourcekolabbase.cpp:253
+msgid ""
+"You have no writable addressbook folder so saving will not be possible.\n"
+"Please create or activate at least one writable addressbook folder and try "
+"again."
+msgstr ""
+
+#: shared/resourcekolabbase.cpp:268
 msgid ""
 "You have more than one writable resource folder. Please select the one you want "
 "to write to."
@@ -127,6 +152,13 @@ msgstr ""
 "ਤੁਹਾਡੇ ਕੋਲ ਇੱਕ ਤੋਂ ਜਿਆਦਾ ਲਿਖਣਯੋਗ ਸਰੋਤ ਫੋਲਡਰ ਹਨ। ਕਿਰਪਾ ਕਰਕੇ ਲਿਖਣ ਲਈ ਇੱਕ ਦੀ ਚੋਣ "
 "ਕਰੋ।"
 
-#: shared/resourcekolabbase.cpp:243
+#: shared/resourcekolabbase.cpp:272
 msgid "Select Resource Folder"
 msgstr "ਸਰੋਤ ਫੋਲਡਰ ਚੁਣੋ"
+
+#: tdeabc/resourcekolab.cpp:206
+msgid "Loading contacts..."
+msgstr "ਸੰਪਰਕ ਲੋਡ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ..."
+
+#~ msgid "No writable resource was found, saving will not be possible. Reconfigure KMail first."
+#~ msgstr "ਕੋਈ ਲਿਖਣਯੋਗ ਸਰੋਤ ਨਹੀਂ ਮਿਲਿਆ ਹੈ, ਸੰਭਾਲਣ ਸੰਭਵ ਨਹੀਂ ਹੋਵੇਗਾ। ਕੇ-ਮੇਲ ਨੂੰ ਪਹਿਲਾਂ ਮੁੜ ਸੰਰਚਿਤ ਕਰੋ।"
diff --git a/tde-i18n-pa/messages/tdepim/kres_remote.po b/tde-i18n-pa/messages/tdepim/kres_remote.po
index d6828b77a0d..b687b013608 100644
--- a/tde-i18n-pa/messages/tdepim/kres_remote.po
+++ b/tde-i18n-pa/messages/tdepim/kres_remote.po
@@ -5,21 +5,46 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kres_remote\n"
-"POT-Creation-Date: 2007-01-26 02:44+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-04-20 17:51+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: resourceremote.cpp:203
+#: resourceremote.cpp:60
+msgid "Remote Calendar"
+msgstr ""
+
+#: resourceremote.cpp:206
 msgid "Downloading Calendar"
 msgstr "ਕੈਲੰਡਰ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: resourceremote.cpp:317
+#: resourceremote.cpp:227
+msgid "Remote data access failure"
+msgstr ""
+
+#: resourceremote.cpp:227
+msgid "Detailed information"
+msgstr ""
+
+#: resourceremote.cpp:228
+msgid "What would you like to do?"
+msgstr ""
+
+#: resourceremote.cpp:230
+msgid "Remote Data Access Failure"
+msgstr ""
+
+#: resourceremote.cpp:230
+msgid "&Continue with cached resource"
+msgstr ""
+
+#: resourceremote.cpp:333
 #, c-format
 msgid "URL: %1"
 msgstr "URL: %1"
diff --git a/tde-i18n-pa/messages/tdepim/kres_tvanytime.po b/tde-i18n-pa/messages/tdepim/kres_tvanytime.po
index 5b444956daf..27720a1143c 100644
--- a/tde-i18n-pa/messages/tdepim/kres_tvanytime.po
+++ b/tde-i18n-pa/messages/tdepim/kres_tvanytime.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kres_tvanytime\n"
-"POT-Creation-Date: 2005-12-30 03:18+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-01-17 10:48+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-pa/messages/tdepim/kres_xmlrpc.po b/tde-i18n-pa/messages/tdepim/kres_xmlrpc.po
index af52694fdff..11bcefb8892 100644
--- a/tde-i18n-pa/messages/tdepim/kres_xmlrpc.po
+++ b/tde-i18n-pa/messages/tdepim/kres_xmlrpc.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kres_xmlrpc\n"
-"POT-Creation-Date: 2006-06-16 04:05+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-01-17 10:51+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,74 +19,79 @@ msgstr ""
 msgid "Debug Dialog"
 msgstr "ਡੀਬੱਗ ਵਾਰਤਾਲਾਪ"
 
-#: tdeabc_resourcexmlrpc.cpp:297
-msgid "Login failed, please check your username and password."
+#: kcal_resourcexmlrpc.cpp:116 knotes_resourcexmlrpc.cpp:63
+#: tdeabc_resourcexmlrpc.cpp:70
+msgid "eGroupware Server"
 msgstr ""
 
-#: tdeabc_resourcexmlrpc.cpp:316
-msgid "Logout failed, please check your username and password."
-msgstr ""
-
-#: tdeabc_resourcexmlrpc.cpp:393
-msgid "<qt>Server sent error %1: <b>%2</b></qt>"
-msgstr "<qt>ਸਰਵਰ ਨੇ %1 ਗਲਤੀ ਭੇਜੀ: <b>%2</b></qt>"
-
-#: tdeabc_resourcexmlrpc.cpp:407
-msgid "Unable to add contact %1 to server. (%2)"
-msgstr ""
-
-#: tdeabc_resourcexmlrpc.cpp:416
-msgid "Unable to update contact %1 on server. (%2)"
-msgstr ""
-
-#: tdeabc_resourcexmlrpc.cpp:436
-msgid "Unable to delete contact %1 from server. (%2)"
-msgstr ""
-
-#: tdeabc_resourcexmlrpcconfig.cpp:41 kcal_resourcexmlrpcconfig.cpp:42
-#: knotes_resourcexmlrpcconfig.cpp:42
+#: kcal_resourcexmlrpcconfig.cpp:42 knotes_resourcexmlrpcconfig.cpp:42
+#: tdeabc_resourcexmlrpcconfig.cpp:41
 msgid "URL:"
 msgstr "URL:"
 
-#: tdeabc_resourcexmlrpcconfig.cpp:47 kcal_resourcexmlrpcconfig.cpp:48
-#: knotes_resourcexmlrpcconfig.cpp:48
+#: kcal_resourcexmlrpcconfig.cpp:48 knotes_resourcexmlrpcconfig.cpp:48
+#: tdeabc_resourcexmlrpcconfig.cpp:47
 msgid "Domain:"
 msgstr "ਡੋਮੇਨ:"
 
-#: tdeabc_resourcexmlrpcconfig.cpp:53 kcal_resourcexmlrpcconfig.cpp:54
-#: knotes_resourcexmlrpcconfig.cpp:54
+#: kcal_resourcexmlrpcconfig.cpp:54 knotes_resourcexmlrpcconfig.cpp:54
+#: tdeabc_resourcexmlrpcconfig.cpp:53
 msgid "User:"
 msgstr "ਉਪਭੋਗੀ:"
 
-#: tdeabc_resourcexmlrpcconfig.cpp:59 kcal_resourcexmlrpcconfig.cpp:60
-#: knotes_resourcexmlrpcconfig.cpp:60
+#: kcal_resourcexmlrpcconfig.cpp:60 knotes_resourcexmlrpcconfig.cpp:60
+#: tdeabc_resourcexmlrpcconfig.cpp:59
 msgid "Password:"
 msgstr "ਗੁਪਤ-ਕੋਡ:"
 
-#. i18n: file tderesources_tdeabc_egroupware.kcfg line 10
+#. i18n: file tderesources_kcal_egroupware.kcfg line 10
 #: rc.cpp:3 rc.cpp:15 rc.cpp:27
 #, no-c-format
 msgid "URL"
 msgstr "URL"
 
-#. i18n: file tderesources_tdeabc_egroupware.kcfg line 13
+#. i18n: file tderesources_kcal_egroupware.kcfg line 13
 #: rc.cpp:6 rc.cpp:18 rc.cpp:30
 #, no-c-format
 msgid "Domain"
 msgstr "ਡੋਮੇਨ"
 
-#. i18n: file tderesources_tdeabc_egroupware.kcfg line 17
+#. i18n: file tderesources_kcal_egroupware.kcfg line 17
 #: rc.cpp:9 rc.cpp:21 rc.cpp:33
 #, no-c-format
 msgid "User Name"
 msgstr "ਉਪਭੋਗਤਾ ਨਾਂ"
 
-#. i18n: file tderesources_tdeabc_egroupware.kcfg line 20
+#. i18n: file tderesources_kcal_egroupware.kcfg line 20
 #: rc.cpp:12 rc.cpp:24 rc.cpp:36
 #, no-c-format
 msgid "Password"
 msgstr "ਗੁਪਤ-ਕੋਡ"
 
+#: tdeabc_resourcexmlrpc.cpp:300
+msgid "Login failed, please check your username and password."
+msgstr ""
+
+#: tdeabc_resourcexmlrpc.cpp:319
+msgid "Logout failed, please check your username and password."
+msgstr ""
+
+#: tdeabc_resourcexmlrpc.cpp:396
+msgid "<qt>Server sent error %1: <b>%2</b></qt>"
+msgstr "<qt>ਸਰਵਰ ਨੇ %1 ਗਲਤੀ ਭੇਜੀ: <b>%2</b></qt>"
+
+#: tdeabc_resourcexmlrpc.cpp:410
+msgid "Unable to add contact %1 to server. (%2)"
+msgstr ""
+
+#: tdeabc_resourcexmlrpc.cpp:419
+msgid "Unable to update contact %1 on server. (%2)"
+msgstr ""
+
+#: tdeabc_resourcexmlrpc.cpp:439
+msgid "Unable to delete contact %1 from server. (%2)"
+msgstr ""
+
 #: xmlrpciface.cpp:115
 msgid "Received invalid XML markup: %1 at %2:%3"
 msgstr ""
diff --git a/tde-i18n-pa/messages/tdepim/ktnef.po b/tde-i18n-pa/messages/tdepim/ktnef.po
index 3dddcb3014b..2a320b61190 100644
--- a/tde-i18n-pa/messages/tdepim/ktnef.po
+++ b/tde-i18n-pa/messages/tdepim/ktnef.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ktnef\n"
-"POT-Creation-Date: 2007-02-16 02:44+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-01-17 10:51+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-pa/messages/tdepim/kwatchgnupg.po b/tde-i18n-pa/messages/tdepim/kwatchgnupg.po
index 068493c0eae..cf9c67dd57d 100644
--- a/tde-i18n-pa/messages/tdepim/kwatchgnupg.po
+++ b/tde-i18n-pa/messages/tdepim/kwatchgnupg.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kwatchgnupg\n"
-"POT-Creation-Date: 2005-07-25 01:39+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-01-17 10:51+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-pa/messages/tdepim/libkcal.po b/tde-i18n-pa/messages/tdepim/libkcal.po
index c472c318f19..a7c731817e7 100644
--- a/tde-i18n-pa/messages/tdepim/libkcal.po
+++ b/tde-i18n-pa/messages/tdepim/libkcal.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkcal\n"
-"POT-Creation-Date: 2008-08-19 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-01-17 10:49+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,6 +28,39 @@ msgid ""
 "Your emails"
 msgstr "aalam@users.sf.net"
 
+#: attachmenthandler.cpp:73
+msgid "No attachment named \"%1\" found in the incidence."
+msgstr ""
+
+#: attachmenthandler.cpp:81
+msgid ""
+"The attachment \"%1\" is a web link that is inaccessible from this computer. "
+msgstr ""
+
+#: attachmenthandler.cpp:103
+msgid ""
+"The incidence that owns the attachment named \"%1\" could not be found. Perhaps "
+"it was removed from your calendar?"
+msgstr ""
+
+#: attachmenthandler.cpp:122
+msgid ""
+"The calendar invitation stored in this email message is broken in some way. "
+"Unable to continue."
+msgstr ""
+
+#: attachmenthandler.cpp:178 attachmenthandler.cpp:232
+msgid "Unable to create a temporary file for the attachment."
+msgstr ""
+
+#: attachmenthandler.cpp:206
+msgid "Save Attachment"
+msgstr ""
+
+#: attachmenthandler.cpp:211
+msgid "%1 already exists. Do you want to overwrite it?"
+msgstr ""
+
 #: attendee.cpp:76
 msgid "Needs Action"
 msgstr "ਕਾਰਵਾਈ ਲੋੜੀਦੀ"
@@ -49,8 +83,7 @@ msgstr ""
 msgid "Delegated"
 msgstr "ਪ੍ਰਤੀਨਿਧੀ"
 
-#: attendee.cpp:91 htmlexport.cpp:358 incidence.cpp:718
-#: incidenceformatter.cpp:435
+#: attendee.cpp:91 htmlexport.cpp:366 incidence.cpp:774
 msgid "Completed"
 msgstr "ਮੁਕੰਮਲ"
 
@@ -58,42 +91,48 @@ msgstr "ਮੁਕੰਮਲ"
 msgid "In Process"
 msgstr "ਕਾਰਵਾਈ ਅਧੀਨ"
 
-#: attendee.cpp:143
+#: attendee.cpp:97
+msgid ""
+"_: attendee status unknown\n"
+"Unknown"
+msgstr ""
+
+#: attendee.cpp:146
 msgid "Chair"
 msgstr "ਮੁੱਖੀ"
 
-#: attendee.cpp:147
+#: attendee.cpp:150
 msgid "Participant"
 msgstr "ਸਹਿਯੋਗੀ"
 
-#: attendee.cpp:150
+#: attendee.cpp:153
 msgid "Optional Participant"
 msgstr "ਚੋਣਵਾਂ ਸਹਿਯੋਗੀ"
 
-#: attendee.cpp:153
+#: attendee.cpp:156
 msgid "Observer"
 msgstr "ਦਰਸ਼ਕ"
 
-#: calendar.cpp:64
+#: calendar.cpp:65
 msgid "Unknown Name"
 msgstr "ਅਣਜਾਣਾ ਨਾਂ"
 
-#: calendar.cpp:64
+#: calendar.cpp:65
 msgid "unknown@nowhere"
 msgstr "unknown@nowhere"
 
-#: calendarlocal.cpp:581
+#: calendarlocal.cpp:746
 msgid ""
 "The timezone setting was changed. In order to display the calendar you are "
 "looking at in the new timezone, it needs to be saved. Do you want to save the "
 "pending changes or rather wait and apply the new timezone on the next reload?"
 msgstr ""
 
-#: calendarlocal.cpp:587
+#: calendarlocal.cpp:752
 msgid "Save before applying timezones?"
 msgstr ""
 
-#: calendarlocal.cpp:589
+#: calendarlocal.cpp:754
 #, fuzzy
 msgid "Apply Timezone Change on Next Reload"
 msgstr "ਸਮਾਂ-ਖੇਤਰ ਨੂੰ ਅਗਲੀ ਵਾਰ ਮੁੜ-ਲੋਡ ਕਰਨ 'ਤੇ ਲਾਗੂ ਕਰੋ"
@@ -123,7 +162,7 @@ msgid "UID"
 msgstr "UID"
 
 #: convertqtopia.cpp:42
-msgid "Convert Qtopia calendar file to iCalendar"
+msgid "Convert TQtopia calendar file to iCalendar"
 msgstr ""
 
 #: convertqtopia.cpp:44
@@ -139,7 +178,7 @@ msgid "Input file"
 msgstr "ਇੰਪੁੱਟ ਫਾਇਲ"
 
 #: convertqtopia.cpp:53
-msgid "Qtopia calendar file converter"
+msgid "TQtopia calendar file converter"
 msgstr ""
 
 #: convertqtopia.cpp:76
@@ -158,119 +197,126 @@ msgstr "ਗਲਤੀ: ਕੋਈ ਇਂਪੁੱਟ ਫਾਇਲ ਨਹੀਂ ਹ
 msgid "Error saving to '%1'."
 msgstr "ਗਲਤੀ, '%1' ਨੂੰ ਸੰਭਾਲਣ ਵਿੱਚ"
 
-#: exceptions.cpp:40
+#: exceptions.cpp:41
 msgid "%1 Error"
 msgstr "%1 ਗਲਤੀ"
 
-#: exceptions.cpp:57
+#: exceptions.cpp:60
 msgid "Load Error"
 msgstr "ਲੋਡ ਗਲਤੀ"
 
-#: exceptions.cpp:60
+#: exceptions.cpp:63
 msgid "Save Error"
 msgstr "ਸੰਭਾਲਣ ਗਲਤੀ"
 
-#: exceptions.cpp:63
+#: exceptions.cpp:66
 msgid "Parse Error in libical"
 msgstr "libical ਨੂੰ ਪਾਰਸ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: exceptions.cpp:66
+#: exceptions.cpp:69
 msgid "Parse Error in libkcal"
 msgstr "libkcal ਵਿੱਚ ਗਲਤੀ"
 
-#: exceptions.cpp:69
+#: exceptions.cpp:72
 msgid "No calendar component found."
 msgstr "ਕੋਈ ਕੈਲੰਡਰ ਭਾਗ ਨਹੀਂ ਲੱਭਿਆ ਹੈ।"
 
-#: exceptions.cpp:72
+#: exceptions.cpp:75
 msgid "vCalendar Version 1.0 detected."
 msgstr ""
 
-#: exceptions.cpp:75
+#: exceptions.cpp:78
 msgid "iCalendar Version 2.0 detected."
 msgstr ""
 
-#: exceptions.cpp:78
+#: exceptions.cpp:81
+msgid "Unknown calendar format detected."
+msgstr ""
+
+#: exceptions.cpp:84
 msgid "Restriction violation"
 msgstr "ਪਾਬੰਦੀ ਉਲੰਘਣਾ"
 
-#: htmlexport.cpp:149
+#: exceptions.cpp:87
+msgid "No writable resource found"
+msgstr ""
+
+#: htmlexport.cpp:150
 msgid ""
 "_: month_year\n"
 "%1 %2"
 msgstr "%1 %2"
 
-#: htmlexport.cpp:224
+#: htmlexport.cpp:228
 msgid "Start Time"
 msgstr "ਸ਼ੁਰੂ ਸਮਾਂ"
 
-#: htmlexport.cpp:225
+#: htmlexport.cpp:229
 msgid "End Time"
 msgstr "ਅੰਤ ਸਮਾਂ"
 
-#: htmlexport.cpp:226
+#: htmlexport.cpp:230
 msgid "Event"
 msgstr "ਘਟਨਾ"
 
-#: htmlexport.cpp:228 htmlexport.cpp:364 incidenceformatter.cpp:334
-#: incidenceformatter.cpp:413
+#: htmlexport.cpp:232 htmlexport.cpp:372
 msgid "Location"
 msgstr "ਟਿਕਾਣਾ"
 
-#: htmlexport.cpp:232 htmlexport.cpp:368
+#: htmlexport.cpp:236 htmlexport.cpp:376
 msgid "Categories"
 msgstr "ਵਰਗ"
 
-#: htmlexport.cpp:236 htmlexport.cpp:372 incidenceformatter.cpp:158
+#: htmlexport.cpp:240 htmlexport.cpp:380 incidenceformatter.cpp:1950
 msgid "Attendees"
 msgstr "ਸਰੋਤਾ"
 
-#: htmlexport.cpp:356
+#: htmlexport.cpp:364
 msgid "Task"
 msgstr "ਕੰਮ"
 
-#: htmlexport.cpp:357 incidenceformatter.cpp:426
+#: htmlexport.cpp:365
 msgid "Priority"
 msgstr "ਦਰਜਾ"
 
-#: htmlexport.cpp:360
+#: htmlexport.cpp:368
 msgid "Due Date"
 msgstr "ਮਿਆਦ"
 
-#: htmlexport.cpp:391
+#: htmlexport.cpp:399
 msgid "Sub-Tasks of: "
 msgstr ""
 
-#: htmlexport.cpp:441
+#: htmlexport.cpp:449
 msgid "Sub-Tasks"
 msgstr "ਅਧੀਨ-ਕੰਮ"
 
-#: htmlexport.cpp:454 incidenceformatter.cpp:436
+#: htmlexport.cpp:462
 msgid "%1 %"
 msgstr "%1 %"
 
-#: htmlexport.cpp:605
+#: htmlexport.cpp:613
 msgid "This page was created "
 msgstr "ਇਹ ਸਫਾ ਬਣਿਆ ਗਿਆ ਸੀ"
 
-#: htmlexport.cpp:613 htmlexport.cpp:615
+#: htmlexport.cpp:621 htmlexport.cpp:623
 msgid "by <a href=\"mailto:%1\">%2</a> "
 msgstr "<a href=\"mailto:%1\">%2</a> ਨੇ"
 
-#: htmlexport.cpp:618
+#: htmlexport.cpp:626
 msgid "by %1 "
 msgstr "%1 ਰਾਹੀਂ"
 
-#: htmlexport.cpp:622
+#: htmlexport.cpp:630
 msgid "with <a href=\"%1\">%2</a>"
 msgstr "<a href=\"%1\">%2</a> ਦੇ ਨਾਲ"
 
-#: htmlexport.cpp:626
+#: htmlexport.cpp:634
 #, c-format
 msgid "with %1"
 msgstr "%1 ਨਾਲ"
 
-#: htmlexport.cpp:701
+#: htmlexport.cpp:709
 msgid ""
 "_: list of holidays\n"
 "%1, %2"
@@ -284,159 +330,254 @@ msgstr "'%1' ਨੂੰ ਸੰਭਾਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
 msgid "libical error"
 msgstr "libkcal ਗਲਤੀ"
 
-#: icalformatimpl.cpp:1990
+#: icalformatimpl.cpp:2127
+msgid "No VERSION property found"
+msgstr ""
+
+#: icalformatimpl.cpp:2136
 msgid "Expected iCalendar format"
 msgstr ""
 
-#: incidence.cpp:716
+#: incidence.cpp:772
 msgid ""
 "_: incidence status\n"
 "Tentative"
 msgstr ""
 
-#: incidence.cpp:717
+#: incidence.cpp:773
 msgid "Confirmed"
 msgstr "ਤਸਦੀਕ"
 
-#: incidence.cpp:719
+#: incidence.cpp:775
 msgid "Needs-Action"
 msgstr "ਕਾਰਵਾਈ ਲੋੜੀਦੀ"
 
-#: incidence.cpp:720
+#: incidence.cpp:776
 msgid "Canceled"
 msgstr "ਰੱਦ ਹੈ"
 
-#: incidence.cpp:721
+#: incidence.cpp:777
 msgid "In-Process"
 msgstr "ਕਾਰਵਾਈ ਅਧੀਨ"
 
-#: incidence.cpp:722
+#: incidence.cpp:778
 msgid "Draft"
 msgstr "ਡਰਾਫਟ"
 
-#: incidence.cpp:723
+#: incidence.cpp:779
 msgid "Final"
 msgstr "ਅੰਤਮ"
 
-#: incidence.cpp:751
+#: incidence.cpp:807
 msgid "Public"
 msgstr "ਪਬਲਿਕ"
 
-#: incidence.cpp:753
+#: incidence.cpp:809
 msgid "Private"
 msgstr "ਨਿੱਜੀ"
 
-#: incidence.cpp:755
+#: incidence.cpp:811
 msgid "Confidential"
 msgstr "ਗੁਪਤ"
 
-#: incidence.cpp:757
+#: incidence.cpp:813
 msgid "Undefined"
 msgstr "ਨਾ-ਪ੍ਰਭਾਸ਼ਿਤ"
 
-#: incidenceformatter.cpp:151
-msgid "Organizer"
-msgstr "ਪਰਬੰਧਕ"
-
-#: incidenceformatter.cpp:165
+#: incidenceformatter.cpp:251 incidenceformatter.cpp:1970
+#: incidenceformatter.cpp:3408
 msgid " (delegated by %1)"
 msgstr ""
 
-#: incidenceformatter.cpp:168
+#: incidenceformatter.cpp:254 incidenceformatter.cpp:1973
+#: incidenceformatter.cpp:3411
 msgid " (delegated to %1)"
 msgstr ""
 
-#: incidenceformatter.cpp:186
+#: incidenceformatter.cpp:274 incidenceformatter.cpp:3431
+#, fuzzy
+msgid "Organizer:"
+msgstr "ਪਰਬੰਧਕ"
+
+#: incidenceformatter.cpp:287 incidenceformatter.cpp:3439
+#, fuzzy
+msgid "Chair:"
+msgstr "ਮੁੱਖੀ"
+
+#: incidenceformatter.cpp:296 incidenceformatter.cpp:3446
+#, fuzzy
+msgid "Required Participants:"
+msgstr "ਸਹਿਯੋਗੀ"
+
+#: incidenceformatter.cpp:305 incidenceformatter.cpp:3453
+#, fuzzy
+msgid "Optional Participants:"
+msgstr "ਚੋਣਵਾਂ ਸਹਿਯੋਗੀ"
+
+#: incidenceformatter.cpp:314 incidenceformatter.cpp:3460
+#, fuzzy
+msgid "Observers:"
+msgstr "ਦਰਸ਼ਕ"
+
+#: incidenceformatter.cpp:333
 msgid "Show mail"
 msgstr "ਪੱਤਰ ਵੇਖਾਓ"
 
-#: incidenceformatter.cpp:285 incidenceformatter.cpp:295
-#: incidenceformatter.cpp:300
+#: incidenceformatter.cpp:361
+#, fuzzy, c-format
+msgid "Creation date: %1"
+msgstr "ਨਿਰਮਾਣ ਮਿਤੀ: %1"
+
+#: incidenceformatter.cpp:468 incidenceformatter.cpp:641
+#: incidenceformatter.cpp:791 incidenceformatter.cpp:3485
 #, fuzzy
-msgid "Time"
-msgstr "ਅੰਤ ਸਮਾਂ"
+msgid "Calendar:"
+msgstr "iCalendar"
 
-#: incidenceformatter.cpp:286 incidenceformatter.cpp:296
-#: incidenceformatter.cpp:302
-msgid ""
-"_: <beginTime> - <endTime>\n"
-"%1 - %2"
-msgstr "%1 - %2"
+#: incidenceformatter.cpp:476 incidenceformatter.cpp:649
+#: incidenceformatter.cpp:3494 resourcelocalconfig.cpp:49
+#: resourcelocaldirconfig.cpp:48
+msgid "Location:"
+msgstr "ਟਿਕਾਣਾ:"
 
-#: incidenceformatter.cpp:290 incidenceformatter.cpp:309
+#: incidenceformatter.cpp:502 incidenceformatter.cpp:509
+#: incidenceformatter.cpp:517 incidenceformatter.cpp:524
+#: incidenceformatter.cpp:798 incidenceformatter.cpp:1320
+#: incidenceformatter.cpp:1471
 #, fuzzy
-msgid "Date"
+msgid "Date:"
 msgstr "ਮਿਆਦ"
 
-#: incidenceformatter.cpp:291 incidenceformatter.cpp:310
+#: incidenceformatter.cpp:504 incidenceformatter.cpp:519
+#, fuzzy
+msgid ""
+"_: <beginDate> - <endDate>\n"
+"%1 - %2"
+msgstr "%1 - %2"
+
+#: incidenceformatter.cpp:511 incidenceformatter.cpp:526
 #, c-format
 msgid ""
 "_: date as string\n"
 "%1"
 msgstr "%1"
 
-#: incidenceformatter.cpp:318
-msgid "Birthday"
-msgstr "ਜਨਮਦਿਨ"
+#: incidenceformatter.cpp:531 incidenceformatter.cpp:1323
+#, fuzzy
+msgid "Time:"
+msgstr "ਅੰਤ ਸਮਾਂ"
 
-#: incidenceformatter.cpp:327 incidenceformatter.cpp:406
+#: incidenceformatter.cpp:534
+msgid ""
+"_: <beginTime> - <endTime>\n"
+"%1 - %2"
+msgstr "%1 - %2"
+
+#: incidenceformatter.cpp:550 incidenceformatter.cpp:691
+#: incidenceformatter.cpp:1352 incidenceformatter.cpp:3501
+msgid "Duration:"
+msgstr "ਅੰਤਰਾਲ:"
+
+#: incidenceformatter.cpp:557 incidenceformatter.cpp:698
+#: incidenceformatter.cpp:1358 incidenceformatter.cpp:3507
 #, fuzzy
-msgid "Description"
+msgid "Recurrence:"
+msgstr "ਕੋਈ ਨਹੀਂ"
+
+#: incidenceformatter.cpp:567
+msgid "Anniversary:"
+msgstr ""
+
+#: incidenceformatter.cpp:569
+#, fuzzy
+msgid "Birthday:"
+msgstr "ਜਨਮਦਿਨ"
+
+#: incidenceformatter.cpp:579 incidenceformatter.cpp:707
+#: incidenceformatter.cpp:806 incidenceformatter.cpp:1245
+#: incidenceformatter.cpp:1473 incidenceformatter.cpp:3517
+msgid "Description:"
 msgstr "ਵੇਰਵਾ:"
 
-#: incidenceformatter.cpp:341 incidenceformatter.cpp:420
+#: incidenceformatter.cpp:590 incidenceformatter.cpp:718
+#: incidenceformatter.cpp:3525
 #, fuzzy, c-format
 msgid ""
-"_n: 1 Category\n"
-"%n Categories"
-msgstr "ਵਰਗ"
-
-#: incidenceformatter.cpp:350 incidenceformatter.cpp:443
-msgid "Next on"
+"_n: Reminder:\n"
+"%n Reminders:"
 msgstr ""
+"1 ਮਿੰਟ\n"
+"%n ਮਿੰਟ"
+
+#: incidenceformatter.cpp:602 incidenceformatter.cpp:730
+#: incidenceformatter.cpp:815 incidenceformatter.cpp:3535
+#, fuzzy, c-format
+msgid ""
+"_n: Category:\n"
+"%n Categories:"
+msgstr "ਵਰਗ"
 
-#: incidenceformatter.cpp:371 incidenceformatter.cpp:464
+#: incidenceformatter.cpp:612
 #, fuzzy, c-format
 msgid ""
-"_n: 1 attachment\n"
-"%n attachments"
+"_n: Attachment:\n"
+"%n Attachments:"
 msgstr ""
 "ਨੱਥੀ\n"
 "ਨੱਥੀ"
 
-#: incidenceformatter.cpp:377 incidenceformatter.cpp:470
-#, c-format
-msgid "Creation date: %1."
-msgstr "ਨਿਰਮਾਣ ਮਿਤੀ: %1"
+#: incidenceformatter.cpp:662
+#, fuzzy
+msgid "Start:"
+msgstr "ਸ਼ੁਰੂ ਸਮਾਂ:"
 
-#: incidenceformatter.cpp:391
-msgid "Due on"
+#: incidenceformatter.cpp:680
+msgid "Due:"
 msgstr ""
 
-#: incidenceformatter.cpp:430 incidenceformatter.cpp:623
-msgid "Unspecified"
-msgstr "ਨਾ-ਪ੍ਰਭਾਸ਼ਿਤ"
+#: incidenceformatter.cpp:738 incidenceformatter.cpp:3293
+#, fuzzy
+msgid "Priority:"
+msgstr "ਦਰਜਾ"
 
-#: incidenceformatter.cpp:484
-#, c-format
-msgid "Journal for %1"
-msgstr "%1 ਲਈ ਰੋਜ਼ਨਾਮਚਾ"
+#: incidenceformatter.cpp:747 incidenceformatter.cpp:3299
+#, fuzzy
+msgid "Completed:"
+msgstr "ਮੁਕੰਮਲ"
+
+#: incidenceformatter.cpp:751 incidenceformatter.cpp:3302
+msgid "Percent Done:"
+msgstr ""
+
+#: incidenceformatter.cpp:753 incidenceformatter.cpp:2178
+#: incidenceformatter.cpp:2179 incidenceformatter.cpp:3303
+#, fuzzy
+msgid "%1%"
+msgstr "%1 %"
 
-#: incidenceformatter.cpp:496 incidenceformatter.cpp:1976
+#: incidenceformatter.cpp:762
+#, fuzzy
+msgid ""
+"_n: Attachment:\n"
+"Attachments:"
+msgstr ""
+"ਨੱਥੀ\n"
+"ਨੱਥੀ"
+
+#: incidenceformatter.cpp:835 incidenceformatter.cpp:3351
 #, c-format
 msgid "Free/Busy information for %1"
 msgstr ""
 
-#: incidenceformatter.cpp:498
+#: incidenceformatter.cpp:838
 msgid "Busy times in date range %1 - %2:"
 msgstr ""
 
-#: incidenceformatter.cpp:504
+#: incidenceformatter.cpp:844
 msgid "Busy:"
 msgstr "ਰੁਝਿਆ:"
 
-#: incidenceformatter.cpp:512 incidenceformatter.cpp:694
-#: incidenceformatter.cpp:778
+#: incidenceformatter.cpp:852 incidenceformatter.cpp:1503
 #, c-format
 msgid ""
 "_n: 1 hour \n"
@@ -445,7 +586,7 @@ msgstr ""
 "1 ਘੰਟਾ \n"
 "%n ਘੰਟੇ "
 
-#: incidenceformatter.cpp:516 incidenceformatter.cpp:697
+#: incidenceformatter.cpp:856
 #, c-format
 msgid ""
 "_n: 1 minute \n"
@@ -454,7 +595,7 @@ msgstr ""
 "1 ਮਿੰਟ \n"
 "%n ਮਿੰਟ "
 
-#: incidenceformatter.cpp:520 incidenceformatter.cpp:786
+#: incidenceformatter.cpp:860 incidenceformatter.cpp:1511
 #, c-format
 msgid ""
 "_n: 1 second\n"
@@ -463,112 +604,175 @@ msgstr ""
 "1 ਸਕਿੰਟ\n"
 "%n ਸਕਿੰਟ"
 
-#: incidenceformatter.cpp:522 incidenceformatter.cpp:788
+#: incidenceformatter.cpp:862 incidenceformatter.cpp:1513
 msgid ""
 "_: startDate for duration\n"
 "%1 for %2"
 msgstr "%2 ਲਈ %1 "
 
-#: incidenceformatter.cpp:528 incidenceformatter.cpp:794
+#: incidenceformatter.cpp:868 incidenceformatter.cpp:1519
 msgid ""
 "_: date, fromTime - toTime \n"
 "%1, %2 - %3"
 msgstr "%1, %2 - %3"
 
-#: incidenceformatter.cpp:533 incidenceformatter.cpp:799
+#: incidenceformatter.cpp:873 incidenceformatter.cpp:1524
 msgid ""
 "_: fromDateTime - toDateTime\n"
 "%1 - %2"
 msgstr "%1 - %2"
 
-#: incidenceformatter.cpp:602
+#: incidenceformatter.cpp:971
 msgid ""
 "_: %1: Start Date, %2: Start Time\n"
 "%1 %2"
 msgstr "%1 %2"
 
-#: incidenceformatter.cpp:605
+#: incidenceformatter.cpp:975
+#, fuzzy
 msgid ""
 "_: %1: Start Date\n"
-"%1 (time unspecified)"
+"%1 (all day)"
 msgstr "%1 (ਸਮਾਂ ਨਾ-ਨਿਰਧਾਰਿਤ)"
 
-#: incidenceformatter.cpp:616
+#: incidenceformatter.cpp:986
 msgid ""
 "_: %1: End Date, %2: End Time\n"
 "%1 %2"
 msgstr "%1 %2"
 
-#: incidenceformatter.cpp:619
+#: incidenceformatter.cpp:990
+#, fuzzy
 msgid ""
 "_: %1: End Date\n"
-"%1 (time unspecified)"
+"%1 (all day)"
 msgstr "%1 (ਸਮਾਂ ਨਾ-ਨਿਰਧਾਰਿਤ)"
 
-#: incidenceformatter.cpp:638 incidenceformatter.cpp:726
-#: incidenceformatter.cpp:749
-msgid "Description:"
-msgstr "ਵੇਰਵਾ:"
+#: incidenceformatter.cpp:1107
+msgid "Your response is requested"
+msgstr ""
+
+#: incidenceformatter.cpp:1109
+msgid "Your response as <b>%1</b> is requested"
+msgstr ""
+
+#: incidenceformatter.cpp:1113
+msgid "No response is necessary"
+msgstr ""
+
+#: incidenceformatter.cpp:1115
+msgid "No response as <b>%1</b> is necessary"
+msgstr ""
+
+#: incidenceformatter.cpp:1126
+msgid "(<b>Note</b>: the Organizer preset your response to <b>%1</b>)"
+msgstr ""
 
-#: incidenceformatter.cpp:644
+#: incidenceformatter.cpp:1255
 msgid "Comments:"
 msgstr ""
 
-#: incidenceformatter.cpp:662 incidenceformatter.cpp:716
-#: incidenceformatter.cpp:738
+#: incidenceformatter.cpp:1280 incidenceformatter.cpp:1391
+#: incidenceformatter.cpp:1455
 msgid "Summary unspecified"
 msgstr "ਸੰਖੇਪ ਨਾ-ਨਿਰਧਾਰਿਤ"
 
-#: incidenceformatter.cpp:667
+#: incidenceformatter.cpp:1292 incidenceformatter.cpp:1403
 msgid "Location unspecified"
 msgstr "ਟਿਕਾਣਾ ਨਾ-ਨਿਰਧਾਰਿਤ"
 
-#: incidenceformatter.cpp:678
+#: incidenceformatter.cpp:1310 incidenceformatter.cpp:1420
 msgid "What:"
 msgstr "ਕੀ:"
 
-#: incidenceformatter.cpp:679
+#: incidenceformatter.cpp:1311 incidenceformatter.cpp:1421
 msgid "Where:"
 msgstr "ਕਿੱਥੇ:"
 
-#: incidenceformatter.cpp:682
+#: incidenceformatter.cpp:1314
+#, fuzzy
+msgid "First Start Time:"
+msgstr "ਸ਼ੁਰੂ ਸਮਾਂ:"
+
+#: incidenceformatter.cpp:1315
+#, fuzzy
+msgid "First End Time:"
+msgstr "ਅੰਤ ਸਮਾਂ:"
+
+#: incidenceformatter.cpp:1329
+msgid ""
+"_: Starting date of an event\n"
+"From:"
+msgstr ""
+
+#: incidenceformatter.cpp:1332 incidenceformatter.cpp:1339
+msgid ""
+"_: Starting time of an event\n"
+"At:"
+msgstr ""
+
+#: incidenceformatter.cpp:1336 incidenceformatter.cpp:1343
+msgid ""
+"_: Ending date of an event\n"
+"To:"
+msgstr ""
+
+#: incidenceformatter.cpp:1344
+#, fuzzy
+msgid "no end date specified"
+msgstr "ਟਿਕਾਣਾ ਨਾ-ਨਿਰਧਾਰਿਤ"
+
+#: incidenceformatter.cpp:1368
+#, fuzzy
+msgid "Cancelled on:"
+msgstr "ਰੱਦ ਹੈ"
+
+#: incidenceformatter.cpp:1424
+#, fuzzy
+msgid "Start Date:"
+msgstr "ਸ਼ੁਰੂ ਮਿਤੀ:"
+
+#: incidenceformatter.cpp:1427
 msgid "Start Time:"
 msgstr "ਸ਼ੁਰੂ ਸਮਾਂ:"
 
-#: incidenceformatter.cpp:685
-msgid "End Time:"
+#: incidenceformatter.cpp:1432 incidenceformatter.cpp:1440
+#, fuzzy
+msgid "Due Date:"
+msgstr "ਮਿਆਦ"
+
+#: incidenceformatter.cpp:1435
+#, fuzzy
+msgid "Due Time:"
 msgstr "ਅੰਤ ਸਮਾਂ:"
 
-#: incidenceformatter.cpp:700
-msgid "Duration:"
-msgstr "ਅੰਤਰਾਲ:"
+#: incidenceformatter.cpp:1440
+msgid ""
+"_: Due Date: None\n"
+"None"
+msgstr ""
 
-#: incidenceformatter.cpp:717 incidenceformatter.cpp:739
+#: incidenceformatter.cpp:1456
 msgid "Description unspecified"
 msgstr "ਵੇਰਵਾ ਨਾ-ਨਿਰਧਾਰਿਤ"
 
-#: incidenceformatter.cpp:725 incidenceformatter.cpp:747
+#: incidenceformatter.cpp:1470
 msgid "Summary:"
 msgstr "ਸੰਖੇਪ:"
 
-#: incidenceformatter.cpp:748
-#, fuzzy
-msgid "Date:"
-msgstr "ਮਿਆਦ"
-
-#: incidenceformatter.cpp:762
+#: incidenceformatter.cpp:1486
 msgid "Person:"
 msgstr "ਵਿਅਕਤੀ:"
 
-#: incidenceformatter.cpp:763
+#: incidenceformatter.cpp:1487
 msgid "Start date:"
 msgstr "ਸ਼ੁਰੂ ਮਿਤੀ:"
 
-#: incidenceformatter.cpp:764
+#: incidenceformatter.cpp:1489
 msgid "End date:"
 msgstr "ਅੰਤ ਮਿਤੀ:"
 
-#: incidenceformatter.cpp:782
+#: incidenceformatter.cpp:1507
 #, c-format
 msgid ""
 "_n: 1 minute\n"
@@ -577,485 +781,687 @@ msgstr ""
 "1 ਮਿੰਟ\n"
 "%n ਮਿੰਟ"
 
-#: incidenceformatter.cpp:818
-msgid "This event has been published"
-msgstr "ਇਹ ਘਟਨਾ ਪਰਾਕਸ਼ਿਤ ਕਰ ਦਿੱਤੀ ਗਈ ਹੈ"
-
-#: incidenceformatter.cpp:821
+#: incidenceformatter.cpp:1564
 #, fuzzy
-msgid "This meeting has been updated"
+msgid "This invitation has been published"
+msgstr "ਇਹ ਕੰਮ ਪ੍ਰਕਾਸ਼ਿਤ ਕੀਤਾ ਜਾਵੇਗਾ"
+
+#: incidenceformatter.cpp:1567
+#, fuzzy, c-format
+msgid "This invitation has been updated by the organizer %1"
 msgstr "ਮੀਟਿੰਗ ਨੂੰ ਰੱਦ ਕਰ ਦਿੱਤਾ ਗਿਆ ਸੀ"
 
-#: incidenceformatter.cpp:822
-msgid "You have been invited to this meeting"
+#: incidenceformatter.cpp:1571
+msgid "I created this invitation"
+msgstr ""
+
+#: incidenceformatter.cpp:1581
+#, c-format
+msgid "You received an invitation from %1"
+msgstr ""
+
+#: incidenceformatter.cpp:1583
+msgid "You received an invitation"
 msgstr ""
 
-#: incidenceformatter.cpp:824
+#: incidenceformatter.cpp:1587
+msgid "You received an invitation from %1 as a representative of %2"
+msgstr ""
+
+#: incidenceformatter.cpp:1590
+msgid "You received an invitation from %1 as the organizer's representative"
+msgstr ""
+
+#: incidenceformatter.cpp:1596
 msgid "This invitation was refreshed"
 msgstr "ਇਹ ਸੱਦਾ ਤਾਜ਼ਾ ਕੀਤਾ ਗਿਆ ਸੀ"
 
-#: incidenceformatter.cpp:826
-msgid "This meeting has been canceled"
+#: incidenceformatter.cpp:1598
+#, fuzzy
+msgid "This invitation has been canceled"
 msgstr "ਮੀਟਿੰਗ ਨੂੰ ਰੱਦ ਕਰ ਦਿੱਤਾ ਗਿਆ ਸੀ"
 
-#: incidenceformatter.cpp:828
-msgid "Addition to the meeting invitation"
+#: incidenceformatter.cpp:1600
+#, fuzzy
+msgid "Addition to the invitation"
+msgstr "ਕੰਮ ਵਿੱਚ ਹੋਰ"
+
+#: incidenceformatter.cpp:1604 incidenceformatter.cpp:1684
+#: incidenceformatter.cpp:1748 incidenceformatter.cpp:1837
+msgid "%1 makes this counter proposal"
 msgstr ""
 
-#: incidenceformatter.cpp:843
+#: incidenceformatter.cpp:1605 incidenceformatter.cpp:1617
+#: incidenceformatter.cpp:1685 incidenceformatter.cpp:1689
+#: incidenceformatter.cpp:1749 incidenceformatter.cpp:1761
+#: incidenceformatter.cpp:1838 incidenceformatter.cpp:1842
 #, fuzzy
 msgid "Sender"
 msgstr "ਯਾਦ-ਪੱਤਰ"
 
-#: incidenceformatter.cpp:852
+#: incidenceformatter.cpp:1628
 msgid "%1 indicates this invitation still needs some action"
 msgstr ""
 
-#: incidenceformatter.cpp:855
-msgid "%1 accepts this meeting invitation"
-msgstr ""
+#: incidenceformatter.cpp:1632
+#, fuzzy, c-format
+msgid "This invitation has been updated by attendee %1"
+msgstr "ਮੀਟਿੰਗ ਨੂੰ ਰੱਦ ਕਰ ਦਿੱਤਾ ਗਿਆ ਸੀ"
 
-#: incidenceformatter.cpp:856
-msgid "%1 accepts this meeting invitation on behalf of %2"
-msgstr ""
+#: incidenceformatter.cpp:1634
+#, fuzzy
+msgid "This invitation has been updated by an attendee"
+msgstr "ਮੀਟਿੰਗ ਨੂੰ ਰੱਦ ਕਰ ਦਿੱਤਾ ਗਿਆ ਸੀ"
 
-#: incidenceformatter.cpp:860
-msgid "%1 tentatively accepts this meeting invitation"
+#: incidenceformatter.cpp:1638
+msgid "%1 accepts this invitation"
 msgstr ""
 
-#: incidenceformatter.cpp:861
-msgid "%1 tentatively accepts this meeting invitation on behalf of %2"
+#: incidenceformatter.cpp:1640
+msgid "%1 accepts this invitation on behalf of %2"
 msgstr ""
 
-#: incidenceformatter.cpp:865
-msgid "%1 declines this meeting invitation"
+#: incidenceformatter.cpp:1646
+msgid "%1 tentatively accepts this invitation"
 msgstr ""
 
-#: incidenceformatter.cpp:866
-msgid "%1 declines this meeting invitation on behalf of %2"
+#: incidenceformatter.cpp:1649
+msgid "%1 tentatively accepts this invitation on behalf of %2"
 msgstr ""
 
-#: incidenceformatter.cpp:874
-msgid "%1 has delegated this meeting invitation to %2"
+#: incidenceformatter.cpp:1654
+msgid "%1 declines this invitation"
 msgstr ""
 
-#: incidenceformatter.cpp:876
-msgid "%1 has delegated this meeting invitation"
+#: incidenceformatter.cpp:1656
+msgid "%1 declines this invitation on behalf of %2"
 msgstr ""
 
-#: incidenceformatter.cpp:879
-msgid "This meeting invitation is now completed"
+#: incidenceformatter.cpp:1666
+msgid "%1 has delegated this invitation to %2"
 msgstr ""
 
-#: incidenceformatter.cpp:881
-msgid "%1 is still processing the invitation"
+#: incidenceformatter.cpp:1669
+msgid "%1 has delegated this invitation"
 msgstr ""
 
-#: incidenceformatter.cpp:883
-msgid "Unknown response to this meeting invitation"
-msgstr ""
+#: incidenceformatter.cpp:1673
+#, fuzzy
+msgid "This invitation is now completed"
+msgstr "ਇਹ ਸੱਦਾ ਤਾਜ਼ਾ ਕੀਤਾ ਗਿਆ ਸੀ"
 
-#: incidenceformatter.cpp:887 incidenceformatter.cpp:952
-#: incidenceformatter.cpp:1009
-msgid "Sender makes this counter proposal"
+#: incidenceformatter.cpp:1675
+msgid "%1 is still processing the invitation"
 msgstr ""
 
-#: incidenceformatter.cpp:889 incidenceformatter.cpp:954
-#: incidenceformatter.cpp:1011
-msgid "Sender declines the counter proposal"
+#: incidenceformatter.cpp:1678
+#, fuzzy
+msgid "Unknown response to this invitation"
+msgstr "ਇਸ ਕੰਮ ਲਈ ਅਣਜਾਣਾ ਜਵਾਬ ਹੈ"
+
+#: incidenceformatter.cpp:1688 incidenceformatter.cpp:1841
+msgid "%1 declines the counter proposal"
 msgstr ""
 
-#: incidenceformatter.cpp:891 incidenceformatter.cpp:956
-#: incidenceformatter.cpp:1013
+#: incidenceformatter.cpp:1692 incidenceformatter.cpp:1845
+#: incidenceformatter.cpp:1910
 msgid "Error: iMIP message with unknown method: '%1'"
 msgstr ""
 
-#: incidenceformatter.cpp:903
+#: incidenceformatter.cpp:1707
 msgid "This task has been published"
 msgstr "ਇਹ ਕੰਮ ਪ੍ਰਕਾਸ਼ਿਤ ਕੀਤਾ ਜਾਵੇਗਾ"
 
-#: incidenceformatter.cpp:906
-#, fuzzy
-msgid "This task has been updated"
+#: incidenceformatter.cpp:1710
+#, fuzzy, c-format
+msgid "This task has been updated by the organizer %1"
 msgstr "ਇਹ ਕੰਮ ਪ੍ਰਕਾਸ਼ਿਤ ਕੀਤਾ ਜਾਵੇਗਾ"
 
-#: incidenceformatter.cpp:907
+#: incidenceformatter.cpp:1714
+msgid "I created this task"
+msgstr ""
+
+#: incidenceformatter.cpp:1724
+#, fuzzy, c-format
+msgid "You have been assigned this task by %1"
+msgstr "ਤੁਹਾਨੂੰ ਇਹ ਕੰਮ ਦਿੱਤਾ ਗਿਆ ਹੈ"
+
+#: incidenceformatter.cpp:1726
 msgid "You have been assigned this task"
 msgstr "ਤੁਹਾਨੂੰ ਇਹ ਕੰਮ ਦਿੱਤਾ ਗਿਆ ਹੈ"
 
-#: incidenceformatter.cpp:909
+#: incidenceformatter.cpp:1730
+#, fuzzy
+msgid "You have been assigned this task by %1 as a representative of %2"
+msgstr "ਤੁਹਾਨੂੰ ਇਹ ਕੰਮ ਦਿੱਤਾ ਗਿਆ ਹੈ"
+
+#: incidenceformatter.cpp:1733
+#, fuzzy
+msgid ""
+"You have been assigned this task by %1 as the organizer's representative"
+msgstr "ਤੁਹਾਨੂੰ ਇਹ ਕੰਮ ਦਿੱਤਾ ਗਿਆ ਹੈ"
+
+#: incidenceformatter.cpp:1740
 msgid "This task was refreshed"
 msgstr "ਇਹ ਕੰਮ ਨੂੰ ਤਾਜ਼ਾ ਕੀਤਾ ਗਿਆ ਸੀ"
 
-#: incidenceformatter.cpp:911
+#: incidenceformatter.cpp:1742
 msgid "This task was canceled"
 msgstr "ਇਹ ਕੰਮ ਰੱਦ ਕੀਤਾ ਗਿਆ ਸੀ"
 
-#: incidenceformatter.cpp:913
+#: incidenceformatter.cpp:1744
 msgid "Addition to the task"
 msgstr "ਕੰਮ ਵਿੱਚ ਹੋਰ"
 
-#: incidenceformatter.cpp:927
-msgid "Sender indicates this task assignment still needs some action"
+#: incidenceformatter.cpp:1772
+msgid "%1 indicates this task assignment still needs some action"
+msgstr ""
+
+#: incidenceformatter.cpp:1777
+#, fuzzy, c-format
+msgid "This task has been completed by assignee %1"
+msgstr "ਇਹ ਕੰਮ ਪ੍ਰਕਾਸ਼ਿਤ ਕੀਤਾ ਜਾਵੇਗਾ"
+
+#: incidenceformatter.cpp:1779
+#, fuzzy, c-format
+msgid "This task has been updated by assignee %1"
+msgstr "ਇਹ ਕੰਮ ਪ੍ਰਕਾਸ਼ਿਤ ਕੀਤਾ ਜਾਵੇਗਾ"
+
+#: incidenceformatter.cpp:1783
+#, fuzzy
+msgid "This task has been completed by an assignee"
+msgstr "ਇਹ ਕੰਮ ਪ੍ਰਕਾਸ਼ਿਤ ਕੀਤਾ ਜਾਵੇਗਾ"
+
+#: incidenceformatter.cpp:1785
+#, fuzzy
+msgid "This task has been updated by an assignee"
+msgstr "ਇਹ ਕੰਮ ਪ੍ਰਕਾਸ਼ਿਤ ਕੀਤਾ ਜਾਵੇਗਾ"
+
+#: incidenceformatter.cpp:1790
+msgid "%1 accepts this task"
 msgstr ""
 
-#: incidenceformatter.cpp:929
-msgid "Sender accepts this task"
+#: incidenceformatter.cpp:1792
+msgid "%1 accepts this task on behalf of %2"
 msgstr ""
 
-#: incidenceformatter.cpp:931
-msgid "Sender tentatively accepts this task"
+#: incidenceformatter.cpp:1798
+msgid "%1 tentatively accepts this task"
 msgstr ""
 
-#: incidenceformatter.cpp:933
-msgid "Sender declines this task"
+#: incidenceformatter.cpp:1801
+msgid "%1 tentatively accepts this task on behalf of %2"
 msgstr ""
 
-#: incidenceformatter.cpp:940
-#, c-format
-msgid "Sender has delegated this request for the task to %1"
+#: incidenceformatter.cpp:1806
+msgid "%1 declines this task"
 msgstr ""
 
-#: incidenceformatter.cpp:941
-msgid "Sender has delegated this request for the task "
+#: incidenceformatter.cpp:1808
+msgid "%1 declines this task on behalf of %2"
 msgstr ""
 
-#: incidenceformatter.cpp:944
+#: incidenceformatter.cpp:1818
+msgid "%1 has delegated this request for the task to %2"
+msgstr ""
+
+#: incidenceformatter.cpp:1821
+msgid "%1 has delegated this request for the task"
+msgstr ""
+
+#: incidenceformatter.cpp:1826
 msgid "The request for this task is now completed"
 msgstr ""
 
-#: incidenceformatter.cpp:946 incidenceformatter.cpp:1003
-msgid "Sender is still processing the invitation"
+#: incidenceformatter.cpp:1828
+msgid "%1 is still processing the task"
 msgstr ""
 
-#: incidenceformatter.cpp:948
+#: incidenceformatter.cpp:1831
 msgid "Unknown response to this task"
 msgstr "ਇਸ ਕੰਮ ਲਈ ਅਣਜਾਣਾ ਜਵਾਬ ਹੈ"
 
-#: incidenceformatter.cpp:969
+#: incidenceformatter.cpp:1859
 #, fuzzy
 msgid "This journal has been published"
 msgstr "ਇਹ ਕੰਮ ਪ੍ਰਕਾਸ਼ਿਤ ਕੀਤਾ ਜਾਵੇਗਾ"
 
-#: incidenceformatter.cpp:971
+#: incidenceformatter.cpp:1861
 #, fuzzy
 msgid "You have been assigned this journal"
 msgstr "ਤੁਹਾਨੂੰ ਇਹ ਕੰਮ ਦਿੱਤਾ ਗਿਆ ਹੈ"
 
-#: incidenceformatter.cpp:973
+#: incidenceformatter.cpp:1863
 #, fuzzy
 msgid "This journal was refreshed"
 msgstr "ਇਹ ਕੰਮ ਨੂੰ ਤਾਜ਼ਾ ਕੀਤਾ ਗਿਆ ਸੀ"
 
-#: incidenceformatter.cpp:975
+#: incidenceformatter.cpp:1865
 #, fuzzy
 msgid "This journal was canceled"
 msgstr "ਇਹ ਕੰਮ ਰੱਦ ਕੀਤਾ ਗਿਆ ਸੀ"
 
-#: incidenceformatter.cpp:977
+#: incidenceformatter.cpp:1867
 #, fuzzy
 msgid "Addition to the journal"
 msgstr "ਕੰਮ ਵਿੱਚ ਹੋਰ"
 
-#: incidenceformatter.cpp:991
+#: incidenceformatter.cpp:1871 incidenceformatter.cpp:1906
+msgid "Sender makes this counter proposal"
+msgstr ""
+
+#: incidenceformatter.cpp:1887
 msgid "Sender indicates this journal assignment still needs some action"
 msgstr ""
 
-#: incidenceformatter.cpp:993
+#: incidenceformatter.cpp:1889
 msgid "Sender accepts this journal"
 msgstr ""
 
-#: incidenceformatter.cpp:995
+#: incidenceformatter.cpp:1891
 msgid "Sender tentatively accepts this journal"
 msgstr ""
 
-#: incidenceformatter.cpp:997
+#: incidenceformatter.cpp:1893
 msgid "Sender declines this journal"
 msgstr ""
 
-#: incidenceformatter.cpp:999
+#: incidenceformatter.cpp:1895
 msgid "Sender has delegated this request for the journal"
 msgstr ""
 
-#: incidenceformatter.cpp:1001
+#: incidenceformatter.cpp:1897
 msgid "The request for this journal is now completed"
 msgstr ""
 
-#: incidenceformatter.cpp:1005
+#: incidenceformatter.cpp:1899
+msgid "Sender is still processing the invitation"
+msgstr ""
+
+#: incidenceformatter.cpp:1901
 #, fuzzy
 msgid "Unknown response to this journal"
 msgstr "ਇਸ ਕੰਮ ਲਈ ਅਣਜਾਣਾ ਜਵਾਬ ਹੈ"
 
-#: incidenceformatter.cpp:1025
+#: incidenceformatter.cpp:1908
+msgid "Sender declines the counter proposal"
+msgstr ""
+
+#: incidenceformatter.cpp:1924
 msgid "This free/busy list has been published"
 msgstr ""
 
-#: incidenceformatter.cpp:1027
+#: incidenceformatter.cpp:1926
 msgid "The free/busy list has been requested"
 msgstr ""
 
-#: incidenceformatter.cpp:1029
+#: incidenceformatter.cpp:1928
 msgid "This free/busy list was refreshed"
 msgstr ""
 
-#: incidenceformatter.cpp:1031
+#: incidenceformatter.cpp:1930
 msgid "This free/busy list was canceled"
 msgstr ""
 
-#: incidenceformatter.cpp:1033
+#: incidenceformatter.cpp:1932
 msgid "Addition to the free/busy list"
 msgstr ""
 
-#: incidenceformatter.cpp:1036
+#: incidenceformatter.cpp:1935
 msgid "Error: Free/Busy iMIP message with unknown method: '%1'"
 msgstr ""
 
-#: incidenceformatter.cpp:1155
+#: incidenceformatter.cpp:1948
+msgid "Assignees"
+msgstr ""
+
+#: incidenceformatter.cpp:1984
+#, fuzzy
+msgid ""
+"_: No attendee\n"
+"None"
+msgstr "ਕੋਈ ਨਹੀਂ"
+
+#: incidenceformatter.cpp:1999
+msgid "Attached Documents:"
+msgstr ""
+
+#: incidenceformatter.cpp:2158
+#, fuzzy
+msgid "The invitation starting time has been changed from %1 to %2"
+msgstr "ਮੀਟਿੰਗ ਨੂੰ ਰੱਦ ਕਰ ਦਿੱਤਾ ਗਿਆ ਸੀ"
+
+#: incidenceformatter.cpp:2161
 #, fuzzy
-msgid "The begin of the meeting has been changed from %1 to %2"
+msgid "The invitation ending time has been changed from %1 to %2"
 msgstr "ਮੀਟਿੰਗ ਨੂੰ ਰੱਦ ਕਰ ਦਿੱਤਾ ਗਿਆ ਸੀ"
 
-#: incidenceformatter.cpp:1158
+#: incidenceformatter.cpp:2172
+#, fuzzy
+msgid "The task has been completed"
+msgstr "ਇਹ ਕੰਮ ਪ੍ਰਕਾਸ਼ਿਤ ਕੀਤਾ ਜਾਵੇਗਾ"
+
+#: incidenceformatter.cpp:2175
+msgid "The task is no longer completed"
+msgstr ""
+
+#: incidenceformatter.cpp:2180
 #, fuzzy
-msgid "The end of the meeting has been changed from %1 to %2"
+msgid "The task completed percentage has changed from %1 to %2"
 msgstr "ਮੀਟਿੰਗ ਨੂੰ ਰੱਦ ਕਰ ਦਿੱਤਾ ਗਿਆ ਸੀ"
 
-#: incidenceformatter.cpp:1167
+#: incidenceformatter.cpp:2185
+msgid "A task starting time has been added"
+msgstr ""
+
+#: incidenceformatter.cpp:2188
+#, fuzzy
+msgid "The task starting time has been removed"
+msgstr "ਮੀਟਿੰਗ ਨੂੰ ਰੱਦ ਕਰ ਦਿੱਤਾ ਗਿਆ ਸੀ"
+
+#: incidenceformatter.cpp:2192
+#, fuzzy
+msgid "The task starting time has been changed from %1 to %2"
+msgstr "ਮੀਟਿੰਗ ਨੂੰ ਰੱਦ ਕਰ ਦਿੱਤਾ ਗਿਆ ਸੀ"
+
+#: incidenceformatter.cpp:2198
+#, fuzzy
+msgid "A task due time has been added"
+msgstr "ਇਹ ਕੰਮ ਪ੍ਰਕਾਸ਼ਿਤ ਕੀਤਾ ਜਾਵੇਗਾ"
+
+#: incidenceformatter.cpp:2201
+#, fuzzy
+msgid "The task due time has been removed"
+msgstr "ਇਹ ਕੰਮ ਪ੍ਰਕਾਸ਼ਿਤ ਕੀਤਾ ਜਾਵੇਗਾ"
+
+#: incidenceformatter.cpp:2205
+#, fuzzy
+msgid "The task due time has been changed from %1 to %2"
+msgstr "ਮੀਟਿੰਗ ਨੂੰ ਰੱਦ ਕਰ ਦਿੱਤਾ ਗਿਆ ਸੀ"
+
+#: incidenceformatter.cpp:2216
 msgid "The summary has been changed to: \"%1\""
 msgstr ""
 
-#: incidenceformatter.cpp:1169
+#: incidenceformatter.cpp:2218
 #, fuzzy
 msgid "The location has been changed to: \"%1\""
 msgstr "ਮੀਟਿੰਗ ਨੂੰ ਰੱਦ ਕਰ ਦਿੱਤਾ ਗਿਆ ਸੀ"
 
-#: incidenceformatter.cpp:1171
+#: incidenceformatter.cpp:2220
 #, fuzzy
 msgid "The description has been changed to: \"%1\""
 msgstr "ਮੀਟਿੰਗ ਨੂੰ ਰੱਦ ਕਰ ਦਿੱਤਾ ਗਿਆ ਸੀ"
 
-#: incidenceformatter.cpp:1177
+#: incidenceformatter.cpp:2227
 msgid "Attendee %1 has been added"
 msgstr ""
 
-#: incidenceformatter.cpp:1180
+#: incidenceformatter.cpp:2230
 msgid "The status of attendee %1 has been changed to: %2"
 msgstr ""
 
-#: incidenceformatter.cpp:1187
+#: incidenceformatter.cpp:2240
 msgid "Attendee %1 has been removed"
 msgstr ""
 
-#: incidenceformatter.cpp:1279
-msgid ""
-"<p align=\"left\">The following changes have been made by the organizer:</p>"
+#: incidenceformatter.cpp:2304
+msgid "[Record]"
 msgstr ""
 
-#: incidenceformatter.cpp:1288 incidenceformatter.cpp:1307
-#: incidenceformatter.cpp:1352
-msgid "[Enter this into my calendar]"
+#: incidenceformatter.cpp:2309
+msgid "[Move to Trash]"
 msgstr ""
 
-#: incidenceformatter.cpp:1304 incidenceformatter.cpp:1350
-msgid "[Enter this into my task list]"
-msgstr ""
-
-#: incidenceformatter.cpp:1315 incidenceformatter.cpp:1357
+#: incidenceformatter.cpp:2316 incidenceformatter.cpp:2367
 msgid "[Accept]"
 msgstr "[ਸਵੀਕਾਰ]"
 
-#: incidenceformatter.cpp:1318
+#: incidenceformatter.cpp:2322
 msgid ""
 "_: Accept conditionally\n"
 "[Accept cond.]"
 msgstr "[ਸਵੀਕਾਰ ਸ਼ਰਤ]"
 
-#: incidenceformatter.cpp:1321
+#: incidenceformatter.cpp:2327
 msgid "[Counter proposal]"
 msgstr ""
 
-#: incidenceformatter.cpp:1324 incidenceformatter.cpp:1359
+#: incidenceformatter.cpp:2332 incidenceformatter.cpp:2372
 msgid "[Decline]"
 msgstr "[ਨਾ-ਮਨਜ਼ੂਰ]"
 
-#: incidenceformatter.cpp:1328
+#: incidenceformatter.cpp:2339
 #, fuzzy
 msgid "[Delegate]"
 msgstr "ਪ੍ਰਤੀਨਿਧੀ"
 
-#: incidenceformatter.cpp:1332
+#: incidenceformatter.cpp:2344
 msgid "[Forward]"
 msgstr ""
 
-#: incidenceformatter.cpp:1336 incidenceformatter.cpp:1361
+#: incidenceformatter.cpp:2350 incidenceformatter.cpp:2378
 msgid "[Check my calendar]"
 msgstr ""
 
-#: incidenceformatter.cpp:1344
-msgid "[Remove this from my calendar]"
+#: incidenceformatter.cpp:2452
+msgid "The following changes have been made by the organizer:"
 msgstr ""
 
-#: incidenceformatter.cpp:1707
+#: incidenceformatter.cpp:2462
+msgid "The following changes have been made by %1:"
+msgstr ""
+
+#: incidenceformatter.cpp:2464
+msgid "The following changes have been made by an attendee:"
+msgstr ""
+
+#: incidenceformatter.cpp:2516
+msgid "Your <b>%1</b> response has already been recorded"
+msgstr ""
+
+#: incidenceformatter.cpp:2519
+msgid "Your status for this invitation is <b>%1</b>"
+msgstr ""
+
+#: incidenceformatter.cpp:2524
+#, fuzzy
+msgid "This invitation was declined"
+msgstr "ਇਹ ਸੱਦਾ ਤਾਜ਼ਾ ਕੀਤਾ ਗਿਆ ਸੀ"
+
+#: incidenceformatter.cpp:2526
+#, fuzzy
+msgid "This invitation was accepted"
+msgstr "ਇਹ ਸੱਦਾ ਤਾਜ਼ਾ ਕੀਤਾ ਗਿਆ ਸੀ"
+
+#: incidenceformatter.cpp:2531
+msgid "Awaiting delegation response"
+msgstr ""
+
+#: incidenceformatter.cpp:2564
+msgid "[Record invitation in my task list]"
+msgstr ""
+
+#: incidenceformatter.cpp:2567
+msgid "[Record invitation in my calendar]"
+msgstr ""
+
+#: incidenceformatter.cpp:2584
+msgid "[Remove invitation from my task list]"
+msgstr ""
+
+#: incidenceformatter.cpp:2587
+msgid "[Remove invitation from my calendar]"
+msgstr ""
+
+#: incidenceformatter.cpp:2630
+#, fuzzy
+msgid "The response has been recorded [%1]"
+msgstr "ਮੀਟਿੰਗ ਨੂੰ ਰੱਦ ਕਰ ਦਿੱਤਾ ਗਿਆ ਸੀ"
+
+#: incidenceformatter.cpp:2637
+msgid "[Record response in my task list]"
+msgstr ""
+
+#: incidenceformatter.cpp:2639
+msgid "[Record response in my calendar]"
+msgstr ""
+
+#: incidenceformatter.cpp:3026
 msgid "Reminder"
 msgstr "ਯਾਦ-ਪੱਤਰ"
 
-#: incidenceformatter.cpp:1876
+#: incidenceformatter.cpp:3219
 #, c-format
 msgid ""
 "_: Event start\n"
 "<i>From:</i>&nbsp;%1"
 msgstr "<i>ਵਲੋਂ:</i>&nbsp;%1"
 
-#: incidenceformatter.cpp:1882
+#: incidenceformatter.cpp:3225
 #, c-format
 msgid ""
 "_: Event end\n"
 "<i>To:</i>&nbsp;%1"
 msgstr "<i>ਵੱਲ:</i>&nbsp;%1"
 
-#: incidenceformatter.cpp:1890 incidenceformatter.cpp:1940
+#: incidenceformatter.cpp:3233 incidenceformatter.cpp:3314
 #, c-format
 msgid "<i>Date:</i>&nbsp;%1"
 msgstr "<i>ਮਿਤੀ:</i>&nbsp;%1"
 
-#: incidenceformatter.cpp:1897
+#: incidenceformatter.cpp:3242
 #, c-format
 msgid ""
 "_: time for event, &nbsp; to prevent ugly line breaks\n"
 "<i>Time:</i>&nbsp;%1"
 msgstr "<i>ਸਮਾਂ:</i>&nbsp;%1"
 
-#: incidenceformatter.cpp:1901
+#: incidenceformatter.cpp:3246
 msgid ""
 "_: time range for event, &nbsp; to prevent ugly line breaks\n"
 "<i>Time:</i>&nbsp;%1&nbsp;-&nbsp;%2"
 msgstr "<i>ਸਮਾਂ:</i>&nbsp;%1&nbsp;-&nbsp;%2"
 
-#: incidenceformatter.cpp:1919
+#: incidenceformatter.cpp:3269
 #, c-format
 msgid "<i>Start:</i>&nbsp;%1"
 msgstr "<i>ਸ਼ੁਰੂ:</i>&nbsp;%1"
 
-#: incidenceformatter.cpp:1924
+#: incidenceformatter.cpp:3284
 #, c-format
 msgid "<i>Due:</i>&nbsp;%1"
 msgstr ""
 
-#: incidenceformatter.cpp:1929
-#, c-format
-msgid "<i>Completed:</i>&nbsp;%1"
-msgstr "<i>ਮੁਕੰਮਲ:</i>&nbsp;%1"
-
-#: incidenceformatter.cpp:1931
-msgid "%1 % completed"
-msgstr "%1 % ਮੁਕੰਮਲ"
-
-#: incidenceformatter.cpp:1947 incidenceformatter.cpp:1949
+#: incidenceformatter.cpp:3322 incidenceformatter.cpp:3324
 #, c-format
 msgid "<i>Period start:</i>&nbsp;%1"
 msgstr "<i>ਸ਼ੁਰੂ ਸਮਾਂ:</i>&nbsp;%1"
 
-#: incidenceformatter.cpp:1994
-#, c-format
-msgid "<i>Location:</i>&nbsp;%1"
-msgstr "<i>ਸਥਿਤੀ:</i>&nbsp;%1"
+#: incidenceformatter.cpp:3380
+msgid ""
+"_: elipsis\n"
+"..."
+msgstr ""
 
-#: incidenceformatter.cpp:2002
-msgid "<i>Description:</i><br>"
-msgstr "<i>ਵੇਰਵਾ:</i><br>"
+#: incidenceformatter.cpp:3384
+msgid ""
+"_: separator for lists of people names\n"
+", "
+msgstr ""
 
-#: incidenceformatter.cpp:2040
+#: incidenceformatter.cpp:3581
 msgid "This is a Free Busy Object"
 msgstr ""
 
-#: incidenceformatter.cpp:2050
+#: incidenceformatter.cpp:3591
 msgid ""
 "Summary: %1\n"
 msgstr ""
 "ਸੰਖੇਪ: %1\n"
 
-#: incidenceformatter.cpp:2053
+#: incidenceformatter.cpp:3594
 msgid ""
 "Organizer: %1\n"
 msgstr ""
 "ਪ੍ਰਬੰਧਕ: %1\n"
 
-#: incidenceformatter.cpp:2056
+#: incidenceformatter.cpp:3597
 msgid ""
 "Location: %1\n"
 msgstr ""
 "ਸਥਿਤੀ: %1\n"
 
-#: incidenceformatter.cpp:2063
+#: incidenceformatter.cpp:3604
 msgid ""
 "_: no recurrence\n"
 "None"
 msgstr "ਕੋਈ ਨਹੀਂ"
 
-#: incidenceformatter.cpp:2064
+#: incidenceformatter.cpp:3605
 msgid "Minutely"
 msgstr "ਮਿੰਟਵਾਰ"
 
-#: incidenceformatter.cpp:2064
+#: incidenceformatter.cpp:3605
 msgid "Hourly"
 msgstr "ਘੰਟੇਵਾਰ"
 
-#: incidenceformatter.cpp:2064
+#: incidenceformatter.cpp:3605
 msgid "Daily"
 msgstr "ਰੋਜ਼"
 
-#: incidenceformatter.cpp:2065
+#: incidenceformatter.cpp:3606
 msgid "Weekly"
 msgstr "ਹਫਤਾਵਾਰੀ"
 
-#: incidenceformatter.cpp:2065
+#: incidenceformatter.cpp:3606
 msgid "Monthly Same Day"
 msgstr "ਮਹੀਨਾਵਾਰ ਇਸੇ ਦਿਨ"
 
-#: incidenceformatter.cpp:2065
+#: incidenceformatter.cpp:3606
 msgid "Monthly Same Position"
 msgstr "ਮਹੀਨਾਵਾਰ ਇਸੇ ਸਥਿਤੀ ਤੇ"
 
-#: incidenceformatter.cpp:2066
+#: incidenceformatter.cpp:3607
 msgid "Yearly"
 msgstr "ਸਾਲਨਾ"
 
-#: incidenceformatter.cpp:2069 incidenceformatter.cpp:2117
+#: incidenceformatter.cpp:3610 incidenceformatter.cpp:3671
 msgid ""
 "Start Date: %1\n"
 msgstr ""
 "ਸ਼ੁਰੂਆਤ ਮਿਤੀ: %1\n"
 
-#: incidenceformatter.cpp:2071 incidenceformatter.cpp:2119
+#: incidenceformatter.cpp:3613 incidenceformatter.cpp:3674
 msgid ""
 "Start Time: %1\n"
 msgstr ""
 "ਸ਼ੁਰੂਆਤ ਸਮਾਂ: %1\n"
 
-#: incidenceformatter.cpp:2074
+#: incidenceformatter.cpp:3617
 msgid ""
 "End Date: %1\n"
 msgstr ""
 "ਅੰਤ ਮਿਤੀ: %1\n"
 
-#: incidenceformatter.cpp:2077
+#: incidenceformatter.cpp:3621
 msgid ""
 "End Time: %1\n"
 msgstr ""
 "ਅੰਤ ਸਮਾਂ: %1\n"
 
-#: incidenceformatter.cpp:2082
+#: incidenceformatter.cpp:3627
 msgid ""
 "Recurs: %1\n"
 msgstr ""
 "ਦੁਹਰਾਉ: %1\n"
 
-#: incidenceformatter.cpp:2084
+#: incidenceformatter.cpp:3629
 msgid ""
 "Frequency: %1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2088
+#: incidenceformatter.cpp:3633
 #, c-format
 msgid ""
 "_n: Repeats once\n"
@@ -1064,18 +1470,29 @@ msgstr ""
 "ਇੱਕ ਵਾਰ ਦੁਹਰਾਓ\n"
 "%n ਵਾਰ ਦੁਹਰਾਓ"
 
-#: incidenceformatter.cpp:2099
+#: incidenceformatter.cpp:3644
 msgid ""
 "Repeat until: %1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2101
+#: incidenceformatter.cpp:3646
 msgid ""
 "Repeats forever\n"
 msgstr ""
 "ਹਮੇਸ਼ਾ ਦੁਹਰਾਉ\n"
 
-#: incidenceformatter.cpp:2107 incidenceformatter.cpp:2130
+#: incidenceformatter.cpp:3652
+#, fuzzy
+msgid ""
+"This recurring meeting has been cancelled on the following days:\n"
+msgstr "ਮੀਟਿੰਗ ਨੂੰ ਰੱਦ ਕਰ ਦਿੱਤਾ ਗਿਆ ਸੀ"
+
+#: incidenceformatter.cpp:3655
+msgid ""
+"  %1\n"
+msgstr ""
+
+#: incidenceformatter.cpp:3661 incidenceformatter.cpp:3688
 msgid ""
 "Details:\n"
 "%1\n"
@@ -1083,48 +1500,298 @@ msgstr ""
 "ਵੇਰਵਾ:\n"
 "%1\n"
 
-#: incidenceformatter.cpp:2123
+#: incidenceformatter.cpp:3679
 msgid ""
 "Due Date: %1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2125
+#: incidenceformatter.cpp:3682
 msgid ""
 "Due Time: %1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2138
+#: incidenceformatter.cpp:3696
 #, fuzzy
 msgid ""
 "Date: %1\n"
 msgstr ""
 "ਅੰਤ ਮਿਤੀ: %1\n"
 
-#: incidenceformatter.cpp:2140
+#: incidenceformatter.cpp:3699
 #, fuzzy
 msgid ""
 "Time: %1\n"
 msgstr ""
 "ਅੰਤ ਸਮਾਂ: %1\n"
 
-#: incidenceformatter.cpp:2143
+#: incidenceformatter.cpp:3703
 msgid ""
 "Text of the journal:\n"
 "%1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2175 incidenceformatter.cpp:2180
+#: incidenceformatter.cpp:3738 incidenceformatter.cpp:3811
 #, fuzzy
 msgid "No recurrence"
 msgstr "ਕੋਈ ਨਹੀਂ"
 
-#: incidenceformatter.cpp:2183
+#: incidenceformatter.cpp:3741
+msgid "31st Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3742
+msgid "30th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3743
+msgid "29th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3744
+msgid "28th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3745
+msgid "27th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3746
+msgid "26th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3747
+msgid "25th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3748
+msgid "24th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3749
+msgid "23rd Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3750
+msgid "22nd Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3751
+msgid "21st Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3752
+msgid "20th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3753
+msgid "19th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3754
+msgid "18th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3755
+msgid "17th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3756
+msgid "16th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3757
+msgid "15th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3758
+msgid "14th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3759
+msgid "13th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3760
+msgid "12th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3761
+msgid "11th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3762
+msgid "10th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3763
+msgid "9th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3764
+msgid "8th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3765
+msgid "7th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3766
+msgid "6th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3767
+msgid "5th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3768
+msgid "4th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3769
+msgid "3rd Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3770
+msgid "2nd Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3771
 msgid ""
-"_n: Recurs every minute until %1\n"
-"Recurs every %n minutes until %1"
+"_: last day of the month\n"
+"Last"
 msgstr ""
 
-#: incidenceformatter.cpp:2185
+#: incidenceformatter.cpp:3772
+msgid ""
+"_: unknown day of the month\n"
+"unknown"
+msgstr ""
+
+#: incidenceformatter.cpp:3773
+msgid "1st"
+msgstr ""
+
+#: incidenceformatter.cpp:3774
+msgid "2nd"
+msgstr ""
+
+#: incidenceformatter.cpp:3775
+msgid "3rd"
+msgstr ""
+
+#: incidenceformatter.cpp:3776
+msgid "4th"
+msgstr ""
+
+#: incidenceformatter.cpp:3777
+msgid "5th"
+msgstr ""
+
+#: incidenceformatter.cpp:3778
+msgid "6th"
+msgstr ""
+
+#: incidenceformatter.cpp:3779
+msgid "7th"
+msgstr ""
+
+#: incidenceformatter.cpp:3780
+msgid "8th"
+msgstr ""
+
+#: incidenceformatter.cpp:3781
+msgid "9th"
+msgstr ""
+
+#: incidenceformatter.cpp:3782
+msgid "10th"
+msgstr ""
+
+#: incidenceformatter.cpp:3783
+msgid "11th"
+msgstr ""
+
+#: incidenceformatter.cpp:3784
+msgid "12th"
+msgstr ""
+
+#: incidenceformatter.cpp:3785
+msgid "13th"
+msgstr ""
+
+#: incidenceformatter.cpp:3786
+msgid "14th"
+msgstr ""
+
+#: incidenceformatter.cpp:3787
+msgid "15th"
+msgstr ""
+
+#: incidenceformatter.cpp:3788
+msgid "16th"
+msgstr ""
+
+#: incidenceformatter.cpp:3789
+msgid "17th"
+msgstr ""
+
+#: incidenceformatter.cpp:3790
+msgid "18th"
+msgstr ""
+
+#: incidenceformatter.cpp:3791
+msgid "19th"
+msgstr ""
+
+#: incidenceformatter.cpp:3792
+msgid "20th"
+msgstr ""
+
+#: incidenceformatter.cpp:3793
+msgid "21st"
+msgstr ""
+
+#: incidenceformatter.cpp:3794
+msgid "22nd"
+msgstr ""
+
+#: incidenceformatter.cpp:3795
+msgid "23rd"
+msgstr ""
+
+#: incidenceformatter.cpp:3796
+msgid "24th"
+msgstr ""
+
+#: incidenceformatter.cpp:3797
+msgid "25th"
+msgstr ""
+
+#: incidenceformatter.cpp:3798
+msgid "26th"
+msgstr ""
+
+#: incidenceformatter.cpp:3799
+msgid "27th"
+msgstr ""
+
+#: incidenceformatter.cpp:3800
+msgid "28th"
+msgstr ""
+
+#: incidenceformatter.cpp:3801
+msgid "29th"
+msgstr ""
+
+#: incidenceformatter.cpp:3802
+msgid "30th"
+msgstr ""
+
+#: incidenceformatter.cpp:3803
+msgid "31st"
+msgstr ""
+
+#: incidenceformatter.cpp:3814
 #, fuzzy, c-format
 msgid ""
 "_n: Recurs every minute\n"
@@ -1133,13 +1800,21 @@ msgstr ""
 "1 ਮਿੰਟ\n"
 "%n ਮਿੰਟ"
 
-#: incidenceformatter.cpp:2188
-msgid ""
-"_n: Recurs hourly until %1\n"
-"Recurs every %n hours until %1"
+#: incidenceformatter.cpp:3816 incidenceformatter.cpp:3827
+#: incidenceformatter.cpp:3839
+msgid "%1 until %2"
 msgstr ""
 
-#: incidenceformatter.cpp:2190
+#: incidenceformatter.cpp:3818 incidenceformatter.cpp:3829
+#: incidenceformatter.cpp:3841 incidenceformatter.cpp:3868
+#: incidenceformatter.cpp:3888 incidenceformatter.cpp:3914
+#: incidenceformatter.cpp:3937 incidenceformatter.cpp:3974
+#: incidenceformatter.cpp:3998
+#, fuzzy
+msgid " (%1 occurrences)"
+msgstr "ਕੋਈ ਨਹੀਂ"
+
+#: incidenceformatter.cpp:3825
 #, fuzzy, c-format
 msgid ""
 "_n: Recurs hourly\n"
@@ -1148,54 +1823,211 @@ msgstr ""
 "1 ਘੰਟਾ \n"
 "%n ਘੰਟੇ "
 
-#: incidenceformatter.cpp:2193
+#: incidenceformatter.cpp:3836
+#, c-format
 msgid ""
-"_n: Recurs daily until %1\n"
-"Recurs every %n days until %1"
+"_n: Recurs daily\n"
+"Recurs every %n days"
 msgstr ""
 
-#: incidenceformatter.cpp:2195
+#: incidenceformatter.cpp:3849
 #, c-format
 msgid ""
-"_n: Recurs daily\n"
-"Recurs every %n days"
+"_n: Recurs weekly\n"
+"Recurs every %n weeks"
 msgstr ""
 
-#: incidenceformatter.cpp:2198
+#: incidenceformatter.cpp:3855
 msgid ""
-"_n: Recurs weekly until %1\n"
-"Recurs every %n weeks until %1"
+"_: separator for list of days\n"
+", "
 msgstr ""
 
-#: incidenceformatter.cpp:2200
-#, c-format
+#: incidenceformatter.cpp:3862
 msgid ""
-"_n: Recurs weekly\n"
-"Recurs every %n weeks"
+"_: Recurs weekly on no days\n"
+"no days"
 msgstr ""
 
-#: incidenceformatter.cpp:2204
-#, c-format
-msgid "Recurs monthly until %1"
+#: incidenceformatter.cpp:3865
+msgid "%1 on %2 until %3"
 msgstr ""
 
-#: incidenceformatter.cpp:2205
-msgid "Recurs monthly"
+#: incidenceformatter.cpp:3872
+msgid "%1 on %2"
+msgstr ""
+
+#: incidenceformatter.cpp:3877 incidenceformatter.cpp:3904
+#, fuzzy, c-format
+msgid ""
+"_n: Recurs monthly\n"
+"Recurs every %n months"
+msgstr ""
+"1 ਘੰਟਾ \n"
+"%n ਘੰਟੇ "
+
+#: incidenceformatter.cpp:3882
+msgid "%1 on the %2 %3 until %4"
+msgstr ""
+
+#: incidenceformatter.cpp:3892
+msgid "%1 on the %2 %3"
+msgstr ""
+
+#: incidenceformatter.cpp:3909
+msgid "%1 on the %2 day until %3"
+msgstr ""
+
+#: incidenceformatter.cpp:3918
+msgid "%1 on the %2 day"
+msgstr ""
+
+#: incidenceformatter.cpp:3927 incidenceformatter.cpp:3966
+#, fuzzy, c-format
+msgid ""
+"_n: Recurs yearly\n"
+"Recurs every %n years"
+msgstr ""
+"1 ਘੰਟਾ \n"
+"%n ਘੰਟੇ "
+
+#: incidenceformatter.cpp:3931
+msgid "%1 on %2 %3 until %4"
+msgstr ""
+
+#: incidenceformatter.cpp:3943
+msgid "%1 on %2 %3"
 msgstr ""
 
-#: incidenceformatter.cpp:2210
+#: incidenceformatter.cpp:3950 incidenceformatter.cpp:3955
+msgid "Recurs yearly on %1 %2"
+msgstr ""
+
+#: incidenceformatter.cpp:3969
+msgid "%1 on day %2 until %3"
+msgstr ""
+
+#: incidenceformatter.cpp:3978
+msgid "%1 on day %2"
+msgstr ""
+
+#: incidenceformatter.cpp:3987
 #, c-format
-msgid "Recurs yearly until %1"
+msgid ""
+"_n: Every year\n"
+"Every %n years"
 msgstr ""
 
-#: incidenceformatter.cpp:2211
-msgid "Recurs yearly"
+#: incidenceformatter.cpp:3991
+msgid "%1 on the %2 %3 of %4 until %5"
 msgstr ""
 
-#: incidenceformatter.cpp:2213
+#: incidenceformatter.cpp:4002
+msgid "%1 on the %2 %3 of %4"
+msgstr ""
+
+#: incidenceformatter.cpp:4015
 msgid "Incidence recurs"
 msgstr ""
 
+#: incidenceformatter.cpp:4071 incidenceformatter.cpp:4097
+#: incidenceformatter.cpp:4110
+#, fuzzy, c-format
+msgid ""
+"_n: 1 day\n"
+"%n days"
+msgstr ""
+"1 ਸਕਿੰਟ\n"
+"%n ਸਕਿੰਟ"
+
+#: incidenceformatter.cpp:4077
+#, fuzzy, c-format
+msgid ""
+"_n: 1 hour\n"
+"%n hours"
+msgstr ""
+"1 ਘੰਟਾ \n"
+"%n ਘੰਟੇ "
+
+#: incidenceformatter.cpp:4083
+#, fuzzy, c-format
+msgid ""
+"_n: 1 minute\n"
+"%n minutes"
+msgstr ""
+"1 ਮਿੰਟ\n"
+"%n ਮਿੰਟ"
+
+#: incidenceformatter.cpp:4101
+#, fuzzy
+msgid "forever"
+msgstr "ਕਦੇ ਨਹੀਂ"
+
+#: incidenceformatter.cpp:4143
+msgid ""
+"_: N days/hours/minutes before the start datetime\n"
+"%1 before the start"
+msgstr ""
+
+#: incidenceformatter.cpp:4146
+msgid ""
+"_: N days/hours/minutes after the start datetime\n"
+"%1 after the start"
+msgstr ""
+
+#: incidenceformatter.cpp:4158
+msgid ""
+"_: N days/hours/minutes before the due datetime\n"
+"%1 before the to-do is due"
+msgstr ""
+
+#: incidenceformatter.cpp:4161
+msgid ""
+"_: N days/hours/minutes before the end datetime\n"
+"%1 before the end"
+msgstr ""
+
+#: incidenceformatter.cpp:4166
+msgid ""
+"_: N days/hours/minutes after the due datetime\n"
+"%1 after the to-do is due"
+msgstr ""
+
+#: incidenceformatter.cpp:4169
+msgid ""
+"_: N days/hours/minutes after the end datetime\n"
+"%1 after the end"
+msgstr ""
+
+#: incidenceformatter.cpp:4187
+#, c-format
+msgid ""
+"_: reminder occurs at datetime\n"
+"at %1"
+msgstr ""
+
+#: incidenceformatter.cpp:4194
+#, fuzzy, c-format
+msgid ""
+"_n: repeats once\n"
+"repeats %n times"
+msgstr ""
+"ਇੱਕ ਵਾਰ ਦੁਹਰਾਓ\n"
+"%n ਵਾਰ ਦੁਹਰਾਓ"
+
+#: incidenceformatter.cpp:4195
+#, c-format
+msgid ""
+"_: interval is N days/hours/minutes\n"
+"interval is %1"
+msgstr ""
+
+#: incidenceformatter.cpp:4197
+msgid ""
+"_: (repeat string, interval string)\n"
+"(%1, %2)"
+msgstr ""
+
 #: qtopiaformat.cpp:297
 msgid "Could not open file '%1'"
 msgstr "ਫਾਇਲ '%1' ਨੂੰ ਖੋਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
@@ -1412,12 +2244,12 @@ msgstr ""
 msgid "Title of the free/busy list"
 msgstr ""
 
-#: resourcecached.cpp:630
+#: resourcecached.cpp:691
 #, c-format
 msgid "Last loaded: %1"
 msgstr ""
 
-#: resourcecached.cpp:635
+#: resourcecached.cpp:696
 #, c-format
 msgid "Last saved: %1"
 msgstr ""
@@ -1459,25 +2291,21 @@ msgstr "ਤਬਦੀਲੀਆਂ ਵਿੱਚ ਦੇਰੀ"
 msgid "On every change"
 msgstr "ਹਰ ਤਬਦੀਲੀ ਤੇ"
 
-#: resourcecalendar.cpp:57
+#: resourcecalendar.cpp:77
 #, c-format
 msgid "Type: %1"
 msgstr "ਕਿਸਮ: %1"
 
-#: resourcecalendar.cpp:149
+#: resourcecalendar.cpp:175
 msgid ""
 "Error while loading %1.\n"
 msgstr ""
 
-#: resourcecalendar.cpp:186
+#: resourcecalendar.cpp:212
 msgid ""
 "Error while saving %1.\n"
 msgstr ""
 
-#: resourcelocalconfig.cpp:49 resourcelocaldirconfig.cpp:47
-msgid "Location:"
-msgstr "ਟਿਕਾਣਾ:"
-
 #: resourcelocalconfig.cpp:54
 msgid "Calendar Format"
 msgstr "ਕੈਲੰਡਰ ਫਾਰਮਿਟ"
@@ -1497,80 +2325,194 @@ msgid ""
 "resource properties."
 msgstr ""
 
-#: scheduler.cpp:50
+#: resourcelocaldirconfig.cpp:72
+msgid "No location specified.  The calendar will be read-only."
+msgstr ""
+
+#: scheduler.cpp:53
 msgid "Updated Publish"
 msgstr ""
 
-#: scheduler.cpp:52 scheduler.cpp:154
+#: scheduler.cpp:55 scheduler.cpp:160
 msgid "Publish"
 msgstr "ਪ੍ਰਕਾਸ਼ਿਤ"
 
-#: scheduler.cpp:54
+#: scheduler.cpp:57
 msgid "Obsolete"
 msgstr "ਹਟਾਏ"
 
-#: scheduler.cpp:56
+#: scheduler.cpp:59
 msgid "New Request"
 msgstr "ਨਵੀਂ ਬੇਨਤੀ"
 
-#: scheduler.cpp:58
+#: scheduler.cpp:61
 msgid "Updated Request"
 msgstr "ਬੇਨਤੀ ਦਾ ਨਵੀਨੀਕਰਨ"
 
-#: scheduler.cpp:60
+#: scheduler.cpp:63
 #, c-format
 msgid "Unknown Status: %1"
 msgstr ""
 
-#: scheduler.cpp:156
+#: scheduler.cpp:162
 msgid "Request"
 msgstr "ਬੇਨਤੀ"
 
-#: scheduler.cpp:158
+#: scheduler.cpp:164
 msgid "Refresh"
 msgstr "ਤਾਜ਼ਾ"
 
-#: scheduler.cpp:164
+#: scheduler.cpp:170
 msgid "Reply"
 msgstr "ਜਵਾਬ"
 
-#: scheduler.cpp:166
+#: scheduler.cpp:172
 msgid ""
 "_: counter proposal\n"
 "Counter"
 msgstr ""
 
-#: scheduler.cpp:168
+#: scheduler.cpp:174
 msgid ""
 "_: decline counter proposal\n"
 "Decline Counter"
 msgstr ""
 
-#: scheduler.cpp:170
+#: scheduler.cpp:176
 msgid "Unknown"
 msgstr "ਅਣਜਾਣ"
 
-#: scheduler.cpp:341
+#: scheduler.cpp:310
+msgid ""
+"<qt>You accepted an invitation update, but an earlier version of the item could "
+"not be found in your calendar."
+"<p>This may have occurred because:"
+"<ul>"
+"<li>the organizer did not include you in the original invitation</li>"
+"<li>you did not accept the original invitation yet</li>"
+"<li>you deleted the original invitation from your calendar</li>"
+"<li>you no longer have access to the calendar containing the invitation</li>"
+"</ul>This is not a problem, but we thought you should know.</qt>"
+msgstr ""
+
+#: scheduler.cpp:320
+msgid "Cannot find invitation to be updated"
+msgstr ""
+
+#: scheduler.cpp:329
+msgid "No calendars found, unable to save the invitation."
+msgstr ""
+
+#: scheduler.cpp:357
+msgid ""
+"You canceled the save operation. Therefore, the appointment will not be stored "
+"in your calendar even though you accepted the invitation. Are you certain you "
+"want to discard this invitation? "
+msgstr ""
+
+#: scheduler.cpp:360
+msgid "Discard this invitation?"
+msgstr ""
+
+#: scheduler.cpp:361
+msgid "Go Back to Folder Selection"
+msgstr ""
+
+#: scheduler.cpp:364
+msgid ""
+"The invitation \"%1\" was not saved to your calendar but you are still listed "
+"as an attendee for that appointment.\n"
+"If you mistakenly accepted the invitation or do not plan to attend, please "
+"notify the organizer %2 and ask them to remove you from the attendee list."
+msgstr ""
+
+#: scheduler.cpp:380
+msgid "Unable to save %1 \"%2\"."
+msgstr ""
+
+#: scheduler.cpp:487
+msgid ""
+"The event or task could not be removed from your calendar. Maybe it has already "
+"been deleted or is not owned by you. Or it might belong to a read-only or "
+"disabled calendar."
+msgstr ""
+
+#: scheduler.cpp:520
+msgid ""
+"The event or task to be canceled could not be removed from your calendar. Maybe "
+"it has already been deleted or is not owned by you. Or it might belong to a "
+"read-only or disabled calendar."
+msgstr ""
+
+#: scheduler.cpp:593
 msgid "%1 wants to attend %2 but was not invited."
 msgstr ""
 
-#: scheduler.cpp:344
+#: scheduler.cpp:596
 msgid "%1 wants to attend %2 on behalf of %3."
 msgstr ""
 
-#: scheduler.cpp:347
+#: scheduler.cpp:599
 msgid "Uninvited attendee"
 msgstr ""
 
-#: scheduler.cpp:348
+#: scheduler.cpp:600
 #, fuzzy
 msgid "Accept Attendance"
 msgstr "ਸਵੀਕਾਰ"
 
-#: scheduler.cpp:348
+#: scheduler.cpp:600
 msgid "Reject Attendance"
 msgstr ""
 
-#: scheduler.cpp:353
+#: scheduler.cpp:605
 msgid "The organizer rejected your attendance at this meeting."
 msgstr ""
+
+#: scheduler.cpp:627
+msgid ""
+"An attendee was added to the incidence. Do you want to email the attendees an "
+"update message?"
+msgstr ""
+
+#: scheduler.cpp:629
+#, fuzzy
+msgid "Attendee Added"
+msgstr "ਸਰੋਤਾ"
+
+#: scheduler.cpp:629
+msgid "Send Messages"
+msgstr ""
+
+#: scheduler.cpp:630
+msgid "Do Not Send"
+msgstr ""
+
+#, fuzzy
+#~ msgid "Date"
+#~ msgstr "ਮਿਆਦ"
+
+#, fuzzy
+#~ msgid "Description"
+#~ msgstr "ਵੇਰਵਾ:"
+
+#~ msgid "Unspecified"
+#~ msgstr "ਨਾ-ਪ੍ਰਭਾਸ਼ਿਤ"
+
+#~ msgid "Journal for %1"
+#~ msgstr "%1 ਲਈ ਰੋਜ਼ਨਾਮਚਾ"
+
+#~ msgid "This event has been published"
+#~ msgstr "ਇਹ ਘਟਨਾ ਪਰਾਕਸ਼ਿਤ ਕਰ ਦਿੱਤੀ ਗਈ ਹੈ"
+
+#~ msgid "<i>Completed:</i>&nbsp;%1"
+#~ msgstr "<i>ਮੁਕੰਮਲ:</i>&nbsp;%1"
+
+#~ msgid "%1 % completed"
+#~ msgstr "%1 % ਮੁਕੰਮਲ"
+
+#~ msgid "<i>Location:</i>&nbsp;%1"
+#~ msgstr "<i>ਸਥਿਤੀ:</i>&nbsp;%1"
+
+#~ msgid "<i>Description:</i><br>"
+#~ msgstr "<i>ਵੇਰਵਾ:</i><br>"
diff --git a/tde-i18n-pa/messages/tdepim/libkholidays.po b/tde-i18n-pa/messages/tdepim/libkholidays.po
index 54c51495625..f2eaa5b68ff 100644
--- a/tde-i18n-pa/messages/tdepim/libkholidays.po
+++ b/tde-i18n-pa/messages/tdepim/libkholidays.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkholidays\n"
-"POT-Creation-Date: 2005-02-19 01:28+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-04-20 17:54+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-pa/messages/tdepim/libkleopatra.po b/tde-i18n-pa/messages/tdepim/libkleopatra.po
index 16fa1eff28a..7d4fcc4f5f6 100644
--- a/tde-i18n-pa/messages/tdepim/libkleopatra.po
+++ b/tde-i18n-pa/messages/tdepim/libkleopatra.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkleopatra\n"
-"POT-Creation-Date: 2008-08-19 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-04-20 17:56+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -375,19 +376,26 @@ msgstr ""
 msgid "&Reset"
 msgstr "ਮੁੜ-ਸੈੱਟ(&R)"
 
-#: ui/cryptoconfigmodule.cpp:577
+#: ui/cryptoconfigmodule.cpp:132
+msgid ""
+"The gpgconf tool used to provide the information for this dialog does not seem "
+"to be installed properly. It did not return any components. Try running \"%1\" "
+"on the command line for more information."
+msgstr ""
+
+#: ui/cryptoconfigmodule.cpp:605
 msgid "Edit..."
 msgstr "ਸੋਧ..."
 
-#: ui/cryptoconfigmodule.cpp:609
+#: ui/cryptoconfigmodule.cpp:637
 msgid "Configure LDAP Servers"
 msgstr ""
 
-#: ui/cryptoconfigmodule.cpp:628
+#: ui/cryptoconfigmodule.cpp:656
 msgid "No server configured yet"
 msgstr ""
 
-#: ui/cryptoconfigmodule.cpp:630
+#: ui/cryptoconfigmodule.cpp:658
 #, c-format
 msgid ""
 "_n: 1 server configured\n"
@@ -486,12 +494,12 @@ msgstr "ਇਕਰਿਪਸ਼ਨ ਪਸੰਦ:"
 msgid "Change..."
 msgstr "ਤਬਦੀਲ..."
 
-#: ui/keyrequester.cpp:218 ui/keyselectiondialog.cpp:216
+#: ui/keyrequester.cpp:218 ui/keyselectiondialog.cpp:224
 msgid "<unknown>"
 msgstr "<unknown>"
 
-#: backends/qgpgme/qgpgmekeylistjob.cpp:180 ui/keyrequester.cpp:231
-#: ui/keyselectiondialog.cpp:520
+#: backends/qgpgme/qgpgmekeylistjob.cpp:196 ui/keyrequester.cpp:231
+#: ui/keyselectiondialog.cpp:572
 msgid ""
 "<qt>"
 "<p>An error occurred while fetching the keys from the backend:</p>"
@@ -499,7 +507,7 @@ msgid ""
 msgstr ""
 
 #: ui/keyrequester.cpp:236 ui/keyrequester.cpp:265 ui/keyrequester.cpp:289
-#: ui/keyselectiondialog.cpp:493 ui/keyselectiondialog.cpp:525
+#: ui/keyselectiondialog.cpp:543 ui/keyselectiondialog.cpp:577
 msgid "Key Listing Failed"
 msgstr ""
 
@@ -537,19 +545,19 @@ msgstr "ਕੁੰਜੀ ਚੋਣ"
 msgid "Please select an (OpenPGP or S/MIME) key to use."
 msgstr ""
 
-#: ui/keyselectiondialog.cpp:192
+#: ui/keyselectiondialog.cpp:200
 msgid "Key ID"
 msgstr "ਕੁੰਜੀ ID"
 
-#: ui/keyselectiondialog.cpp:193
+#: ui/keyselectiondialog.cpp:201
 msgid "User ID"
 msgstr "ਉਪਭੋਗਤਾ ID"
 
-#: ui/keyselectiondialog.cpp:237
+#: ui/keyselectiondialog.cpp:245
 msgid "never"
 msgstr "ਕਦੇਂ ਨਹੀਂ"
 
-#: ui/keyselectiondialog.cpp:240
+#: ui/keyselectiondialog.cpp:248
 msgid ""
 "OpenPGP key for %1\n"
 "Created: %2\n"
@@ -557,13 +565,13 @@ msgid ""
 "Fingerprint: %4"
 msgstr ""
 
-#: ui/keyselectiondialog.cpp:244 ui/keyselectiondialog.cpp:246
-#: ui/keyselectiondialog.cpp:253 ui/keyselectiondialog.cpp:255
-#: ui/keyselectiondialog.cpp:256
+#: ui/keyselectiondialog.cpp:252 ui/keyselectiondialog.cpp:254
+#: ui/keyselectiondialog.cpp:261 ui/keyselectiondialog.cpp:263
+#: ui/keyselectiondialog.cpp:264
 msgid "unknown"
 msgstr "ਅਣਜਾਣ"
 
-#: ui/keyselectiondialog.cpp:248
+#: ui/keyselectiondialog.cpp:256
 msgid ""
 "S/MIME key for %1\n"
 "Created: %2\n"
@@ -572,50 +580,54 @@ msgid ""
 "Issuer: %5"
 msgstr ""
 
-#: ui/keyselectiondialog.cpp:355
+#: ui/keyselectiondialog.cpp:392
+msgid "Search for &External Certificates"
+msgstr ""
+
+#: ui/keyselectiondialog.cpp:405
 msgid "&Search for:"
 msgstr "ਖੋਜ ਲਈ:"
 
-#: ui/keyselectiondialog.cpp:375
+#: ui/keyselectiondialog.cpp:425
 msgid "&Remember choice"
 msgstr ""
 
-#: ui/keyselectiondialog.cpp:378
+#: ui/keyselectiondialog.cpp:428
 msgid ""
 "<qt>"
 "<p>If you check this box your choice will be stored and you will not be asked "
 "again.</p></qt>"
 msgstr ""
 
-#: ui/keyselectiondialog.cpp:394
+#: ui/keyselectiondialog.cpp:444
 msgid "&Reread Keys"
 msgstr ""
 
-#: ui/keyselectiondialog.cpp:395
+#: ui/keyselectiondialog.cpp:445
 msgid "&Start Certificate Manager"
 msgstr ""
 
-#: ui/keyselectiondialog.cpp:491
+#: ui/keyselectiondialog.cpp:541
 msgid "No backends found for listing keys. Check your installation."
 msgstr ""
 
-#: ui/keyselectiondialog.cpp:509
+#: ui/keyselectiondialog.cpp:561
 msgid "Could not start certificate manager; please check your installation."
 msgstr ""
 
-#: ui/keyselectiondialog.cpp:511
+#: ui/keyselectiondialog.cpp:563
 msgid "Certificate Manager Error"
 msgstr ""
 
-#: ui/keyselectiondialog.cpp:558
+#: ui/keyselectiondialog.cpp:612
 msgid "Checking selected keys..."
 msgstr ""
 
-#: ui/keyselectiondialog.cpp:558
+#: ui/keyselectiondialog.cpp:612
 msgid "Fetching keys..."
 msgstr "ਕੁੰਜੀ ਪ੍ਰਾਪਤ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
 
-#: ui/keyselectiondialog.cpp:584
+#: ui/keyselectiondialog.cpp:641
 #, c-format
 msgid ""
 "_n: <qt>One backend returned truncated output."
@@ -624,99 +636,110 @@ msgid ""
 "<br>Not all available keys are shown</qt>"
 msgstr ""
 
-#: ui/keyselectiondialog.cpp:587
+#: ui/keyselectiondialog.cpp:644
 msgid "Key List Result"
 msgstr "ਕੁੰਜੀ ਸੂਚੀ ਨਤੀਜਾ"
 
-#: ui/keyselectiondialog.cpp:694
+#: ui/keyselectiondialog.cpp:759
 msgid "Recheck Key"
 msgstr "ਕੁੰਜੀ ਦੀ ਮੁੜ ਜਾਂਚ"
 
-#: ui/messagebox.cpp:60
+#: ui/messagebox.cpp:65
 msgid "&Save to Disk..."
 msgstr ""
 
-#: ui/messagebox.cpp:64
+#: ui/messagebox.cpp:69
 msgid "&Copy to Clipboard"
 msgstr ""
 
-#: ui/messagebox.cpp:64
+#: ui/messagebox.cpp:69
 msgid "Copy Audit Log to Clipboard"
 msgstr ""
 
-#: ui/messagebox.cpp:68
+#: ui/messagebox.cpp:73
 msgid "&Show Audit Log"
 msgstr ""
 
-#: ui/messagebox.cpp:75
+#: ui/messagebox.cpp:81
 msgid "View GnuPG Audit Log"
 msgstr ""
 
-#: ui/messagebox.cpp:94
+#: ui/messagebox.cpp:112
 msgid "Choose File to Save GnuPG Audit Log to"
 msgstr ""
 
-#: ui/messagebox.cpp:106
+#: ui/messagebox.cpp:129
 msgid "Couldn't save to file \"%1\": %2"
 msgstr ""
 
-#: ui/messagebox.cpp:108
+#: ui/messagebox.cpp:131
 msgid "File Save Error"
 msgstr ""
 
-#: ui/messagebox.cpp:129
+#: ui/messagebox.cpp:153
 msgid "Your system does not have support for GnuPG Audit Logs"
 msgstr ""
 
-#: ui/messagebox.cpp:130
+#: ui/messagebox.cpp:154
 msgid "System Error"
 msgstr ""
 
-#: ui/messagebox.cpp:136
+#: ui/messagebox.cpp:161
+#, c-format
+msgid ""
+"An error occurred while trying to retrieve the GnuPG Audit Log:\n"
+"%1"
+msgstr ""
+
+#: ui/messagebox.cpp:163
+msgid "GnuPG Audit Log Error"
+msgstr ""
+
+#: ui/messagebox.cpp:170
 msgid "No GnuPG Audit Log available for this operation."
 msgstr ""
 
-#: ui/messagebox.cpp:137
+#: ui/messagebox.cpp:171
 msgid "No GnuPG Audit Log"
 msgstr ""
 
-#: ui/messagebox.cpp:153 ui/messagebox.cpp:158
+#: ui/messagebox.cpp:187 ui/messagebox.cpp:192
 msgid "GnuPG Audit Log Viewer"
 msgstr ""
 
-#: ui/messagebox.cpp:163
+#: ui/messagebox.cpp:197
 #, c-format
 msgid "Signing failed: %1"
 msgstr ""
 
-#: ui/messagebox.cpp:164
+#: ui/messagebox.cpp:198
 msgid "Signing successful"
 msgstr ""
 
-#: backends/chiasmus/chiasmusjob.cpp:209 ui/messagebox.cpp:173
+#: backends/chiasmus/chiasmusjob.cpp:209 ui/messagebox.cpp:207
 #, c-format
 msgid "Encryption failed: %1"
 msgstr ""
 
-#: ui/messagebox.cpp:174
+#: ui/messagebox.cpp:208
 #, fuzzy
 msgid "Encryption successful"
 msgstr "ਇਕਰਿਪਸ਼ਨ ਕੁੰਜੀਆਂ:"
 
-#: ui/messagebox.cpp:191
+#: ui/messagebox.cpp:225
 msgid "Signing Result"
 msgstr ""
 
-#: ui/messagebox.cpp:201
+#: ui/messagebox.cpp:235
 msgid "Signing Error"
 msgstr ""
 
-#: ui/messagebox.cpp:211 ui/messagebox.cpp:231
+#: ui/messagebox.cpp:245 ui/messagebox.cpp:265
 #, fuzzy
 msgid "Encryption Result"
 msgstr "ਇਕਰਿਪਸ਼ਨ ਕੁੰਜੀਆਂ:"
 
-#: ui/messagebox.cpp:221 ui/messagebox.cpp:241
+#: ui/messagebox.cpp:255 ui/messagebox.cpp:275
 #, fuzzy
 msgid "Encryption Error"
 msgstr "ਇਕਰਿਪਸ਼ਨ ਕੁੰਜੀਆਂ:"
diff --git a/tde-i18n-pa/messages/tdepim/libkmime.po b/tde-i18n-pa/messages/tdepim/libkmime.po
index d1380170147..636f8a4d2b2 100644
--- a/tde-i18n-pa/messages/tdepim/libkmime.po
+++ b/tde-i18n-pa/messages/tdepim/libkmime.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkmime\n"
-"POT-Creation-Date: 2008-04-25 05:30+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-04-20 17:56+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -69,21 +70,21 @@ msgstr ""
 "ਭੇਜਣ ਸੂਚਨਾ ਤਿਆਰ ਦੌਰਾਨ ਗਲਤੀ ਹੈ। ਅਸਫ਼ਲਤਾ ਦਾ ਕਾਰਨ ਦਿੱਤਾ ਗਿਆ ਹੈ: header ਖੇਤਰ ਹੇਠਾਂ "
 "ਹੈ।"
 
-#: kmime_util.cpp:665
+#: kmime_util.cpp:642
 msgid "unknown"
 msgstr "ਅਣਜਾਣ"
 
-#: kmime_util.cpp:682
+#: kmime_util.cpp:659
 #, c-format
 msgid "Today %1"
 msgstr "ਅੱਜ %1"
 
-#: kmime_util.cpp:689
+#: kmime_util.cpp:666
 #, c-format
 msgid "Yesterday %1"
 msgstr "ਕੱਲ੍ਹ %1"
 
-#: kmime_util.cpp:697
+#: kmime_util.cpp:674
 msgid ""
 "_: 1. weekday, 2. time\n"
 "%1 %2"
diff --git a/tde-i18n-pa/messages/tdepim/libkpgp.po b/tde-i18n-pa/messages/tdepim/libkpgp.po
index 812ba3057e2..48423285cea 100644
--- a/tde-i18n-pa/messages/tdepim/libkpgp.po
+++ b/tde-i18n-pa/messages/tdepim/libkpgp.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2006-05-29 04:02+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-04-20 17:57+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-pa/messages/tdepim/libkpimexchange.po b/tde-i18n-pa/messages/tdepim/libkpimexchange.po
index aba43e41b25..e4d42bd72c8 100644
--- a/tde-i18n-pa/messages/tdepim/libkpimexchange.po
+++ b/tde-i18n-pa/messages/tdepim/libkpimexchange.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpimexchange\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-04-20 17:57+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-pa/messages/tdepim/libksieve.po b/tde-i18n-pa/messages/tdepim/libksieve.po
index e1b1873fa18..9dbe6a353a4 100644
--- a/tde-i18n-pa/messages/tdepim/libksieve.po
+++ b/tde-i18n-pa/messages/tdepim/libksieve.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libksieve\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-01-17 10:50+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-pa/messages/tdepim/libtdepim.po b/tde-i18n-pa/messages/tdepim/libtdepim.po
index d57fade95d9..53fcfa609a5 100644
--- a/tde-i18n-pa/messages/tdepim/libtdepim.po
+++ b/tde-i18n-pa/messages/tdepim/libtdepim.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libtdepim\n"
-"POT-Creation-Date: 2008-07-14 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-01-17 10:49+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,98 +24,98 @@ msgstr ""
 msgid "%1 (Default)"
 msgstr "%1 (ਮੂਲ)"
 
-#: ../libkpimidentities/identitymanager.cpp:342
+#: ../libkpimidentities/identitymanager.cpp:340
 msgid "Unnamed"
 msgstr "ਬੇ-ਨਾਮ"
 
-#: ../libemailfunctions/email.cpp:457
+#: ../libemailfunctions/email.cpp:465
 msgid ""
 "The email address you entered is not valid because it contains more than one @. "
 "You will not create valid messages if you do not change your address."
 msgstr ""
 
-#: ../libemailfunctions/email.cpp:462
+#: ../libemailfunctions/email.cpp:470
 msgid ""
 "The email address you entered is not valid because it does not contain a @.You "
 "will not create valid messages if you do not change your address."
 msgstr ""
 
-#: ../libemailfunctions/email.cpp:467
+#: ../libemailfunctions/email.cpp:475
 msgid "You have to enter something in the email address field."
 msgstr ""
 
-#: ../libemailfunctions/email.cpp:469
+#: ../libemailfunctions/email.cpp:477
 msgid ""
 "The email address you entered is not valid because it does not contain a local "
 "part."
 msgstr ""
 
-#: ../libemailfunctions/email.cpp:472
+#: ../libemailfunctions/email.cpp:480
 msgid ""
 "The email address you entered is not valid because it does not contain a domain "
 "part."
 msgstr ""
 
-#: ../libemailfunctions/email.cpp:475
+#: ../libemailfunctions/email.cpp:483
 msgid ""
 "The email address you entered is not valid because it contains unclosed "
 "comments/brackets."
 msgstr ""
 
-#: ../libemailfunctions/email.cpp:478
+#: ../libemailfunctions/email.cpp:486
 msgid "The email address you entered is valid."
 msgstr ""
 
-#: ../libemailfunctions/email.cpp:480
+#: ../libemailfunctions/email.cpp:488
 msgid ""
 "The email address you entered is not valid because it contains an unclosed "
 "anglebracket."
 msgstr ""
 
-#: ../libemailfunctions/email.cpp:483
+#: ../libemailfunctions/email.cpp:491
 msgid ""
 "The email address you entered is not valid because it contains an unopened "
 "anglebracket."
 msgstr ""
 
-#: ../libemailfunctions/email.cpp:486
+#: ../libemailfunctions/email.cpp:494
 msgid ""
 "The email address you have entered is not valid because it contains an "
 "unexpected comma."
 msgstr ""
 
-#: ../libemailfunctions/email.cpp:489
+#: ../libemailfunctions/email.cpp:497
 msgid ""
 "The email address you entered is not valid because it ended unexpectedly, this "
 "probably means you have used an escaping type character like an \\  as the last "
 "character in your email address."
 msgstr ""
 
-#: ../libemailfunctions/email.cpp:494
+#: ../libemailfunctions/email.cpp:502
 msgid ""
 "The email address you entered is not valid because it contains quoted text "
 "which does not end."
 msgstr ""
 
-#: ../libemailfunctions/email.cpp:497 ../libemailfunctions/email.cpp:558
+#: ../libemailfunctions/email.cpp:505 ../libemailfunctions/email.cpp:566
 msgid ""
 "The email address you entered is not valid because it does not seem to contain "
 "an actual email address, i.e. something of the form joe@kde.org."
 msgstr ""
 
-#: ../libemailfunctions/email.cpp:501
+#: ../libemailfunctions/email.cpp:509
 msgid ""
 "The email address you entered is not valid because it contains an illegal "
 "character."
 msgstr ""
 
-#: ../libemailfunctions/email.cpp:504
+#: ../libemailfunctions/email.cpp:512
 msgid ""
 "The email address you have entered is not valid because it contains an invalid "
 "displayname."
 msgstr ""
 
-#: ../libemailfunctions/email.cpp:507
+#: ../libemailfunctions/email.cpp:515
 msgid "Unknown problem with email address"
 msgstr ""
 
@@ -130,8 +131,8 @@ msgid ""
 "Your emails"
 msgstr "aalam@redhat.com,aalam@users.sf.net"
 
-#: addresseeemailselection.cpp:47 addressesdialog.cpp:238
-#: addressesdialog.cpp:719
+#: addresseeemailselection.cpp:47 addressesdialog.cpp:243
+#: addressesdialog.cpp:727
 msgid "To"
 msgstr "ਵੱਲ"
 
@@ -143,17 +144,17 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Bcc"
 
-#: addresseeemailselection.cpp:196 addressesdialog.cpp:319
-#: recentaddresses.cpp:167
+#: addresseeemailselection.cpp:196 addressesdialog.cpp:324
+#: completionordereditor.cpp:208 recentaddresses.cpp:167
 msgid "Recent Addresses"
 msgstr "ਤਾਜ਼ੇ ਸਿਰਨਾਵੇਂ"
 
-#: addresseelineedit.cpp:553 addressesdialog.cpp:1088
-#: completionordereditor.cpp:204
+#: addresseelineedit.cpp:594 addressesdialog.cpp:1152
+#: completionordereditor.cpp:205
 msgid "Distribution Lists"
 msgstr "ਵੰਡ ਸੂਚੀ"
 
-#: addresseelineedit.cpp:873
+#: addresseelineedit.cpp:927
 msgid "Configure Completion Order..."
 msgstr ""
 
@@ -229,8 +230,8 @@ msgstr ""
 msgid "SMS"
 msgstr "SMS"
 
-#: addresseeview.cpp:254 ldapsearchdialog.cpp:76 ldapsearchdialog.cpp:144
-#: ldapsearchdialog.cpp:275 ldapsearchdialog.cpp:346
+#: addresseeview.cpp:254 ldapsearchdialog.cpp:78 ldapsearchdialog.cpp:156
+#: ldapsearchdialog.cpp:287 ldapsearchdialog.cpp:358
 msgid "Email"
 msgstr "ਈ-ਪੱਤਰ"
 
@@ -246,7 +247,7 @@ msgstr ""
 msgid "Notes"
 msgstr "ਸੂਚਨਾ"
 
-#: addresseeview.cpp:343 ldapsearchdialog.cpp:88 ldapsearchdialog.cpp:288
+#: addresseeview.cpp:343 ldapsearchdialog.cpp:90 ldapsearchdialog.cpp:300
 msgid "Department"
 msgstr "ਵਿਭਾਗ"
 
@@ -326,43 +327,43 @@ msgstr "%1 URL ਖੋਲੋ"
 msgid "Chat with %1"
 msgstr "%1 ਨਾਲ ਗੱਲਬਾਤ"
 
-#: addressesdialog.cpp:123 addressesdialog.cpp:131
+#: addressesdialog.cpp:125 addressesdialog.cpp:133
 msgid "<group>"
 msgstr "<group>"
 
 #. i18n: file addresspicker.ui line 16
-#: addressesdialog.cpp:214 rc.cpp:3
+#: addressesdialog.cpp:216 rc.cpp:3
 #, no-c-format
 msgid "Address Selection"
 msgstr "ਸਿਰਨਾਵਾਂ ਚੋਣ"
 
-#: addressesdialog.cpp:249 addressesdialog.cpp:741
+#: addressesdialog.cpp:254 addressesdialog.cpp:748
 msgid "CC"
 msgstr "CC"
 
-#: addressesdialog.cpp:260 addressesdialog.cpp:763
+#: addressesdialog.cpp:265 addressesdialog.cpp:769
 msgid "BCC"
 msgstr "BCC"
 
-#: addressesdialog.cpp:458
+#: addressesdialog.cpp:464
 msgid "Other Addresses"
 msgstr "ਹੋਰ ਸਿਰਨਾਵੇਂ"
 
-#: addressesdialog.cpp:883
+#: addressesdialog.cpp:888
 msgid ""
 "There are no addresses in your list. First add some addresses from your address "
 "book, then try again."
 msgstr ""
 
-#: addressesdialog.cpp:890
+#: addressesdialog.cpp:895
 msgid "New Distribution List"
 msgstr "ਨਵੀਂ ਵੰਡ ਸੂਚੀ"
 
-#: addressesdialog.cpp:891
+#: addressesdialog.cpp:896
 msgid "Please enter name:"
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਨਾਂ ਦਿਓ:"
 
-#: addressesdialog.cpp:908
+#: addressesdialog.cpp:913
 msgid ""
 "<qt>Distribution list with the given name <b>%1</b> already exists. Please "
 "select a different name.</qt>"
@@ -461,8 +462,8 @@ msgstr "ਅੰਤਰਾਲ"
 msgid "Duration"
 msgstr "ਅੰਤਰਾਲ"
 
-#: calendardiffalgo.cpp:135 ksubscription.cpp:270 ldapsearchdialog.cpp:91
-#: ldapsearchdialog.cpp:289
+#: calendardiffalgo.cpp:135 ksubscription.cpp:270 ldapsearchdialog.cpp:93
+#: ldapsearchdialog.cpp:301
 msgid "Description"
 msgstr "ਵੇਰਵਾ"
 
@@ -571,12 +572,12 @@ msgstr "ਵਰਗ"
 msgid "Select Categories"
 msgstr "ਵਰਗ ਚੁਣੋ"
 
-#: completionordereditor.cpp:90
+#: completionordereditor.cpp:91
 #, c-format
 msgid "LDAP server %1"
 msgstr ""
 
-#: completionordereditor.cpp:176
+#: completionordereditor.cpp:177
 msgid "Edit Completion Order"
 msgstr ""
 
@@ -645,50 +646,51 @@ msgid "KCMDesignerfields"
 msgstr "KCMDesignerfields"
 
 #: kcmdesignerfields.cpp:135
-msgid "Qt Designer Fields Dialog"
-msgstr ""
+#, fuzzy
+msgid "TQt Designer Fields Dialog"
+msgstr "KCMDesignerfields"
 
 #: kcmdesignerfields.cpp:137
 msgid "(c), 2004 Tobias Koenig"
 msgstr "(c), 2004 Tobias Koenig"
 
-#: kcmdesignerfields.cpp:178
+#: kcmdesignerfields.cpp:179
 msgid "<qt>Do you really want to delete '<b>%1</b>'?</qt>"
 msgstr ""
 
-#: kcmdesignerfields.cpp:187
+#: kcmdesignerfields.cpp:188
 msgid "*.ui|Designer Files"
 msgstr ""
 
-#: kcmdesignerfields.cpp:188
+#: kcmdesignerfields.cpp:189
 msgid "Import Page"
 msgstr "ਸਫੇ ਆਯਾਤ"
 
-#: kcmdesignerfields.cpp:271
+#: kcmdesignerfields.cpp:272
 msgid ""
-"<qt><b>Warning:</b> Qt Designer could not be found. It is probably not "
+"<qt><b>Warning:</b> TQt Designer could not be found. It is probably not "
 "installed. You will only be able to import existing designer files.</qt>"
 msgstr ""
 
-#: kcmdesignerfields.cpp:280
+#: kcmdesignerfields.cpp:281
 msgid "Available Pages"
 msgstr "ਉਪਲੱਬਧ ਸਫੇ"
 
-#: kcmdesignerfields.cpp:286
+#: kcmdesignerfields.cpp:287
 msgid "Preview of Selected Page"
 msgstr ""
 
-#: kcmdesignerfields.cpp:299
+#: kcmdesignerfields.cpp:300
 msgid ""
 "<qt>"
 "<p>This section allows you to add your own GUI  Elements ('<i>Widgets</i>"
 "') to store your own values into %1. Proceed as described below:</p>"
 "<ol>"
-"<li>Click on '<i>Edit with Qt Designer</i>'"
+"<li>Click on '<i>Edit with TQt Designer</i>'"
 "<li>In the dialog, select '<i>Widget</i>', then click <i>OK</i>"
 "<li>Add your widgets to the form"
-"<li>Save the file in the directory proposed by Qt Designer"
-"<li>Close Qt Designer</ol>"
+"<li>Save the file in the directory proposed by TQt Designer"
+"<li>Close TQt Designer</ol>"
 "<p>In case you already have a designer file (*.ui) located somewhere on your "
 "hard disk, simply choose '<i>Import Page</i>'</p>"
 "<p><b>Important:</b> The name of each input widget you place within the form "
@@ -697,92 +699,41 @@ msgid ""
 "X_Foo</i>'.</p>"
 "<p><b>Important:</b> The widget will edit custom fields with an application "
 "name of %2.  To change the application name to be edited, set the widget name "
-"in Qt Designer.</p></qt>"
+"in TQt Designer.</p></qt>"
 msgstr ""
 
-#: kcmdesignerfields.cpp:321
+#: kcmdesignerfields.cpp:322
 msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
 msgstr "<a href=\"whatsthis:%1\">ਇਹ ਕਿਵੇਂ ਕੰਮ ਕਰਦਾ ਹੈ?</a>"
 
-#: kcmdesignerfields.cpp:329
+#: kcmdesignerfields.cpp:330
 msgid "Delete Page"
 msgstr "ਸਫ਼ਾ ਹਟਾਓ"
 
-#: kcmdesignerfields.cpp:332
+#: kcmdesignerfields.cpp:333
 msgid "Import Page..."
 msgstr ""
 
-#: kcmdesignerfields.cpp:334
-msgid "Edit with Qt Designer..."
+#: kcmdesignerfields.cpp:335
+msgid "Edit with TQt Designer..."
 msgstr ""
 
-#: kcmdesignerfields.cpp:362
+#: kcmdesignerfields.cpp:363
 msgid "Key:"
 msgstr "ਕੁੰਜੀ:"
 
-#: kcmdesignerfields.cpp:364
+#: kcmdesignerfields.cpp:365
 msgid "Type:"
 msgstr "ਕਿਸਮ:"
 
-#: kcmdesignerfields.cpp:366
+#: kcmdesignerfields.cpp:367
 msgid "Classname:"
 msgstr ""
 
-#: kcmdesignerfields.cpp:368
+#: kcmdesignerfields.cpp:369
 msgid "Description:"
 msgstr "ਵੇਰਵਾ:"
 
-#: tdeconfigpropagator.cpp:39
-msgid "Change Config Value"
-msgstr ""
-
-#: tdeconfigwizard.cpp:36 tdeconfigwizard.cpp:45
-msgid "Configuration Wizard"
-msgstr "ਸੰਰਚਨਾ ਸਹਾਇਕ"
-
-#: tdeconfigwizard.cpp:84
-msgid "Rules"
-msgstr "ਨਿਯਮ"
-
-#: tdeconfigwizard.cpp:90
-msgid "Source"
-msgstr "ਸਰੋਤ"
-
-#: tdeconfigwizard.cpp:91
-msgid "Target"
-msgstr "ਨਿਯਤ"
-
-#: tdeconfigwizard.cpp:92
-msgid "Condition"
-msgstr "ਹਾਲਾਤ"
-
-#: tdeconfigwizard.cpp:125
-msgid "Changes"
-msgstr "ਤਬਦੀਲ"
-
-#: tdeconfigwizard.cpp:131
-msgid "Action"
-msgstr "ਕਾਰਵਾਈ"
-
-#: tdeconfigwizard.cpp:132
-msgid "Option"
-msgstr "ਚੋਣ"
-
-#: tdeconfigwizard.cpp:133
-msgid "Value"
-msgstr "ਮੁੱਲ"
-
-#: tdeconfigwizard.cpp:166
-msgid ""
-"Please make sure that the programs which are configured by the wizard do not "
-"run in parallel to the wizard; otherwise, changes done by the wizard could be "
-"lost."
-msgstr ""
-
-#: tdeconfigwizard.cpp:169
-msgid "Run Wizard Now"
-msgstr "ਸਹਾਇਕ ਹੁਣੇ ਚਲਾਉ"
-
 #: kdateedit.cpp:332
 msgid "tomorrow"
 msgstr "ਕੱਲ"
@@ -815,153 +766,6 @@ msgstr "ਅਗਲੇ ਮਹੀਨੇ(&o)"
 msgid "No Date"
 msgstr "ਕੋਈ ਮਿਤੀ ਨਹੀਂ"
 
-#: tdefileio.cpp:31
-msgid "File I/O Error"
-msgstr ""
-
-#: tdefileio.cpp:51 tdefileio.cpp:122
-#, c-format
-msgid ""
-"The specified file does not exist:\n"
-"%1"
-msgstr ""
-"ਦਿੱਤੀ ਫਾਇਲ ਮੌਜੂਦ ਨਹੀਂ ਹੈ:\n"
-"%1"
-
-#: tdefileio.cpp:57 tdefileio.cpp:129
-#, c-format
-msgid ""
-"This is a folder and not a file:\n"
-"%1"
-msgstr ""
-"ਇਹ ਫੋਲਡਰ ਹੈ ਫਾਇਲ ਨਹੀਂ:\n"
-"%1"
-
-#: tdefileio.cpp:63 tdefileio.cpp:136
-#, c-format
-msgid ""
-"You do not have read permissions to the file:\n"
-"%1"
-msgstr ""
-"ਤੁਹਾਨੂੰ ਫਾਇਲ ਪੜਨ ਲਈ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ:\n"
-"%1"
-
-#: tdefileio.cpp:74 tdefileio.cpp:147
-#, c-format
-msgid ""
-"Could not read file:\n"
-"%1"
-msgstr ""
-"ਫਾਇਲ ਪੜੀ ਨਹੀਂ ਜਾ ਸਕੀ:\n"
-"%1"
-
-#: tdefileio.cpp:77 tdefileio.cpp:150
-#, c-format
-msgid ""
-"Could not open file:\n"
-"%1"
-msgstr ""
-"ਫਾਇਲ ਖੋਲੀ ਨਹੀਂ ਜਾ ਸਕਦੀ:\n"
-"%1"
-
-#: tdefileio.cpp:80 tdefileio.cpp:153
-#, c-format
-msgid ""
-"Error while reading file:\n"
-"%1"
-msgstr ""
-"ਫਾਇਲ ਪੜਨ ਦੌਰਾਨ ਗਲਤੀ:\n"
-"%1"
-
-#: tdefileio.cpp:96 tdefileio.cpp:165
-msgid "Could only read %1 bytes of %2."
-msgstr "%2 ਵਿੱਚੋਂ ਸਿਰਫ਼ %1 ਹੀ ਪੜੇ ਜਾ ਸਕੇ ਹਨ।"
-
-#: tdefileio.cpp:193
-msgid ""
-"File %1 exists.\n"
-"Do you want to replace it?"
-msgstr ""
-"ਫਾਇਲ %1 ਮੌਜੂਦ ਹੈ।\n"
-"ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਤਬਦੀਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
-
-#: tdefileio.cpp:196 tdefileio.cpp:213
-msgid "Save to File"
-msgstr "ਫਾਇਲ ਵਿੱਚ ਸੰਭਾਲੋ"
-
-#: tdefileio.cpp:196
-msgid "&Replace"
-msgstr "ਤਬਦੀਲ(&R)"
-
-#: tdefileio.cpp:211
-msgid ""
-"Failed to make a backup copy of %1.\n"
-"Continue anyway?"
-msgstr ""
-"%1 ਦੀ ਬੈਕਅੱਪ ਨਕਲ ਬਣਾਉਣ ਲਈ ਅਸਫ਼ਲ ਹੈ।\n"
-"ਕੀ ਕਿਸੇ ਤਰਾਂ ਵੀ ਜਾਰੀ ਰੱਖਣਾ ਹੈ?"
-
-#: tdefileio.cpp:224 tdefileio.cpp:241
-#, c-format
-msgid ""
-"Could not write to file:\n"
-"%1"
-msgstr ""
-"ਫਾਇਲ ਨੂੰ ਲਿਖਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ:\n"
-"%1"
-
-#: tdefileio.cpp:227
-#, c-format
-msgid ""
-"Could not open file for writing:\n"
-"%1"
-msgstr ""
-"ਫਾਇਲ ਨੂੰ ਲਿਖਣ ਲਈ ਖੋਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ:\n"
-"%1"
-
-#: tdefileio.cpp:231
-#, c-format
-msgid ""
-"Error while writing file:\n"
-"%1"
-msgstr ""
-"ਫਾਇਲ ਲਿਖਣ ਦੌਰਾਨ ਗਲਤੀ:\n"
-"%1"
-
-#: tdefileio.cpp:246
-msgid "Could only write %1 bytes of %2."
-msgstr "%2 ਵਿੱਚੋਂ %1 ਬਾਈਟ ਹੀ ਲਿਖੇ ਜਾ ਸਕੇ।"
-
-#: tdefileio.cpp:285
-msgid "%1 does not exist"
-msgstr ""
-
-#: tdefileio.cpp:297
-msgid "%1 is not accessible and that is unchangeable."
-msgstr ""
-
-#: tdefileio.cpp:318
-msgid "%1 is not readable and that is unchangeable."
-msgstr ""
-
-#: tdefileio.cpp:334
-msgid "%1 is not writable and that is unchangeable."
-msgstr ""
-
-#: tdefileio.cpp:349
-msgid "Folder %1 is inaccessible."
-msgstr ""
-
-#: tdefileio.cpp:380
-msgid ""
-"Some files or folders do not have the right permissions, please correct them "
-"manually."
-msgstr ""
-
-#: tdefileio.cpp:383
-msgid "Permissions Check"
-msgstr ""
-
 #: kimportdialog.cpp:78
 msgid "Plain"
 msgstr "ਸਮਤਲ"
@@ -1435,7 +1239,7 @@ msgid "Current changes:"
 msgstr "ਮੌਜੂਦਾ ਤਬਦੀਲ:"
 
 #. i18n: file addresspicker.ui line 25
-#: ksubscription.cpp:267 ldapsearchdialog.cpp:143 ldapsearchdialog.cpp:341
+#: ksubscription.cpp:267 ldapsearchdialog.cpp:155 ldapsearchdialog.cpp:353
 #: rc.cpp:6 rc.cpp:33
 #, no-c-format
 msgid "Name"
@@ -1480,120 +1284,120 @@ msgid ""
 "Clear"
 msgstr "ਸਾਫ਼"
 
-#: ldapsearchdialog.cpp:74 ldapsearchdialog.cpp:291
+#: ldapsearchdialog.cpp:76 ldapsearchdialog.cpp:303
 msgid "Title"
 msgstr ""
 
-#: ldapsearchdialog.cpp:75 ldapsearchdialog.cpp:274
+#: ldapsearchdialog.cpp:77 ldapsearchdialog.cpp:286
 #, fuzzy
 msgid "Full Name"
 msgstr "ਨਾਂ"
 
-#: ldapsearchdialog.cpp:77 ldapsearchdialog.cpp:145 ldapsearchdialog.cpp:276
-#: ldapsearchdialog.cpp:348
+#: ldapsearchdialog.cpp:79 ldapsearchdialog.cpp:157 ldapsearchdialog.cpp:288
+#: ldapsearchdialog.cpp:360
 #, fuzzy
 msgid "Home Number"
 msgstr "ਟੈਲੀਫੋਨ ਨੰਬਰ ਓਹਲੇ"
 
-#: ldapsearchdialog.cpp:78 ldapsearchdialog.cpp:146 ldapsearchdialog.cpp:277
-#: ldapsearchdialog.cpp:350
+#: ldapsearchdialog.cpp:80 ldapsearchdialog.cpp:158 ldapsearchdialog.cpp:289
+#: ldapsearchdialog.cpp:362
 msgid "Work Number"
 msgstr ""
 
-#: ldapsearchdialog.cpp:79 ldapsearchdialog.cpp:278
+#: ldapsearchdialog.cpp:81 ldapsearchdialog.cpp:290
 msgid "Mobile Number"
 msgstr ""
 
-#: ldapsearchdialog.cpp:80 ldapsearchdialog.cpp:279
+#: ldapsearchdialog.cpp:82 ldapsearchdialog.cpp:291
 msgid "Fax Number"
 msgstr ""
 
-#: ldapsearchdialog.cpp:81
+#: ldapsearchdialog.cpp:83
 msgid "Pager"
 msgstr ""
 
-#: ldapsearchdialog.cpp:82 ldapsearchdialog.cpp:282
+#: ldapsearchdialog.cpp:84 ldapsearchdialog.cpp:294
 msgid "Street"
 msgstr ""
 
-#: ldapsearchdialog.cpp:83 ldapsearchdialog.cpp:283
+#: ldapsearchdialog.cpp:85 ldapsearchdialog.cpp:295
 #, fuzzy
 msgid "State"
 msgstr "ਸਥਿਤੀ"
 
-#: ldapsearchdialog.cpp:84 ldapsearchdialog.cpp:284
+#: ldapsearchdialog.cpp:86 ldapsearchdialog.cpp:296
 msgid "Country"
 msgstr ""
 
-#: ldapsearchdialog.cpp:85 ldapsearchdialog.cpp:287
+#: ldapsearchdialog.cpp:87 ldapsearchdialog.cpp:299
 msgid "City"
 msgstr ""
 
-#: ldapsearchdialog.cpp:86 ldapsearchdialog.cpp:281
+#: ldapsearchdialog.cpp:88 ldapsearchdialog.cpp:293
 #, fuzzy
 msgid "Organization"
 msgstr "ਪ੍ਰਬੰਧਕ"
 
-#: ldapsearchdialog.cpp:87 ldapsearchdialog.cpp:280
+#: ldapsearchdialog.cpp:89 ldapsearchdialog.cpp:292
 msgid "Company"
 msgstr ""
 
-#: ldapsearchdialog.cpp:89 ldapsearchdialog.cpp:285
+#: ldapsearchdialog.cpp:91 ldapsearchdialog.cpp:297
 msgid "Zip Code"
 msgstr ""
 
-#: ldapsearchdialog.cpp:90 ldapsearchdialog.cpp:286
+#: ldapsearchdialog.cpp:92 ldapsearchdialog.cpp:298
 #, fuzzy
 msgid "Postal Address"
 msgstr "ਪੱਤਰ ਸਿਰਨਾਵਾਂ ਵੇਖਾਓ"
 
-#: ldapsearchdialog.cpp:92 ldapsearchdialog.cpp:290
+#: ldapsearchdialog.cpp:94 ldapsearchdialog.cpp:302
 #, fuzzy
 msgid "User ID"
 msgstr "UID"
 
-#: ldapsearchdialog.cpp:116 ldapsearchdialog.cpp:123
+#: ldapsearchdialog.cpp:128 ldapsearchdialog.cpp:135
 msgid "Search for Addresses in Directory"
 msgstr ""
 
-#: ldapsearchdialog.cpp:132
+#: ldapsearchdialog.cpp:144
 #, fuzzy
 msgid "Search for:"
 msgstr "ਖੋਜ:"
 
-#: ldapsearchdialog.cpp:139
+#: ldapsearchdialog.cpp:151
 msgid "in"
 msgstr ""
 
-#: ldapsearchdialog.cpp:152 ldapsearchdialog.cpp:406
+#: ldapsearchdialog.cpp:164 ldapsearchdialog.cpp:418
 #, fuzzy
 msgid "Search"
 msgstr "ਖੋਜ:"
 
-#: ldapsearchdialog.cpp:160
+#: ldapsearchdialog.cpp:172
 msgid "Recursive search"
 msgstr ""
 
-#: ldapsearchdialog.cpp:165
+#: ldapsearchdialog.cpp:177
 #, fuzzy
 msgid "Contains"
 msgstr "ਹਾਲਾਤ"
 
-#: ldapsearchdialog.cpp:166
+#: ldapsearchdialog.cpp:178
 #, fuzzy
 msgid "Starts With"
 msgstr "ਸ਼ੁਰੂ ਸਮਾਂ"
 
-#: ldapsearchdialog.cpp:179
+#: ldapsearchdialog.cpp:191
 msgid "Unselect All"
 msgstr ""
 
-#: ldapsearchdialog.cpp:181
+#: ldapsearchdialog.cpp:193
 #, fuzzy
 msgid "Add Selected"
 msgstr "ਸਿਰਨਾਵਾਂ ਚੋਣ"
 
-#: ldapsearchdialog.cpp:222
+#: ldapsearchdialog.cpp:234
 msgid ""
 "You must select a LDAP server before searching.\n"
 "You can do this from the menu Settings/Configure KAddressBook."
@@ -1753,10 +1557,208 @@ msgstr ""
 msgid "Open detailed progress dialog"
 msgstr ""
 
-#: statusbarprogresswidget.cpp:278
+#: statusbarprogresswidget.cpp:287
 msgid "Hide detailed progress window"
 msgstr "ਵੇਰਵਾ ਤਰੱਕੀ ਝਰੋਖਾ ਓਹਲੇ"
 
-#: statusbarprogresswidget.cpp:283
+#: statusbarprogresswidget.cpp:292
 msgid "Show detailed progress window"
 msgstr ""
+
+#: tdeconfigpropagator.cpp:39
+msgid "Change Config Value"
+msgstr ""
+
+#: tdeconfigwizard.cpp:36 tdeconfigwizard.cpp:45
+msgid "Configuration Wizard"
+msgstr "ਸੰਰਚਨਾ ਸਹਾਇਕ"
+
+#: tdeconfigwizard.cpp:84
+msgid "Rules"
+msgstr "ਨਿਯਮ"
+
+#: tdeconfigwizard.cpp:90
+msgid "Source"
+msgstr "ਸਰੋਤ"
+
+#: tdeconfigwizard.cpp:91
+msgid "Target"
+msgstr "ਨਿਯਤ"
+
+#: tdeconfigwizard.cpp:92
+msgid "Condition"
+msgstr "ਹਾਲਾਤ"
+
+#: tdeconfigwizard.cpp:125
+msgid "Changes"
+msgstr "ਤਬਦੀਲ"
+
+#: tdeconfigwizard.cpp:131
+msgid "Action"
+msgstr "ਕਾਰਵਾਈ"
+
+#: tdeconfigwizard.cpp:132
+msgid "Option"
+msgstr "ਚੋਣ"
+
+#: tdeconfigwizard.cpp:133
+msgid "Value"
+msgstr "ਮੁੱਲ"
+
+#: tdeconfigwizard.cpp:166
+msgid ""
+"Please make sure that the programs which are configured by the wizard do not "
+"run in parallel to the wizard; otherwise, changes done by the wizard could be "
+"lost."
+msgstr ""
+
+#: tdeconfigwizard.cpp:169
+msgid "Run Wizard Now"
+msgstr "ਸਹਾਇਕ ਹੁਣੇ ਚਲਾਉ"
+
+#: tdefileio.cpp:31
+msgid "File I/O Error"
+msgstr ""
+
+#: tdefileio.cpp:51 tdefileio.cpp:122
+#, c-format
+msgid ""
+"The specified file does not exist:\n"
+"%1"
+msgstr ""
+"ਦਿੱਤੀ ਫਾਇਲ ਮੌਜੂਦ ਨਹੀਂ ਹੈ:\n"
+"%1"
+
+#: tdefileio.cpp:57 tdefileio.cpp:129
+#, c-format
+msgid ""
+"This is a folder and not a file:\n"
+"%1"
+msgstr ""
+"ਇਹ ਫੋਲਡਰ ਹੈ ਫਾਇਲ ਨਹੀਂ:\n"
+"%1"
+
+#: tdefileio.cpp:63 tdefileio.cpp:136
+#, c-format
+msgid ""
+"You do not have read permissions to the file:\n"
+"%1"
+msgstr ""
+"ਤੁਹਾਨੂੰ ਫਾਇਲ ਪੜਨ ਲਈ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ:\n"
+"%1"
+
+#: tdefileio.cpp:74 tdefileio.cpp:147
+#, c-format
+msgid ""
+"Could not read file:\n"
+"%1"
+msgstr ""
+"ਫਾਇਲ ਪੜੀ ਨਹੀਂ ਜਾ ਸਕੀ:\n"
+"%1"
+
+#: tdefileio.cpp:77 tdefileio.cpp:150
+#, c-format
+msgid ""
+"Could not open file:\n"
+"%1"
+msgstr ""
+"ਫਾਇਲ ਖੋਲੀ ਨਹੀਂ ਜਾ ਸਕਦੀ:\n"
+"%1"
+
+#: tdefileio.cpp:80 tdefileio.cpp:153
+#, c-format
+msgid ""
+"Error while reading file:\n"
+"%1"
+msgstr ""
+"ਫਾਇਲ ਪੜਨ ਦੌਰਾਨ ਗਲਤੀ:\n"
+"%1"
+
+#: tdefileio.cpp:96 tdefileio.cpp:165
+msgid "Could only read %1 bytes of %2."
+msgstr "%2 ਵਿੱਚੋਂ ਸਿਰਫ਼ %1 ਹੀ ਪੜੇ ਜਾ ਸਕੇ ਹਨ।"
+
+#: tdefileio.cpp:193
+msgid ""
+"File %1 exists.\n"
+"Do you want to replace it?"
+msgstr ""
+"ਫਾਇਲ %1 ਮੌਜੂਦ ਹੈ।\n"
+"ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਤਬਦੀਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
+
+#: tdefileio.cpp:196 tdefileio.cpp:213
+msgid "Save to File"
+msgstr "ਫਾਇਲ ਵਿੱਚ ਸੰਭਾਲੋ"
+
+#: tdefileio.cpp:196
+msgid "&Replace"
+msgstr "ਤਬਦੀਲ(&R)"
+
+#: tdefileio.cpp:211
+msgid ""
+"Failed to make a backup copy of %1.\n"
+"Continue anyway?"
+msgstr ""
+"%1 ਦੀ ਬੈਕਅੱਪ ਨਕਲ ਬਣਾਉਣ ਲਈ ਅਸਫ਼ਲ ਹੈ।\n"
+"ਕੀ ਕਿਸੇ ਤਰਾਂ ਵੀ ਜਾਰੀ ਰੱਖਣਾ ਹੈ?"
+
+#: tdefileio.cpp:224 tdefileio.cpp:241
+#, c-format
+msgid ""
+"Could not write to file:\n"
+"%1"
+msgstr ""
+"ਫਾਇਲ ਨੂੰ ਲਿਖਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ:\n"
+"%1"
+
+#: tdefileio.cpp:227
+#, c-format
+msgid ""
+"Could not open file for writing:\n"
+"%1"
+msgstr ""
+"ਫਾਇਲ ਨੂੰ ਲਿਖਣ ਲਈ ਖੋਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ:\n"
+"%1"
+
+#: tdefileio.cpp:231
+#, c-format
+msgid ""
+"Error while writing file:\n"
+"%1"
+msgstr ""
+"ਫਾਇਲ ਲਿਖਣ ਦੌਰਾਨ ਗਲਤੀ:\n"
+"%1"
+
+#: tdefileio.cpp:246
+msgid "Could only write %1 bytes of %2."
+msgstr "%2 ਵਿੱਚੋਂ %1 ਬਾਈਟ ਹੀ ਲਿਖੇ ਜਾ ਸਕੇ।"
+
+#: tdefileio.cpp:285
+msgid "%1 does not exist"
+msgstr ""
+
+#: tdefileio.cpp:297
+msgid "%1 is not accessible and that is unchangeable."
+msgstr ""
+
+#: tdefileio.cpp:318
+msgid "%1 is not readable and that is unchangeable."
+msgstr ""
+
+#: tdefileio.cpp:334
+msgid "%1 is not writable and that is unchangeable."
+msgstr ""
+
+#: tdefileio.cpp:349
+msgid "Folder %1 is inaccessible."
+msgstr ""
+
+#: tdefileio.cpp:380
+msgid ""
+"Some files or folders do not have the right permissions, please correct them "
+"manually."
+msgstr ""
+
+#: tdefileio.cpp:383
+msgid "Permissions Check"
+msgstr ""
diff --git a/tde-i18n-pa/messages/tdepim/tdeabc2mutt.po b/tde-i18n-pa/messages/tdepim/tdeabc2mutt.po
index c5ee648c8cf..970b7cc601c 100644
--- a/tde-i18n-pa/messages/tdepim/tdeabc2mutt.po
+++ b/tde-i18n-pa/messages/tdepim/tdeabc2mutt.po
@@ -4,20 +4,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeabc2mutt\n"
-"POT-Creation-Date: 2005-04-12 18:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-04-20 17:43+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tdeabc2mutt.cpp:115
-msgid "preferred"
-msgstr "ਪਸੰਦ"
-
 #: main.cpp:30
 msgid "tdeabc2mutt"
 msgstr "tdeabc2mutt"
@@ -50,5 +47,10 @@ msgid "Return all mail addresses, not just the preferred one"
 msgstr ""
 
 #: main.cpp:70
-msgid "Searching TDE addressbook"
+#, fuzzy
+msgid "Searching KDE addressbook"
 msgstr "TDE ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਖੋਜ"
+
+#: tdeabc2mutt.cpp:115
+msgid "preferred"
+msgstr "ਪਸੰਦ"
diff --git a/tde-i18n-pa/messages/tdepim/tdeabc_slox.po b/tde-i18n-pa/messages/tdepim/tdeabc_slox.po
index 5f445e65a82..616a7647b29 100644
--- a/tde-i18n-pa/messages/tdepim/tdeabc_slox.po
+++ b/tde-i18n-pa/messages/tdepim/tdeabc_slox.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeabc_slox\n"
-"POT-Creation-Date: 2006-05-17 04:02+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-04-20 17:43+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,63 +28,35 @@ msgid ""
 "Your emails"
 msgstr "aalam@users.sf.net"
 
-#: tdeabcresourceslox.cpp:214
-msgid "Downloading contacts"
-msgstr "ਸੰਪਰਕ ਡਾਊਨਲੋਡ"
-
-#: tdeabcresourceslox.cpp:523
-#, fuzzy
-msgid "Uploading contacts"
-msgstr "ਸੰਪਰਕ ਡਾਊਨਲੋਡ"
-
-#: tdeabcresourcesloxconfig.cpp:47
-msgid "URL:"
-msgstr "URL:"
-
-#: tdeabcresourcesloxconfig.cpp:53 kcalresourcesloxconfig.cpp:56
-msgid "User:"
-msgstr "ਉਪਭੋਗੀ:"
-
-#: tdeabcresourcesloxconfig.cpp:59 kcalresourcesloxconfig.cpp:62
-msgid "Password:"
-msgstr "ਗੁਪਤ-ਕੋਡ:"
-
-#. i18n: file tderesources_tdeabc_slox.kcfg line 19
-#: tdeabcresourcesloxconfig.cpp:66 kcalresourcesloxconfig.cpp:69 rc.cpp:12
-#: rc.cpp:36
-#, no-c-format
-msgid "Only load data since last sync"
-msgstr "ਅੰਤਿਮ ਸਮਕਾਲੀ ਕਰਨ ਤੋਂ ਬਾਅਦ ਦਾ ਡਾਟਾ ਲੋਡ ਕਰੋ"
-
-#: tdeabcresourcesloxconfig.cpp:70
-msgid "Select Folder..."
-msgstr "ਫੋਲਡਰ ਚੁਣੋ..."
+#: kcalresourceslox.cpp:74 tdeabcresourceslox.cpp:53
+msgid "OpenXchange Server"
+msgstr ""
 
-#: kcalresourceslox.cpp:178
+#: kcalresourceslox.cpp:180
 msgid "Non-http protocol: '%1'"
 msgstr "ਨਾ-http ਪ੍ਰੋਟੋਕੋਲ: '%1'"
 
-#: kcalresourceslox.cpp:233
+#: kcalresourceslox.cpp:235
 msgid "Downloading events"
 msgstr "ਘਟਨਾ ਅੱਪਲੋਡ"
 
-#: kcalresourceslox.cpp:278
+#: kcalresourceslox.cpp:280
 msgid "Downloading to-dos"
 msgstr "ਕੰਮ-ਕਾਰ ਡਾਊਨਲੋਡ"
 
-#: kcalresourceslox.cpp:387
+#: kcalresourceslox.cpp:389
 msgid "Uploading incidence"
 msgstr "ਅਚਾਨਕ ਅੱਪਲੋਡਿੰਗ"
 
-#: kcalresourceslox.cpp:1226
+#: kcalresourceslox.cpp:1228
 msgid "Added"
 msgstr "ਸ਼ਾਮਲ ਕੀਤੇ"
 
-#: kcalresourceslox.cpp:1227
+#: kcalresourceslox.cpp:1229
 msgid "Changed"
 msgstr "ਬਦਲੇ"
 
-#: kcalresourceslox.cpp:1228
+#: kcalresourceslox.cpp:1230
 msgid "Deleted"
 msgstr "ਹਟਾਏ"
 
@@ -92,6 +65,21 @@ msgstr "ਹਟਾਏ"
 msgid "Download from:"
 msgstr "ਡਾਊਨਲੋਡ URL:"
 
+#: kcalresourcesloxconfig.cpp:56 tdeabcresourcesloxconfig.cpp:53
+msgid "User:"
+msgstr "ਉਪਭੋਗੀ:"
+
+#: kcalresourcesloxconfig.cpp:62 tdeabcresourcesloxconfig.cpp:59
+msgid "Password:"
+msgstr "ਗੁਪਤ-ਕੋਡ:"
+
+#. i18n: file tderesources_kcal_slox.kcfg line 25
+#: kcalresourcesloxconfig.cpp:69 rc.cpp:18 rc.cpp:36
+#: tdeabcresourcesloxconfig.cpp:66
+#, no-c-format
+msgid "Only load data since last sync"
+msgstr "ਅੰਤਿਮ ਸਮਕਾਲੀ ਕਰਨ ਤੋਂ ਬਾਅਦ ਦਾ ਡਾਟਾ ਲੋਡ ਕਰੋ"
+
 #: kcalresourcesloxconfig.cpp:73
 msgid "Calendar Folder..."
 msgstr "ਕੈਲੰਡਰ ਫੋਲਡਰ..."
@@ -100,60 +88,60 @@ msgstr "ਕੈਲੰਡਰ ਫੋਲਡਰ..."
 msgid "Task Folder..."
 msgstr ""
 
-#. i18n: file tderesources_tdeabc_slox.kcfg line 10
-#: rc.cpp:3 rc.cpp:21
+#. i18n: file tderesources_kcal_slox.kcfg line 10
+#: rc.cpp:3 rc.cpp:27
 #, no-c-format
 msgid "Base Url"
 msgstr "ਮੂਲ URL"
 
-#. i18n: file tderesources_tdeabc_slox.kcfg line 13
-#: rc.cpp:6 rc.cpp:24
+#. i18n: file tderesources_kcal_slox.kcfg line 13
+#: rc.cpp:6 rc.cpp:30
 #, no-c-format
 msgid "User Name"
 msgstr "ਉਪਭੋਗੀ ਨਾਂ"
 
-#. i18n: file tderesources_tdeabc_slox.kcfg line 16
-#: rc.cpp:9 rc.cpp:27
+#. i18n: file tderesources_kcal_slox.kcfg line 16
+#: rc.cpp:9 rc.cpp:33
 #, no-c-format
 msgid "Password"
 msgstr "ਗੁਪਤ-ਕੋਡ"
 
-#. i18n: file tderesources_tdeabc_slox.kcfg line 23
-#: rc.cpp:15 sloxfolderdialog.cpp:37
-#, no-c-format
-msgid "Folder ID"
-msgstr ""
-
-#. i18n: file tderesources_tdeabc_slox.kcfg line 27
-#: rc.cpp:18
-#, fuzzy, no-c-format
-msgid "Last Sync"
-msgstr "ਅੰਤਿਮ ਘਟਨਾ ਸਮਕਾਲੀ"
-
 #. i18n: file tderesources_kcal_slox.kcfg line 19
-#: rc.cpp:30
+#: rc.cpp:12
 #, no-c-format
 msgid "Last Event Sync"
 msgstr "ਅੰਤਿਮ ਘਟਨਾ ਸਮਕਾਲੀ"
 
 #. i18n: file tderesources_kcal_slox.kcfg line 22
-#: rc.cpp:33
+#: rc.cpp:15
 #, no-c-format
 msgid "Last To-do Sync"
 msgstr "ਅੰਤਿਮ ਕੰਮ-ਕਾਰ ਸਮਕਾਲੀ"
 
 #. i18n: file tderesources_kcal_slox.kcfg line 29
-#: rc.cpp:39
+#: rc.cpp:21
 #, no-c-format
 msgid "Calendar Folder"
 msgstr "ਕੈਲੰਡਰ ਫੋਲਡਰ"
 
 #. i18n: file tderesources_kcal_slox.kcfg line 33
-#: rc.cpp:42
+#: rc.cpp:24
 #, no-c-format
 msgid "Task Folder"
 msgstr ""
 
+#. i18n: file tderesources_tdeabc_slox.kcfg line 23
+#: rc.cpp:39 sloxfolderdialog.cpp:37
+#, no-c-format
+msgid "Folder ID"
+msgstr ""
+
+#. i18n: file tderesources_tdeabc_slox.kcfg line 27
+#: rc.cpp:42
+#, fuzzy, no-c-format
+msgid "Last Sync"
+msgstr "ਅੰਤਿਮ ਘਟਨਾ ਸਮਕਾਲੀ"
+
 #: sloxfolder.cpp:45
 msgid "Global Addressbook"
 msgstr ""
@@ -185,3 +173,20 @@ msgstr "ਸਾਂਝਾ ਫੋਲਡਰ"
 #: sloxfoldermanager.cpp:167
 msgid "System Folder"
 msgstr "ਸਿਸਟਮ ਫੋਲਡਰ"
+
+#: tdeabcresourceslox.cpp:216
+msgid "Downloading contacts"
+msgstr "ਸੰਪਰਕ ਡਾਊਨਲੋਡ"
+
+#: tdeabcresourceslox.cpp:529
+#, fuzzy
+msgid "Uploading contacts"
+msgstr "ਸੰਪਰਕ ਡਾਊਨਲੋਡ"
+
+#: tdeabcresourcesloxconfig.cpp:47
+msgid "URL:"
+msgstr "URL:"
+
+#: tdeabcresourcesloxconfig.cpp:70
+msgid "Select Folder..."
+msgstr "ਫੋਲਡਰ ਚੁਣੋ..."
diff --git a/tde-i18n-pa/messages/tdepim/tdefile_ics.po b/tde-i18n-pa/messages/tdepim/tdefile_ics.po
index 5aaa529116e..88740a7acc5 100644
--- a/tde-i18n-pa/messages/tdepim/tdefile_ics.po
+++ b/tde-i18n-pa/messages/tdepim/tdefile_ics.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_ics\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-04-20 17:46+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-pa/messages/tdepim/tdefile_palm.po b/tde-i18n-pa/messages/tdepim/tdefile_palm.po
index 94f298b1e5b..bcf88174386 100644
--- a/tde-i18n-pa/messages/tdepim/tdefile_palm.po
+++ b/tde-i18n-pa/messages/tdepim/tdefile_palm.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_palm\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-01-17 10:46+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-pa/messages/tdepim/tdefile_rfc822.po b/tde-i18n-pa/messages/tdepim/tdefile_rfc822.po
index 832bfc09f51..d9ab70bb776 100644
--- a/tde-i18n-pa/messages/tdepim/tdefile_rfc822.po
+++ b/tde-i18n-pa/messages/tdepim/tdefile_rfc822.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_rfc822\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-04-20 17:46+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-pa/messages/tdepim/tdefile_vcf.po b/tde-i18n-pa/messages/tdepim/tdefile_vcf.po
index d439a35bb6b..859b6765cba 100644
--- a/tde-i18n-pa/messages/tdepim/tdefile_vcf.po
+++ b/tde-i18n-pa/messages/tdepim/tdefile_vcf.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_vcf\n"
-"POT-Creation-Date: 2008-01-07 01:17+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-04-20 17:46+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-pa/messages/tdepim/tdeio_groupwise.po b/tde-i18n-pa/messages/tdepim/tdeio_groupwise.po
index 71e0a5d9d28..48338d465ba 100644
--- a/tde-i18n-pa/messages/tdepim/tdeio_groupwise.po
+++ b/tde-i18n-pa/messages/tdepim/tdeio_groupwise.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_groupwise\n"
-"POT-Creation-Date: 2006-12-12 02:40+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-04-20 17:47+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-pa/messages/tdepim/tdeio_imap4.po b/tde-i18n-pa/messages/tdepim/tdeio_imap4.po
index 3540bdaa4bf..258073a22bb 100644
--- a/tde-i18n-pa/messages/tdepim/tdeio_imap4.po
+++ b/tde-i18n-pa/messages/tdepim/tdeio_imap4.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_imap4\n"
-"POT-Creation-Date: 2008-01-26 01:19+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-04-20 17:48+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -109,11 +110,7 @@ msgstr ""
 "ਫੋਲਡਰ %1 ਲਈ ਪਹੁੰਚ ਕੰਟਰੋਲ ਸੂਚੀ( Access Control List) ਪ੍ਰਾਪਤ ਕਰਨ ਵਿੱਚ ਗਲਤੀ, ਸਰਵਰ "
 "ਦਾ ਜਵਾਬ:%2"
 
-#: imap4.cc:1783
-msgid "Unable to close mailbox."
-msgstr "ਪੱਤਰ-ਬਕਸਾ ਬੰਦ ਕਰਨ ਤੋਂ ਅਸਫਲ"
-
-#: imap4.cc:2051
+#: imap4.cc:2052
 msgid ""
 "The server %1 supports neither IMAP4 nor IMAP4rev1.\n"
 "It identified itself with: %2"
@@ -121,7 +118,7 @@ msgstr ""
 "ਸਰਵਰ %1 ਨਾ ਤਾਂ IMAP4 ਨਾ ਹੀ IMAP4rev1 ਲਈ ਸਹਾਇਕ ਹੈ।\n"
 "ਇਹ ਖੁਦ ਨੂ ਇਸਤਰਾਂ ਪਛਾਣਦਾ ਹੈ: %2"
 
-#: imap4.cc:2062
+#: imap4.cc:2063
 msgid ""
 "The server does not support TLS.\n"
 "Disable this security feature to connect unencrypted."
@@ -129,23 +126,23 @@ msgstr ""
 "ਸਰਵਰ TLS ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।\n"
 "ਬਿਨਾਂ -ਇੰਕ੍ਰਿਪਸ਼ਨ ਨਾਲ ਜੁੜਨ ਲਈ ਇਹ ਸੁਰੱਖਿਆ ਫੀਚਰ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
 
-#: imap4.cc:2087
+#: imap4.cc:2088
 msgid "Starting TLS failed."
 msgstr "TLS ਦੀ ਸ਼ੁਰੂਆਤ ਅਸਫਲ"
 
-#: imap4.cc:2096
+#: imap4.cc:2097
 msgid "LOGIN is disabled by the server."
 msgstr ""
 
-#: imap4.cc:2103
+#: imap4.cc:2104
 msgid "The authentication method %1 is not supported by the server."
 msgstr "ਸਰਵਰ ਤੇ ਪ੍ਰਮਾਣਿਕਤਾ ਢੰਗ %1 ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
 
-#: imap4.cc:2119
+#: imap4.cc:2132
 msgid "Username and password for your IMAP account:"
 msgstr "ਤੁਹਾਡੇ IMAP ਖਾਤੇ ਲਈ ਉਪਭੋਗੀ ਨਾਂ ਤੇ ਗੁਪਤ-ਕੋਡ:"
 
-#: imap4.cc:2133
+#: imap4.cc:2146
 #, fuzzy
 msgid ""
 "Unable to login. Probably the password is wrong.\n"
@@ -156,7 +153,7 @@ msgstr ""
 "ਸਰਵਰ ਦਾ ਜਵਾਬ:\n"
 "%1"
 
-#: imap4.cc:2140
+#: imap4.cc:2153
 #, fuzzy
 msgid ""
 "Unable to authenticate via %1.\n"
@@ -167,10 +164,13 @@ msgstr ""
 "ਸਰਵਰ ਦਾ ਜਵਾਬ\n"
 "%2"
 
-#: imap4.cc:2147
+#: imap4.cc:2160
 msgid "SASL authentication is not compiled into tdeio_imap4."
 msgstr ""
 
-#: imap4.cc:2691
+#: imap4.cc:2704
 msgid "Unable to open folder %1. The server replied: %2"
 msgstr "ਫੋਲਡਰ %1 ਖੋਲਣ ਵਿੱਚ ਅਸਫਲ। ਸਰਵਰ ਦਾ ਜਵਾਬ: %2"
+
+#~ msgid "Unable to close mailbox."
+#~ msgstr "ਪੱਤਰ-ਬਕਸਾ ਬੰਦ ਕਰਨ ਤੋਂ ਅਸਫਲ"
diff --git a/tde-i18n-pa/messages/tdepim/tdeio_mobile.po b/tde-i18n-pa/messages/tdepim/tdeio_mobile.po
index 47b45cbb93a..836e831a0b3 100644
--- a/tde-i18n-pa/messages/tdepim/tdeio_mobile.po
+++ b/tde-i18n-pa/messages/tdepim/tdeio_mobile.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_mobile\n"
-"POT-Creation-Date: 2004-12-11 01:22+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-04-20 17:48+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-pa/messages/tdepim/tdeio_sieve.po b/tde-i18n-pa/messages/tdepim/tdeio_sieve.po
index 685a2610cea..dd332d978ce 100644
--- a/tde-i18n-pa/messages/tdepim/tdeio_sieve.po
+++ b/tde-i18n-pa/messages/tdepim/tdeio_sieve.po
@@ -4,73 +4,114 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_sieve\n"
-"POT-Creation-Date: 2008-03-07 02:10+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-01-17 10:46+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: sieve.cpp:332
+#: sieve.cpp:343
 msgid "Connecting to %1..."
 msgstr "%1 ਨਾਲ ਜੁੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: sieve.cpp:335
+#: sieve.cpp:346
 msgid "The connection to the server was lost."
 msgstr "ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਖਤਮ ਹੋ ਗਿਆ ਹੈ।"
 
-#: sieve.cpp:347
+#: sieve.cpp:358
 msgid "Server identification failed."
 msgstr "ਸਰਵਰ ਪਛਾਣ ਫੇਲ੍ਹ ਹੋਈ ਹੈ।"
 
-#: sieve.cpp:374
+#: sieve.cpp:364
+msgid "Can not use TLS. Please enable TLS in the TDE cryptography setting."
+msgstr ""
+
+#: sieve.cpp:371
+msgid ""
+"TLS encryption was requested, but your Sieve server does not advertise TLS in "
+"its capabilities.\n"
+"You can choose to try to initiate TLS negotiations nonetheless, or cancel the "
+"operation."
+msgstr ""
+
+#: sieve.cpp:373
+msgid "Server Does Not Advertise TLS"
+msgstr ""
+
+#: sieve.cpp:373
+msgid "&Start TLS nonetheless"
+msgstr ""
+
+#: sieve.cpp:375
+msgid "TLS encryption requested, but not supported by server."
+msgstr ""
+
+#: sieve.cpp:399
+msgid ""
+"Your Sieve server claims to support TLS, but negotiation was unsuccessful."
+msgstr ""
+
+#: sieve.cpp:401
+#, fuzzy
+msgid "Connection Failed"
+msgstr "ਪਰਮਾਣਕਿਤਾ ਫ਼ੇਲ੍ਹ ਹੋ ਗਈ ਹੈ।"
+
+#: sieve.cpp:408
+msgid ""
+"The server does not seem to support TLS. Disable TLS if you want to connect "
+"without encryption."
+msgstr ""
+
+#: sieve.cpp:418
 msgid "Authenticating user..."
 msgstr "ਉਪਭੋਗੀ ਪਰਮਾਣਿਤ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
 
-#: sieve.cpp:377
+#: sieve.cpp:421
 msgid "Authentication failed."
 msgstr "ਪਰਮਾਣਕਿਤਾ ਫ਼ੇਲ੍ਹ ਹੋ ਗਈ ਹੈ।"
 
-#: sieve.cpp:441 sieve.cpp:653 sieve.cpp:743 sieve.cpp:777
+#: sieve.cpp:485 sieve.cpp:697 sieve.cpp:787 sieve.cpp:821
 msgid "Done."
 msgstr "ਮੁਕੰਮਲ"
 
-#: sieve.cpp:453
+#: sieve.cpp:497
 msgid "Activating script..."
 msgstr "ਸਕ੍ਰਿਪਟ ਸਰਗਰਮ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
 
-#: sieve.cpp:469
+#: sieve.cpp:513
 msgid "There was an error activating the script."
 msgstr "ਸਕ੍ਰਿਪਟ ਸਰਗਰਮ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਸੀ।"
 
-#: sieve.cpp:487
+#: sieve.cpp:531
 msgid "There was an error deactivating the script."
 msgstr "ਸਕ੍ਰਿਪਟ ਨਾ-ਸਰਗਰਮ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ।"
 
-#: sieve.cpp:515
+#: sieve.cpp:559
 msgid "Sending data..."
 msgstr "ਡਾਟਾ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: sieve.cpp:532
+#: sieve.cpp:576
 msgid "TDEIO data supply error."
 msgstr "TDEIO ਡਾਟਾ ਭੇਜਣ ਗਲਤੀ ਹੈ।"
 
-#: sieve.cpp:559
+#: sieve.cpp:603
 msgid "Quota exceeded"
 msgstr "ਕੋਟੇ ਤੋਂ ਵੱਧ ਗਿਆ"
 
-#: sieve.cpp:592 sieve.cpp:1156
+#: sieve.cpp:636 sieve.cpp:1200
 msgid "Network error."
 msgstr "ਨੈੱਟਵਰਕ ਗਲਤੀ ਹੈ।"
 
-#: sieve.cpp:603
+#: sieve.cpp:647
 msgid "Verifying upload completion..."
 msgstr "ਅੱਪਲੋਡ ਪੂਰਨਤਾ ਜਾਂਚ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
 
-#: sieve.cpp:629 sieve.cpp:637
+#: sieve.cpp:673 sieve.cpp:681
 #, c-format
 msgid ""
 "The script did not upload successfully.\n"
@@ -79,55 +120,55 @@ msgid ""
 "%1"
 msgstr ""
 
-#: sieve.cpp:642 sieve.cpp:646
+#: sieve.cpp:686 sieve.cpp:690
 msgid ""
 "The script did not upload successfully.\n"
 "The script may contain errors."
 msgstr ""
 
-#: sieve.cpp:681
+#: sieve.cpp:725
 msgid "Retrieving data..."
 msgstr "ਡਾਟਾ ਪ੍ਰਾਪਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: sieve.cpp:730
+#: sieve.cpp:774
 msgid "Finishing up..."
 msgstr "ਮੁਕੰਮਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: sieve.cpp:738
+#: sieve.cpp:782
 msgid "A protocol error occurred while trying to negotiate script downloading."
 msgstr ""
 
-#: sieve.cpp:750
+#: sieve.cpp:794
 msgid "Folders are not supported."
 msgstr "ਫੋਲਡਰ ਸਹਿਯੋਗੀ ਨਹੀਂ ਹੈ।"
 
-#: sieve.cpp:758
+#: sieve.cpp:802
 msgid "Deleting file..."
 msgstr "ਫਾਇਲ ਹਟਾਈ ਜਾ ਰਹੀ ਹੈ..."
 
-#: sieve.cpp:773
+#: sieve.cpp:817
 msgid "The server would not delete the file."
 msgstr "ਸਰਵਰ ਫਾਇਲ ਨਹੀਂ ਹਟਾਏਗਾ।"
 
-#: sieve.cpp:792
+#: sieve.cpp:836
 msgid "Cannot chmod to anything but 0700 (active) or 0600 (inactive script)."
 msgstr ""
 
-#: sieve.cpp:941
+#: sieve.cpp:985
 msgid "No authentication details supplied."
 msgstr "ਕੋਈ ਪਰਮਾਣਕਤਾ ਵੇਰਵਾ ਭੇਜਿਆ ਨਹੀ ਗਿਆ ਹੈ।"
 
-#: sieve.cpp:999
+#: sieve.cpp:1043
 msgid "Sieve Authentication Details"
 msgstr ""
 
-#: sieve.cpp:1000
+#: sieve.cpp:1044
 msgid ""
 "Please enter your authentication details for your sieve account (usually the "
 "same as your email password):"
 msgstr ""
 
-#: sieve.cpp:1067 sieve.cpp:1079
+#: sieve.cpp:1111 sieve.cpp:1123
 #, c-format
 msgid ""
 "A protocol error occurred during authentication.\n"
@@ -136,7 +177,7 @@ msgstr ""
 "ਪ੍ਰਮਾਣਕਿਤਾ ਦੌਰਾਨ ਇੱਕ ਪਰੋਟੋਕਾਲ ਗਲਤੀ ਆਈ ਹੈ।\n"
 "ਕਿਰਪਾ ਕਰਕੇ %1 ਲਈ ਵੱਖਰਾ ਪ੍ਰਮਾਣਕਿਤਾ ਢੰਗ ਚੁਣੋ।"
 
-#: sieve.cpp:1127
+#: sieve.cpp:1171
 #, c-format
 msgid ""
 "Authentication failed.\n"
@@ -149,6 +190,6 @@ msgstr ""
 "ਸਰਵਰ ਦਾ ਜਵਾਬ:\n"
 "%1"
 
-#: sieve.cpp:1205
+#: sieve.cpp:1249
 msgid "A protocol error occurred."
 msgstr "ਇੱਕ ਪ੍ਰੋਟੋਕਾਲ ਗਲਤੀ ਆਈ ਹੈ।"
diff --git a/tde-i18n-pa/messages/tdepim/tdepimresources.po b/tde-i18n-pa/messages/tdepim/tdepimresources.po
index f8d3c7fba66..8509c72d83f 100644
--- a/tde-i18n-pa/messages/tdepim/tdepimresources.po
+++ b/tde-i18n-pa/messages/tdepim/tdepimresources.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdepimresources\n"
-"POT-Creation-Date: 2005-03-13 01:24+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-04-20 17:45+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -105,29 +106,6 @@ msgstr ""
 "1 ਇਕਾਈ ਨੂੰ ਅੱਪਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ।\n"
 "%n ਇਕਾਈਆਂ ਨੂੰ ਅੱਪਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ।"
 
-#: tdeabc_resourcegroupwarebase.cpp:92
-msgid "Downloading addressbook"
-msgstr "ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਡਾਊਨਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
-
-#: tdeabc_resourcegroupwarebase.cpp:93
-msgid "Uploading addressbook"
-msgstr "ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਅੱਪਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
-
-#: tdeabc_resourcegroupwarebaseconfig.cpp:45
-#: kcal_resourcegroupwarebaseconfig.cpp:54
-msgid "URL:"
-msgstr "URL:"
-
-#: tdeabc_resourcegroupwarebaseconfig.cpp:51
-#: kcal_resourcegroupwarebaseconfig.cpp:59
-msgid "User:"
-msgstr "ਉਪਭੋਗੀ:"
-
-#: tdeabc_resourcegroupwarebaseconfig.cpp:57
-#: kcal_resourcegroupwarebaseconfig.cpp:64
-msgid "Password:"
-msgstr "ਗੁਪਤ-ਕੋਡ:"
-
 #: kcal_cachesettingsdlg.cpp:42
 msgid "Resource Cache Settings"
 msgstr "ਸਰੋਤ ਕੈਂਚੇ ਸਥਾਪਨ"
@@ -144,6 +122,21 @@ msgstr "ਤਬਦੀਲ"
 msgid "Deleted"
 msgstr "ਹਟਾਏ"
 
+#: kcal_resourcegroupwarebaseconfig.cpp:54
+#: tdeabc_resourcegroupwarebaseconfig.cpp:45
+msgid "URL:"
+msgstr "URL:"
+
+#: kcal_resourcegroupwarebaseconfig.cpp:59
+#: tdeabc_resourcegroupwarebaseconfig.cpp:51
+msgid "User:"
+msgstr "ਉਪਭੋਗੀ:"
+
+#: kcal_resourcegroupwarebaseconfig.cpp:64
+#: tdeabc_resourcegroupwarebaseconfig.cpp:57
+msgid "Password:"
+msgstr "ਗੁਪਤ-ਕੋਡ:"
+
 #: kcal_resourcegroupwarebaseconfig.cpp:76
 msgid "Configure Cache Settings..."
 msgstr "ਕੈਂਚੇ ਵਿਵਸਲਾ ਸੰਰਚਨਾ..."
@@ -207,3 +200,11 @@ msgstr ""
 "ਵੱਖਰੀਆਂ ਡਾਟਾ ਕਿਸਮਾਂ ਲਈ ਮੂਲ ਨਿਯਤ ਲੜੀ ਅਨੁਸਾਰ ਹੇਠ\n"
 "ਦਿੱਤਾ ਹੈ:\n"
 "ਘਟਨਾ, ਕਰਨ ਲਈ, ਜਰਨਲ, ਸੰਪਰਕ, ਸਭ, ਅਣਜਾਣ"
+
+#: tdeabc_resourcegroupwarebase.cpp:92
+msgid "Downloading addressbook"
+msgstr "ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਡਾਊਨਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+
+#: tdeabc_resourcegroupwarebase.cpp:93
+msgid "Uploading addressbook"
+msgstr "ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਅੱਪਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
diff --git a/tde-i18n-pa/messages/tdepim/tdepimwizards.po b/tde-i18n-pa/messages/tdepim/tdepimwizards.po
index e5f5dd57bfc..bd89e1425be 100644
--- a/tde-i18n-pa/messages/tdepim/tdepimwizards.po
+++ b/tde-i18n-pa/messages/tdepim/tdepimwizards.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdepimwizards\n"
-"POT-Creation-Date: 2008-01-26 01:19+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-04-20 17:46+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,7 +33,7 @@ msgid "Create eGroupware Addressbook Resource"
 msgstr "ਈ-ਗਰੁੱਪਵੇਅਰ ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਸਰੋਤ ਬਣਾਓ"
 
 #: egroupwarewizard.cpp:78 egroupwarewizard.cpp:139 egroupwarewizard.cpp:205
-#: overviewpage.cpp:64
+#: overviewpage.cpp:67
 msgid "eGroupware"
 msgstr "ਈ-ਗਰੁੱਪਵੇਅਰ"
 
@@ -179,7 +180,7 @@ msgstr "ਗਰੁੱਪਵਾਈਜ਼ ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ
 msgid "Update GroupWise Addressbook Resource"
 msgstr "ਗਰੁੱਪਵਾਈਜ਼ ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਸਰੋਤ ਅੱਪਡੇਟ"
 
-#: groupwisewizard.cpp:271 overviewpage.cpp:78
+#: groupwisewizard.cpp:271
 msgid "Novell GroupWise"
 msgstr "ਨੋਵਲ ਗਰੁੱਪਵਾਈਜ਼"
 
@@ -231,7 +232,7 @@ msgstr ""
 msgid "Create Disconnected IMAP Account for KMail"
 msgstr "ਕੇ-ਮੇਲ ਲਈ ਨਾ-ਜੁੜਿਆ IMAP ਖਾਤਾ ਬਣਾਓ"
 
-#: kmailchanges.cpp:309
+#: kmailchanges.cpp:310
 #, fuzzy
 msgid "Create Online IMAP Account for KMail"
 msgstr "ਕੇ-ਮੇਲ ਲਈ ਨਾ-ਜੁੜਿਆ IMAP ਖਾਤਾ ਬਣਾਓ"
@@ -300,18 +301,19 @@ msgid "TDE-PIM Groupware Configuration Wizard"
 msgstr "TDE-PIM ਗਰੁੱਪਵੇਅਰ ਸੰਰਚਨਾ ਸਹਾਇਕ"
 
 #: overviewpage.cpp:61
-msgid "Select the type of server you want connect your TDE to:"
+#, fuzzy
+msgid "Select the type of server you want TDE to connect:"
 msgstr "ਆਪਣੇ TDE ਨੂੰ ਜੋੜਨ ਲਈ ਵਰਤੇ ਜਾਣ ਵਾਲੇ ਸਰਵਰ ਦੀ ਕਿਸਮ ਚੁਣੋ:"
 
-#: overviewpage.cpp:70
+#: overviewpage.cpp:75
 msgid "Kolab"
 msgstr "ਕੋਲਬ"
 
-#: overviewpage.cpp:74
+#: overviewpage.cpp:81
 msgid "SUSE Linux Openexchange (SLOX)"
 msgstr "SUSE Linux Openexchange (SLOX)"
 
-#: overviewpage.cpp:82
+#: overviewpage.cpp:87
 msgid "Microsoft Exchange"
 msgstr "Microsoft Exchange"
 
@@ -407,8 +409,8 @@ msgstr "KCal ਸਰੋਤ ਦਾ ID"
 
 #. i18n: file groupwise.kcfg line 56
 #: rc.cpp:60 rc.cpp:111
-#, no-c-format
-msgid "Id of KABC resource"
+#, fuzzy, no-c-format
+msgid "Id of TDEABC resource"
 msgstr "KABC ਸਰੋਤ ਦਾ ID"
 
 #. i18n: file groupwise.kcfg line 59
author	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2014-09-29 03:08:03 -0500
committer	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2014-09-29 03:08:03 -0500
commit	242434109c14a494dee7738b9c343f5947d20506 (patch)
tree	ea25930767128361a7669f1a25a479a66ccdfbeb /tde-i18n-pa/messages/tdepim
parent	8819501c6a160b7ae106b1a968bc953b0f0bc465 (diff)
download	tde-i18n-242434109c14a494dee7738b9c343f5947d20506.tar.gz tde-i18n-242434109c14a494dee7738b9c343f5947d20506.zip