Merge
authorDa Risk <darisk972@gmail.com>
Tue, 21 Dec 2010 23:27:33 +0100
changeset 830 e6f793612724
parent 829 4b36a3c452e6 (current diff)
parent 828 fec6d1862714 (diff)
child 831 7b8af7616ba9
Merge
--- a/AndroidManifest.xml	Tue Dec 21 23:26:51 2010 +0100
+++ b/AndroidManifest.xml	Tue Dec 21 23:27:33 2010 +0100
@@ -87,11 +87,12 @@
 	</application>
 	<permission android:permissionGroup="android.permission-group.NETWORK"
 		android:label="BeemService" android:description="@string/BeemServiceDescription"
-		android:name="com.beem.project.beem.BEEM_SERVICE"></permission>
-	<uses-permission android:name="android.permission.INTERNET"></uses-permission>
-	<uses-permission android:name="android.permission.VIBRATE"></uses-permission>
-	<uses-permission android:name="com.beem.project.beem.BEEM_SERVICE"></uses-permission>
-	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission>
+		android:name="com.beem.project.beem.BEEM_SERVICE"/>
+	<uses-permission android:name="android.permission.INTERNET"/>
+	<uses-permission android:name="android.permission.VIBRATE"/>
+	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+	<uses-permission android:name="com.beem.project.beem.BEEM_SERVICE"/>
 	<uses-sdk android:minSdkVersion="3" />
 	<supports-screens android:largeScreens="true"
 		android:normalScreens="true" android:smallScreens="true" android:anyDensity="true" />
--- a/CREDITS	Tue Dec 21 23:26:51 2010 +0100
+++ b/CREDITS	Tue Dec 21 23:27:33 2010 +0100
@@ -16,6 +16,9 @@
 Tranlators :
 GoApk http://goapk.com for chinese translations
 Daniel Hofmann for german translations
