From f5cfda1d2a75fc330ba2578c6f421a039add6340 Mon Sep 17 00:00:00 2001
From: Rom Walton <rwalton@ssl.berkeley.edu>
Date: Tue, 10 Feb 2015 09:23:15 -0500
Subject: [PATCH] LOCALE: Fix locale issues with language map for Android.  Had
 to fix some bugs with the Transifex bridge package which I'll submit upsteam.

---
 android/BOINC/res/values-it-rIT/strings.xml   |   2 +-
 android/BOINC/res/values-it_rIT/strings.xml   | 360 ------------------
 android/BOINC/res/values-pt-rPT/strings.xml   |  98 ++++-
 android/BOINC/res/values-pt_PT/strings.xml    | 360 ------------------
 .../strings.xml                               |   0
 android/BOINC/res/values-ru/strings.xml       | 265 -------------
 locale/txconfig                               |   2 +-
 7 files changed, 98 insertions(+), 989 deletions(-)
 delete mode 100644 android/BOINC/res/values-it_rIT/strings.xml
 delete mode 100644 android/BOINC/res/values-pt_PT/strings.xml
 rename android/BOINC/res/{values-ru_RU => values-ru-rRU}/strings.xml (100%)
 delete mode 100644 android/BOINC/res/values-ru/strings.xml

diff --git a/android/BOINC/res/values-it-rIT/strings.xml b/android/BOINC/res/values-it-rIT/strings.xml
index 70f5eb5836..433f438888 100644
--- a/android/BOINC/res/values-it-rIT/strings.xml
+++ b/android/BOINC/res/values-it-rIT/strings.xml
@@ -197,7 +197,7 @@
   <string name="prefs_unit_gb">GB</string>
   <string name="prefs_unit_pct">%</string>
   <string name="prefs_unit_celcius">°C</string>
-  <string name="prefs_unit_seconds">s</string>
+  <string name="prefs_unit_seconds">secondi</string>
   <!--projects tab strings-->
   <string name="projects_loading">Lettura progetti…</string>
   <string name="projects_add">Aggiungi progetto</string>
