From e019f2d0f2dc2fbfa345ab5d7ae85e67bfdd76b8 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 25 Sep 2010 09:03:53 -0400
Subject: [PATCH] - s/RoundCube/Roundcube/

---
 INSTALL                                    |    4 
 program/localization/cy_GB/labels.inc      |    4 
 program/localization/hy_AM/labels.inc      |    4 
 program/localization/de_CH/messages.inc    |    4 
 skins/default/mail.css                     |    2 
 program/include/rcube_session.php          |    4 
 program/localization/it_IT/labels.inc      |    4 
 program/localization/sr_CS/messages.inc    |    4 
 program/localization/el_GR/messages.inc    |    4 
 program/localization/ka_GE/labels.inc      |    4 
 program/steps/settings/delete_identity.inc |    4 
 program/localization/is_IS/labels.inc      |    4 
 program/localization/da_DK/labels.inc      |    4 
 program/localization/ja_JP/labels.inc      |    4 
 program/localization/cs_CZ/labels.inc      |    4 
 program/localization/fa/labels.inc         |    4 
 program/localization/kh_KH/messages.inc    |    2 
 program/steps/addressbook/copy.inc         |    4 
 program/localization/nb_NO/messages.inc    |    4 
 program/localization/az_AZ/labels.inc      |    4 
 program/localization/pt_BR/messages.inc    |    4 
 program/include/rcube_user.php             |    4 
 program/localization/ne_NP/messages.inc    |    6 
 program/localization/ka_GE/messages.inc    |    4 
 program/include/rcube_addressbook.php      |    4 
 program/localization/nb_NO/labels.inc      |    4 
 program/steps/utils/error.inc              |    6 
 program/localization/en_US/messages.inc    |    4 
 SQL/mysql.initial.sql                      |    2 
 program/js/app.js                          |    8 
 program/steps/addressbook/search.inc       |    4 
 program/steps/addressbook/list.inc         |    4 
 bin/decrypt.sh                             |    4 
 program/localization/id_ID/messages.inc    |    4 
 program/localization/az_AZ/messages.inc    |    4 
 program/localization/nn_NO/messages.inc    |    4 
 program/localization/sk_SK/labels.inc      |    4 
 program/localization/ta_IN/labels.inc      |    4 
 program/localization/ro_RO/labels.inc      |    4 
 program/localization/en_GB/labels.inc      |    4 
 program/localization/cy_GB/messages.inc    |    4 
 program/localization/fa/messages.inc       |    4 
 program/localization/mr_IN/messages.inc    |    4 
 program/js/list.js                         |    8 
 program/localization/gl_ES/messages.inc    |    4 
 program/steps/settings/edit_prefs.inc      |    4 
 program/localization/mr_IN/labels.inc      |    4 
 program/steps/utils/save_pref.inc          |    4 
 program/localization/he_IL/messages.inc    |    4 
 program/include/rcube_message.php          |    4 
 program/steps/mail/sendmail.inc            |    4 
 program/localization/uk_UA/labels.inc      |    4 
 program/localization/eu_ES/labels.inc      |    4 
 program/localization/hu_HU/messages.inc    |    4 
 program/localization/et_EE/labels.inc      |    4 
 program/localization/pt_PT/labels.inc      |    4 
 installer/config.php                       |    6 
 SQL/postgres.update.sql                    |    2 
 program/localization/pl_PL/messages.inc    |    4 
 skins/default/functions.js                 |    2 
 program/localization/el_GR/labels.inc      |    4 
 program/localization/ru_RU/messages.inc    |    4 
 program/localization/hr_HR/labels.inc      |    4 
 program/localization/index.inc             |    4 
 program/js/common.js                       |    8 
 program/steps/addressbook/mailto.inc       |    4 
 program/steps/mail/show.inc                |    4 
 installer/welcome.html                     |    4 
 program/localization/de_CH/labels.inc      |    4 
 program/localization/ast/labels.inc        |    4 
 program/localization/br/messages.inc       |    4 
 skins/default/splitter.js                  |    2 
 program/steps/utils/html2text.inc          |    4 
 program/localization/vi_VN/labels.inc      |    4 
 program/localization/ms_MY/messages.inc    |    4 
 program/localization/sv_SE/labels.inc      |    4 
 program/include/rcube_smtp.php             |    4 
 program/localization/sr_CS/labels.inc      |    4 
 program/localization/he_IL/labels.inc      |    4 
 program/localization/vi_VN/messages.inc    |    4 
 program/steps/utils/spell_googie.inc       |    4 
 program/steps/addressbook/groups.inc       |    4 
 program/localization/sq_AL/messages.inc    |    4 
 program/localization/zh_CN/messages.inc    |    4 
 program/steps/mail/attachments.inc         |    4 
 program/localization/bs_BA/labels.inc      |    4 
 program/steps/mail/getunread.inc           |    4 
 program/localization/th_TH/labels.inc      |    4 
 SQL/postgres.initial.sql                   |    2 
 program/localization/ga_IE/messages.inc    |    4 
 program/localization/hi_IN/labels.inc      |    4 
 program/localization/eo/labels.inc         |    4 
 program/include/rcube_contacts.php         |    4 
 skins/default/common.css                   |    2 
 installer/check.php                        |    6 
 program/localization/mk_MK/messages.inc    |    4 
 program/localization/da_DK/messages.inc    |    4 
 program/localization/pt_BR/labels.inc      |    4 
 program/steps/mail/folders.inc             |    4 
 program/include/rcube_result_set.php       |    6 
 program/localization/it_IT/messages.inc    |    4 
 program/localization/ar_SA/messages.inc    |    4 
 program/localization/ta_IN/messages.inc    |    4 
 bin/dumpschema.sh                          |    4 
 program/localization/kh_KH/labels.inc      |    2 
 program/steps/mail/addcontact.inc          |    4 
 program/localization/eo/messages.inc       |    4 
 program/steps/addressbook/save.inc         |    4 
 program/localization/fi_FI/messages.inc    |    4 
 program/steps/settings/save_identity.inc   |    4 
 program/include/rcube_browser.php          |    4 
 program/steps/settings/edit_identity.inc   |    4 
 program/localization/is_IS/messages.inc    |    4 
 program/include/rcube_imap.php             |    4 
 program/localization/hu_HU/labels.inc      |    4 
 program/localization/si_LK/labels.inc      |    4 
 program/include/rcube_vcard.php            |    4 
 program/localization/en_US/labels.inc      |    4 
 program/localization/tr_TR/labels.inc      |    4 
 program/steps/mail/get.inc                 |    4 
 program/localization/zh_CN/labels.inc      |    4 
 program/include/rcube_imap_generic.php     |    4 
 program/localization/bg_BG/labels.inc      |    4 
 bin/update.sh                              |    4 
 program/localization/fr_FR/labels.inc      |    4 
 program/include/main.inc                   |    6 
 program/localization/bs_BA/messages.inc    |    4 
 program/steps/addressbook/delete.inc       |    4 
 program/steps/settings/manage_folders.inc  |    4 
 program/localization/ko_KR/messages.inc    |    4 
 program/localization/ca_ES/labels.inc      |    4 
 program/include/rcube_plugin.php           |    4 
 program/localization/es_AR/messages.inc    |    4 
 program/localization/ast/messages.inc      |    4 
 SQL/sqlite.update.sql                      |    2 
 program/steps/settings/func.inc            |    4 
 program/localization/eu_ES/messages.inc    |    4 
 program/localization/de_DE/messages.inc    |    4 
 program/include/html.php                   |    4 
 installer/utils.php                        |    4 
 program/include/rcube_ldap.php             |    4 
 program/include/rcube_string_replacer.php  |    4 
 program/steps/mail/viewsource.inc          |    4 
 program/localization/nl_NL/labels.inc      |    4 
 program/include/rcube_config.php           |    6 
 program/localization/sv_SE/messages.inc    |    4 
 program/steps/settings/save_prefs.inc      |    4 
 program/localization/es_AR/labels.inc      |    4 
 program/localization/lt_LT/labels.inc      |    4 
 program/steps/mail/copy.inc                |    4 
 program/steps/mail/move_del.inc            |    4 
 program/include/rcube_mdb2.php             |    4 
 program/steps/mail/list.inc                |    4 
 program/localization/sk_SK/messages.inc    |    4 
 program/localization/pt_PT/messages.inc    |    4 
 program/localization/bn_BD/labels.inc      |    4 
 program/localization/sl_SI/messages.inc    |    2 
 program/localization/fr_FR/messages.inc    |    4 
 program/localization/nl_BE/labels.inc      |    4 
 program/localization/ko_KR/labels.inc      |    4 
 config/db.inc.php.dist                     |    4 
 program/include/rcube_json_output.php      |    4 
 program/include/rcube_mime_struct.php      |    4 
 SQL/mysql.update.sql                       |    2 
 program/localization/es_ES/labels.inc      |    4 
 tests/runtests.sh                          |    6 
 program/localization/ja_JP/messages.inc    |    4 
 program/localization/zh_TW/messages.inc    |    4 
 program/steps/utils/modcss.inc             |    4 
 program/include/rcube_shared.inc           |    6 
 program/steps/utils/spell_pspell.inc       |    2 
 program/localization/ne_NP/labels.inc      |    6 
 program/localization/ms_MY/labels.inc      |    4 
 program/localization/cs_CZ/messages.inc    |    4 
 program/steps/mail/check_recent.inc        |    4 
 program/localization/ga_IE/labels.inc      |    4 
 program/localization/ku/messages.inc       |    4 
 program/localization/ru_RU/labels.inc      |    4 
 program/localization/nn_NO/labels.inc      |    4 
 program/localization/ca_ES/messages.inc    |    4 
 skins/default/print.css                    |    2 
 program/localization/et_EE/messages.inc    |    4 
 program/localization/en_GB/messages.inc    |    4 
 program/localization/br/labels.inc         |    4 
 program/localization/lt_LT/messages.inc    |    4 
 program/steps/addressbook/func.inc         |    4 
 program/localization/ro_RO/messages.inc    |    4 
 program/localization/gl_ES/labels.inc      |    4 
 program/steps/mail/autocomplete.inc        |    4 
 program/localization/bg_BG/messages.inc    |    4 
 program/localization/hy_AM/messages.inc    |    4 
 program/localization/uk_UA/messages.inc    |    4 
 program/localization/ar_SA/labels.inc      |    4 
 program/localization/id_ID/labels.inc      |    4 
 program/steps/mail/compose.inc             |    4 
 program/steps/utils/spell_html_googie.inc  |    4 
 program/js/editor.js                       |    6 
 program/localization/hi_IN/messages.inc    |    4 
 program/localization/mk_MK/labels.inc      |    4 
 program/localization/de_DE/labels.inc      |    4 
 index.php                                  |   10 
 installer/rcube_install.php                |   14 
 program/localization/th_TH/messages.inc    |    4 
 bin/cleandb.sh                             |    4 
 program/localization/si_LK/messages.inc    |    4 
 program/localization/tr_TR/messages.inc    |    4 
 program/steps/addressbook/show.inc         |    4 
 program/localization/pl_PL/labels.inc      |    4 
 program/steps/mail/mark.inc                |    4 
 program/steps/utils/killcache.inc          |    4 
 program/steps/settings/identities.inc      |    4 
 CHANGELOG                                  |    2 
 program/lib/utf8.class.php                 |    2 
 config/main.inc.php.dist                   |   14 
 program/steps/utils/spell.inc              |    2 
 program/steps/mail/headers.inc             |    4 
 program/steps/mail/sendmdn.inc             |    4 
 program/steps/addressbook/import.inc       |    4 
 tests/src/htmlbody.txt                     |    2 
 program/include/rcube_sqlite.inc           |    4 
 program/localization/bn_BD/messages.inc    |    4 
 program/localization/sl_SI/labels.inc      |    4 
 program/localization/es_ES/messages.inc    |    4 
 program/localization/ku/labels.inc         |    4 
 installer/index.php                        |    8 
 program/include/rcube_html_page.php        |    6 
 program/localization/sq_AL/labels.inc      |    4 
 program/localization/nl_NL/messages.inc    |    4 
 program/localization/nl_BE/messages.inc    |    4 
 skins/default/addressbook.css              |    2 
 program/include/iniset.php                 |    4 
 program/localization/lv_LV/messages.inc    |    4 
 program/localization/zh_TW/labels.inc      |    4 
 program/steps/mail/func.inc                |    6 
 installer/test.php                         |    6 
 program/steps/addressbook/export.inc       |    4 
 program/include/rcube_plugin_api.php       |    4 
 program/steps/addressbook/edit.inc         |    4 
 program/localization/hr_HR/messages.inc    |    4 
 SQL/sqlite.initial.sql                     |    2 
 program/steps/utils/spell_html_pspell.inc  |    4 
 program/localization/fi_FI/labels.inc      |    4 
 program/localization/lv_LV/labels.inc      |    4 
 skins/default/settings.css                 |    2 
 program/include/rcmail.php                 |    8 
 program/include/rcube_template.php         |    6 
 SQL/mssql.upgrade.sql                      |    2 
 247 files changed, 510 insertions(+), 510 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 1efdea1..6281b82 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-CHANGELOG RoundCube Webmail
