diff options
29 files changed, 18 insertions, 34 deletions
diff --git a/program/include/main.inc b/program/include/main.inc index 2d7cfeaad..019056a5e 100644 --- a/program/include/main.inc +++ b/program/include/main.inc @@ -720,7 +720,7 @@ function rcube_remote_response($js_code, $flush=FALSE) { $s_header_sent = TRUE; send_nocacheing_headers(); - header('Content-Type: application/x-javascript'); + header('Content-Type: application/x-javascript; charset='.$CHARSET); print '/** remote response ['.date('d/M/Y h:i:s O')."] **/\n"; } @@ -1192,14 +1192,16 @@ function rcube_xml_command($command, $str_attrib, $a_attrib=NULL) $task = $GLOBALS['_task']; $title = !empty($CONFIG['product_name']) ? $CONFIG['product_name'].' :: ' : ''; - if ($task=='mail' && isset($GLOBALS['MESSAGE']['subject'])) + if ($task=='login') + $title = rcube_label(array('name' => 'welcome', 'vars' => array('product' => $CONFIG['product_name']))); + else if ($task=='mail' && isset($GLOBALS['MESSAGE']['subject'])) $title .= $GLOBALS['MESSAGE']['subject']; else if (isset($GLOBALS['PAGE_TITLE'])) $title .= $GLOBALS['PAGE_TITLE']; else if ($task=='mail' && ($mbox_name = $IMAP->get_mailbox_name())) $title .= rcube_charset_convert($mbox_name, 'UTF-7', 'UTF-8'); else - $title .= $task; + $title .= ucfirst($task); return rep_specialchars_output($title, 'html', 'all'); } diff --git a/program/localization/ca/labels.inc b/program/localization/ca/labels.inc index e17fd459a..13f1a2ca8 100644 --- a/program/localization/ca/labels.inc +++ b/program/localization/ca/labels.inc @@ -18,7 +18,6 @@ $labels = array(); // login page -$labels['welcome'] = 'Welcome to Roundcube|Mail'; $labels['username'] = 'Nom d\'usuari'; $labels['password'] = 'Contrasenya'; $labels['server'] = 'Servidor'; diff --git a/program/localization/cn/labels.inc b/program/localization/cn/labels.inc index 398e7acef..e1cbcc469 100644 --- a/program/localization/cn/labels.inc +++ b/program/localization/cn/labels.inc @@ -20,7 +20,6 @@ $labels = array(); // login page -$labels['welcome'] = 'Welcome to Roundcube|Mail'; $labels['username'] = '用户名'; $labels['password'] = '密码'; $labels['server'] = '服务器'; diff --git a/program/localization/cz/labels.inc b/program/localization/cz/labels.inc index 3573a7956..c942fa029 100755 --- a/program/localization/cz/labels.inc +++ b/program/localization/cz/labels.inc @@ -19,7 +19,6 @@ $labels = array(); // login page -$labels['welcome'] = 'Welcome to Roundcube|Mail'; $labels['username'] = 'Uživatel'; $labels['password'] = 'Heslo'; $labels['server'] = 'Server'; diff --git a/program/localization/da/labels.inc b/program/localization/da/labels.inc index ad083024f..d72156c08 100644 --- a/program/localization/da/labels.inc +++ b/program/localization/da/labels.inc @@ -21,7 +21,6 @@ $labels = array(); // login page -$labels['welcome'] = 'Welcome to Roundcube|Mail'; $labels['username'] = 'Brugernavn'; $labels['password'] = 'Adgangskode'; $labels['server'] = 'Server'; diff --git a/program/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc index 72fc87862..c7baf0b43 100644 --- a/program/localization/de_CH/labels.inc +++ b/program/localization/de_CH/labels.inc @@ -20,7 +20,7 @@ $labels = array(); // login page // Login-Seite -$labels['welcome'] = 'Welcome to Roundcube|Mail'; +$labels['welcome'] = 'Willkommen bei $product'; $labels['username'] = 'Benutzername'; $labels['password'] = 'Passwort'; $labels['server'] = 'Server'; diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc index 249e6ec8f..7e7f5de22 100644 --- a/program/localization/de_DE/labels.inc +++ b/program/localization/de_DE/labels.inc @@ -21,7 +21,7 @@ $labels = array(); // login page // Login-Seite -$labels['welcome'] = 'Welcome to Roundcube|Mail'; +$labels['welcome'] = 'Willkommen bei $product'; $labels['username'] = 'Benutzername'; $labels['password'] = 'Passwort'; $labels['server'] = 'Server'; diff --git a/program/localization/ee/labels.inc b/program/localization/ee/labels.inc index 4618d618c..3c0bac2ff 100644 --- a/program/localization/ee/labels.inc +++ b/program/localization/ee/labels.inc @@ -19,7 +19,6 @@ $labels = array(); // login page -$labels['welcome'] = 'Welcome to Roundcube|Mail'; $labels['username'] = 'Kasutajanimi'; $labels['password'] = 'Parool'; $labels['server'] = 'Server'; diff --git a/program/localization/el/labels.inc b/program/localization/el/labels.inc index 1641e3ef7..d5e927006 100755 --- a/program/localization/el/labels.inc +++ b/program/localization/el/labels.inc @@ -21,7 +21,6 @@ $labels = array(); // login page -$labels['welcome'] = 'Welcome to Roundcube|Mail'; $labels['username'] = 'Όνομα χρήστη'; $labels['password'] = 'Κωδικός πρόσβασης'; $labels['server'] = 'Διακομιστής'; diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc index 7f23075f3..77990d12e 100644 --- a/program/localization/en_GB/labels.inc +++ b/program/localization/en_GB/labels.inc @@ -19,7 +19,7 @@ $labels = array(); // login page -$labels['welcome'] = 'Welcome to Roundcube|Mail'; +$labels['welcome'] = 'Welcome to $product'; $labels['username'] = 'Username'; $labels['password'] = 'Password'; $labels['server'] = 'Server'; diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc index e280dbb29..afb6c8709 100644 --- a/program/localization/en_US/labels.inc +++ b/program/localization/en_US/labels.inc @@ -2,7 +2,7 @@ /* +-----------------------------------------------------------------------+ - | language/en/labels.inc | + | language/en_US/labels.inc | | | | Language file of the RoundCube Webmail client | | Copyright (C) 2005, RoundQube Dev. - Switzerland | @@ -19,7 +19,7 @@ $labels = array(); // login page -$labels['welcome'] = 'Welcome to Roundcube|Mail'; +$labels['welcome'] = 'Welcome to $product'; $labels['username'] = 'Username'; $labels['password'] = 'Password'; $labels['server'] = 'Server'; diff --git a/program/localization/es/labels.inc b/program/localization/es/labels.inc index 6b15fc996..ca083491a 100644 --- a/program/localization/es/labels.inc +++ b/program/localization/es/labels.inc @@ -24,7 +24,6 @@ $labels = array(); // login page -$labels['welcome'] = 'Welcome to Roundcube|Mail'; $labels['username'] = 'Nombre de usuario'; $labels['password'] = 'Contraseña'; $labels['server'] = 'Servidor'; diff --git a/program/localization/fi/labels.inc b/program/localization/fi/labels.inc index 2a18206b8..87dcc8bef 100644 --- a/program/localization/fi/labels.inc +++ b/program/localization/fi/labels.inc @@ -19,7 +19,6 @@ $labels = array(); // login page -$labels['welcome'] = 'Welcome to Roundcube|Mail'; $labels['username'] = 'Käyttäjätunnus'; $labels['password'] = 'Salasana'; $labels['server'] = 'Palvelin'; diff --git a/program/localization/fr/labels.inc b/program/localization/fr/labels.inc index 5bda036ec..84be53880 100644 --- a/program/localization/fr/labels.inc +++ b/program/localization/fr/labels.inc @@ -19,7 +19,7 @@ $labels = array(); // login page -$labels['welcome'] = 'Welcome to Roundcube|Mail'; +$labels['welcome'] = 'Bienvenue à $product'; $labels['username'] = 'ID utilisateur'; $labels['password'] = 'Mot de passe'; $labels['server'] = 'Serveur'; diff --git a/program/localization/hr/labels.inc b/program/localization/hr/labels.inc index a8edf6c50..9ead5fbad 100644 --- a/program/localization/hr/labels.inc +++ b/program/localization/hr/labels.inc @@ -19,7 +19,6 @@ $labels = array(); // login page // Login-Seite -$labels['welcome'] = 'Welcome to Roundcube|Mail'; $labels['username'] = 'E-mail Korisnika'; $labels['password'] = 'Lozinka'; $labels['server'] = 'Server'; diff --git a/program/localization/hu/labels.inc b/program/localization/hu/labels.inc index 0a18f3586..1a037500d 100644 --- a/program/localization/hu/labels.inc +++ b/program/localization/hu/labels.inc @@ -20,7 +20,6 @@ $labels = array(); // login page -$labels['welcome'] = 'Welcome to Roundcube|Mail'; $labels['username'] = 'Felhasználónév'; $labels['password'] = 'Jelszó'; $labels['server'] = 'Kiszolgáló'; diff --git a/program/localization/it/labels.inc b/program/localization/it/labels.inc index 3d80005da..b95c2e79d 100644 --- a/program/localization/it/labels.inc +++ b/program/localization/it/labels.inc @@ -9,7 +9,7 @@ | Licensed under the GNU GPL | | | +-----------------------------------------------------------------------+ - | Author: Paolo Asperti <paolo@asperti.com> | + | Author: Paolo Asperti <paolo@asperti.com> | +-----------------------------------------------------------------------+ $Id$ @@ -19,7 +19,7 @@ $labels = array(); // login page -$labels['welcome'] = 'Welcome to Roundcube|Mail'; +$labels['welcome'] = 'Benvenuto a $product'; $labels['username'] = 'Utente'; $labels['password'] = 'Password'; $labels['server'] = 'Server'; diff --git a/program/localization/nb_NO/labels.inc b/program/localization/nb_NO/labels.inc index f3b510875..3c9883e59 100644 --- a/program/localization/nb_NO/labels.inc +++ b/program/localization/nb_NO/labels.inc @@ -20,7 +20,6 @@ $labels = array(); // login page -$labels['welcome'] = 'Welcome to Roundcube|Mail'; $labels['username'] = 'Brukernavn:'; $labels['password'] = 'Passord:'; $labels['server'] = 'Server'; diff --git a/program/localization/nl_BE/labels.inc b/program/localization/nl_BE/labels.inc index 38d937c2c..ccaf14012 100644 --- a/program/localization/nl_BE/labels.inc +++ b/program/localization/nl_BE/labels.inc @@ -19,7 +19,7 @@ $labels = array(); // login page -$labels['welcome'] = 'Welcome to Roundcube|Mail'; +$labels['welcome'] = 'Onthaal aan $product'; $labels['username'] = 'Gebruikersnaam'; $labels['password'] = 'Wachtwoord'; $labels['server'] = 'Server'; diff --git a/program/localization/nl_NL/labels.inc b/program/localization/nl_NL/labels.inc index 9c14f33ea..f6e55a28a 100644 --- a/program/localization/nl_NL/labels.inc +++ b/program/localization/nl_NL/labels.inc @@ -19,7 +19,7 @@ $labels = array(); // login page -$labels['welcome'] = 'Welcome to Roundcube|Mail'; +$labels['welcome'] = 'Onthaal aan $product'; $labels['username'] = 'Gebruikersnaam'; $labels['password'] = 'Wachtwoord'; $labels['server'] = 'Server'; diff --git a/program/localization/pl/labels.inc b/program/localization/pl/labels.inc index f62f8f146..33ed16f21 100644 --- a/program/localization/pl/labels.inc +++ b/program/localization/pl/labels.inc @@ -19,7 +19,6 @@ $labels = array(); // login page -$labels['welcome'] = 'Welcome to Roundcube|Mail'; $labels['username'] = 'E-mail'; $labels['password'] = 'Hasło'; $labels['server'] = 'Serwer'; diff --git a/program/localization/pt_BR/labels.inc b/program/localization/pt_BR/labels.inc index 2c881cd4e..75e487255 100644 --- a/program/localization/pt_BR/labels.inc +++ b/program/localization/pt_BR/labels.inc @@ -18,8 +18,7 @@ $labels = array(); -// Página de login -$labels['welcome'] = 'Welcome to Roundcube|Mail'; +// Página de loginOnthaal aan $product $labels['username'] = 'Usuário'; $labels['password'] = 'Senha'; $labels['server'] = 'Servidor'; diff --git a/program/localization/ro/labels.inc b/program/localization/ro/labels.inc index b855ffe55..764f4620b 100644 --- a/program/localization/ro/labels.inc +++ b/program/localization/ro/labels.inc @@ -19,7 +19,6 @@ $labels = array(); // login page -$labels['welcome'] = 'Welcome to Roundcube|Mail'; $labels['username'] = 'Utilizator'; $labels['password'] = 'Parola'; $labels['server'] = 'Server'; diff --git a/program/localization/ru/labels.inc b/program/localization/ru/labels.inc index 2aa622306..efdaeef1b 100755 --- a/program/localization/ru/labels.inc +++ b/program/localization/ru/labels.inc @@ -19,7 +19,6 @@ $labels = array(); // login page -$labels['welcome'] = 'Welcome to Roundcube|Mail'; $labels['username'] = 'Логин'; $labels['password'] = 'Пароль'; $labels['server'] = 'Сервер'; diff --git a/program/localization/se/labels.inc b/program/localization/se/labels.inc index 145a5d514..1baf27202 100644 --- a/program/localization/se/labels.inc +++ b/program/localization/se/labels.inc @@ -19,7 +19,6 @@ $labels = array(); // login page -$labels['welcome'] = 'Welcome to Roundcube|Mail'; $labels['username'] = 'Användarnamn'; $labels['password'] = 'Lösenord'; $labels['server'] = 'Server'; diff --git a/program/localization/sk/labels.inc b/program/localization/sk/labels.inc index 5b28dd8e0..e51047552 100644 --- a/program/localization/sk/labels.inc +++ b/program/localization/sk/labels.inc @@ -17,8 +17,8 @@ */ $labels = array(); + // login page -$labels['welcome'] = 'Welcome to Roundcube|Mail'; $labels['username'] = 'Prihlasovacie meno'; $labels['password'] = 'Heslo'; $labels['server'] = 'Server'; diff --git a/program/localization/tr/labels.inc b/program/localization/tr/labels.inc index ca78d583c..be62f170c 100644 --- a/program/localization/tr/labels.inc +++ b/program/localization/tr/labels.inc @@ -20,7 +20,6 @@ $labels = array(); // login page -$labels['welcome'] = 'Welcome to Roundcube|Mail'; $labels['username'] = 'Kullanıcı Adı'; $labels['password'] = 'Şifre'; $labels['server'] = 'Sunucu'; diff --git a/program/localization/tw/labels.inc b/program/localization/tw/labels.inc index cd20b4b99..d88259fa6 100755 --- a/program/localization/tw/labels.inc +++ b/program/localization/tw/labels.inc @@ -19,7 +19,6 @@ $labels = array(); // login page -$labels['welcome'] = 'Welcome to Roundcube|Mail'; $labels['username'] = '使用者名稱'; $labels['password'] = '密碼'; $labels['server'] = '伺服器'; diff --git a/skins/default/templates/login.html b/skins/default/templates/login.html index ae2804d1c..66ec6f242 100644 --- a/skins/default/templates/login.html +++ b/skins/default/templates/login.html @@ -1,7 +1,7 @@ <!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:label name="welcome" /></title> +<title><roundcube:object name="pagetitle" /></title> <roundcube:include file="/includes/links.html" /> <style type="text/css"> |