+Andrea Selva for italian translations
+Erik Lindström for swedish translations
+
 
 Thanks to all !
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/res/values-it/strings.xml	Tue Dec 21 23:27:33 2010 +0100
@@ -0,0 +1,310 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<!-- Generic terms -->
+	<string name="app_name">Beem</string>
+	<string name="OkButton">Ok</string>
+	<string name="ClearButton">Pulisci</string>
+	<string name="CancelButton">Annulla</string>
+	<string name="AcceptButton">Autorizza</string>
+	<string name="RefuseButton">Proibisci</string>
+	<string name="JabberID">Jabber ID</string>
+	<string name="Password">Password</string>
+	<string name="Continue">Continua</string>
+
+	<!--  AccountConfigure class -->
+	<string name="AccountConfigureManualConfiguration">Configurazione Manuale</string>
+
+	<!--  Beem class -->
+	<string name="BeemJabberID">Jabber ID</string>
+
+	<!--  BeemApplication class -->
+	<string name="BeemApplicationConnect">Connessione...</string>
+
+	<!--  BeemService class -->
+	<string name="BeemServiceDescription">Usa il sservizio Beem</string>
+	<string name="BeemServiceCreated">Create il servizio Bemm</string>
+	<string name="BeemServiceDestroyed">Rimosso il servizio Beem</string>
+
+	<!--  ContactDialog class -->
+	<string name="CDChat">Chat</string>
+	<string name="CDCall">Chiamate</string>
+	<string name="CDInfos">Gestisci Utente</string>
+
+	<!-- AddContact class -->
+	<string name="AddCActTitle">Beem - Aggiungi un contatto</string>
+
+	<string name="AddCLogin">Username</string>
+	<string name="AddCAlias">Alias</string>
+	<string name="AddCGroup">Gruppo</string>
+	<string name="AddCOkButton">Aggiungi</string>
+	<string name="AddCContactAdded">Aggiunto contatto</string>
+	<string name="AddCContactAddedError">Errore Contatto non aggiunto</string>
+	<string name="AddCContactAddedLoginError">Errore di accesso</string>
+	<string name="AddCBadForm">Forma errata</string>
+	<string name="AddCContactAlready">Contatto già esistente</string>
+
+	<!--  ChangeStatus class -->
+	<string name="ChangeStatusActTitle">Beem - Cambia il mio stato</string>
+	<string name="ChangeStatusType">Il mio stato</string>
+	<string name="ChangeStatusMessage">Messaggio personale</string>
+	<string name="OpenContactList">Apri lista contatti</string>
+	
+	<string name="MenuAddContact">Aggiungi un nuovo cotatto</string>
+	<string name="MenuAccountAbout">Progetto Beem</string>
+	<string name="MenuAccountCreate">Crea un account</string>
+	<string name="MenuConnection">Modifica account</string>
+	<string name="ChangeStatusOk">Aggiornamento stato</string>
+	<string name="ChangeStatusNoChange">Nessun cambiamento</string>
+
+	<!-- Settings class -->
+	<string name="SettingsText">Modifica il tuo username</string>
+	<string name="SettingsPassword">Modifica la tua password</string>
+	<string name="SettingsProxy">Proxy</string>
+	<string name="SettingsProxyProxy">Usa un server proxy</string>
+	<string name="SettingsProxySummary">Accedi attraverso un server proxy</string>
+	<string name="SettingsProxyType">Protocollo</string>
+	<string name="SettingsProxyTypeSummary">Scegli il tipo del server proxy</string>
+	<string name="SettingsProxyServer">Modifica l\'indirizzo del server proxy</string>
+	<string name="SettingsProxyPort">Modifica la porta del server proxy</string>
+	<string name="SettingsProxyUser">Opzionale, permetti l\'autenticazione di te stesso sul server proxy</string>
+	<string name="SettingsProxyPassword">Opzionale, permetti l\'autenticazione di te stesso sul server proxy</string>
+	<string name="SettingsAdvanced">Avanzate</string>
+	<string name="SettingsAdvancedOptions">Opzioni specifiche del server</string>
+	<string name="SettingsAdvancedRecoDelay">Modifica ritardo di ri-connessione</string>
+	<string name="SettingsAdvancedSpecOpt">Abilita se vuoi usare un server specifico per la tua connessione</string>
+	<string name="SettingsAdvancedAddOpt">Modifica l\'indirizzo del server</string>
+	<string name="SettingsAdvancedPortOpt">Modifica la porta del server</string>
+	<string name="SettingsResourceTitle">Risorsa</string>
+	<string name="SettingsPriorityTitle">Priorità</string>
+	<string name="SettingsResourceSummary">Imposta la risorsa XMPP del tuo client </string>
+	<string name="SettingsPrioritySummary">Imposta la priorità del tuo client</string>
+	<string name="contact_list_preferences">Lista amici</string>
+	<string name="contact_list_preferences_sum">Un insieme di opzioni di visualizzazione per la tua lista amizie
+	</string>
+	<string name="CLP_hide_groups">Nascondi gruppi</string>	
+	<string name="CLP_hide_groups_sum">Abilita quest\'opzione per nascondere i gruppi</string>
+	<string name="CLP_hidden_contact">Nascondi le amizie</string>
+	<string name="CLP_hidden_contact_sum">Abilita quest\'opzione per nascondere gli amici non connessi
+	</string>
+	<string name="settings_account_username">Username</string>
+	<string name="login_username_info_default">beem@beem-project.com</string>
+	<string name="settings_account_password">Password</string>
+	<string name="settings_account_server">Server</string>
+	<string name="settings_account_port">Porta</string>
+	<string name="settings_advanced_service_behaviour">Funzionamento del servizio</string>
+	<string name="settings_advanced_sum">Un insieme di opzioni per gli utenti avanzati</string>
+	<string name="settings_xmpp_server">Indirizzo</string>
+	<string name="comments_xmpp_server">example.com</string>
+	<string name="settings_xmpp_port">Porta</string>
+	<string name="settings_xmpp_use_tls">Usa SSL/TLS</string>
+	<string name="settings_reco_delay">Ritardo di ri-connessione</string>
+	<string name="comments_xmpp_port">Predefinita: 5222</string>
+	<string name="settings_proxy_sum">Impostazioni per l\'utilizzo del proxy</string>
+	<string name="settings_proxy_use">Connetti utilizzando un proxy</string>
+	<string name="settings_proxy_type_prompt">Scegli un tipo di proxy</string>
+	<string name="settings_proxy_server">Server</string>
+	<string name="settings_proxy_port">Porta</string>
+	<string name="comments_proxy_port">Predefinita: 1080</string>
+	<string name="settings_proxy_username">Username</string>
+	<string name="settings_proxy_password">Password</string>
+	<string name="away_chk_title">Abilita Auto-away</string>
+	<string name="away_chk_sum">Cambia lo stato ad Away quando lo schermo è spento</string>
+	<string name="away_message_title">Messaggio Away</string>
+	<string name="away_message_sum">Il messaggio Away che verrà mostrato</string>
+	<string name="away_message_hint">Non sono disponibile, il mio schermo è spento</string>
+	<string name="notification_preferences">Impostazioni di notifica</string>
+	<string name="notification_enable_vibrate_title">Abilita vibrazione</string>
+	<string name="notification_enable_vibrate_sum">Abilita vibrazione per i messaggi in arrivo</string>
+	<string name="notification_snd_title">Suoneria messaggi</string>
+	<string name="notification_snd_sum">Imposta la suoneria per i messaggi in arrivo</string>
+
+	
+	<!-- Subscription class -->
+	<string name="SubscriptAccept">Sottoscrizione accettata</string>
+	<string name="SubscriptError">Errore nella sottoscrizione</string>
+	<string name="SubscriptRefused">Sottoscrizione refiutata</string>
+	<string name="SubscriptText">%s desidera aggiungerti nella sua lista di amicizie. Vuoi autorizzarlo/a?</string>
+	<string name="SubscriptTitle">Autorizza amicizia ?</string>
+
+	<!--  BeemChatManager -->
+	<string name="BeemChatManagerNewMessage">Hai un nuovo messaggio</string>
+
+	<!--  BeemBroadcastReceiver class -->
+	<string name="BeemBroadcastReceiverDisconnect">BEEM: sei stato disconnesso</string>
+
+	<!--  XmppConnectionAdapter class -->
+	<string name="AcceptContactRequest">%s ti ha appena aggiunto alla sue lista di amicizie.</string>
+	<string name="AcceptContactRequestFrom">Autorizza %s a contattarti.</string>
+
+	<!-- Activities -->
+	<string name="login_tag">Beem - Login Activity</string>
+	<string name="edit_settings_name">Beem - Settings</string>
+	<string name="edit_settings_tag">Beem - EditSettings Activity</string>
+	<string name="create_account_name">Beem - Create an account</string>
+	<string name="create_account_tag">Beem - CreateAccount Activity</string>
+	<string name="contact_list_name">Beem - Contacts</string>
+	<string name="contact_list_tag">Beem - ContactList Activity</string>
+	<string name="user_info_name">Beem - User Info</string>
+
+	<!-- Buttons -->
+	<string name="button_create_account">Crea questo account</string>
+	<string name="button_create_login_account">Crea ed usa questo account</string>
+
+	<!-- LogAs Activity -->
+	<string name="login_username">Username</string>
+	<string name="login_password">Password</string>
+	<string name="login_error_dialog_title">Accesso - Errore</string>
+	<string name="login_close_dialog_button">Chiudi</string>
+	<string name="login_menu_create_account">Crea un account</string>
+	<string name="login_menu_settings">Impostazioni</string>
+	<string name="login_menu_about">Informazioni su</string>
+	<string name="login_about_title">Beem %s - Informazioni</string>
+	<string name="login_about_msg">
+		Beem è un progetto innovativo EPITECH. Visitaci su
+		http://www.beem-project.com !
+	</string>
+	<string name="login_about_button">Chiudi</string>
+	<string name="login_settings_button">Impostazioni</string>
+	<string name="login_login_button">Accedi</string>
+	<string name="login_login_progress">Connessione in corso. Attendere...</string>
+	<string name="login_error_msg">Purtroppo, si è verificato un errore.\n\nDettagli
+		errore:\n%s</string>
+	<string name="login_menu_login">Accedi</string>
+	<string name="login_no_connectivity">Non è stata trovata la connessione internet</string>
+	<string name="login_start_msg">Impostazioni di configurazione nel menuSettings configuration in menu</string>
+
+	<!-- LoginAnim activity -->
+	<string name="loganim_connecting">Connessione in corso ...</string>
+	<string name="loganim_authenticating">Autenticazione ...</string>
+	<string name="loganim_login_success">Accesso riuscito</string>
+	<string name="loganim_login_failed">Accesso fallito</string>
+
+	<!-- EditSettings Activity -->
+	<string name="settings_menu_create_account">Crea un account</string>
+	<string name="settings_menu_privacy_lists">Gestisci le mie liste di privacy</string>
+	<string name="settings_saved_ok">Le impostazioni sono state salvate con successo.</string>
+
+
+
+	<!-- EditSettings Activity Categories -->
+	<string name="general_preferences">Preferenze generali</string>
+	<string name="user_preferences">Impostazioni utente (richiste)</string>
+	<string name="user_preferences_advanced">Impostazioni utente avanzate (opzionali)</string>
+	<string name="network_preferences">Opzioni rete</string>
+	<string name="proxy_proxy_settings">Impostazioni Proxy</string>
+	<string name="proxy_user_settings">Impostazioni Proxy</string>
+
+	<!-- EditSettings Activity Tabs -->
+	<string name="settings_tab_tag_account">edit_settings_tab_account</string>
+	<string name="settings_tab_label_account">Account</string>
+	<string name="settings_tab_tag_xmpp">edit_settings_tab_xmpp</string>
+	<string name="settings_tab_label_xmpp">XMPP</string>
+	<string name="settings_tab_tag_proxy">edit_settings_tab_proxy</string>
+	<string name="settings_tab_label_proxy">Proxy</string>
+
+
+	<!-- wizard activities -->
+	<string name="account_wizard_text1"><b>Benvenuto su BEEM.</b>\n\nNon hai ancora configurato un account XMPP (Jabber).\nScegli una delle seguenti opzioni :</string>
+	<string name="account_wizard_configure_text"><b>Si prega di compilare i dati per il vostro account esistente</b></string>
+	<string name="account_wizard_configure_account">Possiedo già un account che voglio</string>
+	<string name="account_wizard_create_account">Voglio registrare un nuovo account</string>
+
+	<!-- Create an account Activity -->
+	<string name="create_account_instr_dialog_title">Crea un account - Istruzioni</string>
+	<string name="create_account_err_dialog_title">Crea un account - Errore</string>
+	<string name="create_account_err_dialog_settings_button">Cambia le mie impostazioni</string>
+	<string name="create_account_close_dialog_button">Chiudi</string>
+	<string name="create_account_successfull_after">account %s è stato creato con successo</string>
+	<string name="create_account_err_username">Errato JabberID</string>
+	<string name="create_account_err_passwords">Le password non coincidono.</string>
+	<string name="create_account_username">Username</string>
+	<string name="create_account_password">Password</string>
+	<string name="create_account_confirm_password">Conferma password</string>
+
+	<!-- ContactList Activity  -->
+	<string name="contact_list_menu_add_contact">Aggiungi un contatto</string>
+	<string name="contact_list_menu_status">Cambia stato</string>
+	<string name="contact_list_menu_settings">Impsotazioni</string>
+	<string name="contact_list_menu_disconnect">Disconnetti</string>
+	<string name="contact_list_all_contact">Tutti i contatti</string>
+	<string name="contact_list_no_group">Nessun gruppo</string>
+
+	<!-- UserInfo dialog -->
+	<string name="userinfo_label_alias">Alias</string>
+	<string name="userinfo_label_chg_group">Gestisci gruppi</string>
+	<string name="userinfo_label_re_subscription">Rimanda invito</string>
+	<string name="userinfo_label_block">Blocco</string>
+	<string name="userinfo_label_delete">Elimina</string>
+	<string name="userinfo_resend">Rimanda sottoscrizione</string>
+	<string name="userinfo_sure2delete">Sei sicuro di voler eliminare questo contatto?
+	</string>
+	<string name="userinfo_yes">Sì</string>
+	<string name="userinfo_no">No</string>
+	<string name="userinfo_sureresend">Sei sicuro di voler rispedire l\'invito ?</string>
+
+	<string name="chat_name">Beem - Chat</string>
+	<string name="chat_input_default_value">Scrivi il tuo messaggio</string>
+	<string name="chat_self">Io</string>
+	<string name="chat_error">Errore</string>
+	<string name="chat_send_message">Invia</string>
+	<string name="chat_menu_contacts_list">Lista contatti</string>
+	<string name="chat_menu_change_chat">Cambia conversazione</string>
+	<string name="chat_dialog_change_chat_title">Conversazioni aperte</string>
+	<string name="chat_menu_close_chat">Chiudi questa conversazione</string>
+	<string name="chat_no_more_chats">nessuna conversazione attiva</string>
+	<string name="chat_state_composing">sta componendo un messaggio</string>
+	<string name="chat_state_gone">ha abbandonato la conversazione</string>
+	<string name="chat_state_active">presta attenzione alla conversazione</string>
+	<string name="chat_state_inactive">sta facendo qualcos\'altro</string>
+
+	<string name="contact_status_msg_available">Disponibile</string>
+	<string name="contact_status_msg_available_chat">Disponibile a conversare</string>
+	<string name="contact_status_msg_dnd">Non disturbare</string>
+	<string name="contact_status_msg_away">Away</string>
+	<string name="contact_status_msg_xa">Non disponibile</string>
+	<string name="contact_status_msg_offline">Disconnesso</string>
+
+	<string name="privacy_list_name">Beem - Gestisci le mie liste di privacy</string>
+	<string name="privacy_list_no_data">Non c\'è alcuna lista di provacy registrata.</string>
+	<string name="privacy_list_menu_create">Crea una lista di privacy</string>
+	<string name="privacy_list_create_dialog_title">Crea una lista di privacy</string>
+	<string name="privacy_list_create_dialog_list_name_label">Titolo</string>
+	<string name="privacy_list_create_dialog_create_button">Creare</string>
+	<string name="privacy_list_select_dialog_buddies">Amicizie</string>
+	<string name="privacy_list_select_dialog_groups">Gruppi</string>
+	<string name="privacy_list_select_dialog_delete">Elimina</string>
+	<string name="privacy_list_delete_dialog_msg">Sei sicuro di voler eliminare la lista di privacy intitolata \'%s\' ?</string>
+	<string name="privacy_list_delete_dialog_yes">Sì</string>
+	<string name="privacy_list_delete_dialog_no">No</string>
+
+	<string name="UpdateButton">Aggiorna</string>
+	
+	<!-- Error messages -->
+	
+	<string name="error_login_authentication">Errore durante l\'autenticazione, login o password errati.</string>
+	
+	<string name="interna_server_error">Errore del server remoto</string>
+	<string name="bad_request">bad-request</string>
+	<string name="forbidden">forbidden</string>
+	<string name="item_not_found">item-not-found</string>
+	<string name="conflict">conflict</string>
+	<string name="feature_not_implemented">feature-not-implemented</string>
+	<string name="gone">gone</string>
+	<string name="jid_malformed">jid-malformed</string>
+	<string name="no_acceptable">no-acceptable</string>
+	<string name="not_allowed">not-allowed</string>
+	<string name="not_authorized">not-authorized</string>
+	<string name="payment_required">payment-required</string>
+	<string name="recipient_unavailable">recipient-unavailable</string>
+	<string name="redirect">redirect</string>
+	<string name="registration_required">registration-required</string>
+	<string name="remote_server_not_found">Remote server not found</string>
+	<string name="remote_server_timeout">No server response</string>
+	<string name="remote_server_error">Remote server error</string>
+	<string name="resource_constraint">resource-constraint</string>
+	<string name="service_unavailable">service-unavailable</string>
+	<string name="subscription_required">subscription-required</string>
+	<string name="undefined_condition">undefined-condition</string>
+	<string name="unexpected_condition">unexpected-condition</string>
+	<string name="request_timeout">request-timeout</string>
+</resources>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/res/values-sv/strings.xml	Tue Dec 21 23:27:33 2010 +0100
@@ -0,0 +1,310 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+<!-- Generic terms -->
+<string name="app_name">Beem</string>
+<string name="OkButton">Ok</string>
+<string name="ClearButton">Töm</string>
+<string name="CancelButton">Avbryt</string>
+<string name="AcceptButton">Godkänn</string>
+<string name="RefuseButton">Neka</string>
+<string name="JabberID">Jabber-ID</string>
+<string name="Password">Lösenord</string>
+<string name="Continue">Fortsätt</string>
+
+<!--  AccountConfigure class -->
+<string name="AccountConfigureManualConfiguration">Manuell inställning</string>
+
+<!--  Beem class -->
+<string name="BeemJabberID">Jabber-ID</string>
+
+<!--  BeemApplication class -->
+<string name="BeemApplicationConnect">Ansluter...</string>
+
+<!--  BeemService class -->
+<string name="BeemServiceDescription">Använda tjänsten Beem</string>
+<string name="BeemServiceCreated">Beemtjänst skapad</string>
+<string name="BeemServiceDestroyed">Beemtjänst avslutad</string>
+
+<!--  ContactDialog class -->
+<string name="CDChat">Chatta</string>
+<string name="CDCall">Ring</string>
+<string name="CDInfos">Hantera kontakt</string>
+
+<!-- AddContact class -->
+<string name="AddCActTitle">Beem - Lägg till kontakt</string>
+
+<string name="AddCLogin">Användarnamn</string>
+<string name="AddCAlias">Alias</string>
+<string name="AddCGroup">Grupp</string>
+<string name="AddCOkButton">Lägg till</string>
+<string name="AddCContactAdded">Kontakt tillagd</string>
+<string name="AddCContactAddedError">Fel, kontakt inte tillagd</string>
+<string name="AddCContactAddedLoginError">Fel vid inloggning</string>
+<string name="AddCBadForm">Fel ifyllt</string>
+<string name="AddCContactAlready">Kontakten finns redan</string>
+
+<!--  ChangeStatus class -->
+<string name="ChangeStatusActTitle">Beem - Ändra status</string>
+<string name="ChangeStatusType">Min status</string>
+<string name="ChangeStatusMessage">Mitt personliga meddelande</string>
+<string name="OpenContactList">Öppna kontaktlista</string>
+
+<string name="MenuAddContact">Lägg till ny kontakt</string>
+<string name="MenuAccountAbout">Beemprojektet</string>
+<string name="MenuAccountCreate">Skapa konto</string>
+<string name="MenuConnection">Ändra konto</string>
+<string name="ChangeStatusOk">Uppdaterar status</string>
+<string name="ChangeStatusNoChange">Inget att ändra</string>
+
+<!-- Settings class -->
+<string name="SettingsText">Ändra ditt användarnamn</string>
+<string name="SettingsPassword">Ändra ditt lösenord</string>
+<string name="SettingsProxy">Proxy</string>
+<string name="SettingsProxyProxy">Använd proxyserver</string>
+<string name="SettingsProxySummary">Logga in via proxyserver</string>
+<string name="SettingsProxyType">Protokoll</string>
+<string name="SettingsProxyTypeSummary">Välj typ av proxyserver</string>
+<string name="SettingsProxyServer">Ändra proxyserveradress</string>
+<string name="SettingsProxyPort">Ändra proxyserverport</string>
+<string name="SettingsProxyUser">Valfritt, möjliggör autentisering på proxyservern</string>
+<string name="SettingsProxyPassword">Valfritt, möjliggör autentisering på proxyservern</string>
+<string name="SettingsAdvanced">Avancerat</string>
+<string name="SettingsAdvancedOptions">Specifika serverinställningar</string>
+<string name="SettingsAdvancedRecoDelay">Ändra tid mellan anslutningsförsök</string>
+<string name="SettingsAdvancedSpecOpt">Markera om du vill använda någon specifik server för anslutningen</string>
+<string name="SettingsAdvancedAddOpt">Ändra serveradress</string>
+<string name="SettingsAdvancedPortOpt">Ändra serverport</string>
+<string name="SettingsResourceTitle">Instans</string>
+<string name="SettingsPriorityTitle">Prioritet</string>
+<string name="SettingsResourceSummary">Ange XMPP-instans för denna klient</string>
+<string name="SettingsPrioritySummary">Ange prioritet för denna klient</string>
+<string name="contact_list_preferences">Kontaktlista</string>
+<string name="contact_list_preferences_sum">A set of display options for your buddy list
+</string>
+<string name="CLP_hide_groups">Dölj grupper</string>
+<string name="CLP_hide_groups_sum">Markera för att dölja grupper</string>
+<string name="CLP_hidden_contact">Dölj kontakter</string>
+<string name="CLP_hidden_contact_sum">Check this option to hide unconnected buddies
+</string>
+<string name="settings_account_username">Användarnamn</string>
+<string name="login_username_info_default">beem@beem-project.com</string>
+<string name="settings_account_password">Lösenord</string>
+<string name="settings_account_server">Server</string>
+<string name="settings_account_port">Port</string>
+<string name="settings_advanced_service_behaviour">Tjänstebeskrivning</string>
+<string name="settings_advanced_sum">Ett antal inställningar för avancerade användare</string>
+<string name="settings_xmpp_server">Adress</string>
+<string name="comments_xmpp_server">example.com</string>
+<string name="settings_xmpp_port">Port</string>
+<string name="settings_xmpp_use_tls">Kräv SSL/TLS</string>
+<string name="settings_reco_delay">Tid mellan anslutningsförsök</string>
+<string name="comments_xmpp_port">Förvalt: 5222</string>
+<string name="settings_proxy_sum">Inställningar för användning av proxy</string>
+<string name="settings_proxy_use">Anslut via proxy</string>
+<string name="settings_proxy_type_prompt">Välj typ av proxy</string>
+<string name="settings_proxy_server">Server</string>
+<string name="settings_proxy_port">Port</string>
+<string name="comments_proxy_port">Förvalt: 1080</string>
+<string name="settings_proxy_username">Användarnamn</string>
+<string name="settings_proxy_password">Lösenord</string>
+<string name="away_chk_title">Aktivera automatisk frånvaro</string>
+<string name="away_chk_sum">Ändra status till frånvarande när skärmen släcks</string>
+<string name="away_message_title">Frånvaromeddelande</string>
+<string name="away_message_sum">Frånvaromeddelandet som kommer att visas</string>
+<string name="away_message_hint">Jag är frånvarande, telefonens skärm är släckt</string>
+<string name="notification_preferences">Aviseringsinställningar</string>
+<string name="notification_enable_vibrate_title">Aktivera vibration</string>
+<string name="notification_enable_vibrate_sum">Aktivera vibration vid inkommande meddelande</string>
+<string name="notification_snd_title">Meddelandesignal</string>
+<string name="notification_snd_sum">Ange signal för inkommande meddelanden</string>
+
+
+<!-- Subscription class -->
+<string name="SubscriptAccept">Prenumeration godkänd</string>
+<string name="SubscriptError">Fel vid prenumeration</string>
+<string name="SubscriptRefused">Prenumeration nekad</string>
+<string name="SubscriptText">%s vill lägga till dig i sin kontaktlista. Godkänner du det?</string>
+<string name="SubscriptTitle">Godkänn kontakt?</string>
+
+<!--  BeemChatManager -->
+<string name="BeemChatManagerNewMessage">Du har ett nytt meddelande</string>
+
+<!--  BeemBroadcastReceiver class -->
+<string name="BeemBroadcastReceiverDisconnect">BEEM: Du är frånkopplad</string>
+
+<!--  XmppConnectionAdapter class -->
+<string name="AcceptContactRequest">%s har lagt till dig till sin kontaktlista.</string>
+<string name="AcceptContactRequestFrom">Godkänn att %s kontaktar dig.</string>
+
+<!-- Activities -->
+<string name="login_tag">Beem - Aktivitet inloggningar</string>
+<string name="edit_settings_name">Beem - Inställningar</string>
+<string name="edit_settings_tag">Beem - Aktivitet inställningar</string>
+<string name="create_account_name">Beem - Skapa konto</string>
+<string name="create_account_tag">Beem - Aktivitet skapa konto</string>
+<string name="contact_list_name">Beem - Kontakter</string>
+<string name="contact_list_tag">Beem - Aktivitet kontaktlista</string>
+<string name="user_info_name">Beem - Användarinfo</string>
+
+<!-- Buttons -->
+<string name="button_create_account">Skapa kontot</string>
+<string name="button_create_login_account">Skapa och använd kontot</string>
+
+<!-- LogAs Activity -->
+<string name="login_username">Användarnamn</string>
+<string name="login_password">Lösenord</string>
+<string name="login_error_dialog_title">Fel vid inloggning</string>
+<string name="login_close_dialog_button">Stäng</string>
+<string name="login_menu_create_account">Skapa konto</string>
+<string name="login_menu_settings">Inställningar</string>
+<string name="login_menu_about">Om</string>
+<string name="login_about_title">Beem %s - Om</string>
+<string name="login_about_msg">
+Beem is an EPITECH Innovative Project. Visit us at
+http://www.beem-project.com !
+</string>
+<string name="login_about_button">Stäng</string>
+<string name="login_settings_button">Inställningar</string>
+<string name="login_login_button">Logga in</string>
+<string name="login_login_progress">Ansluter. Vänta...</string>
+<string name="login_error_msg">Unfortunately, an error occured.\n\nError
+detail:\n%s</string>
+<string name="login_menu_login">Logga in</string>
+<string name="login_no_connectivity">Ingen internetanslutning hittades</string>
+<string name="login_start_msg">Inställningar i menyn</string>
+
+<!-- LoginAnim activity -->
+<string name="loganim_connecting">Ansluter...</string>
+<string name="loganim_authenticating">Verifierar...</string>
+<string name="loganim_login_success">Inloggningen lyckades</string>
+<string name="loganim_login_failed">Inloggningen misslyckades</string>
+
+<!-- EditSettings Activity -->
+<string name="settings_menu_create_account">Skapa konto</string>
+<string name="settings_menu_privacy_lists">Hantera spärrlistor</string>
+<string name="settings_saved_ok">Inställningarna har sparats.</string>
+
+
+
+<!-- EditSettings Activity Categories -->
+<string name="general_preferences">Allmänna inställningar</string>
+<string name="user_preferences">Användarinställningar (krävs)</string>
+<string name="user_preferences_advanced">Avancerade användarinställningar (valfritt)</string>
+<string name="network_preferences">Nätverksinställningar</string>
+<string name="proxy_proxy_settings">Proxyinställningar</string>
+<string name="proxy_user_settings">Proxyinställningar</string>
+
+<!-- EditSettings Activity Tabs -->
+<string name="settings_tab_tag_account">edit_settings_tab_account</string>
+<string name="settings_tab_label_account">Konto</string>
+<string name="settings_tab_tag_xmpp">edit_settings_tab_xmpp</string>
+<string name="settings_tab_label_xmpp">XMPP</string>
+<string name="settings_tab_tag_proxy">edit_settings_tab_proxy</string>
+<string name="settings_tab_label_proxy">Proxy</string>
+
+
+<!-- wizard activities -->
+<string name="account_wizard_text1"><b>Välkommen till BEEM.</b>\n\nDu har inte konfigurerat något XMPP (Jabber)-konto än.\nVälj ett av följande alternativ:</string>
+<string name="account_wizard_configure_text"><b>Fyll i uppgifterna för ditt befintliga konto</b></string>
+<string name="account_wizard_configure_account">Jag har redan ett konto som jag vill använda</string>
+<string name="account_wizard_create_account">Jag vill registrera ett nytt konto</string>
+
+<!-- Create an account Activity -->
+<string name="create_account_instr_dialog_title">Skapa konto - Instruktioner</string>
+<string name="create_account_err_dialog_title">Skapa konto - Fel</string>
+<string name="create_account_err_dialog_settings_button">Ändra inställningar</string>
+<string name="create_account_close_dialog_button">Stäng</string>
+<string name="create_account_successfull_after">kontot %s har skapats</string>
+<string name="create_account_err_username">Felaktigt Jabber-ID</string>
+<string name="create_account_err_passwords">Lösenorden är inte lika</string>
+<string name="create_account_username">Användarnamn</string>
+<string name="create_account_password">Lösenord</string>
+<string name="create_account_confirm_password">Bekräfta lösenordet</string>
+
+<!-- ContactList Activity  -->
+<string name="contact_list_menu_add_contact">Lägg till kontakt</string>
+<string name="contact_list_menu_status">Ändra status</string>
+<string name="contact_list_menu_settings">Inställningar</string>
+<string name="contact_list_menu_disconnect">Koppla från</string>
+<string name="contact_list_all_contact">Alla kontakter</string>
+<string name="contact_list_no_group">Ingen grupp</string>
+
+<!-- UserInfo dialog -->
+<string name="userinfo_label_alias">Alias</string>
+<string name="userinfo_label_chg_group">Hantera grupper</string>
+<string name="userinfo_label_re_subscription">Skicka inbjudan igen</string>
+<string name="userinfo_label_block">Spärra</string>
+<string name="userinfo_label_delete">Ta bort</string>
+<string name="userinfo_resend">Skicka prenumeration igen</string>
+<string name="userinfo_sure2delete">Are you sure you want to delete this contact ?
+</string>
+<string name="userinfo_yes">Ja</string>
+<string name="userinfo_no">Nej</string>
+<string name="userinfo_sureresend">Är du säker på att du vill skicka prenumerationen igen?</string>
+
+<string name="chat_name">Beem - Chatt</string>
+<string name="chat_input_default_value">Skriv meddelande</string>
+<string name="chat_self">Jag</string>
+<string name="chat_error">Fel</string>
+<string name="chat_send_message">Skicka</string>
+<string name="chat_menu_contacts_list">Kontaktlista</string>
+<string name="chat_menu_change_chat">Byt chatt</string>
+<string name="chat_dialog_change_chat_title">Öppna chattar</string>
+<string name="chat_menu_close_chat">Stäng den här chatten</string>
+<string name="chat_no_more_chats">Inga fler aktiva chattar</string>
+<string name="chat_state_composing">skriver ett meddelande</string>
+<string name="chat_state_gone">har lämnat samtalet</string>
+<string name="chat_state_active">iakttar samtalet</string>
+<string name="chat_state_inactive">gör något annat</string>
+
+<string name="contact_status_msg_available">Tillgänglig</string>
+<string name="contact_status_msg_available_chat">Tillgänglig för chatt</string>
+<string name="contact_status_msg_dnd">Stör ej</string>
+<string name="contact_status_msg_away">Frånvarande</string>
+<string name="contact_status_msg_xa">Inte tillgänglig</string>
+<string name="contact_status_msg_offline">Frånkopplad</string>
+
+<string name="privacy_list_name">Beem - Hantera spärrlistor</string>
+<string name="privacy_list_no_data">Det finns inga spärrlistor.</string>
+<string name="privacy_list_menu_create">Skapa spärrlista</string>
+<string name="privacy_list_create_dialog_title">Skapa spärrlista</string>
+<string name="privacy_list_create_dialog_list_name_label">Titel</string>
+<string name="privacy_list_create_dialog_create_button">Skapa</string>
+<string name="privacy_list_select_dialog_buddies">Kontakter</string>
+<string name="privacy_list_select_dialog_groups">Grupper</string>
+<string name="privacy_list_select_dialog_delete">Ta bort</string>
+<string name="privacy_list_delete_dialog_msg">Vill du verkligen ta bort spärrlistan \'%s\'?</string>
+<string name="privacy_list_delete_dialog_yes">Ja</string>
+<string name="privacy_list_delete_dialog_no">Nej</string>
+
+<string name="UpdateButton">Uppdatera</string>
+
+<!-- Error messages -->
+
+<string name="error_login_authentication">Fel vid inloggning, fel ID eller lösenord</string>
+
+<string name="interna_server_error">Serverfel</string>
+<string name="bad_request">felaktig begäran</string>
+<string name="forbidden">otillåten</string>
+<string name="item_not_found">hittades inte</string>
+<string name="conflict">konflikt</string>
+<string name="feature_not_implemented">funktionen finns inte</string>
+<string name="gone">borta</string>
+<string name="jid_malformed">felaktigt JID</string>
+<string name="no_acceptable">accepteras inte</string>
+<string name="not_allowed">tillåts inte</string>
+<string name="not_authorized">inte godkänd</string>
+<string name="payment_required">betalning krävs</string>
+<string name="recipient_unavailable">mottagaren ej tillgänglig</string>
+<string name="redirect">vidarebefordra</string>
+<string name="registration_required">registrering krävs</string>
+<string name="remote_server_not_found">Servern hittades inte</string>
+<string name="remote_server_timeout">Servern svarar inte</string>
+<string name="remote_server_error">Serverfel</string>
+<string name="resource_constraint">begränsad instans</string>
+<string name="service_unavailable">tjänsten ej tillgänglig</string>
+<string name="subscription_required">prenumeration krävs</string>
+<string name="undefined_condition">odefinierat tillstånd</string>
+<string name="unexpected_condition">oväntat tillstånd</string>
+<string name="request_timeout">Timeoutbegäran</string>
+</resources>
--- a/tools/checkstyle.xml	Tue Dec 21 23:26:51 2010 +0100
+++ b/tools/checkstyle.xml	Tue Dec 21 23:27:33 2010 +0100
@@ -1,208 +1,341 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+    "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+    "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
 
 <!--