+CHANGELOG Roundcube Webmail
 ===========================
 
 - Prevent from saving a non-existing skin path in user prefs (#1486936)
diff --git a/INSTALL b/INSTALL
index 19a9aa5..534eac6 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
 INTRODUCTION
 ============
 
-This file describes the basic steps to install RoundCube Webmail on your
+This file describes the basic steps to install Roundcube Webmail on your
 web server. For additional information, please also consult the project's
 wiki page at http://trac.roundcube.net/wiki
 
@@ -42,7 +42,7 @@
    are writable by the webserver
    - /temp
    - /logs
-3. Create a new database and a database user for RoundCube (see DATABASE SETUP)
+3. Create a new database and a database user for Roundcube (see DATABASE SETUP)
 4. Point your browser to http://url-to-roundcube/installer/
 5. Follow the instructions of the install script (or see MANUAL CONFIGURATION)
 6. After creating and testing the configuration, remove the installer directory
diff --git a/SQL/mssql.upgrade.sql b/SQL/mssql.upgrade.sql
index ef29a39..1aa771b 100644
--- a/SQL/mssql.upgrade.sql
+++ b/SQL/mssql.upgrade.sql
@@ -1,4 +1,4 @@
--- RoundCube Webmail update script for MSSQL databases
+-- Roundcube Webmail update script for MSSQL databases
 
 -- Updates from version 0.3.1
 
diff --git a/SQL/mysql.initial.sql b/SQL/mysql.initial.sql
index 08f7d93..fdab115 100644
--- a/SQL/mysql.initial.sql
+++ b/SQL/mysql.initial.sql
@@ -1,4 +1,4 @@
--- RoundCube Webmail initial database structure
+-- Roundcube Webmail initial database structure
 
 
 /*!40014  SET FOREIGN_KEY_CHECKS=0 */;
diff --git a/SQL/mysql.update.sql b/SQL/mysql.update.sql
index 739a3d8..28ebf6f 100644
--- a/SQL/mysql.update.sql
+++ b/SQL/mysql.update.sql
@@ -1,4 +1,4 @@
--- RoundCube Webmail update script for MySQL databases
+-- Roundcube Webmail update script for MySQL databases
 
 -- Updates from version 0.1-stable
 
diff --git a/SQL/postgres.initial.sql b/SQL/postgres.initial.sql
index e57a706..ac59efb 100644
--- a/SQL/postgres.initial.sql
+++ b/SQL/postgres.initial.sql
@@ -1,4 +1,4 @@
--- RoundCube Webmail initial database structure
+-- Roundcube Webmail initial database structure
 
 --
 -- Sequence "user_ids"
diff --git a/SQL/postgres.update.sql b/SQL/postgres.update.sql
index bbfbcc9..1ef93d8 100644
--- a/SQL/postgres.update.sql
+++ b/SQL/postgres.update.sql
@@ -1,4 +1,4 @@
--- RoundCube Webmail update script for Postgres databases
+-- Roundcube Webmail update script for Postgres databases
 -- Updates from version 0.1-stable to 0.1.1
 
 CREATE INDEX cache_user_id_idx ON cache (user_id, cache_key);
diff --git a/SQL/sqlite.initial.sql b/SQL/sqlite.initial.sql
index 8565eae..e7faeed 100644
--- a/SQL/sqlite.initial.sql
+++ b/SQL/sqlite.initial.sql
@@ -1,4 +1,4 @@
--- RoundCube Webmail initial database structure
+-- Roundcube Webmail initial database structure
 
 -- 
 -- Table structure for table `cache`
diff --git a/SQL/sqlite.update.sql b/SQL/sqlite.update.sql
index f2977ef..2db7821 100644
--- a/SQL/sqlite.update.sql
+++ b/SQL/sqlite.update.sql
@@ -1,4 +1,4 @@
--- RoundCube Webmail update script for SQLite databases
+-- Roundcube Webmail update script for SQLite databases
 -- Updates from version 0.1-stable to 0.1.1
 
 DROP TABLE messages;
diff --git a/bin/cleandb.sh b/bin/cleandb.sh
index 5174644..8124d2c 100755
--- a/bin/cleandb.sh
+++ b/bin/cleandb.sh
@@ -5,8 +5,8 @@
  +-----------------------------------------------------------------------+
  | bin/cleandb.sh                                                        |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2010, RoundCube Dev. - Switzerland                      |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2010, Roundcube Dev. - Switzerland                      |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/bin/decrypt.sh b/bin/decrypt.sh
index 51a89e9..95f1653 100755
--- a/bin/decrypt.sh
+++ b/bin/decrypt.sh
@@ -5,8 +5,8 @@
  +-----------------------------------------------------------------------+
  | bin/decrypt.sh                                                        |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/bin/dumpschema.sh b/bin/dumpschema.sh
index 5afcb7c..13b1562 100755
--- a/bin/dumpschema.sh
+++ b/bin/dumpschema.sh
@@ -5,8 +5,8 @@
  +-----------------------------------------------------------------------+
  | bin/dumpschema.sh                                                     |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/bin/update.sh b/bin/update.sh
index 2d59b26..5f4e3f2 100755
--- a/bin/update.sh
+++ b/bin/update.sh
@@ -124,12 +124,12 @@
   
   
   if ($success) {
-    echo "This instance of RoundCube is up-to-date.\n";
+    echo "This instance of Roundcube is up-to-date.\n";
     echo "Have fun!\n";
   }
 }
 else {
-  echo "This instance of RoundCube is not yet configured!\n";
+  echo "This instance of Roundcube is not yet configured!\n";
   echo "Open http://url-to-roundcube/installer/ in your browser and follow the instuctions.\n";
 }
 
diff --git a/config/db.inc.php.dist b/config/db.inc.php.dist
index 3137e51..e8938a1 100644
--- a/config/db.inc.php.dist
+++ b/config/db.inc.php.dist
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | Configuration file for database access                                |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index e036395..c0c2b03 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | Main configuration file                                               |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
@@ -105,11 +105,11 @@
 // SMTP port (default is 25; 465 for SSL)
 $rcmail_config['smtp_port'] = 25;
 
-// SMTP username (if required) if you use %u as the username RoundCube
+// SMTP username (if required) if you use %u as the username Roundcube
 // will use the current username for login
 $rcmail_config['smtp_user'] = '';
 
-// SMTP password (if required) if you use %p as the password RoundCube
+// SMTP password (if required) if you use %p as the password Roundcube
 // will use the current user's password for login
 $rcmail_config['smtp_pass'] = '';
 
@@ -154,7 +154,7 @@
 // set the port for the ssl connection as value of this option if it differs from the default 443
 $rcmail_config['force_https'] = false;
 
-// automatically create a new RoundCube user when log-in the first time.
+// automatically create a new Roundcube user when log-in the first time.
 // a new user will be created once the IMAP login succeeds.
 // set to false if only registered users can use this service
 $rcmail_config['auto_create_user'] = true;
@@ -225,11 +225,11 @@
 $rcmail_config['include_host_config'] = false;
 
 // path to a text file which will be added to each sent message
-// paths are relative to the RoundCube root folder
+// paths are relative to the Roundcube root folder
 $rcmail_config['generic_message_footer'] = '';
 
 // path to a text file which will be added to each sent HTML message
-// paths are relative to the RoundCube root folder
+// paths are relative to the Roundcube root folder
 $rcmail_config['generic_message_footer_html'] = '';
 
 // add a received header to outgoing mails containing the creators IP and hostname
diff --git a/index.php b/index.php
index 0192ff9..6bc771c 100644
--- a/index.php
+++ b/index.php
@@ -1,10 +1,10 @@
 <?php
 /*
  +-------------------------------------------------------------------------+
- | RoundCube Webmail IMAP Client                                           |
+ | Roundcube Webmail IMAP Client                                           |
  | Version 0.4-20100807                                                    |
  |                                                                         |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                   |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                   |
  |                                                                         |
  | This program is free software; you can redistribute it and/or modify    |
  | it under the terms of the GNU General Public License version 2          |
@@ -146,7 +146,7 @@
 
 // check client X-header to verify request origin
 if ($OUTPUT->ajax_call) {
-  if (!$RCMAIL->config->get('devel_mode') && rc_request_header('X-RoundCube-Request') != $RCMAIL->get_request_token() && !empty($RCMAIL->user->ID)) {
+  if (!$RCMAIL->config->get('devel_mode') && rc_request_header('X-Roundcube-Request') != $RCMAIL->get_request_token() && !empty($RCMAIL->user->ID)) {
     header('HTTP/1.1 404 Not Found');
     die("Invalid Request");
   }
@@ -169,8 +169,8 @@
   if ($RCMAIL->config->get('enable_installer') && is_readable('./installer/index.php')) {
     $OUTPUT->add_footer(html::div(array('style' => "background:#ef9398; border:2px solid #dc5757; padding:0.5em; margin:2em auto; width:50em"),
       html::tag('h2', array('style' => "margin-top:0.2em"), "Installer script is still accessible") .
-      html::p(null, "The install script of your RoundCube installation is still stored in its default location!") .
-      html::p(null, "Please <b>remove</b> the whole <tt>installer</tt> folder from the RoundCube directory because .
+      html::p(null, "The install script of your Roundcube installation is still stored in its default location!") .
+      html::p(null, "Please <b>remove</b> the whole <tt>installer</tt> folder from the Roundcube directory because .
         these files may expose sensitive configuration data like server passwords and encryption keys
         to the public. Make sure you cannot access the <a href=\"./installer/\">installer script</a> from your browser.")
       )
diff --git a/installer/check.php b/installer/check.php
index d1775a3..408f477 100644
--- a/installer/check.php
+++ b/installer/check.php
@@ -75,7 +75,7 @@
 ?>
 
 <h3>Checking PHP extensions</h3>
-<p class="hint">The following modules/extensions are <em>required</em> to run RoundCube:</p>
+<p class="hint">The following modules/extensions are <em>required</em> to run Roundcube:</p>
 <?php
 
 // get extensions location
@@ -154,7 +154,7 @@
 ?>
 
 <h3>Checking php.ini/.htaccess settings</h3>
-<p class="hint">The following settings are <em>required</em> to run RoundCube:</p>
+<p class="hint">The following settings are <em>required</em> to run Roundcube:</p>
 
 <?php
 
@@ -205,7 +205,7 @@
 <?php
 
 if ($RCI->failures) {
-  echo '<p class="warning">Sorry but your webserver does not meet the requirements for RoundCube!<br />
+  echo '<p class="warning">Sorry but your webserver does not meet the requirements for Roundcube!<br />
             Please install the missing modules or fix the php.ini settings according to the above check results.<br />
             Hint: only checks showing <span class="fail">NOT OK</span> need to be fixed.</p>';
 }
diff --git a/installer/config.php b/installer/config.php
index 02deb9b..073b7b5 100644
--- a/installer/config.php
+++ b/installer/config.php
@@ -24,7 +24,7 @@
 if (!empty($_POST['submit'])) {
   
   echo '<p class="notice">Copy or download the following configurations and save them in two files';
-  echo ' (names above the text box) within the <tt>'.RCMAIL_CONFIG_DIR.'</tt> directory of your RoundCube installation.<br/>';
+  echo ' (names above the text box) within the <tt>'.RCMAIL_CONFIG_DIR.'</tt> directory of your Roundcube installation.<br/>';
   echo ' Make sure that there are no characters outside the <tt>&lt;?php ?&gt;</tt> brackets when saving the files.</p>';
   
   $textbox = new html_textarea(array('rows' => 16, 'cols' => 60, 'class' => "configfile"));
@@ -343,12 +343,12 @@
 echo $check_autocreate->show(intval($RCI->getprop('auto_create_user')), array('value' => 1));
 
 ?>
-<label for="cfgautocreate">Automatically create a new RoundCube user when log-in the first time</label><br />
+<label for="cfgautocreate">Automatically create a new Roundcube user when log-in the first time</label><br />
 
 <p class="hint">A user is authenticated by the IMAP server but it requires a local record to store settings
 and contacts. With this option enabled a new user record will automatically be created once the IMAP login succeeds.</p>
 
-<p class="hint">If this option is disabled, the login only succeeds if there's a matching user-record in the local RoundCube database
+<p class="hint">If this option is disabled, the login only succeeds if there's a matching user-record in the local Roundcube database
 what means that you have to create those records manually or disable this option after the first login.</p>
 </dd>
 
diff --git a/installer/index.php b/installer/index.php
index d1c55e4..1c157da 100644
--- a/installer/index.php
+++ b/installer/index.php
@@ -58,7 +58,7 @@
 	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-<title>RoundCube Webmail Installer</title>
+<title>Roundcube Webmail Installer</title>
 <meta name="Robots" content="noindex,nofollow" />
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <link rel="stylesheet" type="text/css" href="styles.css" />
@@ -69,7 +69,7 @@
 
 <div id="banner">
   <div id="header">
-    <div class="banner-logo"><a href="http://www.roundcube.net"><img src="images/banner_logo.gif" width="200" height="56" border="0" alt="RoundCube Webmal Project" /></a></div>
+    <div class="banner-logo"><a href="http://www.roundcube.net"><img src="images/banner_logo.gif" width="200" height="56" border="0" alt="Roundcube Webmal Project" /></a></div>
     <div class="banner-right"><img src="images/banner_right.gif" width="10" height="56" alt="" /></div>
   </div>
   <div id="topnav">
@@ -92,7 +92,7 @@
   
 ?>
 
-<h1>RoundCube Webmail Installer</h1>
+<h1>Roundcube Webmail Installer</h1>
 
 <ol id="progress">
 <?php
@@ -120,7 +120,7 @@
 </div>
 
 <div id="footer">
-  Installer by the RoundCube Dev Team. Copyright &copy; 2008 - Published under the GNU Public License;&nbsp;
+  Installer by the Roundcube Dev Team. Copyright &copy; 2008 - Published under the GNU Public License;&nbsp;
   Icons by <a href="http://famfamfam.com">famfamfam</a>
 </div>
 </body>
diff --git a/installer/rcube_install.php b/installer/rcube_install.php
index afd4224..677dda1 100644
--- a/installer/rcube_install.php
+++ b/installer/rcube_install.php
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | rcube_install.php                                                     |
  |                                                                       |
- | This file is part of the RoundCube Webmail package                    |
- | Copyright (C) 2008-2009, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail package                    |
+ | Copyright (C) 2008-2009, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU Public License                                 |
  +-----------------------------------------------------------------------+
 
@@ -15,10 +15,10 @@
 
 
 /**
- * Class to control the installation process of the RoundCube Webmail package
+ * Class to control the installation process of the Roundcube Webmail package
  *
  * @category Install
- * @package  RoundCube
+ * @package  Roundcube
  * @author Thomas Bruederli
  */
 class rcube_install
