9 commits - About_Kolab_Groupware/de-DE About_Kolab_Groupware/es-ES About_Kolab_Groupware/ja-JP About_Kolab_Groupware/nl-NL About_Kolab_Groupware/pot About_Kolab_Groupware/.tx Administrator_Guide/de-DE Administrator_Guide/en-US Administrator_Guide/es-ES Administrator_Guide/fr-FR Administrator_Guide/ja-JP Administrator_Guide/nl-NL Administrator_Guide/pot Administrator_Guide/.tx Architecture_and_Design/de-DE Architecture_and_Design/es-ES Architecture_and_Design/ja-JP Architecture_and_Design/nl-NL Architecture_and_Design/pot Architecture_and_Design/.tx Deployment_Guide/de-DE Deployment_Guide/es-ES Deployment_Guide/ja-JP Deployment_Guide/nl-NL Deployment_Guide/pot Deployment_Guide/.tx Development_Manual/de-DE Development_Manual/es-ES Development_Manual/ja-JP Development_Manual/nl-NL Development_Manual/pot Development_Manual/.tx Installation_Guide/de-DE Installation_Guide/en-US Installation_Guide/es-ES Installation_Guide/ja-JP Installation_Guide/nl-NL Installation_Guide/pot Installation_Guide/.tx Makefile.common Release_Notes/de-DE Release_Notes/es-ES Release_Notes/ja-JP Release_Notes/nl-NL Release_Notes/pot Release_Notes/.tx Testing_Reference/de-DE Testing_Reference/es-ES Testing_Reference/ja-JP Testing_Reference/nl-NL Testing_Reference/pot Testing_Reference/.tx

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Mon Sep 3 14:14:36 CEST 2012


 About_Kolab_Groupware/.tx/config                                                          |    2 
 About_Kolab_Groupware/de-DE/About_Kolab_Groupware.po                                      |    2 
 About_Kolab_Groupware/de-DE/Article_Info.po                                               |    2 
 About_Kolab_Groupware/de-DE/Revision_History.po                                           |    2 
 About_Kolab_Groupware/de-DE/sect-About_Kolab_Groupware.po                                 |    2 
 About_Kolab_Groupware/de-DE/sect-Feedback.po                                              |    2 
 About_Kolab_Groupware/de-DE/sect-Kolab_Product_Series.po                                  |    2 
 About_Kolab_Groupware/de-DE/sect-Supported_Platforms_and_System_Requirements.po           |    4 
 About_Kolab_Groupware/es-ES/About_Kolab_Groupware.po                                      |    2 
 About_Kolab_Groupware/es-ES/Article_Info.po                                               |    2 
 About_Kolab_Groupware/es-ES/Revision_History.po                                           |    2 
 About_Kolab_Groupware/es-ES/sect-About_Kolab_Groupware.po                                 |    2 
 About_Kolab_Groupware/es-ES/sect-Feedback.po                                              |    2 
 About_Kolab_Groupware/es-ES/sect-Kolab_Product_Series.po                                  |    2 
 About_Kolab_Groupware/es-ES/sect-Supported_Platforms_and_System_Requirements.po           |   20 
 About_Kolab_Groupware/ja-JP/About_Kolab_Groupware.po                                      |   47 
 About_Kolab_Groupware/ja-JP/Article_Info.po                                               |   31 
 About_Kolab_Groupware/ja-JP/Author_Group.po                                               |   49 
 About_Kolab_Groupware/ja-JP/Revision_History.po                                           |   36 
 About_Kolab_Groupware/ja-JP/sect-About_Kolab_Groupware.po                                 |  119 
 About_Kolab_Groupware/ja-JP/sect-Feedback.po                                              |  177 
 About_Kolab_Groupware/ja-JP/sect-Kolab_Product_Series.po                                  |  168 
 About_Kolab_Groupware/ja-JP/sect-Supported_Platforms_and_System_Requirements.po           |   71 
 About_Kolab_Groupware/nl-NL/About_Kolab_Groupware.po                                      |    2 
 About_Kolab_Groupware/nl-NL/Article_Info.po                                               |    2 
 About_Kolab_Groupware/nl-NL/Revision_History.po                                           |    2 
 About_Kolab_Groupware/nl-NL/sect-About_Kolab_Groupware.po                                 |    2 
 About_Kolab_Groupware/nl-NL/sect-Feedback.po                                              |    2 
 About_Kolab_Groupware/nl-NL/sect-Kolab_Product_Series.po                                  |    2 
 About_Kolab_Groupware/nl-NL/sect-Supported_Platforms_and_System_Requirements.po           |    4 
 About_Kolab_Groupware/pot/About_Kolab_Groupware.pot                                       |    4 
 About_Kolab_Groupware/pot/Article_Info.pot                                                |    4 
 About_Kolab_Groupware/pot/Author_Group.pot                                                |    4 
 About_Kolab_Groupware/pot/Revision_History.pot                                            |    4 
 About_Kolab_Groupware/pot/sect-About_Kolab_Groupware.pot                                  |    4 
 About_Kolab_Groupware/pot/sect-Feedback.pot                                               |    4 
 About_Kolab_Groupware/pot/sect-Kolab_Product_Series.pot                                   |    4 
 About_Kolab_Groupware/pot/sect-Supported_Platforms_and_System_Requirements.pot            |    4 
 Administrator_Guide/.tx/config                                                            |    2 
 Administrator_Guide/de-DE/Combating_Spam.po                                               |    2 
 Administrator_Guide/de-DE/Configuring_the_Kolab_Server.po                                 |    2 
 Administrator_Guide/de-DE/Detailed_Kolab_Server_Overview.po                               |    2 
 Administrator_Guide/de-DE/Kolab_Web_Administration_Panel.po                               |    2 
 Administrator_Guide/de-DE/Preface.po                                                      |    2 
 Administrator_Guide/de-DE/Revision_History.po                                             |    2 
 Administrator_Guide/de-DE/Tweaking_Tips_for_389_Directory_Server.po                       |    2 
 Administrator_Guide/de-DE/Tweaking_Tips_for_Cyrus_IMAP.po                                 |    2 
 Administrator_Guide/de-DE/Tweaking_Tips_for_Postfix.po                                    |   69 
 Administrator_Guide/de-DE/Tweaking_Tips_for_Roundcube.po                                  |    2 
 Administrator_Guide/de-DE/Upgrading_Accounts_from_Kolab_Format_version_2.po               |    2 
 Administrator_Guide/de-DE/Upgrading_from_Kolab_2_on_OpenPKG.po                            |    8 
 Administrator_Guide/de-DE/Verifying_the_Installation.po                                   |    2 
 Administrator_Guide/de-DE/chap-About_Kolab_Groupware.po                                   |    2 
 Administrator_Guide/de-DE/part-Clients.po                                                 |    2 
 Administrator_Guide/de-DE/part-Kolab_Server.po                                            |    2 
 Administrator_Guide/de-DE/sect-About_Kolab_Groupware.po                                   |    2 
 Administrator_Guide/de-DE/sect-Feedback.po                                                |    2 
 Administrator_Guide/de-DE/sect-Kolab_Product_Series.po                                    |    2 
 Administrator_Guide/de-DE/sect-Supported_Platforms_and_System_Requirements.po             |    4 
 Administrator_Guide/de-DE/step-convert-seen-databases.po                                  |    2 
 Administrator_Guide/de-DE/step-select-all-mailboxes.po                                    |    2 
 Administrator_Guide/en-US/Administrator_Guide.xml                                         |   10 
 Administrator_Guide/en-US/Book_Info.xml                                                   |   40 
 Administrator_Guide/en-US/Combating_Spam.xml                                              | 1318 +++---
 Administrator_Guide/en-US/Configuring_the_Kolab_Server.xml                                |  265 -
 Administrator_Guide/en-US/Detailed_Kolab_Server_Overview.xml                              |  776 ++--
 Administrator_Guide/en-US/Kolab_Web_Administration_Panel.xml                              |  658 +--
 Administrator_Guide/en-US/Preface.xml                                                     |    8 
 Administrator_Guide/en-US/Revision_History.xml                                            |   38 
 Administrator_Guide/en-US/Tweaking_Tips_for_389_Directory_Server.xml                      |  230 -
 Administrator_Guide/en-US/Tweaking_Tips_for_Cyrus_IMAP.xml                                |  302 -
 Administrator_Guide/en-US/Tweaking_Tips_for_Postfix.xml                                   |   68 
 Administrator_Guide/en-US/Tweaking_Tips_for_Roundcube.xml                                 |  348 -
 Administrator_Guide/en-US/Upgrading_Accounts_from_Kolab_Format_version_2.xml              |   72 
 Administrator_Guide/en-US/Upgrading_Cyrus_IMAP_from_2.3_to_2.4.xml                        |  222 -
 Administrator_Guide/en-US/Upgrading_from_Kolab_2_on_OpenPKG.xml                           |  500 +-
 Administrator_Guide/en-US/Verifying_the_Installation.xml                                  |  608 +--
 Administrator_Guide/en-US/chap-About_Kolab_Groupware.xml                                  |   38 
 Administrator_Guide/en-US/part-Clients.xml                                                |    8 
 Administrator_Guide/en-US/part-Kolab_Server.xml                                           |   24 
 Administrator_Guide/en-US/sect-Kolab_Recipient_Policy_and_Web_Administration_Panel.xml    |  464 ++
 Administrator_Guide/es-ES/Combating_Spam.po                                               |    2 
 Administrator_Guide/es-ES/Configuring_the_Kolab_Server.po                                 |    2 
 Administrator_Guide/es-ES/Detailed_Kolab_Server_Overview.po                               |    2 
 Administrator_Guide/es-ES/Kolab_Web_Administration_Panel.po                               |    2 
 Administrator_Guide/es-ES/Preface.po                                                      |    2 
 Administrator_Guide/es-ES/Revision_History.po                                             |    2 
 Administrator_Guide/es-ES/Tweaking_Tips_for_389_Directory_Server.po                       |    2 
 Administrator_Guide/es-ES/Tweaking_Tips_for_Cyrus_IMAP.po                                 |    2 
 Administrator_Guide/es-ES/Tweaking_Tips_for_Postfix.po                                    |   69 
 Administrator_Guide/es-ES/Tweaking_Tips_for_Roundcube.po                                  |    2 
 Administrator_Guide/es-ES/Upgrading_Accounts_from_Kolab_Format_version_2.po               |    2 
 Administrator_Guide/es-ES/Upgrading_from_Kolab_2_on_OpenPKG.po                            |    8 
 Administrator_Guide/es-ES/Verifying_the_Installation.po                                   |    2 
 Administrator_Guide/es-ES/chap-About_Kolab_Groupware.po                                   |    2 
 Administrator_Guide/es-ES/part-Clients.po                                                 |    2 
 Administrator_Guide/es-ES/part-Kolab_Server.po                                            |    2 
 Administrator_Guide/es-ES/sect-About_Kolab_Groupware.po                                   |    2 
 Administrator_Guide/es-ES/sect-Feedback.po                                                |    2 
 Administrator_Guide/es-ES/sect-Kolab_Product_Series.po                                    |    2 
 Administrator_Guide/es-ES/sect-Supported_Platforms_and_System_Requirements.po             |    4 
 Administrator_Guide/es-ES/step-convert-seen-databases.po                                  |    2 
 Administrator_Guide/es-ES/step-select-all-mailboxes.po                                    |    2 
 Administrator_Guide/fr-FR/Tweaking_Tips_for_Postfix.po                                    |   56 
 Administrator_Guide/fr-FR/Upgrading_from_Kolab_2_on_OpenPKG.po                            |    6 
 Administrator_Guide/ja-JP/Administrator_Guide.po                                          |   14 
 Administrator_Guide/ja-JP/Author_Group.po                                                 |   49 
 Administrator_Guide/ja-JP/Book_Info.po                                                    |   34 
 Administrator_Guide/ja-JP/Combating_Spam.po                                               |  990 +++++
 Administrator_Guide/ja-JP/Configuring_the_Kolab_Server.po                                 |  234 +
 Administrator_Guide/ja-JP/Detailed_Kolab_Server_Overview.po                               |  389 ++
 Administrator_Guide/ja-JP/Kolab_Web_Administration_Panel.po                               |  501 ++
 Administrator_Guide/ja-JP/Preface.po                                                      |   21 
 Administrator_Guide/ja-JP/Revision_History.po                                             |   36 
 Administrator_Guide/ja-JP/Tweaking_Tips_for_389_Directory_Server.po                       |  466 ++
 Administrator_Guide/ja-JP/Tweaking_Tips_for_Cyrus_IMAP.po                                 |  305 +
 Administrator_Guide/ja-JP/Tweaking_Tips_for_Postfix.po                                    |   89 
 Administrator_Guide/ja-JP/Tweaking_Tips_for_Roundcube.po                                  |  184 
 Administrator_Guide/ja-JP/Upgrading_Accounts_from_Kolab_Format_version_2.po               |  149 
 Administrator_Guide/ja-JP/Upgrading_Cyrus_IMAP_from_2.3_to_2.4.po                         |  213 +
 Administrator_Guide/ja-JP/Upgrading_from_Kolab_2_on_OpenPKG.po                            |  507 ++
 Administrator_Guide/ja-JP/Verifying_the_Installation.po                                   |  273 +
 Administrator_Guide/ja-JP/chap-About_Kolab_Groupware.po                                   |   51 
 Administrator_Guide/ja-JP/part-Clients.po                                                 |   21 
 Administrator_Guide/ja-JP/part-Kolab_Server.po                                            |   21 
 Administrator_Guide/ja-JP/sect-About_Kolab_Groupware.po                                   |  119 
 Administrator_Guide/ja-JP/sect-Feedback.po                                                |  177 
 Administrator_Guide/ja-JP/sect-Kolab_Product_Series.po                                    |  168 
 Administrator_Guide/ja-JP/sect-Supported_Platforms_and_System_Requirements.po             |   71 
 Administrator_Guide/ja-JP/step-convert-seen-databases.po                                  |   37 
 Administrator_Guide/ja-JP/step-select-all-mailboxes.po                                    |  123 
 Administrator_Guide/nl-NL/Combating_Spam.po                                               |    2 
 Administrator_Guide/nl-NL/Configuring_the_Kolab_Server.po                                 |    2 
 Administrator_Guide/nl-NL/Detailed_Kolab_Server_Overview.po                               |    2 
 Administrator_Guide/nl-NL/Kolab_Web_Administration_Panel.po                               |    2 
 Administrator_Guide/nl-NL/Preface.po                                                      |    2 
 Administrator_Guide/nl-NL/Revision_History.po                                             |    2 
 Administrator_Guide/nl-NL/Tweaking_Tips_for_389_Directory_Server.po                       |    2 
 Administrator_Guide/nl-NL/Tweaking_Tips_for_Cyrus_IMAP.po                                 |    2 
 Administrator_Guide/nl-NL/Tweaking_Tips_for_Postfix.po                                    |   69 
 Administrator_Guide/nl-NL/Tweaking_Tips_for_Roundcube.po                                  |    2 
 Administrator_Guide/nl-NL/Upgrading_Accounts_from_Kolab_Format_version_2.po               |    2 
 Administrator_Guide/nl-NL/Upgrading_from_Kolab_2_on_OpenPKG.po                            |    8 
 Administrator_Guide/nl-NL/Verifying_the_Installation.po                                   |    2 
 Administrator_Guide/nl-NL/chap-About_Kolab_Groupware.po                                   |    2 
 Administrator_Guide/nl-NL/part-Clients.po                                                 |    2 
 Administrator_Guide/nl-NL/part-Kolab_Server.po                                            |    2 
 Administrator_Guide/nl-NL/sect-About_Kolab_Groupware.po                                   |    2 
 Administrator_Guide/nl-NL/sect-Feedback.po                                                |    2 
 Administrator_Guide/nl-NL/sect-Kolab_Product_Series.po                                    |    2 
 Administrator_Guide/nl-NL/sect-Supported_Platforms_and_System_Requirements.po             |    4 
 Administrator_Guide/nl-NL/step-convert-seen-databases.po                                  |    2 
 Administrator_Guide/nl-NL/step-select-all-mailboxes.po                                    |    2 
 Administrator_Guide/pot/Administrator_Guide.pot                                           |    4 
 Administrator_Guide/pot/Author_Group.pot                                                  |    4 
 Administrator_Guide/pot/Book_Info.pot                                                     |    4 
 Administrator_Guide/pot/Combating_Spam.pot                                                |    4 
 Administrator_Guide/pot/Configuring_the_Kolab_Server.pot                                  |    6 
 Administrator_Guide/pot/Detailed_Kolab_Server_Overview.pot                                |    4 
 Administrator_Guide/pot/Kolab_Web_Administration_Panel.pot                                |    4 
 Administrator_Guide/pot/Preface.pot                                                       |    4 
 Administrator_Guide/pot/Revision_History.pot                                              |    4 
 Administrator_Guide/pot/Tweaking_Tips_for_389_Directory_Server.pot                        |    4 
 Administrator_Guide/pot/Tweaking_Tips_for_Cyrus_IMAP.pot                                  |    4 
 Administrator_Guide/pot/Tweaking_Tips_for_Postfix.pot                                     |   56 
 Administrator_Guide/pot/Tweaking_Tips_for_Roundcube.pot                                   |    4 
 Administrator_Guide/pot/Upgrading_Accounts_from_Kolab_Format_version_2.pot                |    4 
 Administrator_Guide/pot/Upgrading_Cyrus_IMAP_from_2.3_to_2.4.pot                          |    4 
 Administrator_Guide/pot/Upgrading_from_Kolab_2_on_OpenPKG.pot                             |    8 
 Administrator_Guide/pot/Verifying_the_Installation.pot                                    |    4 
 Administrator_Guide/pot/chap-About_Kolab_Groupware.pot                                    |    4 
 Administrator_Guide/pot/part-Clients.pot                                                  |    4 
 Administrator_Guide/pot/part-Kolab_Server.pot                                             |    4 
 Administrator_Guide/pot/sect-About_Kolab_Groupware.pot                                    |    4 
 Administrator_Guide/pot/sect-Feedback.pot                                                 |    4 
 Administrator_Guide/pot/sect-Kolab_Product_Series.pot                                     |    4 
 Administrator_Guide/pot/sect-Kolab_Recipient_Policy_and_Web_Administration_Panel.pot      |  154 
 Administrator_Guide/pot/sect-Supported_Platforms_and_System_Requirements.pot              |    4 
 Administrator_Guide/pot/step-convert-seen-databases.pot                                   |    4 
 Administrator_Guide/pot/step-select-all-mailboxes.pot                                     |    4 
 Architecture_and_Design/.tx/config                                                        |    2 
 Architecture_and_Design/de-DE/Administration_Panel.po                                     |   47 
 Architecture_and_Design/de-DE/Akonadi_for_Integration_and_Caching.po                      |    2 
 Architecture_and_Design/de-DE/Archiving_amp_Discovery.po                                  |    2 
 Architecture_and_Design/de-DE/Authentication_amp_Authorization.po                         |    2 
 Architecture_and_Design/de-DE/Calendaring.po                                              |   11 
 Architecture_and_Design/de-DE/Configuration_Management.po                                 |    2 
 Architecture_and_Design/de-DE/Email.po                                                    |   33 
 Architecture_and_Design/de-DE/Enforcing_Entitlements.po                                   |    2 
 Architecture_and_Design/de-DE/Feature_FAQ.po                                              |    2 
 Architecture_and_Design/de-DE/Free_Busy.po                                                |    2 
 Architecture_and_Design/de-DE/Groupware_Overview.po                                       |    2 
 Architecture_and_Design/de-DE/Integration_amp_Interoperability.po                         |    2 
 Architecture_and_Design/de-DE/Kolab_Content_Filters.po                                    |    2 
 Architecture_and_Design/de-DE/Kolab_Daemon.po                                             |    2 
 Architecture_and_Design/de-DE/Kolab_Objects.po                                            |    2 
 Architecture_and_Design/de-DE/Kolab_SMTP_Access_Policy.po                                 |    2 
 Architecture_and_Design/de-DE/Kolab_Server_Overview.po                                    |    2 
 Architecture_and_Design/de-DE/Migration.po                                                |    2 
 Architecture_and_Design/de-DE/Mobile_Device_Synchronization.po                            |   15 
 Architecture_and_Design/de-DE/Preface.po                                                  |    2 
 Architecture_and_Design/de-DE/Revision_History.po                                         |    2 
 Architecture_and_Design/de-DE/Smart_Clients.po                                            |    2 
 Architecture_and_Design/de-DE/Terminology.po                                              |    2 
 Architecture_and_Design/de-DE/sect-About_Kolab_Groupware.po                               |    2 
 Architecture_and_Design/de-DE/sect-Feedback.po                                            |    2 
 Architecture_and_Design/de-DE/sect-Kolab_Product_Series.po                                |    2 
 Architecture_and_Design/de-DE/sect-Supported_Platforms_and_System_Requirements.po         |    4 
 Architecture_and_Design/es-ES/Administration_Panel.po                                     |    2 
 Architecture_and_Design/es-ES/Akonadi_for_Integration_and_Caching.po                      |    2 
 Architecture_and_Design/es-ES/Archiving_amp_Discovery.po                                  |    2 
 Architecture_and_Design/es-ES/Authentication_amp_Authorization.po                         |    2 
 Architecture_and_Design/es-ES/Calendaring.po                                              |    2 
 Architecture_and_Design/es-ES/Configuration_Management.po                                 |    2 
 Architecture_and_Design/es-ES/Email.po                                                    |    2 
 Architecture_and_Design/es-ES/Enforcing_Entitlements.po                                   |    2 
 Architecture_and_Design/es-ES/Feature_FAQ.po                                              |    2 
 Architecture_and_Design/es-ES/Free_Busy.po                                                |    2 
 Architecture_and_Design/es-ES/Groupware_Overview.po                                       |   47 
 Architecture_and_Design/es-ES/Integration_amp_Interoperability.po                         |    2 
 Architecture_and_Design/es-ES/Kolab_Content_Filters.po                                    |    2 
 Architecture_and_Design/es-ES/Kolab_Daemon.po                                             |    2 
 Architecture_and_Design/es-ES/Kolab_Objects.po                                            |    2 
 Architecture_and_Design/es-ES/Kolab_SMTP_Access_Policy.po                                 |    2 
 Architecture_and_Design/es-ES/Kolab_Server_Overview.po                                    |    2 
 Architecture_and_Design/es-ES/Migration.po                                                |    2 
 Architecture_and_Design/es-ES/Mobile_Device_Synchronization.po                            |    2 
 Architecture_and_Design/es-ES/Preface.po                                                  |    2 
 Architecture_and_Design/es-ES/Revision_History.po                                         |    2 
 Architecture_and_Design/es-ES/Smart_Clients.po                                            |    2 
 Architecture_and_Design/es-ES/Terminology.po                                              |    2 
 Architecture_and_Design/es-ES/sect-About_Kolab_Groupware.po                               |    2 
 Architecture_and_Design/es-ES/sect-Feedback.po                                            |    2 
 Architecture_and_Design/es-ES/sect-Kolab_Product_Series.po                                |    2 
 Architecture_and_Design/es-ES/sect-Supported_Platforms_and_System_Requirements.po         |   20 
 Architecture_and_Design/ja-JP/Administration_Panel.po                                     | 1936 ++++++++++
 Architecture_and_Design/ja-JP/Akonadi_for_Integration_and_Caching.po                      |  550 ++
 Architecture_and_Design/ja-JP/Architecture_and_Design.po                                  |   14 
 Architecture_and_Design/ja-JP/Archiving_amp_Discovery.po                                  |   66 
 Architecture_and_Design/ja-JP/Authentication_amp_Authorization.po                         |  328 +
 Architecture_and_Design/ja-JP/Author_Group.po                                             |   49 
 Architecture_and_Design/ja-JP/Book_Info.po                                                |   29 
 Architecture_and_Design/ja-JP/Calendaring.po                                              |   28 
 Architecture_and_Design/ja-JP/Configuration_Management.po                                 |  744 +++
 Architecture_and_Design/ja-JP/Email.po                                                    |  396 ++
 Architecture_and_Design/ja-JP/Enforcing_Entitlements.po                                   |  212 +
 Architecture_and_Design/ja-JP/Feature_FAQ.po                                              |  927 ++++
 Architecture_and_Design/ja-JP/Free_Busy.po                                                |  282 +
 Architecture_and_Design/ja-JP/Groupware_Overview.po                                       |  121 
 Architecture_and_Design/ja-JP/Integration_amp_Interoperability.po                         |  119 
 Architecture_and_Design/ja-JP/Kolab_Content_Filters.po                                    | 1034 +++++
 Architecture_and_Design/ja-JP/Kolab_Daemon.po                                             |  465 ++
 Architecture_and_Design/ja-JP/Kolab_Objects.po                                            |  471 ++
 Architecture_and_Design/ja-JP/Kolab_SMTP_Access_Policy.po                                 |  305 +
 Architecture_and_Design/ja-JP/Kolab_Server_Overview.po                                    |  324 +
 Architecture_and_Design/ja-JP/Migration.po                                                |   26 
 Architecture_and_Design/ja-JP/Mobile_Device_Synchronization.po                            |   36 
 Architecture_and_Design/ja-JP/Preface.po                                                  |   21 
 Architecture_and_Design/ja-JP/Revision_History.po                                         |   36 
 Architecture_and_Design/ja-JP/Smart_Clients.po                                            |  301 +
 Architecture_and_Design/ja-JP/Terminology.po                                              |  491 ++
 Architecture_and_Design/ja-JP/sect-About_Kolab_Groupware.po                               |  119 
 Architecture_and_Design/ja-JP/sect-Feedback.po                                            |  177 
 Architecture_and_Design/ja-JP/sect-Kolab_Product_Series.po                                |  168 
 Architecture_and_Design/ja-JP/sect-Supported_Platforms_and_System_Requirements.po         |   71 
 Architecture_and_Design/nl-NL/Administration_Panel.po                                     |    2 
 Architecture_and_Design/nl-NL/Akonadi_for_Integration_and_Caching.po                      |    2 
 Architecture_and_Design/nl-NL/Archiving_amp_Discovery.po                                  |    2 
 Architecture_and_Design/nl-NL/Authentication_amp_Authorization.po                         |    2 
 Architecture_and_Design/nl-NL/Calendaring.po                                              |    2 
 Architecture_and_Design/nl-NL/Configuration_Management.po                                 |    2 
 Architecture_and_Design/nl-NL/Email.po                                                    |    2 
 Architecture_and_Design/nl-NL/Enforcing_Entitlements.po                                   |    2 
 Architecture_and_Design/nl-NL/Feature_FAQ.po                                              |    2 
 Architecture_and_Design/nl-NL/Free_Busy.po                                                |    2 
 Architecture_and_Design/nl-NL/Groupware_Overview.po                                       |    2 
 Architecture_and_Design/nl-NL/Integration_amp_Interoperability.po                         |    2 
 Architecture_and_Design/nl-NL/Kolab_Content_Filters.po                                    |    2 
 Architecture_and_Design/nl-NL/Kolab_Daemon.po                                             |    2 
 Architecture_and_Design/nl-NL/Kolab_Objects.po                                            |    2 
 Architecture_and_Design/nl-NL/Kolab_SMTP_Access_Policy.po                                 |    2 
 Architecture_and_Design/nl-NL/Kolab_Server_Overview.po                                    |    2 
 Architecture_and_Design/nl-NL/Migration.po                                                |    2 
 Architecture_and_Design/nl-NL/Mobile_Device_Synchronization.po                            |    2 
 Architecture_and_Design/nl-NL/Preface.po                                                  |    2 
 Architecture_and_Design/nl-NL/Revision_History.po                                         |    2 
 Architecture_and_Design/nl-NL/Smart_Clients.po                                            |    2 
 Architecture_and_Design/nl-NL/Terminology.po                                              |    2 
 Architecture_and_Design/nl-NL/sect-About_Kolab_Groupware.po                               |    2 
 Architecture_and_Design/nl-NL/sect-Feedback.po                                            |    2 
 Architecture_and_Design/nl-NL/sect-Kolab_Product_Series.po                                |    2 
 Architecture_and_Design/nl-NL/sect-Supported_Platforms_and_System_Requirements.po         |    4 
 Architecture_and_Design/pot/Administration_Panel.pot                                      |    4 
 Architecture_and_Design/pot/Akonadi_for_Integration_and_Caching.pot                       |    4 
 Architecture_and_Design/pot/Architecture_and_Design.pot                                   |    4 
 Architecture_and_Design/pot/Archiving_amp_Discovery.pot                                   |    4 
 Architecture_and_Design/pot/Authentication_amp_Authorization.pot                          |    4 
 Architecture_and_Design/pot/Author_Group.pot                                              |    4 
 Architecture_and_Design/pot/Book_Info.pot                                                 |    4 
 Architecture_and_Design/pot/Calendaring.pot                                               |    4 
 Architecture_and_Design/pot/Configuration_Management.pot                                  |    4 
 Architecture_and_Design/pot/Email.pot                                                     |    4 
 Architecture_and_Design/pot/Enforcing_Entitlements.pot                                    |    4 
 Architecture_and_Design/pot/Feature_FAQ.pot                                               |    4 
 Architecture_and_Design/pot/Free_Busy.pot                                                 |    4 
 Architecture_and_Design/pot/Groupware_Overview.pot                                        |    4 
 Architecture_and_Design/pot/Integration_amp_Interoperability.pot                          |    4 
 Architecture_and_Design/pot/Kolab_Content_Filters.pot                                     |    4 
 Architecture_and_Design/pot/Kolab_Daemon.pot                                              |    4 
 Architecture_and_Design/pot/Kolab_Objects.pot                                             |    4 
 Architecture_and_Design/pot/Kolab_SMTP_Access_Policy.pot                                  |    4 
 Architecture_and_Design/pot/Kolab_Server_Overview.pot                                     |    4 
 Architecture_and_Design/pot/Migration.pot                                                 |    4 
 Architecture_and_Design/pot/Mobile_Device_Synchronization.pot                             |    4 
 Architecture_and_Design/pot/Preface.pot                                                   |    4 
 Architecture_and_Design/pot/Revision_History.pot                                          |    4 
 Architecture_and_Design/pot/Smart_Clients.pot                                             |    4 
 Architecture_and_Design/pot/Terminology.pot                                               |    4 
 Architecture_and_Design/pot/sect-About_Kolab_Groupware.pot                                |    4 
 Architecture_and_Design/pot/sect-Feedback.pot                                             |    4 
 Architecture_and_Design/pot/sect-Kolab_Product_Series.pot                                 |    4 
 Architecture_and_Design/pot/sect-Supported_Platforms_and_System_Requirements.pot          |    4 
 Deployment_Guide/.tx/config                                                               |    2 
 Deployment_Guide/de-DE/Capacity_Planning.po                                               |    2 
 Deployment_Guide/de-DE/High_Availability.po                                               |    2 
 Deployment_Guide/de-DE/Infrastructure.po                                                  |    2 
 Deployment_Guide/de-DE/Kolab_Groupware_Components.po                                      |    2 
 Deployment_Guide/de-DE/Kolab_Preparations.po                                              |    2 
 Deployment_Guide/de-DE/LDAP_Installation.po                                               |    2 
 Deployment_Guide/de-DE/LDAP_Integration.po                                                |    2 
 Deployment_Guide/de-DE/Preface.po                                                         |    2 
 Deployment_Guide/de-DE/Revision_History.po                                                |    2 
 Deployment_Guide/de-DE/sect-About_Kolab_Groupware.po                                      |    2 
 Deployment_Guide/de-DE/sect-Feedback.po                                                   |    2 
 Deployment_Guide/de-DE/sect-Kolab_Product_Series.po                                       |    2 
 Deployment_Guide/de-DE/sect-Supported_Platforms_and_System_Requirements.po                |    4 
 Deployment_Guide/es-ES/Capacity_Planning.po                                               |    2 
 Deployment_Guide/es-ES/High_Availability.po                                               |    2 
 Deployment_Guide/es-ES/Infrastructure.po                                                  |    2 
 Deployment_Guide/es-ES/Kolab_Groupware_Components.po                                      |    2 
 Deployment_Guide/es-ES/Kolab_Preparations.po                                              |    2 
 Deployment_Guide/es-ES/LDAP_Installation.po                                               |    2 
 Deployment_Guide/es-ES/LDAP_Integration.po                                                |    2 
 Deployment_Guide/es-ES/Preface.po                                                         |    2 
 Deployment_Guide/es-ES/Revision_History.po                                                |    2 
 Deployment_Guide/es-ES/sect-About_Kolab_Groupware.po                                      |    2 
 Deployment_Guide/es-ES/sect-Feedback.po                                                   |    2 
 Deployment_Guide/es-ES/sect-Kolab_Product_Series.po                                       |    2 
 Deployment_Guide/es-ES/sect-Supported_Platforms_and_System_Requirements.po                |   20 
 Deployment_Guide/ja-JP/Author_Group.po                                                    |   49 
 Deployment_Guide/ja-JP/Book_Info.po                                                       |   34 
 Deployment_Guide/ja-JP/Capacity_Planning.po                                               |  401 ++
 Deployment_Guide/ja-JP/Deployment_Guide.po                                                |   14 
 Deployment_Guide/ja-JP/High_Availability.po                                               |   85 
 Deployment_Guide/ja-JP/Infrastructure.po                                                  |   81 
 Deployment_Guide/ja-JP/Kolab_Groupware_Components.po                                      |  298 +
 Deployment_Guide/ja-JP/Kolab_Preparations.po                                              |   36 
 Deployment_Guide/ja-JP/LDAP_Installation.po                                               |   63 
 Deployment_Guide/ja-JP/LDAP_Integration.po                                                |   58 
 Deployment_Guide/ja-JP/Preface.po                                                         |   31 
 Deployment_Guide/ja-JP/Revision_History.po                                                |   36 
 Deployment_Guide/ja-JP/sect-About_Kolab_Groupware.po                                      |  119 
 Deployment_Guide/ja-JP/sect-Feedback.po                                                   |  177 
 Deployment_Guide/ja-JP/sect-Kolab_Product_Series.po                                       |  168 
 Deployment_Guide/ja-JP/sect-Supported_Platforms_and_System_Requirements.po                |   71 
 Deployment_Guide/nl-NL/Capacity_Planning.po                                               |    2 
 Deployment_Guide/nl-NL/High_Availability.po                                               |    2 
 Deployment_Guide/nl-NL/Infrastructure.po                                                  |    2 
 Deployment_Guide/nl-NL/Kolab_Groupware_Components.po                                      |    2 
 Deployment_Guide/nl-NL/Kolab_Preparations.po                                              |    2 
 Deployment_Guide/nl-NL/LDAP_Installation.po                                               |    2 
 Deployment_Guide/nl-NL/LDAP_Integration.po                                                |    2 
 Deployment_Guide/nl-NL/Preface.po                                                         |    2 
 Deployment_Guide/nl-NL/Revision_History.po                                                |    2 
 Deployment_Guide/nl-NL/sect-About_Kolab_Groupware.po                                      |    2 
 Deployment_Guide/nl-NL/sect-Feedback.po                                                   |    2 
 Deployment_Guide/nl-NL/sect-Kolab_Product_Series.po                                       |    2 
 Deployment_Guide/nl-NL/sect-Supported_Platforms_and_System_Requirements.po                |    4 
 Deployment_Guide/pot/Author_Group.pot                                                     |    4 
 Deployment_Guide/pot/Book_Info.pot                                                        |    4 
 Deployment_Guide/pot/Capacity_Planning.pot                                                |    4 
 Deployment_Guide/pot/Deployment_Guide.pot                                                 |    4 
 Deployment_Guide/pot/High_Availability.pot                                                |    4 
 Deployment_Guide/pot/Infrastructure.pot                                                   |    4 
 Deployment_Guide/pot/Kolab_Groupware_Components.pot                                       |    4 
 Deployment_Guide/pot/Kolab_Preparations.pot                                               |    4 
 Deployment_Guide/pot/LDAP_Installation.pot                                                |    4 
 Deployment_Guide/pot/LDAP_Integration.pot                                                 |    4 
 Deployment_Guide/pot/Preface.pot                                                          |    4 
 Deployment_Guide/pot/Revision_History.pot                                                 |    4 
 Deployment_Guide/pot/sect-About_Kolab_Groupware.pot                                       |    4 
 Deployment_Guide/pot/sect-Feedback.pot                                                    |    4 
 Deployment_Guide/pot/sect-Kolab_Product_Series.pot                                        |    4 
 Deployment_Guide/pot/sect-Supported_Platforms_and_System_Requirements.pot                 |    4 
 Development_Manual/.tx/config                                                             |    2 
 Development_Manual/de-DE/Chapter.po                                                       |    2 
 Development_Manual/de-DE/Development_Processes.po                                         |    2 
 Development_Manual/de-DE/Documentation.po                                                 |    2 
 Development_Manual/de-DE/General_Kolab_Server_Components_Packaging_Notes.po               |    2 
 Development_Manual/de-DE/Localization_and_Internationalization.po                         |   15 
 Development_Manual/de-DE/Packaging_with_APT.po                                            |    2 
 Development_Manual/de-DE/Packaging_with_RPM.po                                            |    2 
 Development_Manual/de-DE/Part-General_Kolab_Packaging_Notes.po                            |    2 
 Development_Manual/de-DE/Preface.po                                                       |    2 
 Development_Manual/de-DE/Revision_History.po                                              |    2 
 Development_Manual/de-DE/TODO.po                                                          |    2 
 Development_Manual/de-DE/sect-About_Kolab_Groupware.po                                    |    2 
 Development_Manual/de-DE/sect-Feedback.po                                                 |    2 
 Development_Manual/de-DE/sect-Kolab_Product_Series.po                                     |    2 
 Development_Manual/de-DE/sect-Supported_Platforms_and_System_Requirements.po              |    4 
 Development_Manual/es-ES/Chapter.po                                                       |    2 
 Development_Manual/es-ES/Development_Processes.po                                         |    2 
 Development_Manual/es-ES/Documentation.po                                                 |    2 
 Development_Manual/es-ES/General_Kolab_Server_Components_Packaging_Notes.po               |    2 
 Development_Manual/es-ES/Localization_and_Internationalization.po                         |    2 
 Development_Manual/es-ES/Packaging_with_APT.po                                            |    2 
 Development_Manual/es-ES/Packaging_with_RPM.po                                            |    2 
 Development_Manual/es-ES/Part-General_Kolab_Packaging_Notes.po                            |    2 
 Development_Manual/es-ES/Preface.po                                                       |    2 
 Development_Manual/es-ES/Revision_History.po                                              |    2 
 Development_Manual/es-ES/TODO.po                                                          |    2 
 Development_Manual/es-ES/sect-About_Kolab_Groupware.po                                    |    2 
 Development_Manual/es-ES/sect-Feedback.po                                                 |    2 
 Development_Manual/es-ES/sect-Kolab_Product_Series.po                                     |    2 
 Development_Manual/es-ES/sect-Supported_Platforms_and_System_Requirements.po              |   20 
 Development_Manual/ja-JP/Author_Group.po                                                  |   49 
 Development_Manual/ja-JP/Book_Info.po                                                     |   34 
 Development_Manual/ja-JP/Chapter.po                                                       |   51 
 Development_Manual/ja-JP/Development_Manual.po                                            |   14 
 Development_Manual/ja-JP/Development_Processes.po                                         |   57 
 Development_Manual/ja-JP/Documentation.po                                                 |   31 
 Development_Manual/ja-JP/General_Kolab_Server_Components_Packaging_Notes.po               |   26 
 Development_Manual/ja-JP/Localization_and_Internationalization.po                         |   36 
 Development_Manual/ja-JP/Packaging_with_APT.po                                            |  328 +
 Development_Manual/ja-JP/Packaging_with_RPM.po                                            |   83 
 Development_Manual/ja-JP/Part-General_Kolab_Packaging_Notes.po                            |   21 
 Development_Manual/ja-JP/Preface.po                                                       |   21 
 Development_Manual/ja-JP/Revision_History.po                                              |   36 
 Development_Manual/ja-JP/TODO.po                                                          |   67 
 Development_Manual/ja-JP/sect-About_Kolab_Groupware.po                                    |  119 
 Development_Manual/ja-JP/sect-Feedback.po                                                 |  177 
 Development_Manual/ja-JP/sect-Kolab_Product_Series.po                                     |  168 
 Development_Manual/ja-JP/sect-Supported_Platforms_and_System_Requirements.po              |   71 
 Development_Manual/nl-NL/Chapter.po                                                       |    2 
 Development_Manual/nl-NL/Development_Processes.po                                         |    2 
 Development_Manual/nl-NL/Documentation.po                                                 |    2 
 Development_Manual/nl-NL/General_Kolab_Server_Components_Packaging_Notes.po               |    2 
 Development_Manual/nl-NL/Localization_and_Internationalization.po                         |    2 
 Development_Manual/nl-NL/Packaging_with_APT.po                                            |    2 
 Development_Manual/nl-NL/Packaging_with_RPM.po                                            |    2 
 Development_Manual/nl-NL/Part-General_Kolab_Packaging_Notes.po                            |    2 
 Development_Manual/nl-NL/Preface.po                                                       |    2 
 Development_Manual/nl-NL/Revision_History.po                                              |    2 
 Development_Manual/nl-NL/TODO.po                                                          |    2 
 Development_Manual/nl-NL/sect-About_Kolab_Groupware.po                                    |    2 
 Development_Manual/nl-NL/sect-Feedback.po                                                 |    2 
 Development_Manual/nl-NL/sect-Kolab_Product_Series.po                                     |    2 
 Development_Manual/nl-NL/sect-Supported_Platforms_and_System_Requirements.po              |    4 
 Development_Manual/pot/Author_Group.pot                                                   |    4 
 Development_Manual/pot/Book_Info.pot                                                      |    4 
 Development_Manual/pot/Chapter.pot                                                        |    4 
 Development_Manual/pot/Development_Manual.pot                                             |    4 
 Development_Manual/pot/Development_Processes.pot                                          |    4 
 Development_Manual/pot/Documentation.pot                                                  |    4 
 Development_Manual/pot/General_Kolab_Server_Components_Packaging_Notes.pot                |    4 
 Development_Manual/pot/Localization_and_Internationalization.pot                          |    4 
 Development_Manual/pot/Packaging_with_APT.pot                                             |    4 
 Development_Manual/pot/Packaging_with_RPM.pot                                             |    4 
 Development_Manual/pot/Part-General_Kolab_Packaging_Notes.pot                             |    4 
 Development_Manual/pot/Preface.pot                                                        |    4 
 Development_Manual/pot/Revision_History.pot                                               |    4 
 Development_Manual/pot/TODO.pot                                                           |    4 
 Development_Manual/pot/sect-About_Kolab_Groupware.pot                                     |    4 
 Development_Manual/pot/sect-Feedback.pot                                                  |    4 
 Development_Manual/pot/sect-Kolab_Product_Series.pot                                      |    4 
 Development_Manual/pot/sect-Supported_Platforms_and_System_Requirements.pot               |    4 
 Installation_Guide/.tx/config                                                             |    2 
 Installation_Guide/de-DE/Cyrus_IMAP.po                                                    |    2 
 Installation_Guide/de-DE/Kolab_Server_Appendix.po                                         |    2 
 Installation_Guide/de-DE/Kolab_Server_Configuration.po                                    |    2 
 Installation_Guide/de-DE/Kolab_Server_First_Login.po                                      |    2 
 Installation_Guide/de-DE/Kolab_Server_Installation.po                                     |    2 
 Installation_Guide/de-DE/Kolab_Server_Overview.po                                         |    2 
 Installation_Guide/de-DE/Kolab_Server_on_Enterprise_Linux.po                              |    2 
 Installation_Guide/de-DE/Kolab_Systems_Software_Repositories.po                           |    2 
 Installation_Guide/de-DE/Kontact.po                                                       |   23 
 Installation_Guide/de-DE/Outlook.po                                                       |    2 
 Installation_Guide/de-DE/Preface.po                                                       |    2 
 Installation_Guide/de-DE/Preparing_the_System.po                                          |    2 
 Installation_Guide/de-DE/Revision_History.po                                              |    2 
 Installation_Guide/de-DE/Server_Client_Appendix.po                                        |    2 
 Installation_Guide/de-DE/Server_Client_Horde.po                                           |    2 
 Installation_Guide/de-DE/Server_Client_Roundcube.po                                       |    2 
 Installation_Guide/de-DE/Thunderbird.po                                                   |   11 
 Installation_Guide/de-DE/part-Kolab_Clients.po                                            |    2 
 Installation_Guide/de-DE/part-Kolab_Server.po                                             |    2 
 Installation_Guide/de-DE/part-Kolab_Server_Clients.po                                     |    2 
 Installation_Guide/de-DE/sect-About_Kolab_Groupware.po                                    |    2 
 Installation_Guide/de-DE/sect-Feedback.po                                                 |    2 
 Installation_Guide/de-DE/sect-Kolab_Product_Series.po                                     |    2 
 Installation_Guide/de-DE/sect-Repository_Configuration-Installation_with_APT_Packages.po  |    2 
 Installation_Guide/de-DE/sect-Repository_Configuration-Installation_with_RPM_Packages.po  |    2 
 Installation_Guide/de-DE/sect-Supported_Platforms_and_System_Requirements.po              |    4 
 Installation_Guide/en-US/sect-Repository_Configuration-Installation_with_APT_Packages.xml |    4 
 Installation_Guide/es-ES/Cyrus_IMAP.po                                                    |    2 
 Installation_Guide/es-ES/Kolab_Server_Appendix.po                                         |    2 
 Installation_Guide/es-ES/Kolab_Server_Configuration.po                                    |    2 
 Installation_Guide/es-ES/Kolab_Server_First_Login.po                                      |    2 
 Installation_Guide/es-ES/Kolab_Server_Installation.po                                     |    2 
 Installation_Guide/es-ES/Kolab_Server_Overview.po                                         |    2 
 Installation_Guide/es-ES/Kolab_Server_on_Enterprise_Linux.po                              |   51 
 Installation_Guide/es-ES/Kolab_Systems_Software_Repositories.po                           |    2 
 Installation_Guide/es-ES/Kontact.po                                                       |    2 
 Installation_Guide/es-ES/Outlook.po                                                       |    2 
 Installation_Guide/es-ES/Preface.po                                                       |    2 
 Installation_Guide/es-ES/Preparing_the_System.po                                          |    2 
 Installation_Guide/es-ES/Revision_History.po                                              |    2 
 Installation_Guide/es-ES/Server_Client_Appendix.po                                        |    9 
 Installation_Guide/es-ES/Server_Client_Horde.po                                           |    2 
 Installation_Guide/es-ES/Server_Client_Roundcube.po                                       |    2 
 Installation_Guide/es-ES/Thunderbird.po                                                   |    2 
 Installation_Guide/es-ES/part-Kolab_Clients.po                                            |    2 
 Installation_Guide/es-ES/part-Kolab_Server.po                                             |    9 
 Installation_Guide/es-ES/part-Kolab_Server_Clients.po                                     |    2 
 Installation_Guide/es-ES/sect-About_Kolab_Groupware.po                                    |    2 
 Installation_Guide/es-ES/sect-Feedback.po                                                 |    2 
 Installation_Guide/es-ES/sect-Kolab_Product_Series.po                                     |    2 
 Installation_Guide/es-ES/sect-Repository_Configuration-Installation_with_APT_Packages.po  |    2 
 Installation_Guide/es-ES/sect-Repository_Configuration-Installation_with_RPM_Packages.po  |    2 
 Installation_Guide/es-ES/sect-Supported_Platforms_and_System_Requirements.po              |   20 
 Installation_Guide/ja-JP/Author_Group.po                                                  |   49 
 Installation_Guide/ja-JP/Book_Info.po                                                     |   39 
 Installation_Guide/ja-JP/Community_Installation_Guide.po                                  |   14 
 Installation_Guide/ja-JP/Cyrus_IMAP.po                                                    |  424 ++
 Installation_Guide/ja-JP/Enterprise_Installation_Guide.po                                 |   14 
 Installation_Guide/ja-JP/Kolab_Server_Appendix.po                                         |   75 
 Installation_Guide/ja-JP/Kolab_Server_Configuration.po                                    |  457 ++
 Installation_Guide/ja-JP/Kolab_Server_First_Login.po                                      |  308 +
 Installation_Guide/ja-JP/Kolab_Server_Installation.po                                     |  269 +
 Installation_Guide/ja-JP/Kolab_Server_Overview.po                                         |  166 
 Installation_Guide/ja-JP/Kolab_Server_on_Enterprise_Linux.po                              |  237 +
 Installation_Guide/ja-JP/Kolab_Systems_Software_Repositories.po                           |  178 
 Installation_Guide/ja-JP/Kontact.po                                                       |   89 
 Installation_Guide/ja-JP/Outlook.po                                                       |   26 
 Installation_Guide/ja-JP/Preface.po                                                       |   21 
 Installation_Guide/ja-JP/Preparing_the_System.po                                          |  432 ++
 Installation_Guide/ja-JP/Revision_History.po                                              |   36 
 Installation_Guide/ja-JP/Server_Client_Appendix.po                                        |  208 +
 Installation_Guide/ja-JP/Server_Client_Horde.po                                           |   87 
 Installation_Guide/ja-JP/Server_Client_Roundcube.po                                       |  202 +
 Installation_Guide/ja-JP/Thunderbird.po                                                   |   26 
 Installation_Guide/ja-JP/part-Kolab_Clients.po                                            |   21 
 Installation_Guide/ja-JP/part-Kolab_Server.po                                             |   21 
 Installation_Guide/ja-JP/part-Kolab_Server_Clients.po                                     |   21 
 Installation_Guide/ja-JP/sect-About_Kolab_Groupware.po                                    |  119 
 Installation_Guide/ja-JP/sect-Feedback.po                                                 |  177 
 Installation_Guide/ja-JP/sect-Kolab_Product_Series.po                                     |  168 
 Installation_Guide/ja-JP/sect-Repository_Configuration-Installation_with_APT_Packages.po  |   28 
 Installation_Guide/ja-JP/sect-Repository_Configuration-Installation_with_RPM_Packages.po  |  585 +++
 Installation_Guide/ja-JP/sect-Supported_Platforms_and_System_Requirements.po              |   71 
 Installation_Guide/nl-NL/Cyrus_IMAP.po                                                    |    2 
 Installation_Guide/nl-NL/Kolab_Server_Appendix.po                                         |    2 
 Installation_Guide/nl-NL/Kolab_Server_Configuration.po                                    |    2 
 Installation_Guide/nl-NL/Kolab_Server_First_Login.po                                      |    2 
 Installation_Guide/nl-NL/Kolab_Server_Installation.po                                     |    2 
 Installation_Guide/nl-NL/Kolab_Server_Overview.po                                         |    2 
 Installation_Guide/nl-NL/Kolab_Server_on_Enterprise_Linux.po                              |    2 
 Installation_Guide/nl-NL/Kolab_Systems_Software_Repositories.po                           |    2 
 Installation_Guide/nl-NL/Kontact.po                                                       |    2 
 Installation_Guide/nl-NL/Outlook.po                                                       |    2 
 Installation_Guide/nl-NL/Preface.po                                                       |    2 
 Installation_Guide/nl-NL/Preparing_the_System.po                                          |    2 
 Installation_Guide/nl-NL/Revision_History.po                                              |    2 
 Installation_Guide/nl-NL/Server_Client_Appendix.po                                        |    2 
 Installation_Guide/nl-NL/Server_Client_Horde.po                                           |    2 
 Installation_Guide/nl-NL/Server_Client_Roundcube.po                                       |    2 
 Installation_Guide/nl-NL/Thunderbird.po                                                   |    2 
 Installation_Guide/nl-NL/part-Kolab_Clients.po                                            |    2 
 Installation_Guide/nl-NL/part-Kolab_Server.po                                             |    2 
 Installation_Guide/nl-NL/part-Kolab_Server_Clients.po                                     |    2 
 Installation_Guide/nl-NL/sect-About_Kolab_Groupware.po                                    |    2 
 Installation_Guide/nl-NL/sect-Feedback.po                                                 |    2 
 Installation_Guide/nl-NL/sect-Kolab_Product_Series.po                                     |    2 
 Installation_Guide/nl-NL/sect-Repository_Configuration-Installation_with_APT_Packages.po  |    2 
 Installation_Guide/nl-NL/sect-Repository_Configuration-Installation_with_RPM_Packages.po  |    2 
 Installation_Guide/nl-NL/sect-Supported_Platforms_and_System_Requirements.po              |    4 
 Installation_Guide/pot/Author_Group.pot                                                   |    4 
 Installation_Guide/pot/Book_Info.pot                                                      |    4 
 Installation_Guide/pot/Community_Installation_Guide.pot                                   |    4 
 Installation_Guide/pot/Cyrus_IMAP.pot                                                     |    4 
 Installation_Guide/pot/Enterprise_Installation_Guide.pot                                  |    4 
 Installation_Guide/pot/Kolab_Server_Appendix.pot                                          |    4 
 Installation_Guide/pot/Kolab_Server_Configuration.pot                                     |    4 
 Installation_Guide/pot/Kolab_Server_First_Login.pot                                       |    4 
 Installation_Guide/pot/Kolab_Server_Installation.pot                                      |    4 
 Installation_Guide/pot/Kolab_Server_Overview.pot                                          |    4 
 Installation_Guide/pot/Kolab_Server_on_Enterprise_Linux.pot                               |    4 
 Installation_Guide/pot/Kolab_Systems_Software_Repositories.pot                            |    4 
 Installation_Guide/pot/Kontact.pot                                                        |    4 
 Installation_Guide/pot/Outlook.pot                                                        |    4 
 Installation_Guide/pot/Preface.pot                                                        |    4 
 Installation_Guide/pot/Preparing_the_System.pot                                           |    4 
 Installation_Guide/pot/Revision_History.pot                                               |    4 
 Installation_Guide/pot/Server_Client_Appendix.pot                                         |    4 
 Installation_Guide/pot/Server_Client_Horde.pot                                            |    4 
 Installation_Guide/pot/Server_Client_Roundcube.pot                                        |    4 
 Installation_Guide/pot/Thunderbird.pot                                                    |    4 
 Installation_Guide/pot/part-Kolab_Clients.pot                                             |    4 
 Installation_Guide/pot/part-Kolab_Server.pot                                              |    4 
 Installation_Guide/pot/part-Kolab_Server_Clients.pot                                      |    4 
 Installation_Guide/pot/sect-About_Kolab_Groupware.pot                                     |    4 
 Installation_Guide/pot/sect-Feedback.pot                                                  |    4 
 Installation_Guide/pot/sect-Kolab_Product_Series.pot                                      |    4 
 Installation_Guide/pot/sect-Repository_Configuration-Installation_with_APT_Packages.pot   |    4 
 Installation_Guide/pot/sect-Repository_Configuration-Installation_with_RPM_Packages.pot   |    4 
 Installation_Guide/pot/sect-Supported_Platforms_and_System_Requirements.pot               |    4 
 Makefile.common                                                                           |   14 
 Release_Notes/.tx/config                                                                  |    2 
 Release_Notes/de-DE/Article_Info.po                                                       |    2 
 Release_Notes/de-DE/Version_Matrix_Debian_Lenny.po                                        |    2 
 Release_Notes/de-DE/Version_Matrix_Debian_Squeeze.po                                      |    2 
 Release_Notes/de-DE/Version_Matrix_Enterprise_Linux_5.po                                  |    2 
 Release_Notes/de-DE/Version_Matrix_Enterprise_Linux_6.po                                  |    2 
 Release_Notes/de-DE/sect-About_Kolab_Groupware.po                                         |    2 
 Release_Notes/de-DE/sect-Feedback.po                                                      |    2 
 Release_Notes/de-DE/sect-Kolab_Product_Series.po                                          |    2 
 Release_Notes/de-DE/sect-Supported_Platforms_and_System_Requirements.po                   |    4 
 Release_Notes/es-ES/Article_Info.po                                                       |    2 
 Release_Notes/es-ES/Version_Matrix_Debian_Lenny.po                                        |    2 
 Release_Notes/es-ES/Version_Matrix_Debian_Squeeze.po                                      |    2 
 Release_Notes/es-ES/Version_Matrix_Enterprise_Linux_5.po                                  |    2 
 Release_Notes/es-ES/Version_Matrix_Enterprise_Linux_6.po                                  |    2 
 Release_Notes/es-ES/sect-About_Kolab_Groupware.po                                         |    2 
 Release_Notes/es-ES/sect-Feedback.po                                                      |    2 
 Release_Notes/es-ES/sect-Kolab_Product_Series.po                                          |    2 
 Release_Notes/es-ES/sect-Supported_Platforms_and_System_Requirements.po                   |   20 
 Release_Notes/ja-JP/Article_Info.po                                                       |   40 
 Release_Notes/ja-JP/Author_Group.po                                                       |   49 
 Release_Notes/ja-JP/Release_Notes.po                                                      |  356 +
 Release_Notes/ja-JP/Version_Matrix_Debian_Lenny.po                                        |  246 +
 Release_Notes/ja-JP/Version_Matrix_Debian_Squeeze.po                                      |  248 +
 Release_Notes/ja-JP/Version_Matrix_Enterprise_Linux_5.po                                  |  265 +
 Release_Notes/ja-JP/Version_Matrix_Enterprise_Linux_6.po                                  |  265 +
 Release_Notes/ja-JP/sect-About_Kolab_Groupware.po                                         |  119 
 Release_Notes/ja-JP/sect-Feedback.po                                                      |  177 
 Release_Notes/ja-JP/sect-Kolab_Product_Series.po                                          |  168 
 Release_Notes/ja-JP/sect-Supported_Platforms_and_System_Requirements.po                   |   71 
 Release_Notes/nl-NL/Article_Info.po                                                       |    2 
 Release_Notes/nl-NL/Version_Matrix_Debian_Lenny.po                                        |    2 
 Release_Notes/nl-NL/Version_Matrix_Debian_Squeeze.po                                      |    2 
 Release_Notes/nl-NL/Version_Matrix_Enterprise_Linux_5.po                                  |    2 
 Release_Notes/nl-NL/Version_Matrix_Enterprise_Linux_6.po                                  |    2 
 Release_Notes/nl-NL/sect-About_Kolab_Groupware.po                                         |    2 
 Release_Notes/nl-NL/sect-Feedback.po                                                      |    2 
 Release_Notes/nl-NL/sect-Kolab_Product_Series.po                                          |    2 
 Release_Notes/nl-NL/sect-Supported_Platforms_and_System_Requirements.po                   |    4 
 Release_Notes/pot/Article_Info.pot                                                        |    4 
 Release_Notes/pot/Author_Group.pot                                                        |    4 
 Release_Notes/pot/Release_Notes.pot                                                       |    4 
 Release_Notes/pot/Version_Matrix_Debian_Lenny.pot                                         |    4 
 Release_Notes/pot/Version_Matrix_Debian_Squeeze.pot                                       |    4 
 Release_Notes/pot/Version_Matrix_Enterprise_Linux_5.pot                                   |    4 
 Release_Notes/pot/Version_Matrix_Enterprise_Linux_6.pot                                   |    4 
 Release_Notes/pot/sect-About_Kolab_Groupware.pot                                          |    4 
 Release_Notes/pot/sect-Feedback.pot                                                       |    4 
 Release_Notes/pot/sect-Kolab_Product_Series.pot                                           |    4 
 Release_Notes/pot/sect-Supported_Platforms_and_System_Requirements.pot                    |    4 
 Testing_Reference/.tx/config                                                              |    2 
 Testing_Reference/de-DE/Introduction.po                                                   |    2 
 Testing_Reference/de-DE/Preface.po                                                        |    2 
 Testing_Reference/de-DE/Revision_History.po                                               |    2 
 Testing_Reference/de-DE/Test_Suite_000-Overview.po                                        |    2 
 Testing_Reference/de-DE/Test_Suite_001-Overview.po                                        |    2 
 Testing_Reference/de-DE/Test_Suite_002-Overview.po                                        |    2 
 Testing_Reference/de-DE/part-Test_Suite_000.po                                            |    2 
 Testing_Reference/de-DE/part-Test_Suite_001.po                                            |    2 
 Testing_Reference/de-DE/part-Test_Suite_002.po                                            |    2 
 Testing_Reference/de-DE/sect-About_Kolab_Groupware.po                                     |    2 
 Testing_Reference/de-DE/sect-Feedback.po                                                  |    2 
 Testing_Reference/de-DE/sect-Kolab_Product_Series.po                                      |    2 
 Testing_Reference/de-DE/sect-Supported_Platforms_and_System_Requirements.po               |    4 
 Testing_Reference/es-ES/Introduction.po                                                   |    2 
 Testing_Reference/es-ES/Preface.po                                                        |    2 
 Testing_Reference/es-ES/Revision_History.po                                               |    2 
 Testing_Reference/es-ES/Test_Suite_000-Overview.po                                        |    2 
 Testing_Reference/es-ES/Test_Suite_001-Overview.po                                        |    2 
 Testing_Reference/es-ES/Test_Suite_002-Overview.po                                        |    2 
 Testing_Reference/es-ES/part-Test_Suite_000.po                                            |    2 
 Testing_Reference/es-ES/part-Test_Suite_001.po                                            |    2 
 Testing_Reference/es-ES/part-Test_Suite_002.po                                            |    2 
 Testing_Reference/es-ES/sect-About_Kolab_Groupware.po                                     |    2 
 Testing_Reference/es-ES/sect-Feedback.po                                                  |    2 
 Testing_Reference/es-ES/sect-Kolab_Product_Series.po                                      |    2 
 Testing_Reference/es-ES/sect-Supported_Platforms_and_System_Requirements.po               |   20 
 Testing_Reference/ja-JP/Author_Group.po                                                   |   49 
 Testing_Reference/ja-JP/Book_Info.po                                                      |   34 
 Testing_Reference/ja-JP/Introduction.po                                                   |  190 
 Testing_Reference/ja-JP/Preface.po                                                        |   21 
 Testing_Reference/ja-JP/Revision_History.po                                               |   36 
 Testing_Reference/ja-JP/Test_Suite_000-Overview.po                                        |  151 
 Testing_Reference/ja-JP/Test_Suite_001-Overview.po                                        |   50 
 Testing_Reference/ja-JP/Test_Suite_002-Overview.po                                        |   28 
 Testing_Reference/ja-JP/Testing_Reference.po                                              |   14 
 Testing_Reference/ja-JP/part-Test_Suite_000.po                                            |   26 
 Testing_Reference/ja-JP/part-Test_Suite_001.po                                            |   26 
 Testing_Reference/ja-JP/part-Test_Suite_002.po                                            |   26 
 Testing_Reference/ja-JP/sect-About_Kolab_Groupware.po                                     |  119 
 Testing_Reference/ja-JP/sect-Feedback.po                                                  |  177 
 Testing_Reference/ja-JP/sect-Kolab_Product_Series.po                                      |  168 
 Testing_Reference/ja-JP/sect-Supported_Platforms_and_System_Requirements.po               |   71 
 Testing_Reference/nl-NL/Introduction.po                                                   |    2 
 Testing_Reference/nl-NL/Preface.po                                                        |    2 
 Testing_Reference/nl-NL/Revision_History.po                                               |    2 
 Testing_Reference/nl-NL/Test_Suite_000-Overview.po                                        |    2 
 Testing_Reference/nl-NL/Test_Suite_001-Overview.po                                        |    2 
 Testing_Reference/nl-NL/Test_Suite_002-Overview.po                                        |    2 
 Testing_Reference/nl-NL/part-Test_Suite_000.po                                            |    2 
 Testing_Reference/nl-NL/part-Test_Suite_001.po                                            |    2 
 Testing_Reference/nl-NL/part-Test_Suite_002.po                                            |    2 
 Testing_Reference/nl-NL/sect-About_Kolab_Groupware.po                                     |    2 
 Testing_Reference/nl-NL/sect-Feedback.po                                                  |    2 
 Testing_Reference/nl-NL/sect-Kolab_Product_Series.po                                      |    2 
 Testing_Reference/nl-NL/sect-Supported_Platforms_and_System_Requirements.po               |    4 
 Testing_Reference/pot/Author_Group.pot                                                    |    4 
 Testing_Reference/pot/Book_Info.pot                                                       |    4 
 Testing_Reference/pot/Introduction.pot                                                    |    4 
 Testing_Reference/pot/Preface.pot                                                         |    4 
 Testing_Reference/pot/Revision_History.pot                                                |    4 
 Testing_Reference/pot/Test_Suite_000-Overview.pot                                         |    4 
 Testing_Reference/pot/Test_Suite_001-Overview.pot                                         |    4 
 Testing_Reference/pot/Test_Suite_002-Overview.pot                                         |    4 
 Testing_Reference/pot/Testing_Reference.pot                                               |    4 
 Testing_Reference/pot/part-Test_Suite_000.pot                                             |    4 
 Testing_Reference/pot/part-Test_Suite_001.pot                                             |    4 
 Testing_Reference/pot/part-Test_Suite_002.pot                                             |    4 
 Testing_Reference/pot/sect-About_Kolab_Groupware.pot                                      |    4 
 Testing_Reference/pot/sect-Feedback.pot                                                   |    4 
 Testing_Reference/pot/sect-Kolab_Product_Series.pot                                       |    4 
 Testing_Reference/pot/sect-Supported_Platforms_and_System_Requirements.pot                |    4 
 739 files changed, 31294 insertions(+), 3705 deletions(-)

New commits:
commit 1784a3c46fc3765fa05202e4ce1a8b6bb90eec59
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Mon Sep 3 13:14:18 2012 +0100

    Update translations
    Add section on the recipient policy

diff --git a/About_Kolab_Groupware/.tx/config b/About_Kolab_Groupware/.tx/config
index c9af3ca..af75547 100644
--- a/About_Kolab_Groupware/.tx/config
+++ b/About_Kolab_Groupware/.tx/config
@@ -1,6 +1,6 @@
 [main]
 host = https://www.transifex.net
-lang_map = de: de-DE, es: es-ES, fr: fr-FR, nl: nl-NL
+lang_map = de: de-DE, es: es-ES, fr: fr-FR, ja: ja-JP, nl: nl-NL
 type = PO
 
 [kolab.About_Kolab_Groupware-Article_Info]
diff --git a/About_Kolab_Groupware/de-DE/About_Kolab_Groupware.po b/About_Kolab_Groupware/de-DE/About_Kolab_Groupware.po
index ff3911d..fd98f9d 100644
--- a/About_Kolab_Groupware/de-DE/About_Kolab_Groupware.po
+++ b/About_Kolab_Groupware/de-DE/About_Kolab_Groupware.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:06:03\n"
+"POT-Creation-Date: 2012-09-03T11:14:06\n"
 "PO-Revision-Date: 2012-08-13 14:14+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/About_Kolab_Groupware/de-DE/Article_Info.po b/About_Kolab_Groupware/de-DE/Article_Info.po
index 627be62..daa4d8c 100644
--- a/About_Kolab_Groupware/de-DE/Article_Info.po
+++ b/About_Kolab_Groupware/de-DE/Article_Info.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:06:03\n"
+"POT-Creation-Date: 2012-09-03T11:14:06\n"
 "PO-Revision-Date: 2012-08-13 14:14+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/About_Kolab_Groupware/de-DE/Revision_History.po b/About_Kolab_Groupware/de-DE/Revision_History.po
index 30ad49a..b2720e6 100644
--- a/About_Kolab_Groupware/de-DE/Revision_History.po
+++ b/About_Kolab_Groupware/de-DE/Revision_History.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:06:03\n"
+"POT-Creation-Date: 2012-09-03T11:14:06\n"
 "PO-Revision-Date: 2012-08-13 14:14+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/About_Kolab_Groupware/de-DE/sect-About_Kolab_Groupware.po b/About_Kolab_Groupware/de-DE/sect-About_Kolab_Groupware.po
index dc9f904..e93453b 100644
--- a/About_Kolab_Groupware/de-DE/sect-About_Kolab_Groupware.po
+++ b/About_Kolab_Groupware/de-DE/sect-About_Kolab_Groupware.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:06:03\n"
+"POT-Creation-Date: 2012-09-03T11:14:06\n"
 "PO-Revision-Date: 2012-08-13 14:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/About_Kolab_Groupware/de-DE/sect-Feedback.po b/About_Kolab_Groupware/de-DE/sect-Feedback.po
index 047d58b..f5c6611 100644
--- a/About_Kolab_Groupware/de-DE/sect-Feedback.po
+++ b/About_Kolab_Groupware/de-DE/sect-Feedback.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:06:03\n"
+"POT-Creation-Date: 2012-09-03T11:14:06\n"
 "PO-Revision-Date: 2012-08-13 14:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/About_Kolab_Groupware/de-DE/sect-Kolab_Product_Series.po b/About_Kolab_Groupware/de-DE/sect-Kolab_Product_Series.po
index 4e5651a..ac8613e 100644
--- a/About_Kolab_Groupware/de-DE/sect-Kolab_Product_Series.po
+++ b/About_Kolab_Groupware/de-DE/sect-Kolab_Product_Series.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:06:03\n"
+"POT-Creation-Date: 2012-09-03T11:14:06\n"
 "PO-Revision-Date: 2012-08-13 14:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/About_Kolab_Groupware/de-DE/sect-Supported_Platforms_and_System_Requirements.po b/About_Kolab_Groupware/de-DE/sect-Supported_Platforms_and_System_Requirements.po
index 2802b9c..87d9063 100644
--- a/About_Kolab_Groupware/de-DE/sect-Supported_Platforms_and_System_Requirements.po
+++ b/About_Kolab_Groupware/de-DE/sect-Supported_Platforms_and_System_Requirements.po
@@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:06:03\n"
-"PO-Revision-Date: 2012-08-15 22:06+0000\n"
+"POT-Creation-Date: 2012-09-03T11:14:06\n"
+"PO-Revision-Date: 2012-09-03 11:14+0000\n"
 "Last-Translator: Jeroen van Meeuwen <vanmeeuwen at kolabsys.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
 "MIME-Version: 1.0\n"
diff --git a/About_Kolab_Groupware/es-ES/About_Kolab_Groupware.po b/About_Kolab_Groupware/es-ES/About_Kolab_Groupware.po
index 0902d26..1fb7a57 100644
--- a/About_Kolab_Groupware/es-ES/About_Kolab_Groupware.po
+++ b/About_Kolab_Groupware/es-ES/About_Kolab_Groupware.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:06:03\n"
+"POT-Creation-Date: 2012-09-03T11:14:06\n"
 "PO-Revision-Date: 2012-08-13 14:14+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/About_Kolab_Groupware/es-ES/Article_Info.po b/About_Kolab_Groupware/es-ES/Article_Info.po
index f0ffaf2..71e58fd 100644
--- a/About_Kolab_Groupware/es-ES/Article_Info.po
+++ b/About_Kolab_Groupware/es-ES/Article_Info.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:06:03\n"
+"POT-Creation-Date: 2012-09-03T11:14:06\n"
 "PO-Revision-Date: 2012-08-13 14:14+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/About_Kolab_Groupware/es-ES/Revision_History.po b/About_Kolab_Groupware/es-ES/Revision_History.po
index 4e1f372..a5f466e 100644
--- a/About_Kolab_Groupware/es-ES/Revision_History.po
+++ b/About_Kolab_Groupware/es-ES/Revision_History.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:06:03\n"
+"POT-Creation-Date: 2012-09-03T11:14:06\n"
 "PO-Revision-Date: 2012-08-13 14:14+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/About_Kolab_Groupware/es-ES/sect-About_Kolab_Groupware.po b/About_Kolab_Groupware/es-ES/sect-About_Kolab_Groupware.po
index 47a14c9..0503a2c 100644
--- a/About_Kolab_Groupware/es-ES/sect-About_Kolab_Groupware.po
+++ b/About_Kolab_Groupware/es-ES/sect-About_Kolab_Groupware.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:06:03\n"
+"POT-Creation-Date: 2012-09-03T11:14:06\n"
 "PO-Revision-Date: 2012-08-13 14:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/About_Kolab_Groupware/es-ES/sect-Feedback.po b/About_Kolab_Groupware/es-ES/sect-Feedback.po
index fde1efb..5861ace 100644
--- a/About_Kolab_Groupware/es-ES/sect-Feedback.po
+++ b/About_Kolab_Groupware/es-ES/sect-Feedback.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:06:03\n"
+"POT-Creation-Date: 2012-09-03T11:14:06\n"
 "PO-Revision-Date: 2012-08-13 14:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/About_Kolab_Groupware/es-ES/sect-Kolab_Product_Series.po b/About_Kolab_Groupware/es-ES/sect-Kolab_Product_Series.po
index c366c57..5a49f56 100644
--- a/About_Kolab_Groupware/es-ES/sect-Kolab_Product_Series.po
+++ b/About_Kolab_Groupware/es-ES/sect-Kolab_Product_Series.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:06:03\n"
+"POT-Creation-Date: 2012-09-03T11:14:06\n"
 "PO-Revision-Date: 2012-08-13 14:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/About_Kolab_Groupware/es-ES/sect-Supported_Platforms_and_System_Requirements.po b/About_Kolab_Groupware/es-ES/sect-Supported_Platforms_and_System_Requirements.po
index 8b50c6a..8e3b615 100644
--- a/About_Kolab_Groupware/es-ES/sect-Supported_Platforms_and_System_Requirements.po
+++ b/About_Kolab_Groupware/es-ES/sect-Supported_Platforms_and_System_Requirements.po
@@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:06:03\n"
-"PO-Revision-Date: 2012-08-15 22:06+0000\n"
+"POT-Creation-Date: 2012-09-03T11:14:06\n"
+"PO-Revision-Date: 2012-09-03 11:14+0000\n"
 "Last-Translator: Jeroen van Meeuwen <vanmeeuwen at kolabsys.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -18,12 +18,12 @@ msgstr ""
 #. Tag: title
 #, no-c-format
 msgid "Supported Platforms and System Requirements"
-msgstr ""
+msgstr "Plataformas compatibles y requisitos del sistema"
 
 #. Tag: para
 #, no-c-format
 msgid "Kolab Groupware is supported on the following platforms;"
-msgstr ""
+msgstr "Kolab Groupware es compatible con las siguientes plataformas;"
 
 #. Tag: para
 #, no-c-format
@@ -33,34 +33,34 @@ msgid ""
 " to keep up with the latest distribution release ear-marked stable. </para> "
 "</footnote>, including but not limited to the following distributions, in no"
 " particular order other then alphabetic;"
-msgstr ""
+msgstr "Todas las versiones razonablemente recientes de Linux\n<footnote> <para> Por versiones razonablemente recientes de Linux, debemos indicar que el proyecto Kolab puede llegar a mantenerse al día con la última versión estable de la distribución.</para> </footnote>, incluyendo pero no limitado a las siguientes distribuciones, sin ningún otro orden en particular, que el alfabético;"
 
 #. Tag: para
 #, no-c-format
 msgid "<ulink url=\"http://centos.org\">CentOS</ulink>"
-msgstr ""
+msgstr "<ulink url=\"http://centos.org\">CentOS</ulink>"
 
 #. Tag: para
 #, no-c-format
 msgid "<ulink url=\"http://debian.org\">Debian</ulink>"
-msgstr ""
+msgstr "<ulink url=\"http://debian.org\">Debian</ulink>"
 
 #. Tag: para
 #, no-c-format
 msgid "<ulink url=\"http://fedoraproject.org\">Fedora</ulink>"
-msgstr ""
+msgstr "<ulink url=\"http://fedoraproject.org\">Fedora</ulink>"
 
 #. Tag: para
 #, no-c-format
 msgid "<ulink url=\"http://redhat.com\">Red Hat Enterprise Linux</ulink>"
-msgstr ""
+msgstr "<ulink url=\"http://redhat.com\">Red Hat Enterprise Linux</ulink>"
 
 #. Tag: para
 #, no-c-format
 msgid ""
 "<ulink url=\"http://www.univention.de/index.php?id=964&L=1\">Univention "
 "Corporate Server</ulink>"
-msgstr ""
+msgstr "<ulink url=\"http://www.univention.de/index.php?id=964&L=1\">Univention Corporate Server</ulink>"
 
 #. Tag: para
 #, no-c-format
diff --git a/About_Kolab_Groupware/ja-JP/About_Kolab_Groupware.po b/About_Kolab_Groupware/ja-JP/About_Kolab_Groupware.po
index 2beab65..12283f7 100644
--- a/About_Kolab_Groupware/ja-JP/About_Kolab_Groupware.po
+++ b/About_Kolab_Groupware/ja-JP/About_Kolab_Groupware.po
@@ -1,16 +1,19 @@
-# 
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:44\n"
-"PO-Revision-Date: 2012-08-24T15:34:44\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
+"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
+"POT-Creation-Date: 2012-09-03T11:14:06\n"
+"PO-Revision-Date: 2012-08-13 14:14+0000\n"
 "Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab/language/ja/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. Tag: title
 #, no-c-format
@@ -19,16 +22,26 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Kolab is a groupware solution for Email communications, Events & Appointments, Contacts and more. It supports <emphasis>mixed client environments</emphasis> because of an <emphasis>open storage format</emphasis>, and the use of well-established, standard protocols such as IMAP and SMTP."
+msgid ""
+"Kolab is a groupware solution for Email communications, Events & "
+"Appointments, Contacts and more. It supports <emphasis>mixed client "
+"environments</emphasis> because of an <emphasis>open storage "
+"format</emphasis>, and the use of well-established, standard protocols such "
+"as IMAP and SMTP."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "For the full Kolab experience, you need a Kolab server, and one or more Kolab clients. What makes Kolab a unique groupware solution is its focus on security, scalability, data ownership and the use of proven components and protocols."
+msgid ""
+"For the full Kolab experience, you need a Kolab server, and one or more "
+"Kolab clients. What makes Kolab a unique groupware solution is its focus on "
+"security, scalability, data ownership and the use of proven components and "
+"protocols."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Kolab Groupware is an award-winning Free and Open Source Software <acronym>FOSS</acronym> solution."
+msgid ""
+"Kolab Groupware is an award-winning Free and Open Source Software "
+"<acronym>FOSS</acronym> solution."
 msgstr ""
-
diff --git a/About_Kolab_Groupware/ja-JP/Article_Info.po b/About_Kolab_Groupware/ja-JP/Article_Info.po
index 4fe057b..c4d240c 100644
--- a/About_Kolab_Groupware/ja-JP/Article_Info.po
+++ b/About_Kolab_Groupware/ja-JP/Article_Info.po
@@ -1,16 +1,19 @@
-# 
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:44\n"
-"PO-Revision-Date: 2012-08-24T15:34:44\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
+"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
+"POT-Creation-Date: 2012-09-03T11:14:06\n"
+"PO-Revision-Date: 2012-08-13 14:14+0000\n"
 "Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab/language/ja/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. Tag: title
 #, no-c-format
@@ -26,4 +29,3 @@ msgstr ""
 #, no-c-format
 msgid "Kolab Groupware"
 msgstr ""
-
diff --git a/About_Kolab_Groupware/ja-JP/Author_Group.po b/About_Kolab_Groupware/ja-JP/Author_Group.po
index 7a2607c..b3d3f2f 100644
--- a/About_Kolab_Groupware/ja-JP/Author_Group.po
+++ b/About_Kolab_Groupware/ja-JP/Author_Group.po
@@ -1,13 +1,14 @@
-# 
+#
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:44\n"
+"POT-Creation-Date: 2012-08-24T15:35:42\n"
 "PO-Revision-Date: 2012-08-24T15:34:44\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -46,4 +47,3 @@ msgstr ""
 #, no-c-format
 msgid "Systems Architect"
 msgstr ""
-
diff --git a/About_Kolab_Groupware/ja-JP/Revision_History.po b/About_Kolab_Groupware/ja-JP/Revision_History.po
index 25f3c4c..5ef6fe4 100644
--- a/About_Kolab_Groupware/ja-JP/Revision_History.po
+++ b/About_Kolab_Groupware/ja-JP/Revision_History.po
@@ -1,16 +1,19 @@
-# 
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:44\n"
-"PO-Revision-Date: 2012-08-24T15:34:44\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
+"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
+"POT-Creation-Date: 2012-09-03T11:14:06\n"
+"PO-Revision-Date: 2012-08-13 14:14+0000\n"
 "Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab/language/ja/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. Tag: title
 #, no-c-format
@@ -31,4 +34,3 @@ msgstr ""
 #, no-c-format
 msgid "Initial creation of book by publican"
 msgstr ""
-
diff --git a/About_Kolab_Groupware/ja-JP/sect-About_Kolab_Groupware.po b/About_Kolab_Groupware/ja-JP/sect-About_Kolab_Groupware.po
index 706c087..09009f3 100644
--- a/About_Kolab_Groupware/ja-JP/sect-About_Kolab_Groupware.po
+++ b/About_Kolab_Groupware/ja-JP/sect-About_Kolab_Groupware.po
@@ -1,16 +1,19 @@
-# 
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:44\n"
-"PO-Revision-Date: 2012-08-24T15:34:44\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
+"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
+"POT-Creation-Date: 2012-09-03T11:14:06\n"
+"PO-Revision-Date: 2012-08-13 14:24+0000\n"
 "Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab/language/ja/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. Tag: title
 #, no-c-format
@@ -19,12 +22,18 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Kolab Groupware is a highly scalable, flexible, mutli-platform solution for Emails, Appointments, Contacts and more. It supports mixed client environments (Outlook/KDE) because of a well-defined, interoperable and open storage format. Any email client speaking standard protocols can be served."
+msgid ""
+"Kolab Groupware is a highly scalable, flexible, mutli-platform solution for "
+"Emails, Appointments, Contacts and more. It supports mixed client "
+"environments (Outlook/KDE) because of a well-defined, interoperable and open"
+" storage format. Any email client speaking standard protocols can be served."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The Kolab Groupware solution consists of many Free Software components, integrated by Kolab in order to build a groupware solution."
+msgid ""
+"The Kolab Groupware solution consists of many Free Software components, "
+"integrated by Kolab in order to build a groupware solution."
 msgstr ""
 
 #. Tag: title
@@ -44,7 +53,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Postfix attempts to be fast, easy to administer, and secure. The outside has a definite Sendmail-ish flavor, but the inside is completely different."
+msgid ""
+"Postfix attempts to be fast, easy to administer, and secure. The outside has"
+" a definite Sendmail-ish flavor, but the inside is completely different."
 msgstr ""
 
 #. Tag: para
@@ -59,7 +70,11 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Cyrus IMAP is a highly scalable enterprise mail system designed for use in enterprise environments of various sizes using standards based technologies. Cyrus IMAP technologies scale from independent use in email departments to a system centrally managed in a large enterprise."
+msgid ""
+"Cyrus IMAP is a highly scalable enterprise mail system designed for use in "
+"enterprise environments of various sizes using standards based technologies."
+" Cyrus IMAP technologies scale from independent use in email departments to "
+"a system centrally managed in a large enterprise."
 msgstr ""
 
 #. Tag: para
@@ -74,7 +89,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "OpenLDAP Software is an open source implementation of the Lightweight Directory Access Protocol."
+msgid ""
+"OpenLDAP Software is an open source implementation of the Lightweight "
+"Directory Access Protocol."
 msgstr ""
 
 #. Tag: para
@@ -89,11 +106,14 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Roundcube webmail is a browser-based multilingual IMAP client with an application-like user interface. It provides full functionality you expect from an e-mail client, including MIME support, address book, folder manipulation, message searching and spell checking."
+msgid ""
+"Roundcube webmail is a browser-based multilingual IMAP client with an "
+"application-like user interface. It provides full functionality you expect "
+"from an e-mail client, including MIME support, address book, folder "
+"manipulation, message searching and spell checking."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid "Website: <ulink url=\"http://www.roundcube.net/\" />"
 msgstr ""
-
diff --git a/About_Kolab_Groupware/ja-JP/sect-Feedback.po b/About_Kolab_Groupware/ja-JP/sect-Feedback.po
index 51c1c45..ac03bc6 100644
--- a/About_Kolab_Groupware/ja-JP/sect-Feedback.po
+++ b/About_Kolab_Groupware/ja-JP/sect-Feedback.po
@@ -1,16 +1,19 @@
-# 
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:44\n"
-"PO-Revision-Date: 2012-08-24T15:34:44\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
+"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
+"POT-Creation-Date: 2012-09-03T11:14:06\n"
+"PO-Revision-Date: 2012-08-13 14:24+0000\n"
 "Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab/language/ja/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. Tag: title
 #, no-c-format
@@ -19,12 +22,16 @@ msgstr ""
 
 #. Tag: indexterm
 #, no-c-format
-msgid "<primary>feedback</primary> <secondary>contact information for this manual</secondary>"
+msgid ""
+"<primary>feedback</primary> <secondary>contact information for this "
+"manual</secondary>"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "We value feedback on our software as well as our documentation. Please find ways to contact us in this section."
+msgid ""
+"We value feedback on our software as well as our documentation. Please find "
+"ways to contact us in this section."
 msgstr ""
 
 #. Tag: title
@@ -34,22 +41,30 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Bug reports can be logged in our <ulink url=\"https://bugzilla.kolabsys.com\">Bugzilla issue tracker</ulink>. Please bear in mind registration is required to log bugs."
+msgid ""
+"Bug reports can be logged in our <ulink "
+"url=\"https://bugzilla.kolabsys.com\">Bugzilla issue tracker</ulink>. Please"
+" bear in mind registration is required to log bugs."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Before reporting a bug, please search the issue tracker for existing bugs that may report the same problem."
+msgid ""
+"Before reporting a bug, please search the issue tracker for existing bugs "
+"that may report the same problem."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "When reporting a bug, please prepare to provide the following information;"
+msgid ""
+"When reporting a bug, please prepare to provide the following information;"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Your platform, and if applicable, your distribution and the distribution version."
+msgid ""
+"Your platform, and if applicable, your distribution and the distribution "
+"version."
 msgstr ""
 
 #. Tag: para
@@ -59,7 +74,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "If a custom version is used, any options that may have specified during the build process."
+msgid ""
+"If a custom version is used, any options that may have specified during the "
+"build process."
 msgstr ""
 
 #. Tag: title
@@ -69,7 +86,10 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Mailing lists are a quick way to get in touch with a large number of subscribers, who may know the answer to your question or can provide you with additional insight."
+msgid ""
+"Mailing lists are a quick way to get in touch with a large number of "
+"subscribers, who may know the answer to your question or can provide you "
+"with additional insight."
 msgstr ""
 
 #. Tag: title
@@ -79,7 +99,15 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Kolab Groupware administrators and developers are strongly encouraged to subscribe to the moderated, low-volume announcement mailing list, to which important release announcements are submitted. We have the announcement mailing list available at <ulink url=\"https://lists.kolab.org/mailman/listinfo/kolab-announce\" />. To subscribe to the list, either click the aforementioned link and fill out the information requested, or send an email to <ulink url=\"mailto:kolab-announce-subscribe at kolab.org\">kolab-announce-subscribe at kolab.org</ulink>."
+msgid ""
+"Kolab Groupware administrators and developers are strongly encouraged to "
+"subscribe to the moderated, low-volume announcement mailing list, to which "
+"important release announcements are submitted. We have the announcement "
+"mailing list available at <ulink "
+"url=\"https://lists.kolab.org/mailman/listinfo/kolab-announce\" />. To "
+"subscribe to the list, either click the aforementioned link and fill out the"
+" information requested, or send an email to <ulink url=\"mailto:kolab-"
+"announce-subscribe at kolab.org\">kolab-announce-subscribe at kolab.org</ulink>."
 msgstr ""
 
 #. Tag: title
@@ -89,7 +117,12 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "For users of Kolab software, we run a public mailing list at <ulink url=\"https://lists.kolab.org/mailman/listinfo/kolab-users\" />. To subscribe to the list, either click the aforementioned link and fill out the information requested, or send an email to <ulink url=\"mailto:kolab-users-subscribe at kolab.org\">kolab-users-subscribe at kolab.org</ulink>."
+msgid ""
+"For users of Kolab software, we run a public mailing list at <ulink "
+"url=\"https://lists.kolab.org/mailman/listinfo/kolab-users\" />. To "
+"subscribe to the list, either click the aforementioned link and fill out the"
+" information requested, or send an email to <ulink url=\"mailto:kolab-users-"
+"subscribe at kolab.org\">kolab-users-subscribe at kolab.org</ulink>."
 msgstr ""
 
 #. Tag: title
@@ -99,7 +132,13 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "For developers of Kolab software, as well as general discussion on bugs and patches, we run a public mailing list at <ulink url=\"https://lists.kolab.org/mailman/listinfo/kolab-devel\" />. To subscribe to the list and fill out the information requested, or send an email to <ulink url=\"mailto:kolab-devel-subscribe at kolab.org\">kolab-devel-subscribe at kolab.org</ulink>."
+msgid ""
+"For developers of Kolab software, as well as general discussion on bugs and "
+"patches, we run a public mailing list at <ulink "
+"url=\"https://lists.kolab.org/mailman/listinfo/kolab-devel\" />. To "
+"subscribe to the list and fill out the information requested, or send an "
+"email to <ulink url=\"mailto:kolab-devel-subscribe at kolab.org\">kolab-devel-"
+"subscribe at kolab.org</ulink>."
 msgstr ""
 
 #. Tag: title
@@ -109,7 +148,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The archives of the announcement, user support and development discussion mailing lists are available through web archives."
+msgid ""
+"The archives of the announcement, user support and development discussion "
+"mailing lists are available through web archives."
 msgstr ""
 
 #. Tag: title
@@ -119,11 +160,18 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Internet Relay Chat (IRC) is another way to get in touch with some of the people that develop and use Kolab Groupware. Use your favorite IRC client to connect to the <ulink url=\"http://freenode.net\">FreeNode IRC Network</ulink>, or use the <ulink url=\"http://webchat.freenode.net?channels=kolab&uio=d4\">web-based chat</ulink>."
+msgid ""
+"Internet Relay Chat (IRC) is another way to get in touch with some of the "
+"people that develop and use Kolab Groupware. Use your favorite IRC client to"
+" connect to the <ulink url=\"http://freenode.net\">FreeNode IRC "
+"Network</ulink>, or use the <ulink "
+"url=\"http://webchat.freenode.net?channels=kolab&uio=d4\">web-based "
+"chat</ulink>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Once connected, join us in <ulink url=\"irc://irc.freenode.net/kolab\">the #kolab IRC channel</ulink>."
+msgid ""
+"Once connected, join us in <ulink url=\"irc://irc.freenode.net/kolab\">the "
+"#kolab IRC channel</ulink>."
 msgstr ""
-
diff --git a/About_Kolab_Groupware/ja-JP/sect-Kolab_Product_Series.po b/About_Kolab_Groupware/ja-JP/sect-Kolab_Product_Series.po
index fd9bc55..e359197 100644
--- a/About_Kolab_Groupware/ja-JP/sect-Kolab_Product_Series.po
+++ b/About_Kolab_Groupware/ja-JP/sect-Kolab_Product_Series.po
@@ -1,16 +1,19 @@
-# 
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:44\n"
-"PO-Revision-Date: 2012-08-24T15:34:44\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
+"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
+"POT-Creation-Date: 2012-09-03T11:14:06\n"
+"PO-Revision-Date: 2012-08-13 14:24+0000\n"
 "Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab/language/ja/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. Tag: title
 #, no-c-format
@@ -19,27 +22,45 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Kolab Groupware consists of free software components, each of which are available from various upstream development and support project organizations, including Linux distributions."
+msgid ""
+"Kolab Groupware consists of free software components, each of which are "
+"available from various upstream development and support project "
+"organizations, including Linux distributions."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The Kolab Groupware developers, community members and Kolab Systems engineering and support staff maintain many of the packages related to Kolab with the Linux distributions through which those packages are available."
+msgid ""
+"The Kolab Groupware developers, community members and Kolab Systems "
+"engineering and support staff maintain many of the packages related to Kolab"
+" with the Linux distributions through which those packages are available."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The Kolab software repositories can therefor include only those software components, or those specific versions of software components, that differentiate from what is available through the upstream Linux distribution software repositories, and possibly recommended or required additional software repositories."
+msgid ""
+"The Kolab software repositories can therefor include only those software "
+"components, or those specific versions of software components, that "
+"differentiate from what is available through the upstream Linux distribution"
+" software repositories, and possibly recommended or required additional "
+"software repositories."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Product series are versioned, each of them created to provide a sustainable stream of updates to the individual software components included in that product serie."
+msgid ""
+"Product series are versioned, each of them created to provide a sustainable "
+"stream of updates to the individual software components included in that "
+"product serie."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The convention for <emphasis>Server Product Versioning</emphasis> is subject to the guidelines proposed and accepted as <ulink url=\"http://wiki.kolab.org/KEP:5\">Kolab Enhancement Proposal #5</ulink> (KEP #5 for short)."
+msgid ""
+"The convention for <emphasis>Server Product Versioning</emphasis> is subject"
+" to the guidelines proposed and accepted as <ulink "
+"url=\"http://wiki.kolab.org/KEP:5\">Kolab Enhancement Proposal #5</ulink> "
+"(KEP #5 for short)."
 msgstr ""
 
 #. Tag: title
@@ -49,47 +70,72 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Two different product streams exist, a <literal>community</literal> edition and an <literal>enterprise</literal> edition."
+msgid ""
+"Two different product streams exist, a <literal>community</literal> edition "
+"and an <literal>enterprise</literal> edition."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The differences between the community edition and the enterprise edition are as follows:"
+msgid ""
+"The differences between the community edition and the enterprise edition are"
+" as follows:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "No debuginfo sub-packages are made available through the repositories for the community edition. You typically need debuginfo sub-paclages in case stack traces need to be generated for binary compiled programs such as mysql, openldap, cyrus-imapd, php and others."
+msgid ""
+"No debuginfo sub-packages are made available through the repositories for "
+"the community edition. You typically need debuginfo sub-paclages in case "
+"stack traces need to be generated for binary compiled programs such as "
+"mysql, openldap, cyrus-imapd, php and others."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The packages available through the repositories for the community edition are not signed with a PGP key, and therefor the authenticity of the packages cannot be verified."
+msgid ""
+"The packages available through the repositories for the community edition "
+"are not signed with a PGP key, and therefor the authenticity of the packages"
+" cannot be verified."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The repositories for the community edition are made available through HTTP only, while the enterprise edition's repositories are available over HTTPS only. For the community edition, the the authenticity cannot be verified."
+msgid ""
+"The repositories for the community edition are made available through HTTP "
+"only, while the enterprise edition's repositories are available over HTTPS "
+"only. For the community edition, the the authenticity cannot be verified."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "In the repositories for the community edition, no package builds other then the latest are made available. Rolling back a software update foo-1.0-2.el5 to a previously installed software version foo-1.0-1.el5 after a failed update is therefor not possible unless a copy of foo-1.0-1.el5 had been preserved."
+msgid ""
+"In the repositories for the community edition, no package builds other then "
+"the latest are made available. Rolling back a software update foo-1.0-2.el5 "
+"to a previously installed software version foo-1.0-1.el5 after a failed "
+"update is therefor not possible unless a copy of foo-1.0-1.el5 had been "
+"preserved."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "For the community edition, no security errata –other then for critical security issues– is sent out."
+msgid ""
+"For the community edition, no security errata –other then for critical"
+" security issues– is sent out."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The enterprise edition is supported for a longer term than the community edition."
+msgid ""
+"The enterprise edition is supported for a longer term than the community "
+"edition."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The software available in the enterprise edition is subjected to thorough quality assurance and certification before being made available."
+msgid ""
+"The software available in the enterprise edition is subjected to thorough "
+"quality assurance and certification before being made available."
 msgstr ""
 
 #. Tag: title
@@ -99,16 +145,24 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "4 different repository stages exist, each of them indicating the expected level of stability, and point-in-time release."
+msgid ""
+"4 different repository stages exist, each of them indicating the expected "
+"level of stability, and point-in-time release."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The <literal>release</literal> and <literal>updates</literal> repositories contain the most stable software (community edition) which is supported (professionally in the enterprise edition)."
+msgid ""
+"The <literal>release</literal> and <literal>updates</literal> repositories "
+"contain the most stable software (community edition) which is supported "
+"(professionally in the enterprise edition)."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The <literal>updates-testing</literal> repositories contain software that is being stabilized (through the collection of community feedback for the community edition) before being submitted to the <literal>updates</literal> repository."
+msgid ""
+"The <literal>updates-testing</literal> repositories contain software that is"
+" being stabilized (through the collection of community feedback for the "
+"community edition) before being submitted to the <literal>updates</literal> "
+"repository."
 msgstr ""
-
diff --git a/About_Kolab_Groupware/ja-JP/sect-Supported_Platforms_and_System_Requirements.po b/About_Kolab_Groupware/ja-JP/sect-Supported_Platforms_and_System_Requirements.po
index c2196e2..a93d78b 100644
--- a/About_Kolab_Groupware/ja-JP/sect-Supported_Platforms_and_System_Requirements.po
+++ b/About_Kolab_Groupware/ja-JP/sect-Supported_Platforms_and_System_Requirements.po
@@ -1,16 +1,19 @@
-# 
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:44\n"
-"PO-Revision-Date: 2012-08-24T15:34:44\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
+"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
+"POT-Creation-Date: 2012-09-03T11:14:06\n"
+"PO-Revision-Date: 2012-09-03 11:14+0000\n"
+"Last-Translator: Jeroen van Meeuwen <vanmeeuwen at kolabsys.com>\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab/language/ja/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. Tag: title
 #, no-c-format
@@ -24,7 +27,12 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "All reasonably recent versions of Linux<footnote> <para> By reasonably recent versions of Linux, we intend to indicate the Kolab project can manage to keep up with the latest distribution release ear-marked stable. </para> </footnote>, including but not limited to the following distributions, in no particular order other then alphabetic;"
+msgid ""
+"All reasonably recent versions of Linux<footnote> <para> By reasonably "
+"recent versions of Linux, we intend to indicate the Kolab project can manage"
+" to keep up with the latest distribution release ear-marked stable. </para> "
+"</footnote>, including but not limited to the following distributions, in no"
+" particular order other then alphabetic;"
 msgstr ""
 
 #. Tag: para
@@ -49,11 +57,15 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "<ulink url=\"http://www.univention.de/index.php?id=964&L=1\">Univention Corporate Server</ulink>"
+msgid ""
+"<ulink url=\"http://www.univention.de/index.php?id=964&L=1\">Univention "
+"Corporate Server</ulink>"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Should your Linux distribution or platform not be listed here, please refer to <xref linkend=\"sect-About_Kolab_Groupware-Feedback\" /> for ways of contacting the Kolab Development team."
+msgid ""
+"Should your Linux distribution or platform not be listed here, please refer "
+"to <xref linkend=\"sect-About_Kolab_Groupware-Feedback\" /> for ways of "
+"contacting the Kolab Development team."
 msgstr ""
-
diff --git a/About_Kolab_Groupware/nl-NL/About_Kolab_Groupware.po b/About_Kolab_Groupware/nl-NL/About_Kolab_Groupware.po
index 4773bbe..e8838f8 100644
--- a/About_Kolab_Groupware/nl-NL/About_Kolab_Groupware.po
+++ b/About_Kolab_Groupware/nl-NL/About_Kolab_Groupware.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:06:03\n"
+"POT-Creation-Date: 2012-09-03T11:14:06\n"
 "PO-Revision-Date: 2012-08-13 15:47+0000\n"
 "Last-Translator: Jeroen van Meeuwen <vanmeeuwen at kolabsys.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/kolab/language/nl/)\n"
diff --git a/About_Kolab_Groupware/nl-NL/Article_Info.po b/About_Kolab_Groupware/nl-NL/Article_Info.po
index cb70aa1..b9dc008 100644
--- a/About_Kolab_Groupware/nl-NL/Article_Info.po
+++ b/About_Kolab_Groupware/nl-NL/Article_Info.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:06:03\n"
+"POT-Creation-Date: 2012-09-03T11:14:06\n"
 "PO-Revision-Date: 2012-08-13 14:14+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/kolab/language/nl/)\n"
diff --git a/About_Kolab_Groupware/nl-NL/Revision_History.po b/About_Kolab_Groupware/nl-NL/Revision_History.po
index 192b3e0..739edb8 100644
--- a/About_Kolab_Groupware/nl-NL/Revision_History.po
+++ b/About_Kolab_Groupware/nl-NL/Revision_History.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:06:03\n"
+"POT-Creation-Date: 2012-09-03T11:14:06\n"
 "PO-Revision-Date: 2012-08-13 14:14+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/kolab/language/nl/)\n"
diff --git a/About_Kolab_Groupware/nl-NL/sect-About_Kolab_Groupware.po b/About_Kolab_Groupware/nl-NL/sect-About_Kolab_Groupware.po
index 3cdee20..ecf7423 100644
--- a/About_Kolab_Groupware/nl-NL/sect-About_Kolab_Groupware.po
+++ b/About_Kolab_Groupware/nl-NL/sect-About_Kolab_Groupware.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:06:03\n"
+"POT-Creation-Date: 2012-09-03T11:14:06\n"
 "PO-Revision-Date: 2012-08-13 14:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/kolab/language/nl/)\n"
diff --git a/About_Kolab_Groupware/nl-NL/sect-Feedback.po b/About_Kolab_Groupware/nl-NL/sect-Feedback.po
index f372f54..bf03d5a 100644
--- a/About_Kolab_Groupware/nl-NL/sect-Feedback.po
+++ b/About_Kolab_Groupware/nl-NL/sect-Feedback.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:06:03\n"
+"POT-Creation-Date: 2012-09-03T11:14:06\n"
 "PO-Revision-Date: 2012-08-14 01:10+0000\n"
 "Last-Translator: Jeroen van Meeuwen <vanmeeuwen at kolabsys.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/kolab/language/nl/)\n"
diff --git a/About_Kolab_Groupware/nl-NL/sect-Kolab_Product_Series.po b/About_Kolab_Groupware/nl-NL/sect-Kolab_Product_Series.po
index c640d5c..b994159 100644
--- a/About_Kolab_Groupware/nl-NL/sect-Kolab_Product_Series.po
+++ b/About_Kolab_Groupware/nl-NL/sect-Kolab_Product_Series.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:06:03\n"
+"POT-Creation-Date: 2012-09-03T11:14:06\n"
 "PO-Revision-Date: 2012-08-13 14:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/kolab/language/nl/)\n"
diff --git a/About_Kolab_Groupware/nl-NL/sect-Supported_Platforms_and_System_Requirements.po b/About_Kolab_Groupware/nl-NL/sect-Supported_Platforms_and_System_Requirements.po
index 31cc10e..692ae57 100644
--- a/About_Kolab_Groupware/nl-NL/sect-Supported_Platforms_and_System_Requirements.po
+++ b/About_Kolab_Groupware/nl-NL/sect-Supported_Platforms_and_System_Requirements.po
@@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:06:03\n"
-"PO-Revision-Date: 2012-08-15 22:06+0000\n"
+"POT-Creation-Date: 2012-09-03T11:14:06\n"
+"PO-Revision-Date: 2012-09-03 11:14+0000\n"
 "Last-Translator: Jeroen van Meeuwen <vanmeeuwen at kolabsys.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/kolab/language/nl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/About_Kolab_Groupware/pot/About_Kolab_Groupware.pot b/About_Kolab_Groupware/pot/About_Kolab_Groupware.pot
index ae026f9..74b08a8 100644
--- a/About_Kolab_Groupware/pot/About_Kolab_Groupware.pot
+++ b/About_Kolab_Groupware/pot/About_Kolab_Groupware.pot
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-15T22:06:03\n"
-"PO-Revision-Date: 2012-08-15T22:06:03\n"
+"POT-Creation-Date: 2012-09-03T11:14:06\n"
+"PO-Revision-Date: 2012-09-03T11:14:06\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
diff --git a/About_Kolab_Groupware/pot/Article_Info.pot b/About_Kolab_Groupware/pot/Article_Info.pot
index c233b23..e86aa28 100644
--- a/About_Kolab_Groupware/pot/Article_Info.pot
+++ b/About_Kolab_Groupware/pot/Article_Info.pot
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-15T22:06:03\n"
-"PO-Revision-Date: 2012-08-15T22:06:03\n"
+"POT-Creation-Date: 2012-09-03T11:14:06\n"
+"PO-Revision-Date: 2012-09-03T11:14:06\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
diff --git a/About_Kolab_Groupware/pot/Author_Group.pot b/About_Kolab_Groupware/pot/Author_Group.pot
index b1cb638..1c4bbf9 100644
--- a/About_Kolab_Groupware/pot/Author_Group.pot
+++ b/About_Kolab_Groupware/pot/Author_Group.pot
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-15T22:06:03\n"
-"PO-Revision-Date: 2012-08-15T22:06:03\n"
+"POT-Creation-Date: 2012-09-03T11:14:06\n"
+"PO-Revision-Date: 2012-09-03T11:14:06\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
diff --git a/About_Kolab_Groupware/pot/Revision_History.pot b/About_Kolab_Groupware/pot/Revision_History.pot
index f6df477..b84dc85 100644
--- a/About_Kolab_Groupware/pot/Revision_History.pot
+++ b/About_Kolab_Groupware/pot/Revision_History.pot
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-15T22:06:03\n"
-"PO-Revision-Date: 2012-08-15T22:06:03\n"
+"POT-Creation-Date: 2012-09-03T11:14:06\n"
+"PO-Revision-Date: 2012-09-03T11:14:06\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
diff --git a/About_Kolab_Groupware/pot/sect-About_Kolab_Groupware.pot b/About_Kolab_Groupware/pot/sect-About_Kolab_Groupware.pot
index 00727e7..2ab25eb 100644
--- a/About_Kolab_Groupware/pot/sect-About_Kolab_Groupware.pot
+++ b/About_Kolab_Groupware/pot/sect-About_Kolab_Groupware.pot
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-15T22:06:03\n"
-"PO-Revision-Date: 2012-08-15T22:06:03\n"
+"POT-Creation-Date: 2012-09-03T11:14:06\n"
+"PO-Revision-Date: 2012-09-03T11:14:06\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
diff --git a/About_Kolab_Groupware/pot/sect-Feedback.pot b/About_Kolab_Groupware/pot/sect-Feedback.pot
index b9ad92e..7604a94 100644
--- a/About_Kolab_Groupware/pot/sect-Feedback.pot
+++ b/About_Kolab_Groupware/pot/sect-Feedback.pot
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-15T22:06:03\n"
-"PO-Revision-Date: 2012-08-15T22:06:03\n"
+"POT-Creation-Date: 2012-09-03T11:14:06\n"
+"PO-Revision-Date: 2012-09-03T11:14:06\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
diff --git a/About_Kolab_Groupware/pot/sect-Kolab_Product_Series.pot b/About_Kolab_Groupware/pot/sect-Kolab_Product_Series.pot
index f2d1f09..80a64aa 100644
--- a/About_Kolab_Groupware/pot/sect-Kolab_Product_Series.pot
+++ b/About_Kolab_Groupware/pot/sect-Kolab_Product_Series.pot
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-15T22:06:03\n"
-"PO-Revision-Date: 2012-08-15T22:06:03\n"
+"POT-Creation-Date: 2012-09-03T11:14:06\n"
+"PO-Revision-Date: 2012-09-03T11:14:06\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
diff --git a/About_Kolab_Groupware/pot/sect-Supported_Platforms_and_System_Requirements.pot b/About_Kolab_Groupware/pot/sect-Supported_Platforms_and_System_Requirements.pot
index 0953eed..929b28b 100644
--- a/About_Kolab_Groupware/pot/sect-Supported_Platforms_and_System_Requirements.pot
+++ b/About_Kolab_Groupware/pot/sect-Supported_Platforms_and_System_Requirements.pot
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-15T22:06:03\n"
-"PO-Revision-Date: 2012-08-15T22:06:03\n"
+"POT-Creation-Date: 2012-09-03T11:14:06\n"
+"PO-Revision-Date: 2012-09-03T11:14:06\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
diff --git a/Administrator_Guide/.tx/config b/Administrator_Guide/.tx/config
index c2310f5..2d17190 100644
--- a/Administrator_Guide/.tx/config
+++ b/Administrator_Guide/.tx/config
@@ -1,6 +1,6 @@
 [main]
 host = https://www.transifex.net
-lang_map = de: de-DE, es: es-ES, fr: fr-FR, nl: nl-NL
+lang_map = de: de-DE, es: es-ES, fr: fr-FR, ja: ja-JP, nl: nl-NL
 type = PO
 
 [kolab.Administrator_Guide-step-select-all-mailboxes]
diff --git a/Administrator_Guide/de-DE/Combating_Spam.po b/Administrator_Guide/de-DE/Combating_Spam.po
index 84922f4..4065c02 100644
--- a/Administrator_Guide/de-DE/Combating_Spam.po
+++ b/Administrator_Guide/de-DE/Combating_Spam.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:16+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Administrator_Guide/de-DE/Configuring_the_Kolab_Server.po b/Administrator_Guide/de-DE/Configuring_the_Kolab_Server.po
index 1fa4ee2..e480e87 100644
--- a/Administrator_Guide/de-DE/Configuring_the_Kolab_Server.po
+++ b/Administrator_Guide/de-DE/Configuring_the_Kolab_Server.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:17+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Administrator_Guide/de-DE/Detailed_Kolab_Server_Overview.po b/Administrator_Guide/de-DE/Detailed_Kolab_Server_Overview.po
index b72846f..a92677f 100644
--- a/Administrator_Guide/de-DE/Detailed_Kolab_Server_Overview.po
+++ b/Administrator_Guide/de-DE/Detailed_Kolab_Server_Overview.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:17+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Administrator_Guide/de-DE/Kolab_Web_Administration_Panel.po b/Administrator_Guide/de-DE/Kolab_Web_Administration_Panel.po
index a040466..d4db28d 100644
--- a/Administrator_Guide/de-DE/Kolab_Web_Administration_Panel.po
+++ b/Administrator_Guide/de-DE/Kolab_Web_Administration_Panel.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:17+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Administrator_Guide/de-DE/Preface.po b/Administrator_Guide/de-DE/Preface.po
index 2462872..553e077 100644
--- a/Administrator_Guide/de-DE/Preface.po
+++ b/Administrator_Guide/de-DE/Preface.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:18+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Administrator_Guide/de-DE/Revision_History.po b/Administrator_Guide/de-DE/Revision_History.po
index ff00e17..ffab20f 100644
--- a/Administrator_Guide/de-DE/Revision_History.po
+++ b/Administrator_Guide/de-DE/Revision_History.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:19+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Administrator_Guide/de-DE/Tweaking_Tips_for_389_Directory_Server.po b/Administrator_Guide/de-DE/Tweaking_Tips_for_389_Directory_Server.po
index e9e1936..8f73797 100644
--- a/Administrator_Guide/de-DE/Tweaking_Tips_for_389_Directory_Server.po
+++ b/Administrator_Guide/de-DE/Tweaking_Tips_for_389_Directory_Server.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:18+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Administrator_Guide/de-DE/Tweaking_Tips_for_Cyrus_IMAP.po b/Administrator_Guide/de-DE/Tweaking_Tips_for_Cyrus_IMAP.po
index 38bcfb6..566ef6e 100644
--- a/Administrator_Guide/de-DE/Tweaking_Tips_for_Cyrus_IMAP.po
+++ b/Administrator_Guide/de-DE/Tweaking_Tips_for_Cyrus_IMAP.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:18+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Administrator_Guide/de-DE/Tweaking_Tips_for_Postfix.po b/Administrator_Guide/de-DE/Tweaking_Tips_for_Postfix.po
index 1d1278b..2ecb103 100644
--- a/Administrator_Guide/de-DE/Tweaking_Tips_for_Postfix.po
+++ b/Administrator_Guide/de-DE/Tweaking_Tips_for_Postfix.po
@@ -5,9 +5,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
-"PO-Revision-Date: 2012-08-13 13:16+0000\n"
-"Last-Translator: Automatically generated\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
+"PO-Revision-Date: 2012-08-24 15:42+0000\n"
+"Last-Translator: Jeroen van Meeuwen <vanmeeuwen at kolabsys.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,3 +24,66 @@ msgstr ""
 #, no-c-format
 msgid "para"
 msgstr ""
+
+#. Tag: title
+#, no-c-format
+msgid "Large Kolab Distribution Groups"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"If you have Kolab distribution groups with many members, you may see the "
+"following message occur in log file <filename>/var/log/maillog</filename>:"
+msgstr ""
+
+#. Tag: screen
+#, no-c-format
+msgid ""
+"Aug 17 10:21:59 kolab postfix/cleanup[5916]: warning: 398194A151: "
+"unreasonable virtual_alias_maps map expansion size for kolab-"
+"users at example.org"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The setting <literal>virtual_alias_expansion_limit</literal> controls the "
+"maximum number of recipient address that are produced from a single original"
+" recipient address. The default depends on your installation."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "To get the default value, execute:"
+msgstr ""
+
+#. Tag: screen
+#, no-c-format
+msgid ""
+"# <userinput>postconf -d virtual_alias_expansion_limit</userinput>\n"
+"1000"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "To get the current value, execute:"
+msgstr ""
+
+#. Tag: screen
+#, no-c-format
+msgid ""
+"# <userinput>postconf virtual_alias_expansion_limit</userinput>\n"
+"1000"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "To set a new value, execute:"
+msgstr ""
+
+#. Tag: screen
+#, no-c-format
+msgid ""
+"# <userinput>postconf -e virtual_alias_expansion_limit=10000</userinput>"
+msgstr ""
diff --git a/Administrator_Guide/de-DE/Tweaking_Tips_for_Roundcube.po b/Administrator_Guide/de-DE/Tweaking_Tips_for_Roundcube.po
index 5669c3a..4a3f9da 100644
--- a/Administrator_Guide/de-DE/Tweaking_Tips_for_Roundcube.po
+++ b/Administrator_Guide/de-DE/Tweaking_Tips_for_Roundcube.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:18+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Administrator_Guide/de-DE/Upgrading_Accounts_from_Kolab_Format_version_2.po b/Administrator_Guide/de-DE/Upgrading_Accounts_from_Kolab_Format_version_2.po
index 75cdb19..ca877e2 100644
--- a/Administrator_Guide/de-DE/Upgrading_Accounts_from_Kolab_Format_version_2.po
+++ b/Administrator_Guide/de-DE/Upgrading_Accounts_from_Kolab_Format_version_2.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:18+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Administrator_Guide/de-DE/Upgrading_from_Kolab_2_on_OpenPKG.po b/Administrator_Guide/de-DE/Upgrading_from_Kolab_2_on_OpenPKG.po
index ddc7169..ac27750 100644
--- a/Administrator_Guide/de-DE/Upgrading_from_Kolab_2_on_OpenPKG.po
+++ b/Administrator_Guide/de-DE/Upgrading_from_Kolab_2_on_OpenPKG.po
@@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
-"PO-Revision-Date: 2012-08-15 22:09+0000\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
+"PO-Revision-Date: 2012-08-24 15:43+0000\n"
 "Last-Translator: Jeroen van Meeuwen <vanmeeuwen at kolabsys.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -463,9 +463,9 @@ msgid ""
 ">   <userinput>sed -e 's/user\\///g' | \\</userinput>\n"
 ">   <userinput>while read user; do</userinput>\n"
 ">       <userinput>kolab-formatupgrade \\</userinput>\n"
-">           <userinput>--user cyrus-admin \\</userinput>\n"
+">           <userinput>--user \"${user}\" \\</userinput>\n"
 ">           <userinput>--password <replaceable>$password</replaceable> \\</userinput>\n"
-">           <userinput>--proxyauth \"${user}\" \\</userinput>\n"
+">           <userinput>--proxyauth cyrus-admin \\</userinput>\n"
 ">           <userinput>--port 143 \\</userinput>\n"
 ">           <userinput>--encrypt TLS \\</userinput>\n"
 ">           <userinput><replaceable>localhost</replaceable></userinput>\n"
diff --git a/Administrator_Guide/de-DE/Verifying_the_Installation.po b/Administrator_Guide/de-DE/Verifying_the_Installation.po
index 9ec0490..9fee2b3 100644
--- a/Administrator_Guide/de-DE/Verifying_the_Installation.po
+++ b/Administrator_Guide/de-DE/Verifying_the_Installation.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:18+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Administrator_Guide/de-DE/chap-About_Kolab_Groupware.po b/Administrator_Guide/de-DE/chap-About_Kolab_Groupware.po
index 301853c..473d43d 100644
--- a/Administrator_Guide/de-DE/chap-About_Kolab_Groupware.po
+++ b/Administrator_Guide/de-DE/chap-About_Kolab_Groupware.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:17+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Administrator_Guide/de-DE/part-Clients.po b/Administrator_Guide/de-DE/part-Clients.po
index d281755..e7db9be 100644
--- a/Administrator_Guide/de-DE/part-Clients.po
+++ b/Administrator_Guide/de-DE/part-Clients.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:17+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Administrator_Guide/de-DE/part-Kolab_Server.po b/Administrator_Guide/de-DE/part-Kolab_Server.po
index 675c43c..3d5ada6 100644
--- a/Administrator_Guide/de-DE/part-Kolab_Server.po
+++ b/Administrator_Guide/de-DE/part-Kolab_Server.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:17+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Administrator_Guide/de-DE/sect-About_Kolab_Groupware.po b/Administrator_Guide/de-DE/sect-About_Kolab_Groupware.po
index 61b6bba..aca3c48 100644
--- a/Administrator_Guide/de-DE/sect-About_Kolab_Groupware.po
+++ b/Administrator_Guide/de-DE/sect-About_Kolab_Groupware.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:53\n"
 "PO-Revision-Date: 2012-08-13 14:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Administrator_Guide/de-DE/sect-Feedback.po b/Administrator_Guide/de-DE/sect-Feedback.po
index 61fdf4a..80720e0 100644
--- a/Administrator_Guide/de-DE/sect-Feedback.po
+++ b/Administrator_Guide/de-DE/sect-Feedback.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:53\n"
 "PO-Revision-Date: 2012-08-13 14:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Administrator_Guide/de-DE/sect-Kolab_Product_Series.po b/Administrator_Guide/de-DE/sect-Kolab_Product_Series.po
index 155660a..04d35c0 100644
--- a/Administrator_Guide/de-DE/sect-Kolab_Product_Series.po
+++ b/Administrator_Guide/de-DE/sect-Kolab_Product_Series.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:53\n"
 "PO-Revision-Date: 2012-08-13 14:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Administrator_Guide/de-DE/sect-Supported_Platforms_and_System_Requirements.po b/Administrator_Guide/de-DE/sect-Supported_Platforms_and_System_Requirements.po
index 1d8b761..9e2b618 100644
--- a/Administrator_Guide/de-DE/sect-Supported_Platforms_and_System_Requirements.po
+++ b/Administrator_Guide/de-DE/sect-Supported_Platforms_and_System_Requirements.po
@@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
-"PO-Revision-Date: 2012-08-15 22:09+0000\n"
+"POT-Creation-Date: 2012-08-24T15:41:53\n"
+"PO-Revision-Date: 2012-08-24 15:44+0000\n"
 "Last-Translator: Jeroen van Meeuwen <vanmeeuwen at kolabsys.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
 "MIME-Version: 1.0\n"
diff --git a/Administrator_Guide/de-DE/step-convert-seen-databases.po b/Administrator_Guide/de-DE/step-convert-seen-databases.po
index df02c6c..ed8c63f 100644
--- a/Administrator_Guide/de-DE/step-convert-seen-databases.po
+++ b/Administrator_Guide/de-DE/step-convert-seen-databases.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:53\n"
 "PO-Revision-Date: 2012-08-13 13:17+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Administrator_Guide/de-DE/step-select-all-mailboxes.po b/Administrator_Guide/de-DE/step-select-all-mailboxes.po
index 0ffa101..78f0656 100644
--- a/Administrator_Guide/de-DE/step-select-all-mailboxes.po
+++ b/Administrator_Guide/de-DE/step-select-all-mailboxes.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:53\n"
 "PO-Revision-Date: 2012-08-15 22:08+0000\n"
 "Last-Translator: Jeroen van Meeuwen <vanmeeuwen at kolabsys.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Administrator_Guide/en-US/Administrator_Guide.xml b/Administrator_Guide/en-US/Administrator_Guide.xml
index 6fe4f69..bad0d1a 100644
--- a/Administrator_Guide/en-US/Administrator_Guide.xml
+++ b/Administrator_Guide/en-US/Administrator_Guide.xml
@@ -4,10 +4,10 @@
 %BOOK_ENTITIES;
 ]>
 <book>
-    <xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="part-Kolab_Server.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <!--            <xi:include href="part-Kolab_Clients.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />            --> <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <index />
+	<xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="part-Kolab_Server.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <!--             <xi:include href="part-Kolab_Clients.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />             --> <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <index />
 </book>
 
diff --git a/Administrator_Guide/en-US/Book_Info.xml b/Administrator_Guide/en-US/Book_Info.xml
index 6376136..2816fc4 100644
--- a/Administrator_Guide/en-US/Book_Info.xml
+++ b/Administrator_Guide/en-US/Book_Info.xml
@@ -4,28 +4,28 @@
 %BOOK_ENTITIES;
 ]>
 <bookinfo id="book-Administrator_Guide-Administrator_Guide">
-    <title>Administrator Guide</title>
-    <subtitle>short description</subtitle>
-    <productname>Kolab Groupware</productname>
-    <productnumber>3.0</productnumber>
-    <edition>0</edition>
-    <pubsnumber>0</pubsnumber>
-    <abstract>
-        <para>
-            A short overview and summary of the book's subject and purpose, traditionally no more than one paragraph long. Note: the abstract will appear in the front matter of your book and will also be placed in the description field of the book's RPM spec file.
-        </para>
+	<title>Administrator Guide</title>
+	 <subtitle>short description</subtitle>
+	 <productname>Kolab Groupware</productname>
+	 <productnumber>3.0</productnumber>
+	 <edition>0</edition>
+	 <pubsnumber>0</pubsnumber>
+	 <abstract>
+		<para>
+			A short overview and summary of the book's subject and purpose, traditionally no more than one paragraph long. Note: the abstract will appear in the front matter of your book and will also be placed in the description field of the book's RPM spec file.
+		</para>
 
-    </abstract>
-    <corpauthor>
-        <inlinemediaobject>
-            <imageobject>
-                <imagedata fileref="images/title_logo.png" format="PNG" />
-            </imageobject>
+	</abstract>
+	 <corpauthor>
+		<inlinemediaobject>
+			<imageobject>
+				<imagedata fileref="images/title_logo.png" format="PNG" />
+			</imageobject>
 
-        </inlinemediaobject>
+		</inlinemediaobject>
 
-    </corpauthor>
-    <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	</corpauthor>
+	 <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </bookinfo>
 
diff --git a/Administrator_Guide/en-US/Combating_Spam.xml b/Administrator_Guide/en-US/Combating_Spam.xml
index cd00ca2..9942529 100644
--- a/Administrator_Guide/en-US/Combating_Spam.xml
+++ b/Administrator_Guide/en-US/Combating_Spam.xml
@@ -4,723 +4,723 @@
 %BOOK_ENTITIES;
 ]>
 <chapter id="chap-Administrator_Guide-Combating_Spam">
-    <title>Combating Spam</title>
-    <para>
-        Kolab Groupware includes <application>SpamAssassin</application>, a fast, well-established anti-spam solution with a large community of supporters contributing not only to the code, but to rulesets as well.
-    </para>
-    <para>
-        Combating spam is always a tricky situation. On the organizational level, a strategy has to be formulated to combat spam in order to achieve the maximum flexibility and effectiveness for individual users, separate organizations, and the deployment as a whole.
-    </para>
-    <para>
-        A common deployment is to define deployment-wide user preferences and to use a single, deployment-wide set of rules for <application>SpamAssassin</application> to operate with -including Bayes database(s).
-    </para>
-    <para>
-        The problems start when individual users mark legitimate email as spam, most notably the company newsletter or correspondation they have opted in some time ago, but wish to no longer receive. Users tend to ignore the long-term effects of marking these message as spam, if at all they are aware of any, and just want such messages out of their way.
-    </para>
-    <para>
-        Common examples of the sort of messages that are often marked as spam while being legitimate traffic include:
-    </para>
-    <para>
-        <itemizedlist>
-            <listitem>
-                <para>
-                    Newsletters, where users, rather then unsubscribe, mark legitimate messages as spam,
-                </para>
-
-            </listitem>
-            <listitem>
-                <para>
-                    Notifications from social networks such as from Google+, Facebook, Twitter, etc., where users, rather then adjust their notification preferences, mark legitimate messages as spam,
-                </para>
-
-            </listitem>
-            <listitem>
-                <para>
-                    Notifications from forums and/or services,
-                </para>
-
-            </listitem>
-
-        </itemizedlist>
-
-    </para>
-    <para>
-        If enough users mark these messages as spam, the system will start to recognize these messages as spam, and other users may be prevented from receiving the same or similar messages in their INBOX.
-    </para>
-    <para>
-        <application>Amavis</application>, the default content filter performing anti-virus and anti-spam, wraps around <application>SpamAssassin</application> to achieve this flexibility.
-    </para>
-    <para>
-        Separate Bayes database(s) can be created on a per-recipient and per-policy-bank <application>SpamAssassin</application> configuration files and SQL Bayes usernames.
-    </para>
-    <para>
-        Without over-complicating things, a common scenario sufficiently serving the anti-spam effort, includes the following aspects;
-    </para>
-    <para>
-        <itemizedlist>
-            <listitem>
-                <para>
-                    A <code>shared/Spam</code> folder is created, with permissions for all users to lookup, read, and insert messages. It is the intention users move or copy messages they think are spam into this folder.
-                </para>
-                <note>
-                    <para>
-                        Note that, optionally, the permissions for users to maintain the 'seen' state of messages could not be granted, which in combination with <literal>sharedseen</literal> could provide a mechanism that would allow users to view which messages have been learned as spam in the past.
-                    </para>
-
-                </note>
-
-            </listitem>
-
-        </itemizedlist>
-
-    </para>
-    <section id="sect-Administrator_Guide-Combating_Spam-Learning_About_New_Spam">
-        <title>Learning About New Spam</title>
-        <para>
-            Optionally, find all folders named "Spam" or "Junk":
-        </para>
-        <para>
-
+	<title>Combating Spam</title>
+	 <para>
+		Kolab Groupware includes <application>SpamAssassin</application>, a fast, well-established anti-spam solution with a large community of supporters contributing not only to the code, but to rulesets as well.
+	</para>
+	 <para>
+		Combating spam is always a tricky situation. On the organizational level, a strategy has to be formulated to combat spam in order to achieve the maximum flexibility and effectiveness for individual users, separate organizations, and the deployment as a whole.
+	</para>
+	 <para>
+		A common deployment is to define deployment-wide user preferences and to use a single, deployment-wide set of rules for <application>SpamAssassin</application> to operate with -including Bayes database(s).
+	</para>
+	 <para>
+		The problems start when individual users mark legitimate email as spam, most notably the company newsletter or correspondation they have opted in some time ago, but wish to no longer receive. Users tend to ignore the long-term effects of marking these message as spam, if at all they are aware of any, and just want such messages out of their way.
+	</para>
+	 <para>
+		Common examples of the sort of messages that are often marked as spam while being legitimate traffic include:
+	</para>
+	 <para>
+		<itemizedlist>
+			<listitem>
+				<para>
+					Newsletters, where users, rather then unsubscribe, mark legitimate messages as spam,
+				</para>
+
+			</listitem>
+			 <listitem>
+				<para>
+					Notifications from social networks such as from Google+, Facebook, Twitter, etc., where users, rather then adjust their notification preferences, mark legitimate messages as spam,
+				</para>
+
+			</listitem>
+			 <listitem>
+				<para>
+					Notifications from forums and/or services,
+				</para>
+
+			</listitem>
+
+		</itemizedlist>
+
+	</para>
+	 <para>
+		If enough users mark these messages as spam, the system will start to recognize these messages as spam, and other users may be prevented from receiving the same or similar messages in their INBOX.
+	</para>
+	 <para>
+		<application>Amavis</application>, the default content filter performing anti-virus and anti-spam, wraps around <application>SpamAssassin</application> to achieve this flexibility.
+	</para>
+	 <para>
+		Separate Bayes database(s) can be created on a per-recipient and per-policy-bank <application>SpamAssassin</application> configuration files and SQL Bayes usernames.
+	</para>
+	 <para>
+		Without over-complicating things, a common scenario sufficiently serving the anti-spam effort, includes the following aspects;
+	</para>
+	 <para>
+		<itemizedlist>
+			<listitem>
+				<para>
+					A <code>shared/Spam</code> folder is created, with permissions for all users to lookup, read, and insert messages. It is the intention users move or copy messages they think are spam into this folder.
+				</para>
+				 <note>
+					<para>
+						Note that, optionally, the permissions for users to maintain the 'seen' state of messages could not be granted, which in combination with <literal>sharedseen</literal> could provide a mechanism that would allow users to view which messages have been learned as spam in the past.
+					</para>
+
+				</note>
+
+			</listitem>
+
+		</itemizedlist>
+
+	</para>
+	 <section id="sect-Administrator_Guide-Combating_Spam-Learning_About_New_Spam">
+		<title>Learning About New Spam</title>
+		 <para>
+			Optionally, find all folders named "Spam" or "Junk":
+		</para>
+		 <para>
+			
 <screen>$ <userinput>find /var/spool/imap/ -type d -name "Spam" -o -name "Junk"</userinput></screen>
 
-        </para>
-        <note>
-            <para>
-                Finding all folders called "Spam" or "Junk" can potentially take a long time, depending on the size of the spool.
-            </para>
-
-        </note>
-        <remark> We would like to do the very same through IMAP, with annotations / SPECIAL-USE. </remark>
-        <para>
+		</para>
+		 <note>
+			<para>
+				Finding all folders called "Spam" or "Junk" can potentially take a long time, depending on the size of the spool.
+			</para>
 
+		</note>
+		 <remark> We would like to do the very same through IMAP, with annotations / SPECIAL-USE. </remark>
+		 <para>
+			
 <screen>$ <userinput>sa-learn --spam /path/to/folder/[0-9]*.</userinput></screen>
 
-        </para>
-        <note>
-            <para>
-                <application>SpamAssassin</application> will not learn about messages it has learned about before. There's no requirement of purging or deleting the messages that <application>SpamAssassin</application> has learned about already, and purging or deleting those messages only helps to speed up the learning process run.
-            </para>
-
-        </note>
-        <warning>
-            <para>
-                Do NOT delete the messages from the filesystem directly. Please refer to <xref linkend="sect-Administrator_Guide-Combating_Spam-Expiring_Messages_from_SpamHam_Shared_Folders" /> for ways to purge, expire and/or delete messages from spam folders in a sustainable way.
-            </para>
-
-        </warning>
-
-    </section>
-
-    <section id="sect-Administrator_Guide-Combating_Spam-Preseeding_the_Bayes_Database">
-        <title>Preseeding the Bayes Database</title>
-        <para>
-            As Bayes is only effective after it has learned about 200 messages, it is recommended to preseed the Bayes database with some high-quality ham and spam. Preseeding the Bayes database with some ham, and some spam, is done using the <emphasis>SpamAssassin Public Corpus</emphasis>. The public corpus consists of many messages qualified as ham and spam, collected from a variety of sources.
-        </para>
-        <para>
-            The SpamAssassin Public Corpus can be found at <ulink url="http://spamassassin.apache.org/publiccorpus/" />.
-        </para>
-        <procedure id="proc-Administrator_Guide-Preseeding_the_Bayes_Database-Preseeding_the_Bayes_Database_using_SpamAssassin_Public_Corpus">
-            <title>Preseeding the Bayes Database using SpamAssassin Public Corpus</title>
-            <step>
-                <para>
-                    Obtain the ham and spam archives:
-                </para>
-                <para>
-
+		</para>
+		 <note>
+			<para>
+				<application>SpamAssassin</application> will not learn about messages it has learned about before. There's no requirement of purging or deleting the messages that <application>SpamAssassin</application> has learned about already, and purging or deleting those messages only helps to speed up the learning process run.
+			</para>
+
+		</note>
+		 <warning>
+			<para>
+				Do NOT delete the messages from the filesystem directly. Please refer to <xref linkend="sect-Administrator_Guide-Combating_Spam-Expiring_Messages_from_SpamHam_Shared_Folders" /> for ways to purge, expire and/or delete messages from spam folders in a sustainable way.
+			</para>
+
+		</warning>
+
+	</section>
+	
+	 <section id="sect-Administrator_Guide-Combating_Spam-Preseeding_the_Bayes_Database">
+		<title>Preseeding the Bayes Database</title>
+		 <para>
+			As Bayes is only effective after it has learned about 200 messages, it is recommended to preseed the Bayes database with some high-quality ham and spam. Preseeding the Bayes database with some ham, and some spam, is done using the <emphasis>SpamAssassin Public Corpus</emphasis>. The public corpus consists of many messages qualified as ham and spam, collected from a variety of sources.
+		</para>
+		 <para>
+			The SpamAssassin Public Corpus can be found at <ulink url="http://spamassassin.apache.org/publiccorpus/" />.
+		</para>
+		 <procedure id="proc-Administrator_Guide-Preseeding_the_Bayes_Database-Preseeding_the_Bayes_Database_using_SpamAssassin_Public_Corpus">
+			<title>Preseeding the Bayes Database using SpamAssassin Public Corpus</title>
+			 <step>
+				<para>
+					Obtain the ham and spam archives:
+				</para>
+				 <para>
+					
 <screen># mkdir -p /tmp/salearn
 # cd /tmp/salearn
 # wget --recursive --timestamping --no-directories --level=1 --reject=gif,png,html,=A,=D http://spamassassin.apache.org/publiccorpus/</screen>
 
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Extract the archives:
-                </para>
-                <para>
+				</para>
 
+			</step>
+			 <step>
+				<para>
+					Extract the archives:
+				</para>
+				 <para>
+					
 <screen># for archive in `ls -1 *.tar.bz2`; do tar jxf $archive; done</screen>
 
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    For all files in the ham directories, learn those messages as ham:
-                </para>
-                <para>
+				</para>
 
+			</step>
+			 <step>
+				<para>
+					For all files in the ham directories, learn those messages as ham:
+				</para>
+				 <para>
+					
 <screen># sa-learn --progress --ham *ham*/*</screen>
 
-                </para>
-                <note>
-                    <para>
-                        The total number of messages is about 7000. Learning about all of them may take quite a while. We recommend running the command in a screen.
-                    </para>
-
-                </note>
-
-            </step>
-            <step>
-                <para>
-                    For all files in the spam directories, learn those messages as spam:
-                </para>
-                <para>
-
+				</para>
+				 <note>
+					<para>
+						The total number of messages is about 7000. Learning about all of them may take quite a while. We recommend running the command in a screen.
+					</para>
+
+				</note>
+
+			</step>
+			 <step>
+				<para>
+					For all files in the spam directories, learn those messages as spam:
+				</para>
+				 <para>
+					
 <screen># sa-learn --progress --spam *spam*/*</screen>
 
-                </para>
-                <note>
-                    <para>
-                        The total number of messages is about 2500. Learning about all of them may take quite a while. We recommend running the command in a screen.
-                    </para>
-
-                </note>
-
-            </step>
-
-        </procedure>
-
-
-    </section>
-
-    <section id="sect-Administrator_Guide-Combating_Spam-Trapping_Massive_Amounts_of_Spam">
-        <title>Trapping Massive Amounts of Spam</title>
-        <para>
-            To learn about spam quickly, allow the Cyrus IMAP postuser to post into a shared folder that will be included in the regular <command>sa-learn</command> run.
-        </para>
-        <procedure id="proc-Administrator_Guide-Trapping_Massive_Amounts_of_Spam-Setting_a_Trap_for_Spam">
-            <title>Setting a Trap for Spam</title>
-            <step>
-                <para>
-                    Set up the Cyrus IMAP postuser, using the <literal>postuser</literal> setting in <filename>/etc/imapd.conf</filename>.
-                </para>
-                <para>
-                    If, for example, the <literal>postuser</literal> is set to <literal>bb</literal>, the mail to <literal>bb+shared.blah</literal> will be delivered to the <literal>shared.blah</literal> folder.
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Create a folder such as <literal>shared/Spam</literal>
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Set permissions:
-                </para>
-                <para>
-
+				</para>
+				 <note>
+					<para>
+						The total number of messages is about 2500. Learning about all of them may take quite a while. We recommend running the command in a screen.
+					</para>
+
+				</note>
+
+			</step>
+
+		</procedure>
+		
+
+	</section>
+	
+	 <section id="sect-Administrator_Guide-Combating_Spam-Trapping_Massive_Amounts_of_Spam">
+		<title>Trapping Massive Amounts of Spam</title>
+		 <para>
+			To learn about spam quickly, allow the Cyrus IMAP postuser to post into a shared folder that will be included in the regular <command>sa-learn</command> run.
+		</para>
+		 <procedure id="proc-Administrator_Guide-Trapping_Massive_Amounts_of_Spam-Setting_a_Trap_for_Spam">
+			<title>Setting a Trap for Spam</title>
+			 <step>
+				<para>
+					Set up the Cyrus IMAP postuser, using the <literal>postuser</literal> setting in <filename>/etc/imapd.conf</filename>.
+				</para>
+				 <para>
+					If, for example, the <literal>postuser</literal> is set to <literal>bb</literal>, the mail to <literal>bb+shared.blah</literal> will be delivered to the <literal>shared.blah</literal> folder.
+				</para>
+
+			</step>
+			 <step>
+				<para>
+					Create a folder such as <literal>shared/Spam</literal>
+				</para>
+
+			</step>
+			 <step>
+				<para>
+					Set permissions:
+				</para>
+				 <para>
+					
 <screen>cyradm> sam shared/Spam <postuser> p</screen>
 
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Submit / subscribe to known spam aggregators (search Google for "free email offers")
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Optionally, set the <literal>luser_relay</literal> option in Postfix, to trap all messages sent to non-existent recipients.
-                </para>
-
-            </step>
-
-        </procedure>
-
-
-    </section>
-
-    <section id="sect-Administrator_Guide-Combating_Spam-Tweaking_Bayes_Scores">
-        <title>Tweaking Bayes' Scores</title>
-        <para>
-            Bayes' score is dependent on the probability Bayes attaches of a message being spam. The rules used to match a message's probability of being spam are systematically prefixed with <literal>BAYES_</literal>, followed by the percentage of likelihood of the message being spam.
-        </para>
-        <para>
-            Because there is rarely a 100% certainty of a message being spam, the highest percentage is 99%. By default, the configuration attaches a 3.5 score to this probability. Depending on the configuration value for <literal>$sa_tag2_level_deflt</literal> supplied in the Amavis configuration file, <literal>6.31</literal> by default, it is unlikely spam will reach the cut-off point of actually being marked as spam solely on the basis of Bayes' probability score.
-        </para>
-        <para>
-            It is therefor recommended to increase the score attached to messages with a 99% probability of being spam to at least <literal>6.308</literal>, if not simply <literal>6.31</literal>. Using <literal>6.308</literal>, you configure spam to be tagged not solely on the basis of Bayes' 99% probability score, but request that in addition the message is recognized to be in HTML (and HTML only), and perhaps uses a big font –or similar patterns with a very small <literal>0.01</literal> score.
-        </para>
-        <para>
-            Some spam has been submitted through systems listed at <ulink url="http://dnswl.org" />, a collaborative false positive protection mechanism, a default score of 1 is substracted from the total score. If this spam reaches you, consider increasing the score on <literal>BAYES_99</literal> with another one point.
-        </para>
-        <procedure id="proc-Administrator_Guide-Tweaking_Bayes_Scores-Adjusting_the_Score_for_BAYES_99">
-            <title>Adjusting the Score for <literal>BAYES_99</literal></title>
-            <step>
-                <para>
-                    Edit <filename>/etc/mail/spamassassin/local.cf</filename>, and make sure the following line is present:
-                </para>
-                <para>
-
+				</para>
+
+			</step>
+			 <step>
+				<para>
+					Submit / subscribe to known spam aggregators (search Google for "free email offers")
+				</para>
+
+			</step>
+			 <step>
+				<para>
+					Optionally, set the <literal>luser_relay</literal> option in Postfix, to trap all messages sent to non-existent recipients.
+				</para>
+
+			</step>
+
+		</procedure>
+		
+
+	</section>
+	
+	 <section id="sect-Administrator_Guide-Combating_Spam-Tweaking_Bayes_Scores">
+		<title>Tweaking Bayes' Scores</title>
+		 <para>
+			Bayes' score is dependent on the probability Bayes attaches of a message being spam. The rules used to match a message's probability of being spam are systematically prefixed with <literal>BAYES_</literal>, followed by the percentage of likelihood of the message being spam.
+		</para>
+		 <para>
+			Because there is rarely a 100% certainty of a message being spam, the highest percentage is 99%. By default, the configuration attaches a 3.5 score to this probability. Depending on the configuration value for <literal>$sa_tag2_level_deflt</literal> supplied in the Amavis configuration file, <literal>6.31</literal> by default, it is unlikely spam will reach the cut-off point of actually being marked as spam solely on the basis of Bayes' probability score.
+		</para>
+		 <para>
+			It is therefor recommended to increase the score attached to messages with a 99% probability of being spam to at least <literal>6.308</literal>, if not simply <literal>6.31</literal>. Using <literal>6.308</literal>, you configure spam to be tagged not solely on the basis of Bayes' 99% probability score, but request that in addition the message is recognized to be in HTML (and HTML only), and perhaps uses a big font –or similar patterns with a very small <literal>0.01</literal> score.
+		</para>
+		 <para>
+			Some spam has been submitted through systems listed at <ulink url="http://dnswl.org" />, a collaborative false positive protection mechanism, a default score of 1 is substracted from the total score. If this spam reaches you, consider increasing the score on <literal>BAYES_99</literal> with another one point.
+		</para>
+		 <procedure id="proc-Administrator_Guide-Tweaking_Bayes_Scores-Adjusting_the_Score_for_BAYES_99">
+			<title>Adjusting the Score for <literal>BAYES_99</literal></title>
+			 <step>
+				<para>
+					Edit <filename>/etc/mail/spamassassin/local.cf</filename>, and make sure the following line is present:
+				</para>
+				 <para>
+					
 <screen>score BAYES_99 7.308</screen>
 
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Reload or restart the <literal>amavisd-new</literal> service:
-                </para>
-                <para>
+				</para>
 
+			</step>
+			 <step>
+				<para>
+					Reload or restart the <literal>amavisd-new</literal> service:
+				</para>
+				 <para>
+					
 <screen># service amavisd-new restart</screen>
 
-                </para>
-
-            </step>
-
-        </procedure>
-
-
-    </section>
-
-    <section id="sect-Administrator_Guide-Combating_Spam-Learning_about_Ham">
-        <title>Learning about Ham</title>
-        <para>
-            It is important to not just learn about spam, but learn about ham, legitimate email messages, as well. When not learning about ham, the anti-spam system will become heavily biased towards spam, and ultimately classify all email messages as such.
-        </para>
-        <para>
-            Learning about ham follows a slightly different doctrine then learning about spam. Most importantly, ham is not to be posted to a shared folder that everyone else can read the contents from. It is most commonly a "Not Junk" or "Ham" folder in one's personal namespace users are instructed to copy or move messages to, that have been classified as spam but are actually ham.
-        </para>
-        <para>
-            It is recommended users are both instructed to use ham folders, as well as create them by default —regardless whether they are called "Ham" or "Not Junk" or equivalent localized version of such.
-        </para>
-        <para>
-            Alternatively, you could learn about ham from people's INBOX folders.
-        </para>
-
-    </section>
-
-    <section id="sect-Administrator_Guide-Combating_Spam-Expiring_Messages_from_SpamHam_Shared_Folders">
-        <title>Expiring Messages from Spam/Ham (Shared) Folders</title>
-        <para>
-            When you share folders to which users can move or copy ham and/or spam messages, it is sensible to purge the contents of those folders regularly, or the folder size continues to increase indefinitely. Run the expiry after <command>sa-learn</command> has been run.
-        </para>
-        <note>
-            <para>
-                Running <command>ipurge</command> to purge mail folder messages occurs independent from setting <literal>expunge_mode</literal>, and independent from the <literal>expire</literal> annotation as well.
-            </para>
-            <para>
-                Using the <literal>expire</literal> annotation is sufficient to purge the contents of the folder, as, with or without the <literal>expunge_mode</literal> setting having been set to delayed, rather then immediate, the Bayes database will only be updated with messages Bayes has not learned about before.
-            </para>
-
-        </note>
-        <para>
-            To purge the contents of a mailfolder, run ipurge:
-        </para>
-        <para>
-
+				</para>
+
+			</step>
+
+		</procedure>
+		
+
+	</section>
+	
+	 <section id="sect-Administrator_Guide-Combating_Spam-Learning_about_Ham">
+		<title>Learning about Ham</title>
+		 <para>
+			It is important to not just learn about spam, but learn about ham, legitimate email messages, as well. When not learning about ham, the anti-spam system will become heavily biased towards spam, and ultimately classify all email messages as such.
+		</para>
+		 <para>
+			Learning about ham follows a slightly different doctrine then learning about spam. Most importantly, ham is not to be posted to a shared folder that everyone else can read the contents from. It is most commonly a "Not Junk" or "Ham" folder in one's personal namespace users are instructed to copy or move messages to, that have been classified as spam but are actually ham.
+		</para>
+		 <para>
+			It is recommended users are both instructed to use ham folders, as well as create them by default —regardless whether they are called "Ham" or "Not Junk" or equivalent localized version of such.
+		</para>
+		 <para>
+			Alternatively, you could learn about ham from people's INBOX folders.
+		</para>
+
+	</section>
+	
+	 <section id="sect-Administrator_Guide-Combating_Spam-Expiring_Messages_from_SpamHam_Shared_Folders">
+		<title>Expiring Messages from Spam/Ham (Shared) Folders</title>
+		 <para>
+			When you share folders to which users can move or copy ham and/or spam messages, it is sensible to purge the contents of those folders regularly, or the folder size continues to increase indefinitely. Run the expiry after <command>sa-learn</command> has been run.
+		</para>
+		 <note>
+			<para>
+				Running <command>ipurge</command> to purge mail folder messages occurs independent from setting <literal>expunge_mode</literal>, and independent from the <literal>expire</literal> annotation as well.
+			</para>
+			 <para>
+				Using the <literal>expire</literal> annotation is sufficient to purge the contents of the folder, as, with or without the <literal>expunge_mode</literal> setting having been set to delayed, rather then immediate, the Bayes database will only be updated with messages Bayes has not learned about before.
+			</para>
+
+		</note>
+		 <para>
+			To purge the contents of a mailfolder, run ipurge:
+		</para>
+		 <para>
+			
 <screen>$ <userinput>/usr/lib/cyrus-imapd/ipurge -d 1 user/folder/name at domain.tld</userinput>
 (...output abbreviated...)
 $ <userinput>/usr/lib/cyrus-imapd/ipurge -i -d 1 user/folder/name at domain.tld</userinput></screen>
 
-        </para>
-
-    </section>
-
-    <section id="sect-Administrator_Guide-Combating_Spam-Updating_the_Spam_Rules">
-        <title>Updating the Spam Rules</title>
-        <para>
-            As part of the <application>SpamAssasin</application> package, a utility is provided to update the rulesets from channels configured.
-        </para>
-        <para>
-            For systems on which either of the SpamAssassin daemon or Amavis daemon is running, the software packages automatically install a nightly cronjob to ensure the rules are updated frequently.
-        </para>
-        <para>
-            The spam rulesets are updated using the <command>sa-update</command> command, supplying one or more <literal>--channel</literal> options specifying the names of the ruleset channels to update, and (optionally) one or more <literal>--gpgkey</literal> options specifying the Pretty Good Privacy keys to allow signatures on the rulesets to have been signed with.
-        </para>
-        <para>
-            The cronjob that is installed by default, executes <command>sa-update</command> for all channels defined in <filename>/etc/mail/spamassassin/channels.d/</filename> with one file per channel.
-        </para>
-
-    </section>
-
-    <section id="sect-Administrator_Guide-Combating_Spam-Bayes_SQL_Database_for_Distributed_Systems">
-        <title>Bayes SQL Database for Distributed Systems</title>
-        <para>
-            If more then one system needs to make use of the Bayes database, consider using a network SQL Bayes database.
-        </para>
-        <procedure id="proc-Administrator_Guide-Bayes_SQL_Database_for_Distributed_Systems-Setting_Up_the_Bayes_Database">
-            <title>Setting Up the Bayes Database</title>
-            <step>
-                <para>
-                    Create the database:
-                </para>
-                <para>
-
+		</para>
+
+	</section>
+	
+	 <section id="sect-Administrator_Guide-Combating_Spam-Updating_the_Spam_Rules">
+		<title>Updating the Spam Rules</title>
+		 <para>
+			As part of the <application>SpamAssasin</application> package, a utility is provided to update the rulesets from channels configured.
+		</para>
+		 <para>
+			For systems on which either of the SpamAssassin daemon or Amavis daemon is running, the software packages automatically install a nightly cronjob to ensure the rules are updated frequently.
+		</para>
+		 <para>
+			The spam rulesets are updated using the <command>sa-update</command> command, supplying one or more <literal>--channel</literal> options specifying the names of the ruleset channels to update, and (optionally) one or more <literal>--gpgkey</literal> options specifying the Pretty Good Privacy keys to allow signatures on the rulesets to have been signed with.
+		</para>
+		 <para>
+			The cronjob that is installed by default, executes <command>sa-update</command> for all channels defined in <filename>/etc/mail/spamassassin/channels.d/</filename> with one file per channel.
+		</para>
+
+	</section>
+	
+	 <section id="sect-Administrator_Guide-Combating_Spam-Bayes_SQL_Database_for_Distributed_Systems">
+		<title>Bayes SQL Database for Distributed Systems</title>
+		 <para>
+			If more then one system needs to make use of the Bayes database, consider using a network SQL Bayes database.
+		</para>
+		 <procedure id="proc-Administrator_Guide-Bayes_SQL_Database_for_Distributed_Systems-Setting_Up_the_Bayes_Database">
+			<title>Setting Up the Bayes Database</title>
+			 <step>
+				<para>
+					Create the database:
+				</para>
+				 <para>
+					
 <screen># mysql -e 'create database <emphasis>kolab_bayes</emphasis><footnote> <para>
-                        Replace with desired database name
-                    </para>
-                    </footnote>;'</screen>
-
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Create a user and grant the appropriate privileges:
-                </para>
-                <para>
-
+						Replace with desired database name
+					</para>
+					 </footnote>;'</screen>
+
+				</para>
+
+			</step>
+			 <step>
+				<para>
+					Create a user and grant the appropriate privileges:
+				</para>
+				 <para>
+					
 <screen># mysql -e "CREATE USER '<emphasis>kolab_bayes</emphasis><footnote> <para>
-                        Replace with desired username
-                    </para>
-                    </footnote>'@'%' IDENTIFIED BY PASSWORD '<emphasis>Welcome2KolabSystems</emphasis><footnote> <para>
-                        Replace with desired password
-                    </para>
-                    </footnote>';"</screen>
-
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Grant the appropriate privileges:
-                </para>
-                <para>
-
+						Replace with desired username
+					</para>
+					 </footnote>'@'%' IDENTIFIED BY PASSWORD '<emphasis>Welcome2KolabSystems</emphasis><footnote> <para>
+						Replace with desired password
+					</para>
+					 </footnote>';"</screen>
+
+				</para>
+
+			</step>
+			 <step>
+				<para>
+					Grant the appropriate privileges:
+				</para>
+				 <para>
+					
 <screen># mysql -e "GRANT USAGE ON * . * TO '<emphasis>kolab_bayes</emphasis><footnote> <para>
-                        Replace with desired username
-                    </para>
-                    </footnote>'@'%' IDENTIFIED BY PASSWORD '<emphasis>Welcome2KolabSystems</emphasis><footnote> <para>
-                        Replace with desired password
-                    </para>
-                    </footnote>' WITH MAX_QUERIES_PER_HOUR 0 MAX_CONNECTIONS_PER_HOUR 0 MAX_UPDATES_PER_HOUR 0 MAX_USER_CONNECTIONS 0;"
+						Replace with desired username
+					</para>
+					 </footnote>'@'%' IDENTIFIED BY PASSWORD '<emphasis>Welcome2KolabSystems</emphasis><footnote> <para>
+						Replace with desired password
+					</para>
+					 </footnote>' WITH MAX_QUERIES_PER_HOUR 0 MAX_CONNECTIONS_PER_HOUR 0 MAX_UPDATES_PER_HOUR 0 MAX_USER_CONNECTIONS 0;"
 # mysql -e "GRANT ALL PRIVILEGES on `<emphasis>kolab_bayes</emphasis><footnote> <para>
-                        Replace with desired database name
-                    </para>
-                    </footnote>` . * TO '<emphasis>kolab_bayes</emphasis><footnote> <para>
-                        Replace with desired username
-                    </para>
-                    </footnote>'@'%';"</screen>
-
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Reload the privileges:
-                </para>
-                <para>
-
+						Replace with desired database name
+					</para>
+					 </footnote>` . * TO '<emphasis>kolab_bayes</emphasis><footnote> <para>
+						Replace with desired username
+					</para>
+					 </footnote>'@'%';"</screen>
+
+				</para>
+
+			</step>
+			 <step>
+				<para>
+					Reload the privileges:
+				</para>
+				 <para>
+					
 <screen># mysql -e 'FLUSH PRIVILEGES;'</screen>
 
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Download the latest Bayes Database SQL schema file from <ulink url="http://svn.apache.org/repos/asf/spamassassin/trunk/sql/bayes_mysql.sql">bayes_mysql.sql</ulink> (when using MySQL):
-                </para>
-                <para>
+				</para>
 
+			</step>
+			 <step>
+				<para>
+					Download the latest Bayes Database SQL schema file from <ulink url="http://svn.apache.org/repos/asf/spamassassin/trunk/sql/bayes_mysql.sql">bayes_mysql.sql</ulink> (when using MySQL):
+				</para>
+				 <para>
+					
 <screen># wget <ulink url="http://svn.apache.org/repos/asf/spamassassin/trunk/sql/bayes_mysql.sql" /></screen>
 
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Insert this schema into the database:
-                </para>
-                <para>
+				</para>
 
+			</step>
+			 <step>
+				<para>
+					Insert this schema into the database:
+				</para>
+				 <para>
+					
 <screen># mysql <emphasis>kolab_bayes</emphasis><footnote> <para>
-                        Replace with database name used.
-                    </para>
-                    </footnote> < bayes_mysql.sql</screen>
-
-                </para>
-
-            </step>
-
-        </procedure>
-
-        <procedure id="proc-Administrator_Guide-Bayes_SQL_Database_for_Distributed_Systems-Migrating_Existing_Bayes_Databases">
-            <title>Migrating Existing Bayes Database(s)</title>
-            <step>
-                <para>
-                    First, export any existing Bayes databases, run the following command (on each server with a Bayes database):
-                </para>
-                <para>
-
+						Replace with database name used.
+					</para>
+					 </footnote> < bayes_mysql.sql</screen>
+
+				</para>
+
+			</step>
+
+		</procedure>
+		
+		 <procedure id="proc-Administrator_Guide-Bayes_SQL_Database_for_Distributed_Systems-Migrating_Existing_Bayes_Databases">
+			<title>Migrating Existing Bayes Database(s)</title>
+			 <step>
+				<para>
+					First, export any existing Bayes databases, run the following command (on each server with a Bayes database):
+				</para>
+				 <para>
+					
 <screen># sa-learn --backup > <filename>/path/to/sa_backup.txt</filename></screen>
 
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    A recommended step, but completely optional, is to expire the current copy of the database:
-                </para>
-                <para>
+				</para>
 
+			</step>
+			 <step>
+				<para>
+					A recommended step, but completely optional, is to expire the current copy of the database:
+				</para>
+				 <para>
+					
 <screen># sa-learn --clear</screen>
 
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Modify <filename>/etc/mail/spamassassin/local.cf</filename> to contain the following settings:
-                </para>
-                <para>
+				</para>
 
+			</step>
+			 <step>
+				<para>
+					Modify <filename>/etc/mail/spamassassin/local.cf</filename> to contain the following settings:
+				</para>
+				 <para>
+					
 <screen>bayes_store_module        Mail::SpamAssassin::BayesStore::SQL
 bayes_sql_dsn            DBI:mysql:<emphasis>kolab_bayes</emphasis><footnote> <para>
-                        Replace with database name
-                    </para>
-                    </footnote>:<emphasis>mysql.domain.tld</emphasis><footnote> <para>
-                        Replace with MySQL server host address
-                    </para>
-                    </footnote>
+						Replace with database name
+					</para>
+					 </footnote>:<emphasis>mysql.domain.tld</emphasis><footnote> <para>
+						Replace with MySQL server host address
+					</para>
+					 </footnote>
 bayes_sql_username        <emphasis>kolab_bayes</emphasis><footnote> <para>
-                        Replace with the username for database access
-                    </para>
-                    </footnote>
+						Replace with the username for database access
+					</para>
+					 </footnote>
 bayes_sql_password        <emphasis>Welcome2KolabSystems</emphasis><footnote> <para>
-                        Replace with the user password
-                    </para>
-                    </footnote>
+						Replace with the user password
+					</para>
+					 </footnote>
 bayes_sql_override_username  root</screen>
 
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Import the exported Bayes database(s):
-                </para>
-                <para>
+				</para>
 
+			</step>
+			 <step>
+				<para>
+					Import the exported Bayes database(s):
+				</para>
+				 <para>
+					
 <screen># sa-learn --restore <filename>/path/to/sa_backup.txt</filename></screen>
 
-                </para>
-
-            </step>
-
-        </procedure>
-
-
-    </section>
-
-    <section id="sect-Administrator_Guide-Combating_Spam-Ensuring_Availability_of_Messages_Spam_Score">
-        <title>Ensuring Availability of Messages' Spam Score</title>
-        <para>
-            For the purpose of troubleshooting, or in deployments with clients that have spam filtering capabilities, it is sensible to always insert the spam headers into email messages, both to avoid clients scanning the message again, as well as troubleshooting why mail may or may not have been filtered.
-        </para>
-        <para>
-            To always insert the spam score into the message headers, find the line in <filename>/etc/amavisd/amavisd.conf</filename> that starts with <literal>$sa_tag_level_deflt</literal> and replace it with:
-        </para>
-        <para>
-
+				</para>
+
+			</step>
+
+		</procedure>
+		
+
+	</section>
+	
+	 <section id="sect-Administrator_Guide-Combating_Spam-Ensuring_Availability_of_Messages_Spam_Score">
+		<title>Ensuring Availability of Messages' Spam Score</title>
+		 <para>
+			For the purpose of troubleshooting, or in deployments with clients that have spam filtering capabilities, it is sensible to always insert the spam headers into email messages, both to avoid clients scanning the message again, as well as troubleshooting why mail may or may not have been filtered.
+		</para>
+		 <para>
+			To always insert the spam score into the message headers, find the line in <filename>/etc/amavisd/amavisd.conf</filename> that starts with <literal>$sa_tag_level_deflt</literal> and replace it with:
+		</para>
+		 <para>
+			
 <screen>$sa_tag_level_deflt  = -10;</screen>
 
-        </para>
-        <para>
-            While the score is available from the log files should the level of logging verbosity have been increased, in some scenarios it is necessary to include the spam score regardless of the traffic being inbound or outbound. An example is a mail gateway for an unknown number of, or regularly changing, or dynamic, or large list of domain name spaces with both inbound and outbound traffic, which needs to be protected senders as well as receivers from spam.
-        </para>
-        <para>
-            Normally only inbound traffic is tagged –if at all–, by recognizing the recipient domain name space as local. The setting <literal>@local_domains</literal> or, in later versions of Amavis, <literal>@local_domains_acl</literal> is used.
-        </para>
-        <para>
-            In a default Kolab Groupware installation, the recipients are looked up in LDAP, and if an entry is found, Amavisd will also classify the domain as local – regardless of any <literal>@local_domains</literal> and/or <literal>@local_domains_acl</literal> setting.
-        </para>
-        <section id="sect-Administrator_Guide-Ensuring_Availability_of_Messages_Spam_Score-Adding_Spam_Headers_to_All_Messages">
-            <title>Adding Spam Headers to All Messages</title>
-            <para>
-                To recognize all domain name spaces as local, edit <filename>/etc/amavisd/amavisd.conf</filename> and make sure the following settings are not configured:
-            </para>
-            <para>
-                <itemizedlist>
-                    <listitem>
-                        <para>
-                            <literal>@local_domains</literal>,
-                        </para>
-
-                    </listitem>
-                    <listitem>
-                        <para>
-                            <literal>@local_domains_acl</literal>, and
-                        </para>
-
-                    </listitem>
-                    <listitem>
-                        <para>
-                            any <literal>read_hash(\%local_domains)</literal> setting.
-                        </para>
-
-                    </listitem>
-
-                </itemizedlist>
-
-            </para>
-            <para>
-                Ensure that the following setting is configured like so:
-            </para>
-            <para>
-
+		</para>
+		 <para>
+			While the score is available from the log files should the level of logging verbosity have been increased, in some scenarios it is necessary to include the spam score regardless of the traffic being inbound or outbound. An example is a mail gateway for an unknown number of, or regularly changing, or dynamic, or large list of domain name spaces with both inbound and outbound traffic, which needs to be protected senders as well as receivers from spam.
+		</para>
+		 <para>
+			Normally only inbound traffic is tagged –if at all–, by recognizing the recipient domain name space as local. The setting <literal>@local_domains</literal> or, in later versions of Amavis, <literal>@local_domains_acl</literal> is used.
+		</para>
+		 <para>
+			In a default Kolab Groupware installation, the recipients are looked up in LDAP, and if an entry is found, Amavisd will also classify the domain as local – regardless of any <literal>@local_domains</literal> and/or <literal>@local_domains_acl</literal> setting.
+		</para>
+		 <section id="sect-Administrator_Guide-Ensuring_Availability_of_Messages_Spam_Score-Adding_Spam_Headers_to_All_Messages">
+			<title>Adding Spam Headers to All Messages</title>
+			 <para>
+				To recognize all domain name spaces as local, edit <filename>/etc/amavisd/amavisd.conf</filename> and make sure the following settings are not configured:
+			</para>
+			 <para>
+				<itemizedlist>
+					<listitem>
+						<para>
+							<literal>@local_domains</literal>,
+						</para>
+
+					</listitem>
+					 <listitem>
+						<para>
+							<literal>@local_domains_acl</literal>, and
+						</para>
+
+					</listitem>
+					 <listitem>
+						<para>
+							any <literal>read_hash(\%local_domains)</literal> setting.
+						</para>
+
+					</listitem>
+
+				</itemizedlist>
+
+			</para>
+			 <para>
+				Ensure that the following setting is configured like so:
+			</para>
+			 <para>
+				
 <screen language="Perl">$local_domains_re = new_RE( qr'.*' );</screen>
 
-            </para>
-            <para>
-                Also disable the LDAP lookups, by removing the following settings:
-            </para>
-            <para>
-                <itemizedlist>
-                    <listitem>
-                        <para>
-                            <literal>$enable_ldap</literal>
-                        </para>
-
-                    </listitem>
-                    <listitem>
-                        <para>
-                            <literal>$default_ldap</literal>
-                        </para>
-
-                    </listitem>
-
-                </itemizedlist>
-
-            </para>
-
-        </section>
-
-
-    </section>
-
-    <section id="sect-Administrator_Guide-Combating_Spam-Default_Amavisd_Behaviour">
-        <title>Default Amavisd Behaviour</title>
-        <para>
-            The default behaviour shown in a Kolab Groupware deployment depends on the default settings that come with the packages delivered mostly through native, distribution-specific software repositories. This chapter documents various aspects of the behaviour Kolab Groupware will show referring to the appropriate settings that will allow a system administrator to modify the behaviour.
-        </para>
-        <formalpara id="form-Administrator_Guide-Default_Amavisd_Behaviour-Adding_Spam_Information_Headers">
-            <title>Adding Spam Information Headers</title>
-            <para>
-                Amavisd, by default, adds spam information headers only to messages that;
-            </para>
-
-        </formalpara>
-        <para>
-            <orderedlist>
-                <listitem>
-                    <para>
-                        Are intended for delivery to local recipients,
-                    </para>
-
-                </listitem>
-                <listitem>
-                    <para>
-                        Get a spam score over <literal>2.0</literal> from <application>SpamAssassin</application>.
-                    </para>
-                    <para>
-                        The related setting is <literal>$sa_tag_level_deflt</literal> in <filename>/etc/amavisd/amavisd.conf</filename>.
-                    </para>
-
-                </listitem>
-
-            </orderedlist>
-
-        </para>
-        <formalpara id="form-Administrator_Guide-Default_Amavisd_Behaviour-Spam_Kill_Level">
-            <title>Spam Kill Level</title>
-            <para>
-                The spam kill level controls which score spam must have been marked with before Amavisd considers the message to not be delivered to the intended recipient(s).
-            </para>
-
-        </formalpara>
-        <para>
-            Depending on your platform, the default for this score is <literal>6.31</literal> or <literal>6.9</literal>. When a message is marked with a spam score higher than or equal to this level, Amavisd will take "evasive action". See <xref linkend="sect-Administrator_Guide-Combating_Spam-Configuring_Amavis_Evasive_Action" /> for more information on configuring evasive actions.
-        </para>
-
-    </section>
-
-    <section id="sect-Administrator_Guide-Combating_Spam-Configuring_Amavis_Evasive_Action">
-        <title>Configuring Amavis Evasive Action</title>
-        <para>
-            You can control what "evasive action" Amavisd takes using the <literal>$final_spam_destiny</literal> and <literal>$final_virus_destiny</literal> settings in <filename>/etc/amavisd/amavisd.conf</filename>. The default is usually to discard the message, but the following options are available:
-        </para>
-        <para>
-            <itemizedlist>
-                <listitem>
-                    <formalpara id="form-Administrator_Guide-Configuring_Amavis_Evasive_Action-D_PASS">
-                        <title>D_PASS</title>
-                        <para>
-                            The message is accepted for delivery to the intended recipient(s), despite having been scored passed the kill or cutoff level, and regardless of bad content.
-                        </para>
-
-                    </formalpara>
-                    <para>
-                        If a quarantine address has been configured, the quarantine address will receive a copy of the email. See <xref linkend="form-Administrator_Guide-Configuring_Amavis_Evasive_Action-Configuring_Quarantine" /> to learn how to configure the quarantine address.
-                    </para>
-
-                </listitem>
-                <listitem>
-                    <formalpara id="form-Administrator_Guide-Configuring_Amavis_Evasive_Action-D_BOUNCE">
-                        <title>D_BOUNCE</title>
-                        <para>
-                            The message is not accepted for delivery to the intended recipient(s). A Delivery Status Notification stating delivery failure is sent out to the sender.
-                        </para>
-
-                    </formalpara>
-                    <para>
-                        If a quarantine address has been configured, the quarantine address will receive a copy of the email. See <xref linkend="form-Administrator_Guide-Configuring_Amavis_Evasive_Action-Configuring_Quarantine" /> to learn how to configure the quarantine address.
-                    </para>
-
-                </listitem>
-                <listitem>
-                    <formalpara id="form-Administrator_Guide-Configuring_Amavis_Evasive_Action-D_REJECT">
-                        <title>D_REJECT</title>
-                        <para>
-                            The message is rejected by Amavisd, and while Amavisd sends out a 550 SMTP response to the Mail Transfer Agent, said Mail Transfer Agent is responsible for sending out the Delivery Status Notification, if any.
-                        </para>
-
-                    </formalpara>
-                    <para>
-                        If a quarantine address has been configured, the quarantine address will receive a copy of the email. See <xref linkend="form-Administrator_Guide-Configuring_Amavis_Evasive_Action-Configuring_Quarantine" /> to learn how to configure the quarantine address.
-                    </para>
-
-                </listitem>
-                <listitem>
-                    <formalpara id="form-Administrator_Guide-Configuring_Amavis_Evasive_Action-D_DISCARD">
-                        <title>D_DISCARD</title>
-                        <para>
-                            The message is simply discarded by Amavisd. The sending Mail Transfer Agent will receive a positive SMTP delivery response, and Amavisd sends out no Delivery Status Notification, nor does it forward the message for delivery to the intended recipients.
-                        </para>
-
-                    </formalpara>
-                    <para>
-                        If a quarantine address has been configured, the quarantine address will receive a copy of the email. See <xref linkend="form-Administrator_Guide-Configuring_Amavis_Evasive_Action-Configuring_Quarantine" /> to learn how to configure the quarantine address.
-                    </para>
-
-                </listitem>
-
-            </itemizedlist>
-
-        </para>
-        <formalpara id="form-Administrator_Guide-Configuring_Amavis_Evasive_Action-Configuring_Quarantine">
-            <title>Configuring Quarantine</title>
-            <para>
-                Two separate quarantine forwarding addresses can be configured. One is for messages labeled as spam, another for messages suspected to contain a virus.
-            </para>
-
-        </formalpara>
-        <para>
-            A catchall address for spam can be configured by setting the <literal>$spam_quarantine_to</literal> setting to a valid recipient address in <filename>/etc/amavisd/amavisd.conf</filename>
-        </para>
-        <para>
-            A catchall address for messages suspected of containing a virus can be configured by setting the <literal>$virus_quarantine_to</literal> setting to a valid recipient address in <filename>/etc/amavisd/amavisd.conf</filename>.
-        </para>
-
-    </section>
-
+			</para>
+			 <para>
+				Also disable the LDAP lookups, by removing the following settings:
+			</para>
+			 <para>
+				<itemizedlist>
+					<listitem>
+						<para>
+							<literal>$enable_ldap</literal>
+						</para>
+
+					</listitem>
+					 <listitem>
+						<para>
+							<literal>$default_ldap</literal>
+						</para>
+
+					</listitem>
+
+				</itemizedlist>
+
+			</para>
+
+		</section>
+		
+
+	</section>
+	
+	 <section id="sect-Administrator_Guide-Combating_Spam-Default_Amavisd_Behaviour">
+		<title>Default Amavisd Behaviour</title>
+		 <para>
+			The default behaviour shown in a Kolab Groupware deployment depends on the default settings that come with the packages delivered mostly through native, distribution-specific software repositories. This chapter documents various aspects of the behaviour Kolab Groupware will show referring to the appropriate settings that will allow a system administrator to modify the behaviour.
+		</para>
+		 <formalpara id="form-Administrator_Guide-Default_Amavisd_Behaviour-Adding_Spam_Information_Headers">
+			<title>Adding Spam Information Headers</title>
+			 <para>
+				Amavisd, by default, adds spam information headers only to messages that;
+			</para>
+
+		</formalpara>
+		 <para>
+			<orderedlist>
+				<listitem>
+					<para>
+						Are intended for delivery to local recipients,
+					</para>
+
+				</listitem>
+				 <listitem>
+					<para>
+						Get a spam score over <literal>2.0</literal> from <application>SpamAssassin</application>.
+					</para>
+					 <para>
+						The related setting is <literal>$sa_tag_level_deflt</literal> in <filename>/etc/amavisd/amavisd.conf</filename>.
+					</para>
+
+				</listitem>
+
+			</orderedlist>
+
+		</para>
+		 <formalpara id="form-Administrator_Guide-Default_Amavisd_Behaviour-Spam_Kill_Level">
+			<title>Spam Kill Level</title>
+			 <para>
+				The spam kill level controls which score spam must have been marked with before Amavisd considers the message to not be delivered to the intended recipient(s).
+			</para>
+
+		</formalpara>
+		 <para>
+			Depending on your platform, the default for this score is <literal>6.31</literal> or <literal>6.9</literal>. When a message is marked with a spam score higher than or equal to this level, Amavisd will take "evasive action". See <xref linkend="sect-Administrator_Guide-Combating_Spam-Configuring_Amavis_Evasive_Action" /> for more information on configuring evasive actions.
+		</para>
+
+	</section>
+	
+	 <section id="sect-Administrator_Guide-Combating_Spam-Configuring_Amavis_Evasive_Action">
+		<title>Configuring Amavis Evasive Action</title>
+		 <para>
+			You can control what "evasive action" Amavisd takes using the <literal>$final_spam_destiny</literal> and <literal>$final_virus_destiny</literal> settings in <filename>/etc/amavisd/amavisd.conf</filename>. The default is usually to discard the message, but the following options are available:
+		</para>
+		 <para>
+			<itemizedlist>
+				<listitem>
+					<formalpara id="form-Administrator_Guide-Configuring_Amavis_Evasive_Action-D_PASS">
+						<title>D_PASS</title>
+						 <para>
+							The message is accepted for delivery to the intended recipient(s), despite having been scored passed the kill or cutoff level, and regardless of bad content.
+						</para>
+
+					</formalpara>
+					 <para>
+						If a quarantine address has been configured, the quarantine address will receive a copy of the email. See <xref linkend="form-Administrator_Guide-Configuring_Amavis_Evasive_Action-Configuring_Quarantine" /> to learn how to configure the quarantine address.
+					</para>
+
+				</listitem>
+				 <listitem>
+					<formalpara id="form-Administrator_Guide-Configuring_Amavis_Evasive_Action-D_BOUNCE">
+						<title>D_BOUNCE</title>
+						 <para>
+							The message is not accepted for delivery to the intended recipient(s). A Delivery Status Notification stating delivery failure is sent out to the sender.
+						</para>
+
+					</formalpara>
+					 <para>
+						If a quarantine address has been configured, the quarantine address will receive a copy of the email. See <xref linkend="form-Administrator_Guide-Configuring_Amavis_Evasive_Action-Configuring_Quarantine" /> to learn how to configure the quarantine address.
+					</para>
+
+				</listitem>
+				 <listitem>
+					<formalpara id="form-Administrator_Guide-Configuring_Amavis_Evasive_Action-D_REJECT">
+						<title>D_REJECT</title>
+						 <para>
+							The message is rejected by Amavisd, and while Amavisd sends out a 550 SMTP response to the Mail Transfer Agent, said Mail Transfer Agent is responsible for sending out the Delivery Status Notification, if any.
+						</para>
+
+					</formalpara>
+					 <para>
+						If a quarantine address has been configured, the quarantine address will receive a copy of the email. See <xref linkend="form-Administrator_Guide-Configuring_Amavis_Evasive_Action-Configuring_Quarantine" /> to learn how to configure the quarantine address.
+					</para>
+
+				</listitem>
+				 <listitem>
+					<formalpara id="form-Administrator_Guide-Configuring_Amavis_Evasive_Action-D_DISCARD">
+						<title>D_DISCARD</title>
+						 <para>
+							The message is simply discarded by Amavisd. The sending Mail Transfer Agent will receive a positive SMTP delivery response, and Amavisd sends out no Delivery Status Notification, nor does it forward the message for delivery to the intended recipients.
+						</para>
+
+					</formalpara>
+					 <para>
+						If a quarantine address has been configured, the quarantine address will receive a copy of the email. See <xref linkend="form-Administrator_Guide-Configuring_Amavis_Evasive_Action-Configuring_Quarantine" /> to learn how to configure the quarantine address.
+					</para>
+
+				</listitem>
+
+			</itemizedlist>
+
+		</para>
+		 <formalpara id="form-Administrator_Guide-Configuring_Amavis_Evasive_Action-Configuring_Quarantine">
+			<title>Configuring Quarantine</title>
+			 <para>
+				Two separate quarantine forwarding addresses can be configured. One is for messages labeled as spam, another for messages suspected to contain a virus.
+			</para>
+
+		</formalpara>
+		 <para>
+			A catchall address for spam can be configured by setting the <literal>$spam_quarantine_to</literal> setting to a valid recipient address in <filename>/etc/amavisd/amavisd.conf</filename>
+		</para>
+		 <para>
+			A catchall address for messages suspected of containing a virus can be configured by setting the <literal>$virus_quarantine_to</literal> setting to a valid recipient address in <filename>/etc/amavisd/amavisd.conf</filename>.
+		</para>
+
+	</section>
+	
 
 </chapter>
 
diff --git a/Administrator_Guide/en-US/Configuring_the_Kolab_Server.xml b/Administrator_Guide/en-US/Configuring_the_Kolab_Server.xml
index ceee91b..96d86d6 100644
--- a/Administrator_Guide/en-US/Configuring_the_Kolab_Server.xml
+++ b/Administrator_Guide/en-US/Configuring_the_Kolab_Server.xml
@@ -4,104 +4,105 @@
 %BOOK_ENTITIES;
 ]>
 <chapter id="chap-Administrator_Guide-Configuring_the_Kolab_Server">
-    <title>Configuring the Kolab Server</title>
-    <para>
-        para
-    </para>
-    <section id="sect-Administrator_Guide-Configuring_the_Kolab_Server-Optimizing_the_Web_Server">
-        <title>Optimizing the Web Server</title>
-        <section id="sect-Administrator_Guide-Optimizing_the_Web_Server-Accelerating_PHP_with_APC">
-            <title>Accelerating PHP with APC</title>
-            <para>
-                Web server performance is greatly improved by caching the interpreted bytecode for the PHP applications using the Alternative PHP Cache (APC) extension from PECL. With APC enabled, PHP source code is compiled only once (per retention interval), and subsequent inclusions for or execution of said PHP source code is obtained directly from cache.
-            </para>
-            <para>
-                To enable APC, install the <application>php-pecl-apc</application> package:
-            </para>
-            <para>
-
+	<title>Configuring the Kolab Server</title>
+	 <para>
+		This chapter outlines some of the most common Kolab Groupware configuration topics found in real life.
+	</para>
+	 <xi:include href="sect-Kolab_Recipient_Policy_and_Web_Administration_Panel.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <section id="sect-Administrator_Guide-Configuring_the_Kolab_Server-Optimizing_the_Web_Server">
+		<title>Optimizing the Web Server</title>
+		 <section id="sect-Administrator_Guide-Optimizing_the_Web_Server-Accelerating_PHP_with_APC">
+			<title>Accelerating PHP with APC</title>
+			 <para>
+				Web server performance is greatly improved by caching the interpreted bytecode for the PHP applications using the Alternative PHP Cache (APC) extension from PECL. With APC enabled, PHP source code is compiled only once (per retention interval), and subsequent inclusions for or execution of said PHP source code is obtained directly from cache.
+			</para>
+			 <para>
+				To enable APC, install the <application>php-pecl-apc</application> package:
+			</para>
+			 <para>
+				
 <screen># <userinput>yum -y install php-pecl-apc</userinput></screen>
 
-            </para>
-            <para>
-                Then, edit <filename>/etc/php.d/apc.ini</filename> and set or consider setting any of the following options;
-            </para>
-            <para>
-                <itemizedlist>
-                    <listitem>
-                        <formalpara id="form-Administrator_Guide-Accelerating_PHP_with_APC-apc.enabled1">
-                            <title><literal>apc.enabled=1</literal></title>
-                            <para>
-                                Enable APC (1), or disable APC (0)
-                            </para>
-
-                        </formalpara>
-
-                    </listitem>
-                    <listitem>
-                        <formalpara id="form-Administrator_Guide-Accelerating_PHP_with_APC-apc.stat0">
-                            <title><literal>apc.stat=0</literal></title>
-                            <para>
-                                Issue a <literal>stat()</literal> call to see if the file with PHP source code has changed since the last binary compilation. Disabling the <literal>stat()</literal> call is recommended for production environments, as calling <literal>stat()</literal> includes a write call to update the file's last access time (atime). Note that the update write call for the last access time can be prevented by mounting the relevant filesystem with the <literal>noatime</literal> option.
-                            </para>
-
-                        </formalpara>
-                        <note>
-                            <title>Changes to PHP Source Code Files with APC <literal>stat()</literal> Disabled</title>
-                            <para>
-                                Note that when APC is configured to not issue a <literal>stat()</literal> call to see if a PHP source code file is changed, changes to PHP source code files will only be included in subsequent execution after the APC cache has been cleared. The APC cache is cleared upon web server service reload, restart or using the PHP call <literal>apc_clear_cache()</literal>.
-                            </para>
-
-                        </note>
-
-                    </listitem>
-                    <listitem>
-                        <formalpara id="form-Administrator_Guide-Accelerating_PHP_with_APC-apc.stat_ctime1">
-                            <title><literal>apc.stat_ctime=1</literal></title>
-                            <para>
-                                When issuing a <literal>stat()</literal> call to see if the file with PHP source code has changed, use the file's change time attribute as opposed to the default, the file's modification time attribute.
-                            </para>
-
-                        </formalpara>
-
-                    </listitem>
-                    <listitem>
-                        <formalpara id="form-Administrator_Guide-Accelerating_PHP_with_APC-apc.include_once_override0">
-                            <title><literal>apc.include_once_override=0</literal></title>
-                            <para>
-                                While overriding the expensive system calls issued during an <literal>include_once()</literal> or <literal>require_once()</literal> call be the PHP source code, this option MUST NOT be enabled. See <ulink url="https://bugzilla.kolabsys.com/show_bug.cgi?id=113" /> for more information.
-                            </para>
-
-                        </formalpara>
-
-                    </listitem>
-
-                </itemizedlist>
-
-            </para>
-
-        </section>
-
-
-    </section>
-
-    <section id="sect-Administrator_Guide-Configuring_the_Kolab_Server-Using_the_Kolab_Perl_Libraries_on_a_non_Kolab_System">
-        <title>Using the Kolab Perl Libraries on a non-Kolab System</title>
-        <para>
-            When using the <application>perl-Kolab</application> libraries on a system that is not a Kolab server itself, please be aware the perl-Kolab libraries expect and/or require certain settings to be available that are not really relevant for normal operations. This section explains which settings are expected and/or required, how to configure them and what the implications are.
-        </para>
-        <para>
-            An example use-case scenario –to install and use the Kolab perl libraries on a system that is not a Kolab server– is, where user provisioning scripts are executed outside of Kolab, and require interfacing with Kolab's IMAP server components to manage user or shared mailboxes.
-        </para>
-        <formalpara id="form-Administrator_Guide-Using_the_Kolab_Perl_Libraries_on_a_non_Kolab_System-Recommended_Settings">
-            <title>Recommended Settings</title>
-            <para>
-                The following is a snippet of the configuration file <filename>/etc/kolab/kolab.conf</filename> that prevents perl errors from being printed to <code>stderr</code>;
-            </para>
-
-        </formalpara>
-        <para>
-
+			</para>
+			 <para>
+				Then, edit <filename>/etc/php.d/apc.ini</filename> and set or consider setting any of the following options;
+			</para>
+			 <para>
+				<itemizedlist>
+					<listitem>
+						<formalpara id="form-Administrator_Guide-Accelerating_PHP_with_APC-apc.enabled1">
+							<title><literal>apc.enabled=1</literal></title>
+							 <para>
+								Enable APC (1), or disable APC (0)
+							</para>
+
+						</formalpara>
+
+					</listitem>
+					 <listitem>
+						<formalpara id="form-Administrator_Guide-Accelerating_PHP_with_APC-apc.stat0">
+							<title><literal>apc.stat=0</literal></title>
+							 <para>
+								Issue a <literal>stat()</literal> call to see if the file with PHP source code has changed since the last binary compilation. Disabling the <literal>stat()</literal> call is recommended for production environments, as calling <literal>stat()</literal> includes a write call to update the file's last access time (atime). Note that the update write call for the last access time can be prevented by mounting the relevant filesystem with the <literal>noatime</literal> option.
+							</para>
+
+						</formalpara>
+						 <note>
+							<title>Changes to PHP Source Code Files with APC <literal>stat()</literal> Disabled</title>
+							 <para>
+								Note that when APC is configured to not issue a <literal>stat()</literal> call to see if a PHP source code file is changed, changes to PHP source code files will only be included in subsequent execution after the APC cache has been cleared. The APC cache is cleared upon web server service reload, restart or using the PHP call <literal>apc_clear_cache()</literal>.
+							</para>
+
+						</note>
+
+					</listitem>
+					 <listitem>
+						<formalpara id="form-Administrator_Guide-Accelerating_PHP_with_APC-apc.stat_ctime1">
+							<title><literal>apc.stat_ctime=1</literal></title>
+							 <para>
+								When issuing a <literal>stat()</literal> call to see if the file with PHP source code has changed, use the file's change time attribute as opposed to the default, the file's modification time attribute.
+							</para>
+
+						</formalpara>
+
+					</listitem>
+					 <listitem>
+						<formalpara id="form-Administrator_Guide-Accelerating_PHP_with_APC-apc.include_once_override0">
+							<title><literal>apc.include_once_override=0</literal></title>
+							 <para>
+								While overriding the expensive system calls issued during an <literal>include_once()</literal> or <literal>require_once()</literal> call be the PHP source code, this option MUST NOT be enabled. See <ulink url="https://bugzilla.kolabsys.com/show_bug.cgi?id=113" /> for more information.
+							</para>
+
+						</formalpara>
+
+					</listitem>
+
+				</itemizedlist>
+
+			</para>
+
+		</section>
+		
+
+	</section>
+	
+	 <section id="sect-Administrator_Guide-Configuring_the_Kolab_Server-Using_the_Kolab_Perl_Libraries_on_a_non_Kolab_System">
+		<title>Using the Kolab Perl Libraries on a non-Kolab System</title>
+		 <para>
+			When using the <application>perl-Kolab</application> libraries on a system that is not a Kolab server itself, please be aware the perl-Kolab libraries expect and/or require certain settings to be available that are not really relevant for normal operations. This section explains which settings are expected and/or required, how to configure them and what the implications are.
+		</para>
+		 <para>
+			An example use-case scenario –to install and use the Kolab perl libraries on a system that is not a Kolab server– is, where user provisioning scripts are executed outside of Kolab, and require interfacing with Kolab's IMAP server components to manage user or shared mailboxes.
+		</para>
+		 <formalpara id="form-Administrator_Guide-Using_the_Kolab_Perl_Libraries_on_a_non_Kolab_System-Recommended_Settings">
+			<title>Recommended Settings</title>
+			 <para>
+				The following is a snippet of the configuration file <filename>/etc/kolab/kolab.conf</filename> that prevents perl errors from being printed to <code>stderr</code>;
+			</para>
+
+		</formalpara>
+		 <para>
+			
 <screen>kolab_usr: kolab
 kolab_musr: kolab
 kolab_rusr: kolab
@@ -109,42 +110,42 @@ kolab_grp: kolab
 kolab_mgrp: kolab
 kolab_rgrp: kolab</screen>
 
-        </para>
-        <para>
-            In a traditional Kolab deployment, these settings are used with the configuration management utilities. On a server that is not a Kolab server, naturally the configuration management does not apply. However, the Kolab perl libraries still require these settings to be available for errors to be suppressed.
-        </para>
-        <para>
-            Please see <ulink url="https://bugzilla.kolabsys.com/show_bug.cgi?id=114" /> for more information.
-        </para>
-        <formalpara id="form-Administrator_Guide-Using_the_Kolab_Perl_Libraries_on_a_non_Kolab_System-Required_Settings">
-            <title>Required Settings</title>
-            <para>
-                The following are settings required;
-            </para>
-
-        </formalpara>
-        <para>
-            <itemizedlist>
-                <listitem>
-                    <formalpara id="form-Administrator_Guide-Using_the_Kolab_Perl_Libraries_on_a_non_Kolab_System-connect_addr">
-                        <title><literal>connect_addr</literal></title>
-                        <para>
-                            The connection address for the Kolab perl libraries. Currently this is being used for IMAP connections.
-                        </para>
-
-                    </formalpara>
-                    <para>
-                        See <ulink url="https://bugzilla.kolabsys.com/show_bug.cgi?id=112">Bugzilla #112: <emphasis>Use of connect_addr, local_addr, bind_addr and bind_any</emphasis></ulink> and <ulink url="https://bugzilla.kolabsys.com/show_bug.cgi?id=115">Bugzilla #115: <emphasis>NEW</emphasis></ulink> for more information.
-                    </para>
-
-                </listitem>
-
-            </itemizedlist>
-
-        </para>
-
-    </section>
-
+		</para>
+		 <para>
+			In a traditional Kolab deployment, these settings are used with the configuration management utilities. On a server that is not a Kolab server, naturally the configuration management does not apply. However, the Kolab perl libraries still require these settings to be available for errors to be suppressed.
+		</para>
+		 <para>
+			Please see <ulink url="https://bugzilla.kolabsys.com/show_bug.cgi?id=114" /> for more information.
+		</para>
+		 <formalpara id="form-Administrator_Guide-Using_the_Kolab_Perl_Libraries_on_a_non_Kolab_System-Required_Settings">
+			<title>Required Settings</title>
+			 <para>
+				The following are settings required;
+			</para>
+
+		</formalpara>
+		 <para>
+			<itemizedlist>
+				<listitem>
+					<formalpara id="form-Administrator_Guide-Using_the_Kolab_Perl_Libraries_on_a_non_Kolab_System-connect_addr">
+						<title><literal>connect_addr</literal></title>
+						 <para>
+							The connection address for the Kolab perl libraries. Currently this is being used for IMAP connections.
+						</para>
+
+					</formalpara>
+					 <para>
+						See <ulink url="https://bugzilla.kolabsys.com/show_bug.cgi?id=112">Bugzilla #112: <emphasis>Use of connect_addr, local_addr, bind_addr and bind_any</emphasis></ulink> and <ulink url="https://bugzilla.kolabsys.com/show_bug.cgi?id=115">Bugzilla #115: <emphasis>NEW</emphasis></ulink> for more information.
+					</para>
+
+				</listitem>
+
+			</itemizedlist>
+
+		</para>
+
+	</section>
+	
 
 </chapter>
 
diff --git a/Administrator_Guide/en-US/Detailed_Kolab_Server_Overview.xml b/Administrator_Guide/en-US/Detailed_Kolab_Server_Overview.xml
index 1d80c8d..96c79bb 100755
--- a/Administrator_Guide/en-US/Detailed_Kolab_Server_Overview.xml
+++ b/Administrator_Guide/en-US/Detailed_Kolab_Server_Overview.xml
@@ -4,394 +4,394 @@
 %BOOK_ENTITIES;
 ]>
 <chapter id="chap-Administrator_Guide-Detailed_Kolab_Server_Overview">
-    <title>Detailed Kolab Server Overview</title>
-    <para>
-        The Kolab Server consists of various 3rd-party OpenSource components as well as some kolab specific components which provide the glue between those. Most of the 3rd-party components can be exchanged, such as the IMAP-Server.
-    </para>
-    <section id="sect-Administrator_Guide-Detailed_Kolab_Server_Overview-EMail_Directory_Service">
-        <title>EMail-/Directory-Service</title>
-        <section id="sect-Administrator_Guide-EMail_Directory_Service-Postfix">
-            <title>Postfix</title>
-            <para>
-                Postfix is an <emphasis>MTA</emphasis> (Mail Transfer Agent), responsible for the transport and distribution of emails.
-            </para>
-            <itemizedlist>
-                <listitem>
-                    <para>
-                        URL: <ulink url="http://www.postfix.org">www.postfix.org</ulink>
-                    </para>
-
-                </listitem>
-                <listitem>
-                    <para>
-                        Documentation: <ulink url="http://www.postfix.org/documentation.html">Postfix Documentation</ulink>
-                    </para>
-
-                </listitem>
-
-            </itemizedlist>
-            <formalpara id="form-Administrator_Guide-Postfix-Services">
-                <title>Services:</title>
-                <para>
-                    <itemizedlist>
-                        <listitem>
-                            <para>
-                                <application>postfix</application>
-                            </para>
-
-                        </listitem>
-
-                    </itemizedlist>
-
-                </para>
-
-            </formalpara>
-            <formalpara id="form-Administrator_Guide-Postfix-Configuration_files">
-                <title>Configuration files:</title>
-                <para>
-                    <itemizedlist>
-                        <listitem>
-                            <para>
-                                <filename>/etc/postfix/main.cf</filename>
-                            </para>
-
-                        </listitem>
-                        <listitem>
-                            <para>
-                                <filename>/etc/postfix/master.cf</filename>
-                            </para>
-
-                        </listitem>
-                        <listitem>
-                            <para>
-                                <filename>/etc/postfix/ldap/alias_maps.cf</filename>
-                            </para>
-
-                        </listitem>
-                        <listitem>
-                            <para>
-                                <filename>/etc/postfix/ldap/local_recipient_maps.cf</filename>
-                            </para>
-
-                        </listitem>
-                        <listitem>
-                            <para>
-                                <filename>/etc/postfix/ldap/mydestination.cf</filename>
-                            </para>
-
-                        </listitem>
-                        <listitem>
-                            <para>
-                                <filename>/etc/postfix/ldap/virtual_alias_maps.cf</filename>
-                            </para>
-
-                        </listitem>
-                        <listitem>
-                            <para>
-                                <filename>/etc/postfix/ldap/virtual_alias_maps_mailenabled_distgroups.cf</filename>
-                            </para>
-
-                        </listitem>
-                        <listitem>
-                            <para>
-                                <filename>/etc/postfix/ldap/virtual_alias_maps_mailenabled_dynamic_distgroups.cf</filename>
-                            </para>
-
-                        </listitem>
-
-                    </itemizedlist>
-
-                </para>
-
-            </formalpara>
-            <formalpara id="form-Administrator_Guide-Postfix-Logfiles">
-                <title>Logfiles</title>
-                <para>
-                    <itemizedlist>
-                        <listitem>
-                            <para>
-                                <filename>/var/log/logfile</filename>
-                            </para>
-
-                        </listitem>
-
-                    </itemizedlist>
-
-                </para>
-
-            </formalpara>
-            <formalpara id="form-Administrator_Guide-Postfix-Commands">
-                <title>Commands</title>
-                <para>
-                    /etc/init.d/postfix restart
-                </para>
-
-            </formalpara>
-
-        </section>
-
-        <section id="sect-Administrator_Guide-EMail_Directory_Service-Cyrus_IMAP">
-            <title>Cyrus-IMAP</title>
-            <para>
-                The <application>Cyrus-IMAP</application> server is a scalable, fast IMAP server.
-            </para>
-            <itemizedlist>
-                <listitem>
-                    <para>
-                        URL: <ulink url="http://www.cyrusimap.org/">www.cyrusimap.org/</ulink>
-                    </para>
-
-                </listitem>
-                <listitem>
-                    <para>
-                        Documentation: <ulink url="http://www.cyrusimap.org/docs/cyrus-imapd/">Cyrus Documentation</ulink>
-                    </para>
-
-                </listitem>
-
-            </itemizedlist>
-            <formalpara id="form-Administrator_Guide-Cyrus_IMAP-Services">
-                <title>Services:</title>
-                <para>
-                    <itemizedlist>
-                        <listitem>
-                            <para>
-                                <application>imapd</application>
-                            </para>
-
-                        </listitem>
-                        <listitem>
-                            <para>
-                                <application>pop3d TODO: remove?</application>
-                            </para>
-
-                        </listitem>
-                        <listitem>
-                            <para>
-                                <application>/usr/lib/cyrus-impad/cyrus-master</application>
-                            </para>
-
-                        </listitem>
-                        <listitem>
-                            <para>
-                                <application>idled</application>
-                            </para>
-
-                        </listitem>
-
-                    </itemizedlist>
-
-                </para>
-
-            </formalpara>
-
-        </section>
-
-        <section id="sect-Administrator_Guide-EMail_Directory_Service-OpenLDAP">
-            <title>OpenLDAP</title>
-            <para>
-                LDAP is the directory services used to store information about users as well as parts of the Kolab configuration. The service consists of the <application>slapd</application> deamon, which provides access to the directory. <application>slurpd</application> is a replication deamon for the LDAP database, allowing the system to be distributed over several machines which increases relaiability as well as availability. <application>slurpd</application> is replaced by <application>syncrepl</application> as of version 3.0.
-            </para>
-            <itemizedlist>
-                <listitem>
-                    <para>
-                        URL: <ulink url="http://www.openldap.org/">www.openldap.org/</ulink>
-                    </para>
-
-                </listitem>
-                <listitem>
-                    <para>
-                        Documentation: <ulink url="http://www.openldap.org/doc/admin24/">OpenLDAP admin guide</ulink>
-                    </para>
-
-                </listitem>
-
-            </itemizedlist>
-            <formalpara id="form-Administrator_Guide-OpenLDAP-Services">
-                <title>Services:</title>
-                <para>
-                    <itemizedlist>
-                        <listitem>
-                            <para>
-                                <application>slapd</application>
-                            </para>
-
-                        </listitem>
-                        <listitem>
-                            <para>
-                                <application>slurpd</application>
-                            </para>
-
-                        </listitem>
-
-                    </itemizedlist>
-
-                </para>
-
-            </formalpara>
-
-        </section>
-
-        <section id="sect-Administrator_Guide-EMail_Directory_Service-Cyrus_SASL_authentication">
-            <title>Cyrus-SASL authentication</title>
-            <para>
-                SASL (Simple Authentication and Security Layer) is a method to add authentication support for connection based protocols. The authentication via SASL is used by Postfix and the IMAP-Server. <application>saslauthd</application> is the deamon providing the authentication, using the credentials stored in the LDAP database.
-            </para>
-            <formalpara id="form-Administrator_Guide-Cyrus_SASL_authentication-Services">
-                <title>Services:</title>
-                <para>
-                    <itemizedlist>
-                        <listitem>
-                            <para>
-                                <application>/usr/sbin/saslauthd</application>
-                            </para>
-
-                        </listitem>
-
-                    </itemizedlist>
-
-                </para>
-
-            </formalpara>
-
-        </section>
-
-
-    </section>
-
-    <section id="sect-Administrator_Guide-Detailed_Kolab_Server_Overview-Spam_Virus_Scanner">
-        <title>Spam-/Virus-Scanner</title>
-        <section id="sect-Administrator_Guide-Spam_Virus_Scanner-Amavisd">
-            <title>Amavisd</title>
-            <para>
-                <application>Amavisd</application> is an emailscanner, which unpacks all messages (including attachments) and forwards them to virus scanners and spam filters.
-            </para>
-            <formalpara id="form-Administrator_Guide-Amavisd-Services">
-                <title>Services:</title>
-                <para>
-                    <itemizedlist>
-                        <listitem>
-                            <para>
-                                <application>amavisd</application>
-                            </para>
-
-                        </listitem>
-
-                    </itemizedlist>
-
-                </para>
-
-            </formalpara>
-
-        </section>
-
-        <section id="sect-Administrator_Guide-Spam_Virus_Scanner-ClamAV">
-            <title>ClamAV</title>
-            <para>
-                <application>ClamAV</application> is a virus scanner, suitable for Mailservers.
-            </para>
-            <para>
-                <application>clamd.amavisd</application>
-            </para>
-
-        </section>
-
-        <section id="sect-Administrator_Guide-Spam_Virus_Scanner-SpamAssassin">
-            <title>SpamAssassin</title>
-            <para>
-                <application>SpamAssassin</application> is a spam filter.
-            </para>
-
-        </section>
-
-
-    </section>
-
-    <section id="sect-Administrator_Guide-Detailed_Kolab_Server_Overview-Kolab_Webclient">
-        <title>Kolab-Webclient</title>
-        <section id="sect-Administrator_Guide-Kolab_Webclient-Horde">
-            <title>Horde</title>
-            <para>
-                <application>Horde</application> is the old webclient for Kolab.
-            </para>
-
-        </section>
-
-        <section id="sect-Administrator_Guide-Kolab_Webclient-Roundcube">
-            <title>Roundcube</title>
-            <para>
-                <application>Roundcube</application> is the new webclient for Kolab.
-            </para>
-
-        </section>
-
-
-    </section>
-
-    <section id="sect-Administrator_Guide-Detailed_Kolab_Server_Overview-General">
-        <title>General</title>
-        <section id="sect-Administrator_Guide-General-Apache">
-            <title>Apache</title>
-            <para>
-                The infamous http server.
-            </para>
-            <formalpara id="form-Administrator_Guide-Apache-Services">
-                <title>Services:</title>
-                <para>
-                    <itemizedlist>
-                        <listitem>
-                            <para>
-                                <application>/usr/sbin/httpd</application>
-                            </para>
-
-                        </listitem>
-
-                    </itemizedlist>
-
-                </para>
-
-            </formalpara>
-
-        </section>
-
-
-    </section>
-
-    <section id="sect-Administrator_Guide-Detailed_Kolab_Server_Overview-Kolab_specific_Components">
-        <title>Kolab specific Components</title>
-        <para>
-            Apart from the main components, consisting of proven 3rd-party OpenSource software, there are also some Kolab specific software components.
-        </para>
-        <section id="sect-Administrator_Guide-Kolab_specific_Components-kolabd">
-            <title>kolabd</title>
-            <para>
-                The Kolab-Daemon is the central control unit between the various components. It is responsible for synchronizing the user accounts in the LDAP directory with the available IMAP folders. TODO: further responsabilites of kolabd
-            </para>
-
-        </section>
-
-        <section id="sect-Administrator_Guide-Kolab_specific_Components-kolab_webadmin">
-            <title>kolab-webadmin</title>
-            <para>
-                The Kolab-Webadin is an administrator webinterface.
-            </para>
-
-        </section>
-
-
-    </section>
-
-    <section id="sect-Administrator_Guide-Detailed_Kolab_Server_Overview-Component_Interaction">
-        <title>Component Interaction</title>
-        <para>
-            The following diagram illustrates the interaction between the various components.
-        </para>
-        <para>
-            <application>kolabd</application> is the central control instance of the kolab server, responsible to configure all components,
-        </para>
-
-    </section>
-
+	<title>Detailed Kolab Server Overview</title>
+	 <para>
+		The Kolab Server consists of various 3rd-party OpenSource components as well as some kolab specific components which provide the glue between those. Most of the 3rd-party components can be exchanged, such as the IMAP-Server.
+	</para>
+	 <section id="sect-Administrator_Guide-Detailed_Kolab_Server_Overview-EMail_Directory_Service">
+		<title>EMail-/Directory-Service</title>
+		 <section id="sect-Administrator_Guide-EMail_Directory_Service-Postfix">
+			<title>Postfix</title>
+			 <para>
+				Postfix is an <emphasis>MTA</emphasis> (Mail Transfer Agent), responsible for the transport and distribution of emails.
+			</para>
+			 <itemizedlist>
+				<listitem>
+					<para>
+						URL: <ulink url="http://www.postfix.org">www.postfix.org</ulink>
+					</para>
+
+				</listitem>
+				 <listitem>
+					<para>
+						Documentation: <ulink url="http://www.postfix.org/documentation.html">Postfix Documentation</ulink>
+					</para>
+
+				</listitem>
+
+			</itemizedlist>
+			 <formalpara id="form-Administrator_Guide-Postfix-Services">
+				<title>Services:</title>
+				 <para>
+					<itemizedlist>
+						<listitem>
+							<para>
+								<application>postfix</application>
+							</para>
+
+						</listitem>
+
+					</itemizedlist>
+
+				</para>
+
+			</formalpara>
+			 <formalpara id="form-Administrator_Guide-Postfix-Configuration_files">
+				<title>Configuration files:</title>
+				 <para>
+					<itemizedlist>
+						<listitem>
+							<para>
+								<filename>/etc/postfix/main.cf</filename>
+							</para>
+
+						</listitem>
+						 <listitem>
+							<para>
+								<filename>/etc/postfix/master.cf</filename>
+							</para>
+
+						</listitem>
+						 <listitem>
+							<para>
+								<filename>/etc/postfix/ldap/alias_maps.cf</filename>
+							</para>
+
+						</listitem>
+						 <listitem>
+							<para>
+								<filename>/etc/postfix/ldap/local_recipient_maps.cf</filename>
+							</para>
+
+						</listitem>
+						 <listitem>
+							<para>
+								<filename>/etc/postfix/ldap/mydestination.cf</filename>
+							</para>
+
+						</listitem>
+						 <listitem>
+							<para>
+								<filename>/etc/postfix/ldap/virtual_alias_maps.cf</filename>
+							</para>
+
+						</listitem>
+						 <listitem>
+							<para>
+								<filename>/etc/postfix/ldap/virtual_alias_maps_mailenabled_distgroups.cf</filename>
+							</para>
+
+						</listitem>
+						 <listitem>
+							<para>
+								<filename>/etc/postfix/ldap/virtual_alias_maps_mailenabled_dynamic_distgroups.cf</filename>
+							</para>
+
+						</listitem>
+
+					</itemizedlist>
+
+				</para>
+
+			</formalpara>
+			 <formalpara id="form-Administrator_Guide-Postfix-Logfiles">
+				<title>Logfiles</title>
+				 <para>
+					<itemizedlist>
+						<listitem>
+							<para>
+								<filename>/var/log/logfile</filename>
+							</para>
+
+						</listitem>
+
+					</itemizedlist>
+
+				</para>
+
+			</formalpara>
+			 <formalpara id="form-Administrator_Guide-Postfix-Commands">
+				<title>Commands</title>
+				 <para>
+					/etc/init.d/postfix restart
+				</para>
+
+			</formalpara>
+
+		</section>
+		
+		 <section id="sect-Administrator_Guide-EMail_Directory_Service-Cyrus_IMAP">
+			<title>Cyrus-IMAP</title>
+			 <para>
+				The <application>Cyrus-IMAP</application> server is a scalable, fast IMAP server.
+			</para>
+			 <itemizedlist>
+				<listitem>
+					<para>
+						URL: <ulink url="http://www.cyrusimap.org/">www.cyrusimap.org/</ulink>
+					</para>
+
+				</listitem>
+				 <listitem>
+					<para>
+						Documentation: <ulink url="http://www.cyrusimap.org/docs/cyrus-imapd/">Cyrus Documentation</ulink>
+					</para>
+
+				</listitem>
+
+			</itemizedlist>
+			 <formalpara id="form-Administrator_Guide-Cyrus_IMAP-Services">
+				<title>Services:</title>
+				 <para>
+					<itemizedlist>
+						<listitem>
+							<para>
+								<application>imapd</application>
+							</para>
+
+						</listitem>
+						 <listitem>
+							<para>
+								<application>pop3d TODO: remove?</application>
+							</para>
+
+						</listitem>
+						 <listitem>
+							<para>
+								<application>/usr/lib/cyrus-impad/cyrus-master</application>
+							</para>
+
+						</listitem>
+						 <listitem>
+							<para>
+								<application>idled</application>
+							</para>
+
+						</listitem>
+
+					</itemizedlist>
+
+				</para>
+
+			</formalpara>
+
+		</section>
+		
+		 <section id="sect-Administrator_Guide-EMail_Directory_Service-OpenLDAP">
+			<title>OpenLDAP</title>
+			 <para>
+				LDAP is the directory services used to store information about users as well as parts of the Kolab configuration. The service consists of the <application>slapd</application> deamon, which provides access to the directory. <application>slurpd</application> is a replication deamon for the LDAP database, allowing the system to be distributed over several machines which increases relaiability as well as availability. <application>slurpd</application> is replaced by <application>syncrepl</application> as of version 3.0.
+			</para>
+			 <itemizedlist>
+				<listitem>
+					<para>
+						URL: <ulink url="http://www.openldap.org/">www.openldap.org/</ulink>
+					</para>
+
+				</listitem>
+				 <listitem>
+					<para>
+						Documentation: <ulink url="http://www.openldap.org/doc/admin24/">OpenLDAP admin guide</ulink>
+					</para>
+
+				</listitem>
+
+			</itemizedlist>
+			 <formalpara id="form-Administrator_Guide-OpenLDAP-Services">
+				<title>Services:</title>
+				 <para>
+					<itemizedlist>
+						<listitem>
+							<para>
+								<application>slapd</application>
+							</para>
+
+						</listitem>
+						 <listitem>
+							<para>
+								<application>slurpd</application>
+							</para>
+
+						</listitem>
+
+					</itemizedlist>
+
+				</para>
+
+			</formalpara>
+
+		</section>
+		
+		 <section id="sect-Administrator_Guide-EMail_Directory_Service-Cyrus_SASL_authentication">
+			<title>Cyrus-SASL authentication</title>
+			 <para>
+				SASL (Simple Authentication and Security Layer) is a method to add authentication support for connection based protocols. The authentication via SASL is used by Postfix and the IMAP-Server. <application>saslauthd</application> is the deamon providing the authentication, using the credentials stored in the LDAP database.
+			</para>
+			 <formalpara id="form-Administrator_Guide-Cyrus_SASL_authentication-Services">
+				<title>Services:</title>
+				 <para>
+					<itemizedlist>
+						<listitem>
+							<para>
+								<application>/usr/sbin/saslauthd</application>
+							</para>
+
+						</listitem>
+
+					</itemizedlist>
+
+				</para>
+
+			</formalpara>
+
+		</section>
+		
+
+	</section>
+	
+	 <section id="sect-Administrator_Guide-Detailed_Kolab_Server_Overview-Spam_Virus_Scanner">
+		<title>Spam-/Virus-Scanner</title>
+		 <section id="sect-Administrator_Guide-Spam_Virus_Scanner-Amavisd">
+			<title>Amavisd</title>
+			 <para>
+				<application>Amavisd</application> is an emailscanner, which unpacks all messages (including attachments) and forwards them to virus scanners and spam filters.
+			</para>
+			 <formalpara id="form-Administrator_Guide-Amavisd-Services">
+				<title>Services:</title>
+				 <para>
+					<itemizedlist>
+						<listitem>
+							<para>
+								<application>amavisd</application>
+							</para>
+
+						</listitem>
+
+					</itemizedlist>
+
+				</para>
+
+			</formalpara>
+
+		</section>
+		
+		 <section id="sect-Administrator_Guide-Spam_Virus_Scanner-ClamAV">
+			<title>ClamAV</title>
+			 <para>
+				<application>ClamAV</application> is a virus scanner, suitable for Mailservers.
+			</para>
+			 <para>
+				<application>clamd.amavisd</application>
+			</para>
+
+		</section>
+		
+		 <section id="sect-Administrator_Guide-Spam_Virus_Scanner-SpamAssassin">
+			<title>SpamAssassin</title>
+			 <para>
+				<application>SpamAssassin</application> is a spam filter.
+			</para>
+
+		</section>
+		
+
+	</section>
+	
+	 <section id="sect-Administrator_Guide-Detailed_Kolab_Server_Overview-Kolab_Webclient">
+		<title>Kolab-Webclient</title>
+		 <section id="sect-Administrator_Guide-Kolab_Webclient-Horde">
+			<title>Horde</title>
+			 <para>
+				<application>Horde</application> is the old webclient for Kolab.
+			</para>
+
+		</section>
+		
+		 <section id="sect-Administrator_Guide-Kolab_Webclient-Roundcube">
+			<title>Roundcube</title>
+			 <para>
+				<application>Roundcube</application> is the new webclient for Kolab.
+			</para>
+
+		</section>
+		
+
+	</section>
+	
+	 <section id="sect-Administrator_Guide-Detailed_Kolab_Server_Overview-General">
+		<title>General</title>
+		 <section id="sect-Administrator_Guide-General-Apache">
+			<title>Apache</title>
+			 <para>
+				The infamous http server.
+			</para>
+			 <formalpara id="form-Administrator_Guide-Apache-Services">
+				<title>Services:</title>
+				 <para>
+					<itemizedlist>
+						<listitem>
+							<para>
+								<application>/usr/sbin/httpd</application>
+							</para>
+
+						</listitem>
+
+					</itemizedlist>
+
+				</para>
+
+			</formalpara>
+
+		</section>
+		
+
+	</section>
+	
+	 <section id="sect-Administrator_Guide-Detailed_Kolab_Server_Overview-Kolab_specific_Components">
+		<title>Kolab specific Components</title>
+		 <para>
+			Apart from the main components, consisting of proven 3rd-party OpenSource software, there are also some Kolab specific software components.
+		</para>
+		 <section id="sect-Administrator_Guide-Kolab_specific_Components-kolabd">
+			<title>kolabd</title>
+			 <para>
+				The Kolab-Daemon is the central control unit between the various components. It is responsible for synchronizing the user accounts in the LDAP directory with the available IMAP folders. TODO: further responsabilites of kolabd
+			</para>
+
+		</section>
+		
+		 <section id="sect-Administrator_Guide-Kolab_specific_Components-kolab_webadmin">
+			<title>kolab-webadmin</title>
+			 <para>
+				The Kolab-Webadin is an administrator webinterface.
+			</para>
+
+		</section>
+		
+
+	</section>
+	
+	 <section id="sect-Administrator_Guide-Detailed_Kolab_Server_Overview-Component_Interaction">
+		<title>Component Interaction</title>
+		 <para>
+			The following diagram illustrates the interaction between the various components.
+		</para>
+		 <para>
+			<application>kolabd</application> is the central control instance of the kolab server, responsible to configure all components,
+		</para>
+
+	</section>
+	
 
 </chapter>
 
diff --git a/Administrator_Guide/en-US/Kolab_Web_Administration_Panel.xml b/Administrator_Guide/en-US/Kolab_Web_Administration_Panel.xml
index ce52972..de3bce3 100644
--- a/Administrator_Guide/en-US/Kolab_Web_Administration_Panel.xml
+++ b/Administrator_Guide/en-US/Kolab_Web_Administration_Panel.xml
@@ -4,182 +4,182 @@
 %BOOK_ENTITIES;
 ]>
 <chapter id="chap-Administrator_Guide-Kolab_Web_Administration_Panel">
-    <title>Kolab Web Administration Panel</title>
-    <section id="sect-Administrator_Guide-Kolab_Web_Administration_Panel-Editing_user_types">
-        <title>Editing <literal>user_types</literal></title>
-        <para>
-            The <literal>user_types</literal> table in the MySQL <literal>kolab</literal> database contains the following columns:
-        </para>
-        <para>
-            <itemizedlist>
-                <listitem>
-                    <formalpara id="form-Administrator_Guide-Editing_user_types-id">
-                        <title>id</title>
-                        <para>
-                            A unique ID.
-                        </para>
-
-                    </formalpara>
-
-                </listitem>
-                <listitem>
-                    <formalpara id="form-Administrator_Guide-Editing_user_types-key">
-                        <title>key</title>
-                        <para>
-                            A machine-readable key identifying the user type.
-                        </para>
-
-                    </formalpara>
-
-                </listitem>
-                <listitem>
-                    <formalpara id="form-Administrator_Guide-Editing_user_types-name">
-                        <title>name</title>
-                        <para>
-                            A human-readable name.
-                        </para>
-
-                    </formalpara>
-
-                </listitem>
-                <listitem>
-                    <formalpara id="form-Administrator_Guide-Editing_user_types-description">
-                        <title>description</title>
-                        <para>
-                            A description of the user type.
-                        </para>
-
-                    </formalpara>
-
-                </listitem>
-                <listitem>
-                    <formalpara id="form-Administrator_Guide-Editing_user_types-attributes">
-                        <title>attributes</title>
-                        <para>
-                            The actual settings. Please see <xref linkend="sect-Administrator_Guide-Editing_user_types-Attributes_Reference" /> for a full reference, and <xref linkend="proc-Administrator_Guide-Editing_user_types-Manually_Changing_the_user_types_Available" /> for the procedure to edit these settings manually.
-                        </para>
-
-                    </formalpara>
-
-                </listitem>
-
-            </itemizedlist>
-
-        </para>
-        <procedure id="proc-Administrator_Guide-Editing_user_types-Manually_Changing_the_user_types_Available">
-            <title>Manually Changing the <literal>user_types</literal> Available</title>
-            <step>
-                <para>
-                    Sample scripts are provided as part of the <application>kolab-webadmin</application> package. Use the following command to locate these scripts, called <emphasis>sample-insert-user_types.php</emphasis>;
-                </para>
-                <para>
-
+	<title>Kolab Web Administration Panel</title>
+	 <section id="sect-Administrator_Guide-Kolab_Web_Administration_Panel-Editing_user_types">
+		<title>Editing <literal>user_types</literal></title>
+		 <para>
+			The <literal>user_types</literal> table in the MySQL <literal>kolab</literal> database contains the following columns:
+		</para>
+		 <para>
+			<itemizedlist>
+				<listitem>
+					<formalpara id="form-Administrator_Guide-Editing_user_types-id">
+						<title>id</title>
+						 <para>
+							A unique ID.
+						</para>
+
+					</formalpara>
+
+				</listitem>
+				 <listitem>
+					<formalpara id="form-Administrator_Guide-Editing_user_types-key">
+						<title>key</title>
+						 <para>
+							A machine-readable key identifying the user type.
+						</para>
+
+					</formalpara>
+
+				</listitem>
+				 <listitem>
+					<formalpara id="form-Administrator_Guide-Editing_user_types-name">
+						<title>name</title>
+						 <para>
+							A human-readable name.
+						</para>
+
+					</formalpara>
+
+				</listitem>
+				 <listitem>
+					<formalpara id="form-Administrator_Guide-Editing_user_types-description">
+						<title>description</title>
+						 <para>
+							A description of the user type.
+						</para>
+
+					</formalpara>
+
+				</listitem>
+				 <listitem>
+					<formalpara id="form-Administrator_Guide-Editing_user_types-attributes">
+						<title>attributes</title>
+						 <para>
+							The actual settings. Please see <xref linkend="sect-Administrator_Guide-Editing_user_types-Attributes_Reference" /> for a full reference, and <xref linkend="proc-Administrator_Guide-Editing_user_types-Manually_Changing_the_user_types_Available" /> for the procedure to edit these settings manually.
+						</para>
+
+					</formalpara>
+
+				</listitem>
+
+			</itemizedlist>
+
+		</para>
+		 <procedure id="proc-Administrator_Guide-Editing_user_types-Manually_Changing_the_user_types_Available">
+			<title>Manually Changing the <literal>user_types</literal> Available</title>
+			 <step>
+				<para>
+					Sample scripts are provided as part of the <application>kolab-webadmin</application> package. Use the following command to locate these scripts, called <emphasis>sample-insert-user_types.php</emphasis>;
+				</para>
+				 <para>
+					
 <screen># <userinput>rpm -qld kolab-webadmin</userinput></screen>
 
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Copy the relevant example file to one directory above the <filename>public_html/</filename> directory, like so:
-                </para>
-                <para>
+				</para>
 
+			</step>
+			 <step>
+				<para>
+					Copy the relevant example file to one directory above the <filename>public_html/</filename> directory, like so:
+				</para>
+				 <para>
+					
 <screen># <userinput>cp -a /path/to/sample-insert-user_types.php \</userinput>
     <userinput>/usr/share/kolab-webadmin/insert-user_types.php</userinput></screen>
 
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Edit the file to reflect your needs. For example, to avoid the <literal>mail</literal> attribute from being automatically generated, remove <literal>$attributes['auto_form_fields']['mail']</literal>.
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    You may want to insert <literal>$attributes["form_fields"]["mail"]</literal> to insert back a form field that allows supplying a mail attribute value for the user type.
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Once done editing, check the syntax;
-                </para>
-                <para>
-
+				</para>
+
+			</step>
+			 <step>
+				<para>
+					Edit the file to reflect your needs. For example, to avoid the <literal>mail</literal> attribute from being automatically generated, remove <literal>$attributes['auto_form_fields']['mail']</literal>.
+				</para>
+
+			</step>
+			 <step>
+				<para>
+					You may want to insert <literal>$attributes["form_fields"]["mail"]</literal> to insert back a form field that allows supplying a mail attribute value for the user type.
+				</para>
+
+			</step>
+			 <step>
+				<para>
+					Once done editing, check the syntax;
+				</para>
+				 <para>
+					
 <screen># <userinput>php -l insert-user_types.php</userinput></screen>
 
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Execute the file to replace the user types currently in the database;
-                </para>
-                <para>
+				</para>
 
+			</step>
+			 <step>
+				<para>
+					Execute the file to replace the user types currently in the database;
+				</para>
+				 <para>
+					
 <screen># <userinput>php insert-user_types.php</userinput></screen>
 
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Log out and log back in to the web admin.
-                </para>
-
-            </step>
-
-        </procedure>
-
-        <section id="sect-Administrator_Guide-Editing_user_types-Attributes_Reference">
-            <title>Attributes Reference</title>
-            <para>
-                The attributes column for user types describes which form fields are to be offered to the <emphasis>add user</emphasis> dialog for each type of user available.
-            </para>
-            <para>
-                It is an object consisting of three types of form fields, namely;
-            </para>
-            <para>
-                <orderedlist>
-                    <listitem>
-                        <para>
-                            <literal>auto_form_fields</literal>, or form fields for which the value is generated automatically (from values that are entered in other form fields).
-                        </para>
-                        <para>
-                            Example form fields for which the value can be generated automatically include <literal>displayname</literal> and <literal>cn</literal>.
-                        </para>
-
-                    </listitem>
-                    <listitem>
-                        <para>
-                            <literal>form_fields</literal>, for form fields to which the user or administrator is to provide input.
-                        </para>
-                        <para>
-                            Example form fields that users or administrators would provide input to include <literal>givenname</literal> and <literal>surname</literal>.
-                        </para>
-
-                    </listitem>
-                    <listitem>
-                        <para>
-                            <literal>fields</literal>, for form fields that are hidden from plain sight, and cannot be edited by the user or administrator.
-                        </para>
-                        <para>
-                            Example fields that would be configured as immutable, or static, and therefore be hidden from the client interface include <literal>objectclass</literal>.
-                        </para>
-
-                    </listitem>
-
-                </orderedlist>
-
-            </para>
-            <para>
-                The structure of the <literal>attributes</literal> attribute value is:
-            </para>
-            <para>
-
+				</para>
+
+			</step>
+			 <step>
+				<para>
+					Log out and log back in to the web admin.
+				</para>
+
+			</step>
+
+		</procedure>
+		
+		 <section id="sect-Administrator_Guide-Editing_user_types-Attributes_Reference">
+			<title>Attributes Reference</title>
+			 <para>
+				The attributes column for user types describes which form fields are to be offered to the <emphasis>add user</emphasis> dialog for each type of user available.
+			</para>
+			 <para>
+				It is an object consisting of three types of form fields, namely;
+			</para>
+			 <para>
+				<orderedlist>
+					<listitem>
+						<para>
+							<literal>auto_form_fields</literal>, or form fields for which the value is generated automatically (from values that are entered in other form fields).
+						</para>
+						 <para>
+							Example form fields for which the value can be generated automatically include <literal>displayname</literal> and <literal>cn</literal>.
+						</para>
+
+					</listitem>
+					 <listitem>
+						<para>
+							<literal>form_fields</literal>, for form fields to which the user or administrator is to provide input.
+						</para>
+						 <para>
+							Example form fields that users or administrators would provide input to include <literal>givenname</literal> and <literal>surname</literal>.
+						</para>
+
+					</listitem>
+					 <listitem>
+						<para>
+							<literal>fields</literal>, for form fields that are hidden from plain sight, and cannot be edited by the user or administrator.
+						</para>
+						 <para>
+							Example fields that would be configured as immutable, or static, and therefore be hidden from the client interface include <literal>objectclass</literal>.
+						</para>
+
+					</listitem>
+
+				</orderedlist>
+
+			</para>
+			 <para>
+				The structure of the <literal>attributes</literal> attribute value is:
+			</para>
+			 <para>
+				
 <screen language="PHP/PHP">Array(
         "<form_field_type>" => Array(
                 "<form_field_name>" => Array(
@@ -198,39 +198,39 @@
             )
     )</screen>
 
-            </para>
-            <para>
-                The <literal>attributes</literal> attribute to a <literal>user_type</literal> entry holds an array with any or all of the following <emphasis><form_field_type></emphasis> keys:
-            </para>
-            <important>
-                <para>
-                    The reference implementation and general rule of thumb is to use the LDAP attribute name as the form field name.
-                </para>
-
-            </important>
-            <para>
-                <itemizedlist>
-                    <listitem>
-                        <formalpara id="form-Administrator_Guide-Attributes_Reference-auto_form_fields">
-                            <title><literal>auto_form_fields</literal></title>
-                            <para>
-                                The <literal>auto_form_fields</literal> key holds an array of form fields that correspond with attributes for which the value is to be generated automatically, using an API call.
-                            </para>
-
-                        </formalpara>
-                        <para>
-                            The key name for each key => value pair indicates the form field name for which the value is to be generated automatically.
-                        </para>
-                        <para>
-                            Each array key corresponds with a user attribute name, and it's value is an array containing the name of the form fields for which the value to submit as part of the API call.
-                        </para>
-                        <example id="exam-Administrator_Guide-Attributes_Reference-A_Users_displayname">
-                            <title>A User's <literal>displayname</literal></title>
-                            <para>
-                                Provided the user type's <literal>auto_form_fields</literal> contains an array key of <literal>displayname</literal>, the array value for this key could look as follows:
-                            </para>
-                            <para>
-
+			</para>
+			 <para>
+				The <literal>attributes</literal> attribute to a <literal>user_type</literal> entry holds an array with any or all of the following <emphasis><form_field_type></emphasis> keys:
+			</para>
+			 <important>
+				<para>
+					The reference implementation and general rule of thumb is to use the LDAP attribute name as the form field name.
+				</para>
+
+			</important>
+			 <para>
+				<itemizedlist>
+					<listitem>
+						<formalpara id="form-Administrator_Guide-Attributes_Reference-auto_form_fields">
+							<title><literal>auto_form_fields</literal></title>
+							 <para>
+								The <literal>auto_form_fields</literal> key holds an array of form fields that correspond with attributes for which the value is to be generated automatically, using an API call.
+							</para>
+
+						</formalpara>
+						 <para>
+							The key name for each key => value pair indicates the form field name for which the value is to be generated automatically.
+						</para>
+						 <para>
+							Each array key corresponds with a user attribute name, and it's value is an array containing the name of the form fields for which the value to submit as part of the API call.
+						</para>
+						 <example id="exam-Administrator_Guide-Attributes_Reference-A_Users_displayname">
+							<title>A User's <literal>displayname</literal></title>
+							 <para>
+								Provided the user type's <literal>auto_form_fields</literal> contains an array key of <literal>displayname</literal>, the array value for this key could look as follows:
+							</para>
+							 <para>
+								
 <screen language="PHP/PHP">Array(
         'auto_form_fields' => Array(
                 'displayname' => Array(
@@ -244,119 +244,119 @@
         (...)
     );</screen>
 
-                            </para>
-                            <para>
-                                This indicates to the client that a form field named 'displayname' is to be populated with the information contained within the form fields named 'givenname' and 'sn'.
-                            </para>
-                            <para>
-                                If the client is capable of doing so, it should also update the form field named 'displayname' after the values for any of the form fields named 'givenname' or 'sn' have been changed.
-                            </para>
-
-                        </example>
-                        <para>
-                            With a JSON object payload containing the values of the form fields for which the names are contained within the 'data' key, if any, the client should submit a POST request on change of these form fields, and will be returned the new value for the automatically generated form field.
-                        </para>
-
-                    </listitem>
-                    <listitem>
-                        <formalpara id="form-Administrator_Guide-Attributes_Reference-form_fields">
-                            <title><literal>form_fields</literal></title>
-                            <para>
-                                The <literal>form_fields</literal> key holds an array of form fields that require user input.
-                            </para>
-
-                        </formalpara>
-                        <para>
-                            The key name for each key => value pair indicates the form field name for which the value is to be supplied by the user.
-                        </para>
-                        <para>
-                            Because some attributes can be multi-valued, or have a limited list of options, each defined form field in <literal>form_fields</literal> can hold an array with additional key => value pairs illustrating the type of form field that should be used, and what format to expect the result value in.
-                        </para>
-                        <para>
-                            <itemizedlist id="item-Administrator_Guide-Attributes_Reference-Additional_Information_in_form_fields">
-                                <title>Additional Information in <literal>form_fields</literal></title>
-                                <listitem>
-                                    <formalpara id="form-Administrator_Guide-Additional_Information_in_form_fields-maxlength">
-                                        <title><literal>maxlength</literal></title>
-                                        <para>
-                                            For a form field of type <xref linkend="form-Administrator_Guide-Additional_Information_in_form_fields-text" /> or type <xref linkend="form-Administrator_Guide-Additional_Information_in_form_fields-list" />, this value holds the maximum length for a given item.
-                                        </para>
-
-                                    </formalpara>
-
-                                </listitem>
-                                <listitem>
-                                    <formalpara id="form-Administrator_Guide-Additional_Information_in_form_fields-type">
-                                        <title><literal>type</literal></title>
-                                        <para>
-                                            The <literal>type</literal> is to indicate the type of form field. Options include;
-                                        </para>
-
-                                    </formalpara>
-                                    <para>
-                                        <itemizedlist>
-                                            <listitem>
-                                                <formalpara id="form-Administrator_Guide-Additional_Information_in_form_fields-text">
-                                                    <title><literal>text</literal></title>
-                                                    <para>
-                                                        This is a regular input field of type text.
-                                                    </para>
-
-                                                </formalpara>
-                                                <para>
-                                                    This is the default.
-                                                </para>
-                                                <para>
-                                                    Additional parameters for a text form field include <xref linkend="form-Administrator_Guide-Additional_Information_in_form_fields-maxlength" />.
-                                                </para>
-
-                                            </listitem>
-                                            <listitem>
-                                                <formalpara id="form-Administrator_Guide-Additional_Information_in_form_fields-list">
-                                                    <title><literal>list</literal></title>
-                                                    <para>
-                                                        A form field of type <literal>list</literal> is expecting a list of text input values.
-                                                    </para>
-
-                                                </formalpara>
-                                                <para>
-                                                    A client web interface could choose to display a textarea with the instructions to supply one item per line, or more advanced (better) equivalents, such as an add/delete widget.
-                                                </para>
-                                                <para>
-                                                    A client command-line interface could choose to prompt for input values until an empty value is supplied.
-                                                </para>
-                                                <para>
-                                                    Additional parameters for a list form field include <xref linkend="form-Administrator_Guide-Additional_Information_in_form_fields-maxlength" />, which holds the maximum length of each text value in the list.
-                                                </para>
-
-                                            </listitem>
-                                            <listitem>
-                                                <formalpara id="form-Administrator_Guide-Additional_Information_in_form_fields-multiselect">
-                                                    <title><literal>multiselect</literal></title>
-                                                    <para>
-                                                        This form field is a select list, where multiple options may be selected (as opposed to a <xref linkend="form-Administrator_Guide-Additional_Information_in_form_fields-select" /> list, where only one option may be selected).
-                                                    </para>
-
-                                                </formalpara>
-
-                                            </listitem>
-                                            <listitem>
-                                                <formalpara id="form-Administrator_Guide-Additional_Information_in_form_fields-select">
-                                                    <title><literal>select</literal></title>
-                                                    <para>
-                                                        This form field is a selection list, of which one option may be selected.
-                                                    </para>
-
-                                                </formalpara>
-
-                                            </listitem>
-
-                                        </itemizedlist>
-
-                                    </para>
-
-                                </listitem>
-                                <!--
+							</para>
+							 <para>
+								This indicates to the client that a form field named 'displayname' is to be populated with the information contained within the form fields named 'givenname' and 'sn'.
+							</para>
+							 <para>
+								If the client is capable of doing so, it should also update the form field named 'displayname' after the values for any of the form fields named 'givenname' or 'sn' have been changed.
+							</para>
+
+						</example>
+						 <para>
+							With a JSON object payload containing the values of the form fields for which the names are contained within the 'data' key, if any, the client should submit a POST request on change of these form fields, and will be returned the new value for the automatically generated form field.
+						</para>
+
+					</listitem>
+					 <listitem>
+						<formalpara id="form-Administrator_Guide-Attributes_Reference-form_fields">
+							<title><literal>form_fields</literal></title>
+							 <para>
+								The <literal>form_fields</literal> key holds an array of form fields that require user input.
+							</para>
+
+						</formalpara>
+						 <para>
+							The key name for each key => value pair indicates the form field name for which the value is to be supplied by the user.
+						</para>
+						 <para>
+							Because some attributes can be multi-valued, or have a limited list of options, each defined form field in <literal>form_fields</literal> can hold an array with additional key => value pairs illustrating the type of form field that should be used, and what format to expect the result value in.
+						</para>
+						 <para>
+							<itemizedlist id="item-Administrator_Guide-Attributes_Reference-Additional_Information_in_form_fields">
+								<title>Additional Information in <literal>form_fields</literal></title>
+								 <listitem>
+									<formalpara id="form-Administrator_Guide-Additional_Information_in_form_fields-maxlength">
+										<title><literal>maxlength</literal></title>
+										 <para>
+											For a form field of type <xref linkend="form-Administrator_Guide-Additional_Information_in_form_fields-text" /> or type <xref linkend="form-Administrator_Guide-Additional_Information_in_form_fields-list" />, this value holds the maximum length for a given item.
+										</para>
+
+									</formalpara>
+
+								</listitem>
+								 <listitem>
+									<formalpara id="form-Administrator_Guide-Additional_Information_in_form_fields-type">
+										<title><literal>type</literal></title>
+										 <para>
+											The <literal>type</literal> is to indicate the type of form field. Options include;
+										</para>
+
+									</formalpara>
+									 <para>
+										<itemizedlist>
+											<listitem>
+												<formalpara id="form-Administrator_Guide-Additional_Information_in_form_fields-text">
+													<title><literal>text</literal></title>
+													 <para>
+														This is a regular input field of type text.
+													</para>
+
+												</formalpara>
+												 <para>
+													This is the default.
+												</para>
+												 <para>
+													Additional parameters for a text form field include <xref linkend="form-Administrator_Guide-Additional_Information_in_form_fields-maxlength" />.
+												</para>
+
+											</listitem>
+											 <listitem>
+												<formalpara id="form-Administrator_Guide-Additional_Information_in_form_fields-list">
+													<title><literal>list</literal></title>
+													 <para>
+														A form field of type <literal>list</literal> is expecting a list of text input values.
+													</para>
+
+												</formalpara>
+												 <para>
+													A client web interface could choose to display a textarea with the instructions to supply one item per line, or more advanced (better) equivalents, such as an add/delete widget.
+												</para>
+												 <para>
+													A client command-line interface could choose to prompt for input values until an empty value is supplied.
+												</para>
+												 <para>
+													Additional parameters for a list form field include <xref linkend="form-Administrator_Guide-Additional_Information_in_form_fields-maxlength" />, which holds the maximum length of each text value in the list.
+												</para>
+
+											</listitem>
+											 <listitem>
+												<formalpara id="form-Administrator_Guide-Additional_Information_in_form_fields-multiselect">
+													<title><literal>multiselect</literal></title>
+													 <para>
+														This form field is a select list, where multiple options may be selected (as opposed to a <xref linkend="form-Administrator_Guide-Additional_Information_in_form_fields-select" /> list, where only one option may be selected).
+													</para>
+
+												</formalpara>
+
+											</listitem>
+											 <listitem>
+												<formalpara id="form-Administrator_Guide-Additional_Information_in_form_fields-select">
+													<title><literal>select</literal></title>
+													 <para>
+														This form field is a selection list, of which one option may be selected.
+													</para>
+
+												</formalpara>
+
+											</listitem>
+
+										</itemizedlist>
+
+									</para>
+
+								</listitem>
+								 <!-- 
 <listitem>
                                     <formalpara id="form-Administrator_Guide-Additional_Information_in_form_fields-value_source">
                                         <title><literal>value_source</literal></title>
@@ -377,32 +377,32 @@
                                     </formalpara>
 
                                 </listitem>
-                                //    -->
-                            </itemizedlist>
-
-                        </para>
-
-                    </listitem>
-                    <listitem>
-                        <formalpara id="form-Administrator_Guide-Attributes_Reference-fields">
-                            <title><literal>fields</literal></title>
-                            <para>
-                                The <literal>fields</literal> key holds an array of form fields and values for said form fields, that are static. One example of such form fields is <literal>objectclass</literal>.
-                            </para>
+                                //     -->
+							</itemizedlist>
 
-                        </formalpara>
+						</para>
 
-                    </listitem>
+					</listitem>
+					 <listitem>
+						<formalpara id="form-Administrator_Guide-Attributes_Reference-fields">
+							<title><literal>fields</literal></title>
+							 <para>
+								The <literal>fields</literal> key holds an array of form fields and values for said form fields, that are static. One example of such form fields is <literal>objectclass</literal>.
+							</para>
 
-                </itemizedlist>
+						</formalpara>
 
-            </para>
+					</listitem>
 
-        </section>
+				</itemizedlist>
 
+			</para>
 
-    </section>
+		</section>
+		
 
+	</section>
+	
 
 </chapter>
 
diff --git a/Administrator_Guide/en-US/Preface.xml b/Administrator_Guide/en-US/Preface.xml
index c9e647e..0b1e251 100644
--- a/Administrator_Guide/en-US/Preface.xml
+++ b/Administrator_Guide/en-US/Preface.xml
@@ -4,9 +4,9 @@
 %BOOK_ENTITIES;
 ]>
 <preface id="pref-Administrator_Guide-Preface">
-    <title>Preface</title>
-    <xi:include href="Common_Content/Conventions.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="sect-Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="sect-About_Kolab_Groupware.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	<title>Preface</title>
+	 <xi:include href="Common_Content/Conventions.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="sect-Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="sect-About_Kolab_Groupware.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </preface>
 
diff --git a/Administrator_Guide/en-US/Revision_History.xml b/Administrator_Guide/en-US/Revision_History.xml
index a75c98d..5d8b7ea 100644
--- a/Administrator_Guide/en-US/Revision_History.xml
+++ b/Administrator_Guide/en-US/Revision_History.xml
@@ -4,30 +4,30 @@
 %BOOK_ENTITIES;
 ]>
 <appendix id="appe-Administrator_Guide-Revision_History">
-    <title>Revision History</title>
-    <simpara>
-        <revhistory>
-            <revision>
-                <revnumber>0-0</revnumber>
-                <date>Mon Dec 13 2010</date>
-                <author>
-                    <firstname>Dude</firstname>
-                    <surname>McPants</surname>
-                    <email>Dude.McPants at example.com</email>
+	<title>Revision History</title>
+	 <simpara>
+		<revhistory>
+			<revision>
+				<revnumber>0-0</revnumber>
+				 <date>Mon Dec 13 2010</date>
+				 <author>
+					<firstname>Dude</firstname>
+					 <surname>McPants</surname>
+					 <email>Dude.McPants at example.com</email>
 
-                </author>
-                <revdescription>
-                    <simplelist>
-                        <member>Initial creation of book by publican</member>
+				</author>
+				 <revdescription>
+					<simplelist>
+						<member>Initial creation of book by publican</member>
 
-                    </simplelist>
+					</simplelist>
 
-                </revdescription>
+				</revdescription>
 
-            </revision>
+			</revision>
 
-        </revhistory>
+		</revhistory>
 
-    </simpara>
+	</simpara>
 </appendix>
 
diff --git a/Administrator_Guide/en-US/Tweaking_Tips_for_389_Directory_Server.xml b/Administrator_Guide/en-US/Tweaking_Tips_for_389_Directory_Server.xml
index e5eae63..48c1ff5 100644
--- a/Administrator_Guide/en-US/Tweaking_Tips_for_389_Directory_Server.xml
+++ b/Administrator_Guide/en-US/Tweaking_Tips_for_389_Directory_Server.xml
@@ -4,66 +4,66 @@
 %BOOK_ENTITIES;
 ]>
 <chapter id="chap-Administrator_Guide-Tweaking_Tips_for_389_Directory_Server">
-    <title>Tweaking Tips for 389 Directory Server</title>
-    <para>
-        para
-    </para>
-    <section id="sect-Administrator_Guide-Tweaking_Tips_for_389_Directory_Server-Adjusting_Cache_Sizes">
-        <title>Adjusting Cache Sizes</title>
-        <para>
-            para
-        </para>
-
-    </section>
-
-    <section id="sect-Administrator_Guide-Tweaking_Tips_for_389_Directory_Server-Using_Virtual_List_View_Control_for_Larger_Directory_Information_Trees">
-        <title>Using Virtual List View Control for Larger Directory Information Trees</title>
-        <para>
-            A default deployment of Kolab Groupware includes a largely unmodified 389 Directory Server with not all too many tweaked settings. When deployments grow the size of their Directory Information Tree, such as would be the case with more than 2000 user, group and/or contact entries, regular bind credentials run out of bounds when querying the tree.
-        </para>
-        <para>
-            Regular bind credentials include look-through, size and time limitations, usually causing a result set to be limited to 2000 entries (usually the first symptom), or causing the query to time out (larger trees, usually a later symptom).
-        </para>
-        <para>
-            Because a variety of User Interfaces depend on listing users, groups and contacts, it may be necessary to seek aid in Virtual List View (VLV) capabilities. VLV consists of additional indexes that can be queried by enabling two server-side controls:
-        </para>
-        <para>
-            <orderedlist>
-                <listitem>
-                    <para>
-                        Virtual List View control, with corresponding Base DN, Filter and Scope
-                    </para>
-
-                </listitem>
-                <listitem>
-                    <para>
-                        Server-Side Sorting control (SSS), with a corresponding list of attributes to use when sorting result entries.
-                    </para>
-
-                </listitem>
-
-            </orderedlist>
-
-        </para>
-        <para>
-            VLV along with SSS enables the pagination of search results, and circumvents the search limits for regular bind credentials.
-        </para>
-        <procedure id="proc-Administrator_Guide-Using_Virtual_List_View_Control_for_Larger_Directory_Information_Trees-Configuring_VLV_and_SSS_on_389_Directory_Server">
-            <title>Configuring VLV and SSS on 389 Directory Server</title>
-            <step>
-                <para>
-                    A version of these scripts can be downloaded from <ulink url="http://hosted.kolabsys.com/~vanmeeuwen/kolab-scripts.tar.gz" />.
-                </para>
-                <para>
-                    Inclusion into the <application>kolab</application> command-line utility is planned, so make sure to check <command>kolab help</command> to see if the commands have been included already.
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    In the following few steps, the scripts refer to the variables outlined below (which are contained in <filename>./settings.sh</filename>).
-                </para>
-
+	<title>Tweaking Tips for 389 Directory Server</title>
+	 <para>
+		para
+	</para>
+	 <section id="sect-Administrator_Guide-Tweaking_Tips_for_389_Directory_Server-Adjusting_Cache_Sizes">
+		<title>Adjusting Cache Sizes</title>
+		 <para>
+			para
+		</para>
+
+	</section>
+	
+	 <section id="sect-Administrator_Guide-Tweaking_Tips_for_389_Directory_Server-Using_Virtual_List_View_Control_for_Larger_Directory_Information_Trees">
+		<title>Using Virtual List View Control for Larger Directory Information Trees</title>
+		 <para>
+			A default deployment of Kolab Groupware includes a largely unmodified 389 Directory Server with not all too many tweaked settings. When deployments grow the size of their Directory Information Tree, such as would be the case with more than 2000 user, group and/or contact entries, regular bind credentials run out of bounds when querying the tree.
+		</para>
+		 <para>
+			Regular bind credentials include look-through, size and time limitations, usually causing a result set to be limited to 2000 entries (usually the first symptom), or causing the query to time out (larger trees, usually a later symptom).
+		</para>
+		 <para>
+			Because a variety of User Interfaces depend on listing users, groups and contacts, it may be necessary to seek aid in Virtual List View (VLV) capabilities. VLV consists of additional indexes that can be queried by enabling two server-side controls:
+		</para>
+		 <para>
+			<orderedlist>
+				<listitem>
+					<para>
+						Virtual List View control, with corresponding Base DN, Filter and Scope
+					</para>
+
+				</listitem>
+				 <listitem>
+					<para>
+						Server-Side Sorting control (SSS), with a corresponding list of attributes to use when sorting result entries.
+					</para>
+
+				</listitem>
+
+			</orderedlist>
+
+		</para>
+		 <para>
+			VLV along with SSS enables the pagination of search results, and circumvents the search limits for regular bind credentials.
+		</para>
+		 <procedure id="proc-Administrator_Guide-Using_Virtual_List_View_Control_for_Larger_Directory_Information_Trees-Configuring_VLV_and_SSS_on_389_Directory_Server">
+			<title>Configuring VLV and SSS on 389 Directory Server</title>
+			 <step>
+				<para>
+					A version of these scripts can be downloaded from <ulink url="http://hosted.kolabsys.com/~vanmeeuwen/kolab-scripts.tar.gz" />.
+				</para>
+				 <para>
+					Inclusion into the <application>kolab</application> command-line utility is planned, so make sure to check <command>kolab help</command> to see if the commands have been included already.
+				</para>
+
+			</step>
+			 <step>
+				<para>
+					In the following few steps, the scripts refer to the variables outlined below (which are contained in <filename>./settings.sh</filename>).
+				</para>
+				 
 <programlisting language="Bash">#!/bin/bash
 
 export rootdn="dc=example,dc=org"
@@ -73,12 +73,12 @@ export ldap_host="localhost"
 export ldap_binddn="cn=Directory Manager"
 export ldap_bindpw="VerySecret"</programlisting>
 
-            </step>
-            <step>
-                <para>
-                    Add the VLV Search definitions:
-                </para>
-
+			</step>
+			 <step>
+				<para>
+					Add the VLV Search definitions:
+				</para>
+				 
 <programlisting language="Bash">#!/bin/bash
 
  . ./settings.sh
@@ -119,12 +119,12 @@ export ldap_bindpw="VerySecret"</programlisting>
     echo ""
 ) | ldapadd -x -h ${ldap_host} -D "${ldap_binddn}" -w "${ldap_bindpw}" -c</programlisting>
 
-            </step>
-            <step>
-                <para>
-                    Add the VLV Indexes:
-                </para>
-
+			</step>
+			 <step>
+				<para>
+					Add the VLV Indexes:
+				</para>
+				 
 <programlisting language="Bash">#!/bin/bash
 
  . ./settings.sh
@@ -159,12 +159,12 @@ export ldap_bindpw="VerySecret"</programlisting>
     echo ""
 ) | ldapadd -x -h ${ldap_host} -D "${ldap_binddn}" -w "${ldap_bindpw}" -c</programlisting>
 
-            </step>
-            <step>
-                <para>
-                    Execute the indexing tasks:
-                </para>
-
+			</step>
+			 <step>
+				<para>
+					Execute the indexing tasks:
+				</para>
+				 
 <programlisting language="Bash">#!/bin/bash
 
  . ./settings.sh
@@ -241,12 +241,12 @@ while [ ${ldap_complete} -ne 1 ]; do
     fi
 done</programlisting>
 
-            </step>
-            <step>
-                <para>
-                    Test the VLV functioning with this detection and execution script:
-                </para>
-
+			</step>
+			 <step>
+				<para>
+					Test the VLV functioning with this detection and execution script:
+				</para>
+				 
 <programlisting language="Bash">#!/bin/bash
 
  . ./settings.sh
@@ -379,37 +379,37 @@ done</programlisting>
     fi
 done</programlisting>
 
-            </step>
-
-        </procedure>
-
-        <section id="sect-Administrator_Guide-Using_Virtual_List_View_Control_for_Larger_Directory_Information_Trees-Making_Use_of_VLV_and_SSS">
-            <title>Making Use of VLV and SSS</title>
-            <para>
-                See <xref linkend="sect-Administrator_Guide-Tweaking_Tips_for_Roundcube-Configuring_the_LDAP_Address_Book_for_Use_of_VLV_and_SSS" /> for instructions on configuring Roundcube to make use of VLV and SSS for its Global Address Book.
-            </para>
-
-        </section>
-
-
-    </section>
-
-    <section id="sect-Administrator_Guide-Tweaking_Tips_for_389_Directory_Server-Enforcing_Global_Attribute_Uniqueness">
-        <title>Enforcing (Global) Attribute Uniqueness</title>
-        <para>
-            para
-        </para>
-
-    </section>
-
-    <section id="sect-Administrator_Guide-Tweaking_Tips_for_389_Directory_Server-Enforcing_a_Password_Policy">
-        <title>Enforcing a Password Policy</title>
-        <para>
-            para
-        </para>
-
-    </section>
-
+			</step>
+
+		</procedure>
+		
+		 <section id="sect-Administrator_Guide-Using_Virtual_List_View_Control_for_Larger_Directory_Information_Trees-Making_Use_of_VLV_and_SSS">
+			<title>Making Use of VLV and SSS</title>
+			 <para>
+				See <xref linkend="sect-Administrator_Guide-Tweaking_Tips_for_Roundcube-Configuring_the_LDAP_Address_Book_for_Use_of_VLV_and_SSS" /> for instructions on configuring Roundcube to make use of VLV and SSS for its Global Address Book.
+			</para>
+
+		</section>
+		
+
+	</section>
+	
+	 <section id="sect-Administrator_Guide-Tweaking_Tips_for_389_Directory_Server-Enforcing_Global_Attribute_Uniqueness">
+		<title>Enforcing (Global) Attribute Uniqueness</title>
+		 <para>
+			para
+		</para>
+
+	</section>
+	
+	 <section id="sect-Administrator_Guide-Tweaking_Tips_for_389_Directory_Server-Enforcing_a_Password_Policy">
+		<title>Enforcing a Password Policy</title>
+		 <para>
+			para
+		</para>
+
+	</section>
+	
 
 </chapter>
 
diff --git a/Administrator_Guide/en-US/Tweaking_Tips_for_Cyrus_IMAP.xml b/Administrator_Guide/en-US/Tweaking_Tips_for_Cyrus_IMAP.xml
index 46bee2e..95ed08d 100644
--- a/Administrator_Guide/en-US/Tweaking_Tips_for_Cyrus_IMAP.xml
+++ b/Administrator_Guide/en-US/Tweaking_Tips_for_Cyrus_IMAP.xml
@@ -4,126 +4,126 @@
 %BOOK_ENTITIES;
 ]>
 <chapter id="chap-Administrator_Guide-Tweaking_Tips_for_Cyrus_IMAP">
-    <title>Tweaking Tips for Cyrus IMAP</title>
-    <para>
-        A default Kolab Groupware environment includes most if not all features that Cyrus IMAP offers, which is not necessarily optimal for all deployments. The sections in this chapter address some of the various opportunities to tweak settings for your deployment.
-    </para>
-    <section id="sect-Administrator_Guide-Tweaking_Tips_for_Cyrus_IMAP-Flushing_Seen_State">
-        <title>Flushing Seen State</title>
-        <para>
-            When users connect multiple clients to Cyrus IMAP, or when multiple users use the same mail folder that has shared seen state enabled, one client may be marking a message as \Seen, and another client may seem to take a while before it picks up on the message having been marked as read.
-        </para>
-        <para>
-            In a default deployment scenario, Cyrus IMAP keeps the flagging of messages from being flushed to disk immediately, which saves on disk I/O, making Cyrus IMAP more efficient in most deployment scenarios. If, however, you have the aforementioned situation occurring in your deployment, you may need to flush the seen state of messages to disk at the first opportunity.
-        </para>
-        <para>
-            In order to do so, execute
-        </para>
-        <procedure id="proc-Administrator_Guide-Flushing_Seen_State-Configuring_Cyrus_IMAP_to_Flush_the_Seen_State_to_Disk_Immediately">
-            <title>Configuring Cyrus IMAP to Flush the Seen State to Disk Immediately</title>
-            <step>
-                <para>
-                    Open up /etc/imapd.conf in your favorite editor
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Set (add the setting if not available already) <literal>flushseenstate</literal> to <literal>1</literal>.
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Restart the Cyrus IMAP service
-                </para>
-
-            </step>
-
-        </procedure>
-
-
-    </section>
-
-    <section id="sect-Administrator_Guide-Tweaking_Tips_for_Cyrus_IMAP-Disabling_the_Shared_Folders_Namespace">
-        <title>Disabling the "Shared Folders" Namespace</title>
-        <para>
-            para
-        </para>
-
-    </section>
-
-    <section id="sect-Administrator_Guide-Tweaking_Tips_for_Cyrus_IMAP-Speeding_Up_Authentication">
-        <title>Speeding Up Authentication</title>
-        <para>
-            para
-        </para>
-
-    </section>
-
-    <section id="sect-Administrator_Guide-Tweaking_Tips_for_Cyrus_IMAP-Full_text_Indexing_of_Mail_Folders">
-        <title>Full-text Indexing of Mail Folders</title>
-        <para>
-            para
-        </para>
-
-    </section>
-
-    <section id="sect-Administrator_Guide-Tweaking_Tips_for_Cyrus_IMAP-IMAP_Single_Instance_Store">
-        <title>IMAP Single Instance Store</title>
-        <para>
-            Cyrus IMAP allows for <emphasis>single instance store</emphasis> that de-duplicates messages being delivered to its mailboxes, but with a certain set of restrictions. This section addresses some of those restrictions and advises on parameters to tweak in Kolab to make optimal use of the feature.
-        </para>
-        <para>
-            Single instance store requires delivery of the message (through LMTP) in one single shot (a single LMTP session). For deployments that expect to have significant numbers of emails be sent to significant numbers of users through Kolab Distribution Groups, tweaking the Postfix settings <literal>lmtp_destination_concurrency_limit</literal> and <literal>lmtp_destination_concurrency_limit</literal> may be necessary.
-        </para>
-        <procedure id="proc-Administrator_Guide-IMAP_Single_Instance_Store-Example_of_Single_Instance_Store">
-            <title>Example of Single Instance Store</title>
-            <para>
-                The following example depicts a scenario in which single instance store can be shown in full force.
-            </para>
-            <step>
-                <para>
-                    Set the destination concurrency and recipient limits for LMTP to 1 (from a default 20):
-                </para>
-                <para>
-
+	<title>Tweaking Tips for Cyrus IMAP</title>
+	 <para>
+		A default Kolab Groupware environment includes most if not all features that Cyrus IMAP offers, which is not necessarily optimal for all deployments. The sections in this chapter address some of the various opportunities to tweak settings for your deployment.
+	</para>
+	 <section id="sect-Administrator_Guide-Tweaking_Tips_for_Cyrus_IMAP-Flushing_Seen_State">
+		<title>Flushing Seen State</title>
+		 <para>
+			When users connect multiple clients to Cyrus IMAP, or when multiple users use the same mail folder that has shared seen state enabled, one client may be marking a message as \Seen, and another client may seem to take a while before it picks up on the message having been marked as read.
+		</para>
+		 <para>
+			In a default deployment scenario, Cyrus IMAP keeps the flagging of messages from being flushed to disk immediately, which saves on disk I/O, making Cyrus IMAP more efficient in most deployment scenarios. If, however, you have the aforementioned situation occurring in your deployment, you may need to flush the seen state of messages to disk at the first opportunity.
+		</para>
+		 <para>
+			In order to do so, execute
+		</para>
+		 <procedure id="proc-Administrator_Guide-Flushing_Seen_State-Configuring_Cyrus_IMAP_to_Flush_the_Seen_State_to_Disk_Immediately">
+			<title>Configuring Cyrus IMAP to Flush the Seen State to Disk Immediately</title>
+			 <step>
+				<para>
+					Open up /etc/imapd.conf in your favorite editor
+				</para>
+
+			</step>
+			 <step>
+				<para>
+					Set (add the setting if not available already) <literal>flushseenstate</literal> to <literal>1</literal>.
+				</para>
+
+			</step>
+			 <step>
+				<para>
+					Restart the Cyrus IMAP service
+				</para>
+
+			</step>
+
+		</procedure>
+		
+
+	</section>
+	
+	 <section id="sect-Administrator_Guide-Tweaking_Tips_for_Cyrus_IMAP-Disabling_the_Shared_Folders_Namespace">
+		<title>Disabling the "Shared Folders" Namespace</title>
+		 <para>
+			para
+		</para>
+
+	</section>
+	
+	 <section id="sect-Administrator_Guide-Tweaking_Tips_for_Cyrus_IMAP-Speeding_Up_Authentication">
+		<title>Speeding Up Authentication</title>
+		 <para>
+			para
+		</para>
+
+	</section>
+	
+	 <section id="sect-Administrator_Guide-Tweaking_Tips_for_Cyrus_IMAP-Full_text_Indexing_of_Mail_Folders">
+		<title>Full-text Indexing of Mail Folders</title>
+		 <para>
+			para
+		</para>
+
+	</section>
+	
+	 <section id="sect-Administrator_Guide-Tweaking_Tips_for_Cyrus_IMAP-IMAP_Single_Instance_Store">
+		<title>IMAP Single Instance Store</title>
+		 <para>
+			Cyrus IMAP allows for <emphasis>single instance store</emphasis> that de-duplicates messages being delivered to its mailboxes, but with a certain set of restrictions. This section addresses some of those restrictions and advises on parameters to tweak in Kolab to make optimal use of the feature.
+		</para>
+		 <para>
+			Single instance store requires delivery of the message (through LMTP) in one single shot (a single LMTP session). For deployments that expect to have significant numbers of emails be sent to significant numbers of users through Kolab Distribution Groups, tweaking the Postfix settings <literal>lmtp_destination_concurrency_limit</literal> and <literal>lmtp_destination_concurrency_limit</literal> may be necessary.
+		</para>
+		 <procedure id="proc-Administrator_Guide-IMAP_Single_Instance_Store-Example_of_Single_Instance_Store">
+			<title>Example of Single Instance Store</title>
+			 <para>
+				The following example depicts a scenario in which single instance store can be shown in full force.
+			</para>
+			 <step>
+				<para>
+					Set the destination concurrency and recipient limits for LMTP to 1 (from a default 20):
+				</para>
+				 <para>
+					
 <screen># <userinput>postconf -e lmtp_destination_concurrency_limit=1</userinput>
 # <userinput>postconf -e lmtp_destination_recipient_limit=1</userinput>
 <userinput># service postfix reload</userinput></screen>
 
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Create a Kolab Distribution Group with 20 users.
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Send an email to the distribution group, such as:
-                </para>
-                <para>
-
+				</para>
+
+			</step>
+			 <step>
+				<para>
+					Create a Kolab Distribution Group with 20 users.
+				</para>
+
+			</step>
+			 <step>
+				<para>
+					Send an email to the distribution group, such as:
+				</para>
+				 <para>
+					
 <screen># <userinput>date | mail -s "single instance store test #1" kolab-users at example.org</userinput></screen>
 
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Await delivery of the mail message to all users.
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Examine the inode numbers (links) and the cumulative size on disk for the files.
-                </para>
-                <para>
-
+				</para>
+
+			</step>
+			 <step>
+				<para>
+					Await delivery of the mail message to all users.
+				</para>
+
+			</step>
+			 <step>
+				<para>
+					Examine the inode numbers (links) and the cumulative size on disk for the files.
+				</para>
+				 <para>
+					
 <screen># <userinput>cd /var/spool/imap/domain/e/example.org/</userinput>
 # <userinput>files=$(grep -lr "^Subject: single instance store test #1" \</userinput>
 > <userinput>$(find . -type f -name "*.") | sort -u)</userinput>
@@ -181,45 +181,45 @@ Modify: 2012-08-06 11:04:06.000000000 +0200
 Change: 2012-08-06 11:04:06.757235163 +0200
 </screen>
 
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Set the destination concurrency and recipient limits for LMTP back to the default 20:
-                </para>
-                <para>
+				</para>
 
+			</step>
+			 <step>
+				<para>
+					Set the destination concurrency and recipient limits for LMTP back to the default 20:
+				</para>
+				 <para>
+					
 <screen># <userinput>postconf -e lmtp_destination_concurrency_limit=20</userinput>
 # <userinput>postconf -e lmtp_destination_recipient_limit=20</userinput>
 <userinput># service postfix reload</userinput></screen>
 
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Send an email to the distribution group, such as:
-                </para>
-                <para>
+				</para>
 
+			</step>
+			 <step>
+				<para>
+					Send an email to the distribution group, such as:
+				</para>
+				 <para>
+					
 <screen># <userinput>date | mail -s "single instance store test #2" kolab-users at example.org</userinput></screen>
 
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Await delivery of the mail message to all users.
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Examine the inode numbers (links) and the cumulative size on disk for the files.
-                </para>
-                <para>
-
+				</para>
+
+			</step>
+			 <step>
+				<para>
+					Await delivery of the mail message to all users.
+				</para>
+
+			</step>
+			 <step>
+				<para>
+					Examine the inode numbers (links) and the cumulative size on disk for the files.
+				</para>
+				 <para>
+					
 <screen># <userinput>cd /var/spool/imap/domain/e/example.org/</userinput>
 # <userinput>files=$(grep -lr "^Subject: single instance store test #2" \</userinput>
 > <userinput>$(find . -type f -name "*.") | sort -u)</userinput>
@@ -257,15 +257,15 @@ Access: 2012-08-06 11:08:56.742891364 +0200
 Modify: 2012-08-06 11:08:28.000000000 +0200
 Change: 2012-08-06 11:08:28.760261876 +0200</screen>
 
-                </para>
-
-            </step>
-
-        </procedure>
+				</para>
 
+			</step>
 
-    </section>
+		</procedure>
+		
 
+	</section>
+	
 
 </chapter>
 
diff --git a/Administrator_Guide/en-US/Tweaking_Tips_for_Postfix.xml b/Administrator_Guide/en-US/Tweaking_Tips_for_Postfix.xml
index 04ce9b4..1ce978b 100644
--- a/Administrator_Guide/en-US/Tweaking_Tips_for_Postfix.xml
+++ b/Administrator_Guide/en-US/Tweaking_Tips_for_Postfix.xml
@@ -4,48 +4,52 @@
 %BOOK_ENTITIES;
 ]>
 <chapter id="chap-Administrator_Guide-Tweaking_Tips_for_Postfix">
-    <title>Tweaking Tips for Postfix</title>
-    <para>
-        para
-    </para>
-    <section id="sect-Administrator_Guide-Tweaking_Tips_for_Postfix-Large_Kolab_Distribution_Groups">
-        <title>Large Kolab Distribution Groups</title>
-        <para>
-            If you have Kolab distribution groups with many members, you may see the following message occur in log file <filename>/var/log/maillog</filename>:
-        </para>
-        <para>
-
+	<title>Tweaking Tips for Postfix</title>
+	 <para>
+		para
+	</para>
+	 <section id="sect-Administrator_Guide-Tweaking_Tips_for_Postfix-Large_Kolab_Distribution_Groups">
+		<title>Large Kolab Distribution Groups</title>
+		 <para>
+			If you have Kolab distribution groups with many members, you may see the following message occur in log file <filename>/var/log/maillog</filename>:
+		</para>
+		 <para>
+			
 <screen>Aug 17 10:21:59 kolab postfix/cleanup[5916]: warning: 398194A151: unreasonable virtual_alias_maps map expansion size for kolab-users at example.org</screen>
 
-        </para>
-        <para>
-            The setting <literal>virtual_alias_expansion_limit</literal> controls the maximum number of recipient address that are produced from a single original recipient address. The default depends on your installation.
-        </para>
-        <para>
-            To get the default value, execute:
-        </para>
-        <para>
-
+		</para>
+		 <para>
+			The setting <literal>virtual_alias_expansion_limit</literal> controls the maximum number of recipient address that are produced from a single original recipient address. The default depends on your installation.
+		</para>
+		 <para>
+			To get the default value, execute:
+		</para>
+		 <para>
+			
 <screen># <userinput>postconf -d virtual_alias_expansion_limit</userinput>
 1000</screen>
-        </para>
-        <para>
-            To get the current value, execute:
-        </para>
-        <para>
 
+		</para>
+		 <para>
+			To get the current value, execute:
+		</para>
+		 <para>
+			
 <screen># <userinput>postconf virtual_alias_expansion_limit</userinput>
 1000</screen>
-        </para>
-        <para>
-            To set a new value, execute:
-        </para>
-        <para>
 
+		</para>
+		 <para>
+			To set a new value, execute:
+		</para>
+		 <para>
+			
 <screen># <userinput>postconf -e virtual_alias_expansion_limit=10000</userinput></screen>
-        </para>
 
-    </section>
+		</para>
+
+	</section>
+	
 
 </chapter>
 
diff --git a/Administrator_Guide/en-US/Tweaking_Tips_for_Roundcube.xml b/Administrator_Guide/en-US/Tweaking_Tips_for_Roundcube.xml
index 89a1f97..6595358 100644
--- a/Administrator_Guide/en-US/Tweaking_Tips_for_Roundcube.xml
+++ b/Administrator_Guide/en-US/Tweaking_Tips_for_Roundcube.xml
@@ -4,180 +4,180 @@
 %BOOK_ENTITIES;
 ]>
 <chapter id="chap-Administrator_Guide-Tweaking_Tips_for_Roundcube">
-    <title>Tweaking Tips for Roundcube</title>
-    <para>
-        para
-    </para>
-    <section id="sect-Administrator_Guide-Tweaking_Tips_for_Roundcube-Setting_the_Maximum_Upload_Size">
-        <title>Setting the Maximum Upload Size</title>
-        <para>
-            para
-        </para>
-
-    </section>
-
-    <section id="sect-Administrator_Guide-Tweaking_Tips_for_Roundcube-Using_Memcached_for_Session_Storage">
-        <title>Using Memcached for Session Storage</title>
-        <para>
-            para
-        </para>
-
-    </section>
-
-    <section id="sect-Administrator_Guide-Tweaking_Tips_for_Roundcube-Using_APC_to_Accelerate_PHP">
-        <title>Using APC to Accelerate PHP</title>
-        <para>
-            para
-        </para>
-
-    </section>
-
-    <section id="sect-Administrator_Guide-Tweaking_Tips_for_Roundcube-Configuring_the_LDAP_Address_Book_for_Use_of_VLV_and_SSS">
-        <title>Configuring the LDAP Address Book for Use of VLV and SSS</title>
-        <para>
-            With a large directory information tree (as described in <xref linkend="sect-Administrator_Guide-Tweaking_Tips_for_389_Directory_Server-Using_Virtual_List_View_Control_for_Larger_Directory_Information_Trees" />), having set up VLV and SSS (see <xref linkend="proc-Administrator_Guide-Using_Virtual_List_View_Control_for_Larger_Directory_Information_Trees-Configuring_VLV_and_SSS_on_389_Directory_Server" />), Roundcube must still be configured to make use of the new settings.
-        </para>
-        <procedure id="proc-Administrator_Guide-Configuring_the_LDAP_Address_Book_for_Use_of_VLV_and_SSS-Configuring_the_LDAP_Address_Book_for_VLV_and_SSS">
-            <title>Configuring the LDAP Address Book for VLV and SSS</title>
-            <step>
-                <para>
-                    Relevant settings are contained within the <literal>$rcmail_config['ldap_public']['kolab_addressbook']</literal> setting in <filename>/etc/roundcubemail/main.inc.php</filename>. Working from a default Kolab Groupware installation, we are going to verify and/or change the relevant settings one by one.
-                </para>
-
-            </step>
-            <step>
-                <formalpara id="form-Administrator_Guide-Configuring_the_LDAP_Address_Book_for_VLV_and_SSS-base_dn">
-                    <title><literal>base_dn</literal></title>
-                    <para>
-                        The <literal>base_dn</literal> configured in the address book should match the Base DN configured for the People VLV Search.
-                    </para>
-
-                </formalpara>
-                <para>
-                    Should you not have modified the configuration deployed by default too much, then the likely appropriate value for this setting is <literal>ou=People,${rootdn}</literal>
-                </para>
-
-            </step>
-            <step>
-                <formalpara id="form-Administrator_Guide-Configuring_the_LDAP_Address_Book_for_VLV_and_SSS-filter">
-                    <title><literal>filter</literal></title>
-                    <para>
-                        The <literal>filter</literal> configured in the address book should match the search filter configured for the People VLV Search.
-                    </para>
-
-                </formalpara>
-                <para>
-                    By default, all LDAP entries with object class <literal>inetOrgPerson</literal> are included.
-                </para>
-
-            </step>
-            <step>
-                <formalpara id="form-Administrator_Guide-Configuring_the_LDAP_Address_Book_for_VLV_and_SSS-scope">
-                    <title><literal>scope</literal></title>
-                    <para>
-                        The <literal>scope</literal> configured in the address book should match the search scope configured for the People VLV Search.
-                    </para>
-
-                </formalpara>
-                <para>
-                    para
-                </para>
-
-            </step>
-            <step>
-                <formalpara id="form-Administrator_Guide-Configuring_the_LDAP_Address_Book_for_VLV_and_SSS-sort">
-                    <title><literal>sort</literal></title>
-                    <para>
-                        The <literal>sort</literal> setting is an array, that must contain the exact list of elements configured in the vlv sort configured for the People VLV Index.
-                    </para>
-
-                </formalpara>
-                <para>
-                    para
-                </para>
-
-            </step>
-            <step>
-                <formalpara id="form-Administrator_Guide-Configuring_the_LDAP_Address_Book_for_VLV_and_SSS-vlv">
-                    <title><literal>vlv</literal></title>
-                    <para>
-                        This setting controls whether VLV is to be used at all. Set it to <literal>true</literal>.
-                    </para>
-
-                </formalpara>
-
-            </step>
-            <step>
-                <formalpara id="form-Administrator_Guide-Configuring_the_LDAP_Address_Book_for_VLV_and_SSS-vlv_search">
-                    <title><literal>vlv_search</literal></title>
-                    <para>
-                        This setting controls whether searches are to use VLV and SSS as well. More specifically, this influences auto-completion such as during the composition of new messages, adding participants to events, and adding ACL entries in folder management.
-                    </para>
-
-                </formalpara>
-                <para>
-                    para
-                </para>
-
-            </step>
-            <step>
-                <formalpara id="form-Administrator_Guide-Configuring_the_LDAP_Address_Book_for_VLV_and_SSS-groups_Array_base_dn">
-                    <title><literal>groups</literal> Array <literal>base_dn</literal></title>
-                    <para>
-                        para
-                    </para>
-
-                </formalpara>
-                <para>
-                    para
-                </para>
-
-            </step>
-            <step>
-                <formalpara id="form-Administrator_Guide-Configuring_the_LDAP_Address_Book_for_VLV_and_SSS-groups_Array_filter">
-                    <title><literal>groups</literal> Array <literal>filter</literal></title>
-                    <para>
-                        para
-                    </para>
-
-                </formalpara>
-                <para>
-                    para
-                </para>
-
-            </step>
-            <step>
-                <formalpara id="form-Administrator_Guide-Configuring_the_LDAP_Address_Book_for_VLV_and_SSS-groups_Array_scope">
-                    <title><literal>groups</literal> Array <literal>scope</literal></title>
-                    <para>
-                        para
-                    </para>
-
-                </formalpara>
-                <para>
-                    para
-                </para>
-
-            </step>
-            <step>
-                <formalpara id="form-Administrator_Guide-Configuring_the_LDAP_Address_Book_for_VLV_and_SSS-groups_Array_sort">
-                    <title><literal>groups</literal> Array <literal>sort</literal></title>
-                    <para>
-                        para
-                    </para>
-
-                </formalpara>
-                <para>
-                    para
-                </para>
-
-            </step>
-
-        </procedure>
-
-
-    </section>
-
+	<title>Tweaking Tips for Roundcube</title>
+	 <para>
+		para
+	</para>
+	 <section id="sect-Administrator_Guide-Tweaking_Tips_for_Roundcube-Setting_the_Maximum_Upload_Size">
+		<title>Setting the Maximum Upload Size</title>
+		 <para>
+			para
+		</para>
+
+	</section>
+	
+	 <section id="sect-Administrator_Guide-Tweaking_Tips_for_Roundcube-Using_Memcached_for_Session_Storage">
+		<title>Using Memcached for Session Storage</title>
+		 <para>
+			para
+		</para>
+
+	</section>
+	
+	 <section id="sect-Administrator_Guide-Tweaking_Tips_for_Roundcube-Using_APC_to_Accelerate_PHP">
+		<title>Using APC to Accelerate PHP</title>
+		 <para>
+			para
+		</para>
+
+	</section>
+	
+	 <section id="sect-Administrator_Guide-Tweaking_Tips_for_Roundcube-Configuring_the_LDAP_Address_Book_for_Use_of_VLV_and_SSS">
+		<title>Configuring the LDAP Address Book for Use of VLV and SSS</title>
+		 <para>
+			With a large directory information tree (as described in <xref linkend="sect-Administrator_Guide-Tweaking_Tips_for_389_Directory_Server-Using_Virtual_List_View_Control_for_Larger_Directory_Information_Trees" />), having set up VLV and SSS (see <xref linkend="proc-Administrator_Guide-Using_Virtual_List_View_Control_for_Larger_Directory_Information_Trees-Configuring_VLV_and_SSS_on_389_Directory_Server" />), Roundcube must still be configured to make use of the new settings.
+		</para>
+		 <procedure id="proc-Administrator_Guide-Configuring_the_LDAP_Address_Book_for_Use_of_VLV_and_SSS-Configuring_the_LDAP_Address_Book_for_VLV_and_SSS">
+			<title>Configuring the LDAP Address Book for VLV and SSS</title>
+			 <step>
+				<para>
+					Relevant settings are contained within the <literal>$rcmail_config['ldap_public']['kolab_addressbook']</literal> setting in <filename>/etc/roundcubemail/main.inc.php</filename>. Working from a default Kolab Groupware installation, we are going to verify and/or change the relevant settings one by one.
+				</para>
+
+			</step>
+			 <step>
+				<formalpara id="form-Administrator_Guide-Configuring_the_LDAP_Address_Book_for_VLV_and_SSS-base_dn">
+					<title><literal>base_dn</literal></title>
+					 <para>
+						The <literal>base_dn</literal> configured in the address book should match the Base DN configured for the People VLV Search.
+					</para>
+
+				</formalpara>
+				 <para>
+					Should you not have modified the configuration deployed by default too much, then the likely appropriate value for this setting is <literal>ou=People,${rootdn}</literal>
+				</para>
+
+			</step>
+			 <step>
+				<formalpara id="form-Administrator_Guide-Configuring_the_LDAP_Address_Book_for_VLV_and_SSS-filter">
+					<title><literal>filter</literal></title>
+					 <para>
+						The <literal>filter</literal> configured in the address book should match the search filter configured for the People VLV Search.
+					</para>
+
+				</formalpara>
+				 <para>
+					By default, all LDAP entries with object class <literal>inetOrgPerson</literal> are included.
+				</para>
+
+			</step>
+			 <step>
+				<formalpara id="form-Administrator_Guide-Configuring_the_LDAP_Address_Book_for_VLV_and_SSS-scope">
+					<title><literal>scope</literal></title>
+					 <para>
+						The <literal>scope</literal> configured in the address book should match the search scope configured for the People VLV Search.
+					</para>
+
+				</formalpara>
+				 <para>
+					para
+				</para>
+
+			</step>
+			 <step>
+				<formalpara id="form-Administrator_Guide-Configuring_the_LDAP_Address_Book_for_VLV_and_SSS-sort">
+					<title><literal>sort</literal></title>
+					 <para>
+						The <literal>sort</literal> setting is an array, that must contain the exact list of elements configured in the vlv sort configured for the People VLV Index.
+					</para>
+
+				</formalpara>
+				 <para>
+					para
+				</para>
+
+			</step>
+			 <step>
+				<formalpara id="form-Administrator_Guide-Configuring_the_LDAP_Address_Book_for_VLV_and_SSS-vlv">
+					<title><literal>vlv</literal></title>
+					 <para>
+						This setting controls whether VLV is to be used at all. Set it to <literal>true</literal>.
+					</para>
+
+				</formalpara>
+
+			</step>
+			 <step>
+				<formalpara id="form-Administrator_Guide-Configuring_the_LDAP_Address_Book_for_VLV_and_SSS-vlv_search">
+					<title><literal>vlv_search</literal></title>
+					 <para>
+						This setting controls whether searches are to use VLV and SSS as well. More specifically, this influences auto-completion such as during the composition of new messages, adding participants to events, and adding ACL entries in folder management.
+					</para>
+
+				</formalpara>
+				 <para>
+					para
+				</para>
+
+			</step>
+			 <step>
+				<formalpara id="form-Administrator_Guide-Configuring_the_LDAP_Address_Book_for_VLV_and_SSS-groups_Array_base_dn">
+					<title><literal>groups</literal> Array <literal>base_dn</literal></title>
+					 <para>
+						para
+					</para>
+
+				</formalpara>
+				 <para>
+					para
+				</para>
+
+			</step>
+			 <step>
+				<formalpara id="form-Administrator_Guide-Configuring_the_LDAP_Address_Book_for_VLV_and_SSS-groups_Array_filter">
+					<title><literal>groups</literal> Array <literal>filter</literal></title>
+					 <para>
+						para
+					</para>
+
+				</formalpara>
+				 <para>
+					para
+				</para>
+
+			</step>
+			 <step>
+				<formalpara id="form-Administrator_Guide-Configuring_the_LDAP_Address_Book_for_VLV_and_SSS-groups_Array_scope">
+					<title><literal>groups</literal> Array <literal>scope</literal></title>
+					 <para>
+						para
+					</para>
+
+				</formalpara>
+				 <para>
+					para
+				</para>
+
+			</step>
+			 <step>
+				<formalpara id="form-Administrator_Guide-Configuring_the_LDAP_Address_Book_for_VLV_and_SSS-groups_Array_sort">
+					<title><literal>groups</literal> Array <literal>sort</literal></title>
+					 <para>
+						para
+					</para>
+
+				</formalpara>
+				 <para>
+					para
+				</para>
+
+			</step>
+
+		</procedure>
+		
+
+	</section>
+	
 
 </chapter>
 
diff --git a/Administrator_Guide/en-US/Upgrading_Accounts_from_Kolab_Format_version_2.xml b/Administrator_Guide/en-US/Upgrading_Accounts_from_Kolab_Format_version_2.xml
index c22bdc0..a7b7fb1 100644
--- a/Administrator_Guide/en-US/Upgrading_Accounts_from_Kolab_Format_version_2.xml
+++ b/Administrator_Guide/en-US/Upgrading_Accounts_from_Kolab_Format_version_2.xml
@@ -4,17 +4,17 @@
 %BOOK_ENTITIES;
 ]>
 <chapter id="chap-Administrator_Guide-Upgrading_Accounts_from_Kolab_Format_version_2">
-    <title>Upgrading Accounts from Kolab Format version 2</title>
-    <para>
-        Upgrading the existing accounts from a Kolab 2 server to a Kolab 3 server is a question of upgrading the server itself, but also upgrading the format from Kolab XML format version 2, to Kolab XML Format version 3.
-    </para>
-    <para>
-        Upgrading the server itself is documented in a different chapter (TODO, link to that chapter). This chapter concerns the upgrading of IMAP Accounts from the Kolab v2 format to the Kolab v3 format.
-    </para>
-    <para>
-        imapsync --host1 kolab2.example.org --tls1 --authuser1 john.doe at example.org --user1 cyrus-admin --proxyauth1 --password1 Welcome2KolabSystems --host2 kolab3.example.org --tls2 --authuser2 john.doe at example.org --user2 cyrus-admin --proxyauth2 --password2 Welcome2KolabSystems --include="INBOX"
-    </para>
-
+	<title>Upgrading Accounts from Kolab Format version 2</title>
+	 <para>
+		Upgrading the existing accounts from a Kolab 2 server to a Kolab 3 server is a question of upgrading the server itself, but also upgrading the format from Kolab XML format version 2, to Kolab XML Format version 3.
+	</para>
+	 <para>
+		Upgrading the server itself is documented in a different chapter (TODO, link to that chapter). This chapter concerns the upgrading of IMAP Accounts from the Kolab v2 format to the Kolab v3 format.
+	</para>
+	 <para>
+		imapsync --host1 kolab2.example.org --tls1 --authuser1 john.doe at example.org --user1 cyrus-admin --proxyauth1 --password1 Welcome2KolabSystems --host2 kolab3.example.org --tls2 --authuser2 john.doe at example.org --user2 cyrus-admin --proxyauth2 --password2 Welcome2KolabSystems --include="INBOX"
+	</para>
+	 
 <programlisting language="Bash">#!/bin/bash
 
 kolab -c /etc/kolab/kolab2.conf list-mailbox-acls user/*@example.org | \
@@ -33,36 +33,36 @@ kolab -c /etc/kolab/kolab2.conf list-mailbox-acls user/*@example.org | \
                 "${aci_permissions}"
         fi
     done</programlisting>
-    <para>
-        warning about --useuid
-    </para>
-    <para>
-        rsync -aHvz --progress --partial --exclude="Archive/" --exclude="Administrativia/" --exclude="Bugzilla/" --exclude="Ham/" --exclude="Spam/" root at kolab.kolabsys.com:/kolab/var/imapd/spool/domain/k/kolabsys.com/v/user/vanmeeuwen/ /var/spool/imap/domain/k/kolabsys.com/v/user/vanmeeuwen/
-    </para>
-    <para>
-        /kolab/var/imapd/domain/k/kolabsys.com/user/v/vanmeeuwen.seen
-    </para>
-    <para>
-        /kolab/var/imapd/domain/k/kolabsys.com/user/v/vanmeeuwen.sub
-    </para>
-    <procedure id="proc-Administrator_Guide-Upgrading_Accounts_from_Kolab_Format_version_2-Synchronizing_IMAP_Accounts_using_Offlineimap">
-        <title>Synchronizing IMAP Accounts using Offlineimap</title>
-        <step>
-            <para>
-                Obtain the SSL certificate fingerprints needed with the following command:
-            </para>
-            <para>
-
+	 <para>
+		warning about --useuid
+	</para>
+	 <para>
+		rsync -aHvz --progress --partial --exclude="Archive/" --exclude="Administrativia/" --exclude="Bugzilla/" --exclude="Ham/" --exclude="Spam/" root at kolab.kolabsys.com:/kolab/var/imapd/spool/domain/k/kolabsys.com/v/user/vanmeeuwen/ /var/spool/imap/domain/k/kolabsys.com/v/user/vanmeeuwen/
+	</para>
+	 <para>
+		/kolab/var/imapd/domain/k/kolabsys.com/user/v/vanmeeuwen.seen
+	</para>
+	 <para>
+		/kolab/var/imapd/domain/k/kolabsys.com/user/v/vanmeeuwen.sub
+	</para>
+	 <procedure id="proc-Administrator_Guide-Upgrading_Accounts_from_Kolab_Format_version_2-Synchronizing_IMAP_Accounts_using_Offlineimap">
+		<title>Synchronizing IMAP Accounts using Offlineimap</title>
+		 <step>
+			<para>
+				Obtain the SSL certificate fingerprints needed with the following command:
+			</para>
+			 <para>
+				
 <screen># <userinput>openssl x509 -fingerprint \</userinput>
 > <userinput>-in /etc/pki/cyrus-imapd/cyrus-imapd.pem | head -n 1</userinput></screen>
 
-            </para>
-
-        </step>
-
-    </procedure>
+			</para>
 
+		</step>
 
+	</procedure>
+	
+	 
 <programlisting language="INI Files">[general]
 metadata = ~/.offlineimap
 accounts = kolab2to3
diff --git a/Administrator_Guide/en-US/Upgrading_Cyrus_IMAP_from_2.3_to_2.4.xml b/Administrator_Guide/en-US/Upgrading_Cyrus_IMAP_from_2.3_to_2.4.xml
index 3151c27..0bd1aa7 100644
--- a/Administrator_Guide/en-US/Upgrading_Cyrus_IMAP_from_2.3_to_2.4.xml
+++ b/Administrator_Guide/en-US/Upgrading_Cyrus_IMAP_from_2.3_to_2.4.xml
@@ -4,118 +4,118 @@
 %BOOK_ENTITIES;
 ]>
 <chapter id="chap-Administrator_Guide-Upgrading_Cyrus_IMAP_from_2.3_to_2.4">
-    <title>Upgrading Cyrus IMAP from 2.3 to 2.4</title>
-    <para>
-        As a seperate set of procedures, we have documented for you, the process of upgrading Cyrus IMAP 2.3 to Cyrus IMAP 2.4 on the same server system. This process involves getting some information out of Cyrus IMAP 2.3 before shutting it down and upgrading Cyrus IMAP 2.3 to 2.4.
-    </para>
-    <procedure id="proc-Administrator_Guide-Upgrading_Cyrus_IMAP_from_2.3_to_2.4-Preparations">
-        <title>Preparations</title>
-        <step>
-            <para>
-                During the migration, the Kolab 2 server cannot be allowed to;
-            </para>
-            <para>
-                <orderedlist>
-                    <listitem>
-                        <para>
-                            Receive new email.
-                        </para>
-
-                    </listitem>
-                    <listitem>
-                        <para>
-                            Let users post/submit new data.
-                        </para>
-
-                    </listitem>
-
-                </orderedlist>
-
-            </para>
-            <para>
-                The easiest way to prevent any of this happening is to shut down the MTA and restrict access to the IMAP and POP services through firewalling.
-            </para>
-
-        </step>
-        <step>
-            <para>
-                Remember to create a backup of the data.
-            </para>
-
-        </step>
-
-    </procedure>
-
-    <procedure id="proc-Administrator_Guide-Upgrading_Cyrus_IMAP_from_2.3_to_2.4-Upgrading_to_Cyrus_IMAP_2.4">
-        <title>Upgrading to Cyrus IMAP 2.4</title>
-        <step>
-            <para>
-                List the existing folder annotations, and save them to a file:
-            </para>
-            <para>
-
+	<title>Upgrading Cyrus IMAP from 2.3 to 2.4</title>
+	 <para>
+		As a seperate set of procedures, we have documented for you, the process of upgrading Cyrus IMAP 2.3 to Cyrus IMAP 2.4 on the same server system. This process involves getting some information out of Cyrus IMAP 2.3 before shutting it down and upgrading Cyrus IMAP 2.3 to 2.4.
+	</para>
+	 <procedure id="proc-Administrator_Guide-Upgrading_Cyrus_IMAP_from_2.3_to_2.4-Preparations">
+		<title>Preparations</title>
+		 <step>
+			<para>
+				During the migration, the Kolab 2 server cannot be allowed to;
+			</para>
+			 <para>
+				<orderedlist>
+					<listitem>
+						<para>
+							Receive new email.
+						</para>
+
+					</listitem>
+					 <listitem>
+						<para>
+							Let users post/submit new data.
+						</para>
+
+					</listitem>
+
+				</orderedlist>
+
+			</para>
+			 <para>
+				The easiest way to prevent any of this happening is to shut down the MTA and restrict access to the IMAP and POP services through firewalling.
+			</para>
+
+		</step>
+		 <step>
+			<para>
+				Remember to create a backup of the data.
+			</para>
+
+		</step>
+
+	</procedure>
+	
+	 <procedure id="proc-Administrator_Guide-Upgrading_Cyrus_IMAP_from_2.3_to_2.4-Upgrading_to_Cyrus_IMAP_2.4">
+		<title>Upgrading to Cyrus IMAP 2.4</title>
+		 <step>
+			<para>
+				List the existing folder annotations, and save them to a file:
+			</para>
+			 <para>
+				
 <screen># <userinput>kolab list-mailbox-metadata \</userinput>
 > <userinput>"user/*@example.org" > metadata.txt</userinput>
 # <userinput>kolab list-mailbox-metadata \</userinput>
 > <userinput>"shared/*@example.org" >> metadata.txt</userinput></screen>
 
-            </para>
-
-        </step>
-        <step>
-            <para>
-                Stop the Cyrus IMAP 2.3 service.
-            </para>
-
-        </step>
-        <step>
-            <para>
-                Convert the annotations database to flat. This example converts the database from skiplist:
-            </para>
-            <para>
-
+			</para>
+
+		</step>
+		 <step>
+			<para>
+				Stop the Cyrus IMAP 2.3 service.
+			</para>
+
+		</step>
+		 <step>
+			<para>
+				Convert the annotations database to flat. This example converts the database from skiplist:
+			</para>
+			 <para>
+				
 <screen># <userinput>/path/to/cvt_cyrusdb /path/to/annotations.db skiplist /path/to/annotations.txt flat</userinput></screen>
 
-            </para>
-
-        </step>
-        <step>
-            <para>
-                Copy both annotations.db and annotations.txt to a safe location.
-            </para>
-
-        </step>
-        <step>
-            <para>
-                Upgrade to Cyrus IMAP 2.4.
-            </para>
-
-        </step>
-        <xi:include href="step-convert-seen-databases.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-        <step>
-            <para>
-                Start the Cyrus IMAP 2.4 service:
-            </para>
-            <para>
-
+			</para>
+
+		</step>
+		 <step>
+			<para>
+				Copy both annotations.db and annotations.txt to a safe location.
+			</para>
+
+		</step>
+		 <step>
+			<para>
+				Upgrade to Cyrus IMAP 2.4.
+			</para>
+
+		</step>
+		 <xi:include href="step-convert-seen-databases.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+		 <step>
+			<para>
+				Start the Cyrus IMAP 2.4 service:
+			</para>
+			 <para>
+				
 <screen># <userinput>service cyrus-imapd start</userinput></screen>
 
-            </para>
-            <important>
-                <para>
-                    Users should not yet be allowed to interact with the system at this point. We suggest closing access to the system through the firewall.
-                </para>
-
-            </important>
-
-        </step>
-        <xi:include href="step-select-all-mailboxes.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-        <step>
-            <para>
-                Verify annotations have been preserved:
-            </para>
-            <para>
-
+			</para>
+			 <important>
+				<para>
+					Users should not yet be allowed to interact with the system at this point. We suggest closing access to the system through the firewall.
+				</para>
+
+			</important>
+
+		</step>
+		 <xi:include href="step-select-all-mailboxes.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+		 <step>
+			<para>
+				Verify annotations have been preserved:
+			</para>
+			 <para>
+				
 <screen># <userinput>kolab -c conf/kolab-kolab2.example.org.conf \</userinput>
 > <userinput>list-mailbox-metadata "user/john.doe/Calendar*@example.org"</userinput>
 Folder user/john.doe/Calendar at example.org
@@ -159,11 +159,11 @@ Folder user/john.doe/Calendar/Private at example.org
   /shared/vendor/cmu/cyrus-imapd/size               305426
   /shared/vendor/cmu/cyrus-imapd/sharedseen         false</screen>
 
-            </para>
-            <para>
-                If not, like in the example, use the previously saved <filename>metadata.txt</filename> to restore the annotations:
-            </para>
-
+			</para>
+			 <para>
+				If not, like in the example, use the previously saved <filename>metadata.txt</filename> to restore the annotations:
+			</para>
+			 
 <programlisting language="Bash">#!/bin/bash
 
 # Interesting Annotations
@@ -203,10 +203,10 @@ cat metadata.txt | \
         fi
     done</programlisting>
 
-        </step>
-
-    </procedure>
+		</step>
 
+	</procedure>
+	
 
 </chapter>
 
diff --git a/Administrator_Guide/en-US/Upgrading_from_Kolab_2_on_OpenPKG.xml b/Administrator_Guide/en-US/Upgrading_from_Kolab_2_on_OpenPKG.xml
index d518b19..f1097c4 100644
--- a/Administrator_Guide/en-US/Upgrading_from_Kolab_2_on_OpenPKG.xml
+++ b/Administrator_Guide/en-US/Upgrading_from_Kolab_2_on_OpenPKG.xml
@@ -4,169 +4,169 @@
 %BOOK_ENTITIES;
 ]>
 <chapter id="chap-Administrator_Guide-Upgrading_from_Kolab_2_on_OpenPKG">
-    <title>Upgrading from Kolab 2 on OpenPKG</title>
-    <para>
-        As Kolab Groupware used to be distributed as an OpenPKG stack, with different locations for files, the upgrade of a Kolab 2 server to a Kolab 3 server is a largely manual process.
-    </para>
-    <note>
-        <para>
-            The Kolab 3 server used here has been set up for the same domain name space as the Kolab 2 server. No users have been created on the Kolab 3 server.
-        </para>
-
-    </note>
-    <para>
-        <literal>kolab2.example.org</literal> refers to the Kolab 2 server, <literal>kolab3.example.org</literal> refers to the Kolab 3 server.
-    </para>
-    <procedure id="proc-Administrator_Guide-Upgrading_from_Kolab_2_on_OpenPKG-Preparations">
-        <title>Preparations</title>
-        <step>
-            <para>
-                During the migration, the Kolab 2 server cannot be allowed to;
-            </para>
-            <para>
-                <orderedlist>
-                    <listitem>
-                        <para>
-                            Receive new email.
-                        </para>
-
-                    </listitem>
-                    <listitem>
-                        <para>
-                            Let users post/submit new data.
-                        </para>
-
-                    </listitem>
-
-                </orderedlist>
-
-            </para>
-            <para>
-                The easiest way to prevent any of this happening is to shut down all Kolab Groupware related services on <literal>kolab2.example.org</literal>:
-            </para>
-            <para>
-
+	<title>Upgrading from Kolab 2 on OpenPKG</title>
+	 <para>
+		As Kolab Groupware used to be distributed as an OpenPKG stack, with different locations for files, the upgrade of a Kolab 2 server to a Kolab 3 server is a largely manual process.
+	</para>
+	 <note>
+		<para>
+			The Kolab 3 server used here has been set up for the same domain name space as the Kolab 2 server. No users have been created on the Kolab 3 server.
+		</para>
+
+	</note>
+	 <para>
+		<literal>kolab2.example.org</literal> refers to the Kolab 2 server, <literal>kolab3.example.org</literal> refers to the Kolab 3 server.
+	</para>
+	 <procedure id="proc-Administrator_Guide-Upgrading_from_Kolab_2_on_OpenPKG-Preparations">
+		<title>Preparations</title>
+		 <step>
+			<para>
+				During the migration, the Kolab 2 server cannot be allowed to;
+			</para>
+			 <para>
+				<orderedlist>
+					<listitem>
+						<para>
+							Receive new email.
+						</para>
+
+					</listitem>
+					 <listitem>
+						<para>
+							Let users post/submit new data.
+						</para>
+
+					</listitem>
+
+				</orderedlist>
+
+			</para>
+			 <para>
+				The easiest way to prevent any of this happening is to shut down all Kolab Groupware related services on <literal>kolab2.example.org</literal>:
+			</para>
+			 <para>
+				
 <screen># <userinput>/kolab/bin/openpkg rc stop all</userinput></screen>
 
-            </para>
-
-        </step>
-        <step>
-            <para>
-                Create a backup of the data from <literal>kolab2.example.org</literal>.
-            </para>
-
-        </step>
-        <step>
-            <para>
-                Shut down the Cyrus IMAP service on <literal>kolab3.example.org</literal>:
-            </para>
-            <para>
-
+			</para>
+
+		</step>
+		 <step>
+			<para>
+				Create a backup of the data from <literal>kolab2.example.org</literal>.
+			</para>
+
+		</step>
+		 <step>
+			<para>
+				Shut down the Cyrus IMAP service on <literal>kolab3.example.org</literal>:
+			</para>
+			 <para>
+				
 <screen># <userinput>service cyrus-imapd stop</userinput></screen>
 
-            </para>
-
-        </step>
-        <step>
-            <para>
-                Shut down the Kolab daemon on <literal>kolab3.example.org</literal>:
-            </para>
-            <para>
+			</para>
 
+		</step>
+		 <step>
+			<para>
+				Shut down the Kolab daemon on <literal>kolab3.example.org</literal>:
+			</para>
+			 <para>
+				
 <screen># <userinput>service kolabd stop</userinput></screen>
 
-            </para>
-
-        </step>
-        <step>
-            <para>
-                Update the settings related to the recipient policy in <filename>/etc/kolab/kolab.conf</filename>. The following settings are important:
-            </para>
-            <para>
-                <itemizedlist>
-                    <listitem>
-                        <para>
-                            The <literal>primary_mail</literal> setting in the <literal>[<replaceable>$domain</replaceable>]</literal> section.
-                        </para>
-                        <para>
-                            The policy MUST<footnote> <para>
-                                the policy enforces consistency in the <literal>mail</literal> attribute values for all users - and therefore mailbox names, and ACL entry subject validity
-                            </para>
-                            </footnote> either match the former convention used, if any, or not be enabled at all. See <xref linkend="exam-Administrator_Guide-Upgrading_from_Kolab_2_on_OpenPKG-Example_Migration_of_example.org" /> for an example and some more gotchas.
-                        </para>
-                        <important>
-                            <para>
-                                In case the recipient policy is not to be applied, consider updating the <literal>user_types</literal> as per the instructions in <xref linkend="sect-Administrator_Guide-Kolab_Web_Administration_Panel-Editing_user_types" />.
-                            </para>
-
-                        </important>
-
-                    </listitem>
-                    <listitem>
-                        <para>
-                            The <literal>secondary_mail</literal> setting in the <literal>[<replaceable>$domain</replaceable>]</literal> section.
-                        </para>
-                        <para>
-                            This part of the policy does not apply should the <literal>primary_mail</literal> setting already have been disabled.
-                        </para>
-
-                    </listitem>
-
-                </itemizedlist>
-
-            </para>
-
-        </step>
-
-    </procedure>
-
-    <example id="exam-Administrator_Guide-Upgrading_from_Kolab_2_on_OpenPKG-Example_Migration_of_example.org">
-        <title>Example Migration of example.org</title>
-        <para>
-            Our first example has had a running Kolab 2.3 on OpenPKG server, with a general email address convention of "surname"@example.org.
-        </para>
-        <para>
-            By default, a Kolab &PRODUCT_VERSION; Groupware server will apply a recipient policy for the <literal>mail</literal> attribute value of "givenname"."surname"@example.org. The recipient policy must therefore be adjusted.
-        </para>
-        <para>
-            In the <literal>[example.org]</literal> section in <filename>/etc/kolab/kolab.conf</filename>, the <literal>primary_mail</literal> setting must be adjusted to match the "surname"@example.org convention:
-        </para>
-
+			</para>
+
+		</step>
+		 <step>
+			<para>
+				Update the settings related to the recipient policy in <filename>/etc/kolab/kolab.conf</filename>. The following settings are important:
+			</para>
+			 <para>
+				<itemizedlist>
+					<listitem>
+						<para>
+							The <literal>primary_mail</literal> setting in the <literal>[<replaceable>$domain</replaceable>]</literal> section.
+						</para>
+						 <para>
+							The policy MUST<footnote> <para>
+								the policy enforces consistency in the <literal>mail</literal> attribute values for all users - and therefore mailbox names, and ACL entry subject validity
+							</para>
+							 </footnote> either match the former convention used, if any, or not be enabled at all. See <xref linkend="exam-Administrator_Guide-Upgrading_from_Kolab_2_on_OpenPKG-Example_Migration_of_example.org" /> for an example and some more gotchas.
+						</para>
+						 <important>
+							<para>
+								In case the recipient policy is not to be applied, consider updating the <literal>user_types</literal> as per the instructions in <xref linkend="sect-Administrator_Guide-Kolab_Web_Administration_Panel-Editing_user_types" />.
+							</para>
+
+						</important>
+
+					</listitem>
+					 <listitem>
+						<para>
+							The <literal>secondary_mail</literal> setting in the <literal>[<replaceable>$domain</replaceable>]</literal> section.
+						</para>
+						 <para>
+							This part of the policy does not apply should the <literal>primary_mail</literal> setting already have been disabled.
+						</para>
+
+					</listitem>
+
+				</itemizedlist>
+
+			</para>
+
+		</step>
+
+	</procedure>
+	
+	 <example id="exam-Administrator_Guide-Upgrading_from_Kolab_2_on_OpenPKG-Example_Migration_of_example.org">
+		<title>Example Migration of example.org</title>
+		 <para>
+			Our first example has had a running Kolab 2.3 on OpenPKG server, with a general email address convention of "surname"@example.org.
+		</para>
+		 <para>
+			By default, a Kolab &PRODUCT_VERSION; Groupware server will apply a recipient policy for the <literal>mail</literal> attribute value of "givenname"."surname"@example.org. The recipient policy must therefore be adjusted.
+		</para>
+		 <para>
+			In the <literal>[example.org]</literal> section in <filename>/etc/kolab/kolab.conf</filename>, the <literal>primary_mail</literal> setting must be adjusted to match the "surname"@example.org convention:
+		</para>
+		 
 <programlisting language="INI Files">(...snip...)
 [example.org]
 primary_mail = %(surname)s@%(domain)s
 (...snip...)</programlisting>
-        <para>
-            Now, users that are created will get a <literal>mail</literal> attribute value of "surname"@example.org assigned.
-        </para>
-        <para>
-            First adding user John Doe will give him a <literal>mail</literal> attribute value of <emphasis>doe at example.org</emphasis>, but should you have a Jane Doe as well, she would get <emphasis>doe2 at example.org</emphasis>. It is therefore important to add users in order.
-        </para>
-
-    </example>
-    <section id="sect-Administrator_Guide-Upgrading_from_Kolab_2_on_OpenPKG-Migration_of_LDAP">
-        <title>Migration of LDAP</title>
-        <para>
-            This section has not been authored yet.
-        </para>
-
-    </section>
-
-    <section id="sect-Administrator_Guide-Upgrading_from_Kolab_2_on_OpenPKG-Migration_and_Upgrade_of_Data">
-        <title>Migration and Upgrade of Data</title>
-        <para>
-            The following procedure
-        </para>
-        <procedure id="proc-Administrator_Guide-Migration_and_Upgrade_of_Data-Migrate_the_Data_Through_Copying">
-            <title>Migrate the Data Through Copying</title>
-            <step>
-                <para>
-                    Login to <literal>kolab3.example.org</literal> to execute the steps in this procedure.
-                </para>
-
-            </step>
-            <!--
+		 <para>
+			Now, users that are created will get a <literal>mail</literal> attribute value of "surname"@example.org assigned.
+		</para>
+		 <para>
+			First adding user John Doe will give him a <literal>mail</literal> attribute value of <emphasis>doe at example.org</emphasis>, but should you have a Jane Doe as well, she would get <emphasis>doe2 at example.org</emphasis>. It is therefore important to add users in order.
+		</para>
+
+	</example>
+	 <section id="sect-Administrator_Guide-Upgrading_from_Kolab_2_on_OpenPKG-Migration_of_LDAP">
+		<title>Migration of LDAP</title>
+		 <para>
+			This section has not been authored yet.
+		</para>
+
+	</section>
+	
+	 <section id="sect-Administrator_Guide-Upgrading_from_Kolab_2_on_OpenPKG-Migration_and_Upgrade_of_Data">
+		<title>Migration and Upgrade of Data</title>
+		 <para>
+			The following procedure
+		</para>
+		 <procedure id="proc-Administrator_Guide-Migration_and_Upgrade_of_Data-Migrate_the_Data_Through_Copying">
+			<title>Migrate the Data Through Copying</title>
+			 <step>
+				<para>
+					Login to <literal>kolab3.example.org</literal> to execute the steps in this procedure.
+				</para>
+
+			</step>
+			 <!-- 
 
    It doesn't seem this step causes the annotations.{db,txt} to transfer 1:1
         <step>
@@ -181,12 +181,12 @@ primary_mail = %(surname)s@%(domain)s
             </para>
 
         </step>
-        //    --> <step>
-                <para>
-                    Copy mailboxes.db and annotations.db. These files are located in <filename>/kolab/var/imapd/</filename> on your Kolab 2 server.
-                </para>
-                <para>
-
+        //     --> <step>
+				<para>
+					Copy mailboxes.db and annotations.db. These files are located in <filename>/kolab/var/imapd/</filename> on your Kolab 2 server.
+				</para>
+				 <para>
+					
 <screen># <userinput>scp root at kolab2.example.org:/kolab/var/imapd/annotations.db \</userinput>
 >    <userinput>/var/lib/imap/annotations.db</userinput>
 (...)
@@ -194,29 +194,29 @@ primary_mail = %(surname)s@%(domain)s
 >    <userinput>/var/lib/imap/mailboxes.db</userinput>
 (...)</screen>
 
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Migrate the mail spool:
-                </para>
-                <para>
+				</para>
 
+			</step>
+			 <step>
+				<para>
+					Migrate the mail spool:
+				</para>
+				 <para>
+					
 <screen># <userinput>rsync -rltpHvz --progress --partial \</userinput>
 >    <userinput>kolab2.example.org:/var/imapd/spool/ \</userinput>
 >    <userinput>/var/spool/imap/</userinput>
 (...)</screen>
 
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Migrate the seen and subscription databases:
-                </para>
-                <para>
+				</para>
 
+			</step>
+			 <step>
+				<para>
+					Migrate the seen and subscription databases:
+				</para>
+				 <para>
+					
 <screen># <userinput>rsync -rltpHvz --progress --partial \</userinput>
 >    <userinput>kolab2.example.org:/var/imapd/domain/ \</userinput>
 >    <userinput>/var/lib/imap/domain/</userinput>
@@ -226,70 +226,70 @@ primary_mail = %(surname)s@%(domain)s
 >    <userinput>/var/lib/imap/user/</userinput>
 (...)</screen>
 
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Ensure the filesystem permissions are correct:
-                </para>
-                <para>
+				</para>
 
+			</step>
+			 <step>
+				<para>
+					Ensure the filesystem permissions are correct:
+				</para>
+				 <para>
+					
 <screen># <userinput>chown -R cyrus:mail /var/lib/imap/ /var/spool/imap/</userinput></screen>
 
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Ensure only the cyrus user can read and write, and the mail group can read the contents of either directory tree:
-                </para>
-                <para>
+				</para>
 
+			</step>
+			 <step>
+				<para>
+					Ensure only the cyrus user can read and write, and the mail group can read the contents of either directory tree:
+				</para>
+				 <para>
+					
 <screen># <userinput>find /var/lib/imap -type f -exec chmod 640 {} \;</userinput>
 # <userinput>find /var/lib/imap -type d -exec chmod 750 {} \;</userinput>
 # <userinput>find /var/spool/imap -type f -exec chmod 640 {} \;</userinput>
 # <userinput>find /var/spool/imap -type d -exec chmod 750 {} \;</userinput></screen>
 
-                </para>
-
-            </step>
-            <xi:include href="step-convert-seen-databases.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-            <step>
-                <para>
-                    Stop the Kolab daemon:
-                </para>
-                <para>
+				</para>
 
+			</step>
+			 <xi:include href="step-convert-seen-databases.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+			 <step>
+				<para>
+					Stop the Kolab daemon:
+				</para>
+				 <para>
+					
 <screen># <userinput>service kolabd stop</userinput></screen>
 
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Start the Cyrus IMAP service on <literal>kolab3.example.org</literal>:
-                </para>
-                <para>
+				</para>
 
+			</step>
+			 <step>
+				<para>
+					Start the Cyrus IMAP service on <literal>kolab3.example.org</literal>:
+				</para>
+				 <para>
+					
 <screen># <userinput>service cyrus-imapd start</userinput></screen>
 
-                </para>
-                <important>
-                    <para>
-                        Users should not yet be allowed to interact with the system at this point. We suggest closing access to the system through the firewall.
-                    </para>
-
-                </important>
-
-            </step>
-            <xi:include href="step-select-all-mailboxes.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-            <step>
-                <para>
-                    The annotations database may not have been upgraded correctly, causing some annotations to miss the first 4 characters of their value. The easiest way to fix the issue, that is known to work, is to get the annotation values as they were on the old (Kolab 2) IMAP server, and set them on the new (Kolab 3) IMAP server.
-                </para>
-                <para>
-
+				</para>
+				 <important>
+					<para>
+						Users should not yet be allowed to interact with the system at this point. We suggest closing access to the system through the firewall.
+					</para>
+
+				</important>
+
+			</step>
+			 <xi:include href="step-select-all-mailboxes.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+			 <step>
+				<para>
+					The annotations database may not have been upgraded correctly, causing some annotations to miss the first 4 characters of their value. The easiest way to fix the issue, that is known to work, is to get the annotation values as they were on the old (Kolab 2) IMAP server, and set them on the new (Kolab 3) IMAP server.
+				</para>
+				 <para>
+					
 <screen># <userinput>kolab -c conf/kolab-kolab2.example.org.conf \</userinput>
 > <userinput>list-mailbox-metadata "user/john.doe/Calendar*@example.org"</userinput>
 Folder user/john.doe/Calendar at example.org
@@ -333,11 +333,11 @@ Folder user/john.doe/Calendar/Private at example.org
   /shared/vendor/cmu/cyrus-imapd/size               305426
   /shared/vendor/cmu/cyrus-imapd/sharedseen         false</screen>
 
-                </para>
-                <para>
-                    Fix'em:
-                </para>
-
+				</para>
+				 <para>
+					Fix'em:
+				</para>
+				 
 <programlisting language="Bash">#!/bin/bash
 
 # Interesting Annotations
@@ -383,13 +383,13 @@ for folder_search in user/*@example.org shared/*@example.org; do
 
 done</programlisting>
 
-            </step>
-            <step>
-                <para>
-                    Upgrade all messages from Kolab Format version 2 to Kolab Format version 3 using <command>kolab-formatupgrade</command>. This command is run in two parts. The first will upgrade all mailbox contents in the personal namespace:
-                </para>
-                <para>
-
+			</step>
+			 <step>
+				<para>
+					Upgrade all messages from Kolab Format version 2 to Kolab Format version 3 using <command>kolab-formatupgrade</command>. This command is run in two parts. The first will upgrade all mailbox contents in the personal namespace:
+				</para>
+				 <para>
+					
 <screen># <userinput>kolab lm "user/%@example.org" | \</userinput>
 >   <userinput>sed -e 's/user\///g' | \</userinput>
 >   <userinput>while read user; do</userinput>
@@ -402,15 +402,15 @@ done</programlisting>
 >           <userinput><replaceable>localhost</replaceable></userinput>
 >   <userinput>done</userinput></screen>
 
-                </para>
-                <para>
-                    The second part upgrades the contents of shared folders. Shared folders have no designated owners, and we can therefore not login as a designated user to upgrade the format.
-                </para>
-                <para>
-                    As the user <literal>cyrus-admin</literal> normally does not have the necessary privileges to insert new messages into mail folders, so we're going to have to give out the rights first. We'll delete them again afterwards.
-                </para>
-                <para>
-
+				</para>
+				 <para>
+					The second part upgrades the contents of shared folders. Shared folders have no designated owners, and we can therefore not login as a designated user to upgrade the format.
+				</para>
+				 <para>
+					As the user <literal>cyrus-admin</literal> normally does not have the necessary privileges to insert new messages into mail folders, so we're going to have to give out the rights first. We'll delete them again afterwards.
+				</para>
+				 <para>
+					
 <screen># <userinput>kolab sam shared/*@example.org cyrus-admin lrswiptexa</userinput>
 # <userinput>kolab lm shared/*@example.org | \</userinput>
 >   <userinput>while read folder; do</userinput>
@@ -424,15 +424,15 @@ done</programlisting>
 >   <userinput>done</userinput>
 # <userinput>kolab dam shared/*@example.org cyrus-admin</userinput></screen>
 
-                </para>
-
-            </step>
-
-        </procedure>
+				</para>
 
+			</step>
 
-    </section>
+		</procedure>
+		
 
+	</section>
+	
 
 </chapter>
 
diff --git a/Administrator_Guide/en-US/Verifying_the_Installation.xml b/Administrator_Guide/en-US/Verifying_the_Installation.xml
index c53e3fd..c254cc3 100644
--- a/Administrator_Guide/en-US/Verifying_the_Installation.xml
+++ b/Administrator_Guide/en-US/Verifying_the_Installation.xml
@@ -4,353 +4,353 @@
 %BOOK_ENTITIES;
 ]>
 <chapter id="chap-Administrator_Guide-Verifying_the_Installation">
-    <title>Verifying the Installation</title>
-    <para>
-        This chapter concerns verifying the Kolab Groupware installation works as expected, to the limited realm this documentation can serve. If you have modified the Kolab Groupware deployment to match your needs, some of the following verification steps may not function as expected.
-    </para>
-    <section id="sect-Administrator_Guide-Verifying_the_Installation-Running_Services">
-        <title>Running Services</title>
-        <para>
-            Verify the following services are running:
-        </para>
-        <para>
-            <itemizedlist>
-                <listitem>
-                    <formalpara id="form-Administrator_Guide-Running_Services-a389_Directory_Server">
-                        <title>389 Directory Server</title>
-                        <para>
-                            The LDAP server is crucial to authentication, authorization, user and group information and mail routing, and must be running.
-                        </para>
-
-                    </formalpara>
-                    <procedure>
-                        <step>
-                            <para>
-                                Verify the service is running:
-                            </para>
-                            <para>
-
+	<title>Verifying the Installation</title>
+	 <para>
+		This chapter concerns verifying the Kolab Groupware installation works as expected, to the limited realm this documentation can serve. If you have modified the Kolab Groupware deployment to match your needs, some of the following verification steps may not function as expected.
+	</para>
+	 <section id="sect-Administrator_Guide-Verifying_the_Installation-Running_Services">
+		<title>Running Services</title>
+		 <para>
+			Verify the following services are running:
+		</para>
+		 <para>
+			<itemizedlist>
+				<listitem>
+					<formalpara id="form-Administrator_Guide-Running_Services-a389_Directory_Server">
+						<title>389 Directory Server</title>
+						 <para>
+							The LDAP server is crucial to authentication, authorization, user and group information and mail routing, and must be running.
+						</para>
+
+					</formalpara>
+					 <procedure>
+						<step>
+							<para>
+								Verify the service is running:
+							</para>
+							 <para>
+								
 <screen># <userinput>service dirsrv status</userinput></screen>
 
-                            </para>
-
-                        </step>
-                        <step>
-                            <para>
-                                Verify the service is listening on the expected port(s):
-                            </para>
-                            <para>
+							</para>
 
+						</step>
+						 <step>
+							<para>
+								Verify the service is listening on the expected port(s):
+							</para>
+							 <para>
+								
 <screen># <userinput>netstat -ltnp | grep -E ":(389|636)"</userinput></screen>
 
-                            </para>
-
-                        </step>
-                        <step>
-                            <para>
-                                Verify the firewall allows access to those ports, if the <literal>iptables</literal> service is running:
-                            </para>
-                            <para>
+							</para>
 
+						</step>
+						 <step>
+							<para>
+								Verify the firewall allows access to those ports, if the <literal>iptables</literal> service is running:
+							</para>
+							 <para>
+								
 <screen># <userinput>service iptables status</userinput>
 # <userinput>iptables -L INPUT -n -v | grep -E "dpt:(389|636)" | grep ACCEPT</userinput></screen>
 
-                            </para>
-                            <note>
-                                <para>
-                                    Kolab Groupware does not configure your firewall for you. You may have decided to work your firewall yourself, in which case the former commands may not include any ouput.
-                                </para>
-
-                            </note>
-
-                        </step>
-                        <step>
-                            <para>
-                                Perform a search:
-                            </para>
-                            <para>
-
+							</para>
+							 <note>
+								<para>
+									Kolab Groupware does not configure your firewall for you. You may have decided to work your firewall yourself, in which case the former commands may not include any ouput.
+								</para>
+
+							</note>
+
+						</step>
+						 <step>
+							<para>
+								Perform a search:
+							</para>
+							 <para>
+								
 <screen># <userinput>ldapsearch -x -h localhost -D "${binddn}" -w "${bindpw}" -b "${basedn}"</userinput></screen>
 
-                            </para>
-
-                        </step>
-
-                    </procedure>
-
-                    <para>
-                        Log files for 389 Directory Server are located in <filename>/var/log/dirsrv/slapd-*/</filename>.
-                    </para>
-
-                </listitem>
-                <listitem>
-                    <formalpara id="form-Administrator_Guide-Running_Services-Kolab_SASL_Authentication_Daemon">
-                        <title>Kolab SASL Authentication Daemon</title>
-                        <para>
-                            The Kolab SASL authentication daemon is used by Postfix and Cyrus IMAP, to authenticate users.
-                        </para>
-
-                    </formalpara>
-                    <procedure>
-                        <step>
-                            <para>
-                                Verify the service is running:
-                            </para>
-                            <para>
-
+							</para>
+
+						</step>
+
+					</procedure>
+					
+					 <para>
+						Log files for 389 Directory Server are located in <filename>/var/log/dirsrv/slapd-*/</filename>.
+					</para>
+
+				</listitem>
+				 <listitem>
+					<formalpara id="form-Administrator_Guide-Running_Services-Kolab_SASL_Authentication_Daemon">
+						<title>Kolab SASL Authentication Daemon</title>
+						 <para>
+							The Kolab SASL authentication daemon is used by Postfix and Cyrus IMAP, to authenticate users.
+						</para>
+
+					</formalpara>
+					 <procedure>
+						<step>
+							<para>
+								Verify the service is running:
+							</para>
+							 <para>
+								
 <screen># <userinput>service kolab-saslauthd status</userinput></screen>
 
-                            </para>
-
-                        </step>
-                        <step>
-                            <para>
-                                Make some attempts to authenticate:
-                            </para>
-                            <para>
+							</para>
 
+						</step>
+						 <step>
+							<para>
+								Make some attempts to authenticate:
+							</para>
+							 <para>
+								
 <screen># <userinput>testsaslauthd -u <replaceable>cyrus-admin</replaceable> -p <replaceable>$password</replaceable></userinput>
 # <userinput>testsaslauthd -u <replaceable>john.doe at example.org</replaceable> -p <replaceable>$password</replaceable></userinput>
 # <userinput>testsaslauthd -u <replaceable>doe</replaceable> -p <replaceable>$password</replaceable></userinput>
 # <userinput>testsaslauthd -u <replaceable>doe</replaceable> -r <replaceable>example.org</replaceable> -p <replaceable>$password</replaceable></userinput></screen>
 
-                            </para>
-
-                        </step>
-
-                    </procedure>
-
-                    <para>
-                        The log file for the Kolab SASL authentication daemon is <filename>/var/log/kolab/pykolab.log</filename>.
-                    </para>
-
-                </listitem>
-                <listitem>
-                    <formalpara id="form-Administrator_Guide-Running_Services-Cyrus_IMAP">
-                        <title>Cyrus IMAP</title>
-                        <para>
-                            Essential for access to all email and other groupware data.
-                        </para>
-
-                    </formalpara>
-                    <procedure>
-                        <step>
-                            <para>
-                                Verify the service is running:
-                            </para>
-                            <para>
-
+							</para>
+
+						</step>
+
+					</procedure>
+					
+					 <para>
+						The log file for the Kolab SASL authentication daemon is <filename>/var/log/kolab/pykolab.log</filename>.
+					</para>
+
+				</listitem>
+				 <listitem>
+					<formalpara id="form-Administrator_Guide-Running_Services-Cyrus_IMAP">
+						<title>Cyrus IMAP</title>
+						 <para>
+							Essential for access to all email and other groupware data.
+						</para>
+
+					</formalpara>
+					 <procedure>
+						<step>
+							<para>
+								Verify the service is running:
+							</para>
+							 <para>
+								
 <screen># <userinput>service cyrus-imapd status</userinput></screen>
 
-                            </para>
-
-                        </step>
-                        <step>
-                            <para>
-                                Verify the service is listening on the expected port(s):
-                            </para>
-                            <para>
+							</para>
 
+						</step>
+						 <step>
+							<para>
+								Verify the service is listening on the expected port(s):
+							</para>
+							 <para>
+								
 <screen># <userinput>netstat -tlnp | grep -E ":(143|993)"</userinput></screen>
 
-                            </para>
-
-                        </step>
-                        <step>
-                            <para>
-                                Verify the firewall allows access to those ports, if the <literal>iptables</literal> service is running:
-                            </para>
-                            <para>
+							</para>
 
+						</step>
+						 <step>
+							<para>
+								Verify the firewall allows access to those ports, if the <literal>iptables</literal> service is running:
+							</para>
+							 <para>
+								
 <screen># <userinput>service iptables status</userinput>
 # <userinput>iptables -L INPUT -n -v | grep -E "dpt:(143|993)" | grep ACCEPT</userinput></screen>
 
-                            </para>
-                            <note>
-                                <para>
-                                    Kolab Groupware does not configure your firewall for you. You may have decided to work your firewall yourself, in which case the former commands may not include any ouput.
-                                </para>
-
-                            </note>
-
-                        </step>
-                        <step>
-                            <para>
-                                Attempt to connect and authenticate:
-                            </para>
-                            <para>
-
+							</para>
+							 <note>
+								<para>
+									Kolab Groupware does not configure your firewall for you. You may have decided to work your firewall yourself, in which case the former commands may not include any ouput.
+								</para>
+
+							</note>
+
+						</step>
+						 <step>
+							<para>
+								Attempt to connect and authenticate:
+							</para>
+							 <para>
+								
 <screen># <userinput>imtest -t "" -u <replaceable>john.doe at example.org</replaceable> -w <replaceable>$password</replaceable> localhost</userinput>
 # <userinput>imtest -t "" -u <replaceable>doe</replaceable> -w <replaceable>$password</replaceable> localhost</userinput></screen>
 
-                            </para>
-
-                        </step>
-
-                    </procedure>
-
-
-                </listitem>
-                <listitem>
-                    <formalpara id="form-Administrator_Guide-Running_Services-Apache_Webserver">
-                        <title>Apache Webserver</title>
-                        <para>
-                            The Apache webserver is needed for the Kolab Web Client, Administration Panel and the exchange of Free/Busy information.
-                        </para>
-
-                    </formalpara>
-                    <procedure id="proc-Administrator_Guide-Running_Services-Verifying_the_Apache_Webserver_Service_is_Running">
-                        <title>Verifying the Apache Webserver Service is Running</title>
-                        <step>
-                            <para>
-                                Verify the service is running:
-                            </para>
-                            <para>
-
+							</para>
+
+						</step>
+
+					</procedure>
+					
+
+				</listitem>
+				 <listitem>
+					<formalpara id="form-Administrator_Guide-Running_Services-Apache_Webserver">
+						<title>Apache Webserver</title>
+						 <para>
+							The Apache webserver is needed for the Kolab Web Client, Administration Panel and the exchange of Free/Busy information.
+						</para>
+
+					</formalpara>
+					 <procedure id="proc-Administrator_Guide-Running_Services-Verifying_the_Apache_Webserver_Service_is_Running">
+						<title>Verifying the Apache Webserver Service is Running</title>
+						 <step>
+							<para>
+								Verify the service is running:
+							</para>
+							 <para>
+								
 <screen># <userinput>service httpd status</userinput></screen>
 
-                            </para>
-
-                        </step>
-                        <step>
-                            <para>
-                                Verify the service is listening on the correct ports:
-                            </para>
-                            <para>
+							</para>
 
+						</step>
+						 <step>
+							<para>
+								Verify the service is listening on the correct ports:
+							</para>
+							 <para>
+								
 <screen># <userinput>netstat -ltnp | grep -E ":(80|443)"</userinput></screen>
 
-                            </para>
-
-                        </step>
-                        <step>
-                            <para>
-                                Verify the firewall allows access to those ports, if the <literal>iptables</literal> service is running:
-                            </para>
-                            <para>
+							</para>
 
+						</step>
+						 <step>
+							<para>
+								Verify the firewall allows access to those ports, if the <literal>iptables</literal> service is running:
+							</para>
+							 <para>
+								
 <screen># <userinput>service iptables status</userinput>
 # <userinput>iptables -L INPUT -n -v | grep -E "dpt:(80|443)" | grep ACCEPT</userinput></screen>
 
-                            </para>
-                            <note>
-                                <para>
-                                    Kolab Groupware does not configure your firewall for you. You may have decided to work your firewall yourself, in which case the former commands may not include any ouput.
-                                </para>
-
-                            </note>
-
-                        </step>
-                        <step>
-                            <para>
-                                Attempt to get a few pages:
-                            </para>
-                            <para>
-
+							</para>
+							 <note>
+								<para>
+									Kolab Groupware does not configure your firewall for you. You may have decided to work your firewall yourself, in which case the former commands may not include any ouput.
+								</para>
+
+							</note>
+
+						</step>
+						 <step>
+							<para>
+								Attempt to get a few pages:
+							</para>
+							 <para>
+								
 <screen># <userinput>wget -O- http://localhost</userinput>
 # <userinput>wget -O- https://localhost</userinput></screen>
 
-                            </para>
-                            <note>
-                                <para>
-                                    Kolab Groupware does not, by default, configure the webserver to also listen on HTTPS port 443.
-                                </para>
-
-                            </note>
-
-                        </step>
-
-                    </procedure>
-
-
-                </listitem>
-                <listitem>
-                    <formalpara id="form-Administrator_Guide-Running_Services-MySQL">
-                        <title>MySQL</title>
-                        <para>
-                            para
-                        </para>
-
-                    </formalpara>
-                    <procedure>
-                        <step>
-                            <para>
-                                para
-                            </para>
-
-                        </step>
-
-                    </procedure>
-
-
-                </listitem>
-                <listitem>
-                    <formalpara id="form-Administrator_Guide-Running_Services-Kolab_Web_Administration_Panel">
-                        <title>Kolab Web Administration Panel</title>
-                        <para>
-                            para
-                        </para>
-
-                    </formalpara>
-                    <procedure>
-                        <step>
-                            <para>
-                                para
-                            </para>
-
-                        </step>
-
-                    </procedure>
-
-
-                </listitem>
-                <listitem>
-                    <formalpara id="form-Administrator_Guide-Running_Services-Roundcube_Webmail">
-                        <title>Roundcube Webmail</title>
-                        <para>
-                            para
-                        </para>
-
-                    </formalpara>
-                    <procedure>
-                        <step>
-                            <para>
-                                para
-                            </para>
-
-                        </step>
-
-                    </procedure>
-
-
-                </listitem>
-                <listitem>
-                    <formalpara id="form-Administrator_Guide-Running_Services-The_Kolab_Daemon">
-                        <title>The Kolab Daemon</title>
-                        <para>
-                            para
-                        </para>
-
-                    </formalpara>
-                    <procedure>
-                        <step>
-                            <para>
-                                para
-                            </para>
-
-                        </step>
-
-                    </procedure>
-
-
-                </listitem>
-
-            </itemizedlist>
-
-        </para>
-
-    </section>
-
+							</para>
+							 <note>
+								<para>
+									Kolab Groupware does not, by default, configure the webserver to also listen on HTTPS port 443.
+								</para>
+
+							</note>
+
+						</step>
+
+					</procedure>
+					
+
+				</listitem>
+				 <listitem>
+					<formalpara id="form-Administrator_Guide-Running_Services-MySQL">
+						<title>MySQL</title>
+						 <para>
+							para
+						</para>
+
+					</formalpara>
+					 <procedure>
+						<step>
+							<para>
+								para
+							</para>
+
+						</step>
+
+					</procedure>
+					
+
+				</listitem>
+				 <listitem>
+					<formalpara id="form-Administrator_Guide-Running_Services-Kolab_Web_Administration_Panel">
+						<title>Kolab Web Administration Panel</title>
+						 <para>
+							para
+						</para>
+
+					</formalpara>
+					 <procedure>
+						<step>
+							<para>
+								para
+							</para>
+
+						</step>
+
+					</procedure>
+					
+
+				</listitem>
+				 <listitem>
+					<formalpara id="form-Administrator_Guide-Running_Services-Roundcube_Webmail">
+						<title>Roundcube Webmail</title>
+						 <para>
+							para
+						</para>
+
+					</formalpara>
+					 <procedure>
+						<step>
+							<para>
+								para
+							</para>
+
+						</step>
+
+					</procedure>
+					
+
+				</listitem>
+				 <listitem>
+					<formalpara id="form-Administrator_Guide-Running_Services-The_Kolab_Daemon">
+						<title>The Kolab Daemon</title>
+						 <para>
+							para
+						</para>
+
+					</formalpara>
+					 <procedure>
+						<step>
+							<para>
+								para
+							</para>
+
+						</step>
+
+					</procedure>
+					
+
+				</listitem>
+
+			</itemizedlist>
+
+		</para>
+
+	</section>
+	
 
 </chapter>
 
diff --git a/Administrator_Guide/en-US/chap-About_Kolab_Groupware.xml b/Administrator_Guide/en-US/chap-About_Kolab_Groupware.xml
index 39c850a..eb8a22f 100644
--- a/Administrator_Guide/en-US/chap-About_Kolab_Groupware.xml
+++ b/Administrator_Guide/en-US/chap-About_Kolab_Groupware.xml
@@ -4,27 +4,27 @@
 %BOOK_ENTITIES;
 ]>
 <chapter id="chap-Administrator_Guide-About_Kolab_Groupware">
-    <title>About Kolab Groupware</title>
-    <para>
-        Kolab is a Groupware Solution for Emails, Appointments, Contacts and more. It supports mixed client environments (Outlook/KDE) because of an open storage format. Any email client speaking standard protocols can be served.
-    </para>
-    <section id="sect-Administrator_Guide-About_Kolab_Groupware-Free_Software_Components">
-        <title>Free Software Components</title>
-        <para>
-            TODO: Come on, be a little more verbose...
-        </para>
-        <section id="sect-Administrator_Guide-Free_Software_Components-This_documentation">
-            <title>This documentation</title>
-            <para>
-                Describe how this documentation can be modified to custom, internal documentation
-            </para>
+	<title>About Kolab Groupware</title>
+	 <para>
+		Kolab is a Groupware Solution for Emails, Appointments, Contacts and more. It supports mixed client environments (Outlook/KDE) because of an open storage format. Any email client speaking standard protocols can be served.
+	</para>
+	 <section id="sect-Administrator_Guide-About_Kolab_Groupware-Free_Software_Components">
+		<title>Free Software Components</title>
+		 <para>
+			TODO: Come on, be a little more verbose...
+		</para>
+		 <section id="sect-Administrator_Guide-Free_Software_Components-This_documentation">
+			<title>This documentation</title>
+			 <para>
+				Describe how this documentation can be modified to custom, internal documentation
+			</para>
 
-        </section>
+		</section>
+		
 
-
-    </section>
-
-    <xi:include href="sect-Supported_Platforms_and_System_Requirements.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	</section>
+	
+	 <xi:include href="sect-Supported_Platforms_and_System_Requirements.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 
 </chapter>
 
diff --git a/Administrator_Guide/en-US/part-Clients.xml b/Administrator_Guide/en-US/part-Clients.xml
index cabfdf5..5d391cb 100644
--- a/Administrator_Guide/en-US/part-Clients.xml
+++ b/Administrator_Guide/en-US/part-Clients.xml
@@ -4,9 +4,9 @@
 %BOOK_ENTITIES;
 ]>
 <part id="part-Administrator_Guide-Kolab_Groupware_Clients">
-    <title>Kolab Groupware Clients</title>
-    <xi:include href="Kontact.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="Thunderbird.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="Outlook.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	<title>Kolab Groupware Clients</title>
+	 <xi:include href="Kontact.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="Thunderbird.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="Outlook.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </part>
 
diff --git a/Administrator_Guide/en-US/part-Kolab_Server.xml b/Administrator_Guide/en-US/part-Kolab_Server.xml
index 9fbabcd..ff348ca 100755
--- a/Administrator_Guide/en-US/part-Kolab_Server.xml
+++ b/Administrator_Guide/en-US/part-Kolab_Server.xml
@@ -4,19 +4,19 @@
 %BOOK_ENTITIES;
 ]>
 <part id="part-Administrator_Guide-Kolab_Groupware_Server">
-    <title>Kolab Groupware Server</title>
-    <xi:include href="Upgrading_from_Kolab_2_on_OpenPKG.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <!--
+	<title>Kolab Groupware Server</title>
+	 <xi:include href="Upgrading_from_Kolab_2_on_OpenPKG.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <!-- 
     <xi:include href="Upgrading_Accounts_from_Kolab_Format_version_2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="Upgrading_Cyrus_IMAP_from_2.3_to_2.4.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    //    --> <xi:include href="Verifying_the_Installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="Configuring_the_Kolab_Server.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="Detailed_Kolab_Server_Overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="Kolab_Web_Administration_Panel.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="Combating_Spam.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="Tweaking_Tips_for_389_Directory_Server.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="Tweaking_Tips_for_Cyrus_IMAP.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="Tweaking_Tips_for_Postfix.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="Tweaking_Tips_for_Roundcube.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    //     --> <xi:include href="Verifying_the_Installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="Configuring_the_Kolab_Server.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="Detailed_Kolab_Server_Overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="Kolab_Web_Administration_Panel.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="Combating_Spam.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="Tweaking_Tips_for_389_Directory_Server.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="Tweaking_Tips_for_Cyrus_IMAP.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="Tweaking_Tips_for_Postfix.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="Tweaking_Tips_for_Roundcube.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </part>
 
diff --git a/Administrator_Guide/en-US/sect-Kolab_Recipient_Policy_and_Web_Administration_Panel.xml b/Administrator_Guide/en-US/sect-Kolab_Recipient_Policy_and_Web_Administration_Panel.xml
new file mode 100644
index 0000000..b4bfaa8
--- /dev/null
+++ b/Administrator_Guide/en-US/sect-Kolab_Recipient_Policy_and_Web_Administration_Panel.xml
@@ -0,0 +1,464 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Administrator_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<section id="sect-Administrator_Guide-Kolab_Recipient_Policy_and_Web_Administration_Panel">
+    <title>Kolab Recipient Policy and Web Administration Panel</title>
+    <para>
+        Kolab Groupware includes an automated application of user metadata, such as the user's given- and surname, to recipient email addresses. This is called <emphasis>the recipient policy</emphasis>. See <xref linkend="exam-Administrator_Guide-Kolab_Recipient_Policy_and_Web_Administration_Panel-Example_Default_Application_of_the_Recipient_Policy" /> for the recipient policy at work.
+    </para>
+    <para>
+        The recipient policy aids deployments in achieving a level of consistency throughout their recipient database by applying a naming convention, avoiding the need for Kolab Groupware administrators to need to understand and consistently apply naming convention rules. Consistency is important when considering global address book listings and searches in different contexts, and when anticipating what a valid recipient address for a given user may be – noted that most email users do not have access to your global address book and it is likely that most communications will take place with those users.
+    </para>
+    <para>
+        Furthmore, the recipient policy allows these automatically recipient email addresses to be globally unique.
+    </para>
+    <example id="exam-Administrator_Guide-Kolab_Recipient_Policy_and_Web_Administration_Panel-Example_Default_Application_of_the_Recipient_Policy">
+        <title>Example Default Application of the Recipient Policy</title>
+        <para>
+            If an <emphasis>example.org</emphasis> user is created with given name <emphasis>John</emphasis> and surname <emphasis>Doe</emphasis>, the default recipient policy will set the primary email address to <emphasis>john.doe at example.org</emphasis> and the secondary email addresses to <emphasis>j.doe at example.org</emphasis> and <emphasis>doe at example.org</emphasis>.
+        </para>
+
+    </example>
+    <important>
+        <para>
+            By default, the primary recipient email address is used as a globally unique identifier involving authentication (allowing login by email address), the user's mailbox name, mail delivery configuration, access control and the storage of user profiles. It is therefore very important a single primary recipient email address does not exist for two entries.
+        </para>
+
+    </important>
+    <para>
+        The recipient policy also avoids the need for Kolab Groupware administrators to understand and consistently apply the various transliteration rules for different locales. See <xref linkend="exam-Administrator_Guide-Kolab_Recipient_Policy_and_Web_Administration_Panel-Transliteration_for_Different_Locales" /> for an example.
+    </para>
+    <example id="exam-Administrator_Guide-Kolab_Recipient_Policy_and_Web_Administration_Panel-Transliteration_for_Different_Locales">
+        <title>Transliteration for Different Locales</title>
+        <para>
+            Names can contain non-ASCII characters, as is the case with, for example, <emphasis>Marie Möller</emphasis> (German), while recipient email addresses may not contain such characters (i.e. <emphasis>marie.möller at example.org</emphasis> is an invalid email address.
+        </para>
+        <para>
+            Without locale specific transliteration, the email address would become <emphasis>marie.moller at example.org</emphasis>. This is considered inadequate, as many users will experience this inappropriate, inconsiderate and/or awkward – it is the user's native tongue after all and transliteration is used in every-day life. Kolab Groupware should therefor also be able to apply the same transliteration rules specific to the user's native tongue.
+        </para>
+        <para>
+            With the (presumably correct) transliteration rules for German applied, the email address would become <emphasis>marie.moeller at example.org</emphasis>.
+        </para>
+
+    </example>
+    <para>
+        The recipient policy takes the value(s) of a number of attributes from an entry, and executes the recipient policy for primary and secondary recipient email addresses with help of the attribute names (referred to in the policy) and their values.
+    </para>
+    <para>
+        It will set the primary email address attribute to a singular value, though the LDAP schema allows multiple values for the default primary mail attribute <literal>mail</literal>. The secondary email address attribute (<literal>alias</literal> by default) is set to the value(s) returned by the recipient policy as well.
+    </para>
+    <formalpara id="form-Administrator_Guide-Kolab_Recipient_Policy_and_Web_Administration_Panel-Components_that_Apply_the_Recipient_Policy">
+        <title>Components that Apply the Recipient Policy</title>
+        <para>
+            The Kolab daemon (the <literal>kolabd</literal> service) is the primary Kolab Groupware component to apply the recipient policy. The Kolab Web Administration Panel and its API also apply the recipient policy, as otherwise the user interface would be incomplete. However, installation and use of the Kolab WAP and API are optional, which is why the Kolab daemon is the primary component to apply the policy.
+        </para>
+
+    </formalpara>
+    <para>
+        Both components use the configuration settings <literal>primary_mail</literal> and <literal>secondary_mail</literal> as their policy configuration. These configuration items consist of a Python notation for string formatting, along with a limited number of string operations.
+    </para>
+    <para>
+        The <literal>primary_mail</literal> setting contains a singular basestring to be used in simplistic string formatting, while the <literal>secondary_mail</literal> setting contains a numerically ordered list of singular basestrings to be used in string formatting, with the opportunity to execute some additional string operations such as substrings and capitalization.
+    </para>
+    <example id="exam-Administrator_Guide-Kolab_Recipient_Policy_and_Web_Administration_Panel-Example_Primary_Email_Address_Recipient_Policy">
+        <title>Example Primary Email Address Recipient Policy</title>
+        <para>
+            The primary recipient email address for an <emphasis>example.org</emphasis> user with given name <emphasis>Marie</emphasis>, surname <emphasis>Möller</emphasis> and preffered language <emphasis>de_DE</emphasis>, is composed as follows:
+        </para>
+        <procedure>
+            <step>
+                <para>
+                    The recipient policy is obtained from the <literal>primary_mail</literal> setting. By default, this configuration setting is set to:
+                </para>
+                <para>
+
+<screen language="INI Files">[example.org]
+primary_mail = %(givenname)s.%(surname)s@%(domain)s</screen>
+
+                </para>
+                <para>
+                    As the configuration indicates, the attributes for the user that will be used are the given name and the surname.
+                </para>
+                <note>
+                    <para>
+                        For the Kolab Web Administration Panel API, the attributes supplied to the recipient policy routine are actually configured, rather than obtained from the policy configuration itself. See <xref linkend="proc-Administrator_Guide-Configuring_the_Recipient_Policy-Setting_Primary_Recipient_Email_Address" /> for more information.
+                    </para>
+                    <para>
+                        The Kolab daemon passes a complete list of all attributes along to the recipient policy routine.
+                    </para>
+
+                </note>
+
+            </step>
+            <step>
+                <para>
+                    Either a specified preferred language is used, or the default locale, to transliterate the given name and surname. In this example, the transliteration rules for German are used. The result is a dictionary that looks as follows:
+                </para>
+                <para>
+
+<screen language="Python">{
+        "givenname": "Maria",
+        "surname": "Moeller",
+        "preferredlanguage": "de_DE"
+    }</screen>
+
+                </para>
+
+            </step>
+            <step>
+                <para>
+                    Using Python's string formatting, the resulting primary recipient email address would become:
+                </para>
+                <para>
+
+<screen language="Python">primary_mail = "%(givenname)s.%(surname)s@%(domain)s" % {
+        "givenname": "Maria",
+        "surname": "Moeller",
+        "preferredlanguage": "de_DE"
+    }
+print primary_mail</screen>
+
+                </para>
+                <para>
+                    or:
+                </para>
+                <para>
+
+<screen>maria.moeller at example.org</screen>
+
+                </para>
+
+            </step>
+
+        </procedure>
+
+
+    </example>
+    <example id="exam-Administrator_Guide-Kolab_Recipient_Policy_and_Web_Administration_Panel-Example_Secondary_Email_Address_Recipient_Policy">
+        <title>Example Secondary Email Address Recipient Policy</title>
+        <para>
+            The secondary recipient email address for an <emphasis>example.org</emphasis> user with given name <emphasis>Marie</emphasis>, surname <emphasis>Möller</emphasis> and preffered language <emphasis>de_DE</emphasis>, is composed as follows:
+        </para>
+        <procedure>
+            <step>
+                <para>
+                    The recipient policy is obtained from the <literal>secondary_mail</literal> setting. By default, this configuration setting is set to:
+                </para>
+                <para>
+
+<screen language="INI Files">[example.org]
+secondary_mail = {
+    0: {
+            "{0}.{1}@{2}": "format('%(givenname)s'[0:1].capitalize(), '%(surname)s', '%(domain)s')"
+        },
+    1: {
+            "{0}@{1}": "format('%(uid)s', '%(domain)s')"
+        },
+    2: {
+            "{0}@{1}": "format('%(givenname)s.%(surname)s', '%(domain)s')"
+        }
+}</screen>
+
+                </para>
+                <para>
+                    As the configuration indicates, the attributes for the user that will be used are the given name, the surname and the uid.
+                </para>
+                <note>
+                    <para>
+                        For the Kolab Web Administration Panel API, the attributes supplied to the recipient policy routine are actually configured, rather than obtained from the policy configuration itself. See <xref linkend="proc-Administrator_Guide-Configuring_the_Recipient_Policy-Setting_the_Secondary_Recipient_Email_Address" /> for more information.
+                    </para>
+                    <para>
+                        The Kolab daemon passes a complete list of all attributes along to the recipient policy routine.
+                    </para>
+
+                </note>
+
+            </step>
+            <step>
+                <para>
+                    Either a specified preferred language is used, or the default locale, to transliterate the given name and surname. In this example, the transliteration rules for German are used. The result is a dictionary that looks as follows:
+                </para>
+                <para>
+
+<screen language="Python">{
+        "givenname": "Maria",
+        "surname": "Moeller",
+        "preferredlanguage": "de_DE",
+        "uid": "moeller"
+    }</screen>
+
+                </para>
+
+            </step>
+            <step>
+                <para>
+                    Using Python's string formatting, the resulting primary recipient email address would become:
+                </para>
+                <para>
+
+<screen language="Python">secondary_mail = {
+    0: {
+            "{0}.{1}@{2}": "format('Maria'[0:1].capitalize(), 'Moeller', 'example.org')"
+        },
+    1: {
+            "{0}@{1}": "format('moeller', 'example.org')"
+        },
+    2: {
+            "{0}@{1}": "format('maria.moeller', 'example.org')"
+        }
+    }
+
+print secondary_mail</screen>
+
+                </para>
+                <para>
+                    or:
+                </para>
+                <para>
+
+<screen>- m.moeller at example.org
+- moeller at example.org
+- maria.moeller at example.org</screen>
+
+                </para>
+
+            </step>
+
+        </procedure>
+
+
+    </example>
+    <section id="sect-Administrator_Guide-Kolab_Recipient_Policy_and_Web_Administration_Panel-Configuring_the_Recipient_Policy">
+        <title>Configuring the Recipient Policy</title>
+        <procedure id="proc-Administrator_Guide-Configuring_the_Recipient_Policy-Setting_Primary_Recipient_Email_Address">
+            <title>Setting Primary Recipient Email Address</title>
+            <para>
+                The primary recipient email address can be changed to reflect your naming convention through this procedure:
+            </para>
+            <step>
+                <para>
+                    Edit /etc/kolab/kolab.conf and replace the value of the primary_mail setting in the applicable domain section. For example, set the policy to <literal>%(givenname)s@%(domain)s</literal> to get email addresses like <emphasis>john at example.org</emphasis> and <emphasis>jane at example.org</emphasis>.
+                </para>
+
+            </step>
+            <step>
+                <para>
+                    Edit the user types for any user that matches the filter used by the kolab daemon to determine which users are kolab users. For example, "Kolab Users" and "Mail-enabled POSIX users" both include "objectclass=kolabinetorgperson" (the default kolab_user_filter) and therefore the Kolab daemon would apply the recipient policy to these objects. For each of these user_types, make sure that the auto_form_field configuration for the mail and alias attributes include all attributes needed to compose the addresses.
+                </para>
+                <example id="exam-Administrator_Guide-Setting_Primary_Recipient_Email_Address-Example">
+                    <title>Example</title>
+                    <para>
+                        para
+                    </para>
+
+                </example>
+
+            </step>
+
+        </procedure>
+
+        <procedure id="proc-Administrator_Guide-Configuring_the_Recipient_Policy-Setting_the_Secondary_Recipient_Email_Address">
+            <title>Setting the Secondary Recipient Email Address</title>
+            <para>
+                The primary recipient email address can be changed to reflect your naming convention through this procedure:
+            </para>
+            <step>
+                <para>
+                    Edit /etc/kolab/kolab.conf and replace the value of the primary_mail setting in the applicable domain section. For example, set the policy to <literal>%(givenname)s@%(domain)s</literal> to get email addresses like <emphasis>john at example.org</emphasis> and <emphasis>jane at example.org</emphasis>.
+                </para>
+
+            </step>
+            <step>
+                <para>
+                    Edit the user types for any user that matches the filter used by the kolab daemon to determine which users are kolab users. For example, "Kolab Users" and "Mail-enabled POSIX users" both include "objectclass=kolabinetorgperson" (the default kolab_user_filter) and therefore the Kolab daemon would apply the recipient policy to these objects. For each of these user_types, make sure that the auto_form_field configuration for the mail and alias attributes include all attributes needed to compose the addresses.
+                </para>
+                <example id="exam-Administrator_Guide-Setting_the_Secondary_Recipient_Email_Address-Example">
+                    <title>Example</title>
+                    <para>
+                        para
+                    </para>
+
+                </example>
+
+            </step>
+
+        </procedure>
+
+
+    </section>
+
+    <section id="sect-Administrator_Guide-Kolab_Recipient_Policy_and_Web_Administration_Panel-Controlling_the_Primary_and_Secondary_Recipient_Email_Address_Attributes">
+        <title>Controlling the Primary and Secondary Recipient Email Address Attributes</title>
+        <para>
+            The attribute names that contain the primary and secondary recipient email addresses are controlled by the <literal>mail_attrs</literal> setting in the <literal>[<replaceable>$domain</replaceable>]</literal> section of <filename>/etc/kolab/kolab.conf</filename>. Should no such section or setting exist, the fallback in the <literal>[<replaceable>$auth_mechanism</replaceable>]</literal> section is used, where <literal>$auth_mechanism</title> is the authentication mechanism configured using the <literal>auth_mechanism</literal> setting in the <literal>[kolab]</literal> section – note that only 'ldap' is currently supported as an authentication mechanism.
+        </para>
+        <para>
+            This setting is a comma- and/or comma-space separated list of attribute names. By default, <literal>mail_attrs</literal> is set to <literal>mail, alias</literal>.
+        </para>
+        <para>
+            The first item in the list will be used as the attribute to use for primary recipient email addresses. The second item in the list will be used as the attribute to use for secondary recipient email addresses.
+        </para>
+
+    </section>
+
+    <section id="sect-Administrator_Guide-Kolab_Recipient_Policy_and_Web_Administration_Panel-Disabling_the_Recipient_Policy">
+        <title>Disabling the Recipient Policy</title>
+        <para>
+            The following procedure describes how to disable the recipient policy.
+        </para>
+        <procedure id="proc-Administrator_Guide-Disabling_the_Recipient_Policy-Disabling_the_Recipient_Policy">
+            <title>Disabling the Recipient Policy</title>
+            <step>
+                <para>
+                    Edit <filename>/etc/kolab/kolab.conf</filename> and navigate to the section applicable for your domain (named <literal>[<replaceable>$domain</replaceable>]</literal>).
+                </para>
+
+            </step>
+            <step>
+                <para>
+                    Remove the settings <literal>primary_mail</literal> and <literal>secondary_mail</literal>.
+                </para>
+
+            </step>
+            <step>
+                <para>
+                    Restart the Kolab daemon:
+                </para>
+                <para>
+
+<screen># <userinput>service kolabd restart</userinput></screen>
+
+                </para>
+
+            </step>
+            <step>
+                <para>
+                    Copy <filename>/usr/share/doc/kolab-webadmin-*/sample-insert-user_types.php</filename> to <filename>/usr/share/kolab-webadmin/</filename>:
+                </para>
+                <para>
+
+<screen># <userinput>cp /usr/share/doc/kolab-webadmin-*/sample-insert-user_types.php \</userinput>
+> <userinput>/usr/share/kolab-webadmin/</userinput></screen>
+
+                </para>
+
+            </step>
+            <step>
+                <para>
+                    Open <filename>/usr/share/kolab-webadmin/sample-insert-user_types.php</filename> in an editor.
+                </para>
+
+            </step>
+            <step>
+                <para>
+                    Remove the values of <literal>$attributes['auto_form_fields']['mail']</literal> and <literal>$attributes['auto_form_fields']['alias']</literal>. The corresponding lines should look as follows:
+                </para>
+                <para>
+
+<screen>                    "alias" => Array(
+                            "type" => "list",
+                            "data" => Array(
+                                    "givenname",
+                                    "preferredlanguage",
+                                    "sn",
+                                ),
+                        ),
+</screen>
+
+                </para>
+                <para>
+                    and:
+                </para>
+                <para>
+
+<screen>                    "mail" => Array(
+                            "data" => Array(
+                                    "givenname",
+                                    "preferredlanguage",
+                                    "sn",
+                                ),
+                        ),
+</screen>
+
+                </para>
+
+            </step>
+            <step>
+                <para>
+                    Edit the value of <literal>$attributes['form_fields']['alias']</literal> and add <literal>$attributes['form_fields']['alias']['type'] => "list"</literal>:
+                </para>
+                <para>
+
+<screen>                    "alias" => Array(
+                            "optional" => true,
+                            "type" => "list"
+                        ),
+</screen>
+
+                </para>
+
+            </step>
+            <step>
+                <para>
+                    Add a new value <literal>$attributes['form_fields']['mail']</literal> with the following contents:
+                </para>
+                <para>
+
+<screen>                    "mail" => Array(
+                            "optional" => true
+                        ),
+</screen>
+
+                </para>
+
+            </step>
+            <step>
+                <important>
+                    <para>
+                        Remember to remove the aforementioned <literal>$attributes['auto_form_fields']</literal> changes to all user types that have mail attributes.
+                    </para>
+
+                </important>
+
+            </step>
+            <step>
+                <para>
+                    Exit the editor, saving your changes, and check the PHP syntax:
+                </para>
+                <para>
+
+<screen># <userinput>cd /usr/share/kolab-webadmin/</userinput>
+# <userinput>php -l sample-insert-user_types.php</userinput></screen>
+
+                </para>
+
+            </step>
+            <step>
+                <para>
+                    Apply the changes to the database:
+                </para>
+                <para>
+
+<screen># <userinput>php sample-insert-user_types.php</userinput></screen>
+
+                </para>
+                <note>
+                    <para>
+                        You may have to log out and log back in of the Kolab Web Administration Panel for the changes to take effect.
+                    </para>
+
+                </note>
+
+            </step>
+
+        </procedure>
+
+
+    </section>
+
+
+</section>
+
+
diff --git a/Administrator_Guide/es-ES/Combating_Spam.po b/Administrator_Guide/es-ES/Combating_Spam.po
index 51e92e0..dfd8e8d 100644
--- a/Administrator_Guide/es-ES/Combating_Spam.po
+++ b/Administrator_Guide/es-ES/Combating_Spam.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:16+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Administrator_Guide/es-ES/Configuring_the_Kolab_Server.po b/Administrator_Guide/es-ES/Configuring_the_Kolab_Server.po
index 0720e59..23dd287 100644
--- a/Administrator_Guide/es-ES/Configuring_the_Kolab_Server.po
+++ b/Administrator_Guide/es-ES/Configuring_the_Kolab_Server.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:17+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Administrator_Guide/es-ES/Detailed_Kolab_Server_Overview.po b/Administrator_Guide/es-ES/Detailed_Kolab_Server_Overview.po
index 91494b0..84ecd9e 100644
--- a/Administrator_Guide/es-ES/Detailed_Kolab_Server_Overview.po
+++ b/Administrator_Guide/es-ES/Detailed_Kolab_Server_Overview.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:17+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Administrator_Guide/es-ES/Kolab_Web_Administration_Panel.po b/Administrator_Guide/es-ES/Kolab_Web_Administration_Panel.po
index 34e56d5..99ec539 100644
--- a/Administrator_Guide/es-ES/Kolab_Web_Administration_Panel.po
+++ b/Administrator_Guide/es-ES/Kolab_Web_Administration_Panel.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:17+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Administrator_Guide/es-ES/Preface.po b/Administrator_Guide/es-ES/Preface.po
index b9aab54..90b393a 100644
--- a/Administrator_Guide/es-ES/Preface.po
+++ b/Administrator_Guide/es-ES/Preface.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:18+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Administrator_Guide/es-ES/Revision_History.po b/Administrator_Guide/es-ES/Revision_History.po
index ae4f9f3..04a10be 100644
--- a/Administrator_Guide/es-ES/Revision_History.po
+++ b/Administrator_Guide/es-ES/Revision_History.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:19+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Administrator_Guide/es-ES/Tweaking_Tips_for_389_Directory_Server.po b/Administrator_Guide/es-ES/Tweaking_Tips_for_389_Directory_Server.po
index 86d991b..7ea145e 100644
--- a/Administrator_Guide/es-ES/Tweaking_Tips_for_389_Directory_Server.po
+++ b/Administrator_Guide/es-ES/Tweaking_Tips_for_389_Directory_Server.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:18+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Administrator_Guide/es-ES/Tweaking_Tips_for_Cyrus_IMAP.po b/Administrator_Guide/es-ES/Tweaking_Tips_for_Cyrus_IMAP.po
index 1e956f4..452eccc 100644
--- a/Administrator_Guide/es-ES/Tweaking_Tips_for_Cyrus_IMAP.po
+++ b/Administrator_Guide/es-ES/Tweaking_Tips_for_Cyrus_IMAP.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:18+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Administrator_Guide/es-ES/Tweaking_Tips_for_Postfix.po b/Administrator_Guide/es-ES/Tweaking_Tips_for_Postfix.po
index 49dfc79..65455d7 100644
--- a/Administrator_Guide/es-ES/Tweaking_Tips_for_Postfix.po
+++ b/Administrator_Guide/es-ES/Tweaking_Tips_for_Postfix.po
@@ -5,9 +5,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
-"PO-Revision-Date: 2012-08-13 13:16+0000\n"
-"Last-Translator: Automatically generated\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
+"PO-Revision-Date: 2012-08-24 15:42+0000\n"
+"Last-Translator: Jeroen van Meeuwen <vanmeeuwen at kolabsys.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,3 +24,66 @@ msgstr ""
 #, no-c-format
 msgid "para"
 msgstr ""
+
+#. Tag: title
+#, no-c-format
+msgid "Large Kolab Distribution Groups"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"If you have Kolab distribution groups with many members, you may see the "
+"following message occur in log file <filename>/var/log/maillog</filename>:"
+msgstr ""
+
+#. Tag: screen
+#, no-c-format
+msgid ""
+"Aug 17 10:21:59 kolab postfix/cleanup[5916]: warning: 398194A151: "
+"unreasonable virtual_alias_maps map expansion size for kolab-"
+"users at example.org"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The setting <literal>virtual_alias_expansion_limit</literal> controls the "
+"maximum number of recipient address that are produced from a single original"
+" recipient address. The default depends on your installation."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "To get the default value, execute:"
+msgstr ""
+
+#. Tag: screen
+#, no-c-format
+msgid ""
+"# <userinput>postconf -d virtual_alias_expansion_limit</userinput>\n"
+"1000"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "To get the current value, execute:"
+msgstr ""
+
+#. Tag: screen
+#, no-c-format
+msgid ""
+"# <userinput>postconf virtual_alias_expansion_limit</userinput>\n"
+"1000"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "To set a new value, execute:"
+msgstr ""
+
+#. Tag: screen
+#, no-c-format
+msgid ""
+"# <userinput>postconf -e virtual_alias_expansion_limit=10000</userinput>"
+msgstr ""
diff --git a/Administrator_Guide/es-ES/Tweaking_Tips_for_Roundcube.po b/Administrator_Guide/es-ES/Tweaking_Tips_for_Roundcube.po
index fb27323..83dc09e 100644
--- a/Administrator_Guide/es-ES/Tweaking_Tips_for_Roundcube.po
+++ b/Administrator_Guide/es-ES/Tweaking_Tips_for_Roundcube.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:18+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Administrator_Guide/es-ES/Upgrading_Accounts_from_Kolab_Format_version_2.po b/Administrator_Guide/es-ES/Upgrading_Accounts_from_Kolab_Format_version_2.po
index bf89a0b..649c014 100644
--- a/Administrator_Guide/es-ES/Upgrading_Accounts_from_Kolab_Format_version_2.po
+++ b/Administrator_Guide/es-ES/Upgrading_Accounts_from_Kolab_Format_version_2.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:18+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Administrator_Guide/es-ES/Upgrading_from_Kolab_2_on_OpenPKG.po b/Administrator_Guide/es-ES/Upgrading_from_Kolab_2_on_OpenPKG.po
index 626b24d..01d8364 100644
--- a/Administrator_Guide/es-ES/Upgrading_from_Kolab_2_on_OpenPKG.po
+++ b/Administrator_Guide/es-ES/Upgrading_from_Kolab_2_on_OpenPKG.po
@@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
-"PO-Revision-Date: 2012-08-15 22:09+0000\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
+"PO-Revision-Date: 2012-08-24 15:43+0000\n"
 "Last-Translator: Jeroen van Meeuwen <vanmeeuwen at kolabsys.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -463,9 +463,9 @@ msgid ""
 ">   <userinput>sed -e 's/user\\///g' | \\</userinput>\n"
 ">   <userinput>while read user; do</userinput>\n"
 ">       <userinput>kolab-formatupgrade \\</userinput>\n"
-">           <userinput>--user cyrus-admin \\</userinput>\n"
+">           <userinput>--user \"${user}\" \\</userinput>\n"
 ">           <userinput>--password <replaceable>$password</replaceable> \\</userinput>\n"
-">           <userinput>--proxyauth \"${user}\" \\</userinput>\n"
+">           <userinput>--proxyauth cyrus-admin \\</userinput>\n"
 ">           <userinput>--port 143 \\</userinput>\n"
 ">           <userinput>--encrypt TLS \\</userinput>\n"
 ">           <userinput><replaceable>localhost</replaceable></userinput>\n"
diff --git a/Administrator_Guide/es-ES/Verifying_the_Installation.po b/Administrator_Guide/es-ES/Verifying_the_Installation.po
index f41d7ae..b6997d7 100644
--- a/Administrator_Guide/es-ES/Verifying_the_Installation.po
+++ b/Administrator_Guide/es-ES/Verifying_the_Installation.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:18+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Administrator_Guide/es-ES/chap-About_Kolab_Groupware.po b/Administrator_Guide/es-ES/chap-About_Kolab_Groupware.po
index 79600d0..300f59d 100644
--- a/Administrator_Guide/es-ES/chap-About_Kolab_Groupware.po
+++ b/Administrator_Guide/es-ES/chap-About_Kolab_Groupware.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:17+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Administrator_Guide/es-ES/part-Clients.po b/Administrator_Guide/es-ES/part-Clients.po
index df2cf92..a837eeb 100644
--- a/Administrator_Guide/es-ES/part-Clients.po
+++ b/Administrator_Guide/es-ES/part-Clients.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:17+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Administrator_Guide/es-ES/part-Kolab_Server.po b/Administrator_Guide/es-ES/part-Kolab_Server.po
index a239bb2..78e8eef 100644
--- a/Administrator_Guide/es-ES/part-Kolab_Server.po
+++ b/Administrator_Guide/es-ES/part-Kolab_Server.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:17+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Administrator_Guide/es-ES/sect-About_Kolab_Groupware.po b/Administrator_Guide/es-ES/sect-About_Kolab_Groupware.po
index 1e85129..98fce6a 100644
--- a/Administrator_Guide/es-ES/sect-About_Kolab_Groupware.po
+++ b/Administrator_Guide/es-ES/sect-About_Kolab_Groupware.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:53\n"
 "PO-Revision-Date: 2012-08-13 14:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Administrator_Guide/es-ES/sect-Feedback.po b/Administrator_Guide/es-ES/sect-Feedback.po
index f87560c..7f1e033 100644
--- a/Administrator_Guide/es-ES/sect-Feedback.po
+++ b/Administrator_Guide/es-ES/sect-Feedback.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:53\n"
 "PO-Revision-Date: 2012-08-13 14:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Administrator_Guide/es-ES/sect-Kolab_Product_Series.po b/Administrator_Guide/es-ES/sect-Kolab_Product_Series.po
index d440393..d911148 100644
--- a/Administrator_Guide/es-ES/sect-Kolab_Product_Series.po
+++ b/Administrator_Guide/es-ES/sect-Kolab_Product_Series.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:53\n"
 "PO-Revision-Date: 2012-08-13 14:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Administrator_Guide/es-ES/sect-Supported_Platforms_and_System_Requirements.po b/Administrator_Guide/es-ES/sect-Supported_Platforms_and_System_Requirements.po
index 7e7af66..0413267 100644
--- a/Administrator_Guide/es-ES/sect-Supported_Platforms_and_System_Requirements.po
+++ b/Administrator_Guide/es-ES/sect-Supported_Platforms_and_System_Requirements.po
@@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
-"PO-Revision-Date: 2012-08-15 22:09+0000\n"
+"POT-Creation-Date: 2012-08-24T15:41:53\n"
+"PO-Revision-Date: 2012-08-24 15:44+0000\n"
 "Last-Translator: Jeroen van Meeuwen <vanmeeuwen at kolabsys.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
 "MIME-Version: 1.0\n"
diff --git a/Administrator_Guide/es-ES/step-convert-seen-databases.po b/Administrator_Guide/es-ES/step-convert-seen-databases.po
index faad1da..686e6fb 100644
--- a/Administrator_Guide/es-ES/step-convert-seen-databases.po
+++ b/Administrator_Guide/es-ES/step-convert-seen-databases.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:53\n"
 "PO-Revision-Date: 2012-08-13 13:17+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Administrator_Guide/es-ES/step-select-all-mailboxes.po b/Administrator_Guide/es-ES/step-select-all-mailboxes.po
index a926bfc..4d25b24 100644
--- a/Administrator_Guide/es-ES/step-select-all-mailboxes.po
+++ b/Administrator_Guide/es-ES/step-select-all-mailboxes.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:53\n"
 "PO-Revision-Date: 2012-08-15 22:08+0000\n"
 "Last-Translator: Jeroen van Meeuwen <vanmeeuwen at kolabsys.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Administrator_Guide/fr-FR/Tweaking_Tips_for_Postfix.po b/Administrator_Guide/fr-FR/Tweaking_Tips_for_Postfix.po
index 1216a75..ca85500 100644
--- a/Administrator_Guide/fr-FR/Tweaking_Tips_for_Postfix.po
+++ b/Administrator_Guide/fr-FR/Tweaking_Tips_for_Postfix.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-13T14:57:51\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13T14:49:20\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
@@ -22,3 +22,57 @@ msgstr ""
 #, no-c-format
 msgid "para"
 msgstr ""
+
+#. Tag: title
+#, no-c-format
+msgid "Large Kolab Distribution Groups"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "If you have Kolab distribution groups with many members, you may see the following message occur in log file <filename>/var/log/maillog</filename>:"
+msgstr ""
+
+#. Tag: screen
+#, no-c-format
+msgid "Aug 17 10:21:59 kolab postfix/cleanup[5916]: warning: 398194A151: unreasonable virtual_alias_maps map expansion size for kolab-users at example.org"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "The setting <literal>virtual_alias_expansion_limit</literal> controls the maximum number of recipient address that are produced from a single original recipient address. The default depends on your installation."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "To get the default value, execute:"
+msgstr ""
+
+#. Tag: screen
+#, no-c-format
+msgid ""
+"# <userinput>postconf -d virtual_alias_expansion_limit</userinput>\n"
+"1000"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "To get the current value, execute:"
+msgstr ""
+
+#. Tag: screen
+#, no-c-format
+msgid ""
+"# <userinput>postconf virtual_alias_expansion_limit</userinput>\n"
+"1000"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "To set a new value, execute:"
+msgstr ""
+
+#. Tag: screen
+#, no-c-format
+msgid "# <userinput>postconf -e virtual_alias_expansion_limit=10000</userinput>"
+msgstr ""
diff --git a/Administrator_Guide/fr-FR/Upgrading_from_Kolab_2_on_OpenPKG.po b/Administrator_Guide/fr-FR/Upgrading_from_Kolab_2_on_OpenPKG.po
index 065f358..f82d279 100644
--- a/Administrator_Guide/fr-FR/Upgrading_from_Kolab_2_on_OpenPKG.po
+++ b/Administrator_Guide/fr-FR/Upgrading_from_Kolab_2_on_OpenPKG.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13T14:49:20\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
@@ -397,9 +397,9 @@ msgid ""
 ">   <userinput>sed -e 's/user\\///g' | \\</userinput>\n"
 ">   <userinput>while read user; do</userinput>\n"
 ">       <userinput>kolab-formatupgrade \\</userinput>\n"
-">           <userinput>--user cyrus-admin \\</userinput>\n"
+">           <userinput>--user \"${user}\" \\</userinput>\n"
 ">           <userinput>--password <replaceable>$password</replaceable> \\</userinput>\n"
-">           <userinput>--proxyauth \"${user}\" \\</userinput>\n"
+">           <userinput>--proxyauth cyrus-admin \\</userinput>\n"
 ">           <userinput>--port 143 \\</userinput>\n"
 ">           <userinput>--encrypt TLS \\</userinput>\n"
 ">           <userinput><replaceable>localhost</replaceable></userinput>\n"
diff --git a/Administrator_Guide/ja-JP/Administrator_Guide.po b/Administrator_Guide/ja-JP/Administrator_Guide.po
index 5dd79b1..d801043 100644
--- a/Administrator_Guide/ja-JP/Administrator_Guide.po
+++ b/Administrator_Guide/ja-JP/Administrator_Guide.po
@@ -1,14 +1,14 @@
-# 
+#
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-24T15:34:45\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-
diff --git a/Administrator_Guide/ja-JP/Author_Group.po b/Administrator_Guide/ja-JP/Author_Group.po
index 9f1d800..e488bf5 100644
--- a/Administrator_Guide/ja-JP/Author_Group.po
+++ b/Administrator_Guide/ja-JP/Author_Group.po
@@ -1,13 +1,14 @@
-# 
+#
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-24T15:34:45\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -46,4 +47,3 @@ msgstr ""
 #, no-c-format
 msgid "Systems Architect"
 msgstr ""
-
diff --git a/Administrator_Guide/ja-JP/Book_Info.po b/Administrator_Guide/ja-JP/Book_Info.po
index 12e238e..2d228aa 100644
--- a/Administrator_Guide/ja-JP/Book_Info.po
+++ b/Administrator_Guide/ja-JP/Book_Info.po
@@ -1,13 +1,14 @@
-# 
+#
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-24T15:34:45\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,4 +32,3 @@ msgstr ""
 #, no-c-format
 msgid "A short overview and summary of the book's subject and purpose, traditionally no more than one paragraph long. Note: the abstract will appear in the front matter of your book and will also be placed in the description field of the book's RPM spec file."
 msgstr ""
-
diff --git a/Administrator_Guide/ja-JP/Combating_Spam.po b/Administrator_Guide/ja-JP/Combating_Spam.po
index 2612db9..44fa890 100644
--- a/Administrator_Guide/ja-JP/Combating_Spam.po
+++ b/Administrator_Guide/ja-JP/Combating_Spam.po
@@ -1,16 +1,19 @@
-# 
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:45\n"
-"PO-Revision-Date: 2012-08-24T15:34:45\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
+"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
+"PO-Revision-Date: 2012-08-13 13:16+0000\n"
 "Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab/language/ja/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. Tag: title
 #, no-c-format
@@ -19,37 +22,60 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Kolab Groupware includes <application>SpamAssassin</application>, a fast, well-established anti-spam solution with a large community of supporters contributing not only to the code, but to rulesets as well."
+msgid ""
+"Kolab Groupware includes <application>SpamAssassin</application>, a fast, "
+"well-established anti-spam solution with a large community of supporters "
+"contributing not only to the code, but to rulesets as well."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Combating spam is always a tricky situation. On the organizational level, a strategy has to be formulated to combat spam in order to achieve the maximum flexibility and effectiveness for individual users, separate organizations, and the deployment as a whole."
+msgid ""
+"Combating spam is always a tricky situation. On the organizational level, a "
+"strategy has to be formulated to combat spam in order to achieve the maximum"
+" flexibility and effectiveness for individual users, separate organizations,"
+" and the deployment as a whole."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "A common deployment is to define deployment-wide user preferences and to use a single, deployment-wide set of rules for <application>SpamAssassin</application> to operate with -including Bayes database(s)."
+msgid ""
+"A common deployment is to define deployment-wide user preferences and to use"
+" a single, deployment-wide set of rules for "
+"<application>SpamAssassin</application> to operate with -including Bayes "
+"database(s)."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The problems start when individual users mark legitimate email as spam, most notably the company newsletter or correspondation they have opted in some time ago, but wish to no longer receive. Users tend to ignore the long-term effects of marking these message as spam, if at all they are aware of any, and just want such messages out of their way."
+msgid ""
+"The problems start when individual users mark legitimate email as spam, most"
+" notably the company newsletter or correspondation they have opted in some "
+"time ago, but wish to no longer receive. Users tend to ignore the long-term "
+"effects of marking these message as spam, if at all they are aware of any, "
+"and just want such messages out of their way."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Common examples of the sort of messages that are often marked as spam while being legitimate traffic include:"
+msgid ""
+"Common examples of the sort of messages that are often marked as spam while "
+"being legitimate traffic include:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Newsletters, where users, rather then unsubscribe, mark legitimate messages as spam,"
+msgid ""
+"Newsletters, where users, rather then unsubscribe, mark legitimate messages "
+"as spam,"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Notifications from social networks such as from Google+, Facebook, Twitter, etc., where users, rather then adjust their notification preferences, mark legitimate messages as spam,"
+msgid ""
+"Notifications from social networks such as from Google+, Facebook, Twitter, "
+"etc., where users, rather then adjust their notification preferences, mark "
+"legitimate messages as spam,"
 msgstr ""
 
 #. Tag: para
@@ -59,32 +85,50 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "If enough users mark these messages as spam, the system will start to recognize these messages as spam, and other users may be prevented from receiving the same or similar messages in their INBOX."
+msgid ""
+"If enough users mark these messages as spam, the system will start to "
+"recognize these messages as spam, and other users may be prevented from "
+"receiving the same or similar messages in their INBOX."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "<application>Amavis</application>, the default content filter performing anti-virus and anti-spam, wraps around <application>SpamAssassin</application> to achieve this flexibility."
+msgid ""
+"<application>Amavis</application>, the default content filter performing "
+"anti-virus and anti-spam, wraps around "
+"<application>SpamAssassin</application> to achieve this flexibility."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Separate Bayes database(s) can be created on a per-recipient and per-policy-bank <application>SpamAssassin</application> configuration files and SQL Bayes usernames."
+msgid ""
+"Separate Bayes database(s) can be created on a per-recipient and per-policy-"
+"bank <application>SpamAssassin</application> configuration files and SQL "
+"Bayes usernames."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Without over-complicating things, a common scenario sufficiently serving the anti-spam effort, includes the following aspects;"
+msgid ""
+"Without over-complicating things, a common scenario sufficiently serving the"
+" anti-spam effort, includes the following aspects;"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "A <code>shared/Spam</code> folder is created, with permissions for all users to lookup, read, and insert messages. It is the intention users move or copy messages they think are spam into this folder."
+msgid ""
+"A <code>shared/Spam</code> folder is created, with permissions for all users"
+" to lookup, read, and insert messages. It is the intention users move or "
+"copy messages they think are spam into this folder."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Note that, optionally, the permissions for users to maintain the 'seen' state of messages could not be granted, which in combination with <literal>sharedseen</literal> could provide a mechanism that would allow users to view which messages have been learned as spam in the past."
+msgid ""
+"Note that, optionally, the permissions for users to maintain the 'seen' "
+"state of messages could not be granted, which in combination with "
+"<literal>sharedseen</literal> could provide a mechanism that would allow "
+"users to view which messages have been learned as spam in the past."
 msgstr ""
 
 #. Tag: title
@@ -99,12 +143,16 @@ msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "$ <userinput>find /var/spool/imap/ -type d -name \"Spam\" -o -name \"Junk\"</userinput>"
+msgid ""
+"$ <userinput>find /var/spool/imap/ -type d -name \"Spam\" -o -name "
+"\"Junk\"</userinput>"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Finding all folders called \"Spam\" or \"Junk\" can potentially take a long time, depending on the size of the spool."
+msgid ""
+"Finding all folders called \"Spam\" or \"Junk\" can potentially take a long "
+"time, depending on the size of the spool."
 msgstr ""
 
 #. Tag: screen
@@ -114,12 +162,21 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "<application>SpamAssassin</application> will not learn about messages it has learned about before. There's no requirement of purging or deleting the messages that <application>SpamAssassin</application> has learned about already, and purging or deleting those messages only helps to speed up the learning process run."
+msgid ""
+"<application>SpamAssassin</application> will not learn about messages it has"
+" learned about before. There's no requirement of purging or deleting the "
+"messages that <application>SpamAssassin</application> has learned about "
+"already, and purging or deleting those messages only helps to speed up the "
+"learning process run."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Do NOT delete the messages from the filesystem directly. Please refer to <xref linkend=\"sect-Administrator_Guide-Combating_Spam-Expiring_Messages_from_SpamHam_Shared_Folders\" /> for ways to purge, expire and/or delete messages from spam folders in a sustainable way."
+msgid ""
+"Do NOT delete the messages from the filesystem directly. Please refer to "
+"<xref linkend=\"sect-Administrator_Guide-Combating_Spam-"
+"Expiring_Messages_from_SpamHam_Shared_Folders\" /> for ways to purge, expire"
+" and/or delete messages from spam folders in a sustainable way."
 msgstr ""
 
 #. Tag: title
@@ -129,12 +186,20 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "As Bayes is only effective after it has learned about 200 messages, it is recommended to preseed the Bayes database with some high-quality ham and spam. Preseeding the Bayes database with some ham, and some spam, is done using the <emphasis>SpamAssassin Public Corpus</emphasis>. The public corpus consists of many messages qualified as ham and spam, collected from a variety of sources."
+msgid ""
+"As Bayes is only effective after it has learned about 200 messages, it is "
+"recommended to preseed the Bayes database with some high-quality ham and "
+"spam. Preseeding the Bayes database with some ham, and some spam, is done "
+"using the <emphasis>SpamAssassin Public Corpus</emphasis>. The public corpus"
+" consists of many messages qualified as ham and spam, collected from a "
+"variety of sources."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The SpamAssassin Public Corpus can be found at <ulink url=\"http://spamassassin.apache.org/publiccorpus/\" />."
+msgid ""
+"The SpamAssassin Public Corpus can be found at <ulink "
+"url=\"http://spamassassin.apache.org/publiccorpus/\" />."
 msgstr ""
 
 #. Tag: title
@@ -149,7 +214,8 @@ msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "# mkdir -p /tmp/salearn\n"
+msgid ""
+"# mkdir -p /tmp/salearn\n"
 "# cd /tmp/salearn\n"
 "# wget --recursive --timestamping --no-directories --level=1 --reject=gif,png,html,=A,=D http://spamassassin.apache.org/publiccorpus/"
 msgstr ""
@@ -176,7 +242,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The total number of messages is about 7000. Learning about all of them may take quite a while. We recommend running the command in a screen."
+msgid ""
+"The total number of messages is about 7000. Learning about all of them may "
+"take quite a while. We recommend running the command in a screen."
 msgstr ""
 
 #. Tag: para
@@ -191,7 +259,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The total number of messages is about 2500. Learning about all of them may take quite a while. We recommend running the command in a screen."
+msgid ""
+"The total number of messages is about 2500. Learning about all of them may "
+"take quite a while. We recommend running the command in a screen."
 msgstr ""
 
 #. Tag: title
@@ -201,7 +271,10 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "To learn about spam quickly, allow the Cyrus IMAP postuser to post into a shared folder that will be included in the regular <command>sa-learn</command> run."
+msgid ""
+"To learn about spam quickly, allow the Cyrus IMAP postuser to post into a "
+"shared folder that will be included in the regular <command>sa-"
+"learn</command> run."
 msgstr ""
 
 #. Tag: title
@@ -211,12 +284,17 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Set up the Cyrus IMAP postuser, using the <literal>postuser</literal> setting in <filename>/etc/imapd.conf</filename>."
+msgid ""
+"Set up the Cyrus IMAP postuser, using the <literal>postuser</literal> "
+"setting in <filename>/etc/imapd.conf</filename>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "If, for example, the <literal>postuser</literal> is set to <literal>bb</literal>, the mail to <literal>bb+shared.blah</literal> will be delivered to the <literal>shared.blah</literal> folder."
+msgid ""
+"If, for example, the <literal>postuser</literal> is set to "
+"<literal>bb</literal>, the mail to <literal>bb+shared.blah</literal> will be"
+" delivered to the <literal>shared.blah</literal> folder."
 msgstr ""
 
 #. Tag: para
@@ -236,12 +314,16 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Submit / subscribe to known spam aggregators (search Google for \"free email offers\")"
+msgid ""
+"Submit / subscribe to known spam aggregators (search Google for \"free email"
+" offers\")"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Optionally, set the <literal>luser_relay</literal> option in Postfix, to trap all messages sent to non-existent recipients."
+msgid ""
+"Optionally, set the <literal>luser_relay</literal> option in Postfix, to "
+"trap all messages sent to non-existent recipients."
 msgstr ""
 
 #. Tag: title
@@ -251,22 +333,45 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Bayes' score is dependent on the probability Bayes attaches of a message being spam. The rules used to match a message's probability of being spam are systematically prefixed with <literal>BAYES_</literal>, followed by the percentage of likelihood of the message being spam."
+msgid ""
+"Bayes' score is dependent on the probability Bayes attaches of a message "
+"being spam. The rules used to match a message's probability of being spam "
+"are systematically prefixed with <literal>BAYES_</literal>, followed by the "
+"percentage of likelihood of the message being spam."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Because there is rarely a 100% certainty of a message being spam, the highest percentage is 99%. By default, the configuration attaches a 3.5 score to this probability. Depending on the configuration value for <literal>$sa_tag2_level_deflt</literal> supplied in the Amavis configuration file, <literal>6.31</literal> by default, it is unlikely spam will reach the cut-off point of actually being marked as spam solely on the basis of Bayes' probability score."
+msgid ""
+"Because there is rarely a 100% certainty of a message being spam, the "
+"highest percentage is 99%. By default, the configuration attaches a 3.5 "
+"score to this probability. Depending on the configuration value for "
+"<literal>$sa_tag2_level_deflt</literal> supplied in the Amavis configuration"
+" file, <literal>6.31</literal> by default, it is unlikely spam will reach "
+"the cut-off point of actually being marked as spam solely on the basis of "
+"Bayes' probability score."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "It is therefor recommended to increase the score attached to messages with a 99% probability of being spam to at least <literal>6.308</literal>, if not simply <literal>6.31</literal>. Using <literal>6.308</literal>, you configure spam to be tagged not solely on the basis of Bayes' 99% probability score, but request that in addition the message is recognized to be in HTML (and HTML only), and perhaps uses a big font –or similar patterns with a very small <literal>0.01</literal> score."
+msgid ""
+"It is therefor recommended to increase the score attached to messages with a"
+" 99% probability of being spam to at least <literal>6.308</literal>, if not "
+"simply <literal>6.31</literal>. Using <literal>6.308</literal>, you "
+"configure spam to be tagged not solely on the basis of Bayes' 99% "
+"probability score, but request that in addition the message is recognized to"
+" be in HTML (and HTML only), and perhaps uses a big font –or similar "
+"patterns with a very small <literal>0.01</literal> score."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Some spam has been submitted through systems listed at <ulink url=\"http://dnswl.org\" />, a collaborative false positive protection mechanism, a default score of 1 is substracted from the total score. If this spam reaches you, consider increasing the score on <literal>BAYES_99</literal> with another one point."
+msgid ""
+"Some spam has been submitted through systems listed at <ulink "
+"url=\"http://dnswl.org\" />, a collaborative false positive protection "
+"mechanism, a default score of 1 is substracted from the total score. If this"
+" spam reaches you, consider increasing the score on "
+"<literal>BAYES_99</literal> with another one point."
 msgstr ""
 
 #. Tag: title
@@ -276,7 +381,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Edit <filename>/etc/mail/spamassassin/local.cf</filename>, and make sure the following line is present:"
+msgid ""
+"Edit <filename>/etc/mail/spamassassin/local.cf</filename>, and make sure the"
+" following line is present:"
 msgstr ""
 
 #. Tag: screen
@@ -301,17 +408,29 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "It is important to not just learn about spam, but learn about ham, legitimate email messages, as well. When not learning about ham, the anti-spam system will become heavily biased towards spam, and ultimately classify all email messages as such."
+msgid ""
+"It is important to not just learn about spam, but learn about ham, "
+"legitimate email messages, as well. When not learning about ham, the anti-"
+"spam system will become heavily biased towards spam, and ultimately classify"
+" all email messages as such."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Learning about ham follows a slightly different doctrine then learning about spam. Most importantly, ham is not to be posted to a shared folder that everyone else can read the contents from. It is most commonly a \"Not Junk\" or \"Ham\" folder in one's personal namespace users are instructed to copy or move messages to, that have been classified as spam but are actually ham."
+msgid ""
+"Learning about ham follows a slightly different doctrine then learning about"
+" spam. Most importantly, ham is not to be posted to a shared folder that "
+"everyone else can read the contents from. It is most commonly a \"Not Junk\""
+" or \"Ham\" folder in one's personal namespace users are instructed to copy "
+"or move messages to, that have been classified as spam but are actually ham."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "It is recommended users are both instructed to use ham folders, as well as create them by default —regardless whether they are called \"Ham\" or \"Not Junk\" or equivalent localized version of such."
+msgid ""
+"It is recommended users are both instructed to use ham folders, as well as "
+"create them by default —regardless whether they are called \"Ham\" or "
+"\"Not Junk\" or equivalent localized version of such."
 msgstr ""
 
 #. Tag: para
@@ -326,17 +445,29 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "When you share folders to which users can move or copy ham and/or spam messages, it is sensible to purge the contents of those folders regularly, or the folder size continues to increase indefinitely. Run the expiry after <command>sa-learn</command> has been run."
+msgid ""
+"When you share folders to which users can move or copy ham and/or spam "
+"messages, it is sensible to purge the contents of those folders regularly, "
+"or the folder size continues to increase indefinitely. Run the expiry after "
+"<command>sa-learn</command> has been run."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Running <command>ipurge</command> to purge mail folder messages occurs independent from setting <literal>expunge_mode</literal>, and independent from the <literal>expire</literal> annotation as well."
+msgid ""
+"Running <command>ipurge</command> to purge mail folder messages occurs "
+"independent from setting <literal>expunge_mode</literal>, and independent "
+"from the <literal>expire</literal> annotation as well."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Using the <literal>expire</literal> annotation is sufficient to purge the contents of the folder, as, with or without the <literal>expunge_mode</literal> setting having been set to delayed, rather then immediate, the Bayes database will only be updated with messages Bayes has not learned about before."
+msgid ""
+"Using the <literal>expire</literal> annotation is sufficient to purge the "
+"contents of the folder, as, with or without the "
+"<literal>expunge_mode</literal> setting having been set to delayed, rather "
+"then immediate, the Bayes database will only be updated with messages Bayes "
+"has not learned about before."
 msgstr ""
 
 #. Tag: para
@@ -346,7 +477,8 @@ msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "$ <userinput>/usr/lib/cyrus-imapd/ipurge -d 1 user/folder/name at domain.tld</userinput>\n"
+msgid ""
+"$ <userinput>/usr/lib/cyrus-imapd/ipurge -d 1 user/folder/name at domain.tld</userinput>\n"
 "(...output abbreviated...)\n"
 "$ <userinput>/usr/lib/cyrus-imapd/ipurge -i -d 1 user/folder/name at domain.tld</userinput>"
 msgstr ""
@@ -358,22 +490,36 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "As part of the <application>SpamAssasin</application> package, a utility is provided to update the rulesets from channels configured."
+msgid ""
+"As part of the <application>SpamAssasin</application> package, a utility is "
+"provided to update the rulesets from channels configured."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "For systems on which either of the SpamAssassin daemon or Amavis daemon is running, the software packages automatically install a nightly cronjob to ensure the rules are updated frequently."
+msgid ""
+"For systems on which either of the SpamAssassin daemon or Amavis daemon is "
+"running, the software packages automatically install a nightly cronjob to "
+"ensure the rules are updated frequently."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The spam rulesets are updated using the <command>sa-update</command> command, supplying one or more <literal>--channel</literal> options specifying the names of the ruleset channels to update, and (optionally) one or more <literal>--gpgkey</literal> options specifying the Pretty Good Privacy keys to allow signatures on the rulesets to have been signed with."
+msgid ""
+"The spam rulesets are updated using the <command>sa-update</command> "
+"command, supplying one or more <literal>--channel</literal> options "
+"specifying the names of the ruleset channels to update, and (optionally) one"
+" or more <literal>--gpgkey</literal> options specifying the Pretty Good "
+"Privacy keys to allow signatures on the rulesets to have been signed with."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The cronjob that is installed by default, executes <command>sa-update</command> for all channels defined in <filename>/etc/mail/spamassassin/channels.d/</filename> with one file per channel."
+msgid ""
+"The cronjob that is installed by default, executes <command>sa-"
+"update</command> for all channels defined in "
+"<filename>/etc/mail/spamassassin/channels.d/</filename> with one file per "
+"channel."
 msgstr ""
 
 #. Tag: title
@@ -383,7 +529,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "If more then one system needs to make use of the Bayes database, consider using a network SQL Bayes database."
+msgid ""
+"If more then one system needs to make use of the Bayes database, consider "
+"using a network SQL Bayes database."
 msgstr ""
 
 #. Tag: title
@@ -398,7 +546,8 @@ msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "# mysql -e 'create database <emphasis>kolab_bayes</emphasis><footnote> <para>\n"
+msgid ""
+"# mysql -e 'create database <emphasis>kolab_bayes</emphasis><footnote> <para>\n"
 "                        Replace with desired database name\n"
 "                    </para>\n"
 "                    </footnote>;'"
@@ -411,7 +560,8 @@ msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "# mysql -e \"CREATE USER '<emphasis>kolab_bayes</emphasis><footnote> <para>\n"
+msgid ""
+"# mysql -e \"CREATE USER '<emphasis>kolab_bayes</emphasis><footnote> <para>\n"
 "                        Replace with desired username\n"
 "                    </para>\n"
 "                    </footnote>'@'%' IDENTIFIED BY PASSWORD '<emphasis>Welcome2KolabSystems</emphasis><footnote> <para>\n"
@@ -427,7 +577,8 @@ msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "# mysql -e \"GRANT USAGE ON * . * TO '<emphasis>kolab_bayes</emphasis><footnote> <para>\n"
+msgid ""
+"# mysql -e \"GRANT USAGE ON * . * TO '<emphasis>kolab_bayes</emphasis><footnote> <para>\n"
 "                        Replace with desired username\n"
 "                    </para>\n"
 "                    </footnote>'@'%' IDENTIFIED BY PASSWORD '<emphasis>Welcome2KolabSystems</emphasis><footnote> <para>\n"
@@ -455,12 +606,18 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Download the latest Bayes Database SQL schema file from <ulink url=\"http://svn.apache.org/repos/asf/spamassassin/trunk/sql/bayes_mysql.sql\">bayes_mysql.sql</ulink> (when using MySQL):"
+msgid ""
+"Download the latest Bayes Database SQL schema file from <ulink "
+"url=\"http://svn.apache.org/repos/asf/spamassassin/trunk/sql/bayes_mysql.sql\">bayes_mysql.sql</ulink>"
+" (when using MySQL):"
 msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "# wget <ulink url=\"http://svn.apache.org/repos/asf/spamassassin/trunk/sql/bayes_mysql.sql\" />"
+msgid ""
+"# wget <ulink "
+"url=\"http://svn.apache.org/repos/asf/spamassassin/trunk/sql/bayes_mysql.sql\""
+" />"
 msgstr ""
 
 #. Tag: para
@@ -470,7 +627,8 @@ msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "# mysql <emphasis>kolab_bayes</emphasis><footnote> <para>\n"
+msgid ""
+"# mysql <emphasis>kolab_bayes</emphasis><footnote> <para>\n"
 "                        Replace with database name used.\n"
 "                    </para>\n"
 "                    </footnote> < bayes_mysql.sql"
@@ -483,7 +641,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "First, export any existing Bayes databases, run the following command (on each server with a Bayes database):"
+msgid ""
+"First, export any existing Bayes databases, run the following command (on "
+"each server with a Bayes database):"
 msgstr ""
 
 #. Tag: screen
@@ -493,7 +653,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "A recommended step, but completely optional, is to expire the current copy of the database:"
+msgid ""
+"A recommended step, but completely optional, is to expire the current copy "
+"of the database:"
 msgstr ""
 
 #. Tag: screen
@@ -503,12 +665,15 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Modify <filename>/etc/mail/spamassassin/local.cf</filename> to contain the following settings:"
+msgid ""
+"Modify <filename>/etc/mail/spamassassin/local.cf</filename> to contain the "
+"following settings:"
 msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "bayes_store_module        Mail::SpamAssassin::BayesStore::SQL\n"
+msgid ""
+"bayes_store_module        Mail::SpamAssassin::BayesStore::SQL\n"
 "bayes_sql_dsn            DBI:mysql:<emphasis>kolab_bayes</emphasis><footnote> <para>\n"
 "                        Replace with database name\n"
 "                    </para>\n"
@@ -544,12 +709,20 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "For the purpose of troubleshooting, or in deployments with clients that have spam filtering capabilities, it is sensible to always insert the spam headers into email messages, both to avoid clients scanning the message again, as well as troubleshooting why mail may or may not have been filtered."
+msgid ""
+"For the purpose of troubleshooting, or in deployments with clients that have"
+" spam filtering capabilities, it is sensible to always insert the spam "
+"headers into email messages, both to avoid clients scanning the message "
+"again, as well as troubleshooting why mail may or may not have been "
+"filtered."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "To always insert the spam score into the message headers, find the line in <filename>/etc/amavisd/amavisd.conf</filename> that starts with <literal>$sa_tag_level_deflt</literal> and replace it with:"
+msgid ""
+"To always insert the spam score into the message headers, find the line in "
+"<filename>/etc/amavisd/amavisd.conf</filename> that starts with "
+"<literal>$sa_tag_level_deflt</literal> and replace it with:"
 msgstr ""
 
 #. Tag: screen
@@ -559,17 +732,32 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "While the score is available from the log files should the level of logging verbosity have been increased, in some scenarios it is necessary to include the spam score regardless of the traffic being inbound or outbound. An example is a mail gateway for an unknown number of, or regularly changing, or dynamic, or large list of domain name spaces with both inbound and outbound traffic, which needs to be protected senders as well as receivers from spam."
+msgid ""
+"While the score is available from the log files should the level of logging "
+"verbosity have been increased, in some scenarios it is necessary to include "
+"the spam score regardless of the traffic being inbound or outbound. An "
+"example is a mail gateway for an unknown number of, or regularly changing, "
+"or dynamic, or large list of domain name spaces with both inbound and "
+"outbound traffic, which needs to be protected senders as well as receivers "
+"from spam."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Normally only inbound traffic is tagged –if at all–, by recognizing the recipient domain name space as local. The setting <literal>@local_domains</literal> or, in later versions of Amavis, <literal>@local_domains_acl</literal> is used."
+msgid ""
+"Normally only inbound traffic is tagged –if at all–, by "
+"recognizing the recipient domain name space as local. The setting "
+"<literal>@local_domains</literal> or, in later versions of Amavis, "
+"<literal>@local_domains_acl</literal> is used."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "In a default Kolab Groupware installation, the recipients are looked up in LDAP, and if an entry is found, Amavisd will also classify the domain as local – regardless of any <literal>@local_domains</literal> and/or <literal>@local_domains_acl</literal> setting."
+msgid ""
+"In a default Kolab Groupware installation, the recipients are looked up in "
+"LDAP, and if an entry is found, Amavisd will also classify the domain as "
+"local – regardless of any <literal>@local_domains</literal> and/or "
+"<literal>@local_domains_acl</literal> setting."
 msgstr ""
 
 #. Tag: title
@@ -579,7 +767,10 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "To recognize all domain name spaces as local, edit <filename>/etc/amavisd/amavisd.conf</filename> and make sure the following settings are not configured:"
+msgid ""
+"To recognize all domain name spaces as local, edit "
+"<filename>/etc/amavisd/amavisd.conf</filename> and make sure the following "
+"settings are not configured:"
 msgstr ""
 
 #. Tag: para
@@ -629,7 +820,13 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The default behaviour shown in a Kolab Groupware deployment depends on the default settings that come with the packages delivered mostly through native, distribution-specific software repositories. This chapter documents various aspects of the behaviour Kolab Groupware will show referring to the appropriate settings that will allow a system administrator to modify the behaviour."
+msgid ""
+"The default behaviour shown in a Kolab Groupware deployment depends on the "
+"default settings that come with the packages delivered mostly through "
+"native, distribution-specific software repositories. This chapter documents "
+"various aspects of the behaviour Kolab Groupware will show referring to the "
+"appropriate settings that will allow a system administrator to modify the "
+"behaviour."
 msgstr ""
 
 #. Tag: title
@@ -639,7 +836,8 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Amavisd, by default, adds spam information headers only to messages that;"
+msgid ""
+"Amavisd, by default, adds spam information headers only to messages that;"
 msgstr ""
 
 #. Tag: para
@@ -649,12 +847,16 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Get a spam score over <literal>2.0</literal> from <application>SpamAssassin</application>."
+msgid ""
+"Get a spam score over <literal>2.0</literal> from "
+"<application>SpamAssassin</application>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The related setting is <literal>$sa_tag_level_deflt</literal> in <filename>/etc/amavisd/amavisd.conf</filename>."
+msgid ""
+"The related setting is <literal>$sa_tag_level_deflt</literal> in "
+"<filename>/etc/amavisd/amavisd.conf</filename>."
 msgstr ""
 
 #. Tag: title
@@ -664,12 +866,21 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The spam kill level controls which score spam must have been marked with before Amavisd considers the message to not be delivered to the intended recipient(s)."
+msgid ""
+"The spam kill level controls which score spam must have been marked with "
+"before Amavisd considers the message to not be delivered to the intended "
+"recipient(s)."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Depending on your platform, the default for this score is <literal>6.31</literal> or <literal>6.9</literal>. When a message is marked with a spam score higher than or equal to this level, Amavisd will take \"evasive action\". See <xref linkend=\"sect-Administrator_Guide-Combating_Spam-Configuring_Amavis_Evasive_Action\" /> for more information on configuring evasive actions."
+msgid ""
+"Depending on your platform, the default for this score is "
+"<literal>6.31</literal> or <literal>6.9</literal>. When a message is marked "
+"with a spam score higher than or equal to this level, Amavisd will take "
+"\"evasive action\". See <xref linkend=\"sect-Administrator_Guide-"
+"Combating_Spam-Configuring_Amavis_Evasive_Action\" /> for more information "
+"on configuring evasive actions."
 msgstr ""
 
 #. Tag: title
@@ -679,7 +890,12 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "You can control what \"evasive action\" Amavisd takes using the <literal>$final_spam_destiny</literal> and <literal>$final_virus_destiny</literal> settings in <filename>/etc/amavisd/amavisd.conf</filename>. The default is usually to discard the message, but the following options are available:"
+msgid ""
+"You can control what \"evasive action\" Amavisd takes using the "
+"<literal>$final_spam_destiny</literal> and "
+"<literal>$final_virus_destiny</literal> settings in "
+"<filename>/etc/amavisd/amavisd.conf</filename>. The default is usually to "
+"discard the message, but the following options are available:"
 msgstr ""
 
 #. Tag: title
@@ -689,12 +905,19 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The message is accepted for delivery to the intended recipient(s), despite having been scored passed the kill or cutoff level, and regardless of bad content."
+msgid ""
+"The message is accepted for delivery to the intended recipient(s), despite "
+"having been scored passed the kill or cutoff level, and regardless of bad "
+"content."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "If a quarantine address has been configured, the quarantine address will receive a copy of the email. See <xref linkend=\"form-Administrator_Guide-Configuring_Amavis_Evasive_Action-Configuring_Quarantine\" /> to learn how to configure the quarantine address."
+msgid ""
+"If a quarantine address has been configured, the quarantine address will "
+"receive a copy of the email. See <xref linkend=\"form-Administrator_Guide-"
+"Configuring_Amavis_Evasive_Action-Configuring_Quarantine\" /> to learn how "
+"to configure the quarantine address."
 msgstr ""
 
 #. Tag: title
@@ -704,7 +927,10 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The message is not accepted for delivery to the intended recipient(s). A Delivery Status Notification stating delivery failure is sent out to the sender."
+msgid ""
+"The message is not accepted for delivery to the intended recipient(s). A "
+"Delivery Status Notification stating delivery failure is sent out to the "
+"sender."
 msgstr ""
 
 #. Tag: title
@@ -714,7 +940,10 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The message is rejected by Amavisd, and while Amavisd sends out a 550 SMTP response to the Mail Transfer Agent, said Mail Transfer Agent is responsible for sending out the Delivery Status Notification, if any."
+msgid ""
+"The message is rejected by Amavisd, and while Amavisd sends out a 550 SMTP "
+"response to the Mail Transfer Agent, said Mail Transfer Agent is responsible"
+" for sending out the Delivery Status Notification, if any."
 msgstr ""
 
 #. Tag: title
@@ -724,7 +953,11 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The message is simply discarded by Amavisd. The sending Mail Transfer Agent will receive a positive SMTP delivery response, and Amavisd sends out no Delivery Status Notification, nor does it forward the message for delivery to the intended recipients."
+msgid ""
+"The message is simply discarded by Amavisd. The sending Mail Transfer Agent "
+"will receive a positive SMTP delivery response, and Amavisd sends out no "
+"Delivery Status Notification, nor does it forward the message for delivery "
+"to the intended recipients."
 msgstr ""
 
 #. Tag: title
@@ -734,16 +967,24 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Two separate quarantine forwarding addresses can be configured. One is for messages labeled as spam, another for messages suspected to contain a virus."
+msgid ""
+"Two separate quarantine forwarding addresses can be configured. One is for "
+"messages labeled as spam, another for messages suspected to contain a virus."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "A catchall address for spam can be configured by setting the <literal>$spam_quarantine_to</literal> setting to a valid recipient address in <filename>/etc/amavisd/amavisd.conf</filename>"
+msgid ""
+"A catchall address for spam can be configured by setting the "
+"<literal>$spam_quarantine_to</literal> setting to a valid recipient address "
+"in <filename>/etc/amavisd/amavisd.conf</filename>"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "A catchall address for messages suspected of containing a virus can be configured by setting the <literal>$virus_quarantine_to</literal> setting to a valid recipient address in <filename>/etc/amavisd/amavisd.conf</filename>."
+msgid ""
+"A catchall address for messages suspected of containing a virus can be "
+"configured by setting the <literal>$virus_quarantine_to</literal> setting to"
+" a valid recipient address in "
+"<filename>/etc/amavisd/amavisd.conf</filename>."
 msgstr ""
-
diff --git a/Administrator_Guide/ja-JP/Configuring_the_Kolab_Server.po b/Administrator_Guide/ja-JP/Configuring_the_Kolab_Server.po
index c414e3b..5f84810 100644
--- a/Administrator_Guide/ja-JP/Configuring_the_Kolab_Server.po
+++ b/Administrator_Guide/ja-JP/Configuring_the_Kolab_Server.po
@@ -1,16 +1,19 @@
-# 
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:45\n"
-"PO-Revision-Date: 2012-08-24T15:34:45\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
+"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
+"PO-Revision-Date: 2012-08-13 13:17+0000\n"
 "Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab/language/ja/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. Tag: title
 #, no-c-format
@@ -34,12 +37,18 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Web server performance is greatly improved by caching the interpreted bytecode for the PHP applications using the Alternative PHP Cache (APC) extension from PECL. With APC enabled, PHP source code is compiled only once (per retention interval), and subsequent inclusions for or execution of said PHP source code is obtained directly from cache."
+msgid ""
+"Web server performance is greatly improved by caching the interpreted "
+"bytecode for the PHP applications using the Alternative PHP Cache (APC) "
+"extension from PECL. With APC enabled, PHP source code is compiled only once"
+" (per retention interval), and subsequent inclusions for or execution of "
+"said PHP source code is obtained directly from cache."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "To enable APC, install the <application>php-pecl-apc</application> package:"
+msgid ""
+"To enable APC, install the <application>php-pecl-apc</application> package:"
 msgstr ""
 
 #. Tag: screen
@@ -49,7 +58,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Then, edit <filename>/etc/php.d/apc.ini</filename> and set or consider setting any of the following options;"
+msgid ""
+"Then, edit <filename>/etc/php.d/apc.ini</filename> and set or consider "
+"setting any of the following options;"
 msgstr ""
 
 #. Tag: title
@@ -69,17 +80,30 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Issue a <literal>stat()</literal> call to see if the file with PHP source code has changed since the last binary compilation. Disabling the <literal>stat()</literal> call is recommended for production environments, as calling <literal>stat()</literal> includes a write call to update the file's last access time (atime). Note that the update write call for the last access time can be prevented by mounting the relevant filesystem with the <literal>noatime</literal> option."
+msgid ""
+"Issue a <literal>stat()</literal> call to see if the file with PHP source "
+"code has changed since the last binary compilation. Disabling the "
+"<literal>stat()</literal> call is recommended for production environments, "
+"as calling <literal>stat()</literal> includes a write call to update the "
+"file's last access time (atime). Note that the update write call for the "
+"last access time can be prevented by mounting the relevant filesystem with "
+"the <literal>noatime</literal> option."
 msgstr ""
 
 #. Tag: title
 #, no-c-format
-msgid "Changes to PHP Source Code Files with APC <literal>stat()</literal> Disabled"
+msgid ""
+"Changes to PHP Source Code Files with APC <literal>stat()</literal> Disabled"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Note that when APC is configured to not issue a <literal>stat()</literal> call to see if a PHP source code file is changed, changes to PHP source code files will only be included in subsequent execution after the APC cache has been cleared. The APC cache is cleared upon web server service reload, restart or using the PHP call <literal>apc_clear_cache()</literal>."
+msgid ""
+"Note that when APC is configured to not issue a <literal>stat()</literal> "
+"call to see if a PHP source code file is changed, changes to PHP source code"
+" files will only be included in subsequent execution after the APC cache has"
+" been cleared. The APC cache is cleared upon web server service reload, "
+"restart or using the PHP call <literal>apc_clear_cache()</literal>."
 msgstr ""
 
 #. Tag: title
@@ -89,7 +113,10 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "When issuing a <literal>stat()</literal> call to see if the file with PHP source code has changed, use the file's change time attribute as opposed to the default, the file's modification time attribute."
+msgid ""
+"When issuing a <literal>stat()</literal> call to see if the file with PHP "
+"source code has changed, use the file's change time attribute as opposed to "
+"the default, the file's modification time attribute."
 msgstr ""
 
 #. Tag: title
@@ -99,7 +126,12 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "While overriding the expensive system calls issued during an <literal>include_once()</literal> or <literal>require_once()</literal> call be the PHP source code, this option MUST NOT be enabled. See <ulink url=\"https://bugzilla.kolabsys.com/show_bug.cgi?id=113\" /> for more information."
+msgid ""
+"While overriding the expensive system calls issued during an "
+"<literal>include_once()</literal> or <literal>require_once()</literal> call "
+"be the PHP source code, this option MUST NOT be enabled. See <ulink "
+"url=\"https://bugzilla.kolabsys.com/show_bug.cgi?id=113\" /> for more "
+"information."
 msgstr ""
 
 #. Tag: title
@@ -109,12 +141,22 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "When using the <application>perl-Kolab</application> libraries on a system that is not a Kolab server itself, please be aware the perl-Kolab libraries expect and/or require certain settings to be available that are not really relevant for normal operations. This section explains which settings are expected and/or required, how to configure them and what the implications are."
+msgid ""
+"When using the <application>perl-Kolab</application> libraries on a system "
+"that is not a Kolab server itself, please be aware the perl-Kolab libraries "
+"expect and/or require certain settings to be available that are not really "
+"relevant for normal operations. This section explains which settings are "
+"expected and/or required, how to configure them and what the implications "
+"are."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "An example use-case scenario –to install and use the Kolab perl libraries on a system that is not a Kolab server– is, where user provisioning scripts are executed outside of Kolab, and require interfacing with Kolab's IMAP server components to manage user or shared mailboxes."
+msgid ""
+"An example use-case scenario –to install and use the Kolab perl "
+"libraries on a system that is not a Kolab server– is, where user "
+"provisioning scripts are executed outside of Kolab, and require interfacing "
+"with Kolab's IMAP server components to manage user or shared mailboxes."
 msgstr ""
 
 #. Tag: title
@@ -124,12 +166,16 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The following is a snippet of the configuration file <filename>/etc/kolab/kolab.conf</filename> that prevents perl errors from being printed to <code>stderr</code>;"
+msgid ""
+"The following is a snippet of the configuration file "
+"<filename>/etc/kolab/kolab.conf</filename> that prevents perl errors from "
+"being printed to <code>stderr</code>;"
 msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "kolab_usr: kolab\n"
+msgid ""
+"kolab_usr: kolab\n"
 "kolab_musr: kolab\n"
 "kolab_rusr: kolab\n"
 "kolab_grp: kolab\n"
@@ -139,12 +185,19 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "In a traditional Kolab deployment, these settings are used with the configuration management utilities. On a server that is not a Kolab server, naturally the configuration management does not apply. However, the Kolab perl libraries still require these settings to be available for errors to be suppressed."
+msgid ""
+"In a traditional Kolab deployment, these settings are used with the "
+"configuration management utilities. On a server that is not a Kolab server, "
+"naturally the configuration management does not apply. However, the Kolab "
+"perl libraries still require these settings to be available for errors to be"
+" suppressed."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Please see <ulink url=\"https://bugzilla.kolabsys.com/show_bug.cgi?id=114\" /> for more information."
+msgid ""
+"Please see <ulink url=\"https://bugzilla.kolabsys.com/show_bug.cgi?id=114\" "
+"/> for more information."
 msgstr ""
 
 #. Tag: title
@@ -164,11 +217,18 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The connection address for the Kolab perl libraries. Currently this is being used for IMAP connections."
+msgid ""
+"The connection address for the Kolab perl libraries. Currently this is being"
+" used for IMAP connections."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "See <ulink url=\"https://bugzilla.kolabsys.com/show_bug.cgi?id=112\">Bugzilla #112: <emphasis>Use of connect_addr, local_addr, bind_addr and bind_any</emphasis></ulink> and <ulink url=\"https://bugzilla.kolabsys.com/show_bug.cgi?id=115\">Bugzilla #115: <emphasis>NEW</emphasis></ulink> for more information."
+msgid ""
+"See <ulink "
+"url=\"https://bugzilla.kolabsys.com/show_bug.cgi?id=112\">Bugzilla #112: "
+"<emphasis>Use of connect_addr, local_addr, bind_addr and "
+"bind_any</emphasis></ulink> and <ulink "
+"url=\"https://bugzilla.kolabsys.com/show_bug.cgi?id=115\">Bugzilla #115: "
+"<emphasis>NEW</emphasis></ulink> for more information."
 msgstr ""
-
diff --git a/Administrator_Guide/ja-JP/Detailed_Kolab_Server_Overview.po b/Administrator_Guide/ja-JP/Detailed_Kolab_Server_Overview.po
index 8092103..364f39a 100644
--- a/Administrator_Guide/ja-JP/Detailed_Kolab_Server_Overview.po
+++ b/Administrator_Guide/ja-JP/Detailed_Kolab_Server_Overview.po
@@ -1,16 +1,19 @@
-# 
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:45\n"
-"PO-Revision-Date: 2012-08-24T15:34:45\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
+"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
+"PO-Revision-Date: 2012-08-13 13:17+0000\n"
 "Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab/language/ja/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. Tag: title
 #, no-c-format
@@ -19,7 +22,10 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The Kolab Server consists of various 3rd-party OpenSource components as well as some kolab specific components which provide the glue between those. Most of the 3rd-party components can be exchanged, such as the IMAP-Server."
+msgid ""
+"The Kolab Server consists of various 3rd-party OpenSource components as well"
+" as some kolab specific components which provide the glue between those. "
+"Most of the 3rd-party components can be exchanged, such as the IMAP-Server."
 msgstr ""
 
 #. Tag: title
@@ -34,7 +40,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Postfix is an <emphasis>MTA</emphasis> (Mail Transfer Agent), responsible for the transport and distribution of emails."
+msgid ""
+"Postfix is an <emphasis>MTA</emphasis> (Mail Transfer Agent), responsible "
+"for the transport and distribution of emails."
 msgstr ""
 
 #. Tag: para
@@ -44,7 +52,10 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Documentation: <ulink url=\"http://www.postfix.org/documentation.html\">Postfix Documentation</ulink>"
+msgid ""
+"Documentation: <ulink "
+"url=\"http://www.postfix.org/documentation.html\">Postfix "
+"Documentation</ulink>"
 msgstr ""
 
 #. Tag: title
@@ -94,12 +105,14 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "<filename>/etc/postfix/ldap/virtual_alias_maps_mailenabled_distgroups.cf</filename>"
+msgid ""
+"<filename>/etc/postfix/ldap/virtual_alias_maps_mailenabled_distgroups.cf</filename>"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "<filename>/etc/postfix/ldap/virtual_alias_maps_mailenabled_dynamic_distgroups.cf</filename>"
+msgid ""
+"<filename>/etc/postfix/ldap/virtual_alias_maps_mailenabled_dynamic_distgroups.cf</filename>"
 msgstr ""
 
 #. Tag: title
@@ -129,7 +142,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The <application>Cyrus-IMAP</application> server is a scalable, fast IMAP server."
+msgid ""
+"The <application>Cyrus-IMAP</application> server is a scalable, fast IMAP "
+"server."
 msgstr ""
 
 #. Tag: para
@@ -139,7 +154,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Documentation: <ulink url=\"http://www.cyrusimap.org/docs/cyrus-imapd/\">Cyrus Documentation</ulink>"
+msgid ""
+"Documentation: <ulink url=\"http://www.cyrusimap.org/docs/cyrus-"
+"imapd/\">Cyrus Documentation</ulink>"
 msgstr ""
 
 #. Tag: para
@@ -169,7 +186,15 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "LDAP is the directory services used to store information about users as well as parts of the Kolab configuration. The service consists of the <application>slapd</application> deamon, which provides access to the directory. <application>slurpd</application> is a replication deamon for the LDAP database, allowing the system to be distributed over several machines which increases relaiability as well as availability. <application>slurpd</application> is replaced by <application>syncrepl</application> as of version 3.0."
+msgid ""
+"LDAP is the directory services used to store information about users as well"
+" as parts of the Kolab configuration. The service consists of the "
+"<application>slapd</application> deamon, which provides access to the "
+"directory. <application>slurpd</application> is a replication deamon for the"
+" LDAP database, allowing the system to be distributed over several machines "
+"which increases relaiability as well as availability. "
+"<application>slurpd</application> is replaced by "
+"<application>syncrepl</application> as of version 3.0."
 msgstr ""
 
 #. Tag: para
@@ -179,7 +204,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Documentation: <ulink url=\"http://www.openldap.org/doc/admin24/\">OpenLDAP admin guide</ulink>"
+msgid ""
+"Documentation: <ulink url=\"http://www.openldap.org/doc/admin24/\">OpenLDAP "
+"admin guide</ulink>"
 msgstr ""
 
 #. Tag: para
@@ -199,7 +226,12 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "SASL (Simple Authentication and Security Layer) is a method to add authentication support for connection based protocols. The authentication via SASL is used by Postfix and the IMAP-Server. <application>saslauthd</application> is the deamon providing the authentication, using the credentials stored in the LDAP database."
+msgid ""
+"SASL (Simple Authentication and Security Layer) is a method to add "
+"authentication support for connection based protocols. The authentication "
+"via SASL is used by Postfix and the IMAP-Server. "
+"<application>saslauthd</application> is the deamon providing the "
+"authentication, using the credentials stored in the LDAP database."
 msgstr ""
 
 #. Tag: para
@@ -219,7 +251,10 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "<application>Amavisd</application> is an emailscanner, which unpacks all messages (including attachments) and forwards them to virus scanners and spam filters."
+msgid ""
+"<application>Amavisd</application> is an emailscanner, which unpacks all "
+"messages (including attachments) and forwards them to virus scanners and "
+"spam filters."
 msgstr ""
 
 #. Tag: para
@@ -234,7 +269,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "<application>ClamAV</application> is a virus scanner, suitable for Mailservers."
+msgid ""
+"<application>ClamAV</application> is a virus scanner, suitable for "
+"Mailservers."
 msgstr ""
 
 #. Tag: para
@@ -304,7 +341,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Apart from the main components, consisting of proven 3rd-party OpenSource software, there are also some Kolab specific software components."
+msgid ""
+"Apart from the main components, consisting of proven 3rd-party OpenSource "
+"software, there are also some Kolab specific software components."
 msgstr ""
 
 #. Tag: title
@@ -314,7 +353,10 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The Kolab-Daemon is the central control unit between the various components. It is responsible for synchronizing the user accounts in the LDAP directory with the available IMAP folders. TODO: further responsabilites of kolabd"
+msgid ""
+"The Kolab-Daemon is the central control unit between the various components."
+" It is responsible for synchronizing the user accounts in the LDAP directory"
+" with the available IMAP folders. TODO: further responsabilites of kolabd"
 msgstr ""
 
 #. Tag: title
@@ -334,11 +376,14 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The following diagram illustrates the interaction between the various components."
+msgid ""
+"The following diagram illustrates the interaction between the various "
+"components."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "<application>kolabd</application> is the central control instance of the kolab server, responsible to configure all components,"
+msgid ""
+"<application>kolabd</application> is the central control instance of the "
+"kolab server, responsible to configure all components,"
 msgstr ""
-
diff --git a/Administrator_Guide/ja-JP/Kolab_Web_Administration_Panel.po b/Administrator_Guide/ja-JP/Kolab_Web_Administration_Panel.po
index 859050f..c8480a8 100644
--- a/Administrator_Guide/ja-JP/Kolab_Web_Administration_Panel.po
+++ b/Administrator_Guide/ja-JP/Kolab_Web_Administration_Panel.po
@@ -1,16 +1,19 @@
-# 
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:45\n"
-"PO-Revision-Date: 2012-08-24T15:34:45\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
+"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
+"PO-Revision-Date: 2012-08-13 13:17+0000\n"
 "Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab/language/ja/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. Tag: title
 #, no-c-format
@@ -24,7 +27,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The <literal>user_types</literal> table in the MySQL <literal>kolab</literal> database contains the following columns:"
+msgid ""
+"The <literal>user_types</literal> table in the MySQL "
+"<literal>kolab</literal> database contains the following columns:"
 msgstr ""
 
 #. Tag: title
@@ -74,7 +79,12 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The actual settings. Please see <xref linkend=\"sect-Administrator_Guide-Editing_user_types-Attributes_Reference\" /> for a full reference, and <xref linkend=\"proc-Administrator_Guide-Editing_user_types-Manually_Changing_the_user_types_Available\" /> for the procedure to edit these settings manually."
+msgid ""
+"The actual settings. Please see <xref linkend=\"sect-Administrator_Guide-"
+"Editing_user_types-Attributes_Reference\" /> for a full reference, and <xref"
+" linkend=\"proc-Administrator_Guide-Editing_user_types-"
+"Manually_Changing_the_user_types_Available\" /> for the procedure to edit "
+"these settings manually."
 msgstr ""
 
 #. Tag: title
@@ -84,7 +94,10 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Sample scripts are provided as part of the <application>kolab-webadmin</application> package. Use the following command to locate these scripts, called <emphasis>sample-insert-user_types.php</emphasis>;"
+msgid ""
+"Sample scripts are provided as part of the <application>kolab-"
+"webadmin</application> package. Use the following command to locate these "
+"scripts, called <emphasis>sample-insert-user_types.php</emphasis>;"
 msgstr ""
 
 #. Tag: screen
@@ -94,23 +107,32 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Copy the relevant example file to one directory above the <filename>public_html/</filename> directory, like so:"
+msgid ""
+"Copy the relevant example file to one directory above the "
+"<filename>public_html/</filename> directory, like so:"
 msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "# <userinput>cp -a /path/to/sample-insert-user_types.php \\</userinput>\n"
+msgid ""
+"# <userinput>cp -a /path/to/sample-insert-user_types.php \\</userinput>\n"
 "    <userinput>/usr/share/kolab-webadmin/insert-user_types.php</userinput>"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Edit the file to reflect your needs. For example, to avoid the <literal>mail</literal> attribute from being automatically generated, remove <literal>$attributes['auto_form_fields']['mail']</literal>."
+msgid ""
+"Edit the file to reflect your needs. For example, to avoid the "
+"<literal>mail</literal> attribute from being automatically generated, remove"
+" <literal>$attributes['auto_form_fields']['mail']</literal>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "You may want to insert <literal>$attributes[\"form_fields\"][\"mail\"]</literal> to insert back a form field that allows supplying a mail attribute value for the user type."
+msgid ""
+"You may want to insert "
+"<literal>$attributes[\"form_fields\"][\"mail\"]</literal> to insert back a "
+"form field that allows supplying a mail attribute value for the user type."
 msgstr ""
 
 #. Tag: para
@@ -145,7 +167,10 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The attributes column for user types describes which form fields are to be offered to the <emphasis>add user</emphasis> dialog for each type of user available."
+msgid ""
+"The attributes column for user types describes which form fields are to be "
+"offered to the <emphasis>add user</emphasis> dialog for each type of user "
+"available."
 msgstr ""
 
 #. Tag: para
@@ -155,32 +180,45 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "<literal>auto_form_fields</literal>, or form fields for which the value is generated automatically (from values that are entered in other form fields)."
+msgid ""
+"<literal>auto_form_fields</literal>, or form fields for which the value is "
+"generated automatically (from values that are entered in other form fields)."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Example form fields for which the value can be generated automatically include <literal>displayname</literal> and <literal>cn</literal>."
+msgid ""
+"Example form fields for which the value can be generated automatically "
+"include <literal>displayname</literal> and <literal>cn</literal>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "<literal>form_fields</literal>, for form fields to which the user or administrator is to provide input."
+msgid ""
+"<literal>form_fields</literal>, for form fields to which the user or "
+"administrator is to provide input."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Example form fields that users or administrators would provide input to include <literal>givenname</literal> and <literal>surname</literal>."
+msgid ""
+"Example form fields that users or administrators would provide input to "
+"include <literal>givenname</literal> and <literal>surname</literal>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "<literal>fields</literal>, for form fields that are hidden from plain sight, and cannot be edited by the user or administrator."
+msgid ""
+"<literal>fields</literal>, for form fields that are hidden from plain sight,"
+" and cannot be edited by the user or administrator."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Example fields that would be configured as immutable, or static, and therefore be hidden from the client interface include <literal>objectclass</literal>."
+msgid ""
+"Example fields that would be configured as immutable, or static, and "
+"therefore be hidden from the client interface include "
+"<literal>objectclass</literal>."
 msgstr ""
 
 #. Tag: para
@@ -190,7 +228,8 @@ msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "Array(\n"
+msgid ""
+"Array(\n"
 "        \"<form_field_type>\" => Array(\n"
 "                \"<form_field_name>\" => Array(\n"
 "                            ['data' => Array(\n"
@@ -211,12 +250,17 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The <literal>attributes</literal> attribute to a <literal>user_type</literal> entry holds an array with any or all of the following <emphasis><form_field_type></emphasis> keys:"
+msgid ""
+"The <literal>attributes</literal> attribute to a "
+"<literal>user_type</literal> entry holds an array with any or all of the "
+"following <emphasis><form_field_type></emphasis> keys:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The reference implementation and general rule of thumb is to use the LDAP attribute name as the form field name."
+msgid ""
+"The reference implementation and general rule of thumb is to use the LDAP "
+"attribute name as the form field name."
 msgstr ""
 
 #. Tag: title
@@ -226,17 +270,25 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The <literal>auto_form_fields</literal> key holds an array of form fields that correspond with attributes for which the value is to be generated automatically, using an API call."
+msgid ""
+"The <literal>auto_form_fields</literal> key holds an array of form fields "
+"that correspond with attributes for which the value is to be generated "
+"automatically, using an API call."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The key name for each key => value pair indicates the form field name for which the value is to be generated automatically."
+msgid ""
+"The key name for each key => value pair indicates the form field name for"
+" which the value is to be generated automatically."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Each array key corresponds with a user attribute name, and it's value is an array containing the name of the form fields for which the value to submit as part of the API call."
+msgid ""
+"Each array key corresponds with a user attribute name, and it's value is an "
+"array containing the name of the form fields for which the value to submit "
+"as part of the API call."
 msgstr ""
 
 #. Tag: title
@@ -246,12 +298,16 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Provided the user type's <literal>auto_form_fields</literal> contains an array key of <literal>displayname</literal>, the array value for this key could look as follows:"
+msgid ""
+"Provided the user type's <literal>auto_form_fields</literal> contains an "
+"array key of <literal>displayname</literal>, the array value for this key "
+"could look as follows:"
 msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "Array(\n"
+msgid ""
+"Array(\n"
 "        'auto_form_fields' => Array(\n"
 "                'displayname' => Array(\n"
 "                        'data' => Array(\n"
@@ -267,17 +323,27 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "This indicates to the client that a form field named 'displayname' is to be populated with the information contained within the form fields named 'givenname' and 'sn'."
+msgid ""
+"This indicates to the client that a form field named 'displayname' is to be "
+"populated with the information contained within the form fields named "
+"'givenname' and 'sn'."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "If the client is capable of doing so, it should also update the form field named 'displayname' after the values for any of the form fields named 'givenname' or 'sn' have been changed."
+msgid ""
+"If the client is capable of doing so, it should also update the form field "
+"named 'displayname' after the values for any of the form fields named "
+"'givenname' or 'sn' have been changed."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "With a JSON object payload containing the values of the form fields for which the names are contained within the 'data' key, if any, the client should submit a POST request on change of these form fields, and will be returned the new value for the automatically generated form field."
+msgid ""
+"With a JSON object payload containing the values of the form fields for "
+"which the names are contained within the 'data' key, if any, the client "
+"should submit a POST request on change of these form fields, and will be "
+"returned the new value for the automatically generated form field."
 msgstr ""
 
 #. Tag: title
@@ -287,17 +353,25 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The <literal>form_fields</literal> key holds an array of form fields that require user input."
+msgid ""
+"The <literal>form_fields</literal> key holds an array of form fields that "
+"require user input."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The key name for each key => value pair indicates the form field name for which the value is to be supplied by the user."
+msgid ""
+"The key name for each key => value pair indicates the form field name for"
+" which the value is to be supplied by the user."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Because some attributes can be multi-valued, or have a limited list of options, each defined form field in <literal>form_fields</literal> can hold an array with additional key => value pairs illustrating the type of form field that should be used, and what format to expect the result value in."
+msgid ""
+"Because some attributes can be multi-valued, or have a limited list of "
+"options, each defined form field in <literal>form_fields</literal> can hold "
+"an array with additional key => value pairs illustrating the type of form"
+" field that should be used, and what format to expect the result value in."
 msgstr ""
 
 #. Tag: title
@@ -312,7 +386,11 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "For a form field of type <xref linkend=\"form-Administrator_Guide-Additional_Information_in_form_fields-text\" /> or type <xref linkend=\"form-Administrator_Guide-Additional_Information_in_form_fields-list\" />, this value holds the maximum length for a given item."
+msgid ""
+"For a form field of type <xref linkend=\"form-Administrator_Guide-"
+"Additional_Information_in_form_fields-text\" /> or type <xref linkend"
+"=\"form-Administrator_Guide-Additional_Information_in_form_fields-list\" />,"
+" this value holds the maximum length for a given item."
 msgstr ""
 
 #. Tag: title
@@ -322,7 +400,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The <literal>type</literal> is to indicate the type of form field. Options include;"
+msgid ""
+"The <literal>type</literal> is to indicate the type of form field. Options "
+"include;"
 msgstr ""
 
 #. Tag: title
@@ -342,7 +422,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Additional parameters for a text form field include <xref linkend=\"form-Administrator_Guide-Additional_Information_in_form_fields-maxlength\" />."
+msgid ""
+"Additional parameters for a text form field include <xref linkend=\"form-"
+"Administrator_Guide-Additional_Information_in_form_fields-maxlength\" />."
 msgstr ""
 
 #. Tag: title
@@ -352,22 +434,32 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "A form field of type <literal>list</literal> is expecting a list of text input values."
+msgid ""
+"A form field of type <literal>list</literal> is expecting a list of text "
+"input values."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "A client web interface could choose to display a textarea with the instructions to supply one item per line, or more advanced (better) equivalents, such as an add/delete widget."
+msgid ""
+"A client web interface could choose to display a textarea with the "
+"instructions to supply one item per line, or more advanced (better) "
+"equivalents, such as an add/delete widget."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "A client command-line interface could choose to prompt for input values until an empty value is supplied."
+msgid ""
+"A client command-line interface could choose to prompt for input values "
+"until an empty value is supplied."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Additional parameters for a list form field include <xref linkend=\"form-Administrator_Guide-Additional_Information_in_form_fields-maxlength\" />, which holds the maximum length of each text value in the list."
+msgid ""
+"Additional parameters for a list form field include <xref linkend=\"form-"
+"Administrator_Guide-Additional_Information_in_form_fields-maxlength\" />, "
+"which holds the maximum length of each text value in the list."
 msgstr ""
 
 #. Tag: title
@@ -377,7 +469,11 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "This form field is a select list, where multiple options may be selected (as opposed to a <xref linkend=\"form-Administrator_Guide-Additional_Information_in_form_fields-select\" /> list, where only one option may be selected)."
+msgid ""
+"This form field is a select list, where multiple options may be selected (as"
+" opposed to a <xref linkend=\"form-Administrator_Guide-"
+"Additional_Information_in_form_fields-select\" /> list, where only one "
+"option may be selected)."
 msgstr ""
 
 #. Tag: title
@@ -387,7 +483,8 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "This form field is a selection list, of which one option may be selected."
+msgid ""
+"This form field is a selection list, of which one option may be selected."
 msgstr ""
 
 #. Tag: title
@@ -397,6 +494,8 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The <literal>fields</literal> key holds an array of form fields and values for said form fields, that are static. One example of such form fields is <literal>objectclass</literal>."
+msgid ""
+"The <literal>fields</literal> key holds an array of form fields and values "
+"for said form fields, that are static. One example of such form fields is "
+"<literal>objectclass</literal>."
 msgstr ""
-
diff --git a/Administrator_Guide/ja-JP/Preface.po b/Administrator_Guide/ja-JP/Preface.po
index 2527181..4d618f3 100644
--- a/Administrator_Guide/ja-JP/Preface.po
+++ b/Administrator_Guide/ja-JP/Preface.po
@@ -1,19 +1,21 @@
-# 
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:45\n"
-"PO-Revision-Date: 2012-08-24T15:34:45\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
+"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
+"PO-Revision-Date: 2012-08-13 13:18+0000\n"
 "Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab/language/ja/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. Tag: title
 #, no-c-format
 msgid "Preface"
 msgstr ""
-
diff --git a/Administrator_Guide/ja-JP/Revision_History.po b/Administrator_Guide/ja-JP/Revision_History.po
index 56694dc..b89b323 100644
--- a/Administrator_Guide/ja-JP/Revision_History.po
+++ b/Administrator_Guide/ja-JP/Revision_History.po
@@ -1,16 +1,19 @@
-# 
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:45\n"
-"PO-Revision-Date: 2012-08-24T15:34:45\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
+"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
+"PO-Revision-Date: 2012-08-13 13:19+0000\n"
 "Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab/language/ja/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. Tag: title
 #, no-c-format
@@ -31,4 +34,3 @@ msgstr ""
 #, no-c-format
 msgid "Initial creation of book by publican"
 msgstr ""
-
diff --git a/Administrator_Guide/ja-JP/Tweaking_Tips_for_389_Directory_Server.po b/Administrator_Guide/ja-JP/Tweaking_Tips_for_389_Directory_Server.po
index 8500f6d..feda3a0 100644
--- a/Administrator_Guide/ja-JP/Tweaking_Tips_for_389_Directory_Server.po
+++ b/Administrator_Guide/ja-JP/Tweaking_Tips_for_389_Directory_Server.po
@@ -1,16 +1,19 @@
-# 
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:45\n"
-"PO-Revision-Date: 2012-08-24T15:34:45\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
+"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
+"PO-Revision-Date: 2012-08-13 13:18+0000\n"
 "Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab/language/ja/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. Tag: title
 #, no-c-format
@@ -34,32 +37,50 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "A default deployment of Kolab Groupware includes a largely unmodified 389 Directory Server with not all too many tweaked settings. When deployments grow the size of their Directory Information Tree, such as would be the case with more than 2000 user, group and/or contact entries, regular bind credentials run out of bounds when querying the tree."
+msgid ""
+"A default deployment of Kolab Groupware includes a largely unmodified 389 "
+"Directory Server with not all too many tweaked settings. When deployments "
+"grow the size of their Directory Information Tree, such as would be the case"
+" with more than 2000 user, group and/or contact entries, regular bind "
+"credentials run out of bounds when querying the tree."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Regular bind credentials include look-through, size and time limitations, usually causing a result set to be limited to 2000 entries (usually the first symptom), or causing the query to time out (larger trees, usually a later symptom)."
+msgid ""
+"Regular bind credentials include look-through, size and time limitations, "
+"usually causing a result set to be limited to 2000 entries (usually the "
+"first symptom), or causing the query to time out (larger trees, usually a "
+"later symptom)."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Because a variety of User Interfaces depend on listing users, groups and contacts, it may be necessary to seek aid in Virtual List View (VLV) capabilities. VLV consists of additional indexes that can be queried by enabling two server-side controls:"
+msgid ""
+"Because a variety of User Interfaces depend on listing users, groups and "
+"contacts, it may be necessary to seek aid in Virtual List View (VLV) "
+"capabilities. VLV consists of additional indexes that can be queried by "
+"enabling two server-side controls:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Virtual List View control, with corresponding Base DN, Filter and Scope"
+msgid ""
+"Virtual List View control, with corresponding Base DN, Filter and Scope"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Server-Side Sorting control (SSS), with a corresponding list of attributes to use when sorting result entries."
+msgid ""
+"Server-Side Sorting control (SSS), with a corresponding list of attributes "
+"to use when sorting result entries."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "VLV along with SSS enables the pagination of search results, and circumvents the search limits for regular bind credentials."
+msgid ""
+"VLV along with SSS enables the pagination of search results, and circumvents"
+" the search limits for regular bind credentials."
 msgstr ""
 
 #. Tag: title
@@ -69,22 +90,30 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "A version of these scripts can be downloaded from <ulink url=\"http://hosted.kolabsys.com/~vanmeeuwen/kolab-scripts.tar.gz\" />."
+msgid ""
+"A version of these scripts can be downloaded from <ulink "
+"url=\"http://hosted.kolabsys.com/~vanmeeuwen/kolab-scripts.tar.gz\" />."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Inclusion into the <application>kolab</application> command-line utility is planned, so make sure to check <command>kolab help</command> to see if the commands have been included already."
+msgid ""
+"Inclusion into the <application>kolab</application> command-line utility is "
+"planned, so make sure to check <command>kolab help</command> to see if the "
+"commands have been included already."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "In the following few steps, the scripts refer to the variables outlined below (which are contained in <filename>./settings.sh</filename>)."
+msgid ""
+"In the following few steps, the scripts refer to the variables outlined "
+"below (which are contained in <filename>./settings.sh</filename>)."
 msgstr ""
 
 #. Tag: programlisting
 #, no-c-format
-msgid "#!/bin/bash\n"
+msgid ""
+"#!/bin/bash\n"
 "\n"
 "export rootdn=\"dc=example,dc=org\"\n"
 "export domain=\"example.org\"\n"
@@ -101,7 +130,8 @@ msgstr ""
 
 #. Tag: programlisting
 #, no-c-format
-msgid "#!/bin/bash\n"
+msgid ""
+"#!/bin/bash\n"
 "\n"
 " . ./settings.sh\n"
 "\n"
@@ -149,7 +179,8 @@ msgstr ""
 
 #. Tag: programlisting
 #, no-c-format
-msgid "#!/bin/bash\n"
+msgid ""
+"#!/bin/bash\n"
 "\n"
 " . ./settings.sh\n"
 "\n"
@@ -191,7 +222,8 @@ msgstr ""
 
 #. Tag: programlisting
 #, no-c-format
-msgid "#!/bin/bash\n"
+msgid ""
+"#!/bin/bash\n"
 "\n"
 " . ./settings.sh\n"
 "\n"
@@ -275,7 +307,8 @@ msgstr ""
 
 #. Tag: programlisting
 #, no-c-format
-msgid "#!/bin/bash\n"
+msgid ""
+"#!/bin/bash\n"
 "\n"
 " . ./settings.sh\n"
 "\n"
@@ -415,7 +448,11 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "See <xref linkend=\"sect-Administrator_Guide-Tweaking_Tips_for_Roundcube-Configuring_the_LDAP_Address_Book_for_Use_of_VLV_and_SSS\" /> for instructions on configuring Roundcube to make use of VLV and SSS for its Global Address Book."
+msgid ""
+"See <xref linkend=\"sect-Administrator_Guide-Tweaking_Tips_for_Roundcube-"
+"Configuring_the_LDAP_Address_Book_for_Use_of_VLV_and_SSS\" /> for "
+"instructions on configuring Roundcube to make use of VLV and SSS for its "
+"Global Address Book."
 msgstr ""
 
 #. Tag: title
@@ -427,4 +464,3 @@ msgstr ""
 #, no-c-format
 msgid "Enforcing a Password Policy"
 msgstr ""
-
diff --git a/Administrator_Guide/ja-JP/Tweaking_Tips_for_Cyrus_IMAP.po b/Administrator_Guide/ja-JP/Tweaking_Tips_for_Cyrus_IMAP.po
index 4fba2c9..b567a8f 100644
--- a/Administrator_Guide/ja-JP/Tweaking_Tips_for_Cyrus_IMAP.po
+++ b/Administrator_Guide/ja-JP/Tweaking_Tips_for_Cyrus_IMAP.po
@@ -1,16 +1,19 @@
-# 
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:45\n"
-"PO-Revision-Date: 2012-08-24T15:34:45\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
+"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
+"PO-Revision-Date: 2012-08-13 13:18+0000\n"
 "Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab/language/ja/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. Tag: title
 #, no-c-format
@@ -19,7 +22,11 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "A default Kolab Groupware environment includes most if not all features that Cyrus IMAP offers, which is not necessarily optimal for all deployments. The sections in this chapter address some of the various opportunities to tweak settings for your deployment."
+msgid ""
+"A default Kolab Groupware environment includes most if not all features that"
+" Cyrus IMAP offers, which is not necessarily optimal for all deployments. "
+"The sections in this chapter address some of the various opportunities to "
+"tweak settings for your deployment."
 msgstr ""
 
 #. Tag: title
@@ -29,12 +36,21 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "When users connect multiple clients to Cyrus IMAP, or when multiple users use the same mail folder that has shared seen state enabled, one client may be marking a message as \\Seen, and another client may seem to take a while before it picks up on the message having been marked as read."
+msgid ""
+"When users connect multiple clients to Cyrus IMAP, or when multiple users "
+"use the same mail folder that has shared seen state enabled, one client may "
+"be marking a message as \\Seen, and another client may seem to take a while "
+"before it picks up on the message having been marked as read."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "In a default deployment scenario, Cyrus IMAP keeps the flagging of messages from being flushed to disk immediately, which saves on disk I/O, making Cyrus IMAP more efficient in most deployment scenarios. If, however, you have the aforementioned situation occurring in your deployment, you may need to flush the seen state of messages to disk at the first opportunity."
+msgid ""
+"In a default deployment scenario, Cyrus IMAP keeps the flagging of messages "
+"from being flushed to disk immediately, which saves on disk I/O, making "
+"Cyrus IMAP more efficient in most deployment scenarios. If, however, you "
+"have the aforementioned situation occurring in your deployment, you may need"
+" to flush the seen state of messages to disk at the first opportunity."
 msgstr ""
 
 #. Tag: para
@@ -54,7 +70,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Set (add the setting if not available already) <literal>flushseenstate</literal> to <literal>1</literal>."
+msgid ""
+"Set (add the setting if not available already) "
+"<literal>flushseenstate</literal> to <literal>1</literal>."
 msgstr ""
 
 #. Tag: para
@@ -89,12 +107,22 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Cyrus IMAP allows for <emphasis>single instance store</emphasis> that de-duplicates messages being delivered to its mailboxes, but with a certain set of restrictions. This section addresses some of those restrictions and advises on parameters to tweak in Kolab to make optimal use of the feature."
+msgid ""
+"Cyrus IMAP allows for <emphasis>single instance store</emphasis> that de-"
+"duplicates messages being delivered to its mailboxes, but with a certain set"
+" of restrictions. This section addresses some of those restrictions and "
+"advises on parameters to tweak in Kolab to make optimal use of the feature."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Single instance store requires delivery of the message (through LMTP) in one single shot (a single LMTP session). For deployments that expect to have significant numbers of emails be sent to significant numbers of users through Kolab Distribution Groups, tweaking the Postfix settings <literal>lmtp_destination_concurrency_limit</literal> and <literal>lmtp_destination_concurrency_limit</literal> may be necessary."
+msgid ""
+"Single instance store requires delivery of the message (through LMTP) in one"
+" single shot (a single LMTP session). For deployments that expect to have "
+"significant numbers of emails be sent to significant numbers of users "
+"through Kolab Distribution Groups, tweaking the Postfix settings "
+"<literal>lmtp_destination_concurrency_limit</literal> and "
+"<literal>lmtp_destination_concurrency_limit</literal> may be necessary."
 msgstr ""
 
 #. Tag: title
@@ -104,17 +132,22 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The following example depicts a scenario in which single instance store can be shown in full force."
+msgid ""
+"The following example depicts a scenario in which single instance store can "
+"be shown in full force."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Set the destination concurrency and recipient limits for LMTP to 1 (from a default 20):"
+msgid ""
+"Set the destination concurrency and recipient limits for LMTP to 1 (from a "
+"default 20):"
 msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "# <userinput>postconf -e lmtp_destination_concurrency_limit=1</userinput>\n"
+msgid ""
+"# <userinput>postconf -e lmtp_destination_concurrency_limit=1</userinput>\n"
 "# <userinput>postconf -e lmtp_destination_recipient_limit=1</userinput>\n"
 "<userinput># service postfix reload</userinput>"
 msgstr ""
@@ -131,7 +164,9 @@ msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "# <userinput>date | mail -s \"single instance store test #1\" kolab-users at example.org</userinput>"
+msgid ""
+"# <userinput>date | mail -s \"single instance store test #1\" kolab-"
+"users at example.org</userinput>"
 msgstr ""
 
 #. Tag: para
@@ -141,12 +176,15 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Examine the inode numbers (links) and the cumulative size on disk for the files."
+msgid ""
+"Examine the inode numbers (links) and the cumulative size on disk for the "
+"files."
 msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "# <userinput>cd /var/spool/imap/domain/e/example.org/</userinput>\n"
+msgid ""
+"# <userinput>cd /var/spool/imap/domain/e/example.org/</userinput>\n"
 "# <userinput>files=$(grep -lr \"^Subject: single instance store test #1\" \\</userinput>\n"
 "> <userinput>$(find . -type f -name \"*.\") | sort -u)</userinput>\n"
 "# <userinput>du -k -sch $files</userinput>\n"
@@ -201,29 +239,34 @@ msgid "# <userinput>cd /var/spool/imap/domain/e/example.org/</userinput>\n"
 "Access: 2012-08-06 11:04:45.391468108 +0200\n"
 "Modify: 2012-08-06 11:04:06.000000000 +0200\n"
 "Change: 2012-08-06 11:04:06.757235163 +0200\n"
-""
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Set the destination concurrency and recipient limits for LMTP back to the default 20:"
+msgid ""
+"Set the destination concurrency and recipient limits for LMTP back to the "
+"default 20:"
 msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "# <userinput>postconf -e lmtp_destination_concurrency_limit=20</userinput>\n"
+msgid ""
+"# <userinput>postconf -e lmtp_destination_concurrency_limit=20</userinput>\n"
 "# <userinput>postconf -e lmtp_destination_recipient_limit=20</userinput>\n"
 "<userinput># service postfix reload</userinput>"
 msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "# <userinput>date | mail -s \"single instance store test #2\" kolab-users at example.org</userinput>"
+msgid ""
+"# <userinput>date | mail -s \"single instance store test #2\" kolab-"
+"users at example.org</userinput>"
 msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "# <userinput>cd /var/spool/imap/domain/e/example.org/</userinput>\n"
+msgid ""
+"# <userinput>cd /var/spool/imap/domain/e/example.org/</userinput>\n"
 "# <userinput>files=$(grep -lr \"^Subject: single instance store test #2\" \\</userinput>\n"
 "> <userinput>$(find . -type f -name \"*.\") | sort -u)</userinput>\n"
 "# <userinput>du -k -sch $files</userinput>\n"
@@ -260,4 +303,3 @@ msgid "# <userinput>cd /var/spool/imap/domain/e/example.org/</userinput>\n"
 "Modify: 2012-08-06 11:08:28.000000000 +0200\n"
 "Change: 2012-08-06 11:08:28.760261876 +0200"
 msgstr ""
-
diff --git a/Administrator_Guide/ja-JP/Tweaking_Tips_for_Postfix.po b/Administrator_Guide/ja-JP/Tweaking_Tips_for_Postfix.po
index 7e34f19..d144f9c 100644
--- a/Administrator_Guide/ja-JP/Tweaking_Tips_for_Postfix.po
+++ b/Administrator_Guide/ja-JP/Tweaking_Tips_for_Postfix.po
@@ -1,16 +1,19 @@
-# 
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:45\n"
-"PO-Revision-Date: 2012-08-24T15:34:45\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
+"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
+"PO-Revision-Date: 2012-08-24 15:42+0000\n"
+"Last-Translator: Jeroen van Meeuwen <vanmeeuwen at kolabsys.com>\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab/language/ja/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. Tag: title
 #, no-c-format
@@ -29,17 +32,25 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "If you have Kolab distribution groups with many members, you may see the following message occur in log file <filename>/var/log/maillog</filename>:"
+msgid ""
+"If you have Kolab distribution groups with many members, you may see the "
+"following message occur in log file <filename>/var/log/maillog</filename>:"
 msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "Aug 17 10:21:59 kolab postfix/cleanup[5916]: warning: 398194A151: unreasonable virtual_alias_maps map expansion size for kolab-users at example.org"
+msgid ""
+"Aug 17 10:21:59 kolab postfix/cleanup[5916]: warning: 398194A151: "
+"unreasonable virtual_alias_maps map expansion size for kolab-"
+"users at example.org"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The setting <literal>virtual_alias_expansion_limit</literal> controls the maximum number of recipient address that are produced from a single original recipient address. The default depends on your installation."
+msgid ""
+"The setting <literal>virtual_alias_expansion_limit</literal> controls the "
+"maximum number of recipient address that are produced from a single original"
+" recipient address. The default depends on your installation."
 msgstr ""
 
 #. Tag: para
@@ -49,7 +60,8 @@ msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "# <userinput>postconf -d virtual_alias_expansion_limit</userinput>\n"
+msgid ""
+"# <userinput>postconf -d virtual_alias_expansion_limit</userinput>\n"
 "1000"
 msgstr ""
 
@@ -60,7 +72,8 @@ msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "# <userinput>postconf virtual_alias_expansion_limit</userinput>\n"
+msgid ""
+"# <userinput>postconf virtual_alias_expansion_limit</userinput>\n"
 "1000"
 msgstr ""
 
@@ -71,6 +84,6 @@ msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "# <userinput>postconf -e virtual_alias_expansion_limit=10000</userinput>"
+msgid ""
+"# <userinput>postconf -e virtual_alias_expansion_limit=10000</userinput>"
 msgstr ""
-
diff --git a/Administrator_Guide/ja-JP/Tweaking_Tips_for_Roundcube.po b/Administrator_Guide/ja-JP/Tweaking_Tips_for_Roundcube.po
index 020daca..c3b63ac 100644
--- a/Administrator_Guide/ja-JP/Tweaking_Tips_for_Roundcube.po
+++ b/Administrator_Guide/ja-JP/Tweaking_Tips_for_Roundcube.po
@@ -1,16 +1,19 @@
-# 
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:45\n"
-"PO-Revision-Date: 2012-08-24T15:34:45\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
+"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
+"PO-Revision-Date: 2012-08-13 13:18+0000\n"
 "Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab/language/ja/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. Tag: title
 #, no-c-format
@@ -44,7 +47,15 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "With a large directory information tree (as described in <xref linkend=\"sect-Administrator_Guide-Tweaking_Tips_for_389_Directory_Server-Using_Virtual_List_View_Control_for_Larger_Directory_Information_Trees\" />), having set up VLV and SSS (see <xref linkend=\"proc-Administrator_Guide-Using_Virtual_List_View_Control_for_Larger_Directory_Information_Trees-Configuring_VLV_and_SSS_on_389_Directory_Server\" />), Roundcube must still be configured to make use of the new settings."
+msgid ""
+"With a large directory information tree (as described in <xref linkend"
+"=\"sect-Administrator_Guide-Tweaking_Tips_for_389_Directory_Server-"
+"Using_Virtual_List_View_Control_for_Larger_Directory_Information_Trees\" "
+"/>), having set up VLV and SSS (see <xref linkend=\"proc-"
+"Administrator_Guide-"
+"Using_Virtual_List_View_Control_for_Larger_Directory_Information_Trees-"
+"Configuring_VLV_and_SSS_on_389_Directory_Server\" />), Roundcube must still "
+"be configured to make use of the new settings."
 msgstr ""
 
 #. Tag: title
@@ -54,7 +65,12 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Relevant settings are contained within the <literal>$rcmail_config['ldap_public']['kolab_addressbook']</literal> setting in <filename>/etc/roundcubemail/main.inc.php</filename>. Working from a default Kolab Groupware installation, we are going to verify and/or change the relevant settings one by one."
+msgid ""
+"Relevant settings are contained within the "
+"<literal>$rcmail_config['ldap_public']['kolab_addressbook']</literal> "
+"setting in <filename>/etc/roundcubemail/main.inc.php</filename>. Working "
+"from a default Kolab Groupware installation, we are going to verify and/or "
+"change the relevant settings one by one."
 msgstr ""
 
 #. Tag: title
@@ -64,12 +80,17 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The <literal>base_dn</literal> configured in the address book should match the Base DN configured for the People VLV Search."
+msgid ""
+"The <literal>base_dn</literal> configured in the address book should match "
+"the Base DN configured for the People VLV Search."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Should you not have modified the configuration deployed by default too much, then the likely appropriate value for this setting is <literal>ou=People,${rootdn}</literal>"
+msgid ""
+"Should you not have modified the configuration deployed by default too much,"
+" then the likely appropriate value for this setting is "
+"<literal>ou=People,${rootdn}</literal>"
 msgstr ""
 
 #. Tag: title
@@ -79,12 +100,16 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The <literal>filter</literal> configured in the address book should match the search filter configured for the People VLV Search."
+msgid ""
+"The <literal>filter</literal> configured in the address book should match "
+"the search filter configured for the People VLV Search."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "By default, all LDAP entries with object class <literal>inetOrgPerson</literal> are included."
+msgid ""
+"By default, all LDAP entries with object class "
+"<literal>inetOrgPerson</literal> are included."
 msgstr ""
 
 #. Tag: title
@@ -94,7 +119,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The <literal>scope</literal> configured in the address book should match the search scope configured for the People VLV Search."
+msgid ""
+"The <literal>scope</literal> configured in the address book should match the"
+" search scope configured for the People VLV Search."
 msgstr ""
 
 #. Tag: title
@@ -104,7 +131,10 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The <literal>sort</literal> setting is an array, that must contain the exact list of elements configured in the vlv sort configured for the People VLV Index."
+msgid ""
+"The <literal>sort</literal> setting is an array, that must contain the exact"
+" list of elements configured in the vlv sort configured for the People VLV "
+"Index."
 msgstr ""
 
 #. Tag: title
@@ -114,7 +144,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "This setting controls whether VLV is to be used at all. Set it to <literal>true</literal>."
+msgid ""
+"This setting controls whether VLV is to be used at all. Set it to "
+"<literal>true</literal>."
 msgstr ""
 
 #. Tag: title
@@ -124,7 +156,11 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "This setting controls whether searches are to use VLV and SSS as well. More specifically, this influences auto-completion such as during the composition of new messages, adding participants to events, and adding ACL entries in folder management."
+msgid ""
+"This setting controls whether searches are to use VLV and SSS as well. More "
+"specifically, this influences auto-completion such as during the composition"
+" of new messages, adding participants to events, and adding ACL entries in "
+"folder management."
 msgstr ""
 
 #. Tag: title
@@ -146,4 +182,3 @@ msgstr ""
 #, no-c-format
 msgid "<literal>groups</literal> Array <literal>sort</literal>"
 msgstr ""
-
diff --git a/Administrator_Guide/ja-JP/Upgrading_Accounts_from_Kolab_Format_version_2.po b/Administrator_Guide/ja-JP/Upgrading_Accounts_from_Kolab_Format_version_2.po
index cb74d8a..e49dbee 100644
--- a/Administrator_Guide/ja-JP/Upgrading_Accounts_from_Kolab_Format_version_2.po
+++ b/Administrator_Guide/ja-JP/Upgrading_Accounts_from_Kolab_Format_version_2.po
@@ -1,16 +1,19 @@
-# 
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:45\n"
-"PO-Revision-Date: 2012-08-24T15:34:45\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
+"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
+"PO-Revision-Date: 2012-08-13 13:18+0000\n"
 "Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab/language/ja/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. Tag: title
 #, no-c-format
@@ -19,22 +22,33 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Upgrading the existing accounts from a Kolab 2 server to a Kolab 3 server is a question of upgrading the server itself, but also upgrading the format from Kolab XML format version 2, to Kolab XML Format version 3."
+msgid ""
+"Upgrading the existing accounts from a Kolab 2 server to a Kolab 3 server is"
+" a question of upgrading the server itself, but also upgrading the format "
+"from Kolab XML format version 2, to Kolab XML Format version 3."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Upgrading the server itself is documented in a different chapter (TODO, link to that chapter). This chapter concerns the upgrading of IMAP Accounts from the Kolab v2 format to the Kolab v3 format."
+msgid ""
+"Upgrading the server itself is documented in a different chapter (TODO, link"
+" to that chapter). This chapter concerns the upgrading of IMAP Accounts from"
+" the Kolab v2 format to the Kolab v3 format."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "imapsync --host1 kolab2.example.org --tls1 --authuser1 john.doe at example.org --user1 cyrus-admin --proxyauth1 --password1 Welcome2KolabSystems --host2 kolab3.example.org --tls2 --authuser2 john.doe at example.org --user2 cyrus-admin --proxyauth2 --password2 Welcome2KolabSystems --include=\"INBOX\""
+msgid ""
+"imapsync --host1 kolab2.example.org --tls1 --authuser1 john.doe at example.org "
+"--user1 cyrus-admin --proxyauth1 --password1 Welcome2KolabSystems --host2 "
+"kolab3.example.org --tls2 --authuser2 john.doe at example.org --user2 cyrus-"
+"admin --proxyauth2 --password2 Welcome2KolabSystems --include=\"INBOX\""
 msgstr ""
 
 #. Tag: programlisting
 #, no-c-format
-msgid "#!/bin/bash\n"
+msgid ""
+"#!/bin/bash\n"
 "\n"
 "kolab -c /etc/kolab/kolab2.conf list-mailbox-acls user/*@example.org | \\\n"
 "    while read line; do\n"
@@ -61,7 +75,12 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "rsync -aHvz --progress --partial --exclude=\"Archive/\" --exclude=\"Administrativia/\" --exclude=\"Bugzilla/\" --exclude=\"Ham/\" --exclude=\"Spam/\" root at kolab.kolabsys.com:/kolab/var/imapd/spool/domain/k/kolabsys.com/v/user/vanmeeuwen/ /var/spool/imap/domain/k/kolabsys.com/v/user/vanmeeuwen/"
+msgid ""
+"rsync -aHvz --progress --partial --exclude=\"Archive/\" "
+"--exclude=\"Administrativia/\" --exclude=\"Bugzilla/\" --exclude=\"Ham/\" "
+"--exclude=\"Spam/\" "
+"root at kolab.kolabsys.com:/kolab/var/imapd/spool/domain/k/kolabsys.com/v/user/vanmeeuwen/"
+" /var/spool/imap/domain/k/kolabsys.com/v/user/vanmeeuwen/"
 msgstr ""
 
 #. Tag: para
@@ -81,18 +100,21 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Obtain the SSL certificate fingerprints needed with the following command:"
+msgid ""
+"Obtain the SSL certificate fingerprints needed with the following command:"
 msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "# <userinput>openssl x509 -fingerprint \\</userinput>\n"
+msgid ""
+"# <userinput>openssl x509 -fingerprint \\</userinput>\n"
 "> <userinput>-in /etc/pki/cyrus-imapd/cyrus-imapd.pem | head -n 1</userinput>"
 msgstr ""
 
 #. Tag: programlisting
 #, no-c-format
-msgid "[general]\n"
+msgid ""
+"[general]\n"
 "metadata = ~/.offlineimap\n"
 "accounts = kolab2to3\n"
 "maxsyncaccounts = 1\n"
@@ -125,4 +147,3 @@ msgid "[general]\n"
 "expunge = no\n"
 "readonly = True"
 msgstr ""
-
diff --git a/Administrator_Guide/ja-JP/Upgrading_Cyrus_IMAP_from_2.3_to_2.4.po b/Administrator_Guide/ja-JP/Upgrading_Cyrus_IMAP_from_2.3_to_2.4.po
index c9e36d2..4cc269f 100644
--- a/Administrator_Guide/ja-JP/Upgrading_Cyrus_IMAP_from_2.3_to_2.4.po
+++ b/Administrator_Guide/ja-JP/Upgrading_Cyrus_IMAP_from_2.3_to_2.4.po
@@ -1,13 +1,14 @@
-# 
+#
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-24T15:34:45\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -64,7 +65,8 @@ msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "# <userinput>kolab list-mailbox-metadata \\</userinput>\n"
+msgid ""
+"# <userinput>kolab list-mailbox-metadata \\</userinput>\n"
 "> <userinput>\"user/*@example.org\" > metadata.txt</userinput>\n"
 "# <userinput>kolab list-mailbox-metadata \\</userinput>\n"
 "> <userinput>\"shared/*@example.org\" >> metadata.txt</userinput>"
@@ -117,7 +119,8 @@ msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "# <userinput>kolab -c conf/kolab-kolab2.example.org.conf \\</userinput>\n"
+msgid ""
+"# <userinput>kolab -c conf/kolab-kolab2.example.org.conf \\</userinput>\n"
 "> <userinput>list-mailbox-metadata \"user/john.doe/Calendar*@example.org\"</userinput>\n"
 "Folder user/john.doe/Calendar at example.org\n"
 "  /shared/vendor/cmu/cyrus-imapd/lastpop\n"
@@ -168,7 +171,8 @@ msgstr ""
 
 #. Tag: programlisting
 #, no-c-format
-msgid "#!/bin/bash\n"
+msgid ""
+"#!/bin/bash\n"
 "\n"
 "# Interesting Annotations\n"
 "declare -a ia\n"
@@ -207,4 +211,3 @@ msgid "#!/bin/bash\n"
 "        fi\n"
 "    done"
 msgstr ""
-
diff --git a/Administrator_Guide/ja-JP/Upgrading_from_Kolab_2_on_OpenPKG.po b/Administrator_Guide/ja-JP/Upgrading_from_Kolab_2_on_OpenPKG.po
index 7b94d47..302d27c 100644
--- a/Administrator_Guide/ja-JP/Upgrading_from_Kolab_2_on_OpenPKG.po
+++ b/Administrator_Guide/ja-JP/Upgrading_from_Kolab_2_on_OpenPKG.po
@@ -1,16 +1,19 @@
-# 
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:45\n"
-"PO-Revision-Date: 2012-08-24T15:34:45\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
+"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
+"PO-Revision-Date: 2012-08-24 15:43+0000\n"
+"Last-Translator: Jeroen van Meeuwen <vanmeeuwen at kolabsys.com>\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab/language/ja/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. Tag: title
 #, no-c-format
@@ -19,17 +22,24 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "As Kolab Groupware used to be distributed as an OpenPKG stack, with different locations for files, the upgrade of a Kolab 2 server to a Kolab 3 server is a largely manual process."
+msgid ""
+"As Kolab Groupware used to be distributed as an OpenPKG stack, with "
+"different locations for files, the upgrade of a Kolab 2 server to a Kolab 3 "
+"server is a largely manual process."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The Kolab 3 server used here has been set up for the same domain name space as the Kolab 2 server. No users have been created on the Kolab 3 server."
+msgid ""
+"The Kolab 3 server used here has been set up for the same domain name space "
+"as the Kolab 2 server. No users have been created on the Kolab 3 server."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "<literal>kolab2.example.org</literal> refers to the Kolab 2 server, <literal>kolab3.example.org</literal> refers to the Kolab 3 server."
+msgid ""
+"<literal>kolab2.example.org</literal> refers to the Kolab 2 server, "
+"<literal>kolab3.example.org</literal> refers to the Kolab 3 server."
 msgstr ""
 
 #. Tag: title
@@ -54,7 +64,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The easiest way to prevent any of this happening is to shut down all Kolab Groupware related services on <literal>kolab2.example.org</literal>:"
+msgid ""
+"The easiest way to prevent any of this happening is to shut down all Kolab "
+"Groupware related services on <literal>kolab2.example.org</literal>:"
 msgstr ""
 
 #. Tag: screen
@@ -64,12 +76,14 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Create a backup of the data from <literal>kolab2.example.org</literal>."
+msgid ""
+"Create a backup of the data from <literal>kolab2.example.org</literal>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Shut down the Cyrus IMAP service on <literal>kolab3.example.org</literal>:"
+msgid ""
+"Shut down the Cyrus IMAP service on <literal>kolab3.example.org</literal>:"
 msgstr ""
 
 #. Tag: screen
@@ -89,32 +103,51 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Update the settings related to the recipient policy in <filename>/etc/kolab/kolab.conf</filename>. The following settings are important:"
+msgid ""
+"Update the settings related to the recipient policy in "
+"<filename>/etc/kolab/kolab.conf</filename>. The following settings are "
+"important:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The <literal>primary_mail</literal> setting in the <literal>[<replaceable>$domain</replaceable>]</literal> section."
+msgid ""
+"The <literal>primary_mail</literal> setting in the "
+"<literal>[<replaceable>$domain</replaceable>]</literal> section."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The policy MUST<footnote> <para> the policy enforces consistency in the <literal>mail</literal> attribute values for all users - and therefore mailbox names, and ACL entry subject validity </para> </footnote> either match the former convention used, if any, or not be enabled at all. See <xref linkend=\"exam-Administrator_Guide-Upgrading_from_Kolab_2_on_OpenPKG-Example_Migration_of_example.org\" /> for an example and some more gotchas."
+msgid ""
+"The policy MUST<footnote> <para> the policy enforces consistency in the "
+"<literal>mail</literal> attribute values for all users - and therefore "
+"mailbox names, and ACL entry subject validity </para> </footnote> either "
+"match the former convention used, if any, or not be enabled at all. See "
+"<xref linkend=\"exam-Administrator_Guide-Upgrading_from_Kolab_2_on_OpenPKG-"
+"Example_Migration_of_example.org\" /> for an example and some more gotchas."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "In case the recipient policy is not to be applied, consider updating the <literal>user_types</literal> as per the instructions in <xref linkend=\"sect-Administrator_Guide-Kolab_Web_Administration_Panel-Editing_user_types\" />."
+msgid ""
+"In case the recipient policy is not to be applied, consider updating the "
+"<literal>user_types</literal> as per the instructions in <xref linkend"
+"=\"sect-Administrator_Guide-Kolab_Web_Administration_Panel-"
+"Editing_user_types\" />."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The <literal>secondary_mail</literal> setting in the <literal>[<replaceable>$domain</replaceable>]</literal> section."
+msgid ""
+"The <literal>secondary_mail</literal> setting in the "
+"<literal>[<replaceable>$domain</replaceable>]</literal> section."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "This part of the policy does not apply should the <literal>primary_mail</literal> setting already have been disabled."
+msgid ""
+"This part of the policy does not apply should the "
+"<literal>primary_mail</literal> setting already have been disabled."
 msgstr ""
 
 #. Tag: title
@@ -124,22 +157,33 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Our first example has had a running Kolab 2.3 on OpenPKG server, with a general email address convention of \"surname\"@example.org."
+msgid ""
+"Our first example has had a running Kolab 2.3 on OpenPKG server, with a "
+"general email address convention of \"surname\"@example.org."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "By default, a Kolab &PRODUCT_VERSION; Groupware server will apply a recipient policy for the <literal>mail</literal> attribute value of \"givenname\".\"surname\"@example.org. The recipient policy must therefore be adjusted."
+msgid ""
+"By default, a Kolab &PRODUCT_VERSION; Groupware server will apply a "
+"recipient policy for the <literal>mail</literal> attribute value of "
+"\"givenname\".\"surname\"@example.org. The recipient policy must therefore "
+"be adjusted."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "In the <literal>[example.org]</literal> section in <filename>/etc/kolab/kolab.conf</filename>, the <literal>primary_mail</literal> setting must be adjusted to match the \"surname\"@example.org convention:"
+msgid ""
+"In the <literal>[example.org]</literal> section in "
+"<filename>/etc/kolab/kolab.conf</filename>, the "
+"<literal>primary_mail</literal> setting must be adjusted to match the "
+"\"surname\"@example.org convention:"
 msgstr ""
 
 #. Tag: programlisting
 #, no-c-format
-msgid "(...snip...)\n"
+msgid ""
+"(...snip...)\n"
 "[example.org]\n"
 "primary_mail = %(surname)s@%(domain)s\n"
 "(...snip...)"
@@ -147,12 +191,18 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Now, users that are created will get a <literal>mail</literal> attribute value of \"surname\"@example.org assigned."
+msgid ""
+"Now, users that are created will get a <literal>mail</literal> attribute "
+"value of \"surname\"@example.org assigned."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "First adding user John Doe will give him a <literal>mail</literal> attribute value of <emphasis>doe at example.org</emphasis>, but should you have a Jane Doe as well, she would get <emphasis>doe2 at example.org</emphasis>. It is therefore important to add users in order."
+msgid ""
+"First adding user John Doe will give him a <literal>mail</literal> attribute"
+" value of <emphasis>doe at example.org</emphasis>, but should you have a Jane "
+"Doe as well, she would get <emphasis>doe2 at example.org</emphasis>. It is "
+"therefore important to add users in order."
 msgstr ""
 
 #. Tag: title
@@ -182,17 +232,22 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Login to <literal>kolab3.example.org</literal> to execute the steps in this procedure."
+msgid ""
+"Login to <literal>kolab3.example.org</literal> to execute the steps in this "
+"procedure."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Copy mailboxes.db and annotations.db. These files are located in <filename>/kolab/var/imapd/</filename> on your Kolab 2 server."
+msgid ""
+"Copy mailboxes.db and annotations.db. These files are located in "
+"<filename>/kolab/var/imapd/</filename> on your Kolab 2 server."
 msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "# <userinput>scp root at kolab2.example.org:/kolab/var/imapd/annotations.db \\</userinput>\n"
+msgid ""
+"# <userinput>scp root at kolab2.example.org:/kolab/var/imapd/annotations.db \\</userinput>\n"
 ">    <userinput>/var/lib/imap/annotations.db</userinput>\n"
 "(...)\n"
 "# <userinput>scp root at kolab2.example.org:/kolab/var/imapd/mailboxes.db \\</userinput>\n"
@@ -207,7 +262,8 @@ msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "# <userinput>rsync -rltpHvz --progress --partial \\</userinput>\n"
+msgid ""
+"# <userinput>rsync -rltpHvz --progress --partial \\</userinput>\n"
 ">    <userinput>kolab2.example.org:/var/imapd/spool/ \\</userinput>\n"
 ">    <userinput>/var/spool/imap/</userinput>\n"
 "(...)"
@@ -220,7 +276,8 @@ msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "# <userinput>rsync -rltpHvz --progress --partial \\</userinput>\n"
+msgid ""
+"# <userinput>rsync -rltpHvz --progress --partial \\</userinput>\n"
 ">    <userinput>kolab2.example.org:/var/imapd/domain/ \\</userinput>\n"
 ">    <userinput>/var/lib/imap/domain/</userinput>\n"
 "(...)\n"
@@ -237,17 +294,21 @@ msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "# <userinput>chown -R cyrus:mail /var/lib/imap/ /var/spool/imap/</userinput>"
+msgid ""
+"# <userinput>chown -R cyrus:mail /var/lib/imap/ /var/spool/imap/</userinput>"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Ensure only the cyrus user can read and write, and the mail group can read the contents of either directory tree:"
+msgid ""
+"Ensure only the cyrus user can read and write, and the mail group can read "
+"the contents of either directory tree:"
 msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "# <userinput>find /var/lib/imap -type f -exec chmod 640 {} \\;</userinput>\n"
+msgid ""
+"# <userinput>find /var/lib/imap -type f -exec chmod 640 {} \\;</userinput>\n"
 "# <userinput>find /var/lib/imap -type d -exec chmod 750 {} \\;</userinput>\n"
 "# <userinput>find /var/spool/imap -type f -exec chmod 640 {} \\;</userinput>\n"
 "# <userinput>find /var/spool/imap -type d -exec chmod 750 {} \\;</userinput>"
@@ -270,17 +331,25 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Users should not yet be allowed to interact with the system at this point. We suggest closing access to the system through the firewall."
+msgid ""
+"Users should not yet be allowed to interact with the system at this point. "
+"We suggest closing access to the system through the firewall."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The annotations database may not have been upgraded correctly, causing some annotations to miss the first 4 characters of their value. The easiest way to fix the issue, that is known to work, is to get the annotation values as they were on the old (Kolab 2) IMAP server, and set them on the new (Kolab 3) IMAP server."
+msgid ""
+"The annotations database may not have been upgraded correctly, causing some "
+"annotations to miss the first 4 characters of their value. The easiest way "
+"to fix the issue, that is known to work, is to get the annotation values as "
+"they were on the old (Kolab 2) IMAP server, and set them on the new (Kolab "
+"3) IMAP server."
 msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "# <userinput>kolab -c conf/kolab-kolab2.example.org.conf \\</userinput>\n"
+msgid ""
+"# <userinput>kolab -c conf/kolab-kolab2.example.org.conf \\</userinput>\n"
 "> <userinput>list-mailbox-metadata \"user/john.doe/Calendar*@example.org\"</userinput>\n"
 "Folder user/john.doe/Calendar at example.org\n"
 "  /shared/vendor/cmu/cyrus-imapd/lastpop\n"
@@ -331,7 +400,8 @@ msgstr ""
 
 #. Tag: programlisting
 #, no-c-format
-msgid "#!/bin/bash\n"
+msgid ""
+"#!/bin/bash\n"
 "\n"
 "# Interesting Annotations\n"
 "declare -a ia\n"
@@ -379,12 +449,17 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Upgrade all messages from Kolab Format version 2 to Kolab Format version 3 using <command>kolab-formatupgrade</command>. This command is run in two parts. The first will upgrade all mailbox contents in the personal namespace:"
+msgid ""
+"Upgrade all messages from Kolab Format version 2 to Kolab Format version 3 "
+"using <command>kolab-formatupgrade</command>. This command is run in two "
+"parts. The first will upgrade all mailbox contents in the personal "
+"namespace:"
 msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "# <userinput>kolab lm \"user/%@example.org\" | \\</userinput>\n"
+msgid ""
+"# <userinput>kolab lm \"user/%@example.org\" | \\</userinput>\n"
 ">   <userinput>sed -e 's/user\\///g' | \\</userinput>\n"
 ">   <userinput>while read user; do</userinput>\n"
 ">       <userinput>kolab-formatupgrade \\</userinput>\n"
@@ -399,17 +474,25 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The second part upgrades the contents of shared folders. Shared folders have no designated owners, and we can therefore not login as a designated user to upgrade the format."
+msgid ""
+"The second part upgrades the contents of shared folders. Shared folders have"
+" no designated owners, and we can therefore not login as a designated user "
+"to upgrade the format."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "As the user <literal>cyrus-admin</literal> normally does not have the necessary privileges to insert new messages into mail folders, so we're going to have to give out the rights first. We'll delete them again afterwards."
+msgid ""
+"As the user <literal>cyrus-admin</literal> normally does not have the "
+"necessary privileges to insert new messages into mail folders, so we're "
+"going to have to give out the rights first. We'll delete them again "
+"afterwards."
 msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "# <userinput>kolab sam shared/*@example.org cyrus-admin lrswiptexa</userinput>\n"
+msgid ""
+"# <userinput>kolab sam shared/*@example.org cyrus-admin lrswiptexa</userinput>\n"
 "# <userinput>kolab lm shared/*@example.org | \\</userinput>\n"
 ">   <userinput>while read folder; do</userinput>\n"
 ">       <userinput>kolab-formatupgrade \\</userinput>\n"
@@ -422,4 +505,3 @@ msgid "# <userinput>kolab sam shared/*@example.org cyrus-admin lrswiptexa</useri
 ">   <userinput>done</userinput>\n"
 "# <userinput>kolab dam shared/*@example.org cyrus-admin</userinput>"
 msgstr ""
-
diff --git a/Administrator_Guide/ja-JP/Verifying_the_Installation.po b/Administrator_Guide/ja-JP/Verifying_the_Installation.po
index 6d35899..3b74189 100644
--- a/Administrator_Guide/ja-JP/Verifying_the_Installation.po
+++ b/Administrator_Guide/ja-JP/Verifying_the_Installation.po
@@ -1,16 +1,19 @@
-# 
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:45\n"
-"PO-Revision-Date: 2012-08-24T15:34:45\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
+"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
+"PO-Revision-Date: 2012-08-13 13:18+0000\n"
 "Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab/language/ja/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. Tag: title
 #, no-c-format
@@ -19,7 +22,11 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "This chapter concerns verifying the Kolab Groupware installation works as expected, to the limited realm this documentation can serve. If you have modified the Kolab Groupware deployment to match your needs, some of the following verification steps may not function as expected."
+msgid ""
+"This chapter concerns verifying the Kolab Groupware installation works as "
+"expected, to the limited realm this documentation can serve. If you have "
+"modified the Kolab Groupware deployment to match your needs, some of the "
+"following verification steps may not function as expected."
 msgstr ""
 
 #. Tag: title
@@ -39,7 +46,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The LDAP server is crucial to authentication, authorization, user and group information and mail routing, and must be running."
+msgid ""
+"The LDAP server is crucial to authentication, authorization, user and group "
+"information and mail routing, and must be running."
 msgstr ""
 
 #. Tag: para
@@ -64,18 +73,24 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Verify the firewall allows access to those ports, if the <literal>iptables</literal> service is running:"
+msgid ""
+"Verify the firewall allows access to those ports, if the "
+"<literal>iptables</literal> service is running:"
 msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "# <userinput>service iptables status</userinput>\n"
+msgid ""
+"# <userinput>service iptables status</userinput>\n"
 "# <userinput>iptables -L INPUT -n -v | grep -E \"dpt:(389|636)\" | grep ACCEPT</userinput>"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Kolab Groupware does not configure your firewall for you. You may have decided to work your firewall yourself, in which case the former commands may not include any ouput."
+msgid ""
+"Kolab Groupware does not configure your firewall for you. You may have "
+"decided to work your firewall yourself, in which case the former commands "
+"may not include any ouput."
 msgstr ""
 
 #. Tag: para
@@ -85,12 +100,16 @@ msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "# <userinput>ldapsearch -x -h localhost -D \"${binddn}\" -w \"${bindpw}\" -b \"${basedn}\"</userinput>"
+msgid ""
+"# <userinput>ldapsearch -x -h localhost -D \"${binddn}\" -w \"${bindpw}\" -b"
+" \"${basedn}\"</userinput>"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Log files for 389 Directory Server are located in <filename>/var/log/dirsrv/slapd-*/</filename>."
+msgid ""
+"Log files for 389 Directory Server are located in "
+"<filename>/var/log/dirsrv/slapd-*/</filename>."
 msgstr ""
 
 #. Tag: title
@@ -100,7 +119,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The Kolab SASL authentication daemon is used by Postfix and Cyrus IMAP, to authenticate users."
+msgid ""
+"The Kolab SASL authentication daemon is used by Postfix and Cyrus IMAP, to "
+"authenticate users."
 msgstr ""
 
 #. Tag: screen
@@ -115,7 +136,8 @@ msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "# <userinput>testsaslauthd -u <replaceable>cyrus-admin</replaceable> -p <replaceable>$password</replaceable></userinput>\n"
+msgid ""
+"# <userinput>testsaslauthd -u <replaceable>cyrus-admin</replaceable> -p <replaceable>$password</replaceable></userinput>\n"
 "# <userinput>testsaslauthd -u <replaceable>john.doe at example.org</replaceable> -p <replaceable>$password</replaceable></userinput>\n"
 "# <userinput>testsaslauthd -u <replaceable>doe</replaceable> -p <replaceable>$password</replaceable></userinput>\n"
 "# <userinput>testsaslauthd -u <replaceable>doe</replaceable> -r <replaceable>example.org</replaceable> -p <replaceable>$password</replaceable></userinput>"
@@ -123,7 +145,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The log file for the Kolab SASL authentication daemon is <filename>/var/log/kolab/pykolab.log</filename>."
+msgid ""
+"The log file for the Kolab SASL authentication daemon is "
+"<filename>/var/log/kolab/pykolab.log</filename>."
 msgstr ""
 
 #. Tag: title
@@ -148,7 +172,8 @@ msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "# <userinput>service iptables status</userinput>\n"
+msgid ""
+"# <userinput>service iptables status</userinput>\n"
 "# <userinput>iptables -L INPUT -n -v | grep -E \"dpt:(143|993)\" | grep ACCEPT</userinput>"
 msgstr ""
 
@@ -159,7 +184,8 @@ msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "# <userinput>imtest -t \"\" -u <replaceable>john.doe at example.org</replaceable> -w <replaceable>$password</replaceable> localhost</userinput>\n"
+msgid ""
+"# <userinput>imtest -t \"\" -u <replaceable>john.doe at example.org</replaceable> -w <replaceable>$password</replaceable> localhost</userinput>\n"
 "# <userinput>imtest -t \"\" -u <replaceable>doe</replaceable> -w <replaceable>$password</replaceable> localhost</userinput>"
 msgstr ""
 
@@ -170,7 +196,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The Apache webserver is needed for the Kolab Web Client, Administration Panel and the exchange of Free/Busy information."
+msgid ""
+"The Apache webserver is needed for the Kolab Web Client, Administration "
+"Panel and the exchange of Free/Busy information."
 msgstr ""
 
 #. Tag: title
@@ -195,7 +223,8 @@ msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "# <userinput>service iptables status</userinput>\n"
+msgid ""
+"# <userinput>service iptables status</userinput>\n"
 "# <userinput>iptables -L INPUT -n -v | grep -E \"dpt:(80|443)\" | grep ACCEPT</userinput>"
 msgstr ""
 
@@ -206,13 +235,16 @@ msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "# <userinput>wget -O- http://localhost</userinput>\n"
+msgid ""
+"# <userinput>wget -O- http://localhost</userinput>\n"
 "# <userinput>wget -O- https://localhost</userinput>"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Kolab Groupware does not, by default, configure the webserver to also listen on HTTPS port 443."
+msgid ""
+"Kolab Groupware does not, by default, configure the webserver to also listen"
+" on HTTPS port 443."
 msgstr ""
 
 #. Tag: title
@@ -239,4 +271,3 @@ msgstr ""
 #, no-c-format
 msgid "The Kolab Daemon"
 msgstr ""
-
diff --git a/Administrator_Guide/ja-JP/chap-About_Kolab_Groupware.po b/Administrator_Guide/ja-JP/chap-About_Kolab_Groupware.po
index ef0e209..89115be 100644
--- a/Administrator_Guide/ja-JP/chap-About_Kolab_Groupware.po
+++ b/Administrator_Guide/ja-JP/chap-About_Kolab_Groupware.po
@@ -1,16 +1,19 @@
-# 
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:45\n"
-"PO-Revision-Date: 2012-08-24T15:34:45\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
+"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
+"PO-Revision-Date: 2012-08-13 13:17+0000\n"
 "Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab/language/ja/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. Tag: title
 #, no-c-format
@@ -19,7 +22,10 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Kolab is a Groupware Solution for Emails, Appointments, Contacts and more. It supports mixed client environments (Outlook/KDE) because of an open storage format. Any email client speaking standard protocols can be served."
+msgid ""
+"Kolab is a Groupware Solution for Emails, Appointments, Contacts and more. "
+"It supports mixed client environments (Outlook/KDE) because of an open "
+"storage format. Any email client speaking standard protocols can be served."
 msgstr ""
 
 #. Tag: title
@@ -39,6 +45,7 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Describe how this documentation can be modified to custom, internal documentation"
+msgid ""
+"Describe how this documentation can be modified to custom, internal "
+"documentation"
 msgstr ""
-
diff --git a/Administrator_Guide/ja-JP/part-Clients.po b/Administrator_Guide/ja-JP/part-Clients.po
index 2966a66..f264574 100644
--- a/Administrator_Guide/ja-JP/part-Clients.po
+++ b/Administrator_Guide/ja-JP/part-Clients.po
@@ -1,19 +1,21 @@
-# 
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:45\n"
-"PO-Revision-Date: 2012-08-24T15:34:45\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
+"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
+"PO-Revision-Date: 2012-08-13 13:17+0000\n"
 "Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab/language/ja/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. Tag: title
 #, no-c-format
 msgid "Kolab Groupware Clients"
 msgstr ""
-
diff --git a/Administrator_Guide/ja-JP/part-Kolab_Server.po b/Administrator_Guide/ja-JP/part-Kolab_Server.po
index d21dee1..be9d45a 100644
--- a/Administrator_Guide/ja-JP/part-Kolab_Server.po
+++ b/Administrator_Guide/ja-JP/part-Kolab_Server.po
@@ -1,19 +1,21 @@
-# 
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:45\n"
-"PO-Revision-Date: 2012-08-24T15:34:45\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
+"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
+"PO-Revision-Date: 2012-08-13 13:17+0000\n"
 "Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab/language/ja/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. Tag: title
 #, no-c-format
 msgid "Kolab Groupware Server"
 msgstr ""
-
diff --git a/Administrator_Guide/ja-JP/sect-About_Kolab_Groupware.po b/Administrator_Guide/ja-JP/sect-About_Kolab_Groupware.po
index d896ac1..7fe1131 100644
--- a/Administrator_Guide/ja-JP/sect-About_Kolab_Groupware.po
+++ b/Administrator_Guide/ja-JP/sect-About_Kolab_Groupware.po
@@ -1,16 +1,19 @@
-# 
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:45\n"
-"PO-Revision-Date: 2012-08-24T15:34:45\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
+"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
+"POT-Creation-Date: 2012-08-24T15:41:53\n"
+"PO-Revision-Date: 2012-08-13 14:24+0000\n"
 "Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab/language/ja/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. Tag: title
 #, no-c-format
@@ -19,12 +22,18 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Kolab Groupware is a highly scalable, flexible, mutli-platform solution for Emails, Appointments, Contacts and more. It supports mixed client environments (Outlook/KDE) because of a well-defined, interoperable and open storage format. Any email client speaking standard protocols can be served."
+msgid ""
+"Kolab Groupware is a highly scalable, flexible, mutli-platform solution for "
+"Emails, Appointments, Contacts and more. It supports mixed client "
+"environments (Outlook/KDE) because of a well-defined, interoperable and open"
+" storage format. Any email client speaking standard protocols can be served."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The Kolab Groupware solution consists of many Free Software components, integrated by Kolab in order to build a groupware solution."
+msgid ""
+"The Kolab Groupware solution consists of many Free Software components, "
+"integrated by Kolab in order to build a groupware solution."
 msgstr ""
 
 #. Tag: title
@@ -44,7 +53,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Postfix attempts to be fast, easy to administer, and secure. The outside has a definite Sendmail-ish flavor, but the inside is completely different."
+msgid ""
+"Postfix attempts to be fast, easy to administer, and secure. The outside has"
+" a definite Sendmail-ish flavor, but the inside is completely different."
 msgstr ""
 
 #. Tag: para
@@ -59,7 +70,11 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Cyrus IMAP is a highly scalable enterprise mail system designed for use in enterprise environments of various sizes using standards based technologies. Cyrus IMAP technologies scale from independent use in email departments to a system centrally managed in a large enterprise."
+msgid ""
+"Cyrus IMAP is a highly scalable enterprise mail system designed for use in "
+"enterprise environments of various sizes using standards based technologies."
+" Cyrus IMAP technologies scale from independent use in email departments to "
+"a system centrally managed in a large enterprise."
 msgstr ""
 
 #. Tag: para
@@ -74,7 +89,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "OpenLDAP Software is an open source implementation of the Lightweight Directory Access Protocol."
+msgid ""
+"OpenLDAP Software is an open source implementation of the Lightweight "
+"Directory Access Protocol."
 msgstr ""
 
 #. Tag: para
@@ -89,11 +106,14 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Roundcube webmail is a browser-based multilingual IMAP client with an application-like user interface. It provides full functionality you expect from an e-mail client, including MIME support, address book, folder manipulation, message searching and spell checking."
+msgid ""
+"Roundcube webmail is a browser-based multilingual IMAP client with an "
+"application-like user interface. It provides full functionality you expect "
+"from an e-mail client, including MIME support, address book, folder "
+"manipulation, message searching and spell checking."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid "Website: <ulink url=\"http://www.roundcube.net/\" />"
 msgstr ""
-
diff --git a/Administrator_Guide/ja-JP/sect-Feedback.po b/Administrator_Guide/ja-JP/sect-Feedback.po
index 0f44238..7d479c6 100644
--- a/Administrator_Guide/ja-JP/sect-Feedback.po
+++ b/Administrator_Guide/ja-JP/sect-Feedback.po
@@ -1,16 +1,19 @@
-# 
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:45\n"
-"PO-Revision-Date: 2012-08-24T15:34:45\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
+"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
+"POT-Creation-Date: 2012-08-24T15:41:53\n"
+"PO-Revision-Date: 2012-08-13 14:24+0000\n"
 "Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab/language/ja/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. Tag: title
 #, no-c-format
@@ -19,12 +22,16 @@ msgstr ""
 
 #. Tag: indexterm
 #, no-c-format
-msgid "<primary>feedback</primary> <secondary>contact information for this manual</secondary>"
+msgid ""
+"<primary>feedback</primary> <secondary>contact information for this "
+"manual</secondary>"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "We value feedback on our software as well as our documentation. Please find ways to contact us in this section."
+msgid ""
+"We value feedback on our software as well as our documentation. Please find "
+"ways to contact us in this section."
 msgstr ""
 
 #. Tag: title
@@ -34,22 +41,30 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Bug reports can be logged in our <ulink url=\"https://bugzilla.kolabsys.com\">Bugzilla issue tracker</ulink>. Please bear in mind registration is required to log bugs."
+msgid ""
+"Bug reports can be logged in our <ulink "
+"url=\"https://bugzilla.kolabsys.com\">Bugzilla issue tracker</ulink>. Please"
+" bear in mind registration is required to log bugs."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Before reporting a bug, please search the issue tracker for existing bugs that may report the same problem."
+msgid ""
+"Before reporting a bug, please search the issue tracker for existing bugs "
+"that may report the same problem."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "When reporting a bug, please prepare to provide the following information;"
+msgid ""
+"When reporting a bug, please prepare to provide the following information;"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Your platform, and if applicable, your distribution and the distribution version."
+msgid ""
+"Your platform, and if applicable, your distribution and the distribution "
+"version."
 msgstr ""
 
 #. Tag: para
@@ -59,7 +74,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "If a custom version is used, any options that may have specified during the build process."
+msgid ""
+"If a custom version is used, any options that may have specified during the "
+"build process."
 msgstr ""
 
 #. Tag: title
@@ -69,7 +86,10 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Mailing lists are a quick way to get in touch with a large number of subscribers, who may know the answer to your question or can provide you with additional insight."
+msgid ""
+"Mailing lists are a quick way to get in touch with a large number of "
+"subscribers, who may know the answer to your question or can provide you "
+"with additional insight."
 msgstr ""
 
 #. Tag: title
@@ -79,7 +99,15 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Kolab Groupware administrators and developers are strongly encouraged to subscribe to the moderated, low-volume announcement mailing list, to which important release announcements are submitted. We have the announcement mailing list available at <ulink url=\"https://lists.kolab.org/mailman/listinfo/kolab-announce\" />. To subscribe to the list, either click the aforementioned link and fill out the information requested, or send an email to <ulink url=\"mailto:kolab-announce-subscribe at kolab.org\">kolab-announce-subscribe at kolab.org</ulink>."
+msgid ""
+"Kolab Groupware administrators and developers are strongly encouraged to "
+"subscribe to the moderated, low-volume announcement mailing list, to which "
+"important release announcements are submitted. We have the announcement "
+"mailing list available at <ulink "
+"url=\"https://lists.kolab.org/mailman/listinfo/kolab-announce\" />. To "
+"subscribe to the list, either click the aforementioned link and fill out the"
+" information requested, or send an email to <ulink url=\"mailto:kolab-"
+"announce-subscribe at kolab.org\">kolab-announce-subscribe at kolab.org</ulink>."
 msgstr ""
 
 #. Tag: title
@@ -89,7 +117,12 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "For users of Kolab software, we run a public mailing list at <ulink url=\"https://lists.kolab.org/mailman/listinfo/kolab-users\" />. To subscribe to the list, either click the aforementioned link and fill out the information requested, or send an email to <ulink url=\"mailto:kolab-users-subscribe at kolab.org\">kolab-users-subscribe at kolab.org</ulink>."
+msgid ""
+"For users of Kolab software, we run a public mailing list at <ulink "
+"url=\"https://lists.kolab.org/mailman/listinfo/kolab-users\" />. To "
+"subscribe to the list, either click the aforementioned link and fill out the"
+" information requested, or send an email to <ulink url=\"mailto:kolab-users-"
+"subscribe at kolab.org\">kolab-users-subscribe at kolab.org</ulink>."
 msgstr ""
 
 #. Tag: title
@@ -99,7 +132,13 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "For developers of Kolab software, as well as general discussion on bugs and patches, we run a public mailing list at <ulink url=\"https://lists.kolab.org/mailman/listinfo/kolab-devel\" />. To subscribe to the list and fill out the information requested, or send an email to <ulink url=\"mailto:kolab-devel-subscribe at kolab.org\">kolab-devel-subscribe at kolab.org</ulink>."
+msgid ""
+"For developers of Kolab software, as well as general discussion on bugs and "
+"patches, we run a public mailing list at <ulink "
+"url=\"https://lists.kolab.org/mailman/listinfo/kolab-devel\" />. To "
+"subscribe to the list and fill out the information requested, or send an "
+"email to <ulink url=\"mailto:kolab-devel-subscribe at kolab.org\">kolab-devel-"
+"subscribe at kolab.org</ulink>."
 msgstr ""
 
 #. Tag: title
@@ -109,7 +148,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The archives of the announcement, user support and development discussion mailing lists are available through web archives."
+msgid ""
+"The archives of the announcement, user support and development discussion "
+"mailing lists are available through web archives."
 msgstr ""
 
 #. Tag: title
@@ -119,11 +160,18 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Internet Relay Chat (IRC) is another way to get in touch with some of the people that develop and use Kolab Groupware. Use your favorite IRC client to connect to the <ulink url=\"http://freenode.net\">FreeNode IRC Network</ulink>, or use the <ulink url=\"http://webchat.freenode.net?channels=kolab&uio=d4\">web-based chat</ulink>."
+msgid ""
+"Internet Relay Chat (IRC) is another way to get in touch with some of the "
+"people that develop and use Kolab Groupware. Use your favorite IRC client to"
+" connect to the <ulink url=\"http://freenode.net\">FreeNode IRC "
+"Network</ulink>, or use the <ulink "
+"url=\"http://webchat.freenode.net?channels=kolab&uio=d4\">web-based "
+"chat</ulink>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Once connected, join us in <ulink url=\"irc://irc.freenode.net/kolab\">the #kolab IRC channel</ulink>."
+msgid ""
+"Once connected, join us in <ulink url=\"irc://irc.freenode.net/kolab\">the "
+"#kolab IRC channel</ulink>."
 msgstr ""
-
diff --git a/Administrator_Guide/ja-JP/sect-Kolab_Product_Series.po b/Administrator_Guide/ja-JP/sect-Kolab_Product_Series.po
index 606dcd1..fcaab73 100644
--- a/Administrator_Guide/ja-JP/sect-Kolab_Product_Series.po
+++ b/Administrator_Guide/ja-JP/sect-Kolab_Product_Series.po
@@ -1,16 +1,19 @@
-# 
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:45\n"
-"PO-Revision-Date: 2012-08-24T15:34:45\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
+"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
+"POT-Creation-Date: 2012-08-24T15:41:53\n"
+"PO-Revision-Date: 2012-08-13 14:24+0000\n"
 "Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab/language/ja/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. Tag: title
 #, no-c-format
@@ -19,27 +22,45 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Kolab Groupware consists of free software components, each of which are available from various upstream development and support project organizations, including Linux distributions."
+msgid ""
+"Kolab Groupware consists of free software components, each of which are "
+"available from various upstream development and support project "
+"organizations, including Linux distributions."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The Kolab Groupware developers, community members and Kolab Systems engineering and support staff maintain many of the packages related to Kolab with the Linux distributions through which those packages are available."
+msgid ""
+"The Kolab Groupware developers, community members and Kolab Systems "
+"engineering and support staff maintain many of the packages related to Kolab"
+" with the Linux distributions through which those packages are available."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The Kolab software repositories can therefor include only those software components, or those specific versions of software components, that differentiate from what is available through the upstream Linux distribution software repositories, and possibly recommended or required additional software repositories."
+msgid ""
+"The Kolab software repositories can therefor include only those software "
+"components, or those specific versions of software components, that "
+"differentiate from what is available through the upstream Linux distribution"
+" software repositories, and possibly recommended or required additional "
+"software repositories."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Product series are versioned, each of them created to provide a sustainable stream of updates to the individual software components included in that product serie."
+msgid ""
+"Product series are versioned, each of them created to provide a sustainable "
+"stream of updates to the individual software components included in that "
+"product serie."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The convention for <emphasis>Server Product Versioning</emphasis> is subject to the guidelines proposed and accepted as <ulink url=\"http://wiki.kolab.org/KEP:5\">Kolab Enhancement Proposal #5</ulink> (KEP #5 for short)."
+msgid ""
+"The convention for <emphasis>Server Product Versioning</emphasis> is subject"
+" to the guidelines proposed and accepted as <ulink "
+"url=\"http://wiki.kolab.org/KEP:5\">Kolab Enhancement Proposal #5</ulink> "
+"(KEP #5 for short)."
 msgstr ""
 
 #. Tag: title
@@ -49,47 +70,72 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Two different product streams exist, a <literal>community</literal> edition and an <literal>enterprise</literal> edition."
+msgid ""
+"Two different product streams exist, a <literal>community</literal> edition "
+"and an <literal>enterprise</literal> edition."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The differences between the community edition and the enterprise edition are as follows:"
+msgid ""
+"The differences between the community edition and the enterprise edition are"
+" as follows:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "No debuginfo sub-packages are made available through the repositories for the community edition. You typically need debuginfo sub-paclages in case stack traces need to be generated for binary compiled programs such as mysql, openldap, cyrus-imapd, php and others."
+msgid ""
+"No debuginfo sub-packages are made available through the repositories for "
+"the community edition. You typically need debuginfo sub-paclages in case "
+"stack traces need to be generated for binary compiled programs such as "
+"mysql, openldap, cyrus-imapd, php and others."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The packages available through the repositories for the community edition are not signed with a PGP key, and therefor the authenticity of the packages cannot be verified."
+msgid ""
+"The packages available through the repositories for the community edition "
+"are not signed with a PGP key, and therefor the authenticity of the packages"
+" cannot be verified."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The repositories for the community edition are made available through HTTP only, while the enterprise edition's repositories are available over HTTPS only. For the community edition, the the authenticity cannot be verified."
+msgid ""
+"The repositories for the community edition are made available through HTTP "
+"only, while the enterprise edition's repositories are available over HTTPS "
+"only. For the community edition, the the authenticity cannot be verified."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "In the repositories for the community edition, no package builds other then the latest are made available. Rolling back a software update foo-1.0-2.el5 to a previously installed software version foo-1.0-1.el5 after a failed update is therefor not possible unless a copy of foo-1.0-1.el5 had been preserved."
+msgid ""
+"In the repositories for the community edition, no package builds other then "
+"the latest are made available. Rolling back a software update foo-1.0-2.el5 "
+"to a previously installed software version foo-1.0-1.el5 after a failed "
+"update is therefor not possible unless a copy of foo-1.0-1.el5 had been "
+"preserved."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "For the community edition, no security errata –other then for critical security issues– is sent out."
+msgid ""
+"For the community edition, no security errata –other then for critical"
+" security issues– is sent out."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The enterprise edition is supported for a longer term than the community edition."
+msgid ""
+"The enterprise edition is supported for a longer term than the community "
+"edition."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The software available in the enterprise edition is subjected to thorough quality assurance and certification before being made available."
+msgid ""
+"The software available in the enterprise edition is subjected to thorough "
+"quality assurance and certification before being made available."
 msgstr ""
 
 #. Tag: title
@@ -99,16 +145,24 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "4 different repository stages exist, each of them indicating the expected level of stability, and point-in-time release."
+msgid ""
+"4 different repository stages exist, each of them indicating the expected "
+"level of stability, and point-in-time release."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The <literal>release</literal> and <literal>updates</literal> repositories contain the most stable software (community edition) which is supported (professionally in the enterprise edition)."
+msgid ""
+"The <literal>release</literal> and <literal>updates</literal> repositories "
+"contain the most stable software (community edition) which is supported "
+"(professionally in the enterprise edition)."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The <literal>updates-testing</literal> repositories contain software that is being stabilized (through the collection of community feedback for the community edition) before being submitted to the <literal>updates</literal> repository."
+msgid ""
+"The <literal>updates-testing</literal> repositories contain software that is"
+" being stabilized (through the collection of community feedback for the "
+"community edition) before being submitted to the <literal>updates</literal> "
+"repository."
 msgstr ""
-
diff --git a/Administrator_Guide/ja-JP/sect-Supported_Platforms_and_System_Requirements.po b/Administrator_Guide/ja-JP/sect-Supported_Platforms_and_System_Requirements.po
index 1cbb0e6..6823f28 100644
--- a/Administrator_Guide/ja-JP/sect-Supported_Platforms_and_System_Requirements.po
+++ b/Administrator_Guide/ja-JP/sect-Supported_Platforms_and_System_Requirements.po
@@ -1,16 +1,19 @@
-# 
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:45\n"
-"PO-Revision-Date: 2012-08-24T15:34:45\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
+"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
+"POT-Creation-Date: 2012-08-24T15:41:53\n"
+"PO-Revision-Date: 2012-08-24 15:44+0000\n"
+"Last-Translator: Jeroen van Meeuwen <vanmeeuwen at kolabsys.com>\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab/language/ja/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. Tag: title
 #, no-c-format
@@ -24,7 +27,12 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "All reasonably recent versions of Linux<footnote> <para> By reasonably recent versions of Linux, we intend to indicate the Kolab project can manage to keep up with the latest distribution release ear-marked stable. </para> </footnote>, including but not limited to the following distributions, in no particular order other then alphabetic;"
+msgid ""
+"All reasonably recent versions of Linux<footnote> <para> By reasonably "
+"recent versions of Linux, we intend to indicate the Kolab project can manage"
+" to keep up with the latest distribution release ear-marked stable. </para> "
+"</footnote>, including but not limited to the following distributions, in no"
+" particular order other then alphabetic;"
 msgstr ""
 
 #. Tag: para
@@ -49,11 +57,15 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "<ulink url=\"http://www.univention.de/index.php?id=964&L=1\">Univention Corporate Server</ulink>"
+msgid ""
+"<ulink url=\"http://www.univention.de/index.php?id=964&L=1\">Univention "
+"Corporate Server</ulink>"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Should your Linux distribution or platform not be listed here, please refer to <xref linkend=\"sect-Administrator_Guide-Feedback\" /> for ways of contacting the Kolab Development team."
+msgid ""
+"Should your Linux distribution or platform not be listed here, please refer "
+"to <xref linkend=\"sect-Administrator_Guide-Feedback\" /> for ways of "
+"contacting the Kolab Development team."
 msgstr ""
-
diff --git a/Administrator_Guide/ja-JP/step-convert-seen-databases.po b/Administrator_Guide/ja-JP/step-convert-seen-databases.po
index e8b75f0..eb6d5bb 100644
--- a/Administrator_Guide/ja-JP/step-convert-seen-databases.po
+++ b/Administrator_Guide/ja-JP/step-convert-seen-databases.po
@@ -1,25 +1,31 @@
-# 
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:45\n"
-"PO-Revision-Date: 2012-08-24T15:34:45\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
+"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
+"POT-Creation-Date: 2012-08-24T15:41:53\n"
+"PO-Revision-Date: 2012-08-13 13:17+0000\n"
 "Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab/language/ja/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. Tag: para
 #, no-c-format
-msgid "As the seen databases are particularly hard for Cyrus IMAP 2.4 to upgrade real-time, convert the seen databases with, for example:"
+msgid ""
+"As the seen databases are particularly hard for Cyrus IMAP 2.4 to upgrade "
+"real-time, convert the seen databases with, for example:"
 msgstr ""
 
 #. Tag: programlisting
 #, no-c-format
-msgid "#!/bin/bash\n"
+msgid ""
+"#!/bin/bash\n"
 "\n"
 "find /var/lib/imap/ -type f -name \"*.seen\" | \\\n"
 "    sort | while read seendb; do\n"
@@ -28,6 +34,4 @@ msgid "#!/bin/bash\n"
 "        /usr/lib/cyrus-imapd/cvt_cyrusdb ${seendb}.txt flat ${seendb} skiplist\n"
 "        chown cyrus:mail ${seendb} ${seendb}.txt ${seendb}.orig\n"
 "    done\n"
-""
 msgstr ""
-
diff --git a/Administrator_Guide/ja-JP/step-select-all-mailboxes.po b/Administrator_Guide/ja-JP/step-select-all-mailboxes.po
index d39757b..0c28347 100644
--- a/Administrator_Guide/ja-JP/step-select-all-mailboxes.po
+++ b/Administrator_Guide/ja-JP/step-select-all-mailboxes.po
@@ -1,41 +1,57 @@
-# 
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:45\n"
-"PO-Revision-Date: 2012-08-24T15:34:45\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
+"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
+"POT-Creation-Date: 2012-08-24T15:41:53\n"
+"PO-Revision-Date: 2012-08-13 13:16+0000\n"
 "Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab/language/ja/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. Tag: para
 #, no-c-format
-msgid "Use the Cyrus IMAP administrator account to select all mailboxes, to make sure the format upgrade is not taking place while the user is attempting to login / select a mailbox."
+msgid ""
+"Use the Cyrus IMAP administrator account to select all mailboxes, to make "
+"sure the format upgrade is not taking place while the user is attempting to "
+"login / select a mailbox."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Average sized mailboxes (those restricted with a reasonable quota such as 2GB) can take about 2 minutes to upgrade. A single folder can upgrade as fast as 5 seconds. Mailboxes that contain a lot of messages (such as a shared lists folder that also functions as an archive) can take up to 2-4 minutes to upgrade (approximately 40.000 messages)."
+msgid ""
+"Average sized mailboxes (those restricted with a reasonable quota such as "
+"2GB) can take about 2 minutes to upgrade. A single folder can upgrade as "
+"fast as 5 seconds. Mailboxes that contain a lot of messages (such as a "
+"shared lists folder that also functions as an archive) can take up to 2-4 "
+"minutes to upgrade (approximately 40.000 messages)."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Optionally, if errors are expected enable full so-called telemetry logging so that issues can be backtracked. On the IMAP server, issue the following commands:"
+msgid ""
+"Optionally, if errors are expected enable full so-called telemetry logging "
+"so that issues can be backtracked. On the IMAP server, issue the following "
+"commands:"
 msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "# <userinput>mkdir -p /var/lib/imap/log/cyrus-admin</userinput>\n"
+msgid ""
+"# <userinput>mkdir -p /var/lib/imap/log/cyrus-admin</userinput>\n"
 "# <userinput>chown cyrus:mail /var/lib/imap/log/cyrus-admin</userinput>"
 msgstr ""
 
 #. Tag: programlisting
 #, no-c-format
-msgid "#!/bin/bash\n"
+msgid ""
+"#!/bin/bash\n"
 "\n"
 "kolab lm | while read folder; do\n"
 "    echo \". SELECT \\\"${folder}\\\"\"\n"
@@ -54,7 +70,8 @@ msgstr ""
 
 #. Tag: programlisting
 #, no-c-format
-msgid "#!/bin/bash\n"
+msgid ""
+"#!/bin/bash\n"
 "\n"
 " . ./settings.sh\n"
 "\n"
@@ -86,17 +103,21 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "On your console display, you will see some errors stating <emphasis>NO Permission Denied</emphasis>. These errors you can ignore."
+msgid ""
+"On your console display, you will see some errors stating <emphasis>NO "
+"Permission Denied</emphasis>. These errors you can ignore."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "You'll see messages such as the following appear in <filename>/var/log/maillog</filename>:"
+msgid ""
+"You'll see messages such as the following appear in "
+"<filename>/var/log/maillog</filename>:"
 msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "Aug  8 16:40:10 kolab imap[4644]: Index upgrade: example.org!shared.lists.example^org.memo (10 -> 12)\n"
+msgid ""
+"Aug  8 16:40:10 kolab imap[4644]: Index upgrade: example.org!shared.lists.example^org.memo (10 -> 12)\n"
 "Aug  8 16:40:10 kolab imap[4644]: seen_db: user cyrus-admin opened /var/lib/imap/user/c/cyrus-admin.seen"
 msgstr ""
-
diff --git a/Administrator_Guide/nl-NL/Combating_Spam.po b/Administrator_Guide/nl-NL/Combating_Spam.po
index 40fc509..975c53c 100644
--- a/Administrator_Guide/nl-NL/Combating_Spam.po
+++ b/Administrator_Guide/nl-NL/Combating_Spam.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:16+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/kolab/language/nl/)\n"
diff --git a/Administrator_Guide/nl-NL/Configuring_the_Kolab_Server.po b/Administrator_Guide/nl-NL/Configuring_the_Kolab_Server.po
index 2ee98c2..7d5c91e 100644
--- a/Administrator_Guide/nl-NL/Configuring_the_Kolab_Server.po
+++ b/Administrator_Guide/nl-NL/Configuring_the_Kolab_Server.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:17+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/kolab/language/nl/)\n"
diff --git a/Administrator_Guide/nl-NL/Detailed_Kolab_Server_Overview.po b/Administrator_Guide/nl-NL/Detailed_Kolab_Server_Overview.po
index 0553ae9..44f821c 100644
--- a/Administrator_Guide/nl-NL/Detailed_Kolab_Server_Overview.po
+++ b/Administrator_Guide/nl-NL/Detailed_Kolab_Server_Overview.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:17+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/kolab/language/nl/)\n"
diff --git a/Administrator_Guide/nl-NL/Kolab_Web_Administration_Panel.po b/Administrator_Guide/nl-NL/Kolab_Web_Administration_Panel.po
index 52947b1..da2c16c 100644
--- a/Administrator_Guide/nl-NL/Kolab_Web_Administration_Panel.po
+++ b/Administrator_Guide/nl-NL/Kolab_Web_Administration_Panel.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:17+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/kolab/language/nl/)\n"
diff --git a/Administrator_Guide/nl-NL/Preface.po b/Administrator_Guide/nl-NL/Preface.po
index b41f731..e775d86 100644
--- a/Administrator_Guide/nl-NL/Preface.po
+++ b/Administrator_Guide/nl-NL/Preface.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:18+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/kolab/language/nl/)\n"
diff --git a/Administrator_Guide/nl-NL/Revision_History.po b/Administrator_Guide/nl-NL/Revision_History.po
index ee9e895..cb23569 100644
--- a/Administrator_Guide/nl-NL/Revision_History.po
+++ b/Administrator_Guide/nl-NL/Revision_History.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:19+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/kolab/language/nl/)\n"
diff --git a/Administrator_Guide/nl-NL/Tweaking_Tips_for_389_Directory_Server.po b/Administrator_Guide/nl-NL/Tweaking_Tips_for_389_Directory_Server.po
index 5f69a8f..f790e0f 100644
--- a/Administrator_Guide/nl-NL/Tweaking_Tips_for_389_Directory_Server.po
+++ b/Administrator_Guide/nl-NL/Tweaking_Tips_for_389_Directory_Server.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:18+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/kolab/language/nl/)\n"
diff --git a/Administrator_Guide/nl-NL/Tweaking_Tips_for_Cyrus_IMAP.po b/Administrator_Guide/nl-NL/Tweaking_Tips_for_Cyrus_IMAP.po
index 8d206d7..5c1c800 100644
--- a/Administrator_Guide/nl-NL/Tweaking_Tips_for_Cyrus_IMAP.po
+++ b/Administrator_Guide/nl-NL/Tweaking_Tips_for_Cyrus_IMAP.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:18+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/kolab/language/nl/)\n"
diff --git a/Administrator_Guide/nl-NL/Tweaking_Tips_for_Postfix.po b/Administrator_Guide/nl-NL/Tweaking_Tips_for_Postfix.po
index 802dfce..ae5ad6c 100644
--- a/Administrator_Guide/nl-NL/Tweaking_Tips_for_Postfix.po
+++ b/Administrator_Guide/nl-NL/Tweaking_Tips_for_Postfix.po
@@ -5,9 +5,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
-"PO-Revision-Date: 2012-08-13 13:16+0000\n"
-"Last-Translator: Automatically generated\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
+"PO-Revision-Date: 2012-08-24 15:42+0000\n"
+"Last-Translator: Jeroen van Meeuwen <vanmeeuwen at kolabsys.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/kolab/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,3 +24,66 @@ msgstr ""
 #, no-c-format
 msgid "para"
 msgstr ""
+
+#. Tag: title
+#, no-c-format
+msgid "Large Kolab Distribution Groups"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"If you have Kolab distribution groups with many members, you may see the "
+"following message occur in log file <filename>/var/log/maillog</filename>:"
+msgstr ""
+
+#. Tag: screen
+#, no-c-format
+msgid ""
+"Aug 17 10:21:59 kolab postfix/cleanup[5916]: warning: 398194A151: "
+"unreasonable virtual_alias_maps map expansion size for kolab-"
+"users at example.org"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The setting <literal>virtual_alias_expansion_limit</literal> controls the "
+"maximum number of recipient address that are produced from a single original"
+" recipient address. The default depends on your installation."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "To get the default value, execute:"
+msgstr ""
+
+#. Tag: screen
+#, no-c-format
+msgid ""
+"# <userinput>postconf -d virtual_alias_expansion_limit</userinput>\n"
+"1000"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "To get the current value, execute:"
+msgstr ""
+
+#. Tag: screen
+#, no-c-format
+msgid ""
+"# <userinput>postconf virtual_alias_expansion_limit</userinput>\n"
+"1000"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "To set a new value, execute:"
+msgstr ""
+
+#. Tag: screen
+#, no-c-format
+msgid ""
+"# <userinput>postconf -e virtual_alias_expansion_limit=10000</userinput>"
+msgstr ""
diff --git a/Administrator_Guide/nl-NL/Tweaking_Tips_for_Roundcube.po b/Administrator_Guide/nl-NL/Tweaking_Tips_for_Roundcube.po
index f089b49..797967c 100644
--- a/Administrator_Guide/nl-NL/Tweaking_Tips_for_Roundcube.po
+++ b/Administrator_Guide/nl-NL/Tweaking_Tips_for_Roundcube.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:18+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/kolab/language/nl/)\n"
diff --git a/Administrator_Guide/nl-NL/Upgrading_Accounts_from_Kolab_Format_version_2.po b/Administrator_Guide/nl-NL/Upgrading_Accounts_from_Kolab_Format_version_2.po
index 0a1f21c..22ba9ea 100644
--- a/Administrator_Guide/nl-NL/Upgrading_Accounts_from_Kolab_Format_version_2.po
+++ b/Administrator_Guide/nl-NL/Upgrading_Accounts_from_Kolab_Format_version_2.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:18+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/kolab/language/nl/)\n"
diff --git a/Administrator_Guide/nl-NL/Upgrading_from_Kolab_2_on_OpenPKG.po b/Administrator_Guide/nl-NL/Upgrading_from_Kolab_2_on_OpenPKG.po
index 23f09c8..c999bd3 100644
--- a/Administrator_Guide/nl-NL/Upgrading_from_Kolab_2_on_OpenPKG.po
+++ b/Administrator_Guide/nl-NL/Upgrading_from_Kolab_2_on_OpenPKG.po
@@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
-"PO-Revision-Date: 2012-08-15 22:09+0000\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
+"PO-Revision-Date: 2012-08-24 15:43+0000\n"
 "Last-Translator: Jeroen van Meeuwen <vanmeeuwen at kolabsys.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/kolab/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -463,9 +463,9 @@ msgid ""
 ">   <userinput>sed -e 's/user\\///g' | \\</userinput>\n"
 ">   <userinput>while read user; do</userinput>\n"
 ">       <userinput>kolab-formatupgrade \\</userinput>\n"
-">           <userinput>--user cyrus-admin \\</userinput>\n"
+">           <userinput>--user \"${user}\" \\</userinput>\n"
 ">           <userinput>--password <replaceable>$password</replaceable> \\</userinput>\n"
-">           <userinput>--proxyauth \"${user}\" \\</userinput>\n"
+">           <userinput>--proxyauth cyrus-admin \\</userinput>\n"
 ">           <userinput>--port 143 \\</userinput>\n"
 ">           <userinput>--encrypt TLS \\</userinput>\n"
 ">           <userinput><replaceable>localhost</replaceable></userinput>\n"
diff --git a/Administrator_Guide/nl-NL/Verifying_the_Installation.po b/Administrator_Guide/nl-NL/Verifying_the_Installation.po
index 7162882..25d8d69 100644
--- a/Administrator_Guide/nl-NL/Verifying_the_Installation.po
+++ b/Administrator_Guide/nl-NL/Verifying_the_Installation.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:18+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/kolab/language/nl/)\n"
diff --git a/Administrator_Guide/nl-NL/chap-About_Kolab_Groupware.po b/Administrator_Guide/nl-NL/chap-About_Kolab_Groupware.po
index 4043beb..2722f3b 100644
--- a/Administrator_Guide/nl-NL/chap-About_Kolab_Groupware.po
+++ b/Administrator_Guide/nl-NL/chap-About_Kolab_Groupware.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:17+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/kolab/language/nl/)\n"
diff --git a/Administrator_Guide/nl-NL/part-Clients.po b/Administrator_Guide/nl-NL/part-Clients.po
index 6d091fb..b92e8d5 100644
--- a/Administrator_Guide/nl-NL/part-Clients.po
+++ b/Administrator_Guide/nl-NL/part-Clients.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:17+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/kolab/language/nl/)\n"
diff --git a/Administrator_Guide/nl-NL/part-Kolab_Server.po b/Administrator_Guide/nl-NL/part-Kolab_Server.po
index 780e3ec..9e1d075 100644
--- a/Administrator_Guide/nl-NL/part-Kolab_Server.po
+++ b/Administrator_Guide/nl-NL/part-Kolab_Server.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:52\n"
 "PO-Revision-Date: 2012-08-13 13:17+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/kolab/language/nl/)\n"
diff --git a/Administrator_Guide/nl-NL/sect-About_Kolab_Groupware.po b/Administrator_Guide/nl-NL/sect-About_Kolab_Groupware.po
index 82e9d55..0254c95 100644
--- a/Administrator_Guide/nl-NL/sect-About_Kolab_Groupware.po
+++ b/Administrator_Guide/nl-NL/sect-About_Kolab_Groupware.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:53\n"
 "PO-Revision-Date: 2012-08-13 14:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/kolab/language/nl/)\n"
diff --git a/Administrator_Guide/nl-NL/sect-Feedback.po b/Administrator_Guide/nl-NL/sect-Feedback.po
index 24667f4..f89dfdf 100644
--- a/Administrator_Guide/nl-NL/sect-Feedback.po
+++ b/Administrator_Guide/nl-NL/sect-Feedback.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:53\n"
 "PO-Revision-Date: 2012-08-14 01:10+0000\n"
 "Last-Translator: Jeroen van Meeuwen <vanmeeuwen at kolabsys.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/kolab/language/nl/)\n"
diff --git a/Administrator_Guide/nl-NL/sect-Kolab_Product_Series.po b/Administrator_Guide/nl-NL/sect-Kolab_Product_Series.po
index 1fc78a2..100feb7 100644
--- a/Administrator_Guide/nl-NL/sect-Kolab_Product_Series.po
+++ b/Administrator_Guide/nl-NL/sect-Kolab_Product_Series.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:53\n"
 "PO-Revision-Date: 2012-08-13 14:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/kolab/language/nl/)\n"
diff --git a/Administrator_Guide/nl-NL/sect-Supported_Platforms_and_System_Requirements.po b/Administrator_Guide/nl-NL/sect-Supported_Platforms_and_System_Requirements.po
index 32b9f83..f5d161a 100644
--- a/Administrator_Guide/nl-NL/sect-Supported_Platforms_and_System_Requirements.po
+++ b/Administrator_Guide/nl-NL/sect-Supported_Platforms_and_System_Requirements.po
@@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
-"PO-Revision-Date: 2012-08-15 22:09+0000\n"
+"POT-Creation-Date: 2012-08-24T15:41:53\n"
+"PO-Revision-Date: 2012-08-24 15:44+0000\n"
 "Last-Translator: Jeroen van Meeuwen <vanmeeuwen at kolabsys.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/kolab/language/nl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/Administrator_Guide/nl-NL/step-convert-seen-databases.po b/Administrator_Guide/nl-NL/step-convert-seen-databases.po
index 722769c..06b880c 100644
--- a/Administrator_Guide/nl-NL/step-convert-seen-databases.po
+++ b/Administrator_Guide/nl-NL/step-convert-seen-databases.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:53\n"
 "PO-Revision-Date: 2012-08-13 13:17+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/kolab/language/nl/)\n"
diff --git a/Administrator_Guide/nl-NL/step-select-all-mailboxes.po b/Administrator_Guide/nl-NL/step-select-all-mailboxes.po
index 5129cd5..085f4d0 100644
--- a/Administrator_Guide/nl-NL/step-select-all-mailboxes.po
+++ b/Administrator_Guide/nl-NL/step-select-all-mailboxes.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-24T15:41:53\n"
 "PO-Revision-Date: 2012-08-15 22:08+0000\n"
 "Last-Translator: Jeroen van Meeuwen <vanmeeuwen at kolabsys.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/kolab/language/nl/)\n"
diff --git a/Administrator_Guide/pot/Administrator_Guide.pot b/Administrator_Guide/pot/Administrator_Guide.pot
index 0a523f8..669049d 100644
--- a/Administrator_Guide/pot/Administrator_Guide.pot
+++ b/Administrator_Guide/pot/Administrator_Guide.pot
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
-"PO-Revision-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-28T11:27:35\n"
+"PO-Revision-Date: 2012-08-28T11:27:35\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
diff --git a/Administrator_Guide/pot/Author_Group.pot b/Administrator_Guide/pot/Author_Group.pot
index 84c1954..b1b68af 100644
--- a/Administrator_Guide/pot/Author_Group.pot
+++ b/Administrator_Guide/pot/Author_Group.pot
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
-"PO-Revision-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-28T11:27:35\n"
+"PO-Revision-Date: 2012-08-28T11:27:35\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
diff --git a/Administrator_Guide/pot/Book_Info.pot b/Administrator_Guide/pot/Book_Info.pot
index c4629fd..9fcdd5d 100644
--- a/Administrator_Guide/pot/Book_Info.pot
+++ b/Administrator_Guide/pot/Book_Info.pot
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
-"PO-Revision-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-28T11:27:35\n"
+"PO-Revision-Date: 2012-08-28T11:27:35\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
diff --git a/Administrator_Guide/pot/Combating_Spam.pot b/Administrator_Guide/pot/Combating_Spam.pot
index 724492c..978db47 100644
--- a/Administrator_Guide/pot/Combating_Spam.pot
+++ b/Administrator_Guide/pot/Combating_Spam.pot
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
-"PO-Revision-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-28T11:27:35\n"
+"PO-Revision-Date: 2012-08-28T11:27:35\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
diff --git a/Administrator_Guide/pot/Configuring_the_Kolab_Server.pot b/Administrator_Guide/pot/Configuring_the_Kolab_Server.pot
index e8fffcd..8ab56f6 100644
--- a/Administrator_Guide/pot/Configuring_the_Kolab_Server.pot
+++ b/Administrator_Guide/pot/Configuring_the_Kolab_Server.pot
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
-"PO-Revision-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-28T11:27:35\n"
+"PO-Revision-Date: 2012-08-28T11:27:35\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "para"
+msgid "This chapter outlines some of the most common Kolab Groupware configuration topics found in real life."
 msgstr ""
 
 #. Tag: title
diff --git a/Administrator_Guide/pot/Detailed_Kolab_Server_Overview.pot b/Administrator_Guide/pot/Detailed_Kolab_Server_Overview.pot
index 042dd1c..40b0599 100644
--- a/Administrator_Guide/pot/Detailed_Kolab_Server_Overview.pot
+++ b/Administrator_Guide/pot/Detailed_Kolab_Server_Overview.pot
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
-"PO-Revision-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-28T11:27:35\n"
+"PO-Revision-Date: 2012-08-28T11:27:35\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
diff --git a/Administrator_Guide/pot/Kolab_Web_Administration_Panel.pot b/Administrator_Guide/pot/Kolab_Web_Administration_Panel.pot
index 0060cea..a5b946c 100644
--- a/Administrator_Guide/pot/Kolab_Web_Administration_Panel.pot
+++ b/Administrator_Guide/pot/Kolab_Web_Administration_Panel.pot
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
-"PO-Revision-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-28T11:27:35\n"
+"PO-Revision-Date: 2012-08-28T11:27:35\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
diff --git a/Administrator_Guide/pot/Preface.pot b/Administrator_Guide/pot/Preface.pot
index b82deff..a440409 100644
--- a/Administrator_Guide/pot/Preface.pot
+++ b/Administrator_Guide/pot/Preface.pot
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
-"PO-Revision-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-28T11:27:35\n"
+"PO-Revision-Date: 2012-08-28T11:27:35\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
diff --git a/Administrator_Guide/pot/Revision_History.pot b/Administrator_Guide/pot/Revision_History.pot
index 223bf87..4b247be 100644
--- a/Administrator_Guide/pot/Revision_History.pot
+++ b/Administrator_Guide/pot/Revision_History.pot
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
-"PO-Revision-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-28T11:27:35\n"
+"PO-Revision-Date: 2012-08-28T11:27:35\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
diff --git a/Administrator_Guide/pot/Tweaking_Tips_for_389_Directory_Server.pot b/Administrator_Guide/pot/Tweaking_Tips_for_389_Directory_Server.pot
index 86bf072..5e2f9c7 100644
--- a/Administrator_Guide/pot/Tweaking_Tips_for_389_Directory_Server.pot
+++ b/Administrator_Guide/pot/Tweaking_Tips_for_389_Directory_Server.pot
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
-"PO-Revision-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-28T11:27:35\n"
+"PO-Revision-Date: 2012-08-28T11:27:35\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
diff --git a/Administrator_Guide/pot/Tweaking_Tips_for_Cyrus_IMAP.pot b/Administrator_Guide/pot/Tweaking_Tips_for_Cyrus_IMAP.pot
index 9ba62d0..473d191 100644
--- a/Administrator_Guide/pot/Tweaking_Tips_for_Cyrus_IMAP.pot
+++ b/Administrator_Guide/pot/Tweaking_Tips_for_Cyrus_IMAP.pot
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
-"PO-Revision-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-28T11:27:35\n"
+"PO-Revision-Date: 2012-08-28T11:27:35\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
diff --git a/Administrator_Guide/pot/Tweaking_Tips_for_Postfix.pot b/Administrator_Guide/pot/Tweaking_Tips_for_Postfix.pot
index 05b49cf..4bfd664 100644
--- a/Administrator_Guide/pot/Tweaking_Tips_for_Postfix.pot
+++ b/Administrator_Guide/pot/Tweaking_Tips_for_Postfix.pot
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
-"PO-Revision-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-28T11:27:35\n"
+"PO-Revision-Date: 2012-08-28T11:27:35\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -22,3 +22,55 @@ msgstr ""
 msgid "para"
 msgstr ""
 
+#. Tag: title
+#, no-c-format
+msgid "Large Kolab Distribution Groups"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "If you have Kolab distribution groups with many members, you may see the following message occur in log file <filename>/var/log/maillog</filename>:"
+msgstr ""
+
+#. Tag: screen
+#, no-c-format
+msgid "Aug 17 10:21:59 kolab postfix/cleanup[5916]: warning: 398194A151: unreasonable virtual_alias_maps map expansion size for kolab-users at example.org"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "The setting <literal>virtual_alias_expansion_limit</literal> controls the maximum number of recipient address that are produced from a single original recipient address. The default depends on your installation."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "To get the default value, execute:"
+msgstr ""
+
+#. Tag: screen
+#, no-c-format
+msgid "# <userinput>postconf -d virtual_alias_expansion_limit</userinput>\n"
+"1000"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "To get the current value, execute:"
+msgstr ""
+
+#. Tag: screen
+#, no-c-format
+msgid "# <userinput>postconf virtual_alias_expansion_limit</userinput>\n"
+"1000"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "To set a new value, execute:"
+msgstr ""
+
+#. Tag: screen
+#, no-c-format
+msgid "# <userinput>postconf -e virtual_alias_expansion_limit=10000</userinput>"
+msgstr ""
+
diff --git a/Administrator_Guide/pot/Tweaking_Tips_for_Roundcube.pot b/Administrator_Guide/pot/Tweaking_Tips_for_Roundcube.pot
index 1fe2dcc..27dcb80 100644
--- a/Administrator_Guide/pot/Tweaking_Tips_for_Roundcube.pot
+++ b/Administrator_Guide/pot/Tweaking_Tips_for_Roundcube.pot
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
-"PO-Revision-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-28T11:27:35\n"
+"PO-Revision-Date: 2012-08-28T11:27:35\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
diff --git a/Administrator_Guide/pot/Upgrading_Accounts_from_Kolab_Format_version_2.pot b/Administrator_Guide/pot/Upgrading_Accounts_from_Kolab_Format_version_2.pot
index acab7ac..d3c11c0 100644
--- a/Administrator_Guide/pot/Upgrading_Accounts_from_Kolab_Format_version_2.pot
+++ b/Administrator_Guide/pot/Upgrading_Accounts_from_Kolab_Format_version_2.pot
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
-"PO-Revision-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-28T11:27:35\n"
+"PO-Revision-Date: 2012-08-28T11:27:35\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
diff --git a/Administrator_Guide/pot/Upgrading_Cyrus_IMAP_from_2.3_to_2.4.pot b/Administrator_Guide/pot/Upgrading_Cyrus_IMAP_from_2.3_to_2.4.pot
index c58b2db..e0cd082 100644
--- a/Administrator_Guide/pot/Upgrading_Cyrus_IMAP_from_2.3_to_2.4.pot
+++ b/Administrator_Guide/pot/Upgrading_Cyrus_IMAP_from_2.3_to_2.4.pot
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
-"PO-Revision-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-28T11:27:35\n"
+"PO-Revision-Date: 2012-08-28T11:27:35\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
diff --git a/Administrator_Guide/pot/Upgrading_from_Kolab_2_on_OpenPKG.pot b/Administrator_Guide/pot/Upgrading_from_Kolab_2_on_OpenPKG.pot
index b016bf4..aec0e6a 100644
--- a/Administrator_Guide/pot/Upgrading_from_Kolab_2_on_OpenPKG.pot
+++ b/Administrator_Guide/pot/Upgrading_from_Kolab_2_on_OpenPKG.pot
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
-"PO-Revision-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-28T11:27:35\n"
+"PO-Revision-Date: 2012-08-28T11:27:35\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -388,9 +388,9 @@ msgid "# <userinput>kolab lm \"user/%@example.org\" | \\</userinput>\n"
 ">   <userinput>sed -e 's/user\\///g' | \\</userinput>\n"
 ">   <userinput>while read user; do</userinput>\n"
 ">       <userinput>kolab-formatupgrade \\</userinput>\n"
-">           <userinput>--user cyrus-admin \\</userinput>\n"
+">           <userinput>--user \"${user}\" \\</userinput>\n"
 ">           <userinput>--password <replaceable>$password</replaceable> \\</userinput>\n"
-">           <userinput>--proxyauth \"${user}\" \\</userinput>\n"
+">           <userinput>--proxyauth cyrus-admin \\</userinput>\n"
 ">           <userinput>--port 143 \\</userinput>\n"
 ">           <userinput>--encrypt TLS \\</userinput>\n"
 ">           <userinput><replaceable>localhost</replaceable></userinput>\n"
diff --git a/Administrator_Guide/pot/Verifying_the_Installation.pot b/Administrator_Guide/pot/Verifying_the_Installation.pot
index 53d00f0..a3ed699 100644
--- a/Administrator_Guide/pot/Verifying_the_Installation.pot
+++ b/Administrator_Guide/pot/Verifying_the_Installation.pot
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
-"PO-Revision-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-28T11:27:35\n"
+"PO-Revision-Date: 2012-08-28T11:27:35\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
diff --git a/Administrator_Guide/pot/chap-About_Kolab_Groupware.pot b/Administrator_Guide/pot/chap-About_Kolab_Groupware.pot
index 9526743..33cacbd 100644
--- a/Administrator_Guide/pot/chap-About_Kolab_Groupware.pot
+++ b/Administrator_Guide/pot/chap-About_Kolab_Groupware.pot
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
-"PO-Revision-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-28T11:27:35\n"
+"PO-Revision-Date: 2012-08-28T11:27:35\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
diff --git a/Administrator_Guide/pot/part-Clients.pot b/Administrator_Guide/pot/part-Clients.pot
index a84d822..79f72c4 100644
--- a/Administrator_Guide/pot/part-Clients.pot
+++ b/Administrator_Guide/pot/part-Clients.pot
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
-"PO-Revision-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-28T11:27:35\n"
+"PO-Revision-Date: 2012-08-28T11:27:35\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
diff --git a/Administrator_Guide/pot/part-Kolab_Server.pot b/Administrator_Guide/pot/part-Kolab_Server.pot
index b463f3c..2c5b6d2 100644
--- a/Administrator_Guide/pot/part-Kolab_Server.pot
+++ b/Administrator_Guide/pot/part-Kolab_Server.pot
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
-"PO-Revision-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-28T11:27:35\n"
+"PO-Revision-Date: 2012-08-28T11:27:35\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
diff --git a/Administrator_Guide/pot/sect-About_Kolab_Groupware.pot b/Administrator_Guide/pot/sect-About_Kolab_Groupware.pot
index e4a04fe..5ae4116 100644
--- a/Administrator_Guide/pot/sect-About_Kolab_Groupware.pot
+++ b/Administrator_Guide/pot/sect-About_Kolab_Groupware.pot
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
-"PO-Revision-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-28T11:27:35\n"
+"PO-Revision-Date: 2012-08-28T11:27:35\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
diff --git a/Administrator_Guide/pot/sect-Feedback.pot b/Administrator_Guide/pot/sect-Feedback.pot
index 5b7c9c5..a50e4a3 100644
--- a/Administrator_Guide/pot/sect-Feedback.pot
+++ b/Administrator_Guide/pot/sect-Feedback.pot
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
-"PO-Revision-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-28T11:27:35\n"
+"PO-Revision-Date: 2012-08-28T11:27:35\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
diff --git a/Administrator_Guide/pot/sect-Kolab_Product_Series.pot b/Administrator_Guide/pot/sect-Kolab_Product_Series.pot
index 3ea4416..5cb2b01 100644
--- a/Administrator_Guide/pot/sect-Kolab_Product_Series.pot
+++ b/Administrator_Guide/pot/sect-Kolab_Product_Series.pot
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
-"PO-Revision-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-28T11:27:35\n"
+"PO-Revision-Date: 2012-08-28T11:27:35\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
diff --git a/Administrator_Guide/pot/sect-Kolab_Recipient_Policy_and_Web_Administration_Panel.pot b/Administrator_Guide/pot/sect-Kolab_Recipient_Policy_and_Web_Administration_Panel.pot
new file mode 100644
index 0000000..5a4fae2
--- /dev/null
+++ b/Administrator_Guide/pot/sect-Kolab_Recipient_Policy_and_Web_Administration_Panel.pot
@@ -0,0 +1,154 @@
+# 
+# AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: 0\n"
+"POT-Creation-Date: 2012-08-28T11:27:35\n"
+"PO-Revision-Date: 2012-08-28T11:27:35\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Tag: title
+#, no-c-format
+msgid "Kolab Recipient Policy and Web Administration Panel"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "Kolab Groupware includes an automated application of user metadata, such as the user's given- and surname, to recipient email addresses. This is called <emphasis>the recipient policy</emphasis>."
+msgstr ""
+
+#. Tag: title
+#, no-c-format
+msgid "Example Default Application of the Recipient Policy"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "If an <emphasis>example.org</emphasis> user is created with given name <emphasis>John</emphasis> and surname <emphasis>Doe</emphasis>, the recipient policy will set the <literal>mail</literal> attribute value to <emphasis>john.doe at example.org</emphasis>, and set the secondary mail address attribute <literal>alias</literal> to the values <emphasis>j.doe at example.org</emphasis> and <emphasis>doe at example.org</emphasis>."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "The recipient policy aids deployments in achieving a level of consistency throughout their recipient database by applying a naming convention, avoiding the need for Kolab Groupware administrators to need to understand and consistently apply naming convention rules. Consistency is important when considering global address book listings and searches in different contexts, and when anticipating what a valid recipient address for a given user may be – noted that most email users do not have access to your global address book and it is likely that most communications will take place with those users."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "The recipient policy also avoids the need for Kolab Groupware administrators to understand and consistently apply the various transliteration rules for different locales."
+msgstr ""
+
+#. Tag: title
+#, no-c-format
+msgid "Transliteration for Different Locales"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "Names can contain non-ASCII characters, as is the case with, for example, <emphasis>Marie Möller</emphasis> (German), while recipient email addresses may not contain such characters (i.e. <emphasis>marie.möller at example.org</emphasis> is an invalid email address."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "Without locale specific transliteration, the email address would become <emphasis>marie.moller at example.org</emphasis>. This is considered inadequate, as many users will experience this inappropriate, inconsiderate and/or awkward – it is the user's native tongue after all and transliteration is used in every-day life. Kolab Groupware should therefor also be able to apply the same transliteration rules specific to the user's native tongue."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "With the (presumably correct) transliteration rules for German applied, the email address would become <emphasis>marie.moeller at example.org</emphasis>."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "The recipient policy takes the value(s) of a number of attributes from an LDAP entry, and executes the recipient policy for primary and secondary recipient email addresses with help of these obtained attribute values."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "It will set the primary email address attribute to a singular value, though the LDAP schema allows multiple values for the default primary mail attribute <literal>mail</literal>. The secondary email address attribute (<literal>alias</literal> by default) is set to the value(s) returned by the recipient policy as well."
+msgstr ""
+
+#. Tag: title
+#, no-c-format
+msgid "Components that Apply the Recipient Policy"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "The Kolab daemon the primary Kolab Groupware component to apply the recipient policy. The Kolab Web Administration Panel and its API also apply the recipient policy, as otherwise the user interface would be incomplete. However, installation and use of the Kolab WAP and API are optional, which is why the Kolab daemon is the primary component to apply the policy."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "Both components use the configuration settings <literal>primary_mail</literal> and <literal>secondary_mail</literal> as their policy configuration. These configuration items consist of a Python notation for string formatting, along with a limited number of string operations."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "The <literal>primary_mail</literal> setting contains a singular basestring to be used in simplistic string formatting, while the <literal>secondary_mail</literal> setting contains a numerically ordered list of singular basestrings to be used in string formatting, with the opportunity to execute some additional operations."
+msgstr ""
+
+#. Tag: title
+#, no-c-format
+msgid "Example Primary Email Address Recipient Policy"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "The primary recipient email address for an <emphasis>example.org</emphasis> user with given name <emphasis>Marie</emphasis>, surname <emphasis>Möller</emphasis> and preffered language <emphasis>de_DE</emphasis>, is composed as follows:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "The recipient policy is obtained from the <literal>primary_mail</literal> setting. By default, this configuration setting is set to:"
+msgstr ""
+
+#. Tag: screen
+#, no-c-format
+msgid "[example.org]\n"
+"primary_mail = %(givenname)s.%(surname)s@%(domain)s"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "As the configuration indicates, the attributes for the user that will be used are the given name and the surname."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "Either a specified preferred language is used, or the default locale, to transliterate the given name and surname. In this example, the transliteration rules for German are used. The result is a dictionary that looks as follows:"
+msgstr ""
+
+#. Tag: screen
+#, no-c-format
+msgid "{\n"
+"        \"givenname\": \"Maria\",\n"
+"        \"surname\": \"Moeller\",\n"
+"        \"preferredlanguage\": \"de_DE\"\n"
+"    }"
+msgstr ""
+
+#. Tag: title
+#, no-c-format
+msgid "Controlling the Primary and Secondary Recipient Email Address Attributes"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "The attribute names that contain the primary and secondary recipient email addresses are controlled by the <literal>mail_attrs</literal> setting."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "This setting is a comma- and/or comma-space separated list of attribute names. By default, <literal>mail_attrs</literal> is set to <literal>mail, alias</literal>."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "The first item in the list will be used as the attribute to use for primary recipient email addresses. The second item in the list will be used as the attribute to use for secondary recipient email addresses."
+msgstr ""
+
diff --git a/Administrator_Guide/pot/sect-Supported_Platforms_and_System_Requirements.pot b/Administrator_Guide/pot/sect-Supported_Platforms_and_System_Requirements.pot
index ffbb1f3..7a29ac2 100644
--- a/Administrator_Guide/pot/sect-Supported_Platforms_and_System_Requirements.pot
+++ b/Administrator_Guide/pot/sect-Supported_Platforms_and_System_Requirements.pot
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
-"PO-Revision-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-28T11:27:35\n"
+"PO-Revision-Date: 2012-08-28T11:27:35\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
diff --git a/Administrator_Guide/pot/step-convert-seen-databases.pot b/Administrator_Guide/pot/step-convert-seen-databases.pot
index 3847fdc..6c78c7e 100644
--- a/Administrator_Guide/pot/step-convert-seen-databases.pot
+++ b/Administrator_Guide/pot/step-convert-seen-databases.pot
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
-"PO-Revision-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-28T11:27:35\n"
+"PO-Revision-Date: 2012-08-28T11:27:35\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
diff --git a/Administrator_Guide/pot/step-select-all-mailboxes.pot b/Administrator_Guide/pot/step-select-all-mailboxes.pot
index 2f61d46..db4e9df 100644
--- a/Administrator_Guide/pot/step-select-all-mailboxes.pot
+++ b/Administrator_Guide/pot/step-select-all-mailboxes.pot
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-15T22:08:45\n"
-"PO-Revision-Date: 2012-08-15T22:08:45\n"
+"POT-Creation-Date: 2012-08-28T11:27:35\n"
+"PO-Revision-Date: 2012-08-28T11:27:35\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
diff --git a/Architecture_and_Design/.tx/config b/Architecture_and_Design/.tx/config
index 87e0ee0..a541c65 100644
--- a/Architecture_and_Design/.tx/config
+++ b/Architecture_and_Design/.tx/config
@@ -1,6 +1,6 @@
 [main]
 host = https://www.transifex.net
-lang_map = de: de-DE, es: es-ES, fr: fr-FR, nl: nl-NL
+lang_map = de: de-DE, es: es-ES, fr: fr-FR, ja: ja-JP, nl: nl-NL
 type = PO
 
 [kolab.Architecture_and_Design-Feature_FAQ]
diff --git a/Architecture_and_Design/de-DE/Administration_Panel.po b/Architecture_and_Design/de-DE/Administration_Panel.po
index ecb40bc..eeb8e92 100644
--- a/Architecture_and_Design/de-DE/Administration_Panel.po
+++ b/Architecture_and_Design/de-DE/Administration_Panel.po
@@ -1,13 +1,14 @@
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
 # 
 # Translators:
+# Jo  <jo at caj-augsburg.de>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:16\n"
-"PO-Revision-Date: 2012-08-13 12:53+0000\n"
-"Last-Translator: Automatically generated\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
+"PO-Revision-Date: 2012-08-30 08:37+0000\n"
+"Last-Translator: Jo <jo at caj-augsburg.de>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,12 +37,12 @@ msgstr ""
 #. Tag: para
 #, no-c-format
 msgid "A web client interface,"
-msgstr ""
+msgstr "Eine webbasierte Benutzerschnittstelle,"
 
 #. Tag: para
 #, no-c-format
 msgid "An API backend interface."
-msgstr ""
+msgstr "Ein API Backend-Interface"
 
 #. Tag: para
 #, no-c-format
@@ -62,7 +63,7 @@ msgstr ""
 #. Tag: title
 #, no-c-format
 msgid "Configuration"
-msgstr ""
+msgstr "Konfiguration"
 
 #. Tag: para
 #, no-c-format
@@ -91,7 +92,7 @@ msgstr ""
 #. Tag: para
 #, no-c-format
 msgid "Reset Password"
-msgstr ""
+msgstr "Passwort zurüksetzen"
 
 #. Tag: para
 #, no-c-format
@@ -154,7 +155,7 @@ msgstr ""
 #. Tag: para
 #, no-c-format
 msgid "TODO"
-msgstr ""
+msgstr "TODO"
 
 #. Tag: title
 #, no-c-format
@@ -405,7 +406,7 @@ msgstr ""
 #. Tag: title
 #, no-c-format
 msgid "domain"
-msgstr ""
+msgstr "Domain"
 
 #. Tag: para
 #, no-c-format
@@ -422,12 +423,12 @@ msgstr ""
 #. Tag: title
 #, no-c-format
 msgid "domains"
-msgstr ""
+msgstr "Domains"
 
 #. Tag: para
 #, no-c-format
 msgid "short description"
-msgstr ""
+msgstr "Kurzbeschreibung"
 
 #. Tag: title
 #, no-c-format
@@ -446,12 +447,12 @@ msgstr ""
 #. Tag: title
 #, no-c-format
 msgid "group"
-msgstr ""
+msgstr "Gruppe"
 
 #. Tag: title
 #, no-c-format
 msgid "groups"
-msgstr ""
+msgstr "Gruppen"
 
 #. Tag: title
 #, no-c-format
@@ -787,12 +788,12 @@ msgstr ""
 #. Tag: para
 #, no-c-format
 msgid "<literal>status</literal>"
-msgstr ""
+msgstr "<literal>Status</literal>"
 
 #. Tag: para
 #, no-c-format
 msgid "<literal>result</literal>"
-msgstr ""
+msgstr "<literal>Ergebnis</literal>"
 
 #. Tag: para
 #, no-c-format
@@ -804,7 +805,7 @@ msgstr ""
 #. Tag: para
 #, no-c-format
 msgid "<literal>list</literal>"
-msgstr ""
+msgstr "<literal>Liste</literal>"
 
 #. Tag: para
 #, no-c-format
@@ -1054,12 +1055,12 @@ msgstr ""
 #. Tag: para
 #, no-c-format
 msgid "The following parameters are required:"
-msgstr ""
+msgstr "Folgende Parameter werden benötigt:"
 
 #. Tag: title
 #, no-c-format
 msgid "<literal>group</literal>"
-msgstr ""
+msgstr "<literal>Gruppe</literal>"
 
 #. Tag: para
 #, no-c-format
@@ -1162,7 +1163,7 @@ msgstr ""
 #. Tag: title
 #, no-c-format
 msgid "<literal>password</literal>"
-msgstr ""
+msgstr "<literal>Password</literal>"
 
 #. Tag: para
 #, no-c-format
@@ -1174,7 +1175,7 @@ msgstr ""
 #. Tag: title
 #, no-c-format
 msgid "<literal>domain</literal>"
-msgstr ""
+msgstr "<literal>Domain</literal>"
 
 #. Tag: para
 #, no-c-format
@@ -1234,7 +1235,7 @@ msgid ""
 "if response_data.has_key('result'):\n"
 "    if response_data['result'].has_key('session_token'):\n"
 "        session_id = response_data['result']['session_token']"
-msgstr ""
+msgstr "import json\nimport httplib\nimport sys\n\nfrom pykolab import utils\n\nAPI_HOSTNAME = \"kolab-admin.example.org\"\nAPI_PORT = \"443\"\nAPI_SCHEME = \"https\"\nAPI_BASE = \"/api\"\n\nusername = utils.ask_question(\"Login\")\npassword = utils.ask_question(\"Password\", password=True)\n\nparams = json.dumps({\n                'username': username,\n                'password': password\n            })\n\nif API_SCHEME == \"http\":\n    conn = httplib.HTTPConnection(API_HOSTNAME, API_PORT)\nelif API_SCHEME == \"https\":\n    conn = httplib.HTTPSConnection(API_HOSTNAME, API_PORT)\n\nconn.connect()\nconn.request('POST', \"%s/system.authenticate\" %(API_BASE), params)\ntry:\n    response_data = json.loads(conn.getresponse().read())\nexcept ValueError, e:\n    print e\n    sys.exit(1)\n\n# Check status here, using response_data['status']\n\nif response_data.has_key('result'):\n    if response_data['result'].has_key('session_token'):\n        session_id = response_data['resul
 t']['session_token']"
 
 #. Tag: para
 #, no-c-format
@@ -1387,7 +1388,7 @@ msgid ""
 "                    ),\n"
 "            ),\n"
 "    );\n"
-msgstr ""
+msgstr "\n$id = 1;\n$key = 'simple';\n$description = 'A simple user type';\n$attributes = Array(\n        'auto_form_fields' => Array(),\n        'form_fields' => Array(\n                'cn' => Array(),\n                'mail' => Array(),\n            ),\n        'fields' => Array(\n                'objectclass' => Array(\n                        'top'\n                        'inetorgperson'\n                    ),\n            ),\n    );\n"
 
 #. Tag: para
 #, no-c-format
@@ -1905,7 +1906,7 @@ msgstr ""
 #. Tag: title
 #, no-c-format
 msgid "<literal>fields</literal>"
-msgstr ""
+msgstr "<literal>Felder</literal>"
 
 #. Tag: para
 #, no-c-format
diff --git a/Architecture_and_Design/de-DE/Akonadi_for_Integration_and_Caching.po b/Architecture_and_Design/de-DE/Akonadi_for_Integration_and_Caching.po
index 844a5f3..c616ff4 100644
--- a/Architecture_and_Design/de-DE/Akonadi_for_Integration_and_Caching.po
+++ b/Architecture_and_Design/de-DE/Akonadi_for_Integration_and_Caching.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:16\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 13:34+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Architecture_and_Design/de-DE/Archiving_amp_Discovery.po b/Architecture_and_Design/de-DE/Archiving_amp_Discovery.po
index eb6e793..a0d2d72 100644
--- a/Architecture_and_Design/de-DE/Archiving_amp_Discovery.po
+++ b/Architecture_and_Design/de-DE/Archiving_amp_Discovery.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:16\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 13:34+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Architecture_and_Design/de-DE/Authentication_amp_Authorization.po b/Architecture_and_Design/de-DE/Authentication_amp_Authorization.po
index fce99aa..407f808 100644
--- a/Architecture_and_Design/de-DE/Authentication_amp_Authorization.po
+++ b/Architecture_and_Design/de-DE/Authentication_amp_Authorization.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:16\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 12:52+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Architecture_and_Design/de-DE/Calendaring.po b/Architecture_and_Design/de-DE/Calendaring.po
index fbe28a9..5e1e9f7 100644
--- a/Architecture_and_Design/de-DE/Calendaring.po
+++ b/Architecture_and_Design/de-DE/Calendaring.po
@@ -1,13 +1,14 @@
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
 # 
 # Translators:
+# Jo  <jo at caj-augsburg.de>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:16\n"
-"PO-Revision-Date: 2012-08-13 13:33+0000\n"
-"Last-Translator: Automatically generated\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
+"PO-Revision-Date: 2012-08-30 08:32+0000\n"
+"Last-Translator: Jo <jo at caj-augsburg.de>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,11 +19,11 @@ msgstr ""
 #. Tag: title
 #, no-c-format
 msgid "Calendaring"
-msgstr ""
+msgstr "Kalendern"
 
 #. Tag: para
 #, no-c-format
 msgid ""
 "This chapter addresses the calendaring aspects of the Kolab Groupware "
 "Solution."
-msgstr ""
+msgstr "Dieses Kapitel behandelt die kalendarischen Aspekte der Kolab Groupware Solution."
diff --git a/Architecture_and_Design/de-DE/Configuration_Management.po b/Architecture_and_Design/de-DE/Configuration_Management.po
index 0a4a201..9c30791 100644
--- a/Architecture_and_Design/de-DE/Configuration_Management.po
+++ b/Architecture_and_Design/de-DE/Configuration_Management.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:16\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 12:52+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Architecture_and_Design/de-DE/Email.po b/Architecture_and_Design/de-DE/Email.po
index 17a6f29..a5df66c 100644
--- a/Architecture_and_Design/de-DE/Email.po
+++ b/Architecture_and_Design/de-DE/Email.po
@@ -1,13 +1,14 @@
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
 # 
 # Translators:
+# Jo  <jo at caj-augsburg.de>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:16\n"
-"PO-Revision-Date: 2012-08-13 13:34+0000\n"
-"Last-Translator: Automatically generated\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
+"PO-Revision-Date: 2012-08-29 09:26+0000\n"
+"Last-Translator: Jo <jo at caj-augsburg.de>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +19,7 @@ msgstr ""
 #. Tag: title
 #, no-c-format
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #. Tag: para
 #, no-c-format
@@ -71,17 +72,17 @@ msgstr ""
 #. Tag: title
 #, no-c-format
 msgid "Available Technologies"
-msgstr ""
+msgstr "Verfügbare Technologien"
 
 #. Tag: para
 #, no-c-format
 msgid "Amavisd"
-msgstr ""
+msgstr "Amavisd"
 
 #. Tag: para
 #, no-c-format
 msgid "ClamAV"
-msgstr ""
+msgstr "ClamAV"
 
 #. Tag: para
 #, no-c-format
@@ -91,17 +92,17 @@ msgstr ""
 #. Tag: para
 #, no-c-format
 msgid "Greylisting"
-msgstr ""
+msgstr "Greylisting"
 
 #. Tag: para
 #, no-c-format
 msgid "Postfix' postscreen (version 2.8 and later)"
-msgstr ""
+msgstr "Postfix' postscreen (version 2.8 und später)"
 
 #. Tag: para
 #, no-c-format
 msgid "Spamassassin"
-msgstr ""
+msgstr "Spamassassin"
 
 #. Tag: para
 #, no-c-format
@@ -111,7 +112,7 @@ msgstr ""
 #. Tag: para
 #, no-c-format
 msgid "3rd party appliances"
-msgstr ""
+msgstr "Anwendungen von Drittanbietern"
 
 #. Tag: title
 #, no-c-format
@@ -163,7 +164,7 @@ msgstr ""
 #. Tag: title
 #, no-c-format
 msgid "Anti-Spam"
-msgstr ""
+msgstr "Anti-Spam"
 
 #. Tag: para
 #, no-c-format
@@ -203,12 +204,12 @@ msgid ""
 "<ulink url=\"http://en.wikipedia.org/wiki/Anti-"
 "spam_techniques_(e-mail)\">Wikipedia's article on Anti-Spam "
 "Techniques</ulink>."
-msgstr ""
+msgstr "Für eine vollständigere Referenz zu Email-Anti-Spam Techniken schlagen sie bitte in <ulink url=\"http://de.wikipedia.org/wiki/Spam#Ma.C3.9Fnahmen_gegen_E-Mail-Spam\">Wikipedias Artikel über Maßnahmen gegen Email Spam</ulink> nach."
 
 #. Tag: title
 #, no-c-format
 msgid "Anti-Virus"
-msgstr ""
+msgstr "Anti-Virus"
 
 #. Tag: para
 #, no-c-format
@@ -218,7 +219,7 @@ msgstr ""
 #. Tag: title
 #, no-c-format
 msgid "White- and Blacklisting"
-msgstr ""
+msgstr "White- and Blacklisting"
 
 #. Tag: para
 #, no-c-format
@@ -233,7 +234,7 @@ msgstr ""
 #. Tag: para
 #, no-c-format
 msgid "The IP address of the sending mail exchanger,"
-msgstr ""
+msgstr "die IP-Adresse des sendenden Mailservers"
 
 #. Tag: para
 #, no-c-format
diff --git a/Architecture_and_Design/de-DE/Enforcing_Entitlements.po b/Architecture_and_Design/de-DE/Enforcing_Entitlements.po
index fef6743..c00853a 100644
--- a/Architecture_and_Design/de-DE/Enforcing_Entitlements.po
+++ b/Architecture_and_Design/de-DE/Enforcing_Entitlements.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:16\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 12:53+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Architecture_and_Design/de-DE/Feature_FAQ.po b/Architecture_and_Design/de-DE/Feature_FAQ.po
index 6d86f2e..64e5b4c 100644
--- a/Architecture_and_Design/de-DE/Feature_FAQ.po
+++ b/Architecture_and_Design/de-DE/Feature_FAQ.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:17\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 12:52+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Architecture_and_Design/de-DE/Free_Busy.po b/Architecture_and_Design/de-DE/Free_Busy.po
index f99987b..dec4687 100644
--- a/Architecture_and_Design/de-DE/Free_Busy.po
+++ b/Architecture_and_Design/de-DE/Free_Busy.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:17\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 13:34+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Architecture_and_Design/de-DE/Groupware_Overview.po b/Architecture_and_Design/de-DE/Groupware_Overview.po
index effad27..e107369 100644
--- a/Architecture_and_Design/de-DE/Groupware_Overview.po
+++ b/Architecture_and_Design/de-DE/Groupware_Overview.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:17\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 14:34+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Architecture_and_Design/de-DE/Integration_amp_Interoperability.po b/Architecture_and_Design/de-DE/Integration_amp_Interoperability.po
index 9d4c083..41fd0d9 100644
--- a/Architecture_and_Design/de-DE/Integration_amp_Interoperability.po
+++ b/Architecture_and_Design/de-DE/Integration_amp_Interoperability.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:17\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 13:34+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Architecture_and_Design/de-DE/Kolab_Content_Filters.po b/Architecture_and_Design/de-DE/Kolab_Content_Filters.po
index 2bf089a..c6de5d3 100644
--- a/Architecture_and_Design/de-DE/Kolab_Content_Filters.po
+++ b/Architecture_and_Design/de-DE/Kolab_Content_Filters.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:17\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 13:34+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Architecture_and_Design/de-DE/Kolab_Daemon.po b/Architecture_and_Design/de-DE/Kolab_Daemon.po
index a70691b..c6f80dc 100644
--- a/Architecture_and_Design/de-DE/Kolab_Daemon.po
+++ b/Architecture_and_Design/de-DE/Kolab_Daemon.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:17\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 12:53+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Architecture_and_Design/de-DE/Kolab_Objects.po b/Architecture_and_Design/de-DE/Kolab_Objects.po
index 33d4555..46a9d55 100644
--- a/Architecture_and_Design/de-DE/Kolab_Objects.po
+++ b/Architecture_and_Design/de-DE/Kolab_Objects.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:17\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 12:54+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Architecture_and_Design/de-DE/Kolab_SMTP_Access_Policy.po b/Architecture_and_Design/de-DE/Kolab_SMTP_Access_Policy.po
index e33b03d..48f4212 100644
--- a/Architecture_and_Design/de-DE/Kolab_SMTP_Access_Policy.po
+++ b/Architecture_and_Design/de-DE/Kolab_SMTP_Access_Policy.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:17\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 13:33+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Architecture_and_Design/de-DE/Kolab_Server_Overview.po b/Architecture_and_Design/de-DE/Kolab_Server_Overview.po
index e2faa04..6212090 100644
--- a/Architecture_and_Design/de-DE/Kolab_Server_Overview.po
+++ b/Architecture_and_Design/de-DE/Kolab_Server_Overview.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:17\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 13:33+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Architecture_and_Design/de-DE/Migration.po b/Architecture_and_Design/de-DE/Migration.po
index 15b2b3e..3c527c9 100644
--- a/Architecture_and_Design/de-DE/Migration.po
+++ b/Architecture_and_Design/de-DE/Migration.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:17\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 12:53+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Architecture_and_Design/de-DE/Mobile_Device_Synchronization.po b/Architecture_and_Design/de-DE/Mobile_Device_Synchronization.po
index a56bde3..a0c4834 100644
--- a/Architecture_and_Design/de-DE/Mobile_Device_Synchronization.po
+++ b/Architecture_and_Design/de-DE/Mobile_Device_Synchronization.po
@@ -1,13 +1,14 @@
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
 # 
 # Translators:
+# Jo  <jo at caj-augsburg.de>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:17\n"
-"PO-Revision-Date: 2012-08-13 12:53+0000\n"
-"Last-Translator: Automatically generated\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
+"PO-Revision-Date: 2012-08-29 09:13+0000\n"
+"Last-Translator: Jo <jo at caj-augsburg.de>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,19 +19,19 @@ msgstr ""
 #. Tag: title
 #, no-c-format
 msgid "Mobile Device Synchronization"
-msgstr ""
+msgstr "Synchronisation mit mobilen Geräten"
 
 #. Tag: para
 #, no-c-format
 msgid "TODO"
-msgstr ""
+msgstr "TODO"
 
 #. Tag: title
 #, no-c-format
 msgid "SyncML"
-msgstr ""
+msgstr "SyncML"
 
 #. Tag: title
 #, no-c-format
 msgid "ActiveSync"
-msgstr ""
+msgstr "ActiveSync"
diff --git a/Architecture_and_Design/de-DE/Preface.po b/Architecture_and_Design/de-DE/Preface.po
index df3b74b..976bd74 100644
--- a/Architecture_and_Design/de-DE/Preface.po
+++ b/Architecture_and_Design/de-DE/Preface.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:17\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 13:33+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Architecture_and_Design/de-DE/Revision_History.po b/Architecture_and_Design/de-DE/Revision_History.po
index 6519508..fabc777 100644
--- a/Architecture_and_Design/de-DE/Revision_History.po
+++ b/Architecture_and_Design/de-DE/Revision_History.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:17\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 13:35+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Architecture_and_Design/de-DE/Smart_Clients.po b/Architecture_and_Design/de-DE/Smart_Clients.po
index aa17e32..dc1bea4 100644
--- a/Architecture_and_Design/de-DE/Smart_Clients.po
+++ b/Architecture_and_Design/de-DE/Smart_Clients.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:17\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 12:53+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Architecture_and_Design/de-DE/Terminology.po b/Architecture_and_Design/de-DE/Terminology.po
index 358c65b..00bb8c8 100644
--- a/Architecture_and_Design/de-DE/Terminology.po
+++ b/Architecture_and_Design/de-DE/Terminology.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:17\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 13:34+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Architecture_and_Design/de-DE/sect-About_Kolab_Groupware.po b/Architecture_and_Design/de-DE/sect-About_Kolab_Groupware.po
index 7f7200a..bae058d 100644
--- a/Architecture_and_Design/de-DE/sect-About_Kolab_Groupware.po
+++ b/Architecture_and_Design/de-DE/sect-About_Kolab_Groupware.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:17\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 14:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Architecture_and_Design/de-DE/sect-Feedback.po b/Architecture_and_Design/de-DE/sect-Feedback.po
index 5bdc1b7..8bc635c 100644
--- a/Architecture_and_Design/de-DE/sect-Feedback.po
+++ b/Architecture_and_Design/de-DE/sect-Feedback.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:17\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 14:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Architecture_and_Design/de-DE/sect-Kolab_Product_Series.po b/Architecture_and_Design/de-DE/sect-Kolab_Product_Series.po
index 61db8f1..11c90b7 100644
--- a/Architecture_and_Design/de-DE/sect-Kolab_Product_Series.po
+++ b/Architecture_and_Design/de-DE/sect-Kolab_Product_Series.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:17\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 14:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
diff --git a/Architecture_and_Design/de-DE/sect-Supported_Platforms_and_System_Requirements.po b/Architecture_and_Design/de-DE/sect-Supported_Platforms_and_System_Requirements.po
index a224596..10272d8 100644
--- a/Architecture_and_Design/de-DE/sect-Supported_Platforms_and_System_Requirements.po
+++ b/Architecture_and_Design/de-DE/sect-Supported_Platforms_and_System_Requirements.po
@@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:17\n"
-"PO-Revision-Date: 2012-08-15 22:17+0000\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
+"PO-Revision-Date: 2012-09-03 11:18+0000\n"
 "Last-Translator: Jeroen van Meeuwen <vanmeeuwen at kolabsys.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
 "MIME-Version: 1.0\n"
diff --git a/Architecture_and_Design/es-ES/Administration_Panel.po b/Architecture_and_Design/es-ES/Administration_Panel.po
index ca6abef..ce3ac4a 100644
--- a/Architecture_and_Design/es-ES/Administration_Panel.po
+++ b/Architecture_and_Design/es-ES/Administration_Panel.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:16\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 12:53+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Architecture_and_Design/es-ES/Akonadi_for_Integration_and_Caching.po b/Architecture_and_Design/es-ES/Akonadi_for_Integration_and_Caching.po
index 2da4503..e9bc35b 100644
--- a/Architecture_and_Design/es-ES/Akonadi_for_Integration_and_Caching.po
+++ b/Architecture_and_Design/es-ES/Akonadi_for_Integration_and_Caching.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:16\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 13:34+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Architecture_and_Design/es-ES/Archiving_amp_Discovery.po b/Architecture_and_Design/es-ES/Archiving_amp_Discovery.po
index c6beeb7..d37f656 100644
--- a/Architecture_and_Design/es-ES/Archiving_amp_Discovery.po
+++ b/Architecture_and_Design/es-ES/Archiving_amp_Discovery.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:16\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 13:34+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Architecture_and_Design/es-ES/Authentication_amp_Authorization.po b/Architecture_and_Design/es-ES/Authentication_amp_Authorization.po
index 969bb8b..b88a7d5 100644
--- a/Architecture_and_Design/es-ES/Authentication_amp_Authorization.po
+++ b/Architecture_and_Design/es-ES/Authentication_amp_Authorization.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:16\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 12:52+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Architecture_and_Design/es-ES/Calendaring.po b/Architecture_and_Design/es-ES/Calendaring.po
index d547870..49dc338 100644
--- a/Architecture_and_Design/es-ES/Calendaring.po
+++ b/Architecture_and_Design/es-ES/Calendaring.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:16\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 13:33+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Architecture_and_Design/es-ES/Configuration_Management.po b/Architecture_and_Design/es-ES/Configuration_Management.po
index 5286084..7fa5f34 100644
--- a/Architecture_and_Design/es-ES/Configuration_Management.po
+++ b/Architecture_and_Design/es-ES/Configuration_Management.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:16\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 12:52+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Architecture_and_Design/es-ES/Email.po b/Architecture_and_Design/es-ES/Email.po
index 74185c7..09643d1 100644
--- a/Architecture_and_Design/es-ES/Email.po
+++ b/Architecture_and_Design/es-ES/Email.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:16\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 13:34+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Architecture_and_Design/es-ES/Enforcing_Entitlements.po b/Architecture_and_Design/es-ES/Enforcing_Entitlements.po
index f260f7c..915c7f2 100644
--- a/Architecture_and_Design/es-ES/Enforcing_Entitlements.po
+++ b/Architecture_and_Design/es-ES/Enforcing_Entitlements.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:16\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 12:53+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Architecture_and_Design/es-ES/Feature_FAQ.po b/Architecture_and_Design/es-ES/Feature_FAQ.po
index 338840a..5f1a383 100644
--- a/Architecture_and_Design/es-ES/Feature_FAQ.po
+++ b/Architecture_and_Design/es-ES/Feature_FAQ.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:17\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 12:52+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Architecture_and_Design/es-ES/Free_Busy.po b/Architecture_and_Design/es-ES/Free_Busy.po
index 2c335a9..cbe7d38 100644
--- a/Architecture_and_Design/es-ES/Free_Busy.po
+++ b/Architecture_and_Design/es-ES/Free_Busy.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:17\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 13:34+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Architecture_and_Design/es-ES/Groupware_Overview.po b/Architecture_and_Design/es-ES/Groupware_Overview.po
index 3ac94c4..efbd779 100644
--- a/Architecture_and_Design/es-ES/Groupware_Overview.po
+++ b/Architecture_and_Design/es-ES/Groupware_Overview.po
@@ -1,13 +1,14 @@
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
 # 
 # Translators:
+# Pedro García Rodríguez <pedgarrod at gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:17\n"
-"PO-Revision-Date: 2012-08-13 14:34+0000\n"
-"Last-Translator: Automatically generated\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
+"PO-Revision-Date: 2012-08-16 11:55+0000\n"
+"Last-Translator: Pedro García Rodríguez <pedgarrod at gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +19,7 @@ msgstr ""
 #. Tag: title
 #, no-c-format
 msgid "Groupware Overview"
-msgstr ""
+msgstr "Información general sobre Groupware"
 
 #. Tag: para
 #, no-c-format
@@ -26,96 +27,96 @@ msgid ""
 "Groupware is collaborative software designed to allow people with a common "
 "task to achieve goals. Aspects in an infrastructure providing such "
 "functionality include;"
-msgstr ""
+msgstr "Groupware es un software de colaboración diseñado para permitir que las personas con una objetivo común logren sus objetivos. Entre los aspectos de una infraestructura que proporciona esta funcionalidad se encuentran, entre otros:"
 
 #. Tag: para
 #, no-c-format
 msgid "Email,"
-msgstr ""
+msgstr "Correo electrónico,"
 
 #. Tag: para
 #, no-c-format
 msgid "Calendaring,"
-msgstr ""
+msgstr "calendario,"
 
 #. Tag: para
 #, no-c-format
 msgid "Task Management,"
-msgstr ""
+msgstr "administración de tareas,"
 
 #. Tag: para
 #, no-c-format
 msgid "Journalling,"
-msgstr ""
+msgstr "diario,"
 
 #. Tag: para
 #, no-c-format
 msgid "Contacts,"
-msgstr ""
+msgstr "contactos,"
 
 #. Tag: para
 #, no-c-format
 msgid "Address Books,"
-msgstr ""
+msgstr "libreta de direcciones,"
 
 #. Tag: para
 #, no-c-format
 msgid "Notebooks & Notes"
-msgstr ""
+msgstr "cuadernos y notas"
 
 #. Tag: para
 #, no-c-format
 msgid "All of the former are capabilities provided by Kolab Groupware itself."
-msgstr ""
+msgstr "Kolab Groupware proporciona todas estas capacidades mencionadas previamente."
 
 #. Tag: para
 #, no-c-format
 msgid "Technologies assisting collaborative efforts also include, however;"
-msgstr ""
+msgstr "Entre las tecnologías de asistencia a la colaboración también incluyen:"
 
 #. Tag: para
 #, no-c-format
 msgid "Voice- and Video Communications,"
-msgstr ""
+msgstr "Comunicaciones de voz y vídeo,"
 
 #. Tag: para
 #, no-c-format
 msgid "Message boards,"
-msgstr ""
+msgstr "foros,"
 
 #. Tag: para
 #, no-c-format
 msgid "Knowledge bases,"
-msgstr ""
+msgstr "base de conocimiento,"
 
 #. Tag: para
 #, no-c-format
 msgid "Enterprise bookmarking,"
-msgstr ""
+msgstr "marcadores,"
 
 #. Tag: para
 #, no-c-format
 msgid "Instant Messaging,"
-msgstr ""
+msgstr "mensajería instantánea,"
 
 #. Tag: para
 #, no-c-format
 msgid "Document Management,"
-msgstr ""
+msgstr "gestión de documentos,"
 
 #. Tag: para
 #, no-c-format
 msgid "Project Management,"
-msgstr ""
+msgstr "gestión de proyectos,"
 
 #. Tag: para
 #, no-c-format
 msgid "Work-flow Management"
-msgstr ""
+msgstr "gestión del flujo de trabajo"
 
 #. Tag: para
 #, no-c-format
 msgid ""
 "While each of the aforementioned aspects of groupware and collaboration is "
 "available as Free Software, integration is an entirely different topic."
-msgstr ""
+msgstr "Si bien cada uno de los aspectos antes mencionados de trabajo en grupo y colaboración se encuentran disponible como software libre, la integración de las mismas es un tema totalmente diferente."
diff --git a/Architecture_and_Design/es-ES/Integration_amp_Interoperability.po b/Architecture_and_Design/es-ES/Integration_amp_Interoperability.po
index 936f3ce..7e9f97a 100644
--- a/Architecture_and_Design/es-ES/Integration_amp_Interoperability.po
+++ b/Architecture_and_Design/es-ES/Integration_amp_Interoperability.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:17\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 13:34+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Architecture_and_Design/es-ES/Kolab_Content_Filters.po b/Architecture_and_Design/es-ES/Kolab_Content_Filters.po
index a25c1a6..8feb3c9 100644
--- a/Architecture_and_Design/es-ES/Kolab_Content_Filters.po
+++ b/Architecture_and_Design/es-ES/Kolab_Content_Filters.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:17\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 13:34+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Architecture_and_Design/es-ES/Kolab_Daemon.po b/Architecture_and_Design/es-ES/Kolab_Daemon.po
index 5a9929a..5f4d794 100644
--- a/Architecture_and_Design/es-ES/Kolab_Daemon.po
+++ b/Architecture_and_Design/es-ES/Kolab_Daemon.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:17\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 12:53+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Architecture_and_Design/es-ES/Kolab_Objects.po b/Architecture_and_Design/es-ES/Kolab_Objects.po
index 17ba9e7..5a7e81f 100644
--- a/Architecture_and_Design/es-ES/Kolab_Objects.po
+++ b/Architecture_and_Design/es-ES/Kolab_Objects.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:17\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 12:54+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Architecture_and_Design/es-ES/Kolab_SMTP_Access_Policy.po b/Architecture_and_Design/es-ES/Kolab_SMTP_Access_Policy.po
index c30ef63..5332dab 100644
--- a/Architecture_and_Design/es-ES/Kolab_SMTP_Access_Policy.po
+++ b/Architecture_and_Design/es-ES/Kolab_SMTP_Access_Policy.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:17\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 13:33+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Architecture_and_Design/es-ES/Kolab_Server_Overview.po b/Architecture_and_Design/es-ES/Kolab_Server_Overview.po
index 9ff6889..ab2f64d 100644
--- a/Architecture_and_Design/es-ES/Kolab_Server_Overview.po
+++ b/Architecture_and_Design/es-ES/Kolab_Server_Overview.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:17\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 13:33+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Architecture_and_Design/es-ES/Migration.po b/Architecture_and_Design/es-ES/Migration.po
index 6c752ce..84b884d 100644
--- a/Architecture_and_Design/es-ES/Migration.po
+++ b/Architecture_and_Design/es-ES/Migration.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:17\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 12:53+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Architecture_and_Design/es-ES/Mobile_Device_Synchronization.po b/Architecture_and_Design/es-ES/Mobile_Device_Synchronization.po
index 79e89d2..181fecc 100644
--- a/Architecture_and_Design/es-ES/Mobile_Device_Synchronization.po
+++ b/Architecture_and_Design/es-ES/Mobile_Device_Synchronization.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:17\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 12:53+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Architecture_and_Design/es-ES/Preface.po b/Architecture_and_Design/es-ES/Preface.po
index abd41be..16e335e 100644
--- a/Architecture_and_Design/es-ES/Preface.po
+++ b/Architecture_and_Design/es-ES/Preface.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:17\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 13:33+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Architecture_and_Design/es-ES/Revision_History.po b/Architecture_and_Design/es-ES/Revision_History.po
index e8cb80c..fa0874a 100644
--- a/Architecture_and_Design/es-ES/Revision_History.po
+++ b/Architecture_and_Design/es-ES/Revision_History.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:17\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 13:35+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Architecture_and_Design/es-ES/Smart_Clients.po b/Architecture_and_Design/es-ES/Smart_Clients.po
index 0a42c67..8c38626 100644
--- a/Architecture_and_Design/es-ES/Smart_Clients.po
+++ b/Architecture_and_Design/es-ES/Smart_Clients.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:17\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 12:53+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Architecture_and_Design/es-ES/Terminology.po b/Architecture_and_Design/es-ES/Terminology.po
index c92fb11..fd8df53 100644
--- a/Architecture_and_Design/es-ES/Terminology.po
+++ b/Architecture_and_Design/es-ES/Terminology.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:17\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 13:34+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Architecture_and_Design/es-ES/sect-About_Kolab_Groupware.po b/Architecture_and_Design/es-ES/sect-About_Kolab_Groupware.po
index 6a5672b..40afadc 100644
--- a/Architecture_and_Design/es-ES/sect-About_Kolab_Groupware.po
+++ b/Architecture_and_Design/es-ES/sect-About_Kolab_Groupware.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:17\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 14:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Architecture_and_Design/es-ES/sect-Feedback.po b/Architecture_and_Design/es-ES/sect-Feedback.po
index 2c7d09c..6c64592 100644
--- a/Architecture_and_Design/es-ES/sect-Feedback.po
+++ b/Architecture_and_Design/es-ES/sect-Feedback.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:17\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 14:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Architecture_and_Design/es-ES/sect-Kolab_Product_Series.po b/Architecture_and_Design/es-ES/sect-Kolab_Product_Series.po
index 4b0499f..4f07638 100644
--- a/Architecture_and_Design/es-ES/sect-Kolab_Product_Series.po
+++ b/Architecture_and_Design/es-ES/sect-Kolab_Product_Series.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:17\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
 "PO-Revision-Date: 2012-08-13 14:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
diff --git a/Architecture_and_Design/es-ES/sect-Supported_Platforms_and_System_Requirements.po b/Architecture_and_Design/es-ES/sect-Supported_Platforms_and_System_Requirements.po
index 828c7a3..03ef65d 100644
--- a/Architecture_and_Design/es-ES/sect-Supported_Platforms_and_System_Requirements.po
+++ b/Architecture_and_Design/es-ES/sect-Supported_Platforms_and_System_Requirements.po
@@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-15T22:16:17\n"
-"PO-Revision-Date: 2012-08-15 22:17+0000\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
+"PO-Revision-Date: 2012-09-03 11:18+0000\n"
 "Last-Translator: Jeroen van Meeuwen <vanmeeuwen at kolabsys.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -18,12 +18,12 @@ msgstr ""
 #. Tag: title
 #, no-c-format
 msgid "Supported Platforms and System Requirements"
-msgstr ""
+msgstr "Plataformas compatibles y requisitos del sistema"
 
 #. Tag: para
 #, no-c-format
 msgid "Kolab Groupware is supported on the following platforms;"
-msgstr ""
+msgstr "Kolab Groupware es compatible con las siguientes plataformas;"
 
 #. Tag: para
 #, no-c-format
@@ -33,34 +33,34 @@ msgid ""
 " to keep up with the latest distribution release ear-marked stable. </para> "
 "</footnote>, including but not limited to the following distributions, in no"
 " particular order other then alphabetic;"
-msgstr ""
+msgstr "Todas las versiones razonablemente recientes de Linux\n<footnote> <para> Por versiones razonablemente recientes de Linux, debemos indicar que el proyecto Kolab puede llegar a mantenerse al día con la última versión estable de la distribución.</para> </footnote>, incluyendo pero no limitado a las siguientes distribuciones, sin ningún otro orden en particular, que el alfabético;"
 
 #. Tag: para
 #, no-c-format
 msgid "<ulink url=\"http://centos.org\">CentOS</ulink>"
-msgstr ""
+msgstr "<ulink url=\"http://centos.org\">CentOS</ulink>"
 
 #. Tag: para
 #, no-c-format
 msgid "<ulink url=\"http://debian.org\">Debian</ulink>"
-msgstr ""
+msgstr "<ulink url=\"http://debian.org\">Debian</ulink>"
 
 #. Tag: para
 #, no-c-format
 msgid "<ulink url=\"http://fedoraproject.org\">Fedora</ulink>"
-msgstr ""
+msgstr "<ulink url=\"http://fedoraproject.org\">Fedora</ulink>"
 
 #. Tag: para
 #, no-c-format
 msgid "<ulink url=\"http://redhat.com\">Red Hat Enterprise Linux</ulink>"
-msgstr ""
+msgstr "<ulink url=\"http://redhat.com\">Red Hat Enterprise Linux</ulink>"
 
 #. Tag: para
 #, no-c-format
 msgid ""
 "<ulink url=\"http://www.univention.de/index.php?id=964&L=1\">Univention "
 "Corporate Server</ulink>"
-msgstr ""
+msgstr "<ulink url=\"http://www.univention.de/index.php?id=964&L=1\">Univention Corporate Server</ulink>"
 
 #. Tag: para
 #, no-c-format
diff --git a/Architecture_and_Design/ja-JP/Administration_Panel.po b/Architecture_and_Design/ja-JP/Administration_Panel.po
index 303d761..08d9471 100644
--- a/Architecture_and_Design/ja-JP/Administration_Panel.po
+++ b/Architecture_and_Design/ja-JP/Administration_Panel.po
@@ -1,16 +1,19 @@
-# 
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:46\n"
-"PO-Revision-Date: 2012-08-24T15:34:46\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
+"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
+"PO-Revision-Date: 2012-08-13 12:53+0000\n"
 "Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab/language/ja/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. Tag: title
 #, no-c-format
@@ -19,7 +22,10 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The Kolab Groupware administration panel, a web interface to Kolab Groupware available for administrative purposes, will provide the functionality listed in this chapter."
+msgid ""
+"The Kolab Groupware administration panel, a web interface to Kolab Groupware"
+" available for administrative purposes, will provide the functionality "
+"listed in this chapter."
 msgstr ""
 
 #. Tag: para
@@ -39,12 +45,18 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The web client interface is nothing but a graphical representation of the API backend capabilities, allowing a user to navigate an interface to the administrative tasks the API backend exposes."
+msgid ""
+"The web client interface is nothing but a graphical representation of the "
+"API backend capabilities, allowing a user to navigate an interface to the "
+"administrative tasks the API backend exposes."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "This design allows other system management and corporate products to trigger Kolab Groupware administration tasks on an equal footing, and without the need to (re-)implement all of the Kolab Groupware logic."
+msgid ""
+"This design allows other system management and corporate products to trigger"
+" Kolab Groupware administration tasks on an equal footing, and without the "
+"need to (re-)implement all of the Kolab Groupware logic."
 msgstr ""
 
 #. Tag: title
@@ -54,7 +66,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Configuration of the <xref linkend=\"form-Architecture_and_Design-Terminology-Kolab_Groupware_Primary_Domain\" />"
+msgid ""
+"Configuration of the <xref linkend=\"form-Architecture_and_Design-"
+"Terminology-Kolab_Groupware_Primary_Domain\" />"
 msgstr ""
 
 #. Tag: para
@@ -69,7 +83,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Including the assignment of privileges delegated to delegation security groups, including;"
+msgid ""
+"Including the assignment of privileges delegated to delegation security "
+"groups, including;"
 msgstr ""
 
 #. Tag: para
@@ -94,12 +110,15 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Alter user attributes (common name, display name, surname), if applicable"
+msgid ""
+"Alter user attributes (common name, display name, surname), if applicable"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Create, modify and/or delete distribution lists and/or security groups, if applicable"
+msgid ""
+"Create, modify and/or delete distribution lists and/or security groups, if "
+"applicable"
 msgstr ""
 
 #. Tag: para
@@ -144,17 +163,29 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The web administration panel comes with an API in order to allow different, third-party interfaces, as well as the Kolab tool-chain to Kolab Groupware, to execute tasks of an administrative nature. The API uses JSON to exchange information with the API client."
+msgid ""
+"The web administration panel comes with an API in order to allow different, "
+"third-party interfaces, as well as the Kolab tool-chain to Kolab Groupware, "
+"to execute tasks of an administrative nature. The API uses JSON to exchange "
+"information with the API client."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The calls to the Web API are made to a service handler, for its methods handle the request. A call therefore looks like <emphasis><service>.<method></emphasis>, which is a location beneath the base URL for the API."
+msgid ""
+"The calls to the Web API are made to a service handler, for its methods "
+"handle the request. A call therefore looks like "
+"<emphasis><service>.<method></emphasis>, which is a location "
+"beneath the base URL for the API."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Suppose <ulink url=\"https://kolab-admin.example.org/api/\" /> is the API base URL, then a call to service method <literal>system.authenticate</literal> would be a POST HTTP/1.1 request to <ulink url=\"https://kolab-admin.example.org/api/system.authenticate\" />."
+msgid ""
+"Suppose <ulink url=\"https://kolab-admin.example.org/api/\" /> is the API "
+"base URL, then a call to service method "
+"<literal>system.authenticate</literal> would be a POST HTTP/1.1 request to "
+"<ulink url=\"https://kolab-admin.example.org/api/system.authenticate\" />."
 msgstr ""
 
 #. Tag: title
@@ -164,27 +195,45 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Two HTTP methods are used: GET and POST. The GET method is generally(!) used for read-only operations, whereas the POST method is used for write operations."
+msgid ""
+"Two HTTP methods are used: GET and POST. The GET method is generally(!) used"
+" for read-only operations, whereas the POST method is used for write "
+"operations."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "For GET requests, the parameters (the payload) are appended to the URI requested, <ulink url=\"https://kolab-admin.example.org/api/domain.info?domain=example.org\" />."
+msgid ""
+"For GET requests, the parameters (the payload) are appended to the URI "
+"requested, <ulink url=\"https://kolab-"
+"admin.example.org/api/domain.info?domain=example.org\" />."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "This restricts GET requests to specifying key-value pairs of payload information only, even though a GET parameter key can be specified more then one, creating a list of values."
+msgid ""
+"This restricts GET requests to specifying key-value pairs of payload "
+"information only, even though a GET parameter key can be specified more then"
+" one, creating a list of values."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Some read-only operations, such as <literal>user.find_by_attributes</literal> require the request to pass along multiple attributes with, potentially, multiple search parameters. These types read-only requests are the exception to the rule of using GET for read-only requests, and use POST instead."
+msgid ""
+"Some read-only operations, such as "
+"<literal>user.find_by_attributes</literal> require the request to pass along"
+" multiple attributes with, potentially, multiple search parameters. These "
+"types read-only requests are the exception to the rule of using GET for "
+"read-only requests, and use POST instead."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "For POST requests, the payload is a JSON-encoded dictionary (array) of parameter keys and values. Only strings are allowed as keys. Values for the payload may contain lists, strings, dictionaries (arrays), integers, floats, etc."
+msgid ""
+"For POST requests, the payload is a JSON-encoded dictionary (array) of "
+"parameter keys and values. Only strings are allowed as keys. Values for the "
+"payload may contain lists, strings, dictionaries (arrays), integers, floats,"
+" etc."
 msgstr ""
 
 #. Tag: title
@@ -194,22 +243,35 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "In another rule-of-thumb we outline the naming convention for services and methods."
+msgid ""
+"In another rule-of-thumb we outline the naming convention for services and "
+"methods."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Service names consist of an object name either in singular or plural form. The singular form depicts actions are placed against a single instance of an object, such as <literal>object.add</literal>, or at most one result entry is expected, such as <literal>object.find</literal>."
+msgid ""
+"Service names consist of an object name either in singular or plural form. "
+"The singular form depicts actions are placed against a single instance of an"
+" object, such as <literal>object.add</literal>, or at most one result entry "
+"is expected, such as <literal>object.find</literal>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The plural form depicts actions that are placed against multiple instances of an object, such as <literal>objects.list</literal> or <literal>objects.search</literal>, or expect zero, one or more result entries to be returned."
+msgid ""
+"The plural form depicts actions that are placed against multiple instances "
+"of an object, such as <literal>objects.list</literal> or "
+"<literal>objects.search</literal>, or expect zero, one or more result "
+"entries to be returned."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Method names often imply an action is placed against one or more objects in one request. Certain actions may be confusing though. For these we have the following rules;"
+msgid ""
+"Method names often imply an action is placed against one or more objects in "
+"one request. Certain actions may be confusing though. For these we have the "
+"following rules;"
 msgstr ""
 
 #. Tag: title
@@ -219,7 +281,12 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The method <literal>find</literal> is always executed against the service with the singular form of the object name. The target of calling a <literal>find</literal> method is to obtain exactly zero or one instance of an object. The method should fail if the result set contains any number of objects not zero or one."
+msgid ""
+"The method <literal>find</literal> is always executed against the service "
+"with the singular form of the object name. The target of calling a "
+"<literal>find</literal> method is to obtain exactly zero or one instance of "
+"an object. The method should fail if the result set contains any number of "
+"objects not zero or one."
 msgstr ""
 
 #. Tag: title
@@ -229,7 +296,11 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The method <literal>search</literal> is always executed against the service with the plural form of the object name. The target of calling a <literal>search</literal> method is to obtain all matches, if any. The method should return any result set containing zero or more results."
+msgid ""
+"The method <literal>search</literal> is always executed against the service "
+"with the plural form of the object name. The target of calling a "
+"<literal>search</literal> method is to obtain all matches, if any. The "
+"method should return any result set containing zero or more results."
 msgstr ""
 
 #. Tag: title
@@ -239,12 +310,18 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The standard response layout offers a location for the request status, an error code and the corresponding message, or a result."
+msgid ""
+"The standard response layout offers a location for the request status, an "
+"error code and the corresponding message, or a result."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The status is the first item in the JSON object. It has two possible values: <literal>OK</literal> or <literal>ERROR</literal>. Depending on the status of the request, the rest of the JSON output contains a result (OK) or the error details (ERROR)."
+msgid ""
+"The status is the first item in the JSON object. It has two possible values:"
+" <literal>OK</literal> or <literal>ERROR</literal>. Depending on the status "
+"of the request, the rest of the JSON output contains a result (OK) or the "
+"error details (ERROR)."
 msgstr ""
 
 #. Tag: para
@@ -254,7 +331,8 @@ msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "{\n"
+msgid ""
+"{\n"
 "    \"status\": \"OK\",\n"
 "    \"result\": (...)\n"
 "}"
@@ -262,12 +340,16 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The reponse to a successful request that is expected to return a zero or one item, such as <literal>find</literal> methods, includes a result layout as follows:"
+msgid ""
+"The reponse to a successful request that is expected to return a zero or one"
+" item, such as <literal>find</literal> methods, includes a result layout as "
+"follows:"
 msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "{\n"
+msgid ""
+"{\n"
 "    \"status\": \"OK\",\n"
 "    \"result\": {\n"
 "        (... entry data ...)\n"
@@ -277,12 +359,16 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The reponse to a successful request that is expected to return a list of zero, one or more items, such as <literal>list</literal> and <literal>search</literal> methods, includes a result layout as follows:"
+msgid ""
+"The reponse to a successful request that is expected to return a list of "
+"zero, one or more items, such as <literal>list</literal> and "
+"<literal>search</literal> methods, includes a result layout as follows:"
 msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "{\n"
+msgid ""
+"{\n"
 "    \"status\": \"OK\",\n"
 "    \"result\": {\n"
 "        \"list\": (...),\n"
@@ -298,7 +384,8 @@ msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "{\n"
+msgid ""
+"{\n"
 "    \"status\": \"ERROR\",\n"
 "    \"code\": <integer>,\n"
 "    \"reason\": \"<string>\"\n"
@@ -322,7 +409,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Domain operations, such as obtaining information for them, or adding, editing and deleting a domain."
+msgid ""
+"Domain operations, such as obtaining information for them, or adding, "
+"editing and deleting a domain."
 msgstr ""
 
 #. Tag: para
@@ -347,7 +436,11 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Service handler for form values. Can be used to generate form values (such as passwords for new users), and compose form values for form fields for which the value is to be composed using existing field values from other form fields."
+msgid ""
+"Service handler for form values. Can be used to generate form values (such "
+"as passwords for new users), and compose form values for form fields for "
+"which the value is to be composed using existing field values from other "
+"form fields."
 msgstr ""
 
 #. Tag: title
@@ -422,7 +515,12 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The <literal>domain</literal> service makes available actions against a single domain entity, for example 'add' or 'delete'. For actions against multiple domain entities, such as 'list' and 'search', see <xref linkend=\"sect-Architecture_and_Design-Web_Administration_Panel_API-The_domains_Service\" />."
+msgid ""
+"The <literal>domain</literal> service makes available actions against a "
+"single domain entity, for example 'add' or 'delete'. For actions against "
+"multiple domain entities, such as 'list' and 'search', see <xref linkend"
+"=\"sect-Architecture_and_Design-Web_Administration_Panel_API-"
+"The_domains_Service\" />."
 msgstr ""
 
 #. Tag: title
@@ -432,7 +530,10 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Depending on the technology used, quite the variety of things may need to happen when adding a domain to a Kolab Groupware deployment. This is therefore a responsbility for the API rather then the client."
+msgid ""
+"Depending on the technology used, quite the variety of things may need to "
+"happen when adding a domain to a Kolab Groupware deployment. This is "
+"therefore a responsbility for the API rather then the client."
 msgstr ""
 
 #. Tag: title
@@ -442,7 +543,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The following parameters MUST be specified with the <literal>domain.add</literal> API call:"
+msgid ""
+"The following parameters MUST be specified with the "
+"<literal>domain.add</literal> API call:"
 msgstr ""
 
 #. Tag: title
@@ -457,7 +560,10 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "If more than one domain name space is specified (i.e. <literal>associateddomain</literal> consists of a list or array), the remaining domain name spaces are added as aliases."
+msgid ""
+"If more than one domain name space is specified (i.e. "
+"<literal>associateddomain</literal> consists of a list or array), the "
+"remaining domain name spaces are added as aliases."
 msgstr ""
 
 #. Tag: title
@@ -482,12 +588,15 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The following is an example of a call to API service method <literal>domain.add</literal>:"
+msgid ""
+"The following is an example of a call to API service method "
+"<literal>domain.add</literal>:"
 msgstr ""
 
 #. Tag: programlisting
 #, no-c-format
-msgid "import json\n"
+msgid ""
+"import json\n"
 "import httplib\n"
 "import sys\n"
 "\n"
@@ -545,7 +654,8 @@ msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "{\n"
+msgid ""
+"{\n"
 "    \"status\":\"OK\"\n"
 "}"
 msgstr ""
@@ -557,52 +667,84 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "On the server-side, when a domain is added, an entry is added to the default authentication and authorization database, as configured through the setting <literal>auth_mechanism</literal> in the <literal>[kolab]</literal> section of <filename>/etc/kolab/kolab.conf</filename>."
+msgid ""
+"On the server-side, when a domain is added, an entry is added to the default"
+" authentication and authorization database, as configured through the "
+"setting <literal>auth_mechanism</literal> in the <literal>[kolab]</literal> "
+"section of <filename>/etc/kolab/kolab.conf</filename>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The authentication database technology referred to has the necessary settings to determine how a new domain can be added. The related settings for LDAP are <literal>domain_base_dn</literal>, <literal>domain_scope</literal>, <literal>domain_filter</literal>, <literal>domain_name_attribute</literal> (used for the RDN to compose the DN)."
+msgid ""
+"The authentication database technology referred to has the necessary "
+"settings to determine how a new domain can be added. The related settings "
+"for LDAP are <literal>domain_base_dn</literal>, "
+"<literal>domain_scope</literal>, <literal>domain_filter</literal>, "
+"<literal>domain_name_attribute</literal> (used for the RDN to compose the "
+"DN)."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "After checking the domain does not already exist (using administrative credentials), the domain is added using the credentials for the logged in user. This is an access control verification step only; the logged in user must have 'add' rights on the <xref linkend=\"form-Architecture_and_Design-Terminology-Domain_Base_DN\" />."
+msgid ""
+"After checking the domain does not already exist (using administrative "
+"credentials), the domain is added using the credentials for the logged in "
+"user. This is an access control verification step only; the logged in user "
+"must have 'add' rights on the <xref linkend=\"form-Architecture_and_Design-"
+"Terminology-Domain_Base_DN\" />."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Additional steps when adding a (primary) domain name space is to create the databases and populate the root dn."
+msgid ""
+"Additional steps when adding a (primary) domain name space is to create the "
+"databases and populate the root dn."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The following is a list of things that still need to be designed and/or implemented."
+msgid ""
+"The following is a list of things that still need to be designed and/or "
+"implemented."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Adding an alias for a domain name space, such that \"company.nl\" can be specified as an alias domain name space for \"company.com\"."
+msgid ""
+"Adding an alias for a domain name space, such that \"company.nl\" can be "
+"specified as an alias domain name space for \"company.com\"."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Designating an \"owner\" of a domain name space, possibly through nesting (LDAP) or assigning a owner_id (SQL)."
+msgid ""
+"Designating an \"owner\" of a domain name space, possibly through nesting "
+"(LDAP) or assigning a owner_id (SQL)."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Determining access to a domain name space for any particular set of credentials."
+msgid ""
+"Determining access to a domain name space for any particular set of "
+"credentials."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "It seems, for LDAP, the server-side getEffectiveRights control is not supported. An alternative may be to probe the root dn for the domain name space using the current session bind credentials, but this may not scale. Exceptions to the probing would need to be established to make sure the known DNs are not subjected to the extensive operation(s) (such as <emphasis>cn=Directory Manager</emphasis>)."
+msgid ""
+"It seems, for LDAP, the server-side getEffectiveRights control is not "
+"supported. An alternative may be to probe the root dn for the domain name "
+"space using the current session bind credentials, but this may not scale. "
+"Exceptions to the probing would need to be established to make sure the "
+"known DNs are not subjected to the extensive operation(s) (such as "
+"<emphasis>cn=Directory Manager</emphasis>)."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Once a domain is added, we have to implement access control on top of it."
+msgid ""
+"Once a domain is added, we have to implement access control on top of it."
 msgstr ""
 
 #. Tag: title
@@ -637,7 +779,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The response consists of the following two toplevel keys, contained within a JSON object:"
+msgid ""
+"The response consists of the following two toplevel keys, contained within a"
+" JSON object:"
 msgstr ""
 
 #. Tag: para
@@ -652,7 +796,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The <literal>result</literal> JSON object contains the following two primary keys:"
+msgid ""
+"The <literal>result</literal> JSON object contains the following two primary"
+" keys:"
 msgstr ""
 
 #. Tag: para
@@ -662,7 +808,10 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The value represents the list of results. Languages in use today allow the counting of the list's keys, which should get a client application to be able to estimate the number of results contained within the list."
+msgid ""
+"The value represents the list of results. Languages in use today allow the "
+"counting of the list's keys, which should get a client application to be "
+"able to estimate the number of results contained within the list."
 msgstr ""
 
 #. Tag: para
@@ -672,7 +821,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The value represents the total number of results, to allow for pagination on the client."
+msgid ""
+"The value represents the total number of results, to allow for pagination on"
+" the client."
 msgstr ""
 
 #. Tag: title
@@ -687,12 +838,17 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "This API call allows access to routines that generate attribute values. It accepts data containing the names and values of other attribute values as input, which can be used to generate the new attribute value requested."
+msgid ""
+"This API call allows access to routines that generate attribute values. It "
+"accepts data containing the names and values of other attribute values as "
+"input, which can be used to generate the new attribute value requested."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The <literal>form_value.generate</literal> API call accepts the following parameters:"
+msgid ""
+"The <literal>form_value.generate</literal> API call accepts the following "
+"parameters:"
 msgstr ""
 
 #. Tag: title
@@ -712,12 +868,19 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "An array with key => value pairs containing the attribute name (key) and attribute value (value) to use to generate the new value for the attribute supplied in <xref linkend=\"form-Architecture_and_Design-form_value.validate_Method-attribute\" />."
+msgid ""
+"An array with key => value pairs containing the attribute name (key) and "
+"attribute value (value) to use to generate the new value for the attribute "
+"supplied in <xref linkend=\"form-Architecture_and_Design-form_value"
+".validate_Method-attribute\" />."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "This parameter is required for certain attributes, such as <literal>cn</literal>, but not for other attributes, such as <literal>userPassword</literal>."
+msgid ""
+"This parameter is required for certain attributes, such as "
+"<literal>cn</literal>, but not for other attributes, such as "
+"<literal>userPassword</literal>."
 msgstr ""
 
 #. Tag: title
@@ -727,17 +890,23 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "An optional parameter to indicate to the API that the formation policy for users should be used."
+msgid ""
+"An optional parameter to indicate to the API that the formation policy for "
+"users should be used."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Supply an integer indicating the user type to use policies for that user type."
+msgid ""
+"Supply an integer indicating the user type to use policies for that user "
+"type."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Supply a boolean True to use a policy for users, allowing the use of policies not specific to any user type."
+msgid ""
+"Supply a boolean True to use a policy for users, allowing the use of "
+"policies not specific to any user type."
 msgstr ""
 
 #. Tag: para
@@ -757,17 +926,23 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "An optional parameter to indicate to the API that the formation policy for groups should be used."
+msgid ""
+"An optional parameter to indicate to the API that the formation policy for "
+"groups should be used."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Supply an integer indicating the group type to use policies for that group type."
+msgid ""
+"Supply an integer indicating the group type to use policies for that group "
+"type."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Supply a boolean True to use a policy for groups, allowing the use of policies not specific to any group type."
+msgid ""
+"Supply a boolean True to use a policy for groups, allowing the use of "
+"policies not specific to any group type."
 msgstr ""
 
 #. Tag: para
@@ -777,7 +952,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The API call does not allow both the <literal>user_type_id</literal> and <literal>group_type_id</literal> to;"
+msgid ""
+"The API call does not allow both the <literal>user_type_id</literal> and "
+"<literal>group_type_id</literal> to;"
 msgstr ""
 
 #. Tag: para
@@ -807,14 +984,15 @@ msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "result = request('POST', 'form_value.generate_userpassword')\n"
+msgid ""
+"result = request('POST', 'form_value.generate_userpassword')\n"
 "print result['userpassword']\n"
-""
 msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "{\n"
+msgid ""
+"{\n"
 "        \"status\": \"OK\",\n"
 "        \"result\": {\n"
 "                \"password\": \"3SQLAdcW_KZL5vO\"\n"
@@ -834,7 +1012,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The <literal>form_value.validate</literal> API call accepts the following parameters:"
+msgid ""
+"The <literal>form_value.validate</literal> API call accepts the following "
+"parameters:"
 msgstr ""
 
 #. Tag: para
@@ -849,12 +1029,16 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "An optional parameter to indicate to the API that the validation policy for users should be used."
+msgid ""
+"An optional parameter to indicate to the API that the validation policy for "
+"users should be used."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "An optional parameter to indicate to the API that the validation policy for groups should be used."
+msgid ""
+"An optional parameter to indicate to the API that the validation policy for "
+"groups should be used."
 msgstr ""
 
 #. Tag: title
@@ -884,7 +1068,8 @@ msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "{\n"
+msgid ""
+"{\n"
 "        \"status\": \"OK\",\n"
 "        \"result\": {\n"
 "                \"cn\": \"sysadmin-main\",\n"
@@ -913,7 +1098,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The <literal>group.members_list</literal> service method lists the members of a group."
+msgid ""
+"The <literal>group.members_list</literal> service method lists the members "
+"of a group."
 msgstr ""
 
 #. Tag: para
@@ -933,12 +1120,19 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Successful authentication is a prerequisite in order to be able to execute any other action against the system. Upon success, the <literal>system.authenticate</literal> API call returns a session token that MUST be supplied with all subsequent requests for the session, through the HTTP header <literal>X-Session-Token</literal>."
+msgid ""
+"Successful authentication is a prerequisite in order to be able to execute "
+"any other action against the system. Upon success, the "
+"<literal>system.authenticate</literal> API call returns a session token that"
+" MUST be supplied with all subsequent requests for the session, through the "
+"HTTP header <literal>X-Session-Token</literal>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The following parameters MUST be supplied with a call to <literal>system.authenticate</literal>:"
+msgid ""
+"The following parameters MUST be supplied with a call to "
+"<literal>system.authenticate</literal>:"
 msgstr ""
 
 #. Tag: title
@@ -953,12 +1147,16 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Currently, only the 'entryDN' and 'mail' attribute values are allowed as the username for an authentication request."
+msgid ""
+"Currently, only the 'entryDN' and 'mail' attribute values are allowed as the"
+" username for an authentication request."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "See also: <xref linkend=\"sect-Architecture_and_Design-Authentication_amp_Authorization-The_User_Supplied_Login\" />"
+msgid ""
+"See also: <xref linkend=\"sect-Architecture_and_Design-"
+"Authentication_amp_Authorization-The_User_Supplied_Login\" />"
 msgstr ""
 
 #. Tag: title
@@ -968,7 +1166,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The following parameters MAY be supplied with a call to <literal>system.authenticate</literal>:"
+msgid ""
+"The following parameters MAY be supplied with a call to "
+"<literal>system.authenticate</literal>:"
 msgstr ""
 
 #. Tag: title
@@ -978,7 +1178,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "With supplying the <literal>domain</literal> parameter in an authentication request,"
+msgid ""
+"With supplying the <literal>domain</literal> parameter in an authentication "
+"request,"
 msgstr ""
 
 #. Tag: title
@@ -988,12 +1190,14 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The following is an example of authentication against the API in Python:"
+msgid ""
+"The following is an example of authentication against the API in Python:"
 msgstr ""
 
 #. Tag: programlisting
 #, no-c-format
-msgid "import json\n"
+msgid ""
+"import json\n"
 "import httplib\n"
 "import sys\n"
 "\n"
@@ -1034,12 +1238,15 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The following is a response to a successful authentication request (with inserted line-breaks for readability):"
+msgid ""
+"The following is a response to a successful authentication request (with "
+"inserted line-breaks for readability):"
 msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "{\n"
+msgid ""
+"{\n"
 "    \"status\":\"OK\",\n"
 "    \"result\": {\n"
 "        \"user\":\"cn=Directory Manager\",\n"
@@ -1051,12 +1258,16 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The following is a reponse to an unsuccessful call to <literal>system.authenticate</literal> (with inserted line-breaks for readability):"
+msgid ""
+"The following is a reponse to an unsuccessful call to "
+"<literal>system.authenticate</literal> (with inserted line-breaks for "
+"readability):"
 msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "{\n"
+msgid ""
+"{\n"
 "    \"status\":\"ERROR\",\n"
 "    \"code\":500,\n"
 "    \"reason\":\"Internal error\"\n"
@@ -1070,7 +1281,11 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "For all service handlers registered, a method <literal>capabilities</literal> can be executed listing the methods available and access to them. The <literal>system.capabilities</literal> API call lists all of the registered service handlers' methods and access."
+msgid ""
+"For all service handlers registered, a method "
+"<literal>capabilities</literal> can be executed listing the methods "
+"available and access to them. The <literal>system.capabilities</literal> API"
+" call lists all of the registered service handlers' methods and access."
 msgstr ""
 
 #. Tag: title
@@ -1095,7 +1310,12 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Select the domain supplied as the current working domain. By default, users are logged in and have access to what they are authorized for in their own domain name space only. Certain users, such as <emphasis>cn=Directory Manager</emphasis>, have access to all domains. This API call allows such users to select the domain name space they are currently working on."
+msgid ""
+"Select the domain supplied as the current working domain. By default, users "
+"are logged in and have access to what they are authorized for in their own "
+"domain name space only. Certain users, such as <emphasis>cn=Directory "
+"Manager</emphasis>, have access to all domains. This API call allows such "
+"users to select the domain name space they are currently working on."
 msgstr ""
 
 #. Tag: para
@@ -1105,7 +1325,12 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "On the server-side, when <literal>system.select_domain</literal> is called successfully, the selected domain is stored in <code>$_SESSION['user']->current_domain</code>. This is a private property, however, and the rest of the code is to use the public function <code>$_SESSION['user']->get_domain()</code>:"
+msgid ""
+"On the server-side, when <literal>system.select_domain</literal> is called "
+"successfully, the selected domain is stored in "
+"<code>$_SESSION['user']->current_domain</code>. This is a private "
+"property, however, and the rest of the code is to use the public function "
+"<code>$_SESSION['user']->get_domain()</code>:"
 msgstr ""
 
 #. Tag: title
@@ -1125,7 +1350,11 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "A required parameter is the <literal>user_type_id</literal> (obtain from <literal>user_types.list</literal>). Further required parameters are the keys of the <literal>form_fields</literal> array for the user type with that id."
+msgid ""
+"A required parameter is the <literal>user_type_id</literal> (obtain from "
+"<literal>user_types.list</literal>). Further required parameters are the "
+"keys of the <literal>form_fields</literal> array for the user type with that"
+" id."
 msgstr ""
 
 #. Tag: title
@@ -1140,7 +1369,8 @@ msgstr ""
 
 #. Tag: programlisting
 #, no-c-format
-msgid "\n"
+msgid ""
+"\n"
 "$id = 1;\n"
 "$key = 'simple';\n"
 "$description = 'A simple user type';\n"
@@ -1157,26 +1387,32 @@ msgid "\n"
 "                    ),\n"
 "            ),\n"
 "    );\n"
-""
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Additional required parameters for this user type (with ID 1) would include <literal>cn</literal> and <literal>mail</literal>."
+msgid ""
+"Additional required parameters for this user type (with ID 1) would include "
+"<literal>cn</literal> and <literal>mail</literal>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Note that keys of the array <literal>auto_form_fields</literal> may be submitted, but are honored only if <literal>admin_auto_fields_rw</literal> is set to true or 1. If this setting is not specified (the default), form field values are re-generated. The client interface should have disabled input for these form fields."
+msgid ""
+"Note that keys of the array <literal>auto_form_fields</literal> may be "
+"submitted, but are honored only if <literal>admin_auto_fields_rw</literal> "
+"is set to true or 1. If this setting is not specified (the default), form "
+"field values are re-generated. The client interface should have disabled "
+"input for these form fields."
 msgstr ""
 
 #. Tag: programlisting
 #, no-c-format
-msgid "\n"
+msgid ""
+"\n"
 "headers = { 'X-Session-Token': <replaceable><token></replaceable> }\n"
 "params = { 'cn': 'John Doe', 'mail': 'john.doe at example.org' }\n"
 "request('POST', 'user.add', params, headers)\n"
-""
 msgstr ""
 
 #. Tag: title
@@ -1206,7 +1442,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The following parameter(s) MUST be supplied with a call to <literal>user.info</literal>:"
+msgid ""
+"The following parameter(s) MUST be supplied with a call to "
+"<literal>user.info</literal>:"
 msgstr ""
 
 #. Tag: title
@@ -1216,22 +1454,31 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "A string allowing the user the information needs to be obtained for to be uniquely identified."
+msgid ""
+"A string allowing the user the information needs to be obtained for to be "
+"uniquely identified."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The response to a <literal>user.info</literal> API call contains all information to a particular entry in the authentication and authorization database technology, that can be obtained using the bind credentials for the session user."
+msgid ""
+"The response to a <literal>user.info</literal> API call contains all "
+"information to a particular entry in the authentication and authorization "
+"database technology, that can be obtained using the bind credentials for the"
+" session user."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The output is normalized for abstraction, and looks as follows, with added line-breaks for clarity:"
+msgid ""
+"The output is normalized for abstraction, and looks as follows, with added "
+"line-breaks for clarity:"
 msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "{\n"
+msgid ""
+"{\n"
 "    u'status': 'OK',\n"
 "    u'uid=vanmeeuwen,ou=People,dc=klab,dc=cc': {\n"
 "            u'mailalternateaddress': [\n"
@@ -1310,7 +1557,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The user types are backed by database entries, containing the following attributes per user type:"
+msgid ""
+"The user types are backed by database entries, containing the following "
+"attributes per user type:"
 msgstr ""
 
 #. Tag: title
@@ -1320,7 +1569,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Of type INT, this attribute is automatically assigned by the database backend, unless specifically supplied on insert."
+msgid ""
+"Of type INT, this attribute is automatically assigned by the database "
+"backend, unless specifically supplied on insert."
 msgstr ""
 
 #. Tag: title
@@ -1330,7 +1581,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Of type VARCHAR(16), the <literal>key</literal> attribute is to hold a machine readable name."
+msgid ""
+"Of type VARCHAR(16), the <literal>key</literal> attribute is to hold a "
+"machine readable name."
 msgstr ""
 
 #. Tag: title
@@ -1340,7 +1593,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Of type VARCHAR(128), the <literal>name</literal> attribute is to be the human-readable name for the user type."
+msgid ""
+"Of type VARCHAR(128), the <literal>name</literal> attribute is to be the "
+"human-readable name for the user type."
 msgstr ""
 
 #. Tag: title
@@ -1350,7 +1605,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Of type VARCHAR(256), the <literal>description</literal> attribute holds the description for the user type."
+msgid ""
+"Of type VARCHAR(256), the <literal>description</literal> attribute holds the"
+" description for the user type."
 msgstr ""
 
 #. Tag: title
@@ -1360,7 +1617,10 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Of type TEXT, the <literal>attributes</literal> contains a serialized JSON object with the information needed for the API and client interface to build queries and forms for the user type."
+msgid ""
+"Of type TEXT, the <literal>attributes</literal> contains a serialized JSON "
+"object with the information needed for the API and client interface to build"
+" queries and forms for the user type."
 msgstr ""
 
 #. Tag: title
@@ -1375,7 +1635,8 @@ msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "Array(\n"
+msgid ""
+"Array(\n"
 "        \"<form_field_type>\" => Array(\n"
 "                \"<form_field_name>\" => Array(\n"
 "                            ['data' => Array(\n"
@@ -1396,7 +1657,10 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The <literal>attributes</literal> attribute to a <literal>user_type</literal> entry holds an array with any or all of the following <emphasis><form_field_type></emphasis> keys:"
+msgid ""
+"The <literal>attributes</literal> attribute to a "
+"<literal>user_type</literal> entry holds an array with any or all of the "
+"following <emphasis><form_field_type></emphasis> keys:"
 msgstr ""
 
 #. Tag: title
@@ -1406,17 +1670,25 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The <literal>auto_form_fields</literal> key holds an array of form fields that correspond with attributes for which the value is to be generated automatically, using an API call."
+msgid ""
+"The <literal>auto_form_fields</literal> key holds an array of form fields "
+"that correspond with attributes for which the value is to be generated "
+"automatically, using an API call."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The key name for each key => value pair indicates the form field name for which the value is to be generated automatically."
+msgid ""
+"The key name for each key => value pair indicates the form field name for"
+" which the value is to be generated automatically."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Each array key corresponds with a user attribute name, and it's value is an array containing the name of the form fields for which the value to submit as part of the API call."
+msgid ""
+"Each array key corresponds with a user attribute name, and it's value is an "
+"array containing the name of the form fields for which the value to submit "
+"as part of the API call."
 msgstr ""
 
 #. Tag: title
@@ -1426,12 +1698,16 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Provided the user type's <literal>auto_form_fields</literal> contains an array key of <literal>displayname</literal>, the array value for this key could look as follows:"
+msgid ""
+"Provided the user type's <literal>auto_form_fields</literal> contains an "
+"array key of <literal>displayname</literal>, the array value for this key "
+"could look as follows:"
 msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "Array(\n"
+msgid ""
+"Array(\n"
 "        'auto_form_fields' => Array(\n"
 "                'displayname' => Array(\n"
 "                        'data' => Array(\n"
@@ -1447,17 +1723,27 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "This indicates to the client that a form field named 'displayname' is to be populated with the information contained within the form fields named 'givenname' and 'sn'."
+msgid ""
+"This indicates to the client that a form field named 'displayname' is to be "
+"populated with the information contained within the form fields named "
+"'givenname' and 'sn'."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "If the client is capable of doing so, it should also update the form field named 'displayname' after the values for any of the form fields named 'givenname' or 'sn' have been changed."
+msgid ""
+"If the client is capable of doing so, it should also update the form field "
+"named 'displayname' after the values for any of the form fields named "
+"'givenname' or 'sn' have been changed."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "With a JSON object payload containing the values of the form fields for which the names are contained within the 'data' key, if any, the client should submit a POST request on change of these form fields, and will be returned the new value for the automatically generated form field."
+msgid ""
+"With a JSON object payload containing the values of the form fields for "
+"which the names are contained within the 'data' key, if any, the client "
+"should submit a POST request on change of these form fields, and will be "
+"returned the new value for the automatically generated form field."
 msgstr ""
 
 #. Tag: title
@@ -1467,17 +1753,25 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The <literal>form_fields</literal> key holds an array of form fields that require user input."
+msgid ""
+"The <literal>form_fields</literal> key holds an array of form fields that "
+"require user input."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The key name for each key => value pair indicates the form field name for which the value is to be supplied by the user."
+msgid ""
+"The key name for each key => value pair indicates the form field name for"
+" which the value is to be supplied by the user."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Because some attributes can be multi-valued, or have a limited list of options, each defined form field in <literal>form_fields</literal> can hold an array with additional key => value pairs illustrating the type of form field that should be used, and what format to expect the result value in."
+msgid ""
+"Because some attributes can be multi-valued, or have a limited list of "
+"options, each defined form field in <literal>form_fields</literal> can hold "
+"an array with additional key => value pairs illustrating the type of form"
+" field that should be used, and what format to expect the result value in."
 msgstr ""
 
 #. Tag: title
@@ -1492,7 +1786,11 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "For a form field of type <xref linkend=\"form-Architecture_and_Design-Additional_Information_in_form_fields-text\" /> or type <xref linkend=\"form-Architecture_and_Design-Additional_Information_in_form_fields-list\" />, this value holds the maximum length for a given item."
+msgid ""
+"For a form field of type <xref linkend=\"form-Architecture_and_Design-"
+"Additional_Information_in_form_fields-text\" /> or type <xref linkend"
+"=\"form-Architecture_and_Design-Additional_Information_in_form_fields-list\""
+" />, this value holds the maximum length for a given item."
 msgstr ""
 
 #. Tag: title
@@ -1502,7 +1800,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The <literal>type</literal> is to indicate the type of form field. Options include;"
+msgid ""
+"The <literal>type</literal> is to indicate the type of form field. Options "
+"include;"
 msgstr ""
 
 #. Tag: title
@@ -1522,27 +1822,40 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Additional parameters for a text form field include <xref linkend=\"form-Architecture_and_Design-Additional_Information_in_form_fields-maxlength\" />."
+msgid ""
+"Additional parameters for a text form field include <xref linkend=\"form-"
+"Architecture_and_Design-Additional_Information_in_form_fields-maxlength\" "
+"/>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "A form field of type <literal>list</literal> is expecting a list of text input values."
+msgid ""
+"A form field of type <literal>list</literal> is expecting a list of text "
+"input values."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "A client web interface could choose to display a textarea with the instructions to supply one item per line, or more advanced (better) equivalents, such as an add/delete widget."
+msgid ""
+"A client web interface could choose to display a textarea with the "
+"instructions to supply one item per line, or more advanced (better) "
+"equivalents, such as an add/delete widget."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "A client command-line interface could choose to prompt for input values until an empty value is supplied."
+msgid ""
+"A client command-line interface could choose to prompt for input values "
+"until an empty value is supplied."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Additional parameters for a list form field include <xref linkend=\"form-Architecture_and_Design-Additional_Information_in_form_fields-maxlength\" />, which holds the maximum length of each text value in the list."
+msgid ""
+"Additional parameters for a list form field include <xref linkend=\"form-"
+"Architecture_and_Design-Additional_Information_in_form_fields-maxlength\" "
+"/>, which holds the maximum length of each text value in the list."
 msgstr ""
 
 #. Tag: title
@@ -1552,12 +1865,20 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "This form field is a select list, where multiple options may be selected (as opposed to a <xref linkend=\"form-Architecture_and_Design-Additional_Information_in_form_fields-select\" /> list, where only one option may be selected)."
+msgid ""
+"This form field is a select list, where multiple options may be selected (as"
+" opposed to a <xref linkend=\"form-Architecture_and_Design-"
+"Additional_Information_in_form_fields-select\" /> list, where only one "
+"option may be selected)."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "A client interface MUST consult the <literal>form_value.list_options</literal> API call for options, described in <xref linkend=\"sect-Architecture_and_Design-The_form_value_Service-form_value.list_options_Method\" />."
+msgid ""
+"A client interface MUST consult the "
+"<literal>form_value.list_options</literal> API call for options, described "
+"in <xref linkend=\"sect-Architecture_and_Design-The_form_value_Service-"
+"form_value.list_options_Method\" />."
 msgstr ""
 
 #. Tag: title
@@ -1567,7 +1888,8 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "This form field is a selection list, of which one option may be selected."
+msgid ""
+"This form field is a selection list, of which one option may be selected."
 msgstr ""
 
 #. Tag: title
@@ -1587,7 +1909,10 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The <literal>fields</literal> key holds an array of form fields and values for said form fields, that are static. One example of such form fields is <literal>objectclass</literal>."
+msgid ""
+"The <literal>fields</literal> key holds an array of form fields and values "
+"for said form fields, that are static. One example of such form fields is "
+"<literal>objectclass</literal>."
 msgstr ""
 
 #. Tag: title
@@ -1609,4 +1934,3 @@ msgstr ""
 #, no-c-format
 msgid "<literal>users.search</literal> Method"
 msgstr ""
-
diff --git a/Architecture_and_Design/ja-JP/Akonadi_for_Integration_and_Caching.po b/Architecture_and_Design/ja-JP/Akonadi_for_Integration_and_Caching.po
index 953b02c..ac0e1dd 100644
--- a/Architecture_and_Design/ja-JP/Akonadi_for_Integration_and_Caching.po
+++ b/Architecture_and_Design/ja-JP/Akonadi_for_Integration_and_Caching.po
@@ -1,16 +1,19 @@
-# 
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:46\n"
-"PO-Revision-Date: 2012-08-24T15:34:46\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
+"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
+"PO-Revision-Date: 2012-08-13 13:34+0000\n"
 "Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab/language/ja/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. Tag: title
 #, no-c-format
@@ -19,7 +22,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "In introduction into using Akonadi as the integration and caching layer for server-side clients goes here."
+msgid ""
+"In introduction into using Akonadi as the integration and caching layer for "
+"server-side clients goes here."
 msgstr ""
 
 #. Tag: title
@@ -29,7 +34,12 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "<xref linkend=\"figu-Architecture_and_Design-Server_Side_Akonadi_Architecture_Overview-Local_Akonadi_Control_Server_Architecture_Overview\" /> provides an overview of a simple, single-server deployment with server-side Akonadi being used by the client applications Roundcube and ActiveSync."
+msgid ""
+"<xref linkend=\"figu-Architecture_and_Design-"
+"Server_Side_Akonadi_Architecture_Overview-"
+"Local_Akonadi_Control_Server_Architecture_Overview\" /> provides an overview"
+" of a simple, single-server deployment with server-side Akonadi being used "
+"by the client applications Roundcube and ActiveSync."
 msgstr ""
 
 #. Tag: title
@@ -39,7 +49,14 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Note that the storage for the Akonadi Server is the lightest of all database technologies, SQLite. Alternatively, a SQL database server can be used, as illustrated in <xref linkend=\"figu-Architecture_and_Design-Server_Side_Akonadi_Architecture_Overview-Multiple_Networked_Akonadi_Control_Servers_Architecture\" />. Using a SQL database server would, at the same time, allow more than one Akonadi Control Server system to be deployed as well."
+msgid ""
+"Note that the storage for the Akonadi Server is the lightest of all database"
+" technologies, SQLite. Alternatively, a SQL database server can be used, as "
+"illustrated in <xref linkend=\"figu-Architecture_and_Design-"
+"Server_Side_Akonadi_Architecture_Overview-"
+"Multiple_Networked_Akonadi_Control_Servers_Architecture\" />. Using a SQL "
+"database server would, at the same time, allow more than one Akonadi Control"
+" Server system to be deployed as well."
 msgstr ""
 
 #. Tag: title
@@ -69,22 +86,35 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The client (Roundcube, ActiveSync) calls <application>libakonadi</application> API <code>akonadi_open(</code><emphasis>username</emphasis><code>, </code><emphasis>password</emphasis><code>[, authorize_as=</code><emphasis>username</emphasis><code>][, imap_host=</code><emphasis>imap_host</emphasis><code>][, akonadi_session_id=</code><emphasis>akonadi_session_id</emphasis><code>])</code>."
+msgid ""
+"The client (Roundcube, ActiveSync) calls "
+"<application>libakonadi</application> API "
+"<code>akonadi_open(</code><emphasis>username</emphasis><code>, "
+"</code><emphasis>password</emphasis><code>[, "
+"authorize_as=</code><emphasis>username</emphasis><code>][, "
+"imap_host=</code><emphasis>imap_host</emphasis><code>][, "
+"akonadi_session_id=</code><emphasis>akonadi_session_id</emphasis><code>])</code>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "On behalf of the client application, <application>libakonadi</application> establishes a connection to;"
+msgid ""
+"On behalf of the client application, <application>libakonadi</application> "
+"establishes a connection to;"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The configured or discovered Akonadi Control Server, through a configured mechanism (AF_UNIX, AF_INET, AMQP MessageBus obtained location)."
+msgid ""
+"The configured or discovered Akonadi Control Server, through a configured "
+"mechanism (AF_UNIX, AF_INET, AMQP MessageBus obtained location)."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "See also: <xref linkend=\"proc-Architecture_and_Design-Procedural_Descriptions-libakonadi_Connections_to_Akonadi\" />."
+msgid ""
+"See also: <xref linkend=\"proc-Architecture_and_Design-"
+"Procedural_Descriptions-libakonadi_Connections_to_Akonadi\" />."
 msgstr ""
 
 #. Tag: para
@@ -94,27 +124,41 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The call to <code>akonadi_open()</code> may be synchronous or asynchronous."
+msgid ""
+"The call to <code>akonadi_open()</code> may be synchronous or asynchronous."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "For synchronous calls (using <code>akonadi_open_s()</code>), <application>libakonadi</application> refrains from returning a link identifier until after;"
+msgid ""
+"For synchronous calls (using <code>akonadi_open_s()</code>), "
+"<application>libakonadi</application> refrains from returning a link "
+"identifier until after;"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "It has fully established a successfully authenticated connection to the Akonadi Control Server, and the Akonadi Control Server has returned the Akonadi Session Identifier."
+msgid ""
+"It has fully established a successfully authenticated connection to the "
+"Akonadi Control Server, and the Akonadi Control Server has returned the "
+"Akonadi Session Identifier."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "It has fully established a successfully authenticated connection to the IMAP server, if any such had been requested."
+msgid ""
+"It has fully established a successfully authenticated connection to the IMAP"
+" server, if any such had been requested."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "For asynchronous calls (using <code>akonadi_open()</code>), <application>libakonadi</application> immediately returns a link identifier. The connections to both the Akonadi Control Server and IMAP Server will be established, but will block subsequent access to synchronous calls, and/or queue subsequent asynchronous calls."
+msgid ""
+"For asynchronous calls (using <code>akonadi_open()</code>), "
+"<application>libakonadi</application> immediately returns a link identifier."
+" The connections to both the Akonadi Control Server and IMAP Server will be "
+"established, but will block subsequent access to synchronous calls, and/or "
+"queue subsequent asynchronous calls."
 msgstr ""
 
 #. Tag: para
@@ -124,12 +168,17 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Once the connection is established, authenticated successfully and has obtained a Session Identifier from the Akonadi Control Server, the session identifier is to be made available through API call:"
+msgid ""
+"Once the connection is established, authenticated successfully and has "
+"obtained a Session Identifier from the Akonadi Control Server, the session "
+"identifier is to be made available through API call:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "<code>akonadi_session_id(</code><emphasis>link identifier</emphasis><code>)</code>"
+msgid ""
+"<code>akonadi_session_id(</code><emphasis>link "
+"identifier</emphasis><code>)</code>"
 msgstr ""
 
 #. Tag: title
@@ -139,17 +188,28 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "<application>libakonadi</application>, using the credentials supplied to it through the <code>akonadi_open()</code> call, authenticates itself to the Akonadi Control Server (ACS) using one of the credential exchange mechanisms advertised by the ACS in the initial greeting, such as PLAIN, LOGIN, CRAM-MD5, DIGEST-MD5."
+msgid ""
+"<application>libakonadi</application>, using the credentials supplied to it "
+"through the <code>akonadi_open()</code> call, authenticates itself to the "
+"Akonadi Control Server (ACS) using one of the credential exchange mechanisms"
+" advertised by the ACS in the initial greeting, such as PLAIN, LOGIN, CRAM-"
+"MD5, DIGEST-MD5."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "<remark>Note that we may have to consider the authentication mechanism allowed by the Akonadi Control Server to include GSSAPI and SSL certificate based authentication as well. </remark>"
+msgid ""
+"<remark>Note that we may have to consider the authentication mechanism "
+"allowed by the Akonadi Control Server to include GSSAPI and SSL certificate "
+"based authentication as well. </remark>"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "After the connection has been successfully authenticated (and authorized, where appropriate), the ACS proxies through the connection to the Akonadi Server associated with the Akonadi Session."
+msgid ""
+"After the connection has been successfully authenticated (and authorized, "
+"where appropriate), the ACS proxies through the connection to the Akonadi "
+"Server associated with the Akonadi Session."
 msgstr ""
 
 #. Tag: title
@@ -159,12 +219,18 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Upon receiving a connection, the ACS identifies itself in a greeting (server_name) and includes its capabilities."
+msgid ""
+"Upon receiving a connection, the ACS identifies itself in a greeting "
+"(server_name) and includes its capabilities."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Upon receiving an authentication request, should the authentication be successful, the ACS proxies through the connection to the Akonadi Server associated with the user account the connection is to be authorized as, or follows the following startup procedure;"
+msgid ""
+"Upon receiving an authentication request, should the authentication be "
+"successful, the ACS proxies through the connection to the Akonadi Server "
+"associated with the user account the connection is to be authorized as, or "
+"follows the following startup procedure;"
 msgstr ""
 
 #. Tag: title
@@ -174,17 +240,24 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The client application user is associated with an Akonadi Session Identifier."
+msgid ""
+"The client application user is associated with an Akonadi Session "
+"Identifier."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "It is NOT the client application session that is associated with an Akonadi Server."
+msgid ""
+"It is NOT the client application session that is associated with an Akonadi "
+"Server."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "For each Akonadi Server and Akonadi Agent the ACS starts up, a public and private key-pair is generated and along with the Akonadi Session Identifier, handed over to the Akonadi Server or Agent."
+msgid ""
+"For each Akonadi Server and Akonadi Agent the ACS starts up, a public and "
+"private key-pair is generated and along with the Akonadi Session Identifier,"
+" handed over to the Akonadi Server or Agent."
 msgstr ""
 
 #. Tag: para
@@ -199,12 +272,16 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "If successful, the Akonadi Session Identifier is passed back to the client (<application>libakonadi</application>)."
+msgid ""
+"If successful, the Akonadi Session Identifier is passed back to the client "
+"(<application>libakonadi</application>)."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "After initial discovery (IMAP Configuration folder), additional Akonadi Agents may need to be started up. For this procedure, please see"
+msgid ""
+"After initial discovery (IMAP Configuration folder), additional Akonadi "
+"Agents may need to be started up. For this procedure, please see"
 msgstr ""
 
 #. Tag: title
@@ -214,7 +291,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The following situations may cause a new Akonadi Agent to need to be started:"
+msgid ""
+"The following situations may cause a new Akonadi Agent to need to be "
+"started:"
 msgstr ""
 
 #. Tag: para
@@ -224,7 +303,10 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Discovery of an IMAP Configuration folder with Kolab XML Format Configuration of secondary accounts requires new agents in order to handle said accounts (i.e. Twitter / Facebook / Gmail / ...)."
+msgid ""
+"Discovery of an IMAP Configuration folder with Kolab XML Format "
+"Configuration of secondary accounts requires new agents in order to handle "
+"said accounts (i.e. Twitter / Facebook / Gmail / ...)."
 msgstr ""
 
 #. Tag: para
@@ -234,12 +316,16 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Additionally, the exchange of the original user credentials may be needed in the following scenario:"
+msgid ""
+"Additionally, the exchange of the original user credentials may be needed in"
+" the following scenario:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "An Akonadi Agent has lost it's connection and no credentials had been cached, causing the agent to be unable to re-establish the connection."
+msgid ""
+"An Akonadi Agent has lost it's connection and no credentials had been "
+"cached, causing the agent to be unable to re-establish the connection."
 msgstr ""
 
 #. Tag: para
@@ -249,12 +335,17 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "A request for the user credentials corresponding to the agent is made in a signed and encrypted fashion, sending the signed/encrypted payload containing the overall Akonadi Session Identifier over a D-Bus signal."
+msgid ""
+"A request for the user credentials corresponding to the agent is made in a "
+"signed and encrypted fashion, sending the signed/encrypted payload "
+"containing the overall Akonadi Session Identifier over a D-Bus signal."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The Akonadi Control Server responds with a signed/encrypted D-Bus signal containing the user credentials."
+msgid ""
+"The Akonadi Control Server responds with a signed/encrypted D-Bus signal "
+"containing the user credentials."
 msgstr ""
 
 #. Tag: title
@@ -269,22 +360,39 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Authenticating to the Akonadi Control Server for each connection created by or on behalf of a client application is deemed to be the most secure, effective and standardized mechanism to establish session reliability, proxy authorization and the ability to have one client application use one set of credentials for a user over another set of credentials for a user."
+msgid ""
+"Authenticating to the Akonadi Control Server for each connection created by "
+"or on behalf of a client application is deemed to be the most secure, "
+"effective and standardized mechanism to establish session reliability, proxy"
+" authorization and the ability to have one client application use one set of"
+" credentials for a user over another set of credentials for a user."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Note that the client library, <application>libakonadi</application> needs to obtain the user credentials each time a new connection is requested, as a future direct IMAP connection can be used for interactions that are deemed more efficient to execute against the IMAP server directly, such as simple LIST and FETCH commands –for which libakonadi would be the intelligent broker."
+msgid ""
+"Note that the client library, <application>libakonadi</application> needs to"
+" obtain the user credentials each time a new connection is requested, as a "
+"future direct IMAP connection can be used for interactions that are deemed "
+"more efficient to execute against the IMAP server directly, such as simple "
+"LIST and FETCH commands –for which libakonadi would be the intelligent"
+" broker."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "A typical scenario for one user being able to use two or more different sets of credentials includes secondary passwords for mobile devices using ActiveSync, so loss of corporate credentials is less likely to occur."
+msgid ""
+"A typical scenario for one user being able to use two or more different sets"
+" of credentials includes secondary passwords for mobile devices using "
+"ActiveSync, so loss of corporate credentials is less likely to occur."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Note that we are otherwise unlikely to be able to securely associate user session #1 in client application $x with user session #2 in client application $y passing both through to the same Akonadi Server."
+msgid ""
+"Note that we are otherwise unlikely to be able to securely associate user "
+"session #1 in client application $x with user session #2 in client "
+"application $y passing both through to the same Akonadi Server."
 msgstr ""
 
 #. Tag: title
@@ -294,12 +402,20 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "AMQP capabilities for <application>libakonadi</application> would enable <application>libakonadi</application> to discover the Akonadi Control Server to use for the new or existing session, enabling one or more Akonadi Control Servers to be deployed with Kolab Groupware."
+msgid ""
+"AMQP capabilities for <application>libakonadi</application> would enable "
+"<application>libakonadi</application> to discover the Akonadi Control Server"
+" to use for the new or existing session, enabling one or more Akonadi "
+"Control Servers to be deployed with Kolab Groupware."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The underlying assumption is scaling up the concept of Akonadi Control Servers as the integration and caching layer for client applications will ultimately cause more than one Akonadi Control Server system to need to be added to the deployment."
+msgid ""
+"The underlying assumption is scaling up the concept of Akonadi Control "
+"Servers as the integration and caching layer for client applications will "
+"ultimately cause more than one Akonadi Control Server system to need to be "
+"added to the deployment."
 msgstr ""
 
 #. Tag: title
@@ -309,7 +425,12 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "AMQP capabilities for Akonadi in general would enable IMAP to push change notifications to Akonadi services including <application>libakonadi</application> even if that means the client library can only pick them up during the first interaction against the client application. Such notifications could include;"
+msgid ""
+"AMQP capabilities for Akonadi in general would enable IMAP to push change "
+"notifications to Akonadi services including "
+"<application>libakonadi</application> even if that means the client library "
+"can only pick them up during the first interaction against the client "
+"application. Such notifications could include;"
 msgstr ""
 
 #. Tag: para
@@ -319,17 +440,27 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "New and/or updated message content (update cache, Free/Busy, or more in general, act accordingly)"
+msgid ""
+"New and/or updated message content (update cache, Free/Busy, or more in "
+"general, act accordingly)"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "These notifications (from Cyrus IMAP) and notifications from Akonadi itself, can remain pending on the messagebus for <application>libakonadi</application> to pick up when users start interacting with client applications."
+msgid ""
+"These notifications (from Cyrus IMAP) and notifications from Akonadi itself,"
+" can remain pending on the messagebus for "
+"<application>libakonadi</application> to pick up when users start "
+"interacting with client applications."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Using a push notification mechanism like this may prove crucial for ActiveSync PUSH mode, or continuously operating web application(s) (PHP FPM, FastCGI) with clients connected through <ulink url=\"http://en.wikipedia.org/wiki/WebSocket\">web sockets</ulink>."
+msgid ""
+"Using a push notification mechanism like this may prove crucial for "
+"ActiveSync PUSH mode, or continuously operating web application(s) (PHP FPM,"
+" FastCGI) with clients connected through <ulink "
+"url=\"http://en.wikipedia.org/wiki/WebSocket\">web sockets</ulink>."
 msgstr ""
 
 #. Tag: title
@@ -339,17 +470,28 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "In scenarios where de-duplication of data is important (i.e. many users, large mailboxes, etc.), the Akonadi Server and Agents would be configured to only obtain and insert into cache relevant metadata about folders and messages."
+msgid ""
+"In scenarios where de-duplication of data is important (i.e. many users, "
+"large mailboxes, etc.), the Akonadi Server and Agents would be configured to"
+" only obtain and insert into cache relevant metadata about folders and "
+"messages."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "It is therefor assumed that, for example, a FETCH of a message is more efficiently executed against IMAP directly, and only complex queries that cannot be answered by IMAP servers efficiently are directed at the Akonadi Server."
+msgid ""
+"It is therefor assumed that, for example, a FETCH of a message is more "
+"efficiently executed against IMAP directly, and only complex queries that "
+"cannot be answered by IMAP servers efficiently are directed at the Akonadi "
+"Server."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Queries that do not need to be executed against an Akonadi Server but are very easily and very efficiently answered by an IMAP server are, for example:"
+msgid ""
+"Queries that do not need to be executed against an Akonadi Server but are "
+"very easily and very efficiently answered by an IMAP server are, for "
+"example:"
 msgstr ""
 
 #. Tag: para
@@ -369,12 +511,19 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The data for the aforelisted commands, which may be presumed to be among the largest amounts of data, does not need to descend client -> ACS -> AS (-> Cache -> AS) -> AA -> IMAP -> AA -> AS (-> Cache -> AS) -> client."
+msgid ""
+"The data for the aforelisted commands, which may be presumed to be among the"
+" largest amounts of data, does not need to descend client -> ACS -> AS"
+" (-> Cache -> AS) -> AA -> IMAP -> AA -> AS (-> Cache "
+"-> AS) -> client."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Commands that are more complex for the IMAP server to answer because of databases maintained on the IMAP server are less ideally suited to answer the command quickly, could include;"
+msgid ""
+"Commands that are more complex for the IMAP server to answer because of "
+"databases maintained on the IMAP server are less ideally suited to answer "
+"the command quickly, could include;"
 msgstr ""
 
 #. Tag: para
@@ -384,7 +533,10 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Commands that are complex for the client to compile an answer for because they would require a number of iterations in order to successfully compile the answer, could include;"
+msgid ""
+"Commands that are complex for the client to compile an answer for because "
+"they would require a number of iterations in order to successfully compile "
+"the answer, could include;"
 msgstr ""
 
 #. Tag: para
@@ -396,4 +548,3 @@ msgstr ""
 #, no-c-format
 msgid "A list of all calendar folders (the user has write access to)."
 msgstr ""
-
diff --git a/Architecture_and_Design/ja-JP/Architecture_and_Design.po b/Architecture_and_Design/ja-JP/Architecture_and_Design.po
index 3aa583f..34f4857 100644
--- a/Architecture_and_Design/ja-JP/Architecture_and_Design.po
+++ b/Architecture_and_Design/ja-JP/Architecture_and_Design.po
@@ -1,14 +1,14 @@
-# 
+#
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:46\n"
+"POT-Creation-Date: 2012-08-24T16:00:09\n"
 "PO-Revision-Date: 2012-08-24T15:34:46\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-
diff --git a/Architecture_and_Design/ja-JP/Archiving_amp_Discovery.po b/Architecture_and_Design/ja-JP/Archiving_amp_Discovery.po
index 90a0dc6..d3fd1e1 100644
--- a/Architecture_and_Design/ja-JP/Archiving_amp_Discovery.po
+++ b/Architecture_and_Design/ja-JP/Archiving_amp_Discovery.po
@@ -1,16 +1,19 @@
-# 
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:46\n"
-"PO-Revision-Date: 2012-08-24T15:34:46\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
+"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
+"PO-Revision-Date: 2012-08-13 13:34+0000\n"
 "Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab/language/ja/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. Tag: title
 #, no-c-format
@@ -61,4 +64,3 @@ msgstr ""
 #, no-c-format
 msgid "Analysis of the Telemetry Log"
 msgstr ""
-
diff --git a/Architecture_and_Design/ja-JP/Authentication_amp_Authorization.po b/Architecture_and_Design/ja-JP/Authentication_amp_Authorization.po
index 9dc6f87..e0a8aaa 100644
--- a/Architecture_and_Design/ja-JP/Authentication_amp_Authorization.po
+++ b/Architecture_and_Design/ja-JP/Authentication_amp_Authorization.po
@@ -1,16 +1,19 @@
-# 
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:46\n"
-"PO-Revision-Date: 2012-08-24T15:34:46\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
+"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
+"PO-Revision-Date: 2012-08-13 12:52+0000\n"
 "Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab/language/ja/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. Tag: title
 #, no-c-format
@@ -49,7 +52,8 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Note that domain.tld is actually a realm in the context of authn. and authz."
+msgid ""
+"Note that domain.tld is actually a realm in the context of authn. and authz."
 msgstr ""
 
 #. Tag: title
@@ -59,12 +63,17 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "primary_domain, default realm, or something derived from other metadata (such as reverse lookup on connection IP address if available)"
+msgid ""
+"primary_domain, default realm, or something derived from other metadata "
+"(such as reverse lookup on connection IP address if available)"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "It is not uncommon to allow a user to login with either of a uid, mail or alias, each either qualified or unqualified (i.e. uid at domain.tld while 'uid' attribute value may only be 'uid')."
+msgid ""
+"It is not uncommon to allow a user to login with either of a uid, mail or "
+"alias, each either qualified or unqualified (i.e. uid at domain.tld while 'uid'"
+" attribute value may only be 'uid')."
 msgstr ""
 
 #. Tag: title
@@ -74,7 +83,11 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "LDAP technologies typically contain a one-way hashed password in the <literal>userPassword</literal> attribute of the corresponding LDAP object. Authentication MAY be performed using any attribute that is globally unique, such as;"
+msgid ""
+"LDAP technologies typically contain a one-way hashed password in the "
+"<literal>userPassword</literal> attribute of the corresponding LDAP object. "
+"Authentication MAY be performed using any attribute that is globally unique,"
+" such as;"
 msgstr ""
 
 #. Tag: para
@@ -84,12 +97,18 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "the <xref linkend=\"form-Architecture_and_Design-Terminology-Naming_Attribute\" /> if enforced to be globally unique or used with search scope ONE,"
+msgid ""
+"the <xref linkend=\"form-Architecture_and_Design-Terminology-"
+"Naming_Attribute\" /> if enforced to be globally unique or used with search "
+"scope ONE,"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "any other attribute that is <emphasis>assumed</emphasis> and/or <emphasis>enforced</emphasis> to be globally unique and/or unique within the search scope."
+msgid ""
+"any other attribute that is <emphasis>assumed</emphasis> and/or "
+"<emphasis>enforced</emphasis> to be globally unique and/or unique within the"
+" search scope."
 msgstr ""
 
 #. Tag: title
@@ -99,7 +118,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The authentication routine against LDAP, when using a username and password, typically is;"
+msgid ""
+"The authentication routine against LDAP, when using a username and password,"
+" typically is;"
 msgstr ""
 
 #. Tag: title
@@ -109,32 +130,61 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The client supplies its <xref linkend=\"form-Architecture_and_Design-Terminology-Authentication_Credentials\" /> in the form of an <xref linkend=\"form-Architecture_and_Design-Terminology-Authentication_Username\" /> and an <xref linkend=\"form-Architecture_and_Design-Terminology-Authentication_Password\" />."
+msgid ""
+"The client supplies its <xref linkend=\"form-Architecture_and_Design-"
+"Terminology-Authentication_Credentials\" /> in the form of an <xref linkend"
+"=\"form-Architecture_and_Design-Terminology-Authentication_Username\" /> and"
+" an <xref linkend=\"form-Architecture_and_Design-Terminology-"
+"Authentication_Password\" />."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Dependent on the server-side settings, as well as the content of the <xref linkend=\"form-Architecture_and_Design-Terminology-Authentication_Credentials\" /> supplied, the server could be configured to, amongst other things;"
+msgid ""
+"Dependent on the server-side settings, as well as the content of the <xref "
+"linkend=\"form-Architecture_and_Design-Terminology-"
+"Authentication_Credentials\" /> supplied, the server could be configured to,"
+" amongst other things;"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "include a configured <xref linkend=\"form-Architecture_and_Design-Terminology-Authentication_Realm\" />,"
+msgid ""
+"include a configured <xref linkend=\"form-Architecture_and_Design-"
+"Terminology-Authentication_Realm\" />,"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "derive the <xref linkend=\"form-Architecture_and_Design-Terminology-Authentication_Domain\" /> and/or <xref linkend=\"form-Architecture_and_Design-Terminology-Authentication_Realm\" /> from the <xref linkend=\"form-Architecture_and_Design-Terminology-Authentication_Username\" /> included,"
+msgid ""
+"derive the <xref linkend=\"form-Architecture_and_Design-Terminology-"
+"Authentication_Domain\" /> and/or <xref linkend=\"form-"
+"Architecture_and_Design-Terminology-Authentication_Realm\" /> from the <xref"
+" linkend=\"form-Architecture_and_Design-Terminology-"
+"Authentication_Username\" /> included,"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The server issues an <xref linkend=\"form-Architecture_and_Design-Terminology-Mailfolder\" /> LDAP for the LDAP object using the configured <xref linkend=\"form-Architecture_and_Design-Terminology-Bind_Credentials\" />, <xref linkend=\"form-Architecture_and_Design-Terminology-Search_Scope\" /> and <xref linkend=\"form-Architecture_and_Design-Terminology-Search_Filter\" />, and using the <xref linkend=\"form-Architecture_and_Design-Terminology-Distinguished_Name\" /> of the LDAP object found, attempts to either <code>bind()</code> or <code>fast_bind()</code> using the distinguished name and the supplied <xref linkend=\"form-Architecture_and_Design-Terminology-Authentication_Password\" />."
+msgid ""
+"The server issues an <xref linkend=\"form-Architecture_and_Design-"
+"Terminology-Mailfolder\" /> LDAP for the LDAP object using the configured "
+"<xref linkend=\"form-Architecture_and_Design-Terminology-Bind_Credentials\" "
+"/>, <xref linkend=\"form-Architecture_and_Design-Terminology-Search_Scope\" "
+"/> and <xref linkend=\"form-Architecture_and_Design-Terminology-"
+"Search_Filter\" />, and using the <xref linkend=\"form-"
+"Architecture_and_Design-Terminology-Distinguished_Name\" /> of the LDAP "
+"object found, attempts to either <code>bind()</code> or "
+"<code>fast_bind()</code> using the distinguished name and the supplied <xref"
+" linkend=\"form-Architecture_and_Design-Terminology-"
+"Authentication_Password\" />."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Address fully qualified vs. unqualified, uid/mail, domain/realm. Also refer to auth mechanisms and ldap server side requirements."
+msgid ""
+"Address fully qualified vs. unqualified, uid/mail, domain/realm. Also refer "
+"to auth mechanisms and ldap server side requirements."
 msgstr ""
 
 #. Tag: title
@@ -144,7 +194,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "TODO - since kerberos is an identity exchange protocol, and not a hmmm list of users and groups for kolab to consume, ..."
+msgid ""
+"TODO - since kerberos is an identity exchange protocol, and not a hmmm list "
+"of users and groups for kolab to consume, ..."
 msgstr ""
 
 #. Tag: title
@@ -154,7 +206,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "TODO - since ssl infrastructure does not provide lists nor group authorization capabilities, kolab must have"
+msgid ""
+"TODO - since ssl infrastructure does not provide lists nor group "
+"authorization capabilities, kolab must have"
 msgstr ""
 
 #. Tag: title
@@ -164,7 +218,8 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "TODO: for more information please see the integration part of this document."
+msgid ""
+"TODO: for more information please see the integration part of this document."
 msgstr ""
 
 #. Tag: title
@@ -271,4 +326,3 @@ msgstr ""
 #, no-c-format
 msgid "Authorization Through Groups"
 msgstr ""
-
diff --git a/Architecture_and_Design/ja-JP/Author_Group.po b/Architecture_and_Design/ja-JP/Author_Group.po
index 8312c51..ab22bb5 100644
--- a/Architecture_and_Design/ja-JP/Author_Group.po
+++ b/Architecture_and_Design/ja-JP/Author_Group.po
@@ -1,13 +1,14 @@
-# 
+#
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:46\n"
+"POT-Creation-Date: 2012-08-24T16:00:09\n"
 "PO-Revision-Date: 2012-08-24T15:34:46\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -46,4 +47,3 @@ msgstr ""
 #, no-c-format
 msgid "Systems Architect"
 msgstr ""
-
diff --git a/Architecture_and_Design/ja-JP/Book_Info.po b/Architecture_and_Design/ja-JP/Book_Info.po
index f8fe4dd..7f80ae8 100644
--- a/Architecture_and_Design/ja-JP/Book_Info.po
+++ b/Architecture_and_Design/ja-JP/Book_Info.po
@@ -1,13 +1,14 @@
-# 
+#
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:46\n"
+"POT-Creation-Date: 2012-08-24T16:00:09\n"
 "PO-Revision-Date: 2012-08-24T15:34:46\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,4 +27,3 @@ msgstr ""
 #, no-c-format
 msgid "This document is the reference to version 3.0 of the Kolab Groupware Solution architecture and design considerations, specifications and implementation details."
 msgstr ""
-
diff --git a/Architecture_and_Design/ja-JP/Calendaring.po b/Architecture_and_Design/ja-JP/Calendaring.po
index d45d53d..1ecc393 100644
--- a/Architecture_and_Design/ja-JP/Calendaring.po
+++ b/Architecture_and_Design/ja-JP/Calendaring.po
@@ -1,16 +1,19 @@
-# 
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:46\n"
-"PO-Revision-Date: 2012-08-24T15:34:46\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
+"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
+"PO-Revision-Date: 2012-08-13 13:33+0000\n"
 "Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab/language/ja/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. Tag: title
 #, no-c-format
@@ -19,6 +22,7 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "This chapter addresses the calendaring aspects of the Kolab Groupware Solution."
+msgid ""
+"This chapter addresses the calendaring aspects of the Kolab Groupware "
+"Solution."
 msgstr ""
-
diff --git a/Architecture_and_Design/ja-JP/Configuration_Management.po b/Architecture_and_Design/ja-JP/Configuration_Management.po
index 1b99cd1..399f966 100644
--- a/Architecture_and_Design/ja-JP/Configuration_Management.po
+++ b/Architecture_and_Design/ja-JP/Configuration_Management.po
@@ -1,16 +1,19 @@
-# 
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:46\n"
-"PO-Revision-Date: 2012-08-24T15:34:46\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
+"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
+"PO-Revision-Date: 2012-08-13 12:52+0000\n"
 "Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab/language/ja/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. Tag: title
 #, no-c-format
@@ -19,12 +22,17 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Kolab Groupware includes configuration management, so that adjusting settings for your environment can be automatically deployed to the relevant configuration files, and the corresponding services can be reloaded or restarted."
+msgid ""
+"Kolab Groupware includes configuration management, so that adjusting "
+"settings for your environment can be automatically deployed to the relevant "
+"configuration files, and the corresponding services can be reloaded or "
+"restarted."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "To that end, Kolab Groupware employs a relational, object-oriented model."
+msgid ""
+"To that end, Kolab Groupware employs a relational, object-oriented model."
 msgstr ""
 
 #. Tag: title
@@ -39,12 +47,18 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "A node is a single operating system instance with a unique fully qualified domain name. It is the container for roles, as each node in a deployment can be assigned one or more roles."
+msgid ""
+"A node is a single operating system instance with a unique fully qualified "
+"domain name. It is the container for roles, as each node in a deployment can"
+" be assigned one or more roles."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Additionally, a node is assigned an <xref linkend=\"form-Architecture_and_Design-Configuration_Management_Objects-environment\" />, in order to facilitate setups with pre-production environments."
+msgid ""
+"Additionally, a node is assigned an <xref linkend=\"form-"
+"Architecture_and_Design-Configuration_Management_Objects-environment\" />, "
+"in order to facilitate setups with pre-production environments."
 msgstr ""
 
 #. Tag: title
@@ -54,12 +68,18 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "A role is a set of tasks to perform in a given environment. For example, a node can be an MTA, or an MTA of a particular type (internal, external)."
+msgid ""
+"A role is a set of tasks to perform in a given environment. For example, a "
+"node can be an MTA, or an MTA of a particular type (internal, external)."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Adding the role \"mta-internal\" to a node tells the configuration management that certain packages need to be installed, certain configuration settings need to be applied to certain files, and certain services need to be started."
+msgid ""
+"Adding the role \"mta-internal\" to a node tells the configuration "
+"management that certain packages need to be installed, certain configuration"
+" settings need to be applied to certain files, and certain services need to "
+"be started."
 msgstr ""
 
 #. Tag: title
@@ -69,7 +89,8 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "A file is related to a service, and contains its configuration settings."
+msgid ""
+"A file is related to a service, and contains its configuration settings."
 msgstr ""
 
 #. Tag: title
@@ -79,17 +100,25 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "A setting is a single key-value pair of the augeas path and the desired contents. The contents can be specified as a value, or as the return value of a function to call."
+msgid ""
+"A setting is a single key-value pair of the augeas path and the desired "
+"contents. The contents can be specified as a value, or as the return value "
+"of a function to call."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "For example, the list of Cyrus IMAP administrator login names is contained within <filename>/etc/imapd.conf</filename>, setting <literal>admins</literal>. Its value is a space-separated list of login names."
+msgid ""
+"For example, the list of Cyrus IMAP administrator login names is contained "
+"within <filename>/etc/imapd.conf</filename>, setting "
+"<literal>admins</literal>. Its value is a space-separated list of login "
+"names."
 msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "(...snip...)\n"
+msgid ""
+"(...snip...)\n"
 "admins: cyrus-admin\n"
 "(...snip...)"
 msgstr ""
@@ -101,27 +130,41 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Removing the setting from the management, and directly editing the setting in <filename>/etc/imapd.conf</filename> adding the login name for the new administrator to the space-seperated list."
+msgid ""
+"Removing the setting from the management, and directly editing the setting "
+"in <filename>/etc/imapd.conf</filename> adding the login name for the new "
+"administrator to the space-seperated list."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Adding the new administrator to the list of login names returned by the function called to get to the value of the setting."
+msgid ""
+"Adding the new administrator to the list of login names returned by the "
+"function called to get to the value of the setting."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "By default, we consider a role <emphasis>cyrus-admins</emphasis> to exist in LDAP, and list the uid attribute values of the accounts with that role."
+msgid ""
+"By default, we consider a role <emphasis>cyrus-admins</emphasis> to exist in"
+" LDAP, and list the uid attribute values of the accounts with that role."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Because a setting can contain a setting specific for a particular role, while contained within the same file, you can associate the setting with one or more roles and thereby restrict its application to nodes with these roles only."
+msgid ""
+"Because a setting can contain a setting specific for a particular role, "
+"while contained within the same file, you can associate the setting with one"
+" or more roles and thereby restrict its application to nodes with these "
+"roles only."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Additionally, settings can vary per environment. Set the environment property on a setting to only apply the setting to nodes in that environment."
+msgid ""
+"Additionally, settings can vary per environment. Set the environment "
+"property on a setting to only apply the setting to nodes in that "
+"environment."
 msgstr ""
 
 #. Tag: title
@@ -161,7 +204,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The main Kolab configuration file is <filename>/etc/kolab/kolab.conf</filename>."
+msgid ""
+"The main Kolab configuration file is "
+"<filename>/etc/kolab/kolab.conf</filename>."
 msgstr ""
 
 #. Tag: title
@@ -171,17 +216,22 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "This does not take into account using POSIX permissions for command-line users using the toolchain."
+msgid ""
+"This does not take into account using POSIX permissions for command-line "
+"users using the toolchain."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The format of the configuration file is the INI format, which consists of the following syntax:"
+msgid ""
+"The format of the configuration file is the INI format, which consists of "
+"the following syntax:"
 msgstr ""
 
 #. Tag: screen
 #, no-c-format
-msgid "[section]\n"
+msgid ""
+"[section]\n"
 "; comment line\n"
 "\n"
 "key1 = value\n"
@@ -191,7 +241,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The configuration file has a mandatory section, <literal>[kolab]</literal>, which controls much of the information to the base of the Kolab deployment."
+msgid ""
+"The configuration file has a mandatory section, <literal>[kolab]</literal>, "
+"which controls much of the information to the base of the Kolab deployment."
 msgstr ""
 
 #. Tag: title
@@ -201,7 +253,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The following is an overview of settings available in the <literal>[kolab]</literal> section:"
+msgid ""
+"The following is an overview of settings available in the "
+"<literal>[kolab]</literal> section:"
 msgstr ""
 
 #. Tag: title
@@ -211,7 +265,10 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The authentication and authorization database technology to use for the primary domain name space in this Kolab deployment. If not set, defaults to a value of 'ldap'."
+msgid ""
+"The authentication and authorization database technology to use for the "
+"primary domain name space in this Kolab deployment. If not set, defaults to "
+"a value of 'ldap'."
 msgstr ""
 
 #. Tag: para
@@ -221,12 +278,17 @@ msgstr ""
 
 #. Tag: title
 #, no-c-format
-msgid "<literal>primary_domain</literal> (<emphasis>constants.domainname</emphasis>)"
+msgid ""
+"<literal>primary_domain</literal> "
+"(<emphasis>constants.domainname</emphasis>)"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The primary domain name space for this Kolab deployment. If not set, defaults to the value of the PyKolab constant <literal>domainname</literal>, which is derived from the system fully qualified domain name."
+msgid ""
+"The primary domain name space for this Kolab deployment. If not set, "
+"defaults to the value of the PyKolab constant <literal>domainname</literal>,"
+" which is derived from the system fully qualified domain name."
 msgstr ""
 
 #. Tag: title
@@ -251,7 +313,10 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Default quota to apply to user mailboxes. Any integer representing a number of kilobytes will do. Defaults to 'None', which is actually to say, no default quota will be applied."
+msgid ""
+"Default quota to apply to user mailboxes. Any integer representing a number "
+"of kilobytes will do. Defaults to 'None', which is actually to say, no "
+"default quota will be applied."
 msgstr ""
 
 #. Tag: title
@@ -261,7 +326,8 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "In which mode the IMAP 'virtual_domains' feature is enabled. Not in use yet."
+msgid ""
+"In which mode the IMAP 'virtual_domains' feature is enabled. Not in use yet."
 msgstr ""
 
 #. Tag: title
@@ -271,17 +337,23 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The primary LDAP settings are contained within this section. The following settings are available:"
+msgid ""
+"The primary LDAP settings are contained within this section. The following "
+"settings are available:"
 msgstr ""
 
 #. Tag: title
 #, no-c-format
-msgid "<literal>ldap_uri</literal> (<emphasis>ldap://localhost:389</emphasis>)"
+msgid ""
+"<literal>ldap_uri</literal> (<emphasis>ldap://localhost:389</emphasis>)"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The URI to the LDAP server. Contains only the scheme ('ldap', 'ldaps'), the LDAP server connection address (an IP address or DNS name), and the port to use."
+msgid ""
+"The URI to the LDAP server. Contains only the scheme ('ldap', 'ldaps'), the "
+"LDAP server connection address (an IP address or DNS name), and the port to "
+"use."
 msgstr ""
 
 #. Tag: title
@@ -291,12 +363,22 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "This setting contains the absolute top-level that Kolab is allowed to use. While most commonly the same value as the root distinguished name (root dn) for the tree, <emphasis>dc=example,dc=org</emphasis> for example, this is not always the case."
+msgid ""
+"This setting contains the absolute top-level that Kolab is allowed to use. "
+"While most commonly the same value as the root distinguished name (root dn) "
+"for the tree, <emphasis>dc=example,dc=org</emphasis> for example, this is "
+"not always the case."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Despite the fact that Kolab can generate a domain-component oriented naming scheme base dn from the domain name space configured as or believed to be the primary domain, Kolab often requires the configuration of the overall base distinguished name (base dn) as LDAP trees may use a non-domain component oriented naming scheme, such as <emphasis>o=organization,c=nl</emphasis>, or use a different level of depth."
+msgid ""
+"Despite the fact that Kolab can generate a domain-component oriented naming "
+"scheme base dn from the domain name space configured as or believed to be "
+"the primary domain, Kolab often requires the configuration of the overall "
+"base distinguished name (base dn) as LDAP trees may use a non-domain "
+"component oriented naming scheme, such as "
+"<emphasis>o=organization,c=nl</emphasis>, or use a different level of depth."
 msgstr ""
 
 #. Tag: title
@@ -306,22 +388,34 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The distinguished name of the account to use for bind operations. This is part of a set of bind credentials used as a last resort only."
+msgid ""
+"The distinguished name of the account to use for bind operations. This is "
+"part of a set of bind credentials used as a last resort only."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "If you have other, more functionally specific bind credentials configured as well, set this to the bind dn which has the least privileges (i.e. an anonymous user)."
+msgid ""
+"If you have other, more functionally specific bind credentials configured as"
+" well, set this to the bind dn which has the least privileges (i.e. an "
+"anonymous user)."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "If you have no other functionally more specific bind credentials configured, set this to the bind dn used to allow the most actions to be executed against the LDAP server, for example <emphasis>cn=Directory Manager</emphasis>."
+msgid ""
+"If you have no other functionally more specific bind credentials configured,"
+" set this to the bind dn used to allow the most actions to be executed "
+"against the LDAP server, for example <emphasis>cn=Directory "
+"Manager</emphasis>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "See <xref linkend=\"sect-Architecture_and_Design-Kolab_Configuration_File-Use_of_Bind_Credentials\" /> for more information on configuring functional specific bind credentials."
+msgid ""
+"See <xref linkend=\"sect-Architecture_and_Design-Kolab_Configuration_File-"
+"Use_of_Bind_Credentials\" /> for more information on configuring functional "
+"specific bind credentials."
 msgstr ""
 
 #. Tag: title
@@ -331,7 +425,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The password corresponding with the bind dn configured in <xref linkend=\"form-Architecture_and_Design-ldap-bind_dn_None\" />."
+msgid ""
+"The password corresponding with the bind dn configured in <xref linkend"
+"=\"form-Architecture_and_Design-ldap-bind_dn_None\" />."
 msgstr ""
 
 #. Tag: title
@@ -341,17 +437,25 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "A comma- or comma-space separated list of entry attribute names of which the value is to be allowed as the login name during authentication."
+msgid ""
+"A comma- or comma-space separated list of entry attribute names of which the"
+" value is to be allowed as the login name during authentication."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "This enables an administrator to allow users to login with their entry's <literal>uid</literal> attribute value, in addition to their entry's <literal>mail</literal> attribute value."
+msgid ""
+"This enables an administrator to allow users to login with their entry's "
+"<literal>uid</literal> attribute value, in addition to their entry's "
+"<literal>mail</literal> attribute value."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Common attribute names in this list include: <literal>alias</literal>, <literal>mail</literal>, <literal>mailAlternateAddress</literal>, <literal>uid</literal>."
+msgid ""
+"Common attribute names in this list include: <literal>alias</literal>, "
+"<literal>mail</literal>, <literal>mailAlternateAddress</literal>, "
+"<literal>uid</literal>."
 msgstr ""
 
 #. Tag: title
@@ -366,7 +470,8 @@ msgstr ""
 
 #. Tag: title
 #, no-c-format
-msgid "<literal>mailserver_attribute</literal> (<emphasis>mailhost</emphasis>)"
+msgid ""
+"<literal>mailserver_attribute</literal> (<emphasis>mailhost</emphasis>)"
 msgstr ""
 
 #. Tag: para
@@ -386,7 +491,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "If not specified, the value of <xref linkend=\"form-Architecture_and_Design-ldap-base_dn_None\" /> is used."
+msgid ""
+"If not specified, the value of <xref linkend=\"form-Architecture_and_Design-"
+"ldap-base_dn_None\" /> is used."
 msgstr ""
 
 #. Tag: title
@@ -406,7 +513,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The RDN attribute name (and value) to use. The value for this configuration setting should use a globally unique attribute."
+msgid ""
+"The RDN attribute name (and value) to use. The value for this configuration "
+"setting should use a globally unique attribute."
 msgstr ""
 
 #. Tag: title
@@ -421,7 +530,8 @@ msgstr ""
 
 #. Tag: title
 #, no-c-format
-msgid "<literal>kolab_user_base_dn</literal> (<emphasis>%(base_dn)s</emphasis>)"
+msgid ""
+"<literal>kolab_user_base_dn</literal> (<emphasis>%(base_dn)s</emphasis>)"
 msgstr ""
 
 #. Tag: para
@@ -431,12 +541,15 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "If not specified, the value of <xref linkend=\"form-Architecture_and_Design-ldap-user_base_dn_base_dns\" /> is used."
+msgid ""
+"If not specified, the value of <xref linkend=\"form-Architecture_and_Design-"
+"ldap-user_base_dn_base_dns\" /> is used."
 msgstr ""
 
 #. Tag: title
 #, no-c-format
-msgid "<literal>kolab_user_filter</literal> (<emphasis>(objectClass=*)</emphasis>)"
+msgid ""
+"<literal>kolab_user_filter</literal> (<emphasis>(objectClass=*)</emphasis>)"
 msgstr ""
 
 #. Tag: para
@@ -456,7 +569,8 @@ msgstr ""
 
 #. Tag: title
 #, no-c-format
-msgid "<literal>special_user_base_dn</literal> (<emphasis>%(base_dn)s</emphasis>)"
+msgid ""
+"<literal>special_user_base_dn</literal> (<emphasis>%(base_dn)s</emphasis>)"
 msgstr ""
 
 #. Tag: para
@@ -466,7 +580,9 @@ msgstr ""
 
 #. Tag: title
 #, no-c-format
-msgid "<literal>special_user_filter</literal> (<emphasis>(objectClass=*)</emphasis>)"
+msgid ""
+"<literal>special_user_filter</literal> "
+"(<emphasis>(objectClass=*)</emphasis>)"
 msgstr ""
 
 #. Tag: para
@@ -511,7 +627,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The RDN attribute to use for groups. This should use a globally unique attribute."
+msgid ""
+"The RDN attribute to use for groups. This should use a globally unique "
+"attribute."
 msgstr ""
 
 #. Tag: title
@@ -536,7 +654,8 @@ msgstr ""
 
 #. Tag: title
 #, no-c-format
-msgid "<literal>domain_filter</literal> (<emphasis>(objectClass=*)</emphasis>)"
+msgid ""
+"<literal>domain_filter</literal> (<emphasis>(objectClass=*)</emphasis>)"
 msgstr ""
 
 #. Tag: para
@@ -556,22 +675,31 @@ msgstr ""
 
 #. Tag: title
 #, no-c-format
-msgid "<literal>domain_name_attribute</literal> (<emphasis>associateddomain</emphasis>)"
+msgid ""
+"<literal>domain_name_attribute</literal> "
+"(<emphasis>associateddomain</emphasis>)"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The naming attribute for domains. Results in the first value of the list of values contained within the attribute values for a single entry to be used as the Relative Distinguished Name (RDN)."
+msgid ""
+"The naming attribute for domains. Results in the first value of the list of "
+"values contained within the attribute values for a single entry to be used "
+"as the Relative Distinguished Name (RDN)."
 msgstr ""
 
 #. Tag: title
 #, no-c-format
-msgid "<literal>domain_rootdn_attribute</literal> (<emphasis>inetdomainbasedn</emphasis>)"
+msgid ""
+"<literal>domain_rootdn_attribute</literal> "
+"(<emphasis>inetdomainbasedn</emphasis>)"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The attribute that contains a reference to the root dn to use for the domain."
+msgid ""
+"The attribute that contains a reference to the root dn to use for the "
+"domain."
 msgstr ""
 
 #. Tag: title
@@ -581,17 +709,28 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The configuration can hold a base distinguished name setting for every type of account or group available in the Kolab deployment."
+msgid ""
+"The configuration can hold a base distinguished name setting for every type "
+"of account or group available in the Kolab deployment."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "When the configuration is used, the Kolab programs attempt to get user or group type specific settings first, and fall back onto the generic setting. When, for example, the base dn for Kolab users is needed, first the setting <literal>kolab_user_base_dn</literal> is obtained from the configuration, and should it not have been configured, it will fall back to using <literal>user_base_dn</literal>. Should that setting also not be available, the program will fall back to using <literal>base_dn</literal>."
+msgid ""
+"When the configuration is used, the Kolab programs attempt to get user or "
+"group type specific settings first, and fall back onto the generic setting. "
+"When, for example, the base dn for Kolab users is needed, first the setting "
+"<literal>kolab_user_base_dn</literal> is obtained from the configuration, "
+"and should it not have been configured, it will fall back to using "
+"<literal>user_base_dn</literal>. Should that setting also not be available, "
+"the program will fall back to using <literal>base_dn</literal>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The configuration for a particular type of user or group primarily serves large LDAP directories."
+msgid ""
+"The configuration for a particular type of user or group primarily serves "
+"large LDAP directories."
 msgstr ""
 
 #. Tag: title
@@ -603,4 +742,3 @@ msgstr ""
 #, no-c-format
 msgid "The configuration can hold a series of bind credentials, ...;"
 msgstr ""
-
diff --git a/Architecture_and_Design/ja-JP/Email.po b/Architecture_and_Design/ja-JP/Email.po
index 6146da7..3d73ce0 100644
--- a/Architecture_and_Design/ja-JP/Email.po
+++ b/Architecture_and_Design/ja-JP/Email.po
@@ -1,16 +1,19 @@
-# 
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:46\n"
-"PO-Revision-Date: 2012-08-24T15:34:46\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
+"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
+"PO-Revision-Date: 2012-08-13 13:34+0000\n"
 "Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab/language/ja/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. Tag: title
 #, no-c-format
@@ -19,7 +22,8 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "This chapter addresses the email aspects of the Kolab Groupware Solution."
+msgid ""
+"This chapter addresses the email aspects of the Kolab Groupware Solution."
 msgstr ""
 
 #. Tag: title
@@ -29,27 +33,39 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Content-filtering is usually performed as close to the outer edge of the corporate network as possible. In reality, content-filtering is typically implemented on any or all of the following mail exchanger types, in order of likelihood;"
+msgid ""
+"Content-filtering is usually performed as close to the outer edge of the "
+"corporate network as possible. In reality, content-filtering is typically "
+"implemented on any or all of the following mail exchanger types, in order of"
+" likelihood;"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Receiving <xref linkend=\"form-Architecture_and_Design-Terminology-External_Mail_Exchanger\" />,"
+msgid ""
+"Receiving <xref linkend=\"form-Architecture_and_Design-Terminology-"
+"External_Mail_Exchanger\" />,"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Sending <xref linkend=\"form-Architecture_and_Design-Terminology-External_Mail_Exchanger\" />,"
+msgid ""
+"Sending <xref linkend=\"form-Architecture_and_Design-Terminology-"
+"External_Mail_Exchanger\" />,"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "<xref linkend=\"form-Architecture_and_Design-Terminology-Internal_Mail_Exchanger\" />,"
+msgid ""
+"<xref linkend=\"form-Architecture_and_Design-Terminology-"
+"Internal_Mail_Exchanger\" />,"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Address content-filtering (where, when, what, enhance, control, audit, report, account)."
+msgid ""
+"Address content-filtering (where, when, what, enhance, control, audit, "
+"report, account)."
 msgstr ""
 
 #. Tag: title
@@ -104,22 +120,44 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "As far as content-filtering is concerned, recipient address checking –verifying whether or not the recipient address exists in any of the groupware environments– is typically triggered as one of the first content-filtering defense mechanisms on an <xref linkend=\"form-Architecture_and_Design-Terminology-External_Mail_Exchanger\" /> —usually only those external mail exchangers of type <xref linkend=\"form-Architecture_and_Design-External_Mail_Exchanger_Types-Receiving\" />."
+msgid ""
+"As far as content-filtering is concerned, recipient address checking "
+"–verifying whether or not the recipient address exists in any of the "
+"groupware environments– is typically triggered as one of the first "
+"content-filtering defense mechanisms on an <xref linkend=\"form-"
+"Architecture_and_Design-Terminology-External_Mail_Exchanger\" /> "
+"—usually only those external mail exchangers of type <xref linkend"
+"=\"form-Architecture_and_Design-External_Mail_Exchanger_Types-Receiving\" "
+"/>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "By implementing recipient address checking as a defense mechanism too early, however, an organization exposes itself to recognaisance attacks; an attacker could, relatively quickly, discover which recipient addresses do and which do not exist."
+msgid ""
+"By implementing recipient address checking as a defense mechanism too early,"
+" however, an organization exposes itself to recognaisance attacks; an "
+"attacker could, relatively quickly, discover which recipient addresses do "
+"and which do not exist."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "There is a significant trade-off to implementing recipient address checking too late, however. All email could have to go through (and pass) the relatively processing intensive anti-spam and anti-virus content filters, offering an attacker opportunity to successfully execute Denial-of-Service attacks."
+msgid ""
+"There is a significant trade-off to implementing recipient address checking "
+"too late, however. All email could have to go through (and pass) the "
+"relatively processing intensive anti-spam and anti-virus content filters, "
+"offering an attacker opportunity to successfully execute Denial-of-Service "
+"attacks."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "It is therefor strongly recommended to implement other defense mechanisms before recipient address checking is performed, such as blacklisting, greylisting, real-time DNS blacklisting and sender address and domain name space verification, and to implement recipient address checking before anti-spam and anti-virus content filtering."
+msgid ""
+"It is therefor strongly recommended to implement other defense mechanisms "
+"before recipient address checking is performed, such as blacklisting, "
+"greylisting, real-time DNS blacklisting and sender address and domain name "
+"space verification, and to implement recipient address checking before anti-"
+"spam and anti-virus content filtering."
 msgstr ""
 
 #. Tag: title
@@ -129,27 +167,42 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "When Kolab Groupware is configured to be responsible for anti-spam content filtering measures –the default– it will choose to use Apache's SpamAssassin software to do so."
+msgid ""
+"When Kolab Groupware is configured to be responsible for anti-spam content "
+"filtering measures –the default– it will choose to use Apache's "
+"SpamAssassin software to do so."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Integration with SpamAssassin comes in different shapes and forms, depending on the technology used and the options chosen."
+msgid ""
+"Integration with SpamAssassin comes in different shapes and forms, depending"
+" on the technology used and the options chosen."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "For example, anti-spam content filtering can be implemented inline, providing opportunity to not accept the email for delivery, inherently holding the sender MTA responsible for the non-delivery report."
+msgid ""
+"For example, anti-spam content filtering can be implemented inline, "
+"providing opportunity to not accept the email for delivery, inherently "
+"holding the sender MTA responsible for the non-delivery report."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Whether or not to use deployment-wide or per-user anti-spam content filtering preferences is another one of such options. This one, however, greatly impacts where exactly anti-spam content filtering may take place."
+msgid ""
+"Whether or not to use deployment-wide or per-user anti-spam content "
+"filtering preferences is another one of such options. This one, however, "
+"greatly impacts where exactly anti-spam content filtering may take place."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "For a more complete reference to email anti-spam techniques, please see <ulink url=\"http://en.wikipedia.org/wiki/Anti-spam_techniques_(e-mail)\">Wikipedia's article on Anti-Spam Techniques</ulink>."
+msgid ""
+"For a more complete reference to email anti-spam techniques, please see "
+"<ulink url=\"http://en.wikipedia.org/wiki/Anti-"
+"spam_techniques_(e-mail)\">Wikipedia's article on Anti-Spam "
+"Techniques</ulink>."
 msgstr ""
 
 #. Tag: title
@@ -169,7 +222,12 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "When implementing greylisting, recipient addresses are first rejected, before being accepted at a later time. To track which email has been greylisted before, and should thus be accepted when retried, a mail exchanger typically maintains an internal database recording three key pieces of information –a so-called <emphasis>triplet</emphasis>:"
+msgid ""
+"When implementing greylisting, recipient addresses are first rejected, "
+"before being accepted at a later time. To track which email has been "
+"greylisted before, and should thus be accepted when retried, a mail "
+"exchanger typically maintains an internal database recording three key "
+"pieces of information –a so-called <emphasis>triplet</emphasis>:"
 msgstr ""
 
 #. Tag: para
@@ -189,22 +247,38 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Naturally, for greylisting policies to work the internal database must also keep record of the timestamp for the delivery attempt rejected."
+msgid ""
+"Naturally, for greylisting policies to work the internal database must also "
+"keep record of the timestamp for the delivery attempt rejected."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Greylisting requires the sender to retry delivery, which is not a RFC requirement until <ulink url=\"http://tools.ietf.org/search/rfc5321\">RFC 5321: \"Simple Mail Transfer Protocol\"</ulink>, which obsoleted <ulink url=\"http://tools.ietf.org/search/rfc821\">RFC 821: \"Simple Mail Transfer Protocol\"</ulink>. RFC 821 had recommended (not required) retrying delivery. Older mailservers may not be in compliance with the new specifications in RFC 5321."
+msgid ""
+"Greylisting requires the sender to retry delivery, which is not a RFC "
+"requirement until <ulink url=\"http://tools.ietf.org/search/rfc5321\">RFC "
+"5321: \"Simple Mail Transfer Protocol\"</ulink>, which obsoleted <ulink "
+"url=\"http://tools.ietf.org/search/rfc821\">RFC 821: \"Simple Mail Transfer "
+"Protocol\"</ulink>. RFC 821 had recommended (not required) retrying "
+"delivery. Older mailservers may not be in compliance with the new "
+"specifications in RFC 5321."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Greylisting introduces a delay in delivery for those \"triplets\" that do not have established use patterns. This may be contrary to what users expect, as most email delivery is virtually instantaneous. For greylisting to work effectively, whitelisting should be used extensively."
+msgid ""
+"Greylisting introduces a delay in delivery for those \"triplets\" that do "
+"not have established use patterns. This may be contrary to what users "
+"expect, as most email delivery is virtually instantaneous. For greylisting "
+"to work effectively, whitelisting should be used extensively."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The former notwithstanding, trusted 3rd parties can be annotated as such by, for example, listing the 3rd party server IP addresses or DNS PTR entry record(s) (by CIDR or regex notation)."
+msgid ""
+"The former notwithstanding, trusted 3rd parties can be annotated as such by,"
+" for example, listing the 3rd party server IP addresses or DNS PTR entry "
+"record(s) (by CIDR or regex notation)."
 msgstr ""
 
 #. Tag: title
@@ -219,7 +293,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "<ulink url=\"http://www.greylisting.org/whitelisting.shtml\">Known servers not compliant with greylisting</ulink>"
+msgid ""
+"<ulink url=\"http://www.greylisting.org/whitelisting.shtml\">Known servers "
+"not compliant with greylisting</ulink>"
 msgstr ""
 
 #. Tag: title
@@ -259,7 +335,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Example, GPG signing without Exchange clients enabled to decrypt / verify signatures - same for S/MIME."
+msgid ""
+"Example, GPG signing without Exchange clients enabled to decrypt / verify "
+"signatures - same for S/MIME."
 msgstr ""
 
 #. Tag: title
@@ -269,7 +347,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "<xref linkend=\"sect-Architecture_and_Design-Integration_amp_Interoperability-SSL_Certificate_Infrastructure\" />"
+msgid ""
+"<xref linkend=\"sect-Architecture_and_Design-"
+"Integration_amp_Interoperability-SSL_Certificate_Infrastructure\" />"
 msgstr ""
 
 #. Tag: title
@@ -279,7 +359,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "TODO - routing mtas as internal mtas. link with archiving and discovery. link with content-filtering. link with accounting."
+msgid ""
+"TODO - routing mtas as internal mtas. link with archiving and discovery. "
+"link with content-filtering. link with accounting."
 msgstr ""
 
 #. Tag: title
@@ -289,7 +371,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "TODO - on shared folders on one groupware environment for clients configured against another groupware environment"
+msgid ""
+"TODO - on shared folders on one groupware environment for clients configured"
+" against another groupware environment"
 msgstr ""
 
 #. Tag: title
@@ -299,11 +383,14 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "TODO - distribution groups between multiple groupware environments, access control."
+msgid ""
+"TODO - distribution groups between multiple groupware environments, access "
+"control."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "<xref linkend=\"chap-Architecture_and_Design-Integration_amp_Interoperability\" />"
+msgid ""
+"<xref linkend=\"chap-Architecture_and_Design-"
+"Integration_amp_Interoperability\" />"
 msgstr ""
-
diff --git a/Architecture_and_Design/ja-JP/Enforcing_Entitlements.po b/Architecture_and_Design/ja-JP/Enforcing_Entitlements.po
index 55747a9..565d946 100644
--- a/Architecture_and_Design/ja-JP/Enforcing_Entitlements.po
+++ b/Architecture_and_Design/ja-JP/Enforcing_Entitlements.po
@@ -1,16 +1,19 @@
-# 
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:46\n"
-"PO-Revision-Date: 2012-08-24T15:34:46\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
+"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
+"PO-Revision-Date: 2012-08-13 12:53+0000\n"
 "Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab/language/ja/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. Tag: title
 #, no-c-format
@@ -19,37 +22,64 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Kolab Groupware is distributed in two different product streams. The community edition is the edition that is supported by the community only, and the enterprise edition, that prior to release has been subject to the necessary Quality Assurance, and is supported by Kolab Systems, for a longer term more appropriate for most businesses, to an extent dependent on the type of Service Level Agreement purchased."
+msgid ""
+"Kolab Groupware is distributed in two different product streams. The "
+"community edition is the edition that is supported by the community only, "
+"and the enterprise edition, that prior to release has been subject to the "
+"necessary Quality Assurance, and is supported by Kolab Systems, for a longer"
+" term more appropriate for most businesses, to an extent dependent on the "
+"type of Service Level Agreement purchased."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Both product streams however are Free Software entirely. The enterprise edition however has restrictions, and is supported only for such and so many users, systems, domains, mailboxes, groups, and other groupware functionality, again depending on the type of Service Level Agreement that has been purchased."
+msgid ""
+"Both product streams however are Free Software entirely. The enterprise "
+"edition however has restrictions, and is supported only for such and so many"
+" users, systems, domains, mailboxes, groups, and other groupware "
+"functionality, again depending on the type of Service Level Agreement that "
+"has been purchased."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "This chapter explains how Kolab Systems enforces entitlements using the enterprise version of its software."
+msgid ""
+"This chapter explains how Kolab Systems enforces entitlements using the "
+"enterprise version of its software."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "It is commonly understood that for Free Software to be released in a fashion that allows the enforcing of entitlements, a version must be released that either;"
+msgid ""
+"It is commonly understood that for Free Software to be released in a fashion"
+" that allows the enforcing of entitlements, a version must be released that "
+"either;"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Itself contains information that allows the program to verify entitlements given a license file. Such program would need to be binary compiled, randomized, and contain a key to unlock the lock on the license file. More importantly, however, the program would need to be proprietary (the <emphasis>Zarafa</emphasis> mechanism)."
+msgid ""
+"Itself contains information that allows the program to verify entitlements "
+"given a license file. Such program would need to be binary compiled, "
+"randomized, and contain a key to unlock the lock on the license file. More "
+"importantly, however, the program would need to be proprietary (the "
+"<emphasis>Zarafa</emphasis> mechanism)."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Phone home, to verify its current status is within the boundaries configured for it, against a piece of infrastructure controlled by the vendor (the <emphasis>Red Hat Network</emphasis> mechanism)."
+msgid ""
+"Phone home, to verify its current status is within the boundaries configured"
+" for it, against a piece of infrastructure controlled by the vendor (the "
+"<emphasis>Red Hat Network</emphasis> mechanism)."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "At Kolab Systems, we don't like either of these options. We have come up with a solution that allows the software to remain Free Software, without requiring systems that have Kolab installed to need to phone home."
+msgid ""
+"At Kolab Systems, we don't like either of these options. We have come up "
+"with a solution that allows the software to remain Free Software, without "
+"requiring systems that have Kolab installed to need to phone home."
 msgstr ""
 
 #. Tag: title
@@ -59,12 +89,19 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "First, we create software repositories in a location that requires the consumer to have been issued a key to the lock. We do this through an SSL certificate infrastructure, for which each consumer that we provide access to the repositories is issued with an SSL Client Certificate."
+msgid ""
+"First, we create software repositories in a location that requires the "
+"consumer to have been issued a key to the lock. We do this through an SSL "
+"certificate infrastructure, for which each consumer that we provide access "
+"to the repositories is issued with an SSL Client Certificate."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "This guarantees us anyone with access to the software repositories (for installation, but for updates as well) is a known customer, and has been issued a certificate with an expiry date, that we can revoke."
+msgid ""
+"This guarantees us anyone with access to the software repositories (for "
+"installation, but for updates as well) is a known customer, and has been "
+"issued a certificate with an expiry date, that we can revoke."
 msgstr ""
 
 #. Tag: title
@@ -74,7 +111,12 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Example entitlements could be, the number of users or groups supported within a Kolab Groupware environment. The information for all of a customer's support entitlement purchases is contained within an entitlements file, which can be supplemented with more entitlements files so that the entitlements can be added up and thus easily extended."
+msgid ""
+"Example entitlements could be, the number of users or groups supported "
+"within a Kolab Groupware environment. The information for all of a "
+"customer's support entitlement purchases is contained within an entitlements"
+" file, which can be supplemented with more entitlements files so that the "
+"entitlements can be added up and thus easily extended."
 msgstr ""
 
 #. Tag: title
@@ -84,22 +126,34 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Knowing each of the customer systems contains a Certificate Authority file, and an SSL Client Certificate, as otherwise the system would not have access to the software repositories for important updates, we can use these existing components to sign and encrypt an entitlement file specific to the customer."
+msgid ""
+"Knowing each of the customer systems contains a Certificate Authority file, "
+"and an SSL Client Certificate, as otherwise the system would not have access"
+" to the software repositories for important updates, we can use these "
+"existing components to sign and encrypt an entitlement file specific to the "
+"customer."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "First, we sign the entitlement file using a Certificate Authority certificate, the same one used to issue and sign the SSL Client Certificate."
+msgid ""
+"First, we sign the entitlement file using a Certificate Authority "
+"certificate, the same one used to issue and sign the SSL Client Certificate."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Second, we encrypt the entitlement file using the SSL Client certificate we have issued to the customer."
+msgid ""
+"Second, we encrypt the entitlement file using the SSL Client certificate we "
+"have issued to the customer."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "This guarantees that the only those can read the contents of the entitlements file, that have obtained the SSL Client Certificate, for which we can verify the signature on the entitlements file."
+msgid ""
+"This guarantees that the only those can read the contents of the "
+"entitlements file, that have obtained the SSL Client Certificate, for which "
+"we can verify the signature on the entitlements file."
 msgstr ""
 
 #. Tag: title
@@ -109,26 +163,50 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The entire infrastructure can be replicated, by anyone, if all the information the system would have is a Certificate Authority, an SSL Client Certificate, and a signed and encrypted entitlements file. It may be relatively hard to reverse engineer the exact contents of the entitlements file, and update the binary compiled code to accept a new set of certificates, but it is certainly possible to achieve."
+msgid ""
+"The entire infrastructure can be replicated, by anyone, if all the "
+"information the system would have is a Certificate Authority, an SSL Client "
+"Certificate, and a signed and encrypted entitlements file. It may be "
+"relatively hard to reverse engineer the exact contents of the entitlements "
+"file, and update the binary compiled code to accept a new set of "
+"certificates, but it is certainly possible to achieve."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Therefor, the components that can enforce the entitlements (for example, the Kolab Daemon) can contain information about the certificates used in the SSL infrastructure. Not to function as a key to a lock, however, but to verify the other information available checks out against what it expects."
+msgid ""
+"Therefor, the components that can enforce the entitlements (for example, the"
+" Kolab Daemon) can contain information about the certificates used in the "
+"SSL infrastructure. Not to function as a key to a lock, however, but to "
+"verify the other information available checks out against what it expects."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "It is safe for software to contain such information, as it is not leaking any information that is not already known to the outside world. However the trick is to not allow this information to be altered or tampered with. More to the point, the trick is to not allow this information to be altered or tampered with in a way that can not be detected."
+msgid ""
+"It is safe for software to contain such information, as it is not leaking "
+"any information that is not already known to the outside world. However the "
+"trick is to not allow this information to be altered or tampered with. More "
+"to the point, the trick is to not allow this information to be altered or "
+"tampered with in a way that can not be detected."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Our enterprise edition therefor ships a binary compiled version of the software that contains this information, so that checksums can be verified upon every support request, and to make it harder to both alter the codebase as well as maintain a patch-set."
+msgid ""
+"Our enterprise edition therefor ships a binary compiled version of the "
+"software that contains this information, so that checksums can be verified "
+"upon every support request, and to make it harder to both alter the codebase"
+" as well as maintain a patch-set."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Of course, it is relatively easy to write down any checksums for files right after installation, and run one's own version. However, running one's own version is still detectable through backtraces, and stack traces. If these are reproduced using an original version of the code, then the support issue is legitimate even if the day-to-day code running the environment is not the same."
+msgid ""
+"Of course, it is relatively easy to write down any checksums for files right"
+" after installation, and run one's own version. However, running one's own "
+"version is still detectable through backtraces, and stack traces. If these "
+"are reproduced using an original version of the code, then the support issue"
+" is legitimate even if the day-to-day code running the environment is not "
+"the same."
 msgstr ""
-
diff --git a/Architecture_and_Design/ja-JP/Feature_FAQ.po b/Architecture_and_Design/ja-JP/Feature_FAQ.po
index 30ea032..d082771 100644
--- a/Architecture_and_Design/ja-JP/Feature_FAQ.po
+++ b/Architecture_and_Design/ja-JP/Feature_FAQ.po
@@ -1,16 +1,19 @@
-# 
 # AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2012-08-24T15:34:46\n"
-"PO-Revision-Date: 2012-08-24T15:34:46\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
+"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
+"POT-Creation-Date: 2012-09-03T11:17:52\n"
+"PO-Revision-Date: 2012-08-13 12:52+0000\n"
 "Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab/language/ja/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. Tag: title
 #, no-c-format
@@ -19,12 +22,16 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Kolab Groupware receives many feature requests, questions about features, and questions as to whether one or the other thing would be possible."
+msgid ""
+"Kolab Groupware receives many feature requests, questions about features, "
+"and questions as to whether one or the other thing would be possible."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "This appendix answers, or at least gives some insight, on the questions asked most frequently regarding features and integration."
+msgid ""
+"This appendix answers, or at least gives some insight, on the questions "
+"asked most frequently regarding features and integration."
 msgstr ""
 
 #. Tag: title
@@ -34,22 +41,34 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "A couple of questions can be answered relatively quickly, by explaining what Kolab Groupware is, and what it is not."
+msgid ""
+"A couple of questions can be answered relatively quickly, by explaining what"
+" Kolab Groupware is, and what it is not."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Kolab Groupware provides the glue between a variety of components that enable users to electronically communicate through email, and manage their lives by providing Calendaring, Tasks, Notes and Journals. It also provides Address Books with specifically individual contact records and distribution lists."
+msgid ""
+"Kolab Groupware provides the glue between a variety of components that "
+"enable users to electronically communicate through email, and manage their "
+"lives by providing Calendaring, Tasks, Notes and Journals. It also provides "
+"Address Books with specifically individual contact records and distribution "
+"lists."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "It is not a document management system, not a work-flow management system, not an audio- nor video-communication platform, and does not include instant messaging nor microblogging capabilities."
+msgid ""
+"It is not a document management system, not a work-flow management system, "
+"not an audio- nor video-communication platform, and does not include instant"
+" messaging nor microblogging capabilities."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "That said, Kolab Groupware can be extended to include the functionality provided by third party applications."
+msgid ""
+"That said, Kolab Groupware can be extended to include the functionality "
+"provided by third party applications."
 msgstr ""
 
 #. Tag: title
@@ -64,12 +83,22 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Kolab Groupware is strongly LDAP-based. For groups of users and organizations alike, including Kolab Groupware deployments for family, small, medium and large enterprises, LDAP often contains much of the information needed for a Global Address Book."
+msgid ""
+"Kolab Groupware is strongly LDAP-based. For groups of users and "
+"organizations alike, including Kolab Groupware deployments for family, "
+"small, medium and large enterprises, LDAP often contains much of the "
+"information needed for a Global Address Book."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The information eligible to be contained within LDAP is tremendous, but Kolab Groupware also includes so-called Contact folders, which contain contacts. Since these folders are available over IMAP, they can be shared and restricted access to just like any other IMAP folder. At your option, you can create and maintain several address books, each (possibly) available to different groups of people."
+msgid ""
+"The information eligible to be contained within LDAP is tremendous, but "
+"Kolab Groupware also includes so-called Contact folders, which contain "
+"contacts. Since these folders are available over IMAP, they can be shared "
+"and restricted access to just like any other IMAP folder. At your option, "
+"you can create and maintain several address books, each (possibly) available"
+" to different groups of people."
 msgstr ""
 
 #. Tag: title
@@ -79,7 +108,10 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Import and export of the data contained within Kolab Groupware is perfectly possible, as it storage format is Open. Our clients include interfaces for data to be imported into and/or exported from Kolab."
+msgid ""
+"Import and export of the data contained within Kolab Groupware is perfectly "
+"possible, as it storage format is Open. Our clients include interfaces for "
+"data to be imported into and/or exported from Kolab."
 msgstr ""
 
 #. Tag: title
@@ -94,7 +126,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Think Akonadi (server-side, client-side), SugarCRM connectors, Kolab, CardDAV, external directory trees (to import / synchronize with)."
+msgid ""
+"Think Akonadi (server-side, client-side), SugarCRM connectors, Kolab, "
+"CardDAV, external directory trees (to import / synchronize with)."
 msgstr ""
 
 #. Tag: title
@@ -114,17 +148,23 @@ msgstr ""
 
 #. Tag: title
 #, no-c-format
-msgid "Does Kolab allow for context-aware integration of contacts into documents?"
+msgid ""
+"Does Kolab allow for context-aware integration of contacts into documents?"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "There's currently no Free Software document editing software with an interface to integrate Kolab contacts (or other sources of contacts for that matter), let alone context-aware."
+msgid ""
+"There's currently no Free Software document editing software with an "
+"interface to integrate Kolab contacts (or other sources of contacts for that"
+" matter), let alone context-aware."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "This seems to be an OLE based, Microsoft Active Directory and Microsoft Office specific feature."
+msgid ""
+"This seems to be an OLE based, Microsoft Active Directory and Microsoft "
+"Office specific feature."
 msgstr ""
 
 #. Tag: para
@@ -144,17 +184,27 @@ msgstr ""
 
 #. Tag: title
 #, no-c-format
-msgid "Does Kolab allow me to define, enforce and provide forms for pre-defined and/or ad-hoc processes, procedures or workflows?"
+msgid ""
+"Does Kolab allow me to define, enforce and provide forms for pre-defined "
+"and/or ad-hoc processes, procedures or workflows?"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Kolab Groupware does not currently provide these capabilities. Think <ulink url=\"http://www.cuteflow-project.org\" /> and/or <ulink url=\"http://freecode.com/projects/processmaker\" />. Consider <ulink url=\"http://www.softwareforenterprise.us/2009/03/13/list-of-top-open-source-bpm-workflow-solution/\" />."
+msgid ""
+"Kolab Groupware does not currently provide these capabilities. Think <ulink "
+"url=\"http://www.cuteflow-project.org\" /> and/or <ulink "
+"url=\"http://freecode.com/projects/processmaker\" />. Consider <ulink "
+"url=\"http://www.softwareforenterprise.us/2009/03/13/list-of-top-open-"
+"source-bpm-workflow-solution/\" />."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Additionally, requests have been made to have workflow management include digital signatures for approval, and prevent the use of media other then digital - at least until processes have been completed."
+msgid ""
+"Additionally, requests have been made to have workflow management include "
+"digital signatures for approval, and prevent the use of media other then "
+"digital - at least until processes have been completed."
 msgstr ""
 
 #. Tag: para
@@ -169,17 +219,26 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "As mentioned before, Kolab does not do workflow management and may need an external application to provide such capabilities - it is therefore also the external application that would need to provide said functionality."
+msgid ""
+"As mentioned before, Kolab does not do workflow management and may need an "
+"external application to provide such capabilities - it is therefore also the"
+" external application that would need to provide said functionality."
 msgstr ""
 
 #. Tag: title
 #, no-c-format
-msgid "Can I have a personalized portal to the Groupware environment / contents / applications?"
+msgid ""
+"Can I have a personalized portal to the Groupware environment / contents / "
+"applications?"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Kontact allows for the customization of one's Summary page, as does Horde allow the user to position and add/remove widgets on it's main page. Roundcube however does not allow for such configuration, and perhaps nor does Kontact Touch."
+msgid ""
+"Kontact allows for the customization of one's Summary page, as does Horde "
+"allow the user to position and add/remove widgets on it's main page. "
+"Roundcube however does not allow for such configuration, and perhaps nor "
+"does Kontact Touch."
 msgstr ""
 
 #. Tag: para
@@ -194,7 +253,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Links to actual documents instead of copies. Think also Document Management Systems. De-duplication."
+msgid ""
+"Links to actual documents instead of copies. Think also Document Management "
+"Systems. De-duplication."
 msgstr ""
 
 #. Tag: title
@@ -204,12 +265,16 @@ msgstr ""
 
 #. Tag: title
 #, no-c-format
-msgid "Can I attach files to electronic messages I send using/through/to/from Kolab?"
+msgid ""
+"Can I attach files to electronic messages I send using/through/to/from "
+"Kolab?"
 msgstr ""
 
 #. Tag: title
 #, no-c-format
-msgid "Is the layout for messages preserved when I send electronic messages using/through/to/from Kolab?"
+msgid ""
+"Is the layout for messages preserved when I send electronic messages "
+"using/through/to/from Kolab?"
 msgstr ""
 
 #. Tag: title
@@ -219,7 +284,10 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Kolab 3.0 can issue signals for events that occur in IMAP, and will be able to issue signals for events that happen in its various server-side components as well."
+msgid ""
+"Kolab 3.0 can issue signals for events that occur in IMAP, and will be able "
+"to issue signals for events that happen in its various server-side "
+"components as well."
 msgstr ""
 
 #. Tag: title
@@ -229,32 +297,48 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Kolab is not a document editor (suite). It requires other components to do document creation and editing. It's possible ensuring the creation of unique documents is something best left to yet another component than is document creation/editing."
+msgid ""
+"Kolab is not a document editor (suite). It requires other components to do "
+"document creation and editing. It's possible ensuring the creation of unique"
+" documents is something best left to yet another component than is document "
+"creation/editing."
 msgstr ""
 
 #. Tag: title
 #, no-c-format
-msgid "Can Kolab create, maintain and provide version control, change history and/or locks on documents?"
+msgid ""
+"Can Kolab create, maintain and provide version control, change history "
+"and/or locks on documents?"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Kolab Groupware is not, nor does it currently integrate with, document creation/editing software nor management systems."
+msgid ""
+"Kolab Groupware is not, nor does it currently integrate with, document "
+"creation/editing software nor management systems."
 msgstr ""
 
 #. Tag: title
 #, no-c-format
-msgid "Can Kolab process, archive, secure documents, and provide an interface to such archive, if any?"
+msgid ""
+"Can Kolab process, archive, secure documents, and provide an interface to "
+"such archive, if any?"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Kolab Groupware can process and archive contents contained within IMAP. As illustrated before, Kolab Groupware does not currently provide interfaces to nor integration with document creation/editing software, nor document management systems, and as such does also not currently process, archive nor have an interface to that data."
+msgid ""
+"Kolab Groupware can process and archive contents contained within IMAP. As "
+"illustrated before, Kolab Groupware does not currently provide interfaces to"
+" nor integration with document creation/editing software, nor document "
+"management systems, and as such does also not currently process, archive nor"
+" have an interface to that data."
 msgstr ""
 
 #. Tag: title
 #, no-c-format
-msgid "Does Kolab allow me to define a free structure in which to contain data?"
+msgid ""
+"Does Kolab allow me to define a free structure in which to contain data?"
 msgstr ""
 
 #. Tag: para
@@ -264,12 +348,15 @@ msgstr ""
 
 #. Tag: title
 #, no-c-format
-msgid "Can Kolab de-duplicate data (attachments, documents) across structures?"
+msgid ""
+"Can Kolab de-duplicate data (attachments, documents) across structures?"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The only de-duplication currently available is on initial message delivery (to the same IMAP server)."
+msgid ""
+"The only de-duplication currently available is on initial message delivery "
+"(to the same IMAP server)."
 msgstr ""
 
 #. Tag: title
@@ -289,22 +376,30 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "At your option, Kolab Groupware can be made to delete data from disk only after a certain period of time, including eternity."
+msgid ""
+"At your option, Kolab Groupware can be made to delete data from disk only "
+"after a certain period of time, including eternity."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Currently no interface exists that discloses the information on disk to a user."
+msgid ""
+"Currently no interface exists that discloses the information on disk to a "
+"user."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "We seek to implement Excellent Archiving and e-Discovery for this purpose (already named \"Bonnie\") instead."
+msgid ""
+"We seek to implement Excellent Archiving and e-Discovery for this purpose "
+"(already named \"Bonnie\") instead."
 msgstr ""
 
 #. Tag: title
 #, no-c-format
-msgid "Does Kolab provide integration of data sources, work-spaces and/or applications?"
+msgid ""
+"Does Kolab provide integration of data sources, work-spaces and/or "
+"applications?"
 msgstr ""
 
 #. Tag: title
@@ -314,12 +409,16 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "One or more calendar is available to the user, permissions can be set on each calendar individually."
+msgid ""
+"One or more calendar is available to the user, permissions can be set on "
+"each calendar individually."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "In Kolab 3.0, calendars and events contained within each calendar can be displayed in Free/Busy under configurable conditions."
+msgid ""
+"In Kolab 3.0, calendars and events contained within each calendar can be "
+"displayed in Free/Busy under configurable conditions."
 msgstr ""
 
 #. Tag: title
@@ -329,7 +428,13 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "At your option, this can be made to happen. A user individually could set their calendar to be available to one or more users, one or more groups, or anyone authenticated to the system, provided they are permitted to 'administer' the calendar. The rights to edit access control on a folder could also be revoked, applying what could arguably be called 'mandatory access control'."
+msgid ""
+"At your option, this can be made to happen. A user individually could set "
+"their calendar to be available to one or more users, one or more groups, or "
+"anyone authenticated to the system, provided they are permitted to "
+"'administer' the calendar. The rights to edit access control on a folder "
+"could also be revoked, applying what could arguably be called 'mandatory "
+"access control'."
 msgstr ""
 
 #. Tag: title
@@ -344,7 +449,11 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Kolab 3.0 can actually make the event details unreadable to other users, literally, while other groupware solutions have its clients respect a private flag (the data can still be read if the client only chooses to ignore the flag)."
+msgid ""
+"Kolab 3.0 can actually make the event details unreadable to other users, "
+"literally, while other groupware solutions have its clients respect a "
+"private flag (the data can still be read if the client only chooses to "
+"ignore the flag)."
 msgstr ""
 
 #. Tag: title
@@ -359,7 +468,11 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "As public folders or shared folders can be spread across multiple servers, there's no restriction on the number of, or size of, or number of transactions per second against, public or shared folders (other then int64_t)."
+msgid ""
+"As public folders or shared folders can be spread across multiple servers, "
+"there's no restriction on the number of, or size of, or number of "
+"transactions per second against, public or shared folders (other then "
+"int64_t)."
 msgstr ""
 
 #. Tag: title
@@ -369,7 +482,10 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "What is the use-case here? Read-only access is insufficient? Perhaps the number of calendars would otherwise convulate one's interface. We have no read-only nor linked (copied) events within a read-write calendar folder."
+msgid ""
+"What is the use-case here? Read-only access is insufficient? Perhaps the "
+"number of calendars would otherwise convulate one's interface. We have no "
+"read-only nor linked (copied) events within a read-write calendar folder."
 msgstr ""
 
 #. Tag: title
@@ -379,12 +495,17 @@ msgstr ""
 
 #. Tag: title
 #, no-c-format
-msgid "Does Kolab provide links to documents and other content in its Calendaring?"
+msgid ""
+"Does Kolab provide links to documents and other content in its Calendaring?"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The way Kolab Groupware stores information related to events is through attachments contained within the same RFC822 message as the event. It currently has no linking / reference capabilities (to data contained within nor external to Kolab Groupware)."
+msgid ""
+"The way Kolab Groupware stores information related to events is through "
+"attachments contained within the same RFC822 message as the event. It "
+"currently has no linking / reference capabilities (to data contained within "
+"nor external to Kolab Groupware)."
 msgstr ""
 
 #. Tag: title
@@ -394,12 +515,17 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Think basic Kolab Tasks folders containing individual tasks with sub-tasks, each of which can have an assignee, without or without \\Seen state maintained in a fashion shared across all users, IMAP access control, etc."
+msgid ""
+"Think basic Kolab Tasks folders containing individual tasks with sub-tasks, "
+"each of which can have an assignee, without or without \\Seen state "
+"maintained in a fashion shared across all users, IMAP access control, etc."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "For Kolab 3.0, also think Zanshin, conversations (and thus project management - but no reporting)."
+msgid ""
+"For Kolab 3.0, also think Zanshin, conversations (and thus project "
+"management - but no reporting)."
 msgstr ""
 
 #. Tag: title
@@ -409,12 +535,19 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Whether users are eligible to read/write tasks is (currently) a matter of IMAP folder permissions, not whether the user is the actual creator/assignee of any of the tasks contained within such a folder."
+msgid ""
+"Whether users are eligible to read/write tasks is (currently) a matter of "
+"IMAP folder permissions, not whether the user is the actual creator/assignee"
+" of any of the tasks contained within such a folder."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Read permissions on the IMAP folder currently include disclosure of the full task details. Think private annotations to render a Task private, though, but such happens on an individual user basis (i.e. not per permission group)."
+msgid ""
+"Read permissions on the IMAP folder currently include disclosure of the full"
+" task details. Think private annotations to render a Task private, though, "
+"but such happens on an individual user basis (i.e. not per permission "
+"group)."
 msgstr ""
 
 #. Tag: title
@@ -429,7 +562,9 @@ msgstr ""
 
 #. Tag: title
 #, no-c-format
-msgid "Does the task management allow for (estimated) durations / due dates / deadlines / reminders?"
+msgid ""
+"Does the task management allow for (estimated) durations / due dates / "
+"deadlines / reminders?"
 msgstr ""
 
 #. Tag: para
@@ -444,7 +579,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Linked, no. Associated (requires client capabilities to deal with it), yes (provided conversations or format extension/implementation)."
+msgid ""
+"Linked, no. Associated (requires client capabilities to deal with it), yes "
+"(provided conversations or format extension/implementation)."
 msgstr ""
 
 #. Tag: title
@@ -454,7 +591,11 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The way Kolab Groupware stores information related to tasks is through attachments contained within the same RFC822 message as the event. It currently has no linking / reference capabilities (to data contained within nor external to Kolab Groupware)."
+msgid ""
+"The way Kolab Groupware stores information related to tasks is through "
+"attachments contained within the same RFC822 message as the event. It "
+"currently has no linking / reference capabilities (to data contained within "
+"nor external to Kolab Groupware)."
 msgstr ""
 
 #. Tag: title
@@ -484,7 +625,10 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The exact implementation details may be subject to the extent to which one or more of the \"multiple sources\" are external. If contained within Kolab, the answer is \"yes\"."
+msgid ""
+"The exact implementation details may be subject to the extent to which one "
+"or more of the \"multiple sources\" are external. If contained within Kolab,"
+" the answer is \"yes\"."
 msgstr ""
 
 #. Tag: title
@@ -494,7 +638,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Think statusnet (identi.ca) software for microblogging, and/or XMPP/IRC for full chatting capabilities."
+msgid ""
+"Think statusnet (identi.ca) software for microblogging, and/or XMPP/IRC for "
+"full chatting capabilities."
 msgstr ""
 
 #. Tag: title
@@ -504,7 +650,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Yes, for the most part. Statusnet though may not allow user/group access control for microblog-like short messages."
+msgid ""
+"Yes, for the most part. Statusnet though may not allow user/group access "
+"control for microblog-like short messages."
 msgstr ""
 
 #. Tag: title
@@ -524,17 +672,22 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "This is an instant messaging capability more so then a Kolab (IMAP) capability. Also relates to Voice and Video."
+msgid ""
+"This is an instant messaging capability more so then a Kolab (IMAP) "
+"capability. Also relates to Voice and Video."
 msgstr ""
 
 #. Tag: title
 #, no-c-format
-msgid "Can a user change / indicate their own status/availability information?"
+msgid ""
+"Can a user change / indicate their own status/availability information?"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Currently not a Kolab capability, more to instant messaging, voice and video."
+msgid ""
+"Currently not a Kolab capability, more to instant messaging, voice and "
+"video."
 msgstr ""
 
 #. Tag: title
@@ -544,12 +697,18 @@ msgstr ""
 
 #. Tag: title
 #, no-c-format
-msgid "Can users send or make available documents outside of any application structure?"
+msgid ""
+"Can users send or make available documents outside of any application "
+"structure?"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "We only deal with attachments at the moment, and we have little opportunity to strip attachments, make them available somewhere (through external storage), set the correct permissions on them, or check contents vs. access control policies (Data-Loss Prevention)."
+msgid ""
+"We only deal with attachments at the moment, and we have little opportunity "
+"to strip attachments, make them available somewhere (through external "
+"storage), set the correct permissions on them, or check contents vs. access "
+"control policies (Data-Loss Prevention)."
 msgstr ""
 
 #. Tag: title
@@ -619,7 +778,9 @@ msgstr ""
 
 #. Tag: title
 #, no-c-format
-msgid "Do users have access to start video-based communication in the Address Book(s), Calendars, Websites, ...?"
+msgid ""
+"Do users have access to start video-based communication in the Address "
+"Book(s), Calendars, Websites, ...?"
 msgstr ""
 
 #. Tag: title
@@ -629,7 +790,9 @@ msgstr ""
 
 #. Tag: title
 #, no-c-format
-msgid "Does Kolab integrate audio communication into Address Book(s), Calendaring, Websites, ...?"
+msgid ""
+"Does Kolab integrate audio communication into Address Book(s), Calendaring, "
+"Websites, ...?"
 msgstr ""
 
 #. Tag: title
@@ -664,7 +827,9 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Keep in mind details may include a series of parameters to a resource or group of resources (car is automatic, beamer is HDMI/VGA/PAL, etc.)."
+msgid ""
+"Keep in mind details may include a series of parameters to a resource or "
+"group of resources (car is automatic, beamer is HDMI/VGA/PAL, etc.)."
 msgstr ""
 
 #. Tag: title
@@ -679,17 +844,23 @@ msgstr ""
 
 #. Tag: title
 #, no-c-format
-msgid "Does Kolab allow for resources to be bound to a specific location / physical proximity of the user?"
+msgid ""
+"Does Kolab allow for resources to be bound to a specific location / physical"
+" proximity of the user?"
 msgstr ""
 
 #. Tag: title
 #, no-c-format
-msgid "Does Kolab allow for centralized administration of user roles and permissions?"
+msgid ""
+"Does Kolab allow for centralized administration of user roles and "
+"permissions?"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Think also; mandatory access control plugins (LDAP Schema Extension, interface thereto, application to IMAP (and other resources))."
+msgid ""
+"Think also; mandatory access control plugins (LDAP Schema Extension, "
+"interface thereto, application to IMAP (and other resources))."
 msgstr ""
 
 #. Tag: title
@@ -709,12 +880,15 @@ msgstr ""
 
 #. Tag: title
 #, no-c-format
-msgid "Does Kolab provide document versioning, approval, change notifications?"
+msgid ""
+"Does Kolab provide document versioning, approval, change notifications?"
 msgstr ""
 
 #. Tag: title
 #, no-c-format
-msgid "Does Kolab provide easy to use, comprehensive and accurate search functionality?"
+msgid ""
+"Does Kolab provide easy to use, comprehensive and accurate search "
+"functionality?"
 msgstr ""
 
 #. Tag: para
@@ -724,7 +898,8 @@ msgstr ""
 
 #. Tag: title
 #, no-c-format
-msgid "Does Kolab provide a coherent approach to information technology security?"
+msgid ""
+"Doe