-    This configuration file was written by the eclipse-cs plugin configuration editor
+
+  Checkstyle configuration that checks the sun coding conventions from:
+
+  - the Java Language Specification at
+  http://java.sun.com/docs/books/jls/second_edition/html/index.html
+
+  - the Sun Code Conventions at http://java.sun.com/docs/codeconv/
+
+  - the Javadoc guidelines at
+  http://java.sun.com/j2se/javadoc/writingdoccomments/index.html
+
+  - the JDK Api documentation http://java.sun.com/j2se/docs/api/index.html
+
+  - some best practices
+
+  Checkstyle is very configurable. Be sure to read the documentation at
+  http://checkstyle.sf.net (or in your downloaded distribution).
+
+  Most Checks are configurable, be sure to consult the documentation.
+
+  To completely disable a check, just comment it out or delete it from the file.
+
+  Finally, it is worth reading the documentation.
+
 -->
-<!--
-    Checkstyle-Configuration: Beem Checks
-    Description: none
--->
+
 <module name="Checker">
-  <property name="severity" value="warning"/>
-  <property name="basedir" value="/home/beem/"/>
-  <module name="TreeWalker">
-    <module name="JavadocMethod">
-      <property name="severity" value="error"/>
-      <property name="allowUndeclaredRTE" value="true"/>
-    </module>
-    <module name="JavadocType">
-      <property name="severity" value="error"/>
-    </module>
-    <module name="JavadocVariable">
-      <property name="severity" value="error"/>
-      <property name="scope" value="package"/>
-    </module>
-    <module name="JavadocStyle">
-      <property name="severity" value="error"/>
-      <property name="checkEmptyJavadoc" value="true"/>
-    </module>
-    <module name="ConstantName"/>
-    <module name="LocalFinalVariableName"/>
-    <module name="LocalVariableName"/>
-    <module name="MemberName">
-      <property name="severity" value="error"/>
-      <property name="format" value="^m[A-Z][a-zA-Z0-9]*$"/>
-    </module>
-    <module name="MethodName"/>
-    <module name="PackageName"/>
-    <module name="ParameterName"/>
-    <module name="StaticVariableName"/>
-    <module name="TypeName"/>
-    <module name="AvoidStarImport"/>
-    <module name="IllegalImport"/>
-    <module name="RedundantImport"/>
-    <module name="UnusedImports">
-      <property name="severity" value="error"/>
-    </module>
-    <module name="AvoidStaticImport">
-      <property name="excludes" value="*"/>
-    </module>
-    <module name="LineLength">
-      <property name="max" value="120"/>
+  <!--
+        If you set the basedir property below, then all reported file
+        names will be relative to the specified directory. See
+        http://checkstyle.sourceforge.net/5.x/config.html#Checker
+-->
+    <property name="basedir" value="/home/beem/" default="."/>
+
+    <property name="severity" value="warning"/>
+
+    <!-- Checks that a package-info.java file exists for each package.     -->
+    <!-- See http://checkstyle.sf.net/config_javadoc.html#JavadocPackage -->
+    <module name="JavadocPackage">
+	<property name="allowLegacy" value="true"/>
     </module>