diff --git a/android/BOINC/res/values-it_rIT/strings.xml b/android/BOINC/res/values-it_rIT/strings.xml
deleted file mode 100644
index 433f438888..0000000000
--- a/android/BOINC/res/values-it_rIT/strings.xml
+++ /dev/null
@@ -1,360 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--app global-->
-  <string name="app_name">BOINC</string>
-  <!--generic. used by multiple Activities/tabs-->
-  <string name="generic_loading">Caricamento in corso! Attendere prego…</string>
-  <string name="generic_button_continue">Continua</string>
-  <string name="generic_button_finish">Fine</string>
-  <!--attach project-->
-  <!--selection list-->
-  <string name="attachproject_list_desc">Seleziona il progetto al quale vuoi contribuire:</string>
-  <string name="attachproject_list_header">Scegli un progetto:</string>
-  <string name="attachproject_list_manual_button">Aggiungi un progetto dall\'URL</string>
-  <string name="attachproject_list_manual_dialog_title">Inserisci l\'URL del progetto:</string>
-  <string name="attachproject_list_manual_dialog_button">Aggiungi progetto</string>
-  <string name="attachproject_list_manual_no_url">Aggiungi l\'URL del progetto</string>
-  <string name="attachproject_list_acctmgr_button">Aggiungi un account manager</string>
-  <string name="attachproject_list_no_internet">Connessione Internet assente</string>
-  <!--credential input-->
-  <string name="attachproject_credential_input_sing_desc">Inserisci le informazioni account</string>
-  <string name="attachproject_credential_input_desc">Inserisci le account informazioni per i progetti selezionati:</string>
-  <string name="attachproject_credential_input_show_pwd">Visualizza password</string>
-  <string name="attachproject_individual_credential_input">Aggiungi progetti individualmente</string>
-  <!--conflicts-->
-  <string name="attachproject_conflicts_desc">Si sono verificati errori nell\'aggiunta dei seguenti progetti:</string>
-  <string name="attachproject_conflict_undefined">Impossibile connettersi</string>
-  <string name="attachproject_conflict_not_unique">L\'account esiste già con una password differente</string>
-  <string name="attachproject_conflict_bad_password">Password errata</string>
-  <string name="attachproject_conflict_unknown_user">Account inesistente</string>
-  <string name="attachproject_conflict_unknown_user_creation_disabled">Account inesistente, visita il sito web del progetto per registrarlo</string>
-  <!--working-->
-  <string name="attachproject_working_attaching">Connessione in corso</string>
-  <!--e.g. Attaching Einstein@Home-->
-  <!--hints-->
-  <string name="attachproject_hints_header">Aiuto</string>
-  <!--e.g. Hint 1/2-->
-  <string name="attachproject_hint_contribtion_header">Come contribuire:</string>
-  <string name="attachproject_hint_contribtion_wifi">1. Connetti ad una rete WIFI</string>
-  <string name="attachproject_hint_contribtion_charger">2. Inserisci il Caricabatterie</string>
-  <string name="attachproject_hint_contribtion_screen">3. Spegni lo schermo</string>
-  <string name="attachproject_hint_projectwebsite_header">Visita il sito web del progetto a:</string>
-  <string name="attachproject_hint_projectwebsite_science">Scopri di più sul calcolo scientifico</string>
-  <string name="attachproject_hint_projectwebsite_stats">Vedi le statistiche dei contributi</string>
-  <string name="attachproject_hint_projectwebsite_community">Parla con altri volontari</string>
-  <string name="attachproject_hint_platforms_header">BOINC è anche disponibile per il tuo computer o laptop, visita boinc.berkeley.edu per saperne di più.</string>
-  <!--project login-->
-  <string name="attachproject_login_loading">Comunicazione con il server progetto in corso…</string>
-  <string name="attachproject_login_image_description">Logo progetto.</string>
-  <string name="attachproject_login_header_general_area">Idea generale:</string>
-  <string name="attachproject_login_header_specific_area">Area specifica:</string>
-  <string name="attachproject_login_header_description">Descrizione:</string>
-  <string name="attachproject_login_header_home">Home:</string>
-  <string name="attachproject_login_header_url">Sito Web:</string>
-  <string name="attachproject_login_header_platform">Android:</string>
-  <string name="attachproject_login_platform_supported">Questo progetto supporta i dispositivi Android</string>
-  <string name="attachproject_login_platform_not_supported">Questo progetto non supporta i dispositivi Android</string>
-  <string name="attachproject_login_category_terms_of_use">Licenza per</string>
-  <string name="attachproject_login_accept_terms_of_use">Creando un account per questo progetto, accetti i termini della licenza visualizzata sotto.</string>
-  <string name="attachproject_login_category_login">Fai il login con un account esistente</string>
-  <string name="attachproject_login_header_id_email">eMail:</string>
-  <string name="attachproject_login_header_id_name">Nome:</string>
-  <string name="attachproject_login_header_pwd">Password:</string>
-  <string name="attachproject_login_category_creation">Nuovo</string>
-  <string name="attachproject_login_header_creation_enabled">Registra un account per partecipare:</string>
-  <string name="attachproject_login_header_creation_client_disabled">Visita il sito web del progetto per creare un account:</string>
-  <string name="attachproject_login_header_creation_disabled">Il progetto non permette al momento la creazione di nuovi account!</string>
-  <string name="attachproject_login_button_registration">Registra</string>
-  <string name="attachproject_login_button_login">Login</string>
-  <string name="attachproject_login_button_forgotpw">Password dimenticata</string>
-  <string name="attachproject_login_error_toast">Comunicazione col progetto fallita!</string>
-  <string name="attachproject_login_attached">Connesso</string>
-  <!--project registration-->
-  <string name="attachproject_registration_header">Registrazione account per</string>
-  <string name="attachproject_registration_header_url">Progetto:</string>
-  <string name="attachproject_registration_header_email">eMail:</string>
-  <string name="attachproject_registration_header_username">Nome:</string>
-  <string name="attachproject_registration_header_teamname">Team:</string>
-  <string name="attachproject_registration_header_pwd">Password:</string>
-  <string name="attachproject_registration_header_pwd_confirm">… Ripeti:</string>
-  <string name="attachproject_registration_button">Crea</string>
-  <!--account manager-->
-  <string name="attachproject_acctmgr_list_desc">Usa un account manager BOINC per aggiungere e gestire progetti multipli</string>
-  <string name="attachproject_acctmgr_header">Aggiungi un account manager</string>
-  <string name="attachproject_acctmgr_header_url">URL</string>
-  <string name="attachproject_acctmgr_header_name">Utente:</string>
-  <string name="attachproject_acctmgr_header_pwd">Password:</string>
-  <string name="attachproject_acctmgr_header_pwd_confirm">… Ripeti:</string>
-  <string name="attachproject_acctmgr_button">Aggiungi</string>
-  <!--error strings-->
-  <string name="attachproject_error_wrong_name">Utente non trovato</string>
-  <string name="attachproject_error_short_pwd">Password troppo corta</string>
-  <string name="attachproject_error_no_internet">Errore connessione</string>
-  <string name="attachproject_error_pwd_no_match">Password non corrispondenti</string>
-  <string name="attachproject_error_pwd_no_retype">Per favore inserisci nuovamente la password</string>
-  <string name="attachproject_error_no_url">Inserire un URL</string>
-  <string name="attachproject_error_no_email">Per favore inserisci un indirizzo eMail</string>
-  <string name="attachproject_error_no_pwd">Per favore inserisci una password</string>
-  <string name="attachproject_error_no_name">Per favore inserisci un nome utente</string>
-  <string name="attachproject_error_unknown">fallito</string>
-  <string name="attachproject_error_bad_username">Nome utente rifiutato</string>
-  <string name="attachproject_error_email_in_use">eMail già utilizzata</string>
-  <string name="attachproject_error_project_down">Progetto offline</string>
-  <string name="attachproject_error_email_bad_syntax">eMail rifiutata</string>
-  <string name="attachproject_error_bad_pwd">Password rifiutata</string>
-  <string name="attachproject_error_creation_disabled">La creazione account è disabilitata su questo progetto</string>
-  <string name="attachproject_error_invalid_url">URL invalido</string>
-  <!--working activity-->
-  <string name="attachproject_working_back_button">Indietro</string>
-  <string name="attachproject_working_finish_button">Fine</string>
-  <string name="attachproject_working_check_desc">Completato</string>
-  <string name="attachproject_working_failed_desc">Fallito</string>
-  <string name="attachproject_working_ongoing">…</string>
-  <string name="attachproject_working_finished">.</string>
-  <string name="attachproject_working_description">:</string>
-  <string name="attachproject_working_connect">Connetti</string>
-  <string name="attachproject_working_verify">Verifica account</string>
-  <string name="attachproject_working_register">Registra account</string>
-  <string name="attachproject_working_login">Log in</string>
-  <string name="attachproject_working_acctmgr">Aggiungi un account manager</string>
-  <string name="attachproject_working_acctmgr_sync">Sincronizza</string>
-  <!--main activity-->
-  <string name="main_noproject_warning">Premi qui per scegliere un progetto.</string>
-  <string name="main_error">Whooops</string>
-  <string name="main_error_long">…questo non deve succedere!\nClicca sull\'icona per riprovare.</string>
-  <string name="main_title_icon_desc">icona BOINC</string>
-  <!--tab names-->
-  <string name="tab_status">Stato</string>
-  <string name="tab_projects">Progetti</string>
-  <string name="tab_tasks">Elaborazioni</string>
-  <string name="tab_transfers">Trasferimenti</string>
-  <string name="tab_preferences">Preferenze</string>
-  <string name="tab_notices">Avvisi</string>
-  <string name="tab_desc">Navigazione</string>
-  <!--status strings-->
-  <string name="status_running">Elaborazione in corso</string>
-  <string name="status_running_long">Grazie per la partecipazione.</string>
-  <string name="status_paused">Sospeso</string>
-  <string name="status_idle">Nulla da fare</string>
-  <string name="status_idle_long">In attesa di nuovi lavori…</string>
-  <string name="status_computing_disabled">Sospeso</string>
-  <string name="status_computing_disabled_long">Premi play per far ripartire la rete e l\'elaborazione</string>
-  <string name="status_launching">Avvio in corso…</string>
-  <string name="status_noproject">Scegli un progetto per partecipare.</string>
-  <string name="status_closing">Chiusura in corso…</string>
-  <string name="status_benchmarking">Benchmark in corso…</string>
-  <string name="status_image_description">immagine progetto</string>
-  <!--preferences tab strings-->
-  <string name="prefs_loading">Lettura preferenze in corso…</string>
-  <string name="prefs_submit_button">Salva</string>
-  <string name="prefs_dialog_title">Inserisci il nuovo valore:</string>
-  <string name="prefs_dialog_title_selection">Seleziona:</string>
-  <string name="prefs_category_general">Generale</string>
-  <string name="prefs_category_network">Rete</string>
-  <string name="prefs_category_power">Energia</string>
-  <string name="prefs_category_cpu">CPU</string>
-  <string name="prefs_category_storage">Memoria fisica</string>
-  <string name="prefs_category_memory">Memoria</string>
-  <string name="prefs_category_debug">Debug</string>
-  <string name="prefs_show_advanced_header">Visualizza preferenze avanzate e controlli…</string>
-  <string name="prefs_suspend_when_screen_on">Interrompi il calcolo quando lo schermo è acceso</string>
-  <string name="prefs_stationary_device_mode_header">Modalità dispositivo stazionario</string>
-  <string name="prefs_stationary_device_mode_description">Permetti il calcolo a prescindere dalle preferenze di elettricità. Abilitalo solo se il dispositivo non ha una batteria.</string>
-  <string name="prefs_power_source_header">Sorgente di elettricità per il calcolo</string>
-  <string name="prefs_power_source_description">Seleziona le sorgenti di elettricità che BOINC può usare per il calcolo.</string>
-  <string name="prefs_power_source_ac">Caricabatterie a muro</string>
-  <string name="prefs_power_source_usb">Connessione USB</string>
-  <string name="prefs_power_source_wireless">Caricabatterie wireless</string>
-  <string name="prefs_power_source_battery">Batteria</string>
-  <string name="battery_charge_min_pct_header">Minimo livello batteria</string>
-  <string name="battery_charge_min_pct_description">BOINC sospende l\'elaborazione sotto il livello definito di carica della batteria.</string>
-  <string name="battery_temperature_max_header">Temperatura massima della batteria</string>
-  <string name="battery_temperature_max_description">BOINC sospende l\'elaborazione sopra al livello definito di temperatura della batteria. Non è raccomandato il cambiamento di questo valore.</string>
-  <string name="prefs_disk_max_pct_header">Massimo spazio di salvataggio</string>
-  <string name="prefs_disk_max_pct_description">Quanta percentuale dello spazio di salvataggio può usare BOINC?</string>
-  <string name="prefs_disk_min_free_gb_header">Minimo spazio su disco</string>
-  <string name="prefs_disk_min_free_gb_description">Quanto dello spazio di salvataggio del tuo dispositivo deve rimanere libero?</string>
-  <string name="prefs_disk_access_interval_header">Intervallo di accesso</string>
-  <string name="prefs_disk_access_interval_description">Suggerisci un intervallo tra le scritture su disco</string>
-  <string name="prefs_network_daily_xfer_limit_mb_header">Limite trasferimento giornaliero</string>
-  <string name="prefs_network_daily_xfer_limit_mb_description">Limita il traffico giornaliero causato da BOINC.</string>
-  <string name="prefs_network_wifi_only_header">Trasferisce i lavori solo su WiFi</string>
-  <string name="prefs_autostart_header">Avvio automatico</string>
-  <string name="prefs_show_notification_notices_header">Visualizza notifiche per nuove notizie</string>
-  <string name="prefs_show_notification_suspended_header">Visualizza notifiche quando sospeso</string>
-  <string name="prefs_cpu_number_cpus_header">Usa questo numero di core CPU</string>
-  <string name="prefs_cpu_number_cpus_description">Limita il numero di core CPU che BOINC usa per l\'elaborazione.</string>
-  <string name="prefs_cpu_other_load_suspension_header">Pausa con utilizzo CPU superiore a</string>
-  <string name="prefs_cpu_other_load_suspension_description">Determina quando BOINC ferma l\'elaborazione a causa dell\'utilizzo CPU di altre applicazioni.</string>
-  <string name="prefs_cpu_time_max_header">limite CPU</string>
-  <string name="prefs_cpu_time_max_description">Limita il tempo CPU che BOINC usa per l\'elaborazione.</string>
-  <string name="prefs_memory_max_idle_header">limite RAM</string>
-  <string name="prefs_memory_max_idle_description">Limita il quantitativo di RAM che BOINC può occupare.</string>
-  <string name="prefs_client_log_flags_header">Flag di log del Client BOINC</string>
-  <string name="prefs_gui_log_level_header">Livello di log della GUI</string>
-  <string name="prefs_gui_log_level_description">Specifica la verbosità dei messaggi di log della GUI.</string>
-  <string name="prefs_unit_mb">MB</string>
-  <string name="prefs_unit_gb">GB</string>
-  <string name="prefs_unit_pct">%</string>
-  <string name="prefs_unit_celcius">°C</string>
-  <string name="prefs_unit_seconds">secondi</string>
-  <!--projects tab strings-->
-  <string name="projects_loading">Lettura progetti…</string>
-  <string name="projects_add">Aggiungi progetto</string>
-  <string name="projects_icon">icona Progetto</string>
-  <string name="projects_credits_header">Crediti:</string>
-  <string name="projects_credits_host_header">(su questo dispositivo)</string>
-  <string name="projects_credits_user_header">(totale)</string>
-  <!--project status strings-->
-  <string name="projects_status_suspendedviagui">Sospeso dall\'utente</string>
-  <string name="projects_status_dontrequestmorework">Non chiedere nuovi lavori</string>
-  <string name="projects_status_ended">Progetto terminato - Può essere rimosso</string>
-  <string name="projects_status_detachwhendone">Verrà rimosso quando i lavori sono terminati</string>
-  <string name="projects_status_schedrpcpending">Richiesta allo scheduler in attesa</string>
-  <string name="projects_status_schedrpcinprogress">Richiesta allo scheduler in corso</string>
-  <string name="projects_status_trickleuppending">Messaggi trickle up in attesa</string>
-  <string name="projects_status_backoff">Comunicazione tra:</string>
-  <!--project controls-->
-  <string name="projects_control_dialog_title">Comandi progetto:</string>
-  <string name="projects_control_visit_website">Visita il sito web</string>
-  <string name="projects_control_update">Aggiorna</string>
-  <string name="projects_control_remove">Rimuovi</string>
-  <string name="projects_control_suspend">Sospendi</string>
-  <string name="projects_control_resume">Riprendi</string>
-  <string name="projects_control_nonewtasks">Nessun nuovo lavoro</string>
-  <string name="projects_control_allownewtasks">Permetti nuovi lavori</string>
-  <string name="projects_control_reset">Reset</string>
-  <string name="projects_control_dialog_title_acctmgr">Comandi dell\'account manager:</string>
-  <string name="projects_control_sync_acctmgr">Sincronizza</string>
-  <string name="projects_control_remove_acctmgr">Disabilita</string>
-  <!--project confirm dialog-->
-  <string name="projects_confirm_detach_title">Rimuovere il progetto?</string>
-  <string name="projects_confirm_detach_message">Sei sicuro di voler rimuovere</string>
-  <string name="projects_confirm_detach_message2">da BOINC?</string>
-  <string name="projects_confirm_detach_confirm">Rimuovi</string>
-  <string name="projects_confirm_reset_title">Reset progetto</string>
-  <string name="projects_confirm_reset_message">Sei sicuro di voler resettare</string>
-  <string name="projects_confirm_reset_message2">\?</string>
-  <string name="projects_confirm_reset_confirm">Reset</string>
-  <string name="projects_confirm_remove_acctmgr_title">Disabilita l\'account manager</string>
-  <string name="projects_confirm_remove_acctmgr_message">Sei sicuro di voler terminare l\'utilizzo</string>
-  <string name="projects_confirm_remove_acctmgr_message2">\?</string>
-  <string name="projects_confirm_remove_acctmgr_confirm">Disabilita</string>
-  <!--tasks tab strings-->
-  <string name="tasks_header_name">Nome Lavoro:</string>
-  <string name="tasks_header_elapsed_time">Tempo trascorso:</string>
-  <string name="tasks_header_project_paused">(sospeso)</string>
-  <string name="tasks_header_deadline">Deadline:</string>
-  <string name="tasks_result_new">nuovo</string>
-  <string name="tasks_result_files_downloading">in attesa del download</string>
-  <string name="tasks_result_files_downloaded">download completato</string>
-  <string name="tasks_result_compute_error">errore elaborazione</string>
-  <string name="tasks_result_files_uploading">upload in corso</string>
-  <string name="tasks_result_files_uploaded">upload completo</string>
-  <string name="tasks_result_aborted">annullato</string>
-  <string name="tasks_result_upload_failed">upload fallito</string>
-  <string name="tasks_active_uninitialized">pronto</string>
-  <string name="tasks_active_executing">elaborazione in corso</string>
-  <string name="tasks_active_suspended">sospeso</string>
-  <string name="tasks_active_abort_pending">in sospensione</string>
-  <string name="tasks_active_quit_pending">in sospensione</string>
-  <string name="tasks_custom_suspended_via_gui">sospeso</string>
-  <string name="tasks_custom_project_suspended_via_gui">progetto sospeso</string>
-  <string name="tasks_custom_ready_to_report">pronto per il report</string>
-  <!--confirmation dialog-->
-  <string name="confirm_abort_task_title">Annullare elaborazione?</string>
-  <string name="confirm_abort_task_message">Annulla elaborazione:</string>
-  <string name="confirm_abort_task_confirm">Annulla</string>
-  <string name="confirm_cancel">Cancella</string>
-  <string name="confirm_image_desc">Finestra di conferma</string>
-  <!--transfers tab strings-->
-  <string name="trans_loading">Lettura trasferimenti…</string>
-  <string name="trans_upload">Upload</string>
-  <string name="trans_download">Download</string>
-  <string name="trans_retryin">riprova tra</string>
-  <string name="trans_failed">fallito</string>
-  <string name="trans_suspended">sospeso</string>
-  <string name="trans_active">attivo</string>
-  <string name="trans_pending">in attesa</string>
-  <string name="trans_projectbackoff">backoff del progetto</string>
-  <string name="trans_header_name">File:</string>
-  <string name="trans_control_retry">Ritenta i trasferimenti</string>
-  <string name="confirm_abort_trans_title">Annullare trasferimento?</string>
-  <string name="confirm_abort_trans_message">Annulla File:</string>
-  <string name="confirm_abort_trans_confirm">Annulla</string>
-  <!--notices tab strings-->
-  <string name="notices_loading">Lettura notizie...</string>
-  <!--eventlog tab strings-->
-  <string name="eventlog_loading">Caricamento messaggi di log…</string>
-  <string name="eventlog_client_header">Messaggi del Client</string>
-  <string name="eventlog_gui_header">Messaggi della GUI</string>
-  <string name="eventlog_copy_toast">Log copiato nella clipboard.</string>
-  <string name="eventlog_email_subject">Log eventi per BOINC su Android:</string>
-  <!--suspend reasons-->
-  <string name="suspend_unknown">Elaborazione sospesa.</string>
-  <string name="suspend_batteries">Connetti il tuo dispositivo ad un caricabatterie per continuare l\'eleborazione.</string>
-  <string name="suspend_screen_on">Spegni lo schermo per continuare il calcolo.</string>
-  <string name="suspend_useractive">Utente attivo.</string>
-  <string name="suspend_tod">Fuori tempo massimo di computazione.</string>
-  <string name="suspend_bm">BOINC sta facendo il benchmark del tuo dispositivo…</string>
-  <string name="suspend_disksize">Superato lo spazio disco.</string>
-  <string name="suspend_cputhrottle">CPU throttle schedulato</string>
-  <string name="suspend_noinput">Nessuna attività dell\'utente recente.</string>
-  <string name="suspend_delay">Ritardo di inizializzazione.</string>
-  <string name="suspend_exclusiveapp">Un\'applicazione esclusiva è in corso.</string>
-  <string name="suspend_cpu">Il tuo dispositivo è occupato con altre applicazioni.</string>
-  <string name="suspend_network_quota">BOINC ha raggiunto il limite di trasferimento dalla rete.</string>
-  <string name="suspend_os">Fermato da Android.</string>
-  <string name="suspend_wifi">Non connesso al WiFi</string>
-  <string name="suspend_battery_charging">La batteria necessita di essere ricaricata prima di riprendere l\'elaborazione.</string>
-  <string name="suspend_battery_charging_long">L\'elaborazione riprenderà quando il livello di carica della batteria raggiunge</string>
-  <string name="suspend_battery_charging_long2"></string>
-  <string name="suspend_battery_charging_current">attualmente</string>
-  <string name="suspend_battery_overheating">In attesa che la batteria si raffreddi</string>
-  <string name="suspend_user_req">Ripresa elaborazione…</string>
-  <string name="suspend_network_user_req">manualmente.</string>
-  <!--rpc reasons-->
-  <string name="rpcreason_userreq">Richiesta dall\'utente</string>
-  <string name="rpcreason_needwork">Richiesta lavoro</string>
-  <string name="rpcreason_resultsdue">Invio elaborazioni terminate</string>
-  <string name="rpcreason_trickleup">Invio messaggi di trickle-up</string>
-  <string name="rpcreason_acctmgrreq">Richiesto dal gestore account</string>
-  <string name="rpcreason_init">Inizializzazione progetto</string>
-  <string name="rpcreason_projectreq">Richiesto dal progetto</string>
-  <string name="rpcreason_unknown">Motivo sconosciuto</string>
-  <!--menu-->
-  <string name="menu_refresh">Refresh</string>
-  <string name="menu_emailto">Invia una Email</string>
-  <string name="menu_copy">Copia nella Clipboard</string>
-  <string name="menu_eventlog">Log Eventi</string>
-  <string name="menu_exit">Chiudi BOINC</string>
-  <string name="menu_run_mode_disable">Sospendi</string>
-  <string name="menu_run_mode_enable">Riprendi</string>
-  <string name="menu_about">About</string>
-  <string name="menu_help">Help</string>
-  <!--about dialog-->
-  <string name="about_button">Return</string>
-  <string name="about_title">About</string>
-  <string name="about_name">BOINC</string>
-  <string name="about_version">Versione</string>
-  <string name="about_name_long">Berkeley Open Infrastructure for Network Computing</string>
-  <string name="about_copyright">© 2003–2013 University of California, Berkeley.\nTutti i diritti riservati.</string>
-  <string name="about_copyright_reserved">Tutti i Diritti Riservati.</string>
-  <string name="about_credits">Grazie all\'istituto Max Planck per la Fisica Gravitazionale, la IBM Corporation e la HTC Corporation per il loro supporto.</string>
-  <!--notice notification-->
-  <string name="notice_notification_single_header">Nuova notizia da</string>
-  <!--e.g. New notice from SETI@HOME-->
-  <string name="notice_notification_multiple_header">nuovi avvisi</string>
-  <!--e.g. 3 new notices-->
-  <!--multi BOINC compitability-->
-  <string name="nonexcl_dialog_header">Applicazione di calcolo distribuito rilevata</string>
-  <string name="nonexcl_dialog_text">Un\'altra applicazione di calcolo distribuito volontario è in uso su questo dispositivo. Solo una versione per volta può essere utilizzata.</string>
-  <string name="nonexcl_dialog_exit">Esci</string>
-  <!--social integration-->
-  <string name="social_invite_button">Invita amici</string>
-  <string name="social_invite_intent_title">Come vuoi condividere?</string>
-  <string name="social_invite_content_title">Sto facendo calcoli scientifici dal mio smartphone!</string>
-  <string name="social_invite_content_body">Sto usando il mio %1$s per fare calcolo scientifico distribuito. Anche tu puoi! Scarica l\'applicazione da: %2$s</string>
-  <!--first parameter: device manufacturer, second: URL-->
-  <string name="social_invite_content_url">https://play.google.com/store/apps/details?id=edu.berkeley.boinc</string>
-</resources>
diff --git a/android/BOINC/res/values-pt-rPT/strings.xml b/android/BOINC/res/values-pt-rPT/strings.xml
index 00e885152d..8d82224e38 100644
--- a/android/BOINC/res/values-pt-rPT/strings.xml
+++ b/android/BOINC/res/values-pt-rPT/strings.xml
@@ -1,7 +1,14 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--app global-->
   <string name="app_name">BOINC</string>
