http://projects.vdr-developer.org/issues/851

3 files changed, 37 insertions, 16 deletions

diff --git a/vdrmanager/res/values-it/channel_list.xml b/vdrmanager/res/values-it/channel_list.xml
index 0e3d38b..c5cec83 100644
--- a/vdrmanager/res/values-it/channel_list.xml
+++ b/vdrmanager/res/values-it/channel_list.xml
@@ -9,10 +9,10 @@
   <string name="channel_group_menu_hide">Nascondi</string>
   <string name="channel_group_menu_hide_permanent">Nascondi sempre</string>
   
-  <string name="menu_groupby">Gruppo da</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">Gruppo da %1$s</string>
+  <string name="groupby_window_title_templte">Ordina per %1$s</string>
 </resources>
diff --git a/vdrmanager/res/values-it/epg.xml b/vdrmanager/res/values-it/epg.xml
index 9dead8f..c3411d8 100644
--- a/vdrmanager/res/values-it/epg.xml
+++ b/vdrmanager/res/values-it/epg.xml
@@ -3,8 +3,8 @@
  
   <!-- What's on display -->
   <string name="epg_list_time_label">In programmazione alle</string>
-  <string name="epg_list_time_now">Adesso</string>
-  <string name="epg_list_time_next">Più tardi</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>
@@ -28,7 +28,7 @@
   <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 volte</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/preferences.xml b/vdrmanager/res/values-it/preferences.xml
index a757c22..46c31b5 100644
--- a/vdrmanager/res/values-it/preferences.xml
+++ b/vdrmanager/res/values-it/preferences.xml
@@ -6,8 +6,8 @@
 
     <!-- VDR plugin preferences -->
     <string name="vdr_preferences">Impostazioni rete</string>
-    <string name="vdr_host_title">Nome VDR</string>
-    <string name="vdr_host_summary">Nome VDR in esecuzione</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>
@@ -33,6 +33,7 @@
     <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_key">key_wakeup_method</string>
     <string name="wakeup_method_title">Metodo accensione</string>
     <string name="wakeup_method_summary">Scegli un metodo per accendere VDR</string>
 
@@ -46,18 +47,21 @@
     </string-array>
 
     <string name="default_wakeup_method">url</string>
-    <string name="wakeup_wol_custom_boradcast_title">Indirizzo trasmissione</string>
-    <string name="wakeup_wol_custom_boradcast_summary">Inserisci un indirizzo di trasmissione personalizzato piuttosto che 255.255.255.255. Ad esempio, utile per una connessione VPN.</string>
-    <string name="wakeup_wol_custom_boradcast_summary_on">Trasmissione</string>
+    <string name="wakeup_wol_custom_broadcast_key">key_wol_custom_broadcast</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_key">key_wakeup_wol_mac</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_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_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>
@@ -67,19 +71,25 @@
 
     <!-- GUI -->
     <string name="gui_preferences">Impostazioni GUI</string>
+    <string name="gui_enable_24h_format_key">key_enable_24h</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_key">key_channels_show_channel_numbers</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="qui_quit_on_back_key">key_gui_quit_on_back</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_key">key_qui_show_imdb_button</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_imdb_url_key">key_qui_imdb_url</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_key">key_gui_custom_locale</string>
 	<string name="gui_custom_locale_title">Lingua</string>
 	<string name="gui_custom_locale_sum">Seleziona una lingua</string>
         
@@ -103,31 +113,42 @@
         <item>imdb.it</item>
         <item>imdb.pt</item>
     </string-array>
-
     <string-array name="lang_values">
         <item>en</item>
-        <item>it</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>
-       	<item>Tedesco</item>
     </string-array>
 
     <string name="vdr_advanced_preferences">Avanzate</string>
+    <string name="vdr_advanced_preferences_summary">Impostazioni avanzate</string>
         
+    <string name="vdr_conntimeout_key">key_conntimeout_key</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_key">key_vdr_readtimeout</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_key">key_vdr_timeout</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_password_key">key_streaming_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="streaming_username_key">key_streaming_username</string>
+    
+    <string name="vdr_encoding_key">key_vdr_encoding</string>
+    <string name="vdr_encoding_title">Codifica caratteri</string>
+    <string name="vdr_encoding_summary">Codifica caratteri della VDR. Predefinito utf-8.</string>
 </resources>