-    <module name="MethodLength"/>
-    <module name="ParameterNumber"/>
-    <module name="AnonInnerLength">
-      <property name="max" value="60"/>
-    </module>
-    <module name="EmptyForIteratorPad"/>
-    <module name="GenericWhitespace">
-      <property name="severity" value="error"/>
-    </module>
-    <module name="MethodParamPad">
-      <property name="severity" value="error"/>
+
+    <!-- Checks whether files end with a new line.                        -->
+    <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
+    <module name="NewlineAtEndOfFile">
+	<property name="severity" value="error"/>
     </module>
-    <module name="NoWhitespaceAfter">
-      <property name="severity" value="error"/>
-    </module>
-    <module name="NoWhitespaceBefore">
-      <property name="severity" value="error"/>
-    </module>
-    <module name="OperatorWrap"/>
-    <module name="ParenPad">
-      <property name="severity" value="error"/>
-    </module>
-    <module name="TypecastParenPad">
-      <property name="severity" value="error"/>
+
+    <!-- Checks that property files contain the same keys.         -->
+    <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
+    <module name="Translation">
+	<property name="severity" value="error"/>
     </module>
-    <module name="WhitespaceAfter">
-      <property name="severity" value="error"/>
-    </module>
-    <module name="WhitespaceAround">
-      <property name="severity" value="error"/>
-    </module>
-    <module name="ModifierOrder">
-      <property name="severity" value="error"/>
-    </module>
-    <module name="RedundantModifier">
-      <property name="severity" value="error"/>
+
+    <!-- Checks for Size Violations.                    -->
+    <!-- See http://checkstyle.sf.net/config_sizes.html -->
+    <module name="FileLength"/>
+
+    <!-- Checks for whitespace                               -->
+    <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+    <!-- we want tab
+    <module name="FileTabCharacter"/>
+    -->
+
+    <!-- Miscellaneous other checks.                   -->
+    <!-- See http://checkstyle.sf.net/config_misc.html -->
+    <module name="RegexpSingleline">
+	<property name="severity" value="error"/>
+	<property name="format" value="\s+$"/>
+	<property name="minimum" value="0"/>
+	<property name="maximum" value="0"/>
+	<property name="message" value="Line has trailing spaces."/>
     </module>
