From 71001537c241eef1e5c044dfd1accf7f47e67c54 Mon Sep 17 00:00:00 2001
From: lado <herrlado@gmail.com>
Date: Mon, 23 Jan 2012 21:28:58 +0100
Subject: moved to single file

---
 vdrmanager/res/values-it/action_menu.xml         |  11 -
 vdrmanager/res/values-it/application.xml         |   4 -
 vdrmanager/res/values-it/channel_list.xml        |  18 --
 vdrmanager/res/values-it/common.xml              |  32 ---
 vdrmanager/res/values-it/epg.xml                 |  35 ---
 vdrmanager/res/values-it/epg_list.xml            |   5 -
 vdrmanager/res/values-it/epg_list_menu.xml       |  15 -
 vdrmanager/res/values-it/epg_search_times.xml    |   7 -
 vdrmanager/res/values-it/errors.xml              |   6 -
 vdrmanager/res/values-it/livetv.xml              |  37 ---
 vdrmanager/res/values-it/main_menu.xml           |   8 -
 vdrmanager/res/values-it/preferences.xml         | 142 ----------
 vdrmanager/res/values-it/progress.xml            |  28 --
 vdrmanager/res/values-it/recording_list_menu.xml |   5 -
 vdrmanager/res/values-it/strings.xml             | 334 +++++++++++++++++++++++
 vdrmanager/res/values-it/timers.xml              |  15 -
 16 files changed, 334 insertions(+), 368 deletions(-)
 delete mode 100644 vdrmanager/res/values-it/action_menu.xml
 delete mode 100644 vdrmanager/res/values-it/application.xml
 delete mode 100644 vdrmanager/res/values-it/channel_list.xml
 delete mode 100644 vdrmanager/res/values-it/common.xml
 delete mode 100644 vdrmanager/res/values-it/epg.xml
 delete mode 100644 vdrmanager/res/values-it/epg_list.xml
 delete mode 100644 vdrmanager/res/values-it/epg_list_menu.xml
 delete mode 100644 vdrmanager/res/values-it/epg_search_times.xml
 delete mode 100644 vdrmanager/res/values-it/errors.xml
 delete mode 100644 vdrmanager/res/values-it/livetv.xml
 delete mode 100644 vdrmanager/res/values-it/main_menu.xml
 delete mode 100644 vdrmanager/res/values-it/preferences.xml
 delete mode 100644 vdrmanager/res/values-it/progress.xml
 delete mode 100644 vdrmanager/res/values-it/recording_list_menu.xml
 create mode 100644 vdrmanager/res/values-it/strings.xml
 delete mode 100644 vdrmanager/res/values-it/timers.xml

(limited to 'vdrmanager/res/values-it')