@@ -327,7 +327,7 @@
   
   /**
    * Compare the local database schema with the reference schema
-   * required for this version of RoundCube
+   * required for this version of Roundcube
    *
    * @param boolean True if the schema schould be updated
    * @return boolean True if the schema is up-to-date, false if not or an error occured
@@ -366,7 +366,7 @@
   
   /**
    * Compare the local database schema with the reference schema
-   * required for this version of RoundCube
+   * required for this version of Roundcube
    *
    * @param boolean True if the schema schould be updated
    * @return boolean True if the schema is up-to-date, false if not or an error occured
@@ -624,7 +624,7 @@
   }
   
   /**
-   * Handler for RoundCube errors
+   * Handler for Roundcube errors
    */
   function raise_error($p)
   {
diff --git a/installer/test.php b/installer/test.php
index d1b5979..45de5e8 100644
--- a/installer/test.php
+++ b/installer/test.php
@@ -88,7 +88,7 @@
 ?>
 
 <h3>Check if directories are writable</h3>
-<p>RoundCube may need to write/save files into these directories</p>
+<p>Roundcube may need to write/save files into these directories</p>
 <?php
 
 if ($RCI->configured) {
@@ -255,10 +255,10 @@
     $headers = array(
       'From'    => trim($_POST['_from']),
       'To'      => trim($_POST['_to']),
-      'Subject' => 'Test message from RoundCube',
+      'Subject' => 'Test message from Roundcube',
     );
 
-    $body = 'This is a test to confirm that RoundCube can send email.';
+    $body = 'This is a test to confirm that Roundcube can send email.';
     $smtp_response = array();
     
     // send mail using configured SMTP server
diff --git a/installer/utils.php b/installer/utils.php
index a18dc61..4294f79 100644
--- a/installer/utils.php
+++ b/installer/utils.php
@@ -1,10 +1,10 @@
 <?php
 /*
  +-------------------------------------------------------------------------+
- | RoundCube Webmail IMAP Client                                           |
+ | Roundcube Webmail IMAP Client                                           |
  | Version 0.3-20090702                                                    |
  |                                                                         |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                   |
+ | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland                   |
  |                                                                         |
  | This program is free software; you can redistribute it and/or modify    |
  | it under the terms of the GNU General Public License version 2          |
diff --git a/installer/welcome.html b/installer/welcome.html
index 0c6805a..a992c5e 100644
--- a/installer/welcome.html
+++ b/installer/welcome.html
@@ -1,8 +1,8 @@
 <form action="index.php" methond="get">
 <input type="hidden" name="_step" value="1" />
 
-<p>Welcome to the interactive install script for the RoundCube Webmail package</p>
-<p>First let's check your local environment and find out if everything RoundCube needs is available.</p>
+<p>Welcome to the interactive install script for the Roundcube Webmail package</p>
+<p>First let's check your local environment and find out if everything Roundcube needs is available.</p>
 
 <p>The basic requirements are:</p>
 <ul>
diff --git a/program/include/html.php b/program/include/html.php
index 54a6cde..527fa9b 100644
--- a/program/include/html.php
+++ b/program/include/html.php
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/include/html.php                                              |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2010, RoundCube Dev, - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2010, Roundcube Dev, - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/include/iniset.php b/program/include/iniset.php
index a4f87e9..46a76a4 100755
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/include/iniset.php                                            |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2008-2009, RoundCube Dev, - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2008-2009, Roundcube Dev, - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/include/main.inc b/program/include/main.inc
index 00fd083..efcb60e 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/include/main.inc                                              |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2009, RoundCube Dev, - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2009, Roundcube Dev, - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -20,7 +20,7 @@
 */
 
 /**
- * RoundCube Webmail common functions
+ * Roundcube Webmail common functions
  *
  * @package Core
  * @author Thomas Bruederli <roundcube@gmail.com>
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 97d4b54..f0cbdbf 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/include/rcmail.php                                            |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2008-2010, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2008-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -21,7 +21,7 @@
 
 
 /**
- * Application class of RoundCube Webmail
+ * Application class of Roundcube Webmail
  * implemented as singleton
  *
  * @package Core
@@ -1172,7 +1172,7 @@
   }
 
   /**
-   * Build a valid URL to this instance of RoundCube
+   * Build a valid URL to this instance of Roundcube
    *
    * @param mixed Either a string with the action or url parameters as key-value pairs
    * @return string Valid application URL
diff --git a/program/include/rcube_addressbook.php b/program/include/rcube_addressbook.php
index 790c8c8..3b07235 100644
--- a/program/include/rcube_addressbook.php
+++ b/program/include/rcube_addressbook.php
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/include/rcube_addressbook.php                                 |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2006-2009, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2006-2009, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/include/rcube_browser.php b/program/include/rcube_browser.php
index 361ffb6..d080c60 100644
--- a/program/include/rcube_browser.php
+++ b/program/include/rcube_browser.php
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/include/rcube_browser.php                                     |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2007-2009, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2007-2009, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index 488ffc4..36892c0 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/include/rcube_config.php                                      |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2008-2010, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2008-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -20,7 +20,7 @@
 */
 
 /**
- * Configuration class for RoundCube
+ * Configuration class for Roundcube
  *
  * @package Core
  */
diff --git a/program/include/rcube_contacts.php b/program/include/rcube_contacts.php
index 698378a..8f93374 100644
--- a/program/include/rcube_contacts.php
+++ b/program/include/rcube_contacts.php
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/include/rcube_contacts.php                                    |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2006-2010, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2006-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/include/rcube_html_page.php b/program/include/rcube_html_page.php
index 0395f6f..9abe08e 100644
--- a/program/include/rcube_html_page.php
+++ b/program/include/rcube_html_page.php
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/include/rcube_html_page.php                                   |
  |                                                                       |
- | This file is part of the RoundCube PHP suite                          |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube PHP suite                          |
+ | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | CONTENTS:                                                             |
@@ -149,7 +149,7 @@
 
         // set default page title
         if (empty($this->title)) {
-            $this->title = 'RoundCube Mail';
+            $this->title = 'Roundcube Mail';
         }
 
         // replace specialchars in content
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 2151f5c..b7ba9ab 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/include/rcube_imap.php                                        |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/include/rcube_imap_generic.php b/program/include/rcube_imap_generic.php
index 96865e2..b60ddc7 100644
--- a/program/include/rcube_imap_generic.php
+++ b/program/include/rcube_imap_generic.php
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/include/rcube_imap_generic.php                                |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/include/rcube_json_output.php b/program/include/rcube_json_output.php
index 2751ec1..9700472 100644
--- a/program/include/rcube_json_output.php
+++ b/program/include/rcube_json_output.php
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/include/rcube_json_output.php                                 |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2008-2010, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2008-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/include/rcube_ldap.php b/program/include/rcube_ldap.php
index 2754794..fb1396c 100644
--- a/program/include/rcube_ldap.php
+++ b/program/include/rcube_ldap.php
@@ -3,8 +3,8 @@
  +-----------------------------------------------------------------------+
  | program/include/rcube_ldap.php                                        |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2006-2009, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2006-2009, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/include/rcube_mdb2.php b/program/include/rcube_mdb2.php
index 06f5915..0769b63 100644
--- a/program/include/rcube_mdb2.php
+++ b/program/include/rcube_mdb2.php
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/include/rcube_mdb2.php                                        |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
index 40df819..a40cdca 100644
--- a/program/include/rcube_message.php
+++ b/program/include/rcube_message.php
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/include/rcube_message.php                                     |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2008-2010, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2008-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/include/rcube_mime_struct.php b/program/include/rcube_mime_struct.php
index 5115628..e74acc0 100644
--- a/program/include/rcube_mime_struct.php
+++ b/program/include/rcube_mime_struct.php
@@ -5,8 +5,8 @@
  +-----------------------------------------------------------------------+
  | program/include/rcube_mime_struct.php                                 |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/include/rcube_plugin.php b/program/include/rcube_plugin.php
index c92b58e..5e5f564 100644
--- a/program/include/rcube_plugin.php
+++ b/program/include/rcube_plugin.php
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/include/rcube_plugin.php                                      |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2008-2009, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2008-2009, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/include/rcube_plugin_api.php b/program/include/rcube_plugin_api.php
index 692b0c7..9ad28e2 100644
--- a/program/include/rcube_plugin_api.php
+++ b/program/include/rcube_plugin_api.php
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/include/rcube_plugin_api.php                                  |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2008-2009, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2008-2009, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/include/rcube_result_set.php b/program/include/rcube_result_set.php
index 499fb6a..435ae72 100644
--- a/program/include/rcube_result_set.php
+++ b/program/include/rcube_result_set.php
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/include/rcube_result_set.php                                  |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2006-2010, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2006-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -21,7 +21,7 @@
 
 
 /**
- * RoundCube result set class.
+ * Roundcube result set class.
  * Representing an address directory result set.
  *
  * @package Addressbook
diff --git a/program/include/rcube_session.php b/program/include/rcube_session.php
index c3332f0..53f9963 100644
--- a/program/include/rcube_session.php
+++ b/program/include/rcube_session.php
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/include/rcube_session.php                                     |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/include/rcube_shared.inc b/program/include/rcube_shared.inc
index 9278512..845230d 100644
--- a/program/include/rcube_shared.inc
+++ b/program/include/rcube_shared.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | rcube_shared.inc                                                      |
  |                                                                       |
- | This file is part of the RoundCube PHP suite                          |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube PHP suite                          |
+ | Copyright (C) 2005-2007, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | CONTENTS:                                                             |
@@ -21,7 +21,7 @@
 
 
 /**
- * RoundCube shared functions
+ * Roundcube shared functions
  * 
  * @package Core
  */
diff --git a/program/include/rcube_smtp.php b/program/include/rcube_smtp.php
index fc32b3f..3c9f669 100644
--- a/program/include/rcube_smtp.php
+++ b/program/include/rcube_smtp.php
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/include/rcube_smtp.php                                        |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/include/rcube_sqlite.inc b/program/include/rcube_sqlite.inc
index fd05119..c965c38 100644
--- a/program/include/rcube_sqlite.inc
+++ b/program/include/rcube_sqlite.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/include/rcube_sqlite.inc                                      |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/include/rcube_string_replacer.php b/program/include/rcube_string_replacer.php
index 0568cc0..962ea04 100644
--- a/program/include/rcube_string_replacer.php
+++ b/program/include/rcube_string_replacer.php
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/include/rcube_string_replacer.php                             |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2009, RoundCube Dev. - Switzerland                      |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2009, Roundcube Dev. - Switzerland                      |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index 89e5600..4dcabb9 100755
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/include/rcube_template.php                                    |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2006-2010, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2006-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -687,7 +687,7 @@
                     $content = call_user_func($handler, $attrib);
                 }
                 else if ($object == 'productname') {
-                    $name = !empty($this->config['product_name']) ? $this->config['product_name'] : 'RoundCube Webmail';
+                    $name = !empty($this->config['product_name']) ? $this->config['product_name'] : 'Roundcube Webmail';
                     $content = Q($name);
                 }
                 else if ($object == 'version') {
diff --git a/program/include/rcube_user.php b/program/include/rcube_user.php
index 1e05d99..6a222e2 100644
--- a/program/include/rcube_user.php
+++ b/program/include/rcube_user.php
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/include/rcube_user.inc                                        |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/include/rcube_vcard.php b/program/include/rcube_vcard.php
index 0ed7be7..0eb7a78 100644
--- a/program/include/rcube_vcard.php
+++ b/program/include/rcube_vcard.php
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/include/rcube_vcard.php                                       |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2008-2009, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2008-2009, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/js/app.js b/program/js/app.js
index 321a7bf..c42b62c 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1,9 +1,9 @@
 /*
  +-----------------------------------------------------------------------+
- | RoundCube Webmail Client Script                                       |
+ | Roundcube Webmail Client Script                                       |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2010, RoundCube Dev, - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2010, Roundcube Dev, - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
@@ -56,7 +56,7 @@
   $.ajaxSetup({
     cache:false,
     error:function(request, status, err){ ref.http_error(request, status, err); },
-    beforeSend:function(xmlhttp){ xmlhttp.setRequestHeader('X-RoundCube-Request', ref.env.request_token); }
+    beforeSend:function(xmlhttp){ xmlhttp.setRequestHeader('X-Roundcube-Request', ref.env.request_token); }
   });
 
   // set environment variable(s)
diff --git a/program/js/common.js b/program/js/common.js
index 4c5d1b7..4e98347 100644
--- a/program/js/common.js
+++ b/program/js/common.js
@@ -1,9 +1,9 @@
 /*
  +-----------------------------------------------------------------------+
- | RoundCube common js library                                           |
+ | Roundcube common js library                                           |
  |                                                                       |
- | This file is part of the RoundCube web development suite              |
- | Copyright (C) 2005-2007, RoundCube Dev, - Switzerland                 |
+ | This file is part of the Roundcube web development suite              |
+ | Copyright (C) 2005-2007, Roundcube Dev, - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
@@ -365,7 +365,7 @@
 
 
 /**
- * RoundCube generic layer (floating box) class
+ * Roundcube generic layer (floating box) class
  *
  * @constructor
  */
diff --git a/program/js/editor.js b/program/js/editor.js
index 4555582..85cf68a 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -1,9 +1,9 @@
 /*
  +-----------------------------------------------------------------------+
- | RoundCube editor js library                                           |
+ | Roundcube editor js library                                           |
  |                                                                       |
- | This file is part of the RoundCube web development suite              |
- | Copyright (C) 2006, RoundCube Dev, - Switzerland                      |
+ | This file is part of the Roundcube web development suite              |
+ | Copyright (C) 2006, Roundcube Dev, - Switzerland                      |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
diff --git a/program/js/list.js b/program/js/list.js
index 3309586..22c8080 100644
--- a/program/js/list.js
+++ b/program/js/list.js
@@ -1,9 +1,9 @@
 /*
  +-----------------------------------------------------------------------+
- | RoundCube List Widget                                                 |
+ | Roundcube List Widget                                                 |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2006-2009, RoundCube Dev, - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2006-2009, Roundcube Dev, - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
@@ -18,7 +18,7 @@
 
 
 /**
- * RoundCube List Widget class
+ * Roundcube List Widget class
  * @contructor
  */
 function rcube_list_widget(list, p)
diff --git a/program/lib/utf8.class.php b/program/lib/utf8.class.php
index 9f718d5..e0dc9e2 100644
--- a/program/lib/utf8.class.php
+++ b/program/lib/utf8.class.php
@@ -35,7 +35,7 @@
 */
 
 // Charset maps
-// Adapted to fit RoundCube
+// Adapted to fit Roundcube
 define("UTF8_MAP_DIR", "program/lib/encoding");
 
 //Error constants
diff --git a/program/localization/ar_SA/labels.inc b/program/localization/ar_SA/labels.inc
index ba8dbcc..f54bb52 100644
--- a/program/localization/ar_SA/labels.inc
+++ b/program/localization/ar_SA/labels.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/ar_SA/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/ar_SA/messages.inc b/program/localization/ar_SA/messages.inc
index 9713231..d9b9a90 100644
--- a/program/localization/ar_SA/messages.inc
+++ b/program/localization/ar_SA/messages.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/ar_SA/messages.inc                                           |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/ast/labels.inc b/program/localization/ast/labels.inc
index 70d63fc..752d643 100644
--- a/program/localization/ast/labels.inc
+++ b/program/localization/ast/labels.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/ast/labels.inc                                               |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/ast/messages.inc b/program/localization/ast/messages.inc
index d37f321..c292ccf 100644
--- a/program/localization/ast/messages.inc
+++ b/program/localization/ast/messages.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/ast/messages.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2008, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2008, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/az_AZ/labels.inc b/program/localization/az_AZ/labels.inc
index 9685109..4e7d9d4 100644
--- a/program/localization/az_AZ/labels.inc
+++ b/program/localization/az_AZ/labels.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/az_AZ/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/az_AZ/messages.inc b/program/localization/az_AZ/messages.inc
index 294d2c0..ef5ca5d 100644
--- a/program/localization/az_AZ/messages.inc
+++ b/program/localization/az_AZ/messages.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/az_AZ/messages.inc                                           |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/bg_BG/labels.inc b/program/localization/bg_BG/labels.inc
index 1b87b44..c0fda2e 100644
--- a/program/localization/bg_BG/labels.inc
+++ b/program/localization/bg_BG/labels.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/bg/labels.inc                                                |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/bg_BG/messages.inc b/program/localization/bg_BG/messages.inc
index a5180de..abcf7ff 100644
--- a/program/localization/bg_BG/messages.inc
+++ b/program/localization/bg_BG/messages.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/bg/messages.inc                                              |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/bn_BD/labels.inc b/program/localization/bn_BD/labels.inc
index e61c73d..3917eec 100644
--- a/program/localization/bn_BD/labels.inc
+++ b/program/localization/bn_BD/labels.inc
@@ -4,8 +4,8 @@
 +-----------------------------------------------------------------------+
 | language/bn_BD/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2008, RoundCube Dev. - Switzerland                      |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2008, Roundcube Dev. - Switzerland                      |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/bn_BD/messages.inc b/program/localization/bn_BD/messages.inc
index 0758fff..1026969 100644
--- a/program/localization/bn_BD/messages.inc
+++ b/program/localization/bn_BD/messages.inc
@@ -4,8 +4,8 @@
 +-----------------------------------------------------------------------+
 | language/bn_BD/messages.inc                                           |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2008, RoundCube Dev. - Switzerland                      |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2008, Roundcube Dev. - Switzerland                      |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/br/labels.inc b/program/localization/br/labels.inc
index 726662b..f80ed34 100644
--- a/program/localization/br/labels.inc
+++ b/program/localization/br/labels.inc
@@ -5,8 +5,8 @@
  +-----------------------------------------------------------------------+
  | language/bzg/labels.inc                                                |
  |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2005-2007, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
diff --git a/program/localization/br/messages.inc b/program/localization/br/messages.inc
index 1d71c18..af11472 100644
--- a/program/localization/br/messages.inc
+++ b/program/localization/br/messages.inc
@@ -5,8 +5,8 @@
  +-----------------------------------------------------------------------+
  | language/bzg/messages.inc                                              |
  |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2005-2007, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
diff --git a/program/localization/bs_BA/labels.inc b/program/localization/bs_BA/labels.inc
index ec6af65..6d2ae5d 100644
--- a/program/localization/bs_BA/labels.inc
+++ b/program/localization/bs_BA/labels.inc
@@ -5,8 +5,8 @@
  +-----------------------------------------------------------------------+
  | language/bs_BA/labels.inc                                             |
  |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
diff --git a/program/localization/bs_BA/messages.inc b/program/localization/bs_BA/messages.inc
index cf07e25..712eb31 100644
--- a/program/localization/bs_BA/messages.inc
+++ b/program/localization/bs_BA/messages.inc
@@ -5,8 +5,8 @@
  +-----------------------------------------------------------------------+
  | language/bs_BA/messages.inc                                           |
  |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
diff --git a/program/localization/ca_ES/labels.inc b/program/localization/ca_ES/labels.inc
index 1e2ee70..a8c71f1 100644
--- a/program/localization/ca_ES/labels.inc
+++ b/program/localization/ca_ES/labels.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/ca_ES/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/ca_ES/messages.inc b/program/localization/ca_ES/messages.inc
index e7ee21a..aa50657 100644
--- a/program/localization/ca_ES/messages.inc
+++ b/program/localization/ca_ES/messages.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/ca_ES/messages.inc                                           |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/cs_CZ/labels.inc b/program/localization/cs_CZ/labels.inc
index 715aa8c..9593571 100644
--- a/program/localization/cs_CZ/labels.inc
+++ b/program/localization/cs_CZ/labels.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/cs_CZ/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/cs_CZ/messages.inc b/program/localization/cs_CZ/messages.inc
index cb41b87..4f806e1 100644
--- a/program/localization/cs_CZ/messages.inc
+++ b/program/localization/cs_CZ/messages.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/cs_CZ/messages.inc                                              |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/cy_GB/labels.inc b/program/localization/cy_GB/labels.inc
index 8714701..64b6b1b 100644
--- a/program/localization/cy_GB/labels.inc
+++ b/program/localization/cy_GB/labels.inc
@@ -4,8 +4,8 @@
 +-----------------------------------------------------------------------+
 | language/cy_GB/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2008-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2008-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/cy_GB/messages.inc b/program/localization/cy_GB/messages.inc
index a70c71e..4a20d30 100644
--- a/program/localization/cy_GB/messages.inc
+++ b/program/localization/cy_GB/messages.inc
@@ -4,8 +4,8 @@
 +-----------------------------------------------------------------------+
 | language/cy_GB/messages.inc                                           |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2008-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2008-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/da_DK/labels.inc b/program/localization/da_DK/labels.inc
index a0ee89e..6d45c04 100644
--- a/program/localization/da_DK/labels.inc
+++ b/program/localization/da_DK/labels.inc
@@ -4,8 +4,8 @@
 +-----------------------------------------------------------------------+
 | language/da_DK/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/da_DK/messages.inc b/program/localization/da_DK/messages.inc
index 3b90012..e66099c 100644
--- a/program/localization/da_DK/messages.inc
+++ b/program/localization/da_DK/messages.inc
@@ -4,8 +4,8 @@
 +-----------------------------------------------------------------------+
 | language/da_DK/messages.inc                                           |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc
index 0fdf75c..63d69db 100644
--- a/program/localization/de_CH/labels.inc
+++ b/program/localization/de_CH/labels.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/de_CH/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/de_CH/messages.inc b/program/localization/de_CH/messages.inc
index 4d84fa8..8a6daf3 100644
--- a/program/localization/de_CH/messages.inc
+++ b/program/localization/de_CH/messages.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/de_CH/messages.inc                                           |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc
index 4d16c23..455204a 100644
--- a/program/localization/de_DE/labels.inc
+++ b/program/localization/de_DE/labels.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/de_DE/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/de_DE/messages.inc b/program/localization/de_DE/messages.inc
index 54e81c2..d2bf6b6 100644
--- a/program/localization/de_DE/messages.inc
+++ b/program/localization/de_DE/messages.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/de_DE/messages.inc                                           |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/el_GR/labels.inc b/program/localization/el_GR/labels.inc
index 816aca9..5303a08 100644
--- a/program/localization/el_GR/labels.inc
+++ b/program/localization/el_GR/labels.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/el/labels.inc                                                |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/el_GR/messages.inc b/program/localization/el_GR/messages.inc
index 508b194..de617ce 100644
--- a/program/localization/el_GR/messages.inc
+++ b/program/localization/el_GR/messages.inc
@@ -3,8 +3,8 @@
 +-----------------------------------------------------------------------+
 | language/el/messages.inc                                              |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc
index 5a97ef4..8d369e5 100644
--- a/program/localization/en_GB/labels.inc
+++ b/program/localization/en_GB/labels.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/en_GB/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/en_GB/messages.inc b/program/localization/en_GB/messages.inc
index fac0ce0..ec4f6e7 100644
--- a/program/localization/en_GB/messages.inc
+++ b/program/localization/en_GB/messages.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/en_GB/messages.inc                                           |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index 517b720..0db6dda 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -5,8 +5,8 @@
  +-----------------------------------------------------------------------+
  | language/en_US/labels.inc                                             |
  |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
diff --git a/program/localization/en_US/messages.inc b/program/localization/en_US/messages.inc
index 05077b9..900a6db 100644
--- a/program/localization/en_US/messages.inc
+++ b/program/localization/en_US/messages.inc
@@ -5,8 +5,8 @@
  +-----------------------------------------------------------------------+
  | language/en_US/messages.inc                                           |
  |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
diff --git a/program/localization/eo/labels.inc b/program/localization/eo/labels.inc
index 8c4bce2..df21704 100644
--- a/program/localization/eo/labels.inc
+++ b/program/localization/eo/labels.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/eo/labels.inc                                                |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/eo/messages.inc b/program/localization/eo/messages.inc
index daddbda..956aed0 100644
--- a/program/localization/eo/messages.inc
+++ b/program/localization/eo/messages.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/eo/messages.inc                                              |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/es_AR/labels.inc b/program/localization/es_AR/labels.inc
index 3475a79..6c2d16b 100644
--- a/program/localization/es_AR/labels.inc
+++ b/program/localization/es_AR/labels.inc
@@ -4,8 +4,8 @@
 +-----------------------------------------------------------------------+
 | language/es_AR/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/es_AR/messages.inc b/program/localization/es_AR/messages.inc
index 96b9af7..3843494 100644
--- a/program/localization/es_AR/messages.inc
+++ b/program/localization/es_AR/messages.inc
@@ -4,8 +4,8 @@
 +-----------------------------------------------------------------------+
 | language/es_ES/messages.inc                                           |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/es_ES/labels.inc b/program/localization/es_ES/labels.inc
index a68e945..4e4829f 100644
--- a/program/localization/es_ES/labels.inc
+++ b/program/localization/es_ES/labels.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/es_ES/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2008, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2008, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/es_ES/messages.inc b/program/localization/es_ES/messages.inc
index 8d28c64..d2d4a83 100644
--- a/program/localization/es_ES/messages.inc
+++ b/program/localization/es_ES/messages.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/es_ES/messages.inc                                           |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2008, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2008, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/et_EE/labels.inc b/program/localization/et_EE/labels.inc
index beae5e3..f93b6b4 100644
--- a/program/localization/et_EE/labels.inc
+++ b/program/localization/et_EE/labels.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/et_EE/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/et_EE/messages.inc b/program/localization/et_EE/messages.inc
index 27dad89..35deacc 100644
--- a/program/localization/et_EE/messages.inc
+++ b/program/localization/et_EE/messages.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/et_EE/messages.inc                                           |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/eu_ES/labels.inc b/program/localization/eu_ES/labels.inc
index 4f0dba1..1572ce2 100644
--- a/program/localization/eu_ES/labels.inc
+++ b/program/localization/eu_ES/labels.inc
@@ -4,8 +4,8 @@
 +-----------------------------------------------------------------------+
 | language/eu_ES/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/eu_ES/messages.inc b/program/localization/eu_ES/messages.inc
index 32e793a..d3787af 100644
--- a/program/localization/eu_ES/messages.inc
+++ b/program/localization/eu_ES/messages.inc
@@ -4,8 +4,8 @@
 +-----------------------------------------------------------------------+
 | language/eu_ES/messages.inc                                           |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/fa/labels.inc b/program/localization/fa/labels.inc
index e7a2393..3bf67a6 100644
--- a/program/localization/fa/labels.inc
+++ b/program/localization/fa/labels.inc
@@ -4,8 +4,8 @@
 +-----------------------------------------------------------------------+
 | language/fa/labels.inc                                                |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/fa/messages.inc b/program/localization/fa/messages.inc
index dd958d4..69146df 100644
--- a/program/localization/fa/messages.inc
+++ b/program/localization/fa/messages.inc
@@ -4,8 +4,8 @@
 +-----------------------------------------------------------------------+
 | language/fa/messages.inc                                              |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/fi_FI/labels.inc b/program/localization/fi_FI/labels.inc
index 3b69dab..31aaf83 100644
--- a/program/localization/fi_FI/labels.inc
+++ b/program/localization/fi_FI/labels.inc
@@ -4,8 +4,8 @@
 +-----------------------------------------------------------------------+
 | language/fi_FI/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/fi_FI/messages.inc b/program/localization/fi_FI/messages.inc
index 1790cf9..ddf98f4 100644
--- a/program/localization/fi_FI/messages.inc
+++ b/program/localization/fi_FI/messages.inc
@@ -4,8 +4,8 @@
 +-----------------------------------------------------------------------+
 | language/fi_FI/messages.inc                                           |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/fr_FR/labels.inc b/program/localization/fr_FR/labels.inc
index 229d973..97ec562 100644
--- a/program/localization/fr_FR/labels.inc
+++ b/program/localization/fr_FR/labels.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/fr_FR/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/fr_FR/messages.inc b/program/localization/fr_FR/messages.inc
index 0585686..a3018fa 100644
--- a/program/localization/fr_FR/messages.inc
+++ b/program/localization/fr_FR/messages.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/fr_FR/messages.inc                                           |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/ga_IE/labels.inc b/program/localization/ga_IE/labels.inc
index 717538b..d6c5f05 100755
--- a/program/localization/ga_IE/labels.inc
+++ b/program/localization/ga_IE/labels.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | language/ga/labels.inc                                                |
  |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
diff --git a/program/localization/ga_IE/messages.inc b/program/localization/ga_IE/messages.inc
index 65d1338..914b952 100755
--- a/program/localization/ga_IE/messages.inc
+++ b/program/localization/ga_IE/messages.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | language/ga/messages.inc                                              |
  |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
diff --git a/program/localization/gl_ES/labels.inc b/program/localization/gl_ES/labels.inc
index 46c8292..13e2a2c 100644
--- a/program/localization/gl_ES/labels.inc
+++ b/program/localization/gl_ES/labels.inc
@@ -4,8 +4,8 @@
 +-----------------------------------------------------------------------+
 | language/gl_ES/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/gl_ES/messages.inc b/program/localization/gl_ES/messages.inc
index 6428955..5eb5c89 100644
--- a/program/localization/gl_ES/messages.inc
+++ b/program/localization/gl_ES/messages.inc
@@ -4,8 +4,8 @@
 +-----------------------------------------------------------------------+
 | language/gl_ES/messages.inc                                           |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/he_IL/labels.inc b/program/localization/he_IL/labels.inc
index 935b3c6..d8f3f8c 100644
--- a/program/localization/he_IL/labels.inc
+++ b/program/localization/he_IL/labels.inc
@@ -4,8 +4,8 @@
 +-----------------------------------------------------------------------+
 | language/he_IL/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/he_IL/messages.inc b/program/localization/he_IL/messages.inc
index 2cd3cc3..2dfaaa3 100644
--- a/program/localization/he_IL/messages.inc
+++ b/program/localization/he_IL/messages.inc
@@ -4,8 +4,8 @@
 +-----------------------------------------------------------------------+
 | language/he_IL/messages.inc                                           |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/hi_IN/labels.inc b/program/localization/hi_IN/labels.inc
index 2fa0053..6db8e02 100644
--- a/program/localization/hi_IN/labels.inc
+++ b/program/localization/hi_IN/labels.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | localization/hi/labels.inc                                            |
  |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
diff --git a/program/localization/hi_IN/messages.inc b/program/localization/hi_IN/messages.inc
index f28493f..b940e8b 100644
--- a/program/localization/hi_IN/messages.inc
+++ b/program/localization/hi_IN/messages.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | localization/hi/messages.inc                                          |
  |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
diff --git a/program/localization/hr_HR/labels.inc b/program/localization/hr_HR/labels.inc
index b18ac5a..835159e 100644
--- a/program/localization/hr_HR/labels.inc
+++ b/program/localization/hr_HR/labels.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/hr/labels.inc                                                |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/hr_HR/messages.inc b/program/localization/hr_HR/messages.inc
index 59d03bb..4f4b7c5 100644
--- a/program/localization/hr_HR/messages.inc
+++ b/program/localization/hr_HR/messages.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/hr/messages.inc                                              |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/hu_HU/labels.inc b/program/localization/hu_HU/labels.inc
index 38c2bfc..5fcc8ac 100644
--- a/program/localization/hu_HU/labels.inc
+++ b/program/localization/hu_HU/labels.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/hu_HU/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/hu_HU/messages.inc b/program/localization/hu_HU/messages.inc
index b806ff1..07fe0ea 100644
--- a/program/localization/hu_HU/messages.inc
+++ b/program/localization/hu_HU/messages.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/hu_HU/messages.inc                                           |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/hy_AM/labels.inc b/program/localization/hy_AM/labels.inc
index 1811802..7081d44 100644
--- a/program/localization/hy_AM/labels.inc
+++ b/program/localization/hy_AM/labels.inc
@@ -4,8 +4,8 @@
 +-----------------------------------------------------------------------+
 | language/hy_AM/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/hy_AM/messages.inc b/program/localization/hy_AM/messages.inc
index c440af1..cd8aab2 100644
--- a/program/localization/hy_AM/messages.inc
+++ b/program/localization/hy_AM/messages.inc
@@ -4,8 +4,8 @@
 +-----------------------------------------------------------------------+
 | language/hy_AM/messages.inc                                           |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/id_ID/labels.inc b/program/localization/id_ID/labels.inc
index b8a1d33..854712d 100644
--- a/program/localization/id_ID/labels.inc
+++ b/program/localization/id_ID/labels.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/id_ID/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/id_ID/messages.inc b/program/localization/id_ID/messages.inc
index d4d0554..f0b49e4 100644
--- a/program/localization/id_ID/messages.inc
+++ b/program/localization/id_ID/messages.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/id_ID/messages.inc                                           |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/index.inc b/program/localization/index.inc
index 1270b7f..5f33792 100644
--- a/program/localization/index.inc
+++ b/program/localization/index.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/localization/index.inc                                        |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/localization/is_IS/labels.inc b/program/localization/is_IS/labels.inc
index dec0ca1..f21a3b5 100644
--- a/program/localization/is_IS/labels.inc
+++ b/program/localization/is_IS/labels.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/is_IS/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2009, RoundCube Dev. - Switzerland                      |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2009, Roundcube Dev. - Switzerland                      |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/is_IS/messages.inc b/program/localization/is_IS/messages.inc
index f874691..acbb201 100644
--- a/program/localization/is_IS/messages.inc
+++ b/program/localization/is_IS/messages.inc
@@ -5,8 +5,8 @@
  +-----------------------------------------------------------------------+
  | language/en_GB/messages.inc                                           |
  |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2005-2007, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
diff --git a/program/localization/it_IT/labels.inc b/program/localization/it_IT/labels.inc
index cd8cc43..fcf5480 100644
--- a/program/localization/it_IT/labels.inc
+++ b/program/localization/it_IT/labels.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/it/labels.inc                                                |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/it_IT/messages.inc b/program/localization/it_IT/messages.inc
index 3e321d8..be00ac7 100644
--- a/program/localization/it_IT/messages.inc
+++ b/program/localization/it_IT/messages.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/it/messages.inc                                              |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/ja_JP/labels.inc b/program/localization/ja_JP/labels.inc
index 48f5b50..78eee2b 100644
--- a/program/localization/ja_JP/labels.inc
+++ b/program/localization/ja_JP/labels.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/ja_JP/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/ja_JP/messages.inc b/program/localization/ja_JP/messages.inc
index 8049d31..bac715b 100644
--- a/program/localization/ja_JP/messages.inc
+++ b/program/localization/ja_JP/messages.inc
@@ -5,8 +5,8 @@
  +-----------------------------------------------------------------------+
  | language/ja_JP/messages.inc                                           |
  |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
diff --git a/program/localization/ka_GE/labels.inc b/program/localization/ka_GE/labels.inc
index 8d67fd7..8234318 100755
--- a/program/localization/ka_GE/labels.inc
+++ b/program/localization/ka_GE/labels.inc
@@ -4,8 +4,8 @@
 +-----------------------------------------------------------------------+
 | localization/ka_GE/labels.inc                                         |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/ka_GE/messages.inc b/program/localization/ka_GE/messages.inc
index c02227e..33767dd 100755
--- a/program/localization/ka_GE/messages.inc
+++ b/program/localization/ka_GE/messages.inc
@@ -4,8 +4,8 @@
 +-----------------------------------------------------------------------+
 | localization/ka_GE/messages.inc                                       |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/kh_KH/labels.inc b/program/localization/kh_KH/labels.inc
index 8ea8d7b..7782b28 100644
--- a/program/localization/kh_KH/labels.inc
+++ b/program/localization/kh_KH/labels.inc
@@ -4,7 +4,7 @@
 +-----------------------------------------------------------------------+
 | language/kh_KH/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
+| Language file of the Roundcube Webmail client                         |
 | Copyright (C) 2008-2009, RoundQube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
diff --git a/program/localization/kh_KH/messages.inc b/program/localization/kh_KH/messages.inc
index 2e643f1..db148d3 100644
--- a/program/localization/kh_KH/messages.inc
+++ b/program/localization/kh_KH/messages.inc
@@ -4,7 +4,7 @@
 +-----------------------------------------------------------------------+
 | language/kh_KH/messages.inc                                           |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
+| Language file of the Roundcube Webmail client                         |
 | Copyright (C) 2008-2009, RoundQube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
diff --git a/program/localization/ko_KR/labels.inc b/program/localization/ko_KR/labels.inc
index ff45793..2d97998 100644
--- a/program/localization/ko_KR/labels.inc
+++ b/program/localization/ko_KR/labels.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | localization/kr/labels.inc                                            |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/ko_KR/messages.inc b/program/localization/ko_KR/messages.inc
index 6a118e3..ea2b451 100644
--- a/program/localization/ko_KR/messages.inc
+++ b/program/localization/ko_KR/messages.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | localization/kr/messages.inc                                            |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/ku/labels.inc b/program/localization/ku/labels.inc
index 2d6405c..c1b7068 100644
--- a/program/localization/ku/labels.inc
+++ b/program/localization/ku/labels.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | language/ku/labels.inc                                                |
  |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2006, RoundCube Dev. - Switzerland                      |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2006, Roundcube Dev. - Switzerland                      |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
diff --git a/program/localization/ku/messages.inc b/program/localization/ku/messages.inc
index f6eb0b7..37029a9 100644
--- a/program/localization/ku/messages.inc
+++ b/program/localization/ku/messages.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | language/ku/messages.inc                                              |
  |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2006, RoundCube Dev. - Switzerland                      |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2006, Roundcube Dev. - Switzerland                      |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
diff --git a/program/localization/lt_LT/labels.inc b/program/localization/lt_LT/labels.inc
index 0cb8533..864bd49 100644
--- a/program/localization/lt_LT/labels.inc
+++ b/program/localization/lt_LT/labels.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/lt_LT/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/lt_LT/messages.inc b/program/localization/lt_LT/messages.inc
index 18bf0cb..a5fe59c 100644
--- a/program/localization/lt_LT/messages.inc
+++ b/program/localization/lt_LT/messages.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/lt_LT/messages.inc                                           |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/lv_LV/labels.inc b/program/localization/lv_LV/labels.inc
index d7ad8c0..cafa1d3 100644
--- a/program/localization/lv_LV/labels.inc
+++ b/program/localization/lv_LV/labels.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/lv/labels.inc                                                |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/lv_LV/messages.inc b/program/localization/lv_LV/messages.inc
index 253c9b0..e84a832 100644
--- a/program/localization/lv_LV/messages.inc
+++ b/program/localization/lv_LV/messages.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/lv/messages.inc                                              |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/mk_MK/labels.inc b/program/localization/mk_MK/labels.inc
index 2716209..4d8d69f 100755
--- a/program/localization/mk_MK/labels.inc
+++ b/program/localization/mk_MK/labels.inc
@@ -4,8 +4,8 @@
 +-----------------------------------------------------------------------+
 | language/mk_MK/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/mk_MK/messages.inc b/program/localization/mk_MK/messages.inc
index 7d1f608..4d51bb5 100755
--- a/program/localization/mk_MK/messages.inc
+++ b/program/localization/mk_MK/messages.inc
@@ -4,8 +4,8 @@
 +-----------------------------------------------------------------------+
 | language/mk_MK/messages.inc                                           |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/mr_IN/labels.inc b/program/localization/mr_IN/labels.inc
index 04aa08e..a8cf865 100755
--- a/program/localization/mr_IN/labels.inc
+++ b/program/localization/mr_IN/labels.inc
@@ -8,9 +8,9 @@
 |
                                                                        |
 |
- Language file of the RoundCube Webmail client                         |
+ Language file of the Roundcube Webmail client                         |
 |
- Copyright (C) 2009, RoundCube Dev. - Switzerland                      |
+ Copyright (C) 2009, Roundcube Dev. - Switzerland                      |
 |
  Licensed under the GNU GPL                                            |
 |
diff --git a/program/localization/mr_IN/messages.inc b/program/localization/mr_IN/messages.inc
index c7299cd..3dc07fd 100755
--- a/program/localization/mr_IN/messages.inc
+++ b/program/localization/mr_IN/messages.inc
@@ -4,8 +4,8 @@
 +-----------------------------------------------------------------------+
 | language/mr_IN/messages.inc                                           |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2009, RoundCube Dev. - Switzerland                      |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2009, Roundcube Dev. - Switzerland                      |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/ms_MY/labels.inc b/program/localization/ms_MY/labels.inc
index 6639c2d..c6a5858 100644
--- a/program/localization/ms_MY/labels.inc
+++ b/program/localization/ms_MY/labels.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/ms_MY/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/ms_MY/messages.inc b/program/localization/ms_MY/messages.inc
index 53f36f0..2dac2bc 100644
--- a/program/localization/ms_MY/messages.inc
+++ b/program/localization/ms_MY/messages.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/ms_MY/messages.inc                                           |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/nb_NO/labels.inc b/program/localization/nb_NO/labels.inc
index 8f94244..0e828a2 100644
--- a/program/localization/nb_NO/labels.inc
+++ b/program/localization/nb_NO/labels.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/nb_NO/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/nb_NO/messages.inc b/program/localization/nb_NO/messages.inc
index 9b9b5f7..db00818 100644
--- a/program/localization/nb_NO/messages.inc
+++ b/program/localization/nb_NO/messages.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/nb_NO/messages.inc                                           |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/ne_NP/labels.inc b/program/localization/ne_NP/labels.inc
index 48aa129..ee1cc09 100644
--- a/program/localization/ne_NP/labels.inc
+++ b/program/localization/ne_NP/labels.inc
@@ -4,14 +4,14 @@
  +-----------------------------------------------------------------------+
  | localization/ne/labels.inc                                            |
  |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2007, RoundCube Dev. - Switzerland                      |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2007, Roundcube Dev. - Switzerland                      |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
  | Nepali Translation by:                                                |
  | Prasanna Singh <prasanna@bhunet.com>, <prasanna@bhunet.com>           |
- | RoundCubeAuthor: Thomas Bruederli <roundcube@gmail.com>               |
+ | RoundcubeAuthor: Thomas Bruederli <roundcube@gmail.com>               |
  +-----------------------------------------------------------------------+
 */
 
diff --git a/program/localization/ne_NP/messages.inc b/program/localization/ne_NP/messages.inc
index 3481d6b..c0f6753 100644
--- a/program/localization/ne_NP/messages.inc
+++ b/program/localization/ne_NP/messages.inc
@@ -4,14 +4,14 @@
  +-----------------------------------------------------------------------+
  | localization/ne/messages.inc                                          |
  |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2007, RoundCube Dev. - Switzerland                      |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2007, Roundcube Dev. - Switzerland                      |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
  | Nepali Translation by:                                                |
  | Prasanna Singh <prasanna@bhunet.com>, <prasanna@bhunet.com>           |
- | RoundCubeAuthor: Thomas Bruederli <roundcube@gmail.com>               |
+ | RoundcubeAuthor: Thomas Bruederli <roundcube@gmail.com>               |
  +-----------------------------------------------------------------------+
 */
 
diff --git a/program/localization/nl_BE/labels.inc b/program/localization/nl_BE/labels.inc
index 331a288..b504e36 100644
--- a/program/localization/nl_BE/labels.inc
+++ b/program/localization/nl_BE/labels.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/nl_BE/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/nl_BE/messages.inc b/program/localization/nl_BE/messages.inc
index 1dd600b..6d13e7e 100644
--- a/program/localization/nl_BE/messages.inc
+++ b/program/localization/nl_BE/messages.inc
@@ -5,8 +5,8 @@
  +-----------------------------------------------------------------------+
  | language/nl_BE/messages.inc                                           |
  |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
diff --git a/program/localization/nl_NL/labels.inc b/program/localization/nl_NL/labels.inc
index 247cbff..c76d60a 100644
--- a/program/localization/nl_NL/labels.inc
+++ b/program/localization/nl_NL/labels.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/nl_NL/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/nl_NL/messages.inc b/program/localization/nl_NL/messages.inc
index 2caf0fe..556499c 100644
--- a/program/localization/nl_NL/messages.inc
+++ b/program/localization/nl_NL/messages.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/nl_NL/messages.inc                                           |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/nn_NO/labels.inc b/program/localization/nn_NO/labels.inc
index 8da9cca..5f4a0a9 100644
--- a/program/localization/nn_NO/labels.inc
+++ b/program/localization/nn_NO/labels.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/nn_NO/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/nn_NO/messages.inc b/program/localization/nn_NO/messages.inc
index 82b220d..904e3b6 100644
--- a/program/localization/nn_NO/messages.inc
+++ b/program/localization/nn_NO/messages.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/nn_NO/messages.inc                                           |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/pl_PL/labels.inc b/program/localization/pl_PL/labels.inc
index 8c5dbbc..821f244 100644
--- a/program/localization/pl_PL/labels.inc
+++ b/program/localization/pl_PL/labels.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/pl_PL/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/pl_PL/messages.inc b/program/localization/pl_PL/messages.inc
index 17ee13c..781ad0b 100644
--- a/program/localization/pl_PL/messages.inc
+++ b/program/localization/pl_PL/messages.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/pl_PL/messages.inc                                           |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/pt_BR/labels.inc b/program/localization/pt_BR/labels.inc
index dd7cf4b..27c5bb5 100644
--- a/program/localization/pt_BR/labels.inc
+++ b/program/localization/pt_BR/labels.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/pt_BR/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/pt_BR/messages.inc b/program/localization/pt_BR/messages.inc
index 7541843..8e4e39f 100644
--- a/program/localization/pt_BR/messages.inc
+++ b/program/localization/pt_BR/messages.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/pt_BR/messages.inc                                           |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/pt_PT/labels.inc b/program/localization/pt_PT/labels.inc
index 7a00fea..acf7c31 100644
--- a/program/localization/pt_PT/labels.inc
+++ b/program/localization/pt_PT/labels.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/pt_PT/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/pt_PT/messages.inc b/program/localization/pt_PT/messages.inc
index eafaac1..4da36ba 100644
--- a/program/localization/pt_PT/messages.inc
+++ b/program/localization/pt_PT/messages.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/pt_PT/messages.inc                                           |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/ro_RO/labels.inc b/program/localization/ro_RO/labels.inc
index 3f8c4c4..6f77b1f 100644
--- a/program/localization/ro_RO/labels.inc
+++ b/program/localization/ro_RO/labels.inc
@@ -4,8 +4,8 @@
 +-----------------------------------------------------------------------+
 | language/ro_RO/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/ro_RO/messages.inc b/program/localization/ro_RO/messages.inc
index 3ddc122..8027f42 100644
--- a/program/localization/ro_RO/messages.inc
+++ b/program/localization/ro_RO/messages.inc
@@ -4,8 +4,8 @@
 +-----------------------------------------------------------------------+
 | language/ro_RO/messages.inc                                           |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/ru_RU/labels.inc b/program/localization/ru_RU/labels.inc
index 0d54273..241293a 100644
--- a/program/localization/ru_RU/labels.inc
+++ b/program/localization/ru_RU/labels.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/ru_RU/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/ru_RU/messages.inc b/program/localization/ru_RU/messages.inc
index 1a1d9c7..85321cb 100644
--- a/program/localization/ru_RU/messages.inc
+++ b/program/localization/ru_RU/messages.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/ru_RU/messages.inc                                           |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/si_LK/labels.inc b/program/localization/si_LK/labels.inc
index 571263a..632b967 100644
--- a/program/localization/si_LK/labels.inc
+++ b/program/localization/si_LK/labels.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | language/si/labels.inc                                                |
  |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
diff --git a/program/localization/si_LK/messages.inc b/program/localization/si_LK/messages.inc
index 655132a..61a0b42 100644
--- a/program/localization/si_LK/messages.inc
+++ b/program/localization/si_LK/messages.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | language/si/messages.inc                                              |
  |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
diff --git a/program/localization/sk_SK/labels.inc b/program/localization/sk_SK/labels.inc
index 87cb771..d0b8dab 100644
--- a/program/localization/sk_SK/labels.inc
+++ b/program/localization/sk_SK/labels.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/sk/labels.inc                                                |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/sk_SK/messages.inc b/program/localization/sk_SK/messages.inc
index 859a144..4476fd7 100644
--- a/program/localization/sk_SK/messages.inc
+++ b/program/localization/sk_SK/messages.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/sk/messages.inc                                              |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/sl_SI/labels.inc b/program/localization/sl_SI/labels.inc
index 5c28c23..a9cf88e 100644
--- a/program/localization/sl_SI/labels.inc
+++ b/program/localization/sl_SI/labels.inc
@@ -4,8 +4,8 @@
 +-----------------------------------------------------------------------+
 | language/sl_SI/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/sl_SI/messages.inc b/program/localization/sl_SI/messages.inc
index 1f4d0fa..de05ad5 100644
--- a/program/localization/sl_SI/messages.inc
+++ b/program/localization/sl_SI/messages.inc
@@ -4,7 +4,7 @@
 +-----------------------------------------------------------------------+
 | language/sl_SL/messages.inc                                           |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
+| Language file of the Roundcube Webmail client                         |
 | Copyright (C) 2008-2010, RoundQube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
diff --git a/program/localization/sq_AL/labels.inc b/program/localization/sq_AL/labels.inc
index 22f1c16..2e0f437 100644
--- a/program/localization/sq_AL/labels.inc
+++ b/program/localization/sq_AL/labels.inc
@@ -5,8 +5,8 @@
  +-----------------------------------------------------------------------+
  | language/sq_AL/labels.inc                                             |
  |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
diff --git a/program/localization/sq_AL/messages.inc b/program/localization/sq_AL/messages.inc
index 1300909..d5bcad6 100644
--- a/program/localization/sq_AL/messages.inc
+++ b/program/localization/sq_AL/messages.inc
@@ -5,8 +5,8 @@
  +-----------------------------------------------------------------------+
  | language/sq_AL/messages.inc                                           |
  |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
diff --git a/program/localization/sr_CS/labels.inc b/program/localization/sr_CS/labels.inc
index 96e94d7..780e6d6 100644
--- a/program/localization/sr_CS/labels.inc
+++ b/program/localization/sr_CS/labels.inc
@@ -5,8 +5,8 @@
  +-----------------------------------------------------------------------+
  | language/sr_cyrillic/labels.inc                                       |
  |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
diff --git a/program/localization/sr_CS/messages.inc b/program/localization/sr_CS/messages.inc
index 1c85b4b..4756b5c 100644
--- a/program/localization/sr_CS/messages.inc
+++ b/program/localization/sr_CS/messages.inc
@@ -5,8 +5,8 @@
  +-----------------------------------------------------------------------+
  | language/sr_cyrillic/messages.inc                                     |
  |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
diff --git a/program/localization/sv_SE/labels.inc b/program/localization/sv_SE/labels.inc
index d41e352..f98f5b3 100644
--- a/program/localization/sv_SE/labels.inc
+++ b/program/localization/sv_SE/labels.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/sv_SE/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/sv_SE/messages.inc b/program/localization/sv_SE/messages.inc
index 290b5ff..1fb72ec 100644
--- a/program/localization/sv_SE/messages.inc
+++ b/program/localization/sv_SE/messages.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/sv_SE/messages.inc                                           |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/ta_IN/labels.inc b/program/localization/ta_IN/labels.inc
index 967c912..9492ad9 100644
--- a/program/localization/ta_IN/labels.inc
+++ b/program/localization/ta_IN/labels.inc
@@ -4,8 +4,8 @@
 +-----------------------------------------------------------------------+
 | language/_NEW_/labels.inc                                             |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2008-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2008-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/ta_IN/messages.inc b/program/localization/ta_IN/messages.inc
index 40255b2..40684a5 100644
--- a/program/localization/ta_IN/messages.inc
+++ b/program/localization/ta_IN/messages.inc
@@ -4,8 +4,8 @@
 +-----------------------------------------------------------------------+
 | language/_NEW_/messages.inc                                           |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2008-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2008-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/th_TH/labels.inc b/program/localization/th_TH/labels.inc
index 1efb345..4daa87b 100644
--- a/program/localization/th_TH/labels.inc
+++ b/program/localization/th_TH/labels.inc
@@ -5,8 +5,8 @@
  +-----------------------------------------------------------------------+
  | language/th_TH/labels.inc                                             |
  |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
diff --git a/program/localization/th_TH/messages.inc b/program/localization/th_TH/messages.inc
index 75b93ab..469436e 100644
--- a/program/localization/th_TH/messages.inc
+++ b/program/localization/th_TH/messages.inc
@@ -5,8 +5,8 @@
  +-----------------------------------------------------------------------+
  | language/th_TH/messages.inc                                           |
  |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
diff --git a/program/localization/tr_TR/labels.inc b/program/localization/tr_TR/labels.inc
index 53805cd..fc1e0bd 100644
--- a/program/localization/tr_TR/labels.inc
+++ b/program/localization/tr_TR/labels.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/tr/labels.inc                                                |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/tr_TR/messages.inc b/program/localization/tr_TR/messages.inc
index d676f59..2d057d3 100644
--- a/program/localization/tr_TR/messages.inc
+++ b/program/localization/tr_TR/messages.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/tr/messages.inc                                              |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/uk_UA/labels.inc b/program/localization/uk_UA/labels.inc
index 652d7fa..9897db7 100644
--- a/program/localization/uk_UA/labels.inc
+++ b/program/localization/uk_UA/labels.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/uk/labels.inc                                                |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/uk_UA/messages.inc b/program/localization/uk_UA/messages.inc
index d4afc14..b41ca0f 100644
--- a/program/localization/uk_UA/messages.inc
+++ b/program/localization/uk_UA/messages.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | language/uk/messages.inc                                              |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/vi_VN/labels.inc b/program/localization/vi_VN/labels.inc
index 750cb7d..611b5a4 100644
--- a/program/localization/vi_VN/labels.inc
+++ b/program/localization/vi_VN/labels.inc
@@ -5,8 +5,8 @@
  +-----------------------------------------------------------------------+
  | language/vn/labels.inc                                                |
  |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
diff --git a/program/localization/vi_VN/messages.inc b/program/localization/vi_VN/messages.inc
index 886ea28..d060515 100644
--- a/program/localization/vi_VN/messages.inc
+++ b/program/localization/vi_VN/messages.inc
@@ -5,8 +5,8 @@
  +-----------------------------------------------------------------------+
  | language/vn/messages.inc                                              |
  |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
diff --git a/program/localization/zh_CN/labels.inc b/program/localization/zh_CN/labels.inc
index 8921257..acebdf7 100644
--- a/program/localization/zh_CN/labels.inc
+++ b/program/localization/zh_CN/labels.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | localization/zh_CN/labels.inc                                         |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/zh_CN/messages.inc b/program/localization/zh_CN/messages.inc
index cd30b53..5fc0d3f 100644
--- a/program/localization/zh_CN/messages.inc
+++ b/program/localization/zh_CN/messages.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | localization/zh_CN/messages.inc                                       |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/zh_TW/labels.inc b/program/localization/zh_TW/labels.inc
index 52f37fb..a73b851 100644
--- a/program/localization/zh_TW/labels.inc
+++ b/program/localization/zh_TW/labels.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | localization/zh_TW/labels.inc                                         |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/localization/zh_TW/messages.inc b/program/localization/zh_TW/messages.inc
index f66e7e4..6f3d189 100644
--- a/program/localization/zh_TW/messages.inc
+++ b/program/localization/zh_TW/messages.inc
@@ -5,8 +5,8 @@
 +-----------------------------------------------------------------------+
 | localization/zh_TW/messages.inc                                       |
 |                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
diff --git a/program/steps/addressbook/copy.inc b/program/steps/addressbook/copy.inc
index 679e999..a37e932 100644
--- a/program/steps/addressbook/copy.inc
+++ b/program/steps/addressbook/copy.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/addressbook/copy.inc                                    |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2007, RoundCube Dev. - Switzerland                      |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2007, Roundcube Dev. - Switzerland                      |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/addressbook/delete.inc b/program/steps/addressbook/delete.inc
index 9071973..08ae36d 100644
--- a/program/steps/addressbook/delete.inc
+++ b/program/steps/addressbook/delete.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/addressbook/delete.inc                                  |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/addressbook/edit.inc b/program/steps/addressbook/edit.inc
index 96a2f39..71c706f 100644
--- a/program/steps/addressbook/edit.inc
+++ b/program/steps/addressbook/edit.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/addressbook/edit.inc                                    |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2007, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/addressbook/export.inc b/program/steps/addressbook/export.inc
index 15d1e72..98f8b92 100644
--- a/program/steps/addressbook/export.inc
+++ b/program/steps/addressbook/export.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/addressbook/export.inc                                  |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2008-2009, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2008-2009, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc
index a43acd9..561b4fe 100644
--- a/program/steps/addressbook/func.inc
+++ b/program/steps/addressbook/func.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/addressbook/func.inc                                    |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2007, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/addressbook/groups.inc b/program/steps/addressbook/groups.inc
index 004096a..542628e 100644
--- a/program/steps/addressbook/groups.inc
+++ b/program/steps/addressbook/groups.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/addressbook/groups.inc                                  |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2010, RoundCube Dev. - Switzerland                      |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2010, Roundcube Dev. - Switzerland                      |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/addressbook/import.inc b/program/steps/addressbook/import.inc
index ec77f89..ac6dc92 100644
--- a/program/steps/addressbook/import.inc
+++ b/program/steps/addressbook/import.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/addressbook/import.inc                                  |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2008-2009, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2008-2009, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/addressbook/list.inc b/program/steps/addressbook/list.inc
index cc8c0bb..813f1c3 100644
--- a/program/steps/addressbook/list.inc
+++ b/program/steps/addressbook/list.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/addressbook/list.inc                                    |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2007, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/addressbook/mailto.inc b/program/steps/addressbook/mailto.inc
index 4b4f524..a1b1f31 100644
--- a/program/steps/addressbook/mailto.inc
+++ b/program/steps/addressbook/mailto.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/addressbook/mailto.inc                                  |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2007, RoundCube Dev. - Switzerland                      |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2007, Roundcube Dev. - Switzerland                      |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/addressbook/save.inc b/program/steps/addressbook/save.inc
index dbc7808..b4b9ae4 100644
--- a/program/steps/addressbook/save.inc
+++ b/program/steps/addressbook/save.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/addressbook/save.inc                                    |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/addressbook/search.inc b/program/steps/addressbook/search.inc
index d23bf5d..b62de49 100644
--- a/program/steps/addressbook/search.inc
+++ b/program/steps/addressbook/search.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/addressbook/search.inc                                  |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2007, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/addressbook/show.inc b/program/steps/addressbook/show.inc
index f3bea30..c714ce1 100644
--- a/program/steps/addressbook/show.inc
+++ b/program/steps/addressbook/show.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/addressbook/show.inc                                    |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/mail/addcontact.inc b/program/steps/mail/addcontact.inc
index 8a071be..128cb4e 100644
--- a/program/steps/mail/addcontact.inc
+++ b/program/steps/mail/addcontact.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/mail/addcontact.inc                                     |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/mail/attachments.inc b/program/steps/mail/attachments.inc
index 797c30c..22445b5 100644
--- a/program/steps/mail/attachments.inc
+++ b/program/steps/mail/attachments.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/mail/attachments.inc                                    |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/mail/autocomplete.inc b/program/steps/mail/autocomplete.inc
index 4b6b6f9..b42ebf8 100644
--- a/program/steps/mail/autocomplete.inc
+++ b/program/steps/mail/autocomplete.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/mail/autocomplete.inc                                   |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2008-2010, RoundCube Dev Team                           |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2008-2010, Roundcube Dev Team                           |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/mail/check_recent.inc b/program/steps/mail/check_recent.inc
index eb58831..dfb5822 100644
--- a/program/steps/mail/check_recent.inc
+++ b/program/steps/mail/check_recent.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/mail/check_recent.inc                                   |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 1320102..521a0f7 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/mail/compose.inc                                        |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/mail/copy.inc b/program/steps/mail/copy.inc
index 175994f..b42ef39 100644
--- a/program/steps/mail/copy.inc
+++ b/program/steps/mail/copy.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/mail/copy.inc                                           |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/mail/folders.inc b/program/steps/mail/folders.inc
index ce3406c..95d138c 100644
--- a/program/steps/mail/folders.inc
+++ b/program/steps/mail/folders.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/mail/folders.inc                                        |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 91fd05e..b191072 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/mail/func.inc                                           |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -1613,7 +1613,7 @@
       "\t" . rcube_label("sent") . ': ' . format_date($message->headers->date, $RCMAIL->config->get('date_long')) . "\r\n" .
       "\r\n" . rcube_label("receiptnote") . "\r\n";
 
-    $ua = $RCMAIL->config->get('useragent', "RoundCube Webmail (Version ".RCMAIL_VERSION.")");
+    $ua = $RCMAIL->config->get('useragent', "Roundcube Webmail (Version ".RCMAIL_VERSION.")");
     $report = "Reporting-UA: $ua\r\n";
 
     if ($message->headers->to)
diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc
index 07af755..3c4e4fb 100644
--- a/program/steps/mail/get.inc
+++ b/program/steps/mail/get.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/mail/get.inc                                            |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/mail/getunread.inc b/program/steps/mail/getunread.inc
index af927fc..a035f52 100644
--- a/program/steps/mail/getunread.inc
+++ b/program/steps/mail/getunread.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/mail/getunread.inc                                      |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/mail/headers.inc b/program/steps/mail/headers.inc
index 5d071cc..bc7f942 100644
--- a/program/steps/mail/headers.inc
+++ b/program/steps/mail/headers.inc
@@ -3,8 +3,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/mail/headers.inc                                        |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2007, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/mail/list.inc b/program/steps/mail/list.inc
index 9f59243..b5ee1b6 100644
--- a/program/steps/mail/list.inc
+++ b/program/steps/mail/list.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/mail/list.inc                                           |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2007, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/mail/mark.inc b/program/steps/mail/mark.inc
index 6d102af..a24714e 100644
--- a/program/steps/mail/mark.inc
+++ b/program/steps/mail/mark.inc
@@ -3,8 +3,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/mail/mark.inc                                           |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc
index 3947ad1..3650782 100644
--- a/program/steps/mail/move_del.inc
+++ b/program/steps/mail/move_del.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/mail/move_del.inc                                       |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index 3902b9a..75d406b 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/mail/sendmail.inc                                       |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/mail/sendmdn.inc b/program/steps/mail/sendmdn.inc
index 880c5c5..f46e382 100644
--- a/program/steps/mail/sendmdn.inc
+++ b/program/steps/mail/sendmdn.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/mail/sendmdn.inc                                        |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2008-2009, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2008-2009, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index 69b30eb..3d42de6 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/mail/show.inc                                           |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/mail/viewsource.inc b/program/steps/mail/viewsource.inc
index 9b65726..6b0f0d4 100644
--- a/program/steps/mail/viewsource.inc
+++ b/program/steps/mail/viewsource.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/mail/viewsource.inc                                     |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/settings/delete_identity.inc b/program/steps/settings/delete_identity.inc
index 06bcab9..4667fd3 100644
--- a/program/steps/settings/delete_identity.inc
+++ b/program/steps/settings/delete_identity.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/settings/delete_identity.inc                            |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/settings/edit_identity.inc b/program/steps/settings/edit_identity.inc
index bf2050d..1a3df95 100644
--- a/program/steps/settings/edit_identity.inc
+++ b/program/steps/settings/edit_identity.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/settings/edit_identity.inc                              |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2007, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/settings/edit_prefs.inc b/program/steps/settings/edit_prefs.inc
index 5a6e7e8..8679c94 100644
--- a/program/steps/settings/edit_prefs.inc
+++ b/program/steps/settings/edit_prefs.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/settings/edit_prefs.inc                                 |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2007, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index c8e46a3..196a509 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/settings/func.inc                                       |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2007, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/settings/identities.inc b/program/steps/settings/identities.inc
index ca332da..2f59453 100644
--- a/program/steps/settings/identities.inc
+++ b/program/steps/settings/identities.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/settings/identities.inc                                 |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2007, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/settings/manage_folders.inc b/program/steps/settings/manage_folders.inc
index 6664478..4a0bb69 100644
--- a/program/steps/settings/manage_folders.inc
+++ b/program/steps/settings/manage_folders.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/settings/manage_folders.inc                             |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/settings/save_identity.inc b/program/steps/settings/save_identity.inc
index 6c2cd81..895ddea 100644
--- a/program/steps/settings/save_identity.inc
+++ b/program/steps/settings/save_identity.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/settings/save_identity.inc                              |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc
index a8ff878..d76bdab 100644
--- a/program/steps/settings/save_prefs.inc
+++ b/program/steps/settings/save_prefs.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/settings/save_prefs.inc                                 |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/utils/error.inc b/program/steps/utils/error.inc
index 083a256..c472faa 100644
--- a/program/steps/utils/error.inc
+++ b/program/steps/utils/error.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/utils/error.inc                                         |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -110,7 +110,7 @@
 print <<<EOF
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"><head>
-<title>RoundCube|Mail : ERROR $ERROR_CODE</title>
+<title>Roundcube|Mail : ERROR $ERROR_CODE</title>
 <link rel="stylesheet" type="text/css" href="skins/$__skin/common.css" />
 </head>
 <body>
diff --git a/program/steps/utils/html2text.inc b/program/steps/utils/html2text.inc
index 2327f7f..f97e1c6 100644
--- a/program/steps/utils/html2text.inc
+++ b/program/steps/utils/html2text.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/utils/html2text.inc                                     |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/utils/killcache.inc b/program/steps/utils/killcache.inc
index b49d36c..4e40adf 100644
--- a/program/steps/utils/killcache.inc
+++ b/program/steps/utils/killcache.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/utils/killcache.inc                                     |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/utils/modcss.inc b/program/steps/utils/modcss.inc
index 00d9433..7817795 100644
--- a/program/steps/utils/modcss.inc
+++ b/program/steps/utils/modcss.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/utils/modcss.inc                                        |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2007-2010, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2007-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/utils/save_pref.inc b/program/steps/utils/save_pref.inc
index e1c2278..d7cb8bf 100644
--- a/program/steps/utils/save_pref.inc
+++ b/program/steps/utils/save_pref.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/utils/save_pref.inc                                     |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/utils/spell.inc b/program/steps/utils/spell.inc
index 3778865..f61939d 100644
--- a/program/steps/utils/spell.inc
+++ b/program/steps/utils/spell.inc
@@ -4,7 +4,7 @@
  +-----------------------------------------------------------------------+
  | program/steps/utils/spell.inc                                         |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
+ | This file is part of the Roundcube Webmail client                     |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/utils/spell_googie.inc b/program/steps/utils/spell_googie.inc
index 9d47a51..4c98dd6 100644
--- a/program/steps/utils/spell_googie.inc
+++ b/program/steps/utils/spell_googie.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/utils/spell_googie.inc                                  |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2007, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/utils/spell_html_googie.inc b/program/steps/utils/spell_html_googie.inc
index 7a301b6..1a4fbd4 100644
--- a/program/steps/utils/spell_html_googie.inc
+++ b/program/steps/utils/spell_html_googie.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/utils/spell_html_googie.inc                             |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/utils/spell_html_pspell.inc b/program/steps/utils/spell_html_pspell.inc
index 13344b0..b38324c 100644
--- a/program/steps/utils/spell_html_pspell.inc
+++ b/program/steps/utils/spell_html_pspell.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/utils/spell_pspell_tiny.inc                             |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/program/steps/utils/spell_pspell.inc b/program/steps/utils/spell_pspell.inc
index 58720ff..44415cd 100644
--- a/program/steps/utils/spell_pspell.inc
+++ b/program/steps/utils/spell_pspell.inc
@@ -4,7 +4,7 @@
  +-----------------------------------------------------------------------+
  | program/steps/utils/spell_pspell.inc                                  |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
+ | This file is part of the Roundcube Webmail client                     |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
diff --git a/skins/default/addressbook.css b/skins/default/addressbook.css
index ec9e632..a90dcf1 100644
--- a/skins/default/addressbook.css
+++ b/skins/default/addressbook.css
@@ -1,4 +1,4 @@
-/***** RoundCube|Mail address book task styles *****/
+/***** Roundcube|Mail address book task styles *****/
 
 #abooktoolbar
 {
diff --git a/skins/default/common.css b/skins/default/common.css
index b1ce779..4a91552 100644
--- a/skins/default/common.css
+++ b/skins/default/common.css
@@ -1,4 +1,4 @@
-/***** RoundCube|Mail basic styles *****/
+/***** Roundcube|Mail basic styles *****/
 
 body
 {
diff --git a/skins/default/functions.js b/skins/default/functions.js
index c69a3cf..338ce20 100644
--- a/skins/default/functions.js
+++ b/skins/default/functions.js
@@ -1,5 +1,5 @@
 /**
- * RoundCube functions for default skin interface
+ * Roundcube functions for default skin interface
  */
 
 /**
diff --git a/skins/default/mail.css b/skins/default/mail.css
index 8830885..fcc905c 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -1,4 +1,4 @@
-/***** RoundCube|Mail mail task styles *****/
+/***** Roundcube|Mail mail task styles *****/
 
 
 #messagetoolbar
diff --git a/skins/default/print.css b/skins/default/print.css
index 2dbbbf6..76c3e0c 100644
--- a/skins/default/print.css
+++ b/skins/default/print.css
@@ -1,4 +1,4 @@
-/***** RoundCube|Mail message print styles *****/
+/***** Roundcube|Mail message print styles *****/
 
 body
 {
diff --git a/skins/default/settings.css b/skins/default/settings.css
index 876a4b7..83bd4e3 100644
--- a/skins/default/settings.css
+++ b/skins/default/settings.css
@@ -1,4 +1,4 @@
-/***** RoundCube|Mail settings task styles *****/
+/***** Roundcube|Mail settings task styles *****/
 
 
 #tabsbar
diff --git a/skins/default/splitter.js b/skins/default/splitter.js
index 2a16b0b..de228c5 100644
--- a/skins/default/splitter.js
+++ b/skins/default/splitter.js
@@ -1,6 +1,6 @@
 
 /**
- * RoundCube splitter GUI class
+ * Roundcube splitter GUI class
  *
  * @constructor
  */
diff --git a/tests/runtests.sh b/tests/runtests.sh
index aeeea94..daa8814 100755
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -5,8 +5,8 @@
  +-----------------------------------------------------------------------+
  | tests/runtests.sh                                                     |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2009, RoundCube Dev. - Switzerland                      |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2009, Roundcube Dev. - Switzerland                      |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -42,7 +42,7 @@
   $testfiles = glob(TESTS_DIR . '*.php');
 }
 
-$test = new TestSuite('RoundCube unit tests');
+$test = new TestSuite('Roundcube unit tests');
 $reporter = new TextReporter();
 
 foreach ($testfiles as $fn) {
diff --git a/tests/src/htmlbody.txt b/tests/src/htmlbody.txt
index a10bfe1..66286e6 100644
--- a/tests/src/htmlbody.txt
+++ b/tests/src/htmlbody.txt
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
-<title>RoundCube Test Message</title>
+<title>Roundcube Test Message</title>
 <link rel="stylesheet" type="text/css" href="http://anysite.net/styles/mail.css">
 <style type="text/css">
 

--
Gitblit v1.9.1