+  <!--generic. used by multiple Activities/tabs-->
   <string name="generic_loading">A carregar! Por favor aguarde...</string>
+  <string name="generic_button_continue">Continuar</string>
+  <string name="generic_button_finish">Terminar</string>
+  <!--attach project-->
+  <!--selection list-->
+  <string name="attachproject_list_desc">Seleccione os projectos científicos que quer contribuir:</string>
   <string name="attachproject_list_header">Escolha um projecto:</string>
   <string name="attachproject_list_manual_button">Adicionar projecto por URL</string>
   <string name="attachproject_list_manual_dialog_title">Insira URL do projecto:</string>
@@ -9,6 +16,34 @@
   <string name="attachproject_list_manual_no_url">Por favor insira o URL do projecto</string>
   <string name="attachproject_list_acctmgr_button">Adicionar gestor de conta</string>
   <string name="attachproject_list_no_internet">Sem conexão de Internet</string>
+  <!--credential input-->
+  <string name="attachproject_credential_input_sing_desc">Insira informações da conta</string>
+  <string name="attachproject_credential_input_desc">Insira informação da conta para os projectos seleccionados:</string>
+  <string name="attachproject_credential_input_show_pwd">Mostrar palavra-passe</string>
+  <string name="attachproject_individual_credential_input">Adicionar projectos individualmente</string>
+  <!--conflicts-->
+  <string name="attachproject_conflicts_desc">Existiram problemas ao anexar os projectos científicos:</string>
+  <string name="attachproject_conflict_undefined">Não conseguiu conexão</string>
+  <string name="attachproject_conflict_not_unique">A conta existe com uma palavra-passe diferente</string>
+  <string name="attachproject_conflict_bad_password">Palavra-passe incorrecta</string>
+  <string name="attachproject_conflict_unknown_user">A conta não existe</string>
+  <string name="attachproject_conflict_unknown_user_creation_disabled">A conta não existe. Visite o website do projecto para se registar</string>
+  <!--working-->
+  <string name="attachproject_working_attaching">Anexando</string>
+  <!--e.g. Attaching Einstein@Home-->
+  <!--hints-->
+  <string name="attachproject_hints_header">Dica</string>
+  <!--e.g. Hint 1/2-->
+  <string name="attachproject_hint_contribtion_header">Como contribuir:</string>
+  <string name="attachproject_hint_contribtion_wifi">1. Conectar ao WiFi</string>
+  <string name="attachproject_hint_contribtion_charger">2. Ligar o Carregador</string>
+  <string name="attachproject_hint_contribtion_screen">3. Desligar o Ecrã</string>
+  <string name="attachproject_hint_projectwebsite_header">Visite os websites do projecto para:</string>
+  <string name="attachproject_hint_projectwebsite_science">Aprenda mais sobre a ciência</string>
+  <string name="attachproject_hint_projectwebsite_stats">Ver estatísticas de contribuição</string>
+  <string name="attachproject_hint_projectwebsite_community">Entre em contacto com outros voluntários</string>
+  <string name="attachproject_hint_platforms_header">O BOINC também está disponível para o seu computador ou portátil, visite boinc.berkeley.edu para saber mais.</string>
+  <!--project login-->
   <string name="attachproject_login_loading">A contactar o servidor do projecto...</string>
   <string name="attachproject_login_image_description">Logotipo do projecto.</string>
   <string name="attachproject_login_header_general_area">Área geral:</string>
@@ -34,6 +69,7 @@
   <string name="attachproject_login_button_forgotpw">Esqueceu a Palavra-passe</string>
   <string name="attachproject_login_error_toast">Contacto ao projecto falhou!</string>
   <string name="attachproject_login_attached">Anexado</string>
+  <!--project registration-->
   <string name="attachproject_registration_header">Registo de conta para</string>
   <string name="attachproject_registration_header_url">Projecto:</string>
   <string name="attachproject_registration_header_email">e-Mail:</string>
@@ -42,16 +78,20 @@
   <string name="attachproject_registration_header_pwd">Palavra-passe:</string>
   <string name="attachproject_registration_header_pwd_confirm">... Escreva novamente:</string>
   <string name="attachproject_registration_button">Criar</string>
+  <!--account manager-->
+  <string name="attachproject_acctmgr_list_desc">Use o gestor de conta do BOINC, para adicionar ou gerir projectos múltiplos</string>
   <string name="attachproject_acctmgr_header">Adicionar gestor de conta</string>
   <string name="attachproject_acctmgr_header_url">URL</string>
   <string name="attachproject_acctmgr_header_name">Utilizador:</string>
   <string name="attachproject_acctmgr_header_pwd">Palavra-passe:</string>
   <string name="attachproject_acctmgr_header_pwd_confirm">... Escreva novamente:</string>
   <string name="attachproject_acctmgr_button">Adicionar</string>
+  <!--error strings-->
   <string name="attachproject_error_wrong_name">Utilizador não encontrado</string>
   <string name="attachproject_error_short_pwd">Palavra-passe demasiado curta</string>
   <string name="attachproject_error_no_internet">Falha de conexão</string>
   <string name="attachproject_error_pwd_no_match">As palavras-passe não coincidem</string>
+  <string name="attachproject_error_pwd_no_retype">Por favor, insira a palavra-passe novamente</string>
   <string name="attachproject_error_no_url">Por favor insira o URL</string>
   <string name="attachproject_error_no_email">Por favor insira o endereço de e-Mail</string>
   <string name="attachproject_error_no_pwd">Por favor insira a palavra-passe</string>
@@ -64,6 +104,7 @@
   <string name="attachproject_error_bad_pwd">Palavra-passe não aceite</string>
   <string name="attachproject_error_creation_disabled">A criação de contas está desabilitada para este projecto</string>
   <string name="attachproject_error_invalid_url">URL inválido</string>
+  <!--working activity-->
   <string name="attachproject_working_back_button">Voltar atrás</string>
   <string name="attachproject_working_finish_button">Terminar</string>
   <string name="attachproject_working_check_desc">Bem sucedido</string>
@@ -77,10 +118,12 @@
   <string name="attachproject_working_login">Entrar</string>
   <string name="attachproject_working_acctmgr">Adicionar gestor de conta</string>
   <string name="attachproject_working_acctmgr_sync">Sincronizar</string>
+  <!--main activity-->
   <string name="main_noproject_warning">Carregue aqui para escolher um projecto.</string>
   <string name="main_error">Whooops</string>
   <string name="main_error_long">...isto não deveria acontecer!\nCarregue no ícone para tentar novamente.</string>
   <string name="main_title_icon_desc">Ícone do BOINC</string>
+  <!--tab names-->
   <string name="tab_status">Estado</string>
   <string name="tab_projects">Projectos</string>
   <string name="tab_tasks">Tarefas</string>
@@ -88,6 +131,7 @@
   <string name="tab_preferences">Preferências</string>
   <string name="tab_notices">Notícias</string>
   <string name="tab_desc">Navegação</string>