diff --git a/vdrmanager/res/values-it/action_menu.xml b/vdrmanager/res/values-it/action_menu.xml
deleted file mode 100644
index 2f39a33..0000000
--- a/vdrmanager/res/values-it/action_menu.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-  <string name="action_menu_channels">Canali</string>   
-  <string name="action_menu_timers">Timer</string>
-  <string name="action_menu_recordings">Registrazioni</string>
-  <string name="action_menu_epg">Elenco EPG</string>
-  <string name="action_menu_search">Ricerca EPG</string>
-  <string name="action_menu_wakeup">Accensione</string>
-  
-</resources>
diff --git a/vdrmanager/res/values-it/application.xml b/vdrmanager/res/values-it/application.xml
deleted file mode 100644
index f88e609..0000000
--- a/vdrmanager/res/values-it/application.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Gestore VDR</string>
-</resources>
diff --git a/vdrmanager/res/values-it/channel_list.xml b/vdrmanager/res/values-it/channel_list.xml
deleted file mode 100644
index c5cec83..0000000
--- a/vdrmanager/res/values-it/channel_list.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-  <string name="channel_item_menu_epg">Mostra EPG</string>
-  <string name="channel_item_menu_stream">Mostra trasmissione</string>
-  <string name="channel_item_menu_hide">Nascondi</string>
-  <string name="channel_item_menu_hide_permanent">Nascondi sempre</string>
-  
-  <string name="channel_group_menu_hide">Nascondi</string>
-  <string name="channel_group_menu_hide_permanent">Nascondi sempre</string>
-  
-  <string name="menu_groupby">Ordina per</string>
-  <string name="groupby_group">Gruppo</string>
-  <string name="groupby_provider">Emittente</string>
-  <string name="groupby_name">Nome</string>
-  <string name="groupby_name_all_channels_group">Tutti i canali</string>
-  <string name="groupby_window_title_templte">Ordina per %1$s</string>
-</resources>
diff --git a/vdrmanager/res/values-it/common.xml b/vdrmanager/res/values-it/common.xml
deleted file mode 100644
index 0a40821..0000000
--- a/vdrmanager/res/values-it/common.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="common_delete">Elimina</string>
-    <string name="prefs_current_value">Attuale:</string>
-    <string name="prefs_current_value_template">\nAttuale: %1$s</string>
-    <string name="prefs_current_value_not_set">&lt;non impostato></string>
-    <string name="no_connection">Nessuna connessione</string>
-    <string name="aborted">Connessione terminata.</string>
-    <string name="no_connection_retry">Riprova</string>
-    <string name="refresh">Aggiorna</string>
-    <string name="done">Completato</string>
-    <string name="share">Condividi</string>
-    <string name="search_reapt">Riesegui</string>
-    <string name="share_chooser">Condividi valore EPG</string>
-    <string name="about_text">
-        Info sul programma "Gestore VDR" per Android\n 
-		Questa è la versione %1$s\n
-        Se a casa disponi di una VDR raggiungibile
-         da Internet e possiedi un telefono cellulare che usa Android allora forse hai trovato l\'applicazione che fa per te.
-         Per maggiori dettagli visita http://projects.vdr-developer.org/projects/vdr-manager/wiki.
-         Autore:\n
-          bju&lt;herrlado@gmail.com&gt;
-          herrlado&lt;herrlado@gmail.com&gt;
-         Traduzione italiana:\n
-	  	  Diego Pierotto
-    </string>
-    <string name="about_title">Info</string>
-
-    <string name="no_internet_connection">Nessuna connessione dati</string>
-    <string name="update_will_start_in">L\'aggiornamento si avvierà tra qualche secondo</string>
-</resources>
diff --git a/vdrmanager/res/values-it/epg.xml b/vdrmanager/res/values-it/epg.xml
deleted file mode 100644
index 361b7b2..0000000
--- a/vdrmanager/res/values-it/epg.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- 
-  <!-- What's on display -->
-  <string name="epg_list_time_label">In programmazione alle</string>
-  <string name="epg_list_time_now">In onda</string>
-  <string name="epg_list_time_next">Successivo</string>
-  <string name="epg_list_time_adhoc">Alle</string>
-  <string name="epg_list_channel_spinner">Canale</string>
-  <string name="epg_list_search_label">Ricerca risultati</string>
-  
-  <!-- create timer -->
-  <string name="epg_event_share_text">Condividi</string>
-  <string name="epg_event_imdb_text">Ricerca IMDb</string>
-  <string name="epg_event_omdb_text">Ricerca OMDB</string>
-  <string name="epg_eent_livetv_text">Trasmissione</string>
-  <string name="epg_event_create_timer_text">Aggiungi timer</string>
-  <string name="epg_event_modify_timer_text">Modifica timer</string>
-  
-  <!-- search -->
-  <string name="epg_search_button">Cerca</string>
-  <string name="epg_duration_template">%1$s min</string>
-  <string name="epg_duration_template_live">%1$s/%2$s min</string>
-  <string name="epg_of_a_channel">EPG -> %1$s,  %2$s/%3$s</string>
-  <string name="epg_by_channel">EPG per canale</string>
-  <string name="epg_by_search">Ricerca EPG</string>
-  <string name="epg_by_search_param">Ricerca EPG: \'%1$s\'</string>
-  <string name="epg_by_time">EPG per ora</string>  
-  <string name="epg_by_time_args">EPG per ora: \'%1$s\'</string>  
-  <string name="search_epg_hint">Ricerca EPG</string>
-  <string name="epg_search_settings_description">Ricerca EPG in VDR</string>
-  <string name="epg_window_title_count">%1$s,  %2$s</string>
-  <string name="channels_window_title_count">%1$s,  %2$s/%3$s</string>
-  <string name="new_timer">Nuovo timer</string>
-</resources>
diff --git a/vdrmanager/res/values-it/epg_list.xml b/vdrmanager/res/values-it/epg_list.xml
deleted file mode 100644
index 3998928..0000000
--- a/vdrmanager/res/values-it/epg_list.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<string name="navigae_at_the_end">Fine</string>
-	<string name="navigae_at_the_start">Inizio</string>
-</resources>
diff --git a/vdrmanager/res/values-it/epg_list_menu.xml b/vdrmanager/res/values-it/epg_list_menu.xml
deleted file mode 100644
index d91d48b..0000000
--- a/vdrmanager/res/values-it/epg_list_menu.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-  <string name="epg_menu_search">Ricerca EPG</string>
-  <string name="epg_menu_times">Numero ricerche</string>
-  
-  <string name="epg_item_menu_timer_add">Crea timer</string>
-  <string name="epg_item_menu_timer_delete">Elimina timer</string>
-  <string name="epg_item_menu_timer_modify">Modifica timer</string>
-  <string name="epg_item_menu_timer_enable">Abilita timer</string>
-  <string name="epg_item_menu_timer_disable">Disabilita timer</string>
-  <string name="epg_no_items">Nessun risultato trovato...</string>
-  <string name="epg_client_errors">Si è verificato un errore, verifica il registro...</string>
-  
-</resources>
diff --git a/vdrmanager/res/values-it/epg_search_times.xml b/vdrmanager/res/values-it/epg_search_times.xml
deleted file mode 100644
index d477ffb..0000000
--- a/vdrmanager/res/values-it/epg_search_times.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- 
-  <string name="epg_search_times_add">Aggiungi numero</string>
-  <string name="epg_search_times_window">Numero personalizzato</string>
-  
-</resources>
diff --git a/vdrmanager/res/values-it/errors.xml b/vdrmanager/res/values-it/errors.xml
deleted file mode 100644
index 19dd4f5..0000000
--- a/vdrmanager/res/values-it/errors.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-  <string name="vdr_error_text">La comunicazione con VDR ha causato un errore: %1$s</string>
-  
-</resources>
diff --git a/vdrmanager/res/values-it/livetv.xml b/vdrmanager/res/values-it/livetv.xml
deleted file mode 100644
index 0299668..0000000
--- a/vdrmanager/res/values-it/livetv.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<string name="livetv">Trasmissione dal vivo</string>
-	<string name="settings_livetv_summary">Sono necessari "streamdev-server" nella VDR e un riproduttore esterno come VPlayer</string>
-	<string name="settings_livetv_streamformat">Formato trasmissione</string>
-	<string name="settings_livetv_port">Porta trasmissione</string>
-	<string name="settings_livetv_port_summary">Predefinita 3000. L\'accesso deve essere abilitato in "streamdevhosts.conf".</string>
-	<string-array name="livetv_streamformat">
-		<item>TS</item>
-		<item>PES</item>
-		<item>ES</item>
-		<item>PS</item>
-	</string-array>
-	<string-array name="livetv_streamformat_values">
-		<item>TS</item>
-		<item>PES</item>
-		<item>ES</item>
-		<item>PS</item>
-	</string-array>
-	<string name="key_remux_enable">remux_enable</string>
-	<string name="key_remux_command">remux_command</string>
-	<string name="key_remux_parameter">remux_parameter</string>
-	
-	<string name="stream_via_as">Trasmissione</string>
-	<string name="stream_via">tramite %s</string>
-	<string name="stream_as">come %s</string>
-	<string name="remux_title">Remux</string>
-	<string name="remux_enable_title">Abilita Remux</string>
-	<string name="remux_enable_summary">Abilita trasmissione tramite remux (es. externremux.sh)</string>
-	
-	<string name="remux_command_title">Comando</string>
-	<string name="remux_command_summary">Di solito EXT o Extern (es. http://vdr:3000/Extern/1)</string>
-	
-	<string name="remux_parameter_title">Parametro</string>
-	<string name="remux_parameter_summary">Controllo qualità trasmissione (es. http://vdr:3000/Extern;DSL1000/1)</string>
-	
-</resources>
diff --git a/vdrmanager/res/values-it/main_menu.xml b/vdrmanager/res/values-it/main_menu.xml
deleted file mode 100644
index 9844237..0000000
--- a/vdrmanager/res/values-it/main_menu.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-  <string name="main_menu_preferences">Impostazioni</string>
-  <string name="main_menu_info">Info</string>
-  <string name="main_menu_exit">Esci</string>
-  
-</resources>
diff --git a/vdrmanager/res/values-it/preferences.xml b/vdrmanager/res/values-it/preferences.xml
deleted file mode 100644
index 8e4a6b4..0000000
--- a/vdrmanager/res/values-it/preferences.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="vdr_devices_summary">Definisci uno o più dispositivi VDR (in arrivo)</string>
-    <string name="vdr_devices">Dispositivi VDR</string>
-
-    <!-- VDR plugin preferences -->
-    <string name="vdr_preferences">Impostazioni rete</string>
-    <string name="vdr_host_title">Nome sistema/IP</string>
-    <string name="vdr_host_summary">Nome sistema o indirizzo IP della VDR in esecuzione</string>
-    <string name="vdr_port_title">Porta plugin VDR</string>
-    <string name="vdr_port_summary">Porta per connessioni al plugin di VDR</string>
-    <string name="vdr_port_default">6420</string>
-    <string name="vdr_password_title">Password plugin VDR</string>
-    <string name="vdr_password_summary">Password per il plugin di VDR</string>
-    <string name="vdr_ssl_title">Connessione sicura</string>
-    <string name="vdr_ssl_summary">Usa SSL per le connessioni (al momento non supportato)</string>
-
-    <!-- channel filter preferences -->
-    <string name="channel_filter_preferences">Impostazioni canale</string>
-    <string name="channel_filter_filter_title">Limita canali</string>
-    <string name="channel_filter_filter_summary">Usa solo determinati canali</string>
-    <string name="channel_filter_last_title">Filtro canale</string>
-    <string name="channel_filter_last_summary">Numero di canali o sequenze separate da virgole (separatore \'-\'). Es. 1,2,4-10</string>
-
-    <!-- wakeup -->
-    <string name="wakeup_preferences">Accensione VDR da remoto</string>
-    <string name="wakeup_enabled_title">Può accendere VDR da remoto</string>
-    <string name="wakeup_enabled_summary">Abilita accensione VDR da remoto</string>
-    <string name="wakeup_url_title">URL per accensione remota</string>
-    <string name="wakeup_url_summary">URL per richiesta esecuzione accensione</string>
-    <string name="wakeup_user_title">Utente accensione</string>
-    <string name="wakeup_user_summary">Utente per accensione remota</string>
-    <string name="wakeup_password_title">Password accensione</string>
-    <string name="wakeup_password_summary">Password per accensione remota</string>
-    <string name="wakeup_method_title">Metodo accensione</string>
-    <string name="wakeup_method_summary">Scegli un metodo per accendere VDR</string>
-
-    <string-array name="wakeup_methods">
-        <item>Chiama URL</item>
-        <item>WOL</item>
-    </string-array>
-    <string-array name="wakeup_methods_values">
-        <item>url</item>
-        <item>wol</item>
-    </string-array>
-
-    <string name="default_wakeup_method">url</string>
-    <string name="wakeup_wol_custom_boradcast_title">Indirizzo IP destinazione</string>
-    <string name="wakeup_wol_custom_boradcast_summary">A meno di non avere delle tabelle ARP statiche dovresti usare un indirizzo di broadcast.</string>
-    <string name="wakeup_wol_mac_title">Indirizzo MAC</string>
-    <string name="wakeup_wol_mac_summary">Indirizzo MAC di VDR. Usa \':\' o \'-\' o uno spazio come separatore.</string>
-
-    <!-- timer -->
-    <string name="timer_preferences">Valori predefiniti timer</string>
-    <string name="timer_pre_start_buffer_title">Margine inizio</string>
-    <string name="timer_pre_start_buffer_summary">Minuti di avvio registrazione prima dell\'inizio
- dell\'evento</string>
-    <string name="timer_post_end_buffer_title">Margine fine</string>
-    <string name="timer_post_end_buffer_summary">Minuti di fermo registrazione dopo la fine
- dell\'evento</string>
-    <string name="timer_default_priority_title">Priorità predefinita</string>
-    <string name="timer_default_priority_summary">Priorità predefinita</string>
-    <string name="timer_default_primary_limit_title">Limite primario predefinito</string>
-    <string name="timer_default_primary_limit_summary">Limite primario predefinito</string>
-    <string name="timer_default_lifetime_title">Durata predefinita</string>
-    <string name="timer_default_lifetime_summary">Durata predefinita</string>
-
-    <!-- GUI -->
-    <string name="gui_preferences">Impostazioni GUI</string>
-    <string name="gui_enable_24h_format_title">Usa formato 24 ore</string>
-    <string name="gui_enable_24h_format_summary_on">13:00</string>
-    <string name="gui_enable_24h_format_summary_off">1:00 PM</string>
-    <string name="gui_channels_show_channel_numbers_title">Mostra numero canali</string>
-    <string name="gui_channels_show_channel_numbers_summary">Mostra il numero di canali nella lista canali</string>
-    <string name="gui_quit_on_back_title">Esci con tasto Indietro</string>
-    <string name="gui_quit_on_back_summary_on">Il tasto Indietro chiude VDR-Manager</string>
-    <string name="gui_quit_on_back_summary_off">Il tasto Indietro non chiude VDR-Manager</string>
-    <string name="qui_show_imdb_button_title">Mostra tasto IMDb</string>
-    <string name="qui_show_imdb_button_summary_on">Mostra il tasto IMDb</string>
-    <string name="qui_show_imdb_button_summary_off">Non mostrare il tasto IMDb</string>
-    <string name="qui_show_omdb_button_title">Mostra tasto OMDB</string>
-    <string name="qui_show_omdb_button_summary_on">Mostra il tasto OMDB</string>
-    <string name="qui_show_omdb_button_summary_off">Non mostrare il tasto OMDB</string>
-    <string name="qui_imdb_url_title">Sito IMDb</string>
-    <string name="qui_imdb_url_summary">Sito IMDb da usare</string>
-	<string name="gui_custom_locale_title">Lingua</string>
-	<string name="gui_custom_locale_sum">Seleziona una lingua</string>
-        
-    <string-array name="imdb_urls">
-        <item>akas.imdb.com</item>
-        <item>imdb.com</item>
-        <item>uk.imdb.com</item>
-        <item>imdb.de</item>
-        <item>imdb.es</item>
-        <item>imdb.fr</item>
-        <item>imdb.it</item>
-        <item>imdb.pt</item>
-    </string-array>
-    <string-array name="imdb_urls_values">
-        <item>Internazionale</item>
-        <item>imdb.com</item>
-        <item>uk.imdb.com</item>
-        <item>imdb.de</item>
-        <item>imdb.es</item>
-        <item>imdb.fr</item>
-        <item>imdb.it</item>
-        <item>imdb.pt</item>
-    </string-array>
-    <string-array name="lang_values">
-        <item>en</item>
-        <item>de</item>
-        <item>it</item>
-    </string-array>
-    <string-array name="lang">
-        <!-- 
-        <item>Default language</item>
-        -->
-        <item>Inglese</item>
-        <item>Tedesco</item>
-        <item>Italiano</item>
-    </string-array>
-
-    <string name="vdr_advanced_preferences">Avanzate</string>
-    <string name="vdr_advanced_preferences_summary">Impostazioni avanzate</string>
-        
-    <string name="vdr_conntimeout_title">Durata connessione</string>
-    <string name="vdr_conntimeout_sum">Tempo (in secondi) da aspettare prima che la connessione venga stabilita</string>
-    <string name="vdr_readtimeout_title">Durata lettura</string>
-    <string name="vdr_readtimeout_sum">Tempo (in secondi) da apsettare per ogni operazione di lettura</string>
-    <string name="vdr_timeout_title">Durata totale</string>
-    <string name="vdr_timeout_sum">Tempo (in secondi) da aspettare per un\'intera operazione di I/O prima di essere terminata</string>
-    
-    <string name="streaming_password_title">Password streamdev</string>
-    <string name="streaming_password_sum">Imposta la password del server streamdev (es. -a \'nomeutente:password\')</string>
-
-    <string name="streaming_username_title">Nome utente streamdev</string>
-    <string name="streaming_username_sum">Imposta il nome utente del server streamdev (es. -a \'nomeutente:password\')</string>
-    
-    <string name="vdr_encoding_title">Codifica caratteri</string>
-    <string name="vdr_encoding_summary">Codifica caratteri della VDR. Predefinito utf-8.</string>
-</resources>
diff --git a/vdrmanager/res/values-it/progress.xml b/vdrmanager/res/values-it/progress.xml
deleted file mode 100644
index 6117087..0000000
--- a/vdrmanager/res/values-it/progress.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  
-  <!--  progress -->
-  <string name="progress_connect">Connessione...</string>
-  <string name="progress_connect_error">Connessione fallita!</string>
-  <string name="progress_connect_timeout">Connessione scaduta!</string>
-  <string name="progress_login">Accedi</string>
-  <string name="progress_login_error">Accesso fallito!</string>
-  <string name="progress_whatson_loading">Caricamento EPG...</string>
-  <string name="progress_timers_loading">Caricamento timer...</string>
-  <string name="progress_recordings_loading">Caricamento registrazioni...</string>
-  <string name="progress_channels_loading">Caricamento canali...</string>
-  <string name="progress_disconnect">Disconnessione...</string>
-  <string name="progress_wakeup_sending">Inizio richiesta accensione...</string>
-  <string name="progress_wakeup_sent">Richiesta accensione inviata</string>
-  <string name="progress_wakeup_error">Errore invio richiesta accensione: %1$s</string>
-  <string name="progress_timer_save">Salvataggio timer...</string>
-  <string name="progress_timer_delete">Rimozione timer...</string>
-  <string name="progress_recording_delete">Eliminazione registrazione...</string>
-  <string name="progress_timer_enable">Attivazione timer...</string>
-  <string name="progress_timer_modify">Aggiornamento timer...</string>
-  <string name="progress_timer_disable">Disattivazione timer...</string>
-  <string name="progress_connect_finished_abnormal">Connessione completata in modo anomalo</string>
-  <string name="progress_connect_finished_abnormal_arg">Connessione completata in modo anomalo: %1$s</string>
-  <string name="progress_cache_hit">Caricato dalla cache</string>
-  
-</resources>
diff --git a/vdrmanager/res/values-it/recording_list_menu.xml b/vdrmanager/res/values-it/recording_list_menu.xml
deleted file mode 100644
index 770e1ff..0000000
--- a/vdrmanager/res/values-it/recording_list_menu.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="recording_item_menu_delete">Elimina</string>
-  <string name="recording_item_menu_stream">Trasmissione</string>
-</resources>
diff --git a/vdrmanager/res/values-it/strings.xml b/vdrmanager/res/values-it/strings.xml
new file mode 100644
index 0000000..3c73595
--- /dev/null
+++ b/vdrmanager/res/values-it/strings.xml
@@ -0,0 +1,334 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+  <string name="action_menu_channels">Canali</string>   
+  <string name="action_menu_timers">Timer</string>
+  <string name="action_menu_recordings">Registrazioni</string>
+  <string name="action_menu_epg">Elenco EPG</string>
+  <string name="action_menu_search">Ricerca EPG</string>
+  <string name="action_menu_wakeup">Accensione</string>
+
+
+  <string name="app_name">Gestore VDR</string>
+
+
+  <string name="channel_item_menu_epg">Mostra EPG</string>
+  <string name="channel_item_menu_stream">Mostra trasmissione</string>
+  <string name="channel_item_menu_hide">Nascondi</string>
+  <string name="channel_item_menu_hide_permanent">Nascondi sempre</string>
+  
+  <string name="channel_group_menu_hide">Nascondi</string>
+  <string name="channel_group_menu_hide_permanent">Nascondi sempre</string>
+  
+  <string name="menu_groupby">Ordina per</string>
+  <string name="groupby_group">Gruppo</string>
+  <string name="groupby_provider">Emittente</string>
+  <string name="groupby_name">Nome</string>
+  <string name="groupby_name_all_channels_group">Tutti i canali</string>
+  <string name="groupby_window_title_templte">Ordina per %1$s</string>
+
+
+    <string name="common_delete">Elimina</string>
+    <string name="prefs_current_value">Attuale:</string>
+    <string name="prefs_current_value_template">\nAttuale: %1$s</string>
+    <string name="prefs_current_value_not_set">&lt;non impostato></string>
+    <string name="no_connection">Nessuna connessione</string>
+    <string name="aborted">Connessione terminata.</string>
+    <string name="no_connection_retry">Riprova</string>
+    <string name="refresh">Aggiorna</string>
+    <string name="done">Completato</string>
+    <string name="share">Condividi</string>
+    <string name="search_reapt">Riesegui</string>
+    <string name="share_chooser">Condividi valore EPG</string>
+    <string name="about_text">
+        Info sul programma "Gestore VDR" per Android\n 
+		Questa è la versione %1$s\n
+        Se a casa disponi di una VDR raggiungibile
+         da Internet e possiedi un telefono cellulare che usa Android allora forse hai trovato l\'applicazione che fa per te.
+         Per maggiori dettagli visita http://projects.vdr-developer.org/projects/vdr-manager/wiki.
+         Autore:\n
+          bju&lt;herrlado@gmail.com&gt;
+          herrlado&lt;herrlado@gmail.com&gt;
+         Traduzione italiana:\n
+	  	  Diego Pierotto
+    </string>
+    <string name="about_title">Info</string>
+
+    <string name="no_internet_connection">Nessuna connessione dati</string>
+    <string name="update_will_start_in">L\'aggiornamento si avvierà tra qualche secondo</string>
+
+
+
+  <string name="epg_menu_search">Ricerca EPG</string>
+  <string name="epg_menu_times">Numero ricerche</string>
+  
+  <string name="epg_item_menu_timer_add">Crea timer</string>
+  <string name="epg_item_menu_timer_delete">Elimina timer</string>
+  <string name="epg_item_menu_timer_modify">Modifica timer</string>
+  <string name="epg_item_menu_timer_enable">Abilita timer</string>
+  <string name="epg_item_menu_timer_disable">Disabilita timer</string>
+  <string name="epg_no_items">Nessun risultato trovato...</string>
+  <string name="epg_client_errors">Si è verificato un errore, verifica il registro...</string>
+  
+
+	<string name="navigae_at_the_end">Fine</string>
+	<string name="navigae_at_the_start">Inizio</string>
+
+  <string name="epg_search_times_add">Aggiungi numero</string>
+  <string name="epg_search_times_window">Numero personalizzato</string>
+
+ 
+  <!-- What's on display -->
+  <string name="epg_list_time_label">In programmazione alle</string>
+  <string name="epg_list_time_now">In onda</string>
+  <string name="epg_list_time_next">Successivo</string>
+  <string name="epg_list_time_adhoc">Alle</string>
+  <string name="epg_list_channel_spinner">Canale</string>
+  <string name="epg_list_search_label">Ricerca risultati</string>
+  
+  <!-- create timer -->
+  <string name="epg_event_share_text">Condividi</string>
+  <string name="epg_event_imdb_text">Ricerca IMDb</string>
+  <string name="epg_event_omdb_text">Ricerca OMDB</string>
+  <string name="epg_eent_livetv_text">Trasmissione</string>
+  <string name="epg_event_create_timer_text">Aggiungi timer</string>
+  <string name="epg_event_modify_timer_text">Modifica timer</string>
+  
+  <!-- search -->
+  <string name="epg_search_button">Cerca</string>
+  <string name="epg_duration_template">%1$s min</string>
+  <string name="epg_duration_template_live">%1$s/%2$s min</string>
+  <string name="epg_of_a_channel">EPG -> %1$s,  %2$s/%3$s</string>
+  <string name="epg_by_channel">EPG per canale</string>
+  <string name="epg_by_search">Ricerca EPG</string>
+  <string name="epg_by_search_param">Ricerca EPG: \'%1$s\'</string>
+  <string name="epg_by_time">EPG per ora</string>  
+  <string name="epg_by_time_args">EPG per ora: \'%1$s\'</string>  
+  <string name="search_epg_hint">Ricerca EPG</string>
+  <string name="epg_search_settings_description">Ricerca EPG in VDR</string>
+  <string name="epg_window_title_count">%1$s,  %2$s</string>
+  <string name="channels_window_title_count">%1$s,  %2$s/%3$s</string>
+  <string name="new_timer">Nuovo timer</string>
+
+
+  <string name="vdr_error_text">La comunicazione con VDR ha causato un errore: %1$s</string>
+
+	<string name="livetv">Trasmissione dal vivo</string>
+	<string name="settings_livetv_summary">Sono necessari "streamdev-server" nella VDR e un riproduttore esterno come VPlayer</string>
+	<string name="settings_livetv_streamformat">Formato trasmissione</string>
+	<string name="settings_livetv_port">Porta trasmissione</string>
+	<string name="settings_livetv_port_summary">Predefinita 3000. L\'accesso deve essere abilitato in "streamdevhosts.conf".</string>
+	<string-array name="livetv_streamformat">
+		<item>TS</item>
+		<item>PES</item>
+		<item>ES</item>
+		<item>PS</item>
+	</string-array>
+	<string-array name="livetv_streamformat_values">
+		<item>TS</item>
+		<item>PES</item>
+		<item>ES</item>
+		<item>PS</item>
+	</string-array>
+	<string name="key_remux_enable">remux_enable</string>
+	<string name="key_remux_command">remux_command</string>
+	<string name="key_remux_parameter">remux_parameter</string>
+	
+	<string name="stream_via_as">Trasmissione</string>
+	<string name="stream_via">tramite %s</string>
+	<string name="stream_as">come %s</string>
+	<string name="remux_title">Remux</string>
+	<string name="remux_enable_title">Abilita Remux</string>
+	<string name="remux_enable_summary">Abilita trasmissione tramite remux (es. externremux.sh)</string>
+	
+	<string name="remux_command_title">Comando</string>
+	<string name="remux_command_summary">Di solito EXT o Extern (es. http://vdr:3000/Extern/1)</string>
+	
+	<string name="remux_parameter_title">Parametro</string>
+	<string name="remux_parameter_summary">Controllo qualità trasmissione (es. http://vdr:3000/Extern;DSL1000/1)</string>
+
+  <string name="main_menu_preferences">Impostazioni</string>
+  <string name="main_menu_info">Info</string>
+  <string name="main_menu_exit">Esci</string>
+  
+
+    <string name="vdr_devices_summary">Definisci uno o più dispositivi VDR (in arrivo)</string>
+    <string name="vdr_devices">Dispositivi VDR</string>
+
+    <!-- VDR plugin preferences -->
+    <string name="vdr_preferences">Impostazioni rete</string>
+    <string name="vdr_host_title">Nome sistema/IP</string>
+    <string name="vdr_host_summary">Nome sistema o indirizzo IP della VDR in esecuzione</string>
+    <string name="vdr_port_title">Porta plugin VDR</string>
+    <string name="vdr_port_summary">Porta per connessioni al plugin di VDR</string>
+    <string name="vdr_port_default">6420</string>
+    <string name="vdr_password_title">Password plugin VDR</string>
+    <string name="vdr_password_summary">Password per il plugin di VDR</string>
+    <string name="vdr_ssl_title">Connessione sicura</string>
+    <string name="vdr_ssl_summary">Usa SSL per le connessioni (al momento non supportato)</string>
+
+    <!-- channel filter preferences -->
+    <string name="channel_filter_preferences">Impostazioni canale</string>
+    <string name="channel_filter_filter_title">Limita canali</string>
+    <string name="channel_filter_filter_summary">Usa solo determinati canali</string>
+    <string name="channel_filter_last_title">Filtro canale</string>
+    <string name="channel_filter_last_summary">Numero di canali o sequenze separate da virgole (separatore \'-\'). Es. 1,2,4-10</string>
+
+    <!-- wakeup -->
+    <string name="wakeup_preferences">Accensione VDR da remoto</string>
+    <string name="wakeup_enabled_title">Può accendere VDR da remoto</string>
+    <string name="wakeup_enabled_summary">Abilita accensione VDR da remoto</string>
+    <string name="wakeup_url_title">URL per accensione remota</string>
+    <string name="wakeup_url_summary">URL per richiesta esecuzione accensione</string>
+    <string name="wakeup_user_title">Utente accensione</string>
+    <string name="wakeup_user_summary">Utente per accensione remota</string>
+    <string name="wakeup_password_title">Password accensione</string>
+    <string name="wakeup_password_summary">Password per accensione remota</string>
+    <string name="wakeup_method_title">Metodo accensione</string>
+    <string name="wakeup_method_summary">Scegli un metodo per accendere VDR</string>
+
+    <string-array name="wakeup_methods">
+        <item>Chiama URL</item>
+        <item>WOL</item>
+    </string-array>
+    <string-array name="wakeup_methods_values">
+        <item>url</item>
+        <item>wol</item>
+    </string-array>
+
+    <string name="default_wakeup_method">url</string>
+    <string name="wakeup_wol_custom_boradcast_title">Indirizzo IP destinazione</string>
+    <string name="wakeup_wol_custom_boradcast_summary">A meno di non avere delle tabelle ARP statiche dovresti usare un indirizzo di broadcast.</string>
+    <string name="wakeup_wol_mac_title">Indirizzo MAC</string>
+    <string name="wakeup_wol_mac_summary">Indirizzo MAC di VDR. Usa \':\' o \'-\' o uno spazio come separatore.</string>
+
+    <!-- timer -->
+    <string name="timer_preferences">Valori predefiniti timer</string>
+    <string name="timer_pre_start_buffer_title">Margine inizio</string>
+    <string name="timer_pre_start_buffer_summary">Minuti di avvio registrazione prima dell\'inizio
+ dell\'evento</string>
+    <string name="timer_post_end_buffer_title">Margine fine</string>
+    <string name="timer_post_end_buffer_summary">Minuti di fermo registrazione dopo la fine
+ dell\'evento</string>
+    <string name="timer_default_priority_title">Priorità predefinita</string>
+    <string name="timer_default_priority_summary">Priorità predefinita</string>
+    <string name="timer_default_primary_limit_title">Limite primario predefinito</string>
+    <string name="timer_default_primary_limit_summary">Limite primario predefinito</string>
+    <string name="timer_default_lifetime_title">Durata predefinita</string>
+    <string name="timer_default_lifetime_summary">Durata predefinita</string>
+
+    <!-- GUI -->
+    <string name="gui_preferences">Impostazioni GUI</string>
+    <string name="gui_enable_24h_format_title">Usa formato 24 ore</string>
+    <string name="gui_enable_24h_format_summary_on">13:00</string>
+    <string name="gui_enable_24h_format_summary_off">1:00 PM</string>
+    <string name="gui_channels_show_channel_numbers_title">Mostra numero canali</string>
+    <string name="gui_channels_show_channel_numbers_summary">Mostra il numero di canali nella lista canali</string>
+    <string name="gui_quit_on_back_title">Esci con tasto Indietro</string>
+    <string name="gui_quit_on_back_summary_on">Il tasto Indietro chiude VDR-Manager</string>
+    <string name="gui_quit_on_back_summary_off">Il tasto Indietro non chiude VDR-Manager</string>
+    <string name="qui_show_imdb_button_title">Mostra tasto IMDb</string>
+    <string name="qui_show_imdb_button_summary_on">Mostra il tasto IMDb</string>
+    <string name="qui_show_imdb_button_summary_off">Non mostrare il tasto IMDb</string>
+    <string name="qui_show_omdb_button_title">Mostra tasto OMDB</string>
+    <string name="qui_show_omdb_button_summary_on">Mostra il tasto OMDB</string>
+    <string name="qui_show_omdb_button_summary_off">Non mostrare il tasto OMDB</string>
+    <string name="qui_imdb_url_title">Sito IMDb</string>
+    <string name="qui_imdb_url_summary">Sito IMDb da usare</string>
+	<string name="gui_custom_locale_title">Lingua</string>
+	<string name="gui_custom_locale_sum">Seleziona una lingua</string>
+        
+    <string-array name="imdb_urls">
+        <item>akas.imdb.com</item>
+        <item>imdb.com</item>
+        <item>uk.imdb.com</item>
+        <item>imdb.de</item>
+        <item>imdb.es</item>
+        <item>imdb.fr</item>
+        <item>imdb.it</item>
+        <item>imdb.pt</item>
+    </string-array>
+    <string-array name="imdb_urls_values">
+        <item>Internazionale</item>
+        <item>imdb.com</item>
+        <item>uk.imdb.com</item>
+        <item>imdb.de</item>
+        <item>imdb.es</item>
+        <item>imdb.fr</item>
+        <item>imdb.it</item>
+        <item>imdb.pt</item>
+    </string-array>
+    <string-array name="lang_values">
+        <item>en</item>
+        <item>de</item>
+        <item>it</item>
+    </string-array>
+    <string-array name="lang">
+        <!-- 
+        <item>Default language</item>
+        -->
+        <item>Inglese</item>
+        <item>Tedesco</item>
+        <item>Italiano</item>
+    </string-array>
+
+    <string name="vdr_advanced_preferences">Avanzate</string>
+    <string name="vdr_advanced_preferences_summary">Impostazioni avanzate</string>
+        
+    <string name="vdr_conntimeout_title">Durata connessione</string>
+    <string name="vdr_conntimeout_sum">Tempo (in secondi) da aspettare prima che la connessione venga stabilita</string>
+    <string name="vdr_readtimeout_title">Durata lettura</string>
+    <string name="vdr_readtimeout_sum">Tempo (in secondi) da apsettare per ogni operazione di lettura</string>
+    <string name="vdr_timeout_title">Durata totale</string>
+    <string name="vdr_timeout_sum">Tempo (in secondi) da aspettare per un\'intera operazione di I/O prima di essere terminata</string>
+    
+    <string name="streaming_password_title">Password streamdev</string>
+    <string name="streaming_password_sum">Imposta la password del server streamdev (es. -a \'nomeutente:password\')</string>
+
+    <string name="streaming_username_title">Nome utente streamdev</string>
+    <string name="streaming_username_sum">Imposta il nome utente del server streamdev (es. -a \'nomeutente:password\')</string>
+    
+    <string name="vdr_encoding_title">Codifica caratteri</string>
+    <string name="vdr_encoding_summary">Codifica caratteri della VDR. Predefinito utf-8.</string>
+
+  <!--  progress -->
+  <string name="progress_connect">Connessione...</string>
+  <string name="progress_connect_error">Connessione fallita!</string>
+  <string name="progress_connect_timeout">Connessione scaduta!</string>
+  <string name="progress_login">Accedi</string>
+  <string name="progress_login_error">Accesso fallito!</string>
+  <string name="progress_whatson_loading">Caricamento EPG...</string>
+  <string name="progress_timers_loading">Caricamento timer...</string>
+  <string name="progress_recordings_loading">Caricamento registrazioni...</string>
+  <string name="progress_channels_loading">Caricamento canali...</string>
+  <string name="progress_disconnect">Disconnessione...</string>
+  <string name="progress_wakeup_sending">Inizio richiesta accensione...</string>
+  <string name="progress_wakeup_sent">Richiesta accensione inviata</string>
+  <string name="progress_wakeup_error">Errore invio richiesta accensione: %1$s</string>
+  <string name="progress_timer_save">Salvataggio timer...</string>
+  <string name="progress_timer_delete">Rimozione timer...</string>
+  <string name="progress_recording_delete">Eliminazione registrazione...</string>
+  <string name="progress_timer_enable">Attivazione timer...</string>
+  <string name="progress_timer_modify">Aggiornamento timer...</string>
+  <string name="progress_timer_disable">Disattivazione timer...</string>
+  <string name="progress_connect_finished_abnormal">Connessione completata in modo anomalo</string>
+  <string name="progress_connect_finished_abnormal_arg">Connessione completata in modo anomalo: %1$s</string>
+  <string name="progress_cache_hit">Caricato dalla cache</string>
+
+  <string name="recording_item_menu_delete">Elimina</string>
+  <string name="recording_item_menu_stream">Trasmissione</string>
+
+  
+  <string name="timer_detail_title_title">Titolo:</string>
+  <string name="timer_detail_channel_title">Canale:</string>
+  <string name="timer_detail_start_title">Inizio:</string>
+  <string name="timer_detail_end_title">Fine:</string>
+  
+  <string name="timer_details_create_title">Crea timer</string>
+  <string name="timer_details_save_title">Salva modifiche</string>
+  <string name="timer_details_delete_title">Elimina timer</string>
+  
+  <string name="timer_details_add_title">Crea nuovo timer</string>
+  <string name="timer_details_modify_title">Modifica timer</string>
+
+  </resources>
\ No newline at end of file
diff --git a/vdrmanager/res/values-it/timers.xml b/vdrmanager/res/values-it/timers.xml
deleted file mode 100644
index 4327a57..0000000
--- a/vdrmanager/res/values-it/timers.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  
-  <string name="timer_detail_title_title">Titolo:</string>
-  <string name="timer_detail_channel_title">Canale:</string>
-  <string name="timer_detail_start_title">Inizio:</string>
-  <string name="timer_detail_end_title">Fine:</string>
-  
-  <string name="timer_details_create_title">Crea timer</string>
-  <string name="timer_details_save_title">Salva modifiche</string>
-  <string name="timer_details_delete_title">Elimina timer</string>
-  
-  <string name="timer_details_add_title">Crea nuovo timer</string>
-  <string name="timer_details_modify_title">Modifica timer</string>
-</resources>
-- 
cgit v1.2.3