-    <module name="AvoidNestedBlocks"/>
-    <module name="EmptyBlock"/>
-    <module name="LeftCurly">
-      <property name="severity" value="error"/>
+
+    <!-- This rules is desactivated because it is too stupid.
+	It also compare the Header of the file.
+    <module name="StrictDuplicateCode">
+	<property name="min" value="25" />
     </module>
-    <module name="RightCurly">
-      <property name="severity" value="error"/>
-    </module>
-    <module name="AnnotationUseStyle">
-      <property name="severity" value="error"/>
-    </module>
-    <module name="MissingDeprecated">
-      <property name="severity" value="error"/>
+    -->
+
+    <!-- Header file -->
+    <module name="RegexpHeader">
+	<property name="headerFile" value="${basedir}/tools/JavaHeaderCheck.regex"/>
+	<property name="multiLines" value="5, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38"/>
+	<property name="severity" value="error" />
     </module>
-    <module name="MissingOverride">
-      <property name="severity" value="error"/>
-    </module>
-    <module name="CovariantEquals"/>
-    <module name="AvoidInlineConditionals"/>
-    <module name="InnerAssignment"/>
-    <module name="DoubleCheckedLocking"/>
-    <module name="EmptyStatement"/>
-    <module name="EqualsHashCode">
-      <property name="severity" value="error"/>
-    </module>
-    <module name="HiddenField">
-      <property name="ignoreConstructorParameter" value="true"/>
-      <property name="ignoreSetter" value="true"/>
-      <property name="ignoreAbstractMethods" value="true"/>
-    </module>
-    <module name="IllegalInstantiation"/>
-    <module name="InnerAssignment">
-      <property name="severity" value="error"/>
-    </module>
-    <module name="MagicNumber"/>
-    <module name="MissingSwitchDefault">
-      <property name="severity" value="error"/>
-    </module>
-    <module name="RedundantThrows"/>
-    <module name="SimplifyBooleanExpression">
-      <property name="severity" value="error"/>
-    </module>
-    <module name="SimplifyBooleanReturn">
-      <property name="severity" value="error"/>
-    </module>
-    <module name="StringLiteralEquality">
-      <property name="severity" value="error"/>
-    </module>
-    <module name="IllegalCatch"/>
-    <module name="IllegalThrows"/>
-    <module name="IllegalType"/>
-    <module name="PackageDeclaration"/>
-    <module name="JUnitTestCase"/>
-    <module name="DeclarationOrder">
-      <property name="severity" value="error"/>
-    </module>
-    <module name="ExplicitInitialization"/>
-    <module name="DefaultComesLast"/>
-    <module name="MissingCtor"/>
-    <module name="FallThrough"/>
-    <module name="MultipleStringLiterals">
-      <property name="allowedDuplicates" value="2"/>
+
+    <module name="TreeWalker">
+
+	<!-- Checks for Javadoc comments.                     -->
+	<!-- See http://checkstyle.sf.net/config_javadoc.html -->
+	<module name="JavadocMethod">
+	    <property name="allowUndeclaredRTE" value="true"/>
+	    <property name="severity" value="error"/>
+	</module>
+	<module name="JavadocType">
+	    <property name="severity" value="error"/>
+	</module>
+	<module name="JavadocVariable">
+	    <property name="scope" value="package" />
+	    <property name="severity" value="error"/>
+	</module>
+	<module name="JavadocStyle">
+	    <property name="checkEmptyJavadoc" value="true"/>
+	    <property name="severity" value="error"/>
+	</module>
+
+
+	<!-- Checks for Naming Conventions.                  -->
+	<!-- See http://checkstyle.sf.net/config_naming.html -->
+	<module name="ConstantName"/>
+	<module name="LocalFinalVariableName"/>
+	<module name="LocalVariableName"/>
+	<module name="MemberName">
+	    <property  name="format" value="^m[A-Z][a-zA-Z0-9]*$"/>
+	    <property name="severity" value="error"/>
+	</module>
+	<module name="MethodName"/>
+	<module name="PackageName"/>
+	<module name="ParameterName"/>
+	<module name="StaticVariableName"/>
+	<module name="TypeName"/>
+
+
+	<!-- Checks for Headers                                -->
+	<!-- See http://checkstyle.sf.net/config_header.html   -->
+	<!-- <module name="Header">                            -->
+	<!-- The follow property value demonstrates the ability     -->
+	<!-- to have access to ANT properties. In this case it uses -->
+	<!-- the ${basedir} property to allow Checkstyle to be run  -->
+	<!-- from any directory within a project. See property      -->
+	<!-- expansion,                                             -->
+	<!-- http://checkstyle.sf.net/config.html#properties        -->
+	<!-- <property                                              -->
+	<!--     name="headerFile"                                  -->
+	<!--     value="${basedir}/java.header"/>                   -->
+	<!-- </module> -->
+
+	<!-- Checks for imports                              -->
+	<!-- See http://checkstyle.sf.net/config_import.html -->
+	<module name="AvoidStarImport"/>
+	<module name="IllegalImport"/> <!-- defaults to sun.* packages -->
+	<module name="RedundantImport"/>
+	<module name="UnusedImports">
+	    <property name="severity" value="error"/>
+	</module>
+	<module name="AvoidStaticImport">
+	    <property name="excludes" value="*"/>
+	</module>
+
+
+	<!-- Checks for Size Violations.                    -->
+	<!-- See http://checkstyle.sf.net/config_sizes.html -->
+	<module name="LineLength">
+	    <property name="max" value="120" />
+	</module>
+	<module name="MethodLength"/>
+	<module name="ParameterNumber"/>
+	<module name="AnonInnerLength">
+	    <property name="max" value="60" />
+	</module>
+
+
+	<!-- Checks for whitespace                               -->
+	<!-- See http://checkstyle.sf.net/config_whitespace.html -->
+	<module name="EmptyForIteratorPad"/>
+	<module name="GenericWhitespace">
+	    <property name="severity" value="error"/>
+	</module>
+	<module name="MethodParamPad">
+	    <property name="severity" value="error"/>
+	</module>
+	<module name="NoWhitespaceAfter">
+	    <property name="severity" value="error"/>
+	</module>
+	<module name="NoWhitespaceBefore">
+	    <property name="severity" value="error"/>
+	</module>
+	<module name="OperatorWrap"/>
+	<module name="ParenPad">
+	    <property name="severity" value="error"/>
+	</module>
+	<module name="TypecastParenPad">
+	    <property name="severity" value="error"/>
+	</module>
+	<!-- We want mixed tabulation
+	  <module name="TabCharacter"/> 
+	  -->
+	<module name="WhitespaceAfter">
+	    <property name="severity" value="error"/>
+	</module>
+	<module name="WhitespaceAround">
+	    <property name="severity" value="error"/>
+	</module>
+
+
+	<!-- Modifier Checks                                    -->
+	<!-- See http://checkstyle.sf.net/config_modifiers.html -->
+	<module name="ModifierOrder">
+	    <property name="severity" value="error"/>
+	</module>
+	<module name="RedundantModifier">
+	    <property name="severity" value="error"/>
+	</module>
+
+
+	<!-- Checks for blocks. You know, those {}'s         -->
+	<!-- See http://checkstyle.sf.net/config_blocks.html -->
+	<module name="AvoidNestedBlocks"/>
+	<module name="EmptyBlock"/>
+	<module name="LeftCurly">
+	    <property name="severity" value="error"/>
+	</module>
+	<module name="RightCurly">
+	    <property name="severity" value="error"/>
+	</module>
+	<!--
+	  <module name="NeedBraces"/>
+	  -->
+
+	<!-- Check for annotations 
+	http://checkstyle.sourceforge.net/config_annotation.html#MissingDeprecated
+	-->
+	<module name="AnnotationUseStyle">
+	    <property name="severity" value="error"/>
+	</module>
+	<module name="MissingDeprecated">
+	    <property name="severity" value="error"/>
+	</module>
+	<module name="MissingOverride">
+	    <property name="severity" value="error"/>
+	</module>
+
+	<!-- Checks for common coding problems               -->
+	<!-- See http://checkstyle.sf.net/config_coding.html -->
+	<module name="CovariantEquals"/>
+	<module name="AvoidInlineConditionals"/>
+	<module name="InnerAssignment" />
+	<module name="DoubleCheckedLocking"/>    <!-- MY FAVOURITE -->
+	<module name="EmptyStatement"/>
+	<module name="EqualsHashCode">
+	    <property name="severity" value="error"/>
+	</module>
+	<module name="HiddenField">
+	    <property name="ignoreConstructorParameter" value="true"/>
+	    <property name="ignoreAbstractMethods" value="true"/>
+	    <property name="ignoreSetter" value="true"/>
+	</module>
+	<module name="IllegalInstantiation"/>
+	<module name="InnerAssignment">
+	    <property name="severity" value="error"/>
+	</module>
+	<module name="MagicNumber"/>
+	<module name="MissingSwitchDefault">
+	    <property name="severity" value="error"/>
+	</module>
+	<module name="RedundantThrows"/>
+	<module name="SimplifyBooleanExpression">
+	    <property name="severity" value="error"/>
+	</module>
+	<module name="SimplifyBooleanReturn">
+	    <property name="severity" value="error"/>
+	</module>
+	<module name="StringLiteralEquality">
+	    <property name="severity" value="error"/>
+	</module>
+	<module name="IllegalCatch"/>
+	<module name="IllegalThrows"/>
+	<module name="IllegalType"/>
+	<module name="PackageDeclaration"/>
+	<module name="JUnitTestCase"/>
+	<module name="DeclarationOrder">
+	    <property name="severity" value="error"/>
+	</module>
+	<module name="ExplicitInitialization"/>
+	<module name="DefaultComesLast"/>
+	<module name="MissingCtor"/>
+	<module name="FallThrough"/>
+	<module name="MultipleStringLiterals">
+	    <property name="allowedDuplicates" value="2"/>
+	</module>
+	<module name="MultipleVariableDeclarations"/>
+	<module name="UnnecessaryParentheses"/>
+	<module name="ParameterAssignment"/>
+	<module name="EqualsAvoidNull">
+	    <property name="severity" value="error"/>
+	</module>
+	<module name="NoClone"/>
+	<module name="NoFinalizer"/>
+	<module name="SuperClone"/>
+	<module name="SuperFinalize"/>
+	<module name="ModifiedControlVariable">
+	    <property name="severity" value="error"/>
+	</module>
+	<module name="ReturnCount">
+	    <property name="max" value="3"/>
+	</module>
+
+	<!-- Checks for class design                         -->
+	<!-- See http://checkstyle.sf.net/config_design.html -->
+	<!-- 
+	  <module name="DesignForExtension"/>
+	  -->
+	<module name="FinalClass"/>
+	<module name="HideUtilityClassConstructor"/>
+	<!-- 
+	<module name="InterfaceIsType"/>
+	-->
+	<module name="VisibilityModifier"/>
+	<module name="MutableException"/>
+	<module name="ThrowsCount">
+	    <property name="max" value="2" />
+	</module>
+
+
+	<!-- Miscellaneous other checks.                   -->
+	<!-- See http://checkstyle.sf.net/config_misc.html -->
+	<module name="ArrayTypeStyle"/>
+	<module name="FinalParameters">
+	    <property name="tokens" value="CTOR_DEF"/>
+	</module>
+	<module name="Indentation"/>
+
+	<module name="TodoComment"/>
+	<module name="UpperEll"/>
+
+	<module name="BooleanExpressionComplexity"/>
+	<module name="UpperEll"/>
+
+	<module name="ArrayTypeStyle"/>
+
     </module>