+  <!--status strings-->
   <string name="status_running">A computar</string>
   <string name="status_running_long">Obrigado por participar.</string>
   <string name="status_paused">Suspenso</string>
@@ -100,6 +144,7 @@
   <string name="status_closing">A fechar...</string>
   <string name="status_benchmarking">A executar testes de performance...</string>
   <string name="status_image_description">imagem do projecto</string>
+  <!--preferences tab strings-->
   <string name="prefs_loading">A ler preferências...</string>
   <string name="prefs_submit_button">Salvar</string>
   <string name="prefs_dialog_title">Insira novo valor:</string>
@@ -112,6 +157,15 @@
   <string name="prefs_category_memory">Memória</string>
   <string name="prefs_category_debug">Debug</string>
   <string name="prefs_show_advanced_header">Mostrar preferências avançadas e controlos...</string>
+  <string name="prefs_suspend_when_screen_on">Pausar a computação quando o ecrã está ligado</string>
+  <string name="prefs_stationary_device_mode_header">Dispositivo em modo estacionário</string>
+  <string name="prefs_stationary_device_mode_description">Permite computação independentemente das preferências de Energia. Habilite apenas se o dispositivo não tiver uma bateria.</string>
+  <string name="prefs_power_source_header">Fontes de energia para computação</string>
+  <string name="prefs_power_source_description">Selecciona a fonte de energia permitida para o BOINC realizar computação.</string>
+  <string name="prefs_power_source_ac">Wall socket</string>
+  <string name="prefs_power_source_usb">Conexão USB</string>
+  <string name="prefs_power_source_wireless">Carregador sem fios</string>
+  <string name="prefs_power_source_battery">Bateria</string>
   <string name="battery_charge_min_pct_header">Nível de bateria minímo</string>
   <string name="battery_charge_min_pct_description">O BOINC suspende a computação abaixo do nível de bateria definido.</string>
   <string name="battery_temperature_max_header">Temperatura máxima da bateria</string>
@@ -120,14 +174,18 @@
   <string name="prefs_disk_max_pct_description">Qual a percentagem de espaço de armazenamento no seu dispositivo que é permitida que o BOINC use?</string>
   <string name="prefs_disk_min_free_gb_header">Espaço de armazenamento minímo</string>
   <string name="prefs_disk_min_free_gb_description">Qual a capacidade de espaço de armazenamento no seu dispositivo que deve ficar livre?</string>
+  <string name="prefs_disk_access_interval_header">Intervalo de acesso</string>
+  <string name="prefs_disk_access_interval_description">Sugerir um intervalo entre acessos ao disco</string>
   <string name="prefs_network_daily_xfer_limit_mb_header">Transferência diária limite</string>
   <string name="prefs_network_daily_xfer_limit_mb_description">Limita o tráfico diário causado pelo BOINC.</string>
   <string name="prefs_network_wifi_only_header">Transferir tarefas em WiFi apenas</string>
   <string name="prefs_autostart_header">Começo Automático</string>
+  <string name="prefs_show_notification_notices_header">Mostrar notificações para novas notícias</string>
+  <string name="prefs_show_notification_suspended_header">Mostrar notificação quando suspenso</string>
   <string name="prefs_cpu_number_cpus_header">Cores de CPU usados</string>
   <string name="prefs_cpu_number_cpus_description">Limita o número de cores de CPU que o BOINC usa para computação.</string>
   <string name="prefs_cpu_other_load_suspension_header">Pausa no CPU quando a utilização for acima de</string>
-  <string name="prefs_cpu_other_load_suspension_description">Determina quando o BOINC pausa a computação, devido ao uso de outras aplicações no CPU.</string>
+  <string name="prefs_cpu_other_load_suspension_description">Determina quando o BOINC pausa a computação, devido ao uso de CPU por outras aplicações</string>
   <string name="prefs_cpu_time_max_header">Limite do CPU</string>
   <string name="prefs_cpu_time_max_description">Limita o tempo de CPU que o BOINC usa para computação.</string>
   <string name="prefs_memory_max_idle_header">Limite de RAM</string>
@@ -139,12 +197,15 @@
   <string name="prefs_unit_gb">GB</string>
   <string name="prefs_unit_pct">%</string>
   <string name="prefs_unit_celcius">ºC</string>
+  <string name="prefs_unit_seconds">s</string>
+  <!--projects tab strings-->
   <string name="projects_loading">A ler projectos...</string>
   <string name="projects_add">Adicionar projecto</string>
   <string name="projects_icon">Ícone do projecto</string>
   <string name="projects_credits_header">Créditos:</string>
   <string name="projects_credits_host_header">(neste dispositivo)</string>
   <string name="projects_credits_user_header">(total)</string>
+  <!--project status strings-->
   <string name="projects_status_suspendedviagui">Supenso pelo utilizador</string>
   <string name="projects_status_dontrequestmorework">Não ir buscar novas tarefas</string>
   <string name="projects_status_ended">Projecto terminado - OK para remover</string>
@@ -153,6 +214,7 @@
   <string name="projects_status_schedrpcinprogress">Solicitação agendada em progresso</string>
   <string name="projects_status_trickleuppending">Mensagem de aviso pendente</string>
   <string name="projects_status_backoff">Comunicação agendada em:</string>
+  <!--project controls-->
   <string name="projects_control_dialog_title">Comandos do projecto:</string>
   <string name="projects_control_visit_website">Visitar website</string>
   <string name="projects_control_update">Actualizar</string>
@@ -165,16 +227,20 @@
   <string name="projects_control_dialog_title_acctmgr">Comandos do gestor de conta:</string>
   <string name="projects_control_sync_acctmgr">Sincronizar</string>
   <string name="projects_control_remove_acctmgr">Desabilitar</string>
+  <!--project confirm dialog-->
   <string name="projects_confirm_detach_title">Remover projecto?</string>
   <string name="projects_confirm_detach_message">Tem a certeza que quer remover</string>
   <string name="projects_confirm_detach_message2">do BOINC?</string>
   <string name="projects_confirm_detach_confirm">Remover</string>
   <string name="projects_confirm_reset_title">Fazer reset ao projecto</string>
   <string name="projects_confirm_reset_message">Tem a certeza que quer fazer reset</string>
+  <string name="projects_confirm_reset_message2">\?</string>
   <string name="projects_confirm_reset_confirm">Reset</string>
   <string name="projects_confirm_remove_acctmgr_title">Desabilitar gestor de conta</string>
   <string name="projects_confirm_remove_acctmgr_message">Tem a certeza que quer parar de usar o</string>
+  <string name="projects_confirm_remove_acctmgr_message2">\?</string>
   <string name="projects_confirm_remove_acctmgr_confirm">Desabilitar</string>
+  <!--tasks tab strings-->
   <string name="tasks_header_name">Nome da Tarefa:</string>
   <string name="tasks_header_elapsed_time">Tempo decorrido:</string>
   <string name="tasks_header_project_paused">(suspenso)</string>
@@ -195,11 +261,13 @@
   <string name="tasks_custom_suspended_via_gui">suspenso</string>
   <string name="tasks_custom_project_suspended_via_gui">projecto suspenso</string>
   <string name="tasks_custom_ready_to_report">pronto para reportar</string>
+  <!--confirmation dialog-->
   <string name="confirm_abort_task_title">Abortar tarefa?</string>
   <string name="confirm_abort_task_message">Abortar tarefa:</string>
   <string name="confirm_abort_task_confirm">Abortar</string>
   <string name="confirm_cancel">Cancelar</string>
   <string name="confirm_image_desc">Diálogo de confirmação</string>
+  <!--transfers tab strings-->
   <string name="trans_loading">A ler transferências...</string>
   <string name="trans_upload">Upload</string>
   <string name="trans_download">Transferir</string>
@@ -214,14 +282,18 @@
   <string name="confirm_abort_trans_title">Abortar transferência?</string>
   <string name="confirm_abort_trans_message">Abortar Ficheiro:</string>
   <string name="confirm_abort_trans_confirm">Abortar</string>
+  <!--notices tab strings-->
   <string name="notices_loading">A ler notícias...</string>
+  <!--eventlog tab strings-->
   <string name="eventlog_loading">A carregar mensagens de log...</string>
   <string name="eventlog_client_header">Mensagens do Cliente</string>
   <string name="eventlog_gui_header">Mensagens da GUI</string>
   <string name="eventlog_copy_toast">Log copiado para a área de transferência.</string>
   <string name="eventlog_email_subject">Log de Eventos para o BOINC no Android:</string>
+  <!--suspend reasons-->
   <string name="suspend_unknown">Computação suspensa.</string>
   <string name="suspend_batteries">Conecte o seu dispositivo a um carregador para continuar a computação.</string>
+  <string name="suspend_screen_on">Desligar ecrã para continuar a computação.</string>
   <string name="suspend_useractive">O utilizador está activo</string>
   <string name="suspend_tod">Fora da janela de tempo para a computação.</string>
   <string name="suspend_bm">O BOINC está a executar testes de performance no seu dispositivo...</string>
@@ -236,10 +308,12 @@
   <string name="suspend_wifi">Não conectado a um WiFi.</string>
   <string name="suspend_battery_charging">A bateria precisa de ser carregada antes que a computação seja resumida.</string>
   <string name="suspend_battery_charging_long">A computação será resumida quando a carga da bateria chegar a</string>
+  <string name="suspend_battery_charging_long2"></string>
   <string name="suspend_battery_charging_current">actualmente</string>
   <string name="suspend_battery_overheating">À espera que a bateria arrefeça</string>
   <string name="suspend_user_req">A resumir a computação...</string>
   <string name="suspend_network_user_req">manualmente.</string>
+  <!--rpc reasons-->
   <string name="rpcreason_userreq">Requisitado pelo utilizador</string>
   <string name="rpcreason_needwork">Ir buscar trabalho</string>
   <string name="rpcreason_resultsdue">Reportar tarefas completas</string>
@@ -248,6 +322,7 @@
   <string name="rpcreason_init">Inicialização do projecto</string>
   <string name="rpcreason_projectreq">Requisitado pelo projecto</string>
   <string name="rpcreason_unknown">Razão desconhecida</string>
+  <!--menu-->
   <string name="menu_refresh">Recarregar</string>
   <string name="menu_emailto">Enviar como e-mail</string>
   <string name="menu_copy">Copiar para a Àrea de Transferência</string>
@@ -257,10 +332,29 @@
   <string name="menu_run_mode_enable">Resumir</string>
   <string name="menu_about">Acerca de</string>
   <string name="menu_help">Ajuda</string>
+  <!--about dialog-->
   <string name="about_button">Regressar</string>
   <string name="about_title">Acerca de</string>
   <string name="about_name">BOINC</string>
   <string name="about_version">Versão</string>
   <string name="about_name_long">Infraestrutura Aberta Berkeley para a Rede de Computação</string>
   <string name="about_copyright">© 2003-2013 Universidade da Califórnia, Berkeley.\nTodos os Direitos Reservados.</string>
+  <string name="about_copyright_reserved">Todos os Direitos Reservados</string>
+  <string name="about_credits">Agradecimentos ao Instituto Max Planck de Física Gravitacional, IBM e HTC pelo seu suporte.</string>
+  <!--notice notification-->
+  <string name="notice_notification_single_header">Nova notícia de</string>
+  <!--e.g. New notice from SETI@HOME-->
+  <string name="notice_notification_multiple_header">notícias novas</string>
+  <!--e.g. 3 new notices-->
+  <!--multi BOINC compitability-->
+  <string name="nonexcl_dialog_header">Aplicação de computação voluntária detectada</string>
+  <string name="nonexcl_dialog_text">Outra aplicação de computação voluntária está a ser executada neste aparelho. Apenas uma pode correr de cada vez.</string>
+  <string name="nonexcl_dialog_exit">Sair</string>
+  <!--social integration-->
+  <string name="social_invite_button">Convidar amigos</string>
+  <string name="social_invite_intent_title">Como quer partilhar?</string>
+  <string name="social_invite_content_title">Estou a fazer ciência no meu smartphone!</string>
+  <string name="social_invite_content_body">Estou a utilizar o meu %1$s para fazer computação para a ciência. Tamném podes! Faz a transferência da aplicação de: %2$s</string>
+  <!--first parameter: device manufacturer, second: URL-->
+  <string name="social_invite_content_url">https://play.google.com/store/apps/details?id=edu.berkeley.boinc</string>
 </resources>
diff --git a/android/BOINC/res/values-pt_PT/strings.xml b/android/BOINC/res/values-pt_PT/strings.xml
deleted file mode 100644
index 8d82224e38..0000000000
--- a/android/BOINC/res/values-pt_PT/strings.xml
+++ /dev/null
@@ -1,360 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--app global-->
-  <string name="app_name">BOINC</string>
-  <!--generic. used by multiple Activities/tabs-->
-  <string name="generic_loading">A carregar! Por favor aguarde...</string>
-  <string name="generic_button_continue">Continuar</string>
-  <string name="generic_button_finish">Terminar</string>
-  <!--attach project-->
-  <!--selection list-->
-  <string name="attachproject_list_desc">Seleccione os projectos científicos que quer contribuir:</string>
-  <string name="attachproject_list_header">Escolha um projecto:</string>
-  <string name="attachproject_list_manual_button">Adicionar projecto por URL</string>
-  <string name="attachproject_list_manual_dialog_title">Insira URL do projecto:</string>
-  <string name="attachproject_list_manual_dialog_button">Adicionar projecto</string>
-  <string name="attachproject_list_manual_no_url">Por favor insira o URL do projecto</string>
-  <string name="attachproject_list_acctmgr_button">Adicionar gestor de conta</string>
-  <string name="attachproject_list_no_internet">Sem conexão de Internet</string>
-  <!--credential input-->
-  <string name="attachproject_credential_input_sing_desc">Insira informações da conta</string>
-  <string name="attachproject_credential_input_desc">Insira informação da conta para os projectos seleccionados:</string>
-  <string name="attachproject_credential_input_show_pwd">Mostrar palavra-passe</string>
-  <string name="attachproject_individual_credential_input">Adicionar projectos individualmente</string>
-  <!--conflicts-->
-  <string name="attachproject_conflicts_desc">Existiram problemas ao anexar os projectos científicos:</string>
-  <string name="attachproject_conflict_undefined">Não conseguiu conexão</string>
-  <string name="attachproject_conflict_not_unique">A conta existe com uma palavra-passe diferente</string>
-  <string name="attachproject_conflict_bad_password">Palavra-passe incorrecta</string>
-  <string name="attachproject_conflict_unknown_user">A conta não existe</string>
-  <string name="attachproject_conflict_unknown_user_creation_disabled">A conta não existe. Visite o website do projecto para se registar</string>
-  <!--working-->
-  <string name="attachproject_working_attaching">Anexando</string>
-  <!--e.g. Attaching Einstein@Home-->
-  <!--hints-->
-  <string name="attachproject_hints_header">Dica</string>
-  <!--e.g. Hint 1/2-->
-  <string name="attachproject_hint_contribtion_header">Como contribuir:</string>
-  <string name="attachproject_hint_contribtion_wifi">1. Conectar ao WiFi</string>
-  <string name="attachproject_hint_contribtion_charger">2. Ligar o Carregador</string>
-  <string name="attachproject_hint_contribtion_screen">3. Desligar o Ecrã</string>
-  <string name="attachproject_hint_projectwebsite_header">Visite os websites do projecto para:</string>
-  <string name="attachproject_hint_projectwebsite_science">Aprenda mais sobre a ciência</string>
-  <string name="attachproject_hint_projectwebsite_stats">Ver estatísticas de contribuição</string>
-  <string name="attachproject_hint_projectwebsite_community">Entre em contacto com outros voluntários</string>
-  <string name="attachproject_hint_platforms_header">O BOINC também está disponível para o seu computador ou portátil, visite boinc.berkeley.edu para saber mais.</string>
-  <!--project login-->
-  <string name="attachproject_login_loading">A contactar o servidor do projecto...</string>
-  <string name="attachproject_login_image_description">Logotipo do projecto.</string>
-  <string name="attachproject_login_header_general_area">Área geral:</string>
-  <string name="attachproject_login_header_specific_area">Área específica:</string>
-  <string name="attachproject_login_header_description">Descrição:</string>
-  <string name="attachproject_login_header_home">Página principal:</string>
-  <string name="attachproject_login_header_url">Website:</string>
-  <string name="attachproject_login_header_platform">Android:</string>
-  <string name="attachproject_login_platform_supported">Este projecto suporta dispositivos com Android</string>
-  <string name="attachproject_login_platform_not_supported">Este projecto não suporta dispositivos com Android</string>
-  <string name="attachproject_login_category_terms_of_use">Termos de uso para</string>
-  <string name="attachproject_login_accept_terms_of_use">Ao criar uma conta neste projecto, aceita os termos de uso acima descritos.</string>
-  <string name="attachproject_login_category_login">Entrar com uma conta já existente</string>
-  <string name="attachproject_login_header_id_email">e-Mail:</string>
-  <string name="attachproject_login_header_id_name">Nome:</string>
-  <string name="attachproject_login_header_pwd">Palavra-passe:</string>
-  <string name="attachproject_login_category_creation">Novo a</string>
-  <string name="attachproject_login_header_creation_enabled">Registar uma conta para participar:</string>
-  <string name="attachproject_login_header_creation_client_disabled">Visite o website do projecto para criar uma conta:</string>
-  <string name="attachproject_login_header_creation_disabled">O projecto não permite de momento a criação de novas contas!</string>
-  <string name="attachproject_login_button_registration">Registar</string>
-  <string name="attachproject_login_button_login">Entrar</string>
-  <string name="attachproject_login_button_forgotpw">Esqueceu a Palavra-passe</string>
-  <string name="attachproject_login_error_toast">Contacto ao projecto falhou!</string>
-  <string name="attachproject_login_attached">Anexado</string>
-  <!--project registration-->
-  <string name="attachproject_registration_header">Registo de conta para</string>
-  <string name="attachproject_registration_header_url">Projecto:</string>
-  <string name="attachproject_registration_header_email">e-Mail:</string>
-  <string name="attachproject_registration_header_username">Nome:</string>
-  <string name="attachproject_registration_header_teamname">Equipa:</string>
-  <string name="attachproject_registration_header_pwd">Palavra-passe:</string>
-  <string name="attachproject_registration_header_pwd_confirm">... Escreva novamente:</string>
-  <string name="attachproject_registration_button">Criar</string>
-  <!--account manager-->
-  <string name="attachproject_acctmgr_list_desc">Use o gestor de conta do BOINC, para adicionar ou gerir projectos múltiplos</string>
-  <string name="attachproject_acctmgr_header">Adicionar gestor de conta</string>
-  <string name="attachproject_acctmgr_header_url">URL</string>
-  <string name="attachproject_acctmgr_header_name">Utilizador:</string>
-  <string name="attachproject_acctmgr_header_pwd">Palavra-passe:</string>
-  <string name="attachproject_acctmgr_header_pwd_confirm">... Escreva novamente:</string>
-  <string name="attachproject_acctmgr_button">Adicionar</string>
-  <!--error strings-->
-  <string name="attachproject_error_wrong_name">Utilizador não encontrado</string>
-  <string name="attachproject_error_short_pwd">Palavra-passe demasiado curta</string>
-  <string name="attachproject_error_no_internet">Falha de conexão</string>
-  <string name="attachproject_error_pwd_no_match">As palavras-passe não coincidem</string>
-  <string name="attachproject_error_pwd_no_retype">Por favor, insira a palavra-passe novamente</string>
-  <string name="attachproject_error_no_url">Por favor insira o URL</string>
-  <string name="attachproject_error_no_email">Por favor insira o endereço de e-Mail</string>
-  <string name="attachproject_error_no_pwd">Por favor insira a palavra-passe</string>
-  <string name="attachproject_error_no_name">Por favor insira o nome de utilizador</string>
-  <string name="attachproject_error_unknown">falhou</string>
-  <string name="attachproject_error_bad_username">Nome de utilizador não aceite</string>
-  <string name="attachproject_error_email_in_use">Endereço de e-Mail já em uso</string>
-  <string name="attachproject_error_project_down">O projecto está offline</string>
-  <string name="attachproject_error_email_bad_syntax">Endereço de e-Mail não aceite</string>
-  <string name="attachproject_error_bad_pwd">Palavra-passe não aceite</string>
-  <string name="attachproject_error_creation_disabled">A criação de contas está desabilitada para este projecto</string>
-  <string name="attachproject_error_invalid_url">URL inválido</string>
-  <!--working activity-->
-  <string name="attachproject_working_back_button">Voltar atrás</string>
-  <string name="attachproject_working_finish_button">Terminar</string>
-  <string name="attachproject_working_check_desc">Bem sucedido</string>
-  <string name="attachproject_working_failed_desc">Falhou</string>
-  <string name="attachproject_working_ongoing">...</string>
-  <string name="attachproject_working_finished">.</string>
-  <string name="attachproject_working_description">:</string>
-  <string name="attachproject_working_connect">Conectar</string>
-  <string name="attachproject_working_verify">Verificar conta</string>
-  <string name="attachproject_working_register">Registar conta</string>
-  <string name="attachproject_working_login">Entrar</string>
-  <string name="attachproject_working_acctmgr">Adicionar gestor de conta</string>
-  <string name="attachproject_working_acctmgr_sync">Sincronizar</string>
-  <!--main activity-->
-  <string name="main_noproject_warning">Carregue aqui para escolher um projecto.</string>
-  <string name="main_error">Whooops</string>
-  <string name="main_error_long">...isto não deveria acontecer!\nCarregue no ícone para tentar novamente.</string>
-  <string name="main_title_icon_desc">Ícone do BOINC</string>
-  <!--tab names-->
-  <string name="tab_status">Estado</string>
-  <string name="tab_projects">Projectos</string>
-  <string name="tab_tasks">Tarefas</string>
-  <string name="tab_transfers">Transferências</string>
-  <string name="tab_preferences">Preferências</string>
-  <string name="tab_notices">Notícias</string>
-  <string name="tab_desc">Navegação</string>
-  <!--status strings-->
-  <string name="status_running">A computar</string>
-  <string name="status_running_long">Obrigado por participar.</string>
-  <string name="status_paused">Suspenso</string>
-  <string name="status_idle">Nada para fazer</string>
-  <string name="status_idle_long">A aguardar tarefas...</string>
-  <string name="status_computing_disabled">Suspenso</string>
-  <string name="status_computing_disabled_long">Carregue no play para resumir a actividade de rede e computação.</string>
-  <string name="status_launching">A começar...</string>
-  <string name="status_noproject">Escolha um projecto para participar.</string>
-  <string name="status_closing">A fechar...</string>
-  <string name="status_benchmarking">A executar testes de performance...</string>
-  <string name="status_image_description">imagem do projecto</string>
-  <!--preferences tab strings-->
-  <string name="prefs_loading">A ler preferências...</string>
-  <string name="prefs_submit_button">Salvar</string>
-  <string name="prefs_dialog_title">Insira novo valor:</string>
-  <string name="prefs_dialog_title_selection">Seleccione:</string>
-  <string name="prefs_category_general">Geral</string>
-  <string name="prefs_category_network">Rede</string>
-  <string name="prefs_category_power">Alimentação</string>
-  <string name="prefs_category_cpu">CPU</string>
-  <string name="prefs_category_storage">Armazenamento</string>
-  <string name="prefs_category_memory">Memória</string>
-  <string name="prefs_category_debug">Debug</string>
-  <string name="prefs_show_advanced_header">Mostrar preferências avançadas e controlos...</string>
-  <string name="prefs_suspend_when_screen_on">Pausar a computação quando o ecrã está ligado</string>
-  <string name="prefs_stationary_device_mode_header">Dispositivo em modo estacionário</string>
-  <string name="prefs_stationary_device_mode_description">Permite computação independentemente das preferências de Energia. Habilite apenas se o dispositivo não tiver uma bateria.</string>
-  <string name="prefs_power_source_header">Fontes de energia para computação</string>
-  <string name="prefs_power_source_description">Selecciona a fonte de energia permitida para o BOINC realizar computação.</string>
-  <string name="prefs_power_source_ac">Wall socket</string>
-  <string name="prefs_power_source_usb">Conexão USB</string>
-  <string name="prefs_power_source_wireless">Carregador sem fios</string>
-  <string name="prefs_power_source_battery">Bateria</string>
-  <string name="battery_charge_min_pct_header">Nível de bateria minímo</string>
-  <string name="battery_charge_min_pct_description">O BOINC suspende a computação abaixo do nível de bateria definido.</string>
-  <string name="battery_temperature_max_header">Temperatura máxima da bateria</string>
-  <string name="battery_temperature_max_description">O BOINC suspende a computação abaixo da temperatura da bateria definida. Não é recomendada a alteração deste valor.</string>
-  <string name="prefs_disk_max_pct_header">Espaço de armazenamento máximo</string>
-  <string name="prefs_disk_max_pct_description">Qual a percentagem de espaço de armazenamento no seu dispositivo que é permitida que o BOINC use?</string>
-  <string name="prefs_disk_min_free_gb_header">Espaço de armazenamento minímo</string>
-  <string name="prefs_disk_min_free_gb_description">Qual a capacidade de espaço de armazenamento no seu dispositivo que deve ficar livre?</string>
-  <string name="prefs_disk_access_interval_header">Intervalo de acesso</string>
-  <string name="prefs_disk_access_interval_description">Sugerir um intervalo entre acessos ao disco</string>
-  <string name="prefs_network_daily_xfer_limit_mb_header">Transferência diária limite</string>
-  <string name="prefs_network_daily_xfer_limit_mb_description">Limita o tráfico diário causado pelo BOINC.</string>
-  <string name="prefs_network_wifi_only_header">Transferir tarefas em WiFi apenas</string>
-  <string name="prefs_autostart_header">Começo Automático</string>
-  <string name="prefs_show_notification_notices_header">Mostrar notificações para novas notícias</string>
-  <string name="prefs_show_notification_suspended_header">Mostrar notificação quando suspenso</string>
-  <string name="prefs_cpu_number_cpus_header">Cores de CPU usados</string>
-  <string name="prefs_cpu_number_cpus_description">Limita o número de cores de CPU que o BOINC usa para computação.</string>
-  <string name="prefs_cpu_other_load_suspension_header">Pausa no CPU quando a utilização for acima de</string>
-  <string name="prefs_cpu_other_load_suspension_description">Determina quando o BOINC pausa a computação, devido ao uso de CPU por outras aplicações</string>
-  <string name="prefs_cpu_time_max_header">Limite do CPU</string>
-  <string name="prefs_cpu_time_max_description">Limita o tempo de CPU que o BOINC usa para computação.</string>
-  <string name="prefs_memory_max_idle_header">Limite de RAM</string>
-  <string name="prefs_memory_max_idle_description">Limita a quantidade de RAM que é permitida que as tarefas ocupem.</string>
-  <string name="prefs_client_log_flags_header">Bandeiras de log do cliente BOINC</string>
-  <string name="prefs_gui_log_level_header">Nível de log da GUI</string>
-  <string name="prefs_gui_log_level_description">Especifica a verbosidade das mensagens de log da GUI.</string>
-  <string name="prefs_unit_mb">MB</string>
-  <string name="prefs_unit_gb">GB</string>
-  <string name="prefs_unit_pct">%</string>
-  <string name="prefs_unit_celcius">ºC</string>
-  <string name="prefs_unit_seconds">s</string>
-  <!--projects tab strings-->
-  <string name="projects_loading">A ler projectos...</string>
-  <string name="projects_add">Adicionar projecto</string>
-  <string name="projects_icon">Ícone do projecto</string>
-  <string name="projects_credits_header">Créditos:</string>
-  <string name="projects_credits_host_header">(neste dispositivo)</string>
-  <string name="projects_credits_user_header">(total)</string>
-  <!--project status strings-->
-  <string name="projects_status_suspendedviagui">Supenso pelo utilizador</string>
-  <string name="projects_status_dontrequestmorework">Não ir buscar novas tarefas</string>
-  <string name="projects_status_ended">Projecto terminado - OK para remover</string>
-  <string name="projects_status_detachwhendone">Irá remover quando as tarefas terminarem</string>
-  <string name="projects_status_schedrpcpending">Solicitação agendada pendente</string>
-  <string name="projects_status_schedrpcinprogress">Solicitação agendada em progresso</string>
-  <string name="projects_status_trickleuppending">Mensagem de aviso pendente</string>
-  <string name="projects_status_backoff">Comunicação agendada em:</string>
-  <!--project controls-->
-  <string name="projects_control_dialog_title">Comandos do projecto:</string>
-  <string name="projects_control_visit_website">Visitar website</string>
-  <string name="projects_control_update">Actualizar</string>
-  <string name="projects_control_remove">Remover</string>
-  <string name="projects_control_suspend">Suspender</string>
-  <string name="projects_control_resume">Resumir</string>
-  <string name="projects_control_nonewtasks">Cancelar novas tarefas</string>
-  <string name="projects_control_allownewtasks">Permitir novas tarefas</string>
-  <string name="projects_control_reset">Reset</string>
-  <string name="projects_control_dialog_title_acctmgr">Comandos do gestor de conta:</string>
-  <string name="projects_control_sync_acctmgr">Sincronizar</string>
-  <string name="projects_control_remove_acctmgr">Desabilitar</string>
-  <!--project confirm dialog-->
-  <string name="projects_confirm_detach_title">Remover projecto?</string>
-  <string name="projects_confirm_detach_message">Tem a certeza que quer remover</string>
-  <string name="projects_confirm_detach_message2">do BOINC?</string>
-  <string name="projects_confirm_detach_confirm">Remover</string>
-  <string name="projects_confirm_reset_title">Fazer reset ao projecto</string>
-  <string name="projects_confirm_reset_message">Tem a certeza que quer fazer reset</string>
-  <string name="projects_confirm_reset_message2">\?</string>
-  <string name="projects_confirm_reset_confirm">Reset</string>
-  <string name="projects_confirm_remove_acctmgr_title">Desabilitar gestor de conta</string>
-  <string name="projects_confirm_remove_acctmgr_message">Tem a certeza que quer parar de usar o</string>
-  <string name="projects_confirm_remove_acctmgr_message2">\?</string>
-  <string name="projects_confirm_remove_acctmgr_confirm">Desabilitar</string>
-  <!--tasks tab strings-->
-  <string name="tasks_header_name">Nome da Tarefa:</string>
-  <string name="tasks_header_elapsed_time">Tempo decorrido:</string>
-  <string name="tasks_header_project_paused">(suspenso)</string>
-  <string name="tasks_header_deadline">Data Limite:</string>
-  <string name="tasks_result_new">novo</string>
-  <string name="tasks_result_files_downloading">à espera de transferir</string>
-  <string name="tasks_result_files_downloaded">transferência completa</string>
-  <string name="tasks_result_compute_error">erro de computação</string>
-  <string name="tasks_result_files_uploading">a fazer upload</string>
-  <string name="tasks_result_files_uploaded">upload completo</string>
-  <string name="tasks_result_aborted">abortado</string>
-  <string name="tasks_result_upload_failed">upload falhado</string>
-  <string name="tasks_active_uninitialized">pronto</string>
-  <string name="tasks_active_executing">em execução</string>
-  <string name="tasks_active_suspended">suspenso</string>
-  <string name="tasks_active_abort_pending">a suspender</string>
-  <string name="tasks_active_quit_pending">a suspender</string>
-  <string name="tasks_custom_suspended_via_gui">suspenso</string>
-  <string name="tasks_custom_project_suspended_via_gui">projecto suspenso</string>
-  <string name="tasks_custom_ready_to_report">pronto para reportar</string>
-  <!--confirmation dialog-->
-  <string name="confirm_abort_task_title">Abortar tarefa?</string>
-  <string name="confirm_abort_task_message">Abortar tarefa:</string>
-  <string name="confirm_abort_task_confirm">Abortar</string>
-  <string name="confirm_cancel">Cancelar</string>
-  <string name="confirm_image_desc">Diálogo de confirmação</string>
-  <!--transfers tab strings-->
-  <string name="trans_loading">A ler transferências...</string>
-  <string name="trans_upload">Upload</string>
-  <string name="trans_download">Transferir</string>
-  <string name="trans_retryin">tentar novamente em</string>
-  <string name="trans_failed">falhou</string>
-  <string name="trans_suspended">suspenso</string>
-  <string name="trans_active">activo</string>
-  <string name="trans_pending">pendente</string>
-  <string name="trans_projectbackoff">projecto em backoff</string>
-  <string name="trans_header_name">Ficheiro:</string>
-  <string name="trans_control_retry">Tentar transferências novamente</string>
-  <string name="confirm_abort_trans_title">Abortar transferência?</string>
-  <string name="confirm_abort_trans_message">Abortar Ficheiro:</string>
-  <string name="confirm_abort_trans_confirm">Abortar</string>
-  <!--notices tab strings-->
-  <string name="notices_loading">A ler notícias...</string>
-  <!--eventlog tab strings-->
-  <string name="eventlog_loading">A carregar mensagens de log...</string>
-  <string name="eventlog_client_header">Mensagens do Cliente</string>
-  <string name="eventlog_gui_header">Mensagens da GUI</string>
-  <string name="eventlog_copy_toast">Log copiado para a área de transferência.</string>
-  <string name="eventlog_email_subject">Log de Eventos para o BOINC no Android:</string>
-  <!--suspend reasons-->
-  <string name="suspend_unknown">Computação suspensa.</string>
-  <string name="suspend_batteries">Conecte o seu dispositivo a um carregador para continuar a computação.</string>
-  <string name="suspend_screen_on">Desligar ecrã para continuar a computação.</string>
-  <string name="suspend_useractive">O utilizador está activo</string>
-  <string name="suspend_tod">Fora da janela de tempo para a computação.</string>
-  <string name="suspend_bm">O BOINC está a executar testes de performance no seu dispositivo...</string>
-  <string name="suspend_disksize">Sem espaço em disco.</string>
-  <string name="suspend_cputhrottle">Estrangulamento de CPU agendado.</string>
-  <string name="suspend_noinput">Sem actividade recente do utilizador.</string>
-  <string name="suspend_delay">Atraso de inicialização.</string>
-  <string name="suspend_exclusiveapp">Uma aplicação exclusiva está em execução.</string>
-  <string name="suspend_cpu">O seu dispositivo está ocupado com outras aplicações</string>
-  <string name="suspend_network_quota">O BOINC atingiu a transferência de rede diária limite.</string>
-  <string name="suspend_os">Parado pelo Android.</string>
-  <string name="suspend_wifi">Não conectado a um WiFi.</string>
-  <string name="suspend_battery_charging">A bateria precisa de ser carregada antes que a computação seja resumida.</string>
-  <string name="suspend_battery_charging_long">A computação será resumida quando a carga da bateria chegar a</string>
-  <string name="suspend_battery_charging_long2"></string>
-  <string name="suspend_battery_charging_current">actualmente</string>
-  <string name="suspend_battery_overheating">À espera que a bateria arrefeça</string>
-  <string name="suspend_user_req">A resumir a computação...</string>
-  <string name="suspend_network_user_req">manualmente.</string>
-  <!--rpc reasons-->
-  <string name="rpcreason_userreq">Requisitado pelo utilizador</string>
-  <string name="rpcreason_needwork">Ir buscar trabalho</string>
-  <string name="rpcreason_resultsdue">Reportar tarefas completas</string>
-  <string name="rpcreason_trickleup">Enviar mensagem de aviso</string>
-  <string name="rpcreason_acctmgrreq">Requisitado pelo gestor de conta</string>
-  <string name="rpcreason_init">Inicialização do projecto</string>
-  <string name="rpcreason_projectreq">Requisitado pelo projecto</string>
-  <string name="rpcreason_unknown">Razão desconhecida</string>
-  <!--menu-->
-  <string name="menu_refresh">Recarregar</string>
-  <string name="menu_emailto">Enviar como e-mail</string>
-  <string name="menu_copy">Copiar para a Àrea de Transferência</string>
-  <string name="menu_eventlog">Log de Eventos</string>
-  <string name="menu_exit">Sair do BOINC</string>
-  <string name="menu_run_mode_disable">Suspender</string>
-  <string name="menu_run_mode_enable">Resumir</string>
-  <string name="menu_about">Acerca de</string>
-  <string name="menu_help">Ajuda</string>
-  <!--about dialog-->
-  <string name="about_button">Regressar</string>
-  <string name="about_title">Acerca de</string>
-  <string name="about_name">BOINC</string>
-  <string name="about_version">Versão</string>
-  <string name="about_name_long">Infraestrutura Aberta Berkeley para a Rede de Computação</string>
-  <string name="about_copyright">© 2003-2013 Universidade da Califórnia, Berkeley.\nTodos os Direitos Reservados.</string>
-  <string name="about_copyright_reserved">Todos os Direitos Reservados</string>
-  <string name="about_credits">Agradecimentos ao Instituto Max Planck de Física Gravitacional, IBM e HTC pelo seu suporte.</string>
-  <!--notice notification-->
-  <string name="notice_notification_single_header">Nova notícia de</string>
-  <!--e.g. New notice from SETI@HOME-->
-  <string name="notice_notification_multiple_header">notícias novas</string>
-  <!--e.g. 3 new notices-->
-  <!--multi BOINC compitability-->
-  <string name="nonexcl_dialog_header">Aplicação de computação voluntária detectada</string>
-  <string name="nonexcl_dialog_text">Outra aplicação de computação voluntária está a ser executada neste aparelho. Apenas uma pode correr de cada vez.</string>
-  <string name="nonexcl_dialog_exit">Sair</string>
-  <!--social integration-->
-  <string name="social_invite_button">Convidar amigos</string>
-  <string name="social_invite_intent_title">Como quer partilhar?</string>
-  <string name="social_invite_content_title">Estou a fazer ciência no meu smartphone!</string>
-  <string name="social_invite_content_body">Estou a utilizar o meu %1$s para fazer computação para a ciência. Tamném podes! Faz a transferência da aplicação de: %2$s</string>
-  <!--first parameter: device manufacturer, second: URL-->
-  <string name="social_invite_content_url">https://play.google.com/store/apps/details?id=edu.berkeley.boinc</string>
-</resources>
diff --git a/android/BOINC/res/values-ru_RU/strings.xml b/android/BOINC/res/values-ru-rRU/strings.xml
similarity index 100%
rename from android/BOINC/res/values-ru_RU/strings.xml
rename to android/BOINC/res/values-ru-rRU/strings.xml
diff --git a/android/BOINC/res/values-ru/strings.xml b/android/BOINC/res/values-ru/strings.xml
deleted file mode 100644
index 131b4d7f8d..0000000000
--- a/android/BOINC/res/values-ru/strings.xml
+++ /dev/null
@@ -1,265 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources>
-  <string name="app_name">BOINC</string>
-  <string name="generic_loading">Загружается! Пожалуйста подождите…</string>
-  <string name="attachproject_list_header">Выберите проект:</string>
-  <string name="attachproject_list_manual_button">Добавить URL-адрес проекта</string>
-  <string name="attachproject_list_manual_dialog_title">Введите URL проекта:</string>
-  <string name="attachproject_list_manual_dialog_button">Добавить проект</string>
-  <string name="attachproject_list_manual_no_url">Пожалуйста, введите URL проекта</string>
-  <string name="attachproject_list_acctmgr_button">Добавить менеджер проектов</string>
-  <string name="attachproject_list_no_internet">Нет подключения к Интернету</string>
-  <string name="attachproject_login_loading">Соединение с сервером проекта…</string>
-  <string name="attachproject_login_image_description">Логотип проекта.</string>
-  <string name="attachproject_login_header_general_area">Основная область:</string>
-  <string name="attachproject_login_header_specific_area">Специализация:</string>
-  <string name="attachproject_login_header_description">Описание:</string>
-  <string name="attachproject_login_header_home">Владелец:</string>
-  <string name="attachproject_login_header_url">Веб-сайт:</string>
-  <string name="attachproject_login_header_platform">Android:</string>
-  <string name="attachproject_login_platform_supported">Этот проект поддерживает Android-устройства</string>
-  <string name="attachproject_login_platform_not_supported">Этот проект не поддерживает устройства на базе Android</string>
-  <string name="attachproject_login_category_terms_of_use">Условия использования для</string>
-  <string name="attachproject_login_accept_terms_of_use">Создавая учётную запись в этом проекте, вы принимаете условия использования, которые показаны выше.</string>
-  <string name="attachproject_login_category_login">Войти с существующей учётной записью</string>
-  <string name="attachproject_login_header_id_email">Электронная почта:</string>
-  <string name="attachproject_login_header_id_name">Имя:</string>
-  <string name="attachproject_login_header_pwd">Пароль:</string>
-  <string name="attachproject_login_category_creation">Впервые в</string>
-  <string name="attachproject_login_header_creation_enabled">Зарегистрировать учётную запись для участия:</string>
-  <string name="attachproject_login_header_creation_client_disabled">Посетить веб-сайт проекта для создания учётной записи:</string>
-  <string name="attachproject_login_header_creation_disabled">Проект в данный момент не позволяет создавать новые учётные записи!</string>
-  <string name="attachproject_login_button_registration">Зарегистрироваться</string>
-  <string name="attachproject_login_button_login">Войти</string>
-  <string name="attachproject_login_button_forgotpw">Восстановить пароль</string>
-  <string name="attachproject_login_error_toast">Сбой при установке связи с проектом!</string>
-  <string name="attachproject_login_attached">Подключен</string>
-  <string name="attachproject_registration_header">Регистрация учётной записи для</string>
-  <string name="attachproject_registration_header_url">Проект:</string>
-  <string name="attachproject_registration_header_email">Электронная почта:</string>
-  <string name="attachproject_registration_header_username">Имя:</string>
-  <string name="attachproject_registration_header_teamname">Команда:</string>
-  <string name="attachproject_registration_header_pwd">Пароль:</string>
-  <string name="attachproject_registration_header_pwd_confirm">… Повторите:</string>
-  <string name="attachproject_registration_button">Создать</string>
-  <string name="attachproject_acctmgr_header">Добавить менеджер проектов</string>
-  <string name="attachproject_acctmgr_header_url">URL</string>
-  <string name="attachproject_acctmgr_header_name">Пользователь:</string>
-  <string name="attachproject_acctmgr_header_pwd">Пароль:</string>
-  <string name="attachproject_acctmgr_header_pwd_confirm">… Повторите:</string>
-  <string name="attachproject_acctmgr_button">Добавить</string>
-  <string name="attachproject_error_wrong_name">Пользователь не найден</string>
-  <string name="attachproject_error_short_pwd">Пароль слишком короткий</string>
-  <string name="attachproject_error_no_internet">Сбой подключения</string>
-  <string name="attachproject_error_pwd_no_match">Пароли не совпадают</string>
-  <string name="attachproject_error_no_url">Введите URL</string>
-  <string name="attachproject_error_no_email">Введите адрес электронной почты</string>
-  <string name="attachproject_error_no_pwd">Введите пароль</string>
-  <string name="attachproject_error_no_name">Введите имя пользователя</string>
-  <string name="attachproject_error_unknown">неудача</string>
-  <string name="attachproject_error_bad_username">Имя пользователя не принято</string>
-  <string name="attachproject_error_email_in_use">Адрес электронной почты уже используется</string>
-  <string name="attachproject_error_project_down">Проект выключен</string>
-  <string name="attachproject_error_email_bad_syntax">Адрес электронной почты не принят</string>
-  <string name="attachproject_error_bad_pwd">Пароль не принят</string>
-  <string name="attachproject_error_creation_disabled">Создание учётной записи в данном проекте отключено</string>
-  <string name="attachproject_error_invalid_url">Неправильный адрес (URL)</string>
-  <string name="attachproject_working_back_button">Назад</string>
-  <string name="attachproject_working_finish_button">Готово</string>
-  <string name="attachproject_working_check_desc">Успешно</string>
-  <string name="attachproject_working_failed_desc">Неудачно</string>
-  <string name="attachproject_working_ongoing">…</string>
-  <string name="attachproject_working_finished">.</string>
-  <string name="attachproject_working_description">:</string>
-  <string name="attachproject_working_connect">Подключиться</string>
-  <string name="attachproject_working_verify">Проверить учётную запись</string>
-  <string name="attachproject_working_register">Зарегистрировать учётную запись</string>
-  <string name="attachproject_working_login">Войти</string>
-  <string name="attachproject_working_acctmgr">Добавить менеджер проектов</string>
-  <string name="attachproject_working_acctmgr_sync">Синхронизировать</string>
-  <string name="main_error">Упс</string>
-  <string name="main_error_long">…этого не должно было произойти!\nНажмите на значок BOINC, чтобы попробовать ещё раз.</string>
-  <string name="main_title_icon_desc">Значок BOINC</string>
-  <string name="tab_status">Статус</string>
-  <string name="tab_projects">Проекты</string>
-  <string name="tab_tasks">Задания</string>
-  <string name="tab_transfers">Передачи</string>
-  <string name="tab_preferences">Настройки</string>
-  <string name="tab_notices">Уведомления</string>
-  <string name="tab_desc">Навигация</string>
-  <string name="status_running">Выполнение расчётов</string>
-  <string name="status_running_long">Спасибо за участие.</string>
-  <string name="status_paused">Приостановлено</string>
-  <string name="status_idle">Нечего делать</string>
-  <string name="status_idle_long">Ожидание заданий…</string>
-  <string name="status_computing_disabled">Приостановлено</string>
-  <string name="status_computing_disabled_long">Нажмите кнопку Play для возобновления расчётов и передачи данных.</string>
-  <string name="status_launching">Запуск…</string>
-  <string name="status_noproject">Выбрать проект для участия.</string>
-  <string name="status_closing">Закрытие…</string>
-  <string name="status_benchmarking">Тестирование производительности…</string>
-  <string name="status_image_description">изображение проекта</string>
-  <string name="prefs_loading">Чтение настроек…</string>
-  <string name="prefs_submit_button">Сохранить</string>
-  <string name="prefs_dialog_title">Введите новое значение:</string>
-  <string name="prefs_dialog_title_selection">Выбрать:</string>
-  <string name="prefs_category_general">Основные</string>
-  <string name="prefs_category_network">Сеть</string>
-  <string name="prefs_category_power">Питание</string>
-  <string name="prefs_category_cpu">Процессор</string>
-  <string name="prefs_category_storage">Диск</string>
-  <string name="prefs_category_memory">Память</string>
-  <string name="prefs_category_debug">Отладка</string>
-  <string name="prefs_show_advanced_header">Показать дополнительные настройки и элементы управления…</string>
-  <string name="battery_charge_min_pct_header">Мин. уровень заряда батареи</string>
-  <string name="battery_charge_min_pct_description">BOINC приостановит расчёты, когда заряд батареи будет ниже указанного уровня.</string>
-  <string name="battery_temperature_max_header">Макс. температура батареи</string>
-  <string name="battery_temperature_max_description">BOINC приостановит расчёты, когда температура батареи превысит указанный уровень. Не рекомендуется менять это значение.</string>
-  <string name="prefs_disk_max_pct_header">Макс. используемое пространство памяти</string>
-  <string name="prefs_disk_max_pct_description">Сколько процентов от общего объёма памяти вашего устройства BOINC может использовать?</string>
-  <string name="prefs_disk_min_free_gb_header">Мин. свободное пространство</string>
-  <string name="prefs_disk_min_free_gb_description">Какой объём памяти вашего устройства должен оставаться свободным?</string>
-  <string name="prefs_network_daily_xfer_limit_mb_header">Ежедневный предел передачи</string>
-  <string name="prefs_network_daily_xfer_limit_mb_description">Ограничивает ежедневный трафик данных, вызванный BOINC.</string>
-  <string name="prefs_network_wifi_only_header">Передавать задания только по WiFi</string>
-  <string name="prefs_autostart_header">Автозапуск</string>
-  <string name="prefs_cpu_number_cpus_header">Используемые ядра процессора</string>
-  <string name="prefs_cpu_number_cpus_description">Ограничивает количество ядер процессора, которые использует BOINC для расчётов.</string>
-  <string name="prefs_cpu_other_load_suspension_header">Пауза при использовании процессора выше</string>
-  <string name="prefs_cpu_other_load_suspension_description">Определяет, когда BOINC останавливает расчёты из-за использования процессора другими приложениями.</string>
-  <string name="prefs_cpu_time_max_header">Предельное время процессора</string>
-  <string name="prefs_cpu_time_max_description">Ограничивает время процессора, которое использует BOINC для расчётов.</string>
-  <string name="prefs_memory_max_idle_header">Ограничение ОЗУ</string>
-  <string name="prefs_memory_max_idle_description">Ограничивает объём ОЗУ, который задания могут занимать.</string>
-  <string name="prefs_client_log_flags_header">Флаги журнала клиента BOINC</string>
-  <string name="prefs_gui_log_level_header">Уровень журнала GUI</string>
-  <string name="prefs_gui_log_level_description">Задает уровень детализации сообщений журнала GUI.</string>
-  <string name="prefs_unit_mb">МБ</string>
-  <string name="prefs_unit_gb">ГБ</string>
-  <string name="prefs_unit_pct">%</string>
-  <string name="prefs_unit_celcius">°C</string>
-  <string name="projects_loading">Чтение проектов…</string>
-  <string name="projects_add">Добавить проект</string>
-  <string name="projects_icon">Значок проекта</string>
-  <string name="projects_credits_header">Очки:</string>
-  <string name="projects_credits_host_header">(на этом устройстве)</string>
-  <string name="projects_credits_user_header">(всего)</string>
-  <string name="projects_status_suspendedviagui">Приостановлен пользователем</string>
-  <string name="projects_status_dontrequestmorework">Не запрашивать новые задания</string>
-  <string name="projects_status_ended">Проект завершён - ОК для удаления</string>
-  <string name="projects_status_detachwhendone">Будет удалён после завершения заданий</string>
-  <string name="projects_status_schedrpcpending">Запрос информации у планировщика</string>
-  <string name="projects_status_schedrpcinprogress">Производится запрос информации у планировщика</string>
-  <string name="projects_status_trickleuppending">Ожидание промежуточной отправки</string>
-  <string name="projects_status_backoff">Связь по расписанию:</string>
-  <string name="projects_control_dialog_title">Команды проекта:</string>
-  <string name="projects_control_visit_website">Посетить веб-сайт</string>
-  <string name="projects_control_update">Обновить</string>
-  <string name="projects_control_remove">Удалить</string>
-  <string name="projects_control_suspend">Приостановить</string>
-  <string name="projects_control_resume">Возобновить</string>
-  <string name="projects_control_nonewtasks">Не запрашивать задания</string>
-  <string name="projects_control_allownewtasks">Получать новые задания</string>
-  <string name="projects_control_reset">Сбросить</string>
-  <string name="projects_control_dialog_title_acctmgr">Команды менеджера проектов:</string>
-  <string name="projects_control_sync_acctmgr">Синхронизировать</string>
-  <string name="projects_control_remove_acctmgr">Отключить</string>
-  <string name="projects_confirm_detach_title">Удалить проект?</string>
-  <string name="projects_confirm_detach_message">Вы действительно хотите удалить</string>
-  <string name="projects_confirm_detach_message2">из BOINC?</string>
-  <string name="projects_confirm_detach_confirm">Удалить</string>
-  <string name="projects_confirm_reset_title">Перезапустить проект</string>
-  <string name="projects_confirm_reset_message">Вы действительно хотите перезапустить</string>
-  <string name="projects_confirm_reset_confirm">Сбросить</string>
-  <string name="projects_confirm_remove_acctmgr_title">Отключить менеджер проектов</string>
-  <string name="projects_confirm_remove_acctmgr_message">Вы уверены, что хотите прекратить использование</string>
-  <string name="projects_confirm_remove_acctmgr_confirm">Отключить</string>
-  <string name="tasks_header_name">Название задания:</string>
-  <string name="tasks_header_elapsed_time">Затрачено времени:</string>
-  <string name="tasks_header_project_paused">(приостановлено)</string>
-  <string name="tasks_header_deadline">Крайний срок:</string>
-  <string name="tasks_result_new">новый</string>
-  <string name="tasks_result_files_downloading">ожидание загрузки</string>
-  <string name="tasks_result_files_downloaded">загрузка завершена</string>
-  <string name="tasks_result_compute_error">ошибка расчётов</string>
-  <string name="tasks_result_files_uploading">отправка</string>
-  <string name="tasks_result_files_uploaded">отправка завершена</string>
-  <string name="tasks_result_aborted">прервано</string>
-  <string name="tasks_result_upload_failed">сбой при отправке</string>
-  <string name="tasks_active_uninitialized">готово</string>
-  <string name="tasks_active_executing">выполняется</string>
-  <string name="tasks_active_suspended">приостановлено</string>
-  <string name="tasks_active_abort_pending">приостанавливается</string>
-  <string name="tasks_active_quit_pending">приостанавливается</string>
-  <string name="tasks_custom_suspended_via_gui">приостановлено</string>
-  <string name="tasks_custom_project_suspended_via_gui">проект приостановлен</string>
-  <string name="tasks_custom_ready_to_report">готово для подтверждения</string>
-  <string name="confirm_abort_task_title">Прервать задание?</string>
-  <string name="confirm_abort_task_message">Прервать задание:</string>
-  <string name="confirm_abort_task_confirm">Прервать</string>
-  <string name="confirm_cancel">Отмена</string>
-  <string name="confirm_image_desc">Диалог подтверждения</string>
-  <string name="trans_loading">Чтение списка передач…</string>
-  <string name="trans_upload">Отправка</string>
-  <string name="trans_download">Загрузка</string>
-  <string name="trans_retryin">повтор через</string>
-  <string name="trans_failed">неудача</string>
-  <string name="trans_suspended">приостановлено</string>
-  <string name="trans_active">активна</string>
-  <string name="trans_pending">ожидает</string>
-  <string name="trans_projectbackoff">запрос к проекту отложен на</string>
-  <string name="trans_header_name">Файл:</string>
-  <string name="trans_control_retry">Повторить передачи</string>
-  <string name="confirm_abort_trans_title">Прервать передачу?</string>
-  <string name="confirm_abort_trans_message">Прервать файл:</string>
-  <string name="confirm_abort_trans_confirm">Прервать</string>
-  <string name="notices_loading">Чтение уведомлений…</string>
-  <string name="eventlog_loading">Загрузка сообщений журнала…</string>
-  <string name="eventlog_client_header">Сообщения клиента</string>
-  <string name="eventlog_gui_header">Сообщения GUI</string>
-  <string name="eventlog_copy_toast">Журнал скопирован в буфер обмена.</string>
-  <string name="eventlog_email_subject">Журнал событий для BOINC на Android:</string>
-  <string name="suspend_unknown">Расчёты приостановлены.</string>
-  <string name="suspend_batteries">Подключите ваше устройство к зарядному устройству для продолжения расчётов.</string>
-  <string name="suspend_useractive">Пользователь работает.</string>
-  <string name="suspend_tod">Закончилось выделенное время для расчётов.</string>
-  <string name="suspend_bm">BOINC измеряет производительность вашего устройства…</string>
-  <string name="suspend_disksize">Закончилось свободное место на диске.</string>
-  <string name="suspend_cputhrottle">Запланированное ограничение нагрузки процессора.</string>
-  <string name="suspend_noinput">Нет активности пользователя за последнее время.</string>
-  <string name="suspend_delay">Инициализация отложена.</string>
-  <string name="suspend_exclusiveapp">Выполняется привилегированное приложение.</string>
-  <string name="suspend_cpu">Ваше устройство занято другими приложениями.</string>
-  <string name="suspend_network_quota">BOINC достиг ограничения передачи данных по сети.</string>
-  <string name="suspend_os">Android остановил.</string>
-  <string name="suspend_wifi">Нет подключения к WiFi.</string>
-  <string name="suspend_battery_charging">Необходимо подзарядить батарею для продолжения расчётов.</string>
-  <string name="suspend_battery_charging_long">Расчёты возобновятся, когда заряд батареи достигнет</string>
-  <string name="suspend_battery_charging_current">в данный момент</string>
-  <string name="suspend_battery_overheating">Ожидание охлаждения батареи</string>
-  <string name="suspend_user_req">Возобновление расчётов…</string>
-  <string name="suspend_network_user_req">вручную.</string>
-  <string name="rpcreason_userreq">Запрошено пользователем</string>
-  <string name="rpcreason_needwork">Запросить задания</string>
-  <string name="rpcreason_resultsdue">Сообщить о завершённых заданиях</string>
-  <string name="rpcreason_trickleup">Отправить промежуточное сообщение</string>
-  <string name="rpcreason_acctmgrreq">Запрошено менеджером проектов</string>
-  <string name="rpcreason_init">Инициализация проекта</string>
-  <string name="rpcreason_projectreq">Запрошено проектом</string>
-  <string name="rpcreason_unknown">Неизвестная причина</string>
-  <string name="menu_refresh">Обновить</string>
-  <string name="menu_emailto">Отправить письмом</string>
-  <string name="menu_copy">Копировать в буфер обмена</string>
-  <string name="menu_eventlog">Журнал событий</string>
-  <string name="menu_exit">Выйти из BOINC</string>
-  <string name="menu_run_mode_disable">Приостановить</string>
-  <string name="menu_run_mode_enable">Возобновить</string>
-  <string name="menu_about">О</string>
-  <string name="menu_help">Справка</string>
-  <string name="about_button">Вернуться</string>
-  <string name="about_title">О</string>
-  <string name="about_name">BOINC</string>
-  <string name="about_version">Версия</string>
-  <string name="about_name_long">BOINC - Berkeley Open Infrastructure for Network Computing\nОткрытая Инфраструктура для Распределенных Вычислений университета Беркли</string>
-  <string name="about_copyright">© 2003-2013 Калифорнийский университет, Беркли.\nВсе права защищены.</string>
-</resources>
diff --git a/locale/txconfig b/locale/txconfig
index dbd95f4479..6ce28d7da9 100644
--- a/locale/txconfig
+++ b/locale/txconfig
@@ -35,5 +35,5 @@ type = PO
 file_filter = android/BOINC/res/values-<lang>/strings.xml
 source_file = android/BOINC/res/values/strings.xml
 source_lang = en_US
-lang_map = it_IT: it_rIT, pt_BR: pt_rBR, pt_PT: pt_rPT, ru_RU: ru_rRU, sv_SE: sv_rSE, zh_CN: zh_rCN, zh_TW: zh_rTW
+lang_map = it_IT:it-rIT,pt_BR:pt-rBR,pt_PT:pt-rPT,ru_RU:ru-rRU,sv_SE:sv-rSE,zh_CN:zh-rCN,zh_TW:zh-rTW
 type = ANDROID