-    <module name="MultipleVariableDeclarations"/>
-    <module name="UnnecessaryParentheses"/>
-    <module name="ParameterAssignment"/>
-    <module name="EqualsAvoidNull">
-      <property name="severity" value="error"/>
-    </module>
-    <module name="NoClone"/>
-    <module name="NoFinalizer"/>
-    <module name="SuperClone"/>
-    <module name="SuperFinalize"/>
-    <module name="ModifiedControlVariable">
-      <property name="severity" value="error"/>
-    </module>
-    <module name="ReturnCount">
-      <property name="max" value="3"/>
-    </module>
-    <module name="FinalClass"/>
-    <module name="HideUtilityClassConstructor"/>
-    <module name="VisibilityModifier"/>
-    <module name="MutableException"/>
-    <module name="ThrowsCount">
-      <property name="max" value="2"/>
-    </module>
-    <module name="ArrayTypeStyle"/>
-    <module name="FinalParameters">
-      <property name="tokens" value="CTOR_DEF"/>
-    </module>
-    <module name="Indentation"/>
-    <module name="TodoComment"/>
-    <module name="UpperEll"/>
-    <module name="BooleanExpressionComplexity"/>
-    <module name="UpperEll"/>
-    <module name="ArrayTypeStyle"/>
-  </module>
-  <module name="JavadocPackage">
-    <property name="allowLegacy" value="true"/>
-  </module>
-  <module name="NewlineAtEndOfFile">
-    <property name="severity" value="error"/>
-  </module>
-  <module name="Translation">
-    <property name="severity" value="error"/>
-  </module>
-  <module name="FileLength"/>
-  <module name="RegexpSingleline">
-    <property name="severity" value="error"/>
-    <property name="format" value="\s+$"/>
-    <property name="message" value="Line has trailing spaces."/>
-  </module>
-  <module name="RegexpHeader">
-    <property name="severity" value="error"/>
-    <property name="headerFile" value="${basedir}/tools/JavaHeaderCheck.regex"/>
-    <property name="multiLines" value="5, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38"/>
-  </module>
+
 </module>