diff --git a/intl/msg_hash_chs.h b/intl/msg_hash_chs.h index ac7b7503ce..767d306283 100644 --- a/intl/msg_hash_chs.h +++ b/intl/msg_hash_chs.h @@ -2648,107 +2648,107 @@ MSG_HASH( "更改菜单中当前日期/时间显示格式。" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HMS, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HMS, "YYYY-MM-DD HH:MM:SS" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HM, "YYYY-MM-DD HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD, "YYYY-MM-DD" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YM, "YYYY-MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HMS, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HMS, "MM-DD-YYYY HH:MM:SS" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HM, "MM-DD-YYYY HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD_HM, "MM-DD HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY, "MM-DD-YYYY" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD, "MM-DD" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HMS, - "DD/MM/YYYY HH:MM:SS" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HMS, + "DD-MM-YYYY HH:MM:SS" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HM, - "DD/MM/YYYY HH:MM" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HM, + "DD-MM-YYYY HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMM_HM, - "DD/MM HH:MM" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM_HM, + "DD-MM HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY, - "DD/MM/YYYY" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY, + "DD-MM-YYYY" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMM, - "DD/MM" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM, + "DD-MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HMS, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HMS, "HH:MM:SS" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HM, "HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HMS_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HMS_AMPM, "YYYY-MM-DD HH:MM:SS (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HM_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HM_AMPM, "YYYY-MM-DD HH:MM (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HMS_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HMS_AMPM, "MM-DD-YYYY HH:MM:SS (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HM_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HM_AMPM, "MM-DD-YYYY HH:MM (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD_HM_AM_PM, - "MM/DD HH: (AM/PM)" + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD_HM_AMPM, + "MM-DD HH: (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HMS_AM_PM, - "DD/MM/YYYY HH:MM:SS (AM/PM)" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HMS_AMPM, + "DD-MM-YYYY HH:MM:SS (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HM_AM_PM, - "DD/MM/YYYY HH:MM (AM/PM)" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HM_AMPM, + "DD-MM-YYYY HH:MM (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMM_HM_AM_PM, - "DD/MM HH:MM (AM/PM)" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM_HM_AMPM, + "DD-MM HH:MM (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HMS_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HMS_AMPM, "HH:MM:SS (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HM_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HM_AMPM, "HH:MM (AM/PM)" ) MSG_HASH( diff --git a/intl/msg_hash_el.h b/intl/msg_hash_el.h index d60800a2fa..5264a5f602 100644 --- a/intl/msg_hash_el.h +++ b/intl/msg_hash_el.h @@ -2383,107 +2383,107 @@ MSG_HASH( "Αλλάζει το στυλ της τρέχουσας ημερομηνίας ή και ώρας που φαίνεται μέσα στο μενού." ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HMS, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HMS, "ΧΧΧΧ-ΜΜ-ΗΗ ΩΩ:ΛΛ:ΔΔ" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HM, "ΧΧΧΧ-ΜΜ-ΗΗ ΩΩ:ΛΛ" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD, "ΧΧΧΧ-ΜΜ-ΗΗ" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YM, "ΧΧΧΧ-ΜΜ" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HMS, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HMS, "ΜΜ-ΗΗ-ΧΧΧΧ ΩΩ:ΛΛ:ΔΔ" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HM, "ΜΜ-ΗΗ-ΧΧΧΧ ΩΩ:ΛΛ" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD_HM, "ΜΜ-ΗΗ ΩΩ:ΛΛ" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY, "ΜΜ-ΗΗ-ΧΧΧΧ" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD, "ΜΜ-ΗΗ" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HMS, - "HH/MM/ΧΧΧΧ ΩΩ:ΛΛ:ΔΔ" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HMS, + "HH-MM-ΧΧΧΧ ΩΩ:ΛΛ:ΔΔ" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HM, - "HH/MM/ΧΧΧΧ ΩΩ:ΛΛ" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HM, + "HH-MM-ΧΧΧΧ ΩΩ:ΛΛ" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMM_HM, - "HH/MM ΩΩ:ΛΛ" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM_HM, + "HH-MM ΩΩ:ΛΛ" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY, - "HH/MM/ΧΧΧΧ" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY, + "HH-MM/ΧΧΧΧ" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMM, - "HH/MM" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM, + "HH-MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HMS, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HMS, "ΩΩ:ΛΛ:ΔΔ" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HM, "ΩΩ:ΛΛ" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HMS_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HMS_AMPM, "ΧΧΧΧ-ΜΜ-ΗΗ ΩΩ:ΛΛ:ΔΔ (ΠΜ/ΜΜ)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HM_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HM_AMPM, "ΧΧΧΧ-ΜΜ-ΗΗ ΩΩ:ΛΛ (ΠΜ/ΜΜ)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HMS_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HMS_AMPM, "ΜΜ-ΗΗ-ΧΧΧΧ ΩΩ:ΛΛ:ΔΔ (ΠΜ/ΜΜ)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HM_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HM_AMPM, "ΜΜ-ΗΗ-ΧΧΧΧ ΩΩ:ΛΛ (ΠΜ/ΜΜ)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD_HM_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD_HM_AMPM, "ΜΜ-ΗΗ ΩΩ:ΛΛ (ΠΜ/ΜΜ)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HMS_AM_PM, - "HH/MM/XXXX ΩΩ:ΛΛ:ΔΔ (ΠΜ/ΜΜ)" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HMS_AMPM, + "HH-MM-XXXX ΩΩ:ΛΛ:ΔΔ (ΠΜ/ΜΜ)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HM_AM_PM, - "HH/MM/XXXX ΩΩ:ΛΛ (ΠΜ/ΜΜ)" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HM_AMPM, + "HH-MM-XXXX ΩΩ:ΛΛ (ΠΜ/ΜΜ)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMM_HM_AM_PM, - "HH/MM ΩΩ:ΛΛ (ΠΜ/ΜΜ)" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM_HM_AMPM, + "HH-MM ΩΩ:ΛΛ (ΠΜ/ΜΜ)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HMS_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HMS_AMPM, "ΩΩ:ΛΛ:ΔΔ (ΠΜ/ΜΜ)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HM_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HM_AMPM, "ΩΩ:ΛΛ (ΠΜ/ΜΜ)" ) MSG_HASH( diff --git a/intl/msg_hash_es.h b/intl/msg_hash_es.h index 800521a92f..f837d2874f 100644 --- a/intl/msg_hash_es.h +++ b/intl/msg_hash_es.h @@ -3698,107 +3698,107 @@ MSG_HASH( "Cambia la forma en que se muestra la fecha y hora." ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HMS, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HMS, "AAAA-MM-DD HH:MM:SS" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HM, "AAAA-MM-DD HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD, "AAAA-MM-DD" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YM, "AAAA-MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HMS, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HMS, "MM-DD-AAAA HH:MM:SS" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HM, "MM-DD-AAAA HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD_HM, "MM-DD HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY, "MM-DD-AAAA" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD, "MM-DD" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HMS, - "DD/MM/AAAA HH:MM:SS" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HMS, + "DD-MM-AAAA HH:MM:SS" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HM, - "DD/MM/AAAA HH:MM" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HM, + "DD-MM-AAAA HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMM_HM, - "DD/MM HH:MM" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM_HM, + "DD-MM HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY, - "DD/MM/AAAA" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY, + "DD-MM-AAAA" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMM, - "DD/MM" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM, + "DD-MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HMS, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HMS, "HH:MM:SS" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HM, "HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HMS_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HMS_AMPM, "AAAA-MM-DD HH:MM:SS (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HM_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HM_AMPM, "AAAA-MM-DD HH:MM (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HMS_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HMS_AMPM, "MM-DD-AAAA HH:MM:SS (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HM_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HM_AMPM, "MM-DD-AAAA HH:MM (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD_HM_AM_PM, - "MM/DD HH:MM (AM/PM)" + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD_HM_AMPM, + "MM-DD HH:MM (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HMS_AM_PM, - "DD/MM/AAAA HH:MM:SS (AM/PM)" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HMS_AMPM, + "DD-MM-AAAA HH:MM:SS (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HM_AM_PM, - "DD/MM/AAAA HH:MM (AM/PM)" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HM_AMPM, + "DD-MM-AAAA HH:MM (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMM_HM_AM_PM, - "DD/MM HH:MM (AM/PM)" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM_HM_AMPM, + "DD-MM HH:MM (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HMS_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HMS_AMPM, "HH:MM:SS (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HM_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HM_AMPM, "HH:MM (AM/PM)" ) MSG_HASH( @@ -9511,94 +9511,6 @@ MSG_HASH( MENU_ENUM_SUBLABEL_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE, "Selecciona el formato de fecha y hora para la información de la última partida jugada al mostrar el registro de ejecución. Nota: Las opciones AM/PM afectarán levemente al rendimiento en algunas plataformas." ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD_HMS, - "AAAA/MM/DD - HH:MM:SS" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD_HM, - "AAAA/MM/DD - HH:MM" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD, - "AAAA/MM/DD" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YM, - "AAAA/MM" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HMS, - "MM/DD/AAAA - HH:MM:SS" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HM, - "MM/DD/AAAA - HH:MM" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MD_HM, - "MM/DD - HH:MM" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY, - "MM/DD/AAAA" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MD, - "MM/DD" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HMS, - "DD/MM/AAAA - HH:MM:SS" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HM, - "DD/MM/AAAA - HH:MM" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMM_HM, - "DD/MM - HH:MM" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY, - "DD/MM/AAAA" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMM, - "DD/MM" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD_HMS_AM_PM, - "AAAA/MM/DD - HH:MM:SS (AM/PM)" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD_HM_AM_PM, - "AAAA/MM/DD - HH:MM (AM/PM)" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HMS_AM_PM, - "MM/DD/AAAA - HH:MM:SS (AM/PM)" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HM_AM_PM, - "MM/DD/AAAA - HH:MM (AM/PM)" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MD_HM_AM_PM, - "MM/DD - HH:MM (AM/PM)" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HMS_AM_PM, - "DD/MM/AAAA - HH:MM:SS (AM/PM)" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HM_AM_PM, - "DD/MM/AAAA - HH:MM (AM/PM)" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMM_HM_AM_PM, - "DD/MM - HH:MM (AM/PM)" - ) MSG_HASH( MENU_ENUM_LABEL_VALUE_PLAYLIST_FUZZY_ARCHIVE_MATCH, "Búsqueda difusa de archivos" @@ -10581,4 +10493,3 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_START_GONG, "Iniciar gong" ) - diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h index 2e42719a10..f7d0e32030 100644 --- a/intl/msg_hash_fr.h +++ b/intl/msg_hash_fr.h @@ -6910,197 +6910,109 @@ MSG_HASH( "Tardive" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HMS, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HMS, "AAAA-MM-JJ HH:MM:SS" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HM, "AAAA-MM-JJ HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD, "AAAA-MM-JJ" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YM, "AAAA-MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HMS, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HMS, "MM-JJ-AAAA HH:MM:SS" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HM, "MM-JJ-AAAA HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD_HM, "MM-JJ HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY, "MM-JJ-AAAA" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD, "MM-JJ" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HMS, - "JJ/MM/AAAA HH:MM:SS" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HMS, + "JJ-MM-AAAA HH:MM:SS" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HM, - "JJ/MM/AAAA HH:MM" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HM, + "JJ-MM-AAAA HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMM_HM, - "JJ/MM HH:MM" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM_HM, + "JJ-MM HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY, - "JJ/MM/AAAA" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY, + "JJ-MM/AAAA" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMM, - "JJ/MM" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM, + "JJ-MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HMS, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HMS, "HH:MM:SS" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HM, "HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HMS_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HMS_AMPM, "AAAA-MM-JJ HH:MM:SS (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HM_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HM_AMPM, "AAAA-MM-JJ HH:MM (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HMS_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HMS_AMPM, "MM-JJ-AAAA HH:MM:SS (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HM_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HM_AMPM, "MM-JJ-AAAA HH:MM (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD_HM_AM_PM, - "MM/JJ HH:MM (AM/PM)" + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD_HM_AMPM, + "MM-JJ HH:MM (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HMS_AM_PM, - "JJ/MM/AAAA HH:MM:SS (AM/PM)" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HMS_AMPM, + "JJ-MM-AAAA HH:MM:SS (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HM_AM_PM, - "JJ/MM/AAAA HH:MM (AM/PM)" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HM_AMPM, + "JJ-MM-AAAA HH:MM (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMM_HM_AM_PM, - "JJ/MM HH:MM (AM/PM)" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM_HM_AMPM, + "JJ-MM HH:MM (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HMS_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HMS_AMPM, "HH:MM:SS (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HM_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HM_AMPM, "HH:MM (AM/PM)" ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD_HMS, - "AAAA/MM/JJ - HH:MM:SS" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD_HM, - "AAAA/MM/JJ - HH:MM" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD, - "AAAA/MM/JJ" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YM, - "AAAA/MM" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HMS, - "MM/JJ/AAAA - HH:MM:SS" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HM, - "MM/JJ/AAAA - HH:MM" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MD_HM, - "MM/JJ - HH:MM" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY, - "MM/JJ/AAAA" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MD, - "MM/JJ" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HMS, - "JJ/MM/AAAA - HH:MM:SS" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HM, - "JJ/MM/AAAA - HH:MM" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMM_HM, - "JJ/MM - HH:MM" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY, - "JJ/MM/AAAA" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMM, - "JJ/MM" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD_HMS_AM_PM, - "AAAA/MM/JJ - HH:MM:SS (AM/PM)" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD_HM_AM_PM, - "AAAA/MM/JJ - HH:MM (AM/PM)" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HMS_AM_PM, - "MM/JJ/AAAA - HH:MM:SS (AM/PM)" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HM_AM_PM, - "MM/JJ/AAAA - HH:MM (AM/PM)" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MD_HM_AM_PM, - "MM/JJ - HH:MM (AM/PM)" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HMS_AM_PM, - "JJ/MM/AAAA - HH:MM:SS (AM/PM)" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HM_AM_PM, - "JJ/MM/AAAA - HH:MM (AM/PM)" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMM_HM_AM_PM, - "JJ/MM - HH:MM (AM/PM)" - ) /* RGUI: Settings > User Interface > Appearance */ diff --git a/intl/msg_hash_it.h b/intl/msg_hash_it.h index 1b26471901..1c002004e9 100644 --- a/intl/msg_hash_it.h +++ b/intl/msg_hash_it.h @@ -2622,107 +2622,107 @@ MSG_HASH( "Modifica il modo in cui vengono visualizzate data e ora nel menu" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HMS, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HMS, "AAAA-MM-GG HH:MM:SS" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HM, "AAAA-MM-GG HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD, "AAAA-MM-GG" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YM, "AAAA-MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HMS, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HMS, "MM-GG-AAAA HH:MM:SS" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HM, "MM-GG-AAAA HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD_HM, "MM-GG HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY, "MM-GG-AAAA" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD, "MM-GG" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HMS, - "GG/MM/AAAA HH:MM:SS" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HMS, + "GG-MM-AAAA HH:MM:SS" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HM, - "GG/MM/AAAA HH:MM" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HM, + "GG-MM-AAAA HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMM_HM, - "GG/MM HH:MM" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM_HM, + "GG-MM HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY, - "GG/MM/AAAA" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY, + "GG-MM-AAAA" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMM, - "GG/MM" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM, + "GG-MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HMS, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HMS, "HH:MM:SS" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HM, "HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HMS_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HMS_AMPM, "AAAA-MM-GG HH:MM:SS (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HM_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HM_AMPM, "AAAA-MM-GG HH:MM (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HMS_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HMS_AMPM, "MM-GG-AAAA HH:MM:SS (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HM_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HM_AMPM, "MM-GG-AAAA HH:MM (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD_HM_AM_PM, - "MM/GG HH:MM (AM/PM)" + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD_HM_AMPM, + "MM-GG HH:MM (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HMS_AM_PM, - "GG/MM/AAAA HH:MM:SS (AM/PM)" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HMS_AMPM, + "GG-MM-AAAA HH:MM:SS (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HM_AM_PM, - "GG/MM/AAAA HH:MM (AM/PM)" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HM_AMPM, + "GG-MM-AAAA HH:MM (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMM_HM_AM_PM, - "GG/MM HH:MM (AM/PM)" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM_HM_AMPM, + "GG-MM HH:MM (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HMS_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HMS_AMPM, "HH:MM:SS (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HM_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HM_AMPM, "HH:MM (AM/PM)" ) MSG_HASH( diff --git a/intl/msg_hash_ja.h b/intl/msg_hash_ja.h index f503b52baf..be03117643 100644 --- a/intl/msg_hash_ja.h +++ b/intl/msg_hash_ja.h @@ -3124,107 +3124,107 @@ MSG_HASH( "メニュー内での日付/時刻の表示形式を変更します。" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HMS, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HMS, "年-月-日 時:分:秒" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HM, "年-月-日 時:分" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD, "年-月-日" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YM, "年-月" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HMS, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HMS, "月-日-年 時:分:秒" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HM, "月-日-年 時:分" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD_HM, "月-日 時:分" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY, "月-日-年" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD, "月-日" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HMS, - "日/月/年 時:分:秒" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HMS, + "日-月-年 時:分:秒" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HM, - "日/月/年 時:分" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HM, + "日-月-年 時:分" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMM_HM, - "日/月 時:分" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM_HM, + "日-月 時:分" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY, - "日/月/年" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY, + "日-月-年" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMM, - "日/月" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM, + "日-月" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HMS, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HMS, "時:分:秒" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HM, "時:分" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HMS_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HMS_AMPM, "年-月-日 時:分:秒 (午前/午後)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HM_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HM_AMPM, "年-月-日 時:分 (午前/午後)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HMS_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HMS_AMPM, "月-日-年 時:分:秒 (午前/午後)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HM_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HM_AMPM, "月-日-年 時:分 (午前/午後)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD_HM_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD_HM_AMPM, "月-日 時:分 (午前/午後)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HMS_AM_PM, - "日/月/年 時:分:秒 (午前/午後)" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HMS_AMPM, + "日-月-年 時:分:秒 (午前/午後)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HM_AM_PM, - "日/月/年 時:分 (午前/午後)" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HM_AMPM, + "日-月-年 時:分 (午前/午後)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMM_HM_AM_PM, - "日/月 時:分 (午前/午後)" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM_HM_AMPM, + "日-月 時:分 (午前/午後)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HMS_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HMS_AMPM, "時:分:秒 (午前/午後)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HM_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HM_AMPM, "時:分 (午前/午後)" ) MSG_HASH( diff --git a/intl/msg_hash_ko.h b/intl/msg_hash_ko.h index 262b7dde85..3f6702adde 100644 --- a/intl/msg_hash_ko.h +++ b/intl/msg_hash_ko.h @@ -3578,107 +3578,107 @@ MSG_HASH( "메뉴에 표시될 시간/날짜 스타일을 변경합니다." ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HMS, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HMS, "YYYY-MM-DD HH:MM:SS" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HM, "YYYY-MM-DD HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD, "YYYY-MM-DD" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YM, "YYYY-MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HMS, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HMS, "MM-DD-YYYY HH:MM:SS" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HM, "MM-DD-YYYY HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD_HM, "MM-DD HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY, "MM-DD-YYYY" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD, "MM-DD" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HMS, - "DD/MM/YYYY HH:MM:SS" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HMS, + "DD-MM-YYYY HH:MM:SS" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HM, - "DD/MM/YYYY HH:MM" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HM, + "DD-MM-YYYY HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMM_HM, - "DD/MM HH:MM" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM_HM, + "DD-MM HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY, - "DD/MM/YYYY" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY, + "DD-MM-YYYY" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMM, - "DD/MM" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM, + "DD-MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HMS, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HMS, "HH:MM:SS" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HM, "HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HMS_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HMS_AMPM, "YYYY-MM-DD HH:MM:SS (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HM_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HM_AMPM, "YYYY-MM-DD HH:MM (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HMS_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HMS_AMPM, "MM-DD-YYYY HH:MM:SS (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HM_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HM_AMPM, "MM-DD-YYYY HH:MM (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD_HM_AM_PM, - "MM/DD HH:MM (AM/PM)" + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD_HM_AMPM, + "MM-DD HH:MM (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HMS_AM_PM, - "DD/MM/YYYY HH:MM:SS (AM/PM)" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HMS_AMPM, + "DD-MM-YYYY HH:MM:SS (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HM_AM_PM, - "DD/MM/YYYY HH:MM (AM/PM)" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HM_AMPM, + "DD-MM-YYYY HH:MM (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMM_HM_AM_PM, - "DD/MM HH:MM (AM/PM)" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM_HM_AMPM, + "DD-MM HH:MM (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HMS_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HMS_AMPM, "HH:MM:SS (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HM_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HM_AMPM, "HH:MM (AM/PM)" ) MSG_HASH( diff --git a/intl/msg_hash_pt_br.h b/intl/msg_hash_pt_br.h index 1687d1b895..c893cd5be2 100644 --- a/intl/msg_hash_pt_br.h +++ b/intl/msg_hash_pt_br.h @@ -3718,107 +3718,107 @@ MSG_HASH( "Altera o estilo da data atual ou como a hora é mostrada dentro do menu." ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HMS, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HMS, "AAAA-MM-DD HH:MM:SS" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HM, "AAAA-MM-DD HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD, "AAAA-MM-DD" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YM, "AAAA-MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HMS, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HMS, "MM-DD-AAAA HH:MM:SS" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HM, "MM-DD-AAAA HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD_HM, "MM-DD HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY, "MM-DD-AAAA" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD, "MM-DD" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HMS, - "DD/MM/AAAA HH:MM:SS" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HMS, + "DD-MM-AAAA HH:MM:SS" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HM, - "DD/MM/AAAA HH:MM" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HM, + "DD-MM-AAAA HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMM_HM, - "DD/MM HH:MM" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM_HM, + "DD-MM HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY, - "DD/MM/AAAA" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY, + "DD-MM-AAAA" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMM, - "DD/MM" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM, + "DD-MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HMS, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HMS, "HH:MM:SS" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HM, "HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HMS_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HMS_AMPM, "AAAA-MM-DD HH:MM:SS (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HM_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HM_AMPM, "AAAA-MM-DD HH:MM (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HMS_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HMS_AMPM, "MM-DD-AAAA HH:MM:SS (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HM_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HM_AMPM, "MM-DD-AAAA HH:MM (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD_HM_AM_PM, - "MM/DD HH:MM (AM/PM)" + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD_HM_AMPM, + "MM-DD HH:MM (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HMS_AM_PM, - "DD/MM/AAAA HH:MM:SS (AM/PM)" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HMS_AMPM, + "DD-MM-AAAA HH:MM:SS (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HM_AM_PM, - "DD/MM/AAAA HH:MM (AM/PM)" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HM_AMPM, + "DD-MM-AAAA HH:MM (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMM_HM_AM_PM, - "DD/MM HH:MM (AM/PM)" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM_HM_AMPM, + "DD-MM HH:MM (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HMS_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HMS_AMPM, "HH:MM:SS (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HM_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HM_AMPM, "HH:MM (AM/PM)" ) MSG_HASH( @@ -9586,94 +9586,6 @@ MSG_HASH( MENU_ENUM_SUBLABEL_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE, "Seleciona o formato de data e hora da último partida, mostrando o registro de execução. NOTA: As opções AM/PM afetam ligeiramente o desempenho em algumas plataformas." ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD_HMS, - "AAAA/MM/DD - HH:MM:SS" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD_HM, - "AAAA/MM/DD - HH:MM" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD, - "AAAA/MM/DD" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YM, - "AAAA/MM" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HMS, - "MM/DD/AAAA - HH:MM:SS" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HM, - "MM/DD/AAAA - HH:MM" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MD_HM, - "MM/DD - HH:MM" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY, - "MM/DD/AAAA" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MD, - "MM/DD" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HMS, - "DD/MM/AAAA - HH:MM:SS" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HM, - "DD/MM/AAAA - HH:MM" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMM_HM, - "DD/MM - HH:MM" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY, - "DD/MM/AAAA" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMM, - "DD/MM" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD_HMS_AM_PM, - "AAAA/MM/DD - HH:MM:SS (AM/PM)" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD_HM_AM_PM, - "AAAA/MM/DD - HH:MM (AM/PM)" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HMS_AM_PM, - "MM/DD/AAAA - HH:MM:SS (AM/PM)" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HM_AM_PM, - "MM/DD/AAAA - HH:MM (AM/PM)" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MD_HM_AM_PM, - "MM/DD - HH:MM (AM/PM)" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HMS_AM_PM, - "DD/MM/AAAA - HH:MM:SS (AM/PM)" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HM_AM_PM, - "DD/MM/AAAA - HH:MM (AM/PM)" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMM_HM_AM_PM, - "DD/MM - HH:MM (AM/PM)" - ) MSG_HASH( MENU_ENUM_LABEL_VALUE_PLAYLIST_FUZZY_ARCHIVE_MATCH, "Correspondência de arquivos difusos" diff --git a/intl/msg_hash_tr.h b/intl/msg_hash_tr.h index 5f6dcb3a33..488390c06e 100644 --- a/intl/msg_hash_tr.h +++ b/intl/msg_hash_tr.h @@ -3160,107 +3160,107 @@ MSG_HASH( "Menü içindeki tarih ve/veya saatin stilini değiştir." ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HMS, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HMS, "YYYY-AA-GG SS:DD:SN" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HM, "YYYY-AA-GG SS:DD" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD, "YYYY-AA-GG" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YM, "YYYY-AA" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HMS, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HMS, "AA-GG-YYYY SS:DD:SN" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HM, "AA-GG-YYYY SS:DD" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD_HM, "AA-GG SS:DD" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY, "AA-GG-YYYY" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD, "AA-GG" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HMS, - "GG/AA/YYYY SS:DD:SN" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HMS, + "GG-AA-YYYY SS:DD:SN" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HM, - "GG/AA/YYYY SS:DD" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HM, + "GG-AA-YYYY SS:DD" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMM_HM, - "GG/AA SS:DD" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM_HM, + "GG-AA SS:DD" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY, - "GG/AA/YYYY" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY, + "GG-AA-YYYY" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMM, - "GG/AA" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM, + "GG-AA" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HMS, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HMS, "SS:DD:SN" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HM, "SS:DD" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HMS_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HMS_AMPM, "YYYY-AA-GG SS:DD:SN (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HM_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HM_AMPM, "YYYY-AA-GG SS:DD (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HMS_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HMS_AMPM, "AA-GG-YYYY SS:DD:SN (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HM_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HM_AMPM, "AA-GG-YYYY SS:DD (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD_HM_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD_HM_AMPM, "AA-GG SS:DD (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HMS_AM_PM, - "GG/AA/YYYY SS:DD:SN (AM/PM)" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HMS_AMPM, + "GG-AA-YYYY SS:DD:SN (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HM_AM_PM, - "GG/AA/YYYY SS:DD (AM/PM)" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HM_AMPM, + "GG-AA-YYYY SS:DD (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMM_HM_AM_PM, - "GG/AA SS:DD (AM/PM)" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM_HM_AMPM, + "GG-AA SS:DD (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HMS_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HMS_AMPM, "SS:DD:SN (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HM_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HM_AMPM, "SS:DD (AM/PM)" ) MSG_HASH( diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 39294e8038..c4d394aa38 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -6926,197 +6926,109 @@ MSG_HASH( "Late" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HMS, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HMS, "YYYY-MM-DD HH:MM:SS" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HM, "YYYY-MM-DD HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD, "YYYY-MM-DD" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YM, "YYYY-MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HMS, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HMS, "MM-DD-YYYY HH:MM:SS" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HM, "MM-DD-YYYY HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD_HM, "MM-DD HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY, "MM-DD-YYYY" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD, "MM-DD" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HMS, - "DD/MM/YYYY HH:MM:SS" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HMS, + "DD-MM-YYYY HH:MM:SS" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HM, - "DD/MM/YYYY HH:MM" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HM, + "DD-MM-YYYY HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMM_HM, - "DD/MM HH:MM" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM_HM, + "DD-MM HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY, - "DD/MM/YYYY" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY, + "DD-MM-YYYY" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMM, - "DD/MM" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM, + "DD-MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HMS, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HMS, "HH:MM:SS" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HM, "HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HMS_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HMS_AMPM, "YYYY-MM-DD HH:MM:SS (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HM_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HM_AMPM, "YYYY-MM-DD HH:MM (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HMS_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HMS_AMPM, "MM-DD-YYYY HH:MM:SS (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HM_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HM_AMPM, "MM-DD-YYYY HH:MM (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD_HM_AM_PM, - "MM/DD HH:MM (AM/PM)" + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD_HM_AMPM, + "MM-DD HH:MM (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HMS_AM_PM, - "DD/MM/YYYY HH:MM:SS (AM/PM)" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HMS_AMPM, + "DD-MM-YYYY HH:MM:SS (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HM_AM_PM, - "DD/MM/YYYY HH:MM (AM/PM)" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HM_AMPM, + "DD-MM-YYYY HH:MM (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMM_HM_AM_PM, - "DD/MM HH:MM (AM/PM)" + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM_HM_AMPM, + "DD-MM HH:MM (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HMS_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HMS_AMPM, "HH:MM:SS (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HM_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HM_AMPM, "HH:MM (AM/PM)" ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD_HMS, - "YYYY/MM/DD - HH:MM:SS" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD_HM, - "YYYY/MM/DD - HH:MM" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD, - "YYYY/MM/DD" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YM, - "YYYY/MM" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HMS, - "MM/DD/YYYY - HH:MM:SS" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HM, - "MM/DD/YYYY - HH:MM" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MD_HM, - "MM/DD - HH:MM" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY, - "MM/DD/YYYY" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MD, - "MM/DD" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HMS, - "DD/MM/YYYY - HH:MM:SS" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HM, - "DD/MM/YYYY - HH:MM" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMM_HM, - "DD/MM - HH:MM" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY, - "DD/MM/YYYY" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMM, - "DD/MM" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD_HMS_AM_PM, - "YYYY/MM/DD - HH:MM:SS (AM/PM)" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD_HM_AM_PM, - "YYYY/MM/DD - HH:MM (AM/PM)" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HMS_AM_PM, - "MM/DD/YYYY - HH:MM:SS (AM/PM)" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HM_AM_PM, - "MM/DD/YYYY - HH:MM (AM/PM)" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MD_HM_AM_PM, - "MM/DD - HH:MM (AM/PM)" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HMS_AM_PM, - "DD/MM/YYYY - HH:MM:SS (AM/PM)" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HM_AM_PM, - "DD/MM/YYYY - HH:MM (AM/PM)" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMM_HM_AM_PM, - "DD/MM - HH:MM (AM/PM)" - ) /* RGUI: Settings > User Interface > Appearance */ diff --git a/menu/menu_defines.h b/menu/menu_defines.h index 77972fb22d..cb24aed99e 100644 --- a/menu/menu_defines.h +++ b/menu/menu_defines.h @@ -103,16 +103,16 @@ enum menu_timedate_style_type MENU_TIMEDATE_STYLE_DDMM, MENU_TIMEDATE_STYLE_HMS, MENU_TIMEDATE_STYLE_HM, - MENU_TIMEDATE_STYLE_YMD_HMS_AM_PM, - MENU_TIMEDATE_STYLE_YMD_HM_AM_PM, - MENU_TIMEDATE_STYLE_MDYYYY_HMS_AM_PM, - MENU_TIMEDATE_STYLE_MDYYYY_HM_AM_PM, - MENU_TIMEDATE_STYLE_MD_HM_AM_PM, - MENU_TIMEDATE_STYLE_DDMMYYYY_HMS_AM_PM, - MENU_TIMEDATE_STYLE_DDMMYYYY_HM_AM_PM, - MENU_TIMEDATE_STYLE_DDMM_HM_AM_PM, - MENU_TIMEDATE_STYLE_HMS_AM_PM, - MENU_TIMEDATE_STYLE_HM_AM_PM, + MENU_TIMEDATE_STYLE_YMD_HMS_AMPM, + MENU_TIMEDATE_STYLE_YMD_HM_AMPM, + MENU_TIMEDATE_STYLE_MDYYYY_HMS_AMPM, + MENU_TIMEDATE_STYLE_MDYYYY_HM_AMPM, + MENU_TIMEDATE_STYLE_MD_HM_AMPM, + MENU_TIMEDATE_STYLE_DDMMYYYY_HMS_AMPM, + MENU_TIMEDATE_STYLE_DDMMYYYY_HM_AMPM, + MENU_TIMEDATE_STYLE_DDMM_HM_AMPM, + MENU_TIMEDATE_STYLE_HMS_AMPM, + MENU_TIMEDATE_STYLE_HM_AMPM, MENU_TIMEDATE_STYLE_LAST }; diff --git a/menu/menu_driver.c b/menu/menu_driver.c index f6083484ed..88c840e20c 100644 --- a/menu/menu_driver.c +++ b/menu/menu_driver.c @@ -195,7 +195,7 @@ static void get_current_menu_sublabel(char* retstr, size_t max) menu_entry_init(&entry); menu_entry_get(&entry, 0, menu_navigation_get_selection(), NULL, true); - + menu_entry_get_sublabel(&entry, &entry_sublabel); strlcpy(retstr, entry_sublabel, max); } @@ -217,7 +217,7 @@ static int generic_menu_iterate(void *data, retro_time_t current_time) { #ifdef HAVE_ACCESSIBILITY - static enum action_iterate_type + static enum action_iterate_type last_iterate_type = ITERATE_TYPE_DEFAULT; #endif enum action_iterate_type iterate_type; @@ -260,7 +260,7 @@ static int generic_menu_iterate(void *data, { bool pop_stack = false; - if ( ret == 1 || + if ( ret == 1 || action == MENU_ACTION_OK || action == MENU_ACTION_CANCEL ) @@ -541,8 +541,8 @@ int generic_menu_entry_action( } #ifdef HAVE_ACCESSIBILITY - if ( action != 0 - && is_accessibility_enabled() + if ( action != 0 + && is_accessibility_enabled() && !is_input_keyboard_display_on()) { char current_label[255]; @@ -747,8 +747,8 @@ enum menu_entry_type menu_entry_get_type(uint32_t i) file_list_t *selection_buf = menu_entries_get_selection_buf_ptr_internal(0); menu_file_list_cbs_t *cbs = NULL; rarch_setting_t *setting = NULL; - - /* FIXME/TODO - XXX Really a special kind of ST_ACTION, + + /* FIXME/TODO - XXX Really a special kind of ST_ACTION, * but this should be changed */ if (menu_setting_ctl(MENU_SETTING_CTL_IS_OF_PATH_TYPE, (void*)setting)) return MENU_ENTRY_PATH; @@ -1396,8 +1396,8 @@ void menu_entries_get_at_offset(const file_list_t *list, size_t idx, { file_list_get_at_offset(list, idx, path, label, file_type, entry_idx); if (list && alt) - *alt = list->list[idx].alt - ? list->list[idx].alt + *alt = list->list[idx].alt + ? list->list[idx].alt : list->list[idx].path; } @@ -1419,7 +1419,7 @@ static int menu_entries_elem_get_first_char( if (list) if ((path = list->list[offset].alt - ? list->list[offset].alt + ? list->list[offset].alt : list->list[offset].path)) ret = tolower((int)*path); @@ -1532,9 +1532,9 @@ int menu_entries_get_title(char *s, size_t len) const char *path = NULL; const char *label = NULL; struct menu_state *menu_st = &menu_driver_state; - const file_list_t *list = menu_st->entries.list ? + const file_list_t *list = menu_st->entries.list ? menu_list_get(menu_st->entries.list, 0) : NULL; - menu_file_list_cbs_t *cbs = list + menu_file_list_cbs_t *cbs = list ? (menu_file_list_cbs_t*)list->list[list->size - 1].actiondata : NULL; @@ -2302,9 +2302,9 @@ void menu_display_timedate(gfx_display_ctx_datetime_t *datetime) strftime(menu_st->datetime_cache, sizeof(menu_st->datetime_cache), "%m-%d-%Y %H:%M", tm_); break; - case MENU_TIMEDATE_STYLE_MD_HM: /* MM/DD HH:MM */ + case MENU_TIMEDATE_STYLE_MD_HM: /* MM-DD HH:MM */ strftime(menu_st->datetime_cache, sizeof(menu_st->datetime_cache), - "%m/%d %H:%M", tm_); + "%m-%d %H:%M", tm_); break; case MENU_TIMEDATE_STYLE_MDYYYY: /* MM-DD-YYYY */ strftime(menu_st->datetime_cache, sizeof(menu_st->datetime_cache), @@ -2314,25 +2314,25 @@ void menu_display_timedate(gfx_display_ctx_datetime_t *datetime) strftime(menu_st->datetime_cache, sizeof(menu_st->datetime_cache), "%m-%d", tm_); break; - case MENU_TIMEDATE_STYLE_DDMMYYYY_HMS: /* DD/MM/YYYY HH:MM:SS */ + case MENU_TIMEDATE_STYLE_DDMMYYYY_HMS: /* DD-MM-YYYY HH:MM:SS */ strftime(menu_st->datetime_cache, sizeof(menu_st->datetime_cache), - "%d/%m/%Y %H:%M:%S", tm_); + "%d-%m-%Y %H:%M:%S", tm_); break; - case MENU_TIMEDATE_STYLE_DDMMYYYY_HM: /* DD/MM/YYYY HH:MM */ + case MENU_TIMEDATE_STYLE_DDMMYYYY_HM: /* DD-MM-YYYY HH:MM */ strftime(menu_st->datetime_cache, sizeof(menu_st->datetime_cache), - "%d/%m/%Y %H:%M", tm_); + "%d-%m-%Y %H:%M", tm_); break; - case MENU_TIMEDATE_STYLE_DDMM_HM: /* DD/MM HH:MM */ + case MENU_TIMEDATE_STYLE_DDMM_HM: /* DD-MM HH:MM */ strftime(menu_st->datetime_cache, sizeof(menu_st->datetime_cache), - "%d/%m %H:%M", tm_); + "%d-%m %H:%M", tm_); break; - case MENU_TIMEDATE_STYLE_DDMMYYYY: /* DD/MM/YYYY */ + case MENU_TIMEDATE_STYLE_DDMMYYYY: /* DD-MM-YYYY */ strftime(menu_st->datetime_cache, sizeof(menu_st->datetime_cache), - "%d/%m/%Y", tm_); + "%d-%m-%Y", tm_); break; - case MENU_TIMEDATE_STYLE_DDMM: /* DD/MM */ + case MENU_TIMEDATE_STYLE_DDMM: /* DD-MM */ strftime(menu_st->datetime_cache, sizeof(menu_st->datetime_cache), - "%d/%m", tm_); + "%d-%m", tm_); break; case MENU_TIMEDATE_STYLE_HMS: /* HH:MM:SS */ strftime(menu_st->datetime_cache, sizeof(menu_st->datetime_cache), @@ -2342,43 +2342,43 @@ void menu_display_timedate(gfx_display_ctx_datetime_t *datetime) strftime(menu_st->datetime_cache, sizeof(menu_st->datetime_cache), "%H:%M", tm_); break; - case MENU_TIMEDATE_STYLE_YMD_HMS_AM_PM: /* YYYY-MM-DD HH:MM:SS (am/pm) */ + case MENU_TIMEDATE_STYLE_YMD_HMS_AMPM: /* YYYY-MM-DD HH:MM:SS (AM/PM) */ strftime_am_pm(menu_st->datetime_cache, sizeof(menu_st->datetime_cache), "%Y-%m-%d %I:%M:%S %p", tm_); break; - case MENU_TIMEDATE_STYLE_YMD_HM_AM_PM: /* YYYY-MM-DD HH:MM (am/pm) */ + case MENU_TIMEDATE_STYLE_YMD_HM_AMPM: /* YYYY-MM-DD HH:MM (AM/PM) */ strftime_am_pm(menu_st->datetime_cache, sizeof(menu_st->datetime_cache), "%Y-%m-%d %I:%M %p", tm_); break; - case MENU_TIMEDATE_STYLE_MDYYYY_HMS_AM_PM: /* MM-DD-YYYY HH:MM:SS (am/pm) */ + case MENU_TIMEDATE_STYLE_MDYYYY_HMS_AMPM: /* MM-DD-YYYY HH:MM:SS (AM/PM) */ strftime_am_pm(menu_st->datetime_cache, sizeof(menu_st->datetime_cache), "%m-%d-%Y %I:%M:%S %p", tm_); break; - case MENU_TIMEDATE_STYLE_MDYYYY_HM_AM_PM: /* MM-DD-YYYY HH:MM (am/pm) */ + case MENU_TIMEDATE_STYLE_MDYYYY_HM_AMPM: /* MM-DD-YYYY HH:MM (AM/PM) */ strftime_am_pm(menu_st->datetime_cache, sizeof(menu_st->datetime_cache), "%m-%d-%Y %I:%M %p", tm_); break; - case MENU_TIMEDATE_STYLE_MD_HM_AM_PM: /* MM/DD HH:MM (am/pm) */ + case MENU_TIMEDATE_STYLE_MD_HM_AMPM: /* MM-DD HH:MM (AM/PM) */ strftime_am_pm(menu_st->datetime_cache, sizeof(menu_st->datetime_cache), - "%m/%d %I:%M %p", tm_); + "%m-%d %I:%M %p", tm_); break; - case MENU_TIMEDATE_STYLE_DDMMYYYY_HMS_AM_PM: /* DD/MM/YYYY HH:MM:SS (am/pm) */ + case MENU_TIMEDATE_STYLE_DDMMYYYY_HMS_AMPM: /* DD-MM-YYYY HH:MM:SS (AM/PM) */ strftime_am_pm(menu_st->datetime_cache, sizeof(menu_st->datetime_cache), - "%d/%m/%Y %I:%M:%S %p", tm_); + "%d-%m-%Y %I:%M:%S %p", tm_); break; - case MENU_TIMEDATE_STYLE_DDMMYYYY_HM_AM_PM: /* DD/MM/YYYY HH:MM (am/pm) */ + case MENU_TIMEDATE_STYLE_DDMMYYYY_HM_AMPM: /* DD-MM-YYYY HH:MM (AM/PM) */ strftime_am_pm(menu_st->datetime_cache, sizeof(menu_st->datetime_cache), - "%d/%m/%Y %I:%M %p", tm_); + "%d-%m-%Y %I:%M %p", tm_); break; - case MENU_TIMEDATE_STYLE_DDMM_HM_AM_PM: /* DD/MM HH:MM (am/pm) */ + case MENU_TIMEDATE_STYLE_DDMM_HM_AMPM: /* DD-MM HH:MM (AM/PM) */ strftime_am_pm(menu_st->datetime_cache, sizeof(menu_st->datetime_cache), - "%d/%m %I:%M %p", tm_); + "%d-%m %I:%M %p", tm_); break; - case MENU_TIMEDATE_STYLE_HMS_AM_PM: /* HH:MM:SS (am/pm) */ + case MENU_TIMEDATE_STYLE_HMS_AMPM: /* HH:MM:SS (AM/PM) */ strftime_am_pm(menu_st->datetime_cache, sizeof(menu_st->datetime_cache), "%I:%M:%S %p", tm_); break; - case MENU_TIMEDATE_STYLE_HM_AM_PM: /* HH:MM (am/pm) */ + case MENU_TIMEDATE_STYLE_HM_AMPM: /* HH:MM (AM/PM) */ strftime_am_pm(menu_st->datetime_cache, sizeof(menu_st->datetime_cache), "%I:%M %p", tm_); break; @@ -2615,7 +2615,7 @@ bool menu_driver_init(bool video_is_threaded) command_event(CMD_EVENT_CORE_INFO_INIT, NULL); command_event(CMD_EVENT_LOAD_CORE_PERSIST, NULL); - if ( menu_driver_data || + if ( menu_driver_data || menu_driver_init_internal(video_is_threaded)) { if (menu_driver_ctx && menu_driver_ctx->context_reset) diff --git a/menu/menu_setting.c b/menu/menu_setting.c index cb989d0d57..86b7e8beea 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -3193,129 +3193,129 @@ static void setting_get_string_representation_uint_menu_timedate_style( { case MENU_TIMEDATE_STYLE_YMD_HMS: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HMS), len); + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HMS), len); break; case MENU_TIMEDATE_STYLE_YMD_HM: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HM), len); + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HM), len); break; case MENU_TIMEDATE_STYLE_YMD: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD), len); + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD), len); break; case MENU_TIMEDATE_STYLE_YM: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YM), len); + MENU_ENUM_LABEL_VALUE_TIMEDATE_YM), len); break; case MENU_TIMEDATE_STYLE_MDYYYY_HMS: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HMS), len); + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HMS), len); break; case MENU_TIMEDATE_STYLE_MDYYYY_HM: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HM), len); + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HM), len); break; case MENU_TIMEDATE_STYLE_MD_HM: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD_HM), len); + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD_HM), len); break; case MENU_TIMEDATE_STYLE_MDYYYY: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY), len); + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY), len); break; case MENU_TIMEDATE_STYLE_MD: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD), len); + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD), len); break; case MENU_TIMEDATE_STYLE_DDMMYYYY_HMS: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HMS), len); + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HMS), len); break; case MENU_TIMEDATE_STYLE_DDMMYYYY_HM: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HM), len); + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HM), len); break; case MENU_TIMEDATE_STYLE_DDMM_HM: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMM_HM), len); + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM_HM), len); break; case MENU_TIMEDATE_STYLE_DDMMYYYY: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY), len); + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY), len); break; case MENU_TIMEDATE_STYLE_DDMM: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMM), len); + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM), len); break; case MENU_TIMEDATE_STYLE_HMS: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HMS), len); + MENU_ENUM_LABEL_VALUE_TIMEDATE_HMS), len); break; case MENU_TIMEDATE_STYLE_HM: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HM), len); + MENU_ENUM_LABEL_VALUE_TIMEDATE_HM), len); break; - case MENU_TIMEDATE_STYLE_YMD_HMS_AM_PM: + case MENU_TIMEDATE_STYLE_YMD_HMS_AMPM: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HMS_AM_PM), len); + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HMS_AMPM), len); break; - case MENU_TIMEDATE_STYLE_YMD_HM_AM_PM: + case MENU_TIMEDATE_STYLE_YMD_HM_AMPM: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HM_AM_PM), len); + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HM_AMPM), len); break; - case MENU_TIMEDATE_STYLE_MDYYYY_HMS_AM_PM: + case MENU_TIMEDATE_STYLE_MDYYYY_HMS_AMPM: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HMS_AM_PM), len); + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HMS_AMPM), len); break; - case MENU_TIMEDATE_STYLE_MDYYYY_HM_AM_PM: + case MENU_TIMEDATE_STYLE_MDYYYY_HM_AMPM: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HM_AM_PM), len); + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HM_AMPM), len); break; - case MENU_TIMEDATE_STYLE_MD_HM_AM_PM: + case MENU_TIMEDATE_STYLE_MD_HM_AMPM: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD_HM_AM_PM), len); + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD_HM_AMPM), len); break; - case MENU_TIMEDATE_STYLE_DDMMYYYY_HMS_AM_PM: + case MENU_TIMEDATE_STYLE_DDMMYYYY_HMS_AMPM: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HMS_AM_PM), len); + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HMS_AMPM), len); break; - case MENU_TIMEDATE_STYLE_DDMMYYYY_HM_AM_PM: + case MENU_TIMEDATE_STYLE_DDMMYYYY_HM_AMPM: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HM_AM_PM), len); + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HM_AMPM), len); break; - case MENU_TIMEDATE_STYLE_DDMM_HM_AM_PM: + case MENU_TIMEDATE_STYLE_DDMM_HM_AMPM: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMM_HM_AM_PM), len); + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM_HM_AMPM), len); break; - case MENU_TIMEDATE_STYLE_HMS_AM_PM: + case MENU_TIMEDATE_STYLE_HMS_AMPM: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HMS_AM_PM), len); + MENU_ENUM_LABEL_VALUE_TIMEDATE_HMS_AMPM), len); break; - case MENU_TIMEDATE_STYLE_HM_AM_PM: + case MENU_TIMEDATE_STYLE_HM_AMPM: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HM_AM_PM), len); + MENU_ENUM_LABEL_VALUE_TIMEDATE_HM_AMPM), len); break; } } @@ -4547,133 +4547,133 @@ static void setting_get_string_representation_uint_playlist_sublabel_last_played case PLAYLIST_LAST_PLAYED_STYLE_YMD_HMS: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD_HMS), + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HMS), len); break; case PLAYLIST_LAST_PLAYED_STYLE_YMD_HM: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD_HM), + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HM), len); break; case PLAYLIST_LAST_PLAYED_STYLE_YMD: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD), + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD), len); break; case PLAYLIST_LAST_PLAYED_STYLE_YM: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YM), + MENU_ENUM_LABEL_VALUE_TIMEDATE_YM), len); break; case PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_HMS: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HMS), + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HMS), len); break; case PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_HM: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HM), + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HM), len); break; case PLAYLIST_LAST_PLAYED_STYLE_MD_HM: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MD_HM), + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD_HM), len); break; case PLAYLIST_LAST_PLAYED_STYLE_MDYYYY: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY), + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY), len); break; case PLAYLIST_LAST_PLAYED_STYLE_MD: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MD), + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD), len); break; case PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY_HMS: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HMS), + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HMS), len); break; case PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY_HM: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HM), + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HM), len); break; case PLAYLIST_LAST_PLAYED_STYLE_DDMM_HM: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMM_HM), + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM_HM), len); break; case PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY), + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY), len); break; case PLAYLIST_LAST_PLAYED_STYLE_DDMM: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMM), + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM), len); break; - case PLAYLIST_LAST_PLAYED_STYLE_YMD_HMS_AM_PM: + case PLAYLIST_LAST_PLAYED_STYLE_YMD_HMS_AMPM: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD_HMS_AM_PM), + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HMS_AMPM), len); break; - case PLAYLIST_LAST_PLAYED_STYLE_YMD_HM_AM_PM: + case PLAYLIST_LAST_PLAYED_STYLE_YMD_HM_AMPM: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD_HM_AM_PM), + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HM_AMPM), len); break; - case PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_HMS_AM_PM: + case PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_HMS_AMPM: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HMS_AM_PM), + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HMS_AMPM), len); break; - case PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_HM_AM_PM: + case PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_HM_AMPM: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HM_AM_PM), + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HM_AMPM), len); break; - case PLAYLIST_LAST_PLAYED_STYLE_MD_HM_AM_PM: + case PLAYLIST_LAST_PLAYED_STYLE_MD_HM_AMPM: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MD_HM_AM_PM), + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD_HM_AMPM), len); break; - case PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY_HMS_AM_PM: + case PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY_HMS_AMPM: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HMS_AM_PM), + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HMS_AMPM), len); break; - case PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY_HM_AM_PM: + case PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY_HM_AMPM: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HM_AM_PM), + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HM_AMPM), len); break; - case PLAYLIST_LAST_PLAYED_STYLE_DDMM_HM_AM_PM: + case PLAYLIST_LAST_PLAYED_STYLE_DDMM_HM_AMPM: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMM_HM_AM_PM), + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM_HM_AMPM), len); break; } diff --git a/msg_hash.h b/msg_hash.h index df6d0ef7da..b2d09750d1 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -2662,32 +2662,32 @@ enum msg_hash_enums MSG_CHEAT_SEARCH_DELETE_MATCH_SUCCESS, MSG_CHEEVOS_HARDCORE_MODE_DISABLED, MSG_CHEEVOS_HARDCORE_MODE_DISABLED_CHEAT, - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HMS, - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HM, - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD, - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YM, - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HMS, - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HM, - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD_HM, - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY, - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD, - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HMS, - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HM, - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMM_HM, - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY, - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMM, - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HMS, - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HM, - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HMS_AM_PM, - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HM_AM_PM, - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HMS_AM_PM, - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY_HM_AM_PM, - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD_HM_AM_PM, - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HMS_AM_PM, - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMMYYYY_HM_AM_PM, - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DDMM_HM_AM_PM, - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HMS_AM_PM, - MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HM_AM_PM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HMS, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HMS, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD, + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HMS, + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY, + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HMS, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HMS_AMPM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_YMD_HM_AMPM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HMS_AMPM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MDYYYY_HM_AMPM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_MD_HM_AMPM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HMS_AMPM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMMYYYY_HM_AMPM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_DDMM_HM_AMPM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HMS_AMPM, + MENU_ENUM_LABEL_VALUE_TIMEDATE_HM_AMPM, MENU_ENUM_LABEL_SWITCH_GPU_PROFILE, MENU_ENUM_LABEL_VALUE_SWITCH_GPU_PROFILE, @@ -2735,29 +2735,6 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_PLAYLIST_RUNTIME_PER_CORE, MENU_ENUM_LABEL_VALUE_PLAYLIST_RUNTIME_AGGREGATE, - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD_HMS, - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD_HM, - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD, - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YM, - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HMS, - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HM, - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MD_HM, - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY, - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MD, - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HMS, - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HM, - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMM_HM, - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY, - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMM, - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD_HMS_AM_PM, - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD_HM_AM_PM, - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HMS_AM_PM, - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HM_AM_PM, - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MD_HM_AM_PM, - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HMS_AM_PM, - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HM_AM_PM, - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMM_HM_AM_PM, - MENU_LABEL(HELP_SEND_DEBUG_INFO), MENU_ENUM_LABEL_VALUE_HELP_SEND_DEBUG_INFO_DESC, diff --git a/runtime_file.c b/runtime_file.c index db17eace70..98edd6d4f9 100644 --- a/runtime_file.c +++ b/runtime_file.c @@ -64,14 +64,14 @@ static JSON_Parser_HandlerResult RtlJSONObjectMemberHandler(JSON_Parser parser, { RtlJSONContext *pCtx = (RtlJSONContext*)JSON_Parser_GetUserData(parser); (void)attributes; /* unused */ - + if (pCtx->current_entry_val) { /* something went wrong */ RARCH_ERR("JSON parsing failed at line %d.\n", __LINE__); return JSON_Parser_Abort; } - + if (length) { if (string_is_equal(pValue, "runtime")) @@ -80,7 +80,7 @@ static JSON_Parser_HandlerResult RtlJSONObjectMemberHandler(JSON_Parser parser, pCtx->current_entry_val = &pCtx->last_played_string; /* ignore unknown members */ } - + return JSON_Parser_Continue; } @@ -88,18 +88,18 @@ static JSON_Parser_HandlerResult RtlJSONStringHandler(JSON_Parser parser, char * { RtlJSONContext *pCtx = (RtlJSONContext*)JSON_Parser_GetUserData(parser); (void)attributes; /* unused */ - + if (pCtx->current_entry_val && length && !string_is_empty(pValue)) { if (*pCtx->current_entry_val) free(*pCtx->current_entry_val); - + *pCtx->current_entry_val = strdup(pValue); } /* ignore unknown members */ - + pCtx->current_entry_val = NULL; - + return JSON_Parser_Continue; } @@ -107,7 +107,7 @@ static JSON_Writer_HandlerResult RtlJSONOutputHandler(JSON_Writer writer, const { RtlJSONContext *context = (RtlJSONContext*)JSON_Writer_GetUserData(writer); (void)writer; /* unused */ - + return filestream_write(context->file, pBytes, length) == length ? JSON_Writer_Continue : JSON_Writer_Abort; } @@ -140,50 +140,50 @@ static void runtime_log_read_file(runtime_log_t *runtime_log) unsigned runtime_hours = 0; unsigned runtime_minutes = 0; unsigned runtime_seconds = 0; - + unsigned last_played_year = 0; unsigned last_played_month = 0; unsigned last_played_day = 0; unsigned last_played_hour = 0; unsigned last_played_minute = 0; unsigned last_played_second = 0; - + RtlJSONContext context = {0}; /* Attempt to open log file */ RFILE *file = filestream_open(runtime_log->path, RETRO_VFS_FILE_ACCESS_READ, RETRO_VFS_FILE_ACCESS_HINT_NONE); - + if (!file) { RARCH_ERR("Failed to open runtime log file: %s\n", runtime_log->path); return; } - + /* Initialise JSON parser */ context.runtime_string = NULL; context.last_played_string = NULL; context.parser = JSON_Parser_Create(NULL); context.file = file; - + if (!context.parser) { RARCH_ERR("Failed to create JSON parser.\n"); goto end; } - + /* Configure parser */ JSON_Parser_SetAllowBOM(context.parser, JSON_True); JSON_Parser_SetStringHandler(context.parser, &RtlJSONStringHandler); JSON_Parser_SetObjectMemberHandler(context.parser, &RtlJSONObjectMemberHandler); JSON_Parser_SetUserData(context.parser, &context); - + /* Read file */ while (!filestream_eof(file)) { /* Runtime log files are tiny - use small chunk size */ char chunk[128] = {0}; int64_t length = filestream_read(file, chunk, sizeof(chunk)); - + /* Error checking... */ if (!length && !filestream_eof(file)) { @@ -191,7 +191,7 @@ static void runtime_log_read_file(runtime_log_t *runtime_log) JSON_Parser_Free(context.parser); goto end; } - + /* Parse chunk */ if (!JSON_Parser_Parse(context.parser, chunk, length, JSON_False)) { @@ -201,7 +201,7 @@ static void runtime_log_read_file(runtime_log_t *runtime_log) goto end; } } - + /* Finalise parsing */ if (!JSON_Parser_Parse(context.parser, NULL, 0, JSON_True)) { @@ -210,12 +210,12 @@ static void runtime_log_read_file(runtime_log_t *runtime_log) JSON_Parser_Free(context.parser); goto end; } - + /* Free parser */ JSON_Parser_Free(context.parser); - + /* Process string values read from JSON file */ - + /* Runtime */ if (!string_is_empty(context.runtime_string)) { @@ -226,7 +226,7 @@ static void runtime_log_read_file(runtime_log_t *runtime_log) goto end; } } - + /* Last played */ if (!string_is_empty(context.last_played_string)) { @@ -238,28 +238,28 @@ static void runtime_log_read_file(runtime_log_t *runtime_log) goto end; } } - + /* If we reach this point then all is well * > Assign values to runtime_log object */ runtime_log->runtime.hours = runtime_hours; runtime_log->runtime.minutes = runtime_minutes; runtime_log->runtime.seconds = runtime_seconds; - + runtime_log->last_played.year = last_played_year; runtime_log->last_played.month = last_played_month; runtime_log->last_played.day = last_played_day; runtime_log->last_played.hour = last_played_hour; runtime_log->last_played.minute = last_played_minute; runtime_log->last_played.second = last_played_second; - + end: - + /* Clean up leftover strings */ if (context.runtime_string) free(context.runtime_string); if (context.last_played_string) free(context.last_played_string); - + /* Close log file */ filestream_close(file); } @@ -283,14 +283,14 @@ runtime_log_t *runtime_log_init( core_info_list_t *core_info = NULL; runtime_log_t *runtime_log = NULL; const char *core_path_basename = NULL; - + content_name[0] = '\0'; core_name[0] = '\0'; log_file_dir[0] = '\0'; log_file_path[0] = '\0'; tmp_buf[0] = '\0'; - - if ( string_is_empty(dir_runtime_log) && + + if ( string_is_empty(dir_runtime_log) && string_is_empty(dir_playlist)) { RARCH_ERR("Runtime log directory is undefined - cannot save" @@ -304,21 +304,21 @@ runtime_log_t *runtime_log_init( return NULL; core_path_basename = path_basename(core_path); - - if ( string_is_empty(content_path) || + + if ( string_is_empty(content_path) || string_is_empty(core_path_basename)) return NULL; - + /* Get core name * Note: An annoyance - this is required even when * we are performing aggregate (not per core) logging, * since content name is sometimes dependent upon core * (e.g. see TyrQuake below) */ core_info_get_list(&core_info); - + if (!core_info) return NULL; - + for (i = 0; i < core_info->count; i++) { const char *entry_core_name = core_info->list[i].core_name; @@ -332,10 +332,10 @@ runtime_log_t *runtime_log_init( strlcpy(core_name, entry_core_name, sizeof(core_name)); break; } - + if (string_is_empty(core_name)) return NULL; - + /* Get runtime log directory */ if (string_is_empty(dir_runtime_log)) { @@ -349,10 +349,10 @@ runtime_log_t *runtime_log_init( } else strlcpy(tmp_buf, dir_runtime_log, sizeof(tmp_buf)); - + if (string_is_empty(tmp_buf)) return NULL; - + if (log_per_core) fill_pathname_join( log_file_dir, @@ -361,10 +361,10 @@ runtime_log_t *runtime_log_init( sizeof(log_file_dir)); else strlcpy(log_file_dir, tmp_buf, sizeof(log_file_dir)); - + if (string_is_empty(log_file_dir)) return NULL; - + /* Create directory, if required */ if (!path_is_directory(log_file_dir)) { @@ -375,7 +375,7 @@ runtime_log_t *runtime_log_init( return NULL; } } - + /* Get content name * Note: TyrQuake requires a specific hack, since all * content has the same name... */ @@ -407,14 +407,14 @@ runtime_log_t *runtime_log_init( strlcpy(content_name, tmp_buf_no_ext, sizeof(content_name)); } - + if (string_is_empty(content_name)) return NULL; - + /* Build final log file path */ fill_pathname_join(log_file_path, log_file_dir, content_name, sizeof(log_file_path)); strlcat(log_file_path, file_path_str(FILE_PATH_RUNTIME_EXTENSION), sizeof(log_file_path)); - + if (string_is_empty(log_file_path)) return NULL; @@ -423,25 +423,25 @@ runtime_log_t *runtime_log_init( runtime_log = (runtime_log_t*)calloc(1, sizeof(*runtime_log)); if (!runtime_log) return NULL; - + /* > Populate default values */ runtime_log->runtime.hours = 0; runtime_log->runtime.minutes = 0; runtime_log->runtime.seconds = 0; - + runtime_log->last_played.year = 0; runtime_log->last_played.month = 0; runtime_log->last_played.day = 0; runtime_log->last_played.hour = 0; runtime_log->last_played.minute = 0; runtime_log->last_played.second = 0; - + strlcpy(runtime_log->path, log_file_path, sizeof(runtime_log->path)); - + /* Load existing log file, if it exists */ if (path_is_valid(runtime_log->path)) runtime_log_read_file(runtime_log); - + return runtime_log; } @@ -451,17 +451,17 @@ runtime_log_t *runtime_log_init( void runtime_log_set_runtime_hms(runtime_log_t *runtime_log, unsigned hours, unsigned minutes, unsigned seconds) { retro_time_t usec; - + if (!runtime_log) return; - + /* Converting to usec and back again may be considered a * waste of CPU cycles, but this allows us to handle any * kind of broken input without issue - i.e. user can enter * minutes and seconds values > 59, and everything still * works correctly */ runtime_log_convert_hms2usec(hours, minutes, seconds, &usec); - + runtime_log_convert_usec2hms(usec, &runtime_log->runtime.hours, &runtime_log->runtime.minutes, &runtime_log->runtime.seconds); } @@ -471,7 +471,7 @@ void runtime_log_set_runtime_usec(runtime_log_t *runtime_log, retro_time_t usec) { if (!runtime_log) return; - + runtime_log_convert_usec2hms(usec, &runtime_log->runtime.hours, &runtime_log->runtime.minutes, &runtime_log->runtime.seconds); } @@ -481,16 +481,16 @@ void runtime_log_add_runtime_hms(runtime_log_t *runtime_log, unsigned hours, uns { retro_time_t usec_old; retro_time_t usec_new; - + if (!runtime_log) return; - + runtime_log_convert_hms2usec( runtime_log->runtime.hours, runtime_log->runtime.minutes, runtime_log->runtime.seconds, &usec_old); - + runtime_log_convert_hms2usec(hours, minutes, seconds, &usec_new); - + runtime_log_convert_usec2hms(usec_old + usec_new, &runtime_log->runtime.hours, &runtime_log->runtime.minutes, &runtime_log->runtime.seconds); } @@ -499,14 +499,14 @@ void runtime_log_add_runtime_hms(runtime_log_t *runtime_log, unsigned hours, uns void runtime_log_add_runtime_usec(runtime_log_t *runtime_log, retro_time_t usec) { retro_time_t usec_old; - + if (!runtime_log) return; - + runtime_log_convert_hms2usec( runtime_log->runtime.hours, runtime_log->runtime.minutes, runtime_log->runtime.seconds, &usec_old); - + runtime_log_convert_usec2hms(usec_old + usec, &runtime_log->runtime.hours, &runtime_log->runtime.minutes, &runtime_log->runtime.seconds); } @@ -518,7 +518,7 @@ void runtime_log_set_last_played(runtime_log_t *runtime_log, { if (!runtime_log) return; - + /* This function should never be needed, so just * perform dumb value assignment (i.e. no validation * using mktime()) */ @@ -535,14 +535,14 @@ void runtime_log_set_last_played_now(runtime_log_t *runtime_log) { time_t current_time; struct tm *time_info; - + if (!runtime_log) return; - + /* Get current time */ time(¤t_time); time_info = localtime(¤t_time); - + /* This can actually happen, but if does we probably * have bigger problems to worry about... */ if(!time_info) @@ -550,7 +550,7 @@ void runtime_log_set_last_played_now(runtime_log_t *runtime_log) RARCH_ERR("Failed to get current time.\n"); return; } - + /* Extract values */ runtime_log->last_played.year = (unsigned)time_info->tm_year + 1900; runtime_log->last_played.month = (unsigned)time_info->tm_mon + 1; @@ -565,11 +565,11 @@ void runtime_log_reset(runtime_log_t *runtime_log) { if (!runtime_log) return; - + runtime_log->runtime.hours = 0; runtime_log->runtime.minutes = 0; runtime_log->runtime.seconds = 0; - + runtime_log->last_played.year = 0; runtime_log->last_played.month = 0; runtime_log->last_played.day = 0; @@ -586,7 +586,7 @@ void runtime_log_get_runtime_hms(runtime_log_t *runtime_log, { if (!runtime_log) return; - + *hours = runtime_log->runtime.hours; *minutes = runtime_log->runtime.minutes; *seconds = runtime_log->runtime.seconds; @@ -630,7 +630,7 @@ void runtime_log_get_last_played(runtime_log_t *runtime_log, { if (!runtime_log) return; - + *year = runtime_log->last_played.year; *month = runtime_log->last_played.month; *day = runtime_log->last_played.day; @@ -645,7 +645,7 @@ void runtime_log_get_last_played_time(runtime_log_t *runtime_log, struct tm *tim { if (!runtime_log || !time_info) return; - + /* Set tm values */ time_info->tm_year = (int)runtime_log->last_played.year - 1900; time_info->tm_mon = (int)runtime_log->last_played.month - 1; @@ -654,7 +654,7 @@ void runtime_log_get_last_played_time(runtime_log_t *runtime_log, struct tm *tim time_info->tm_min = (int)runtime_log->last_played.minute; time_info->tm_sec = (int)runtime_log->last_played.second; time_info->tm_isdst = -1; - + /* Perform any required range adjustment + populate * missing entries */ mktime(time_info); @@ -707,43 +707,43 @@ void runtime_log_get_last_played_str(runtime_log_t *runtime_log, * > These require extra work, due to AM/PM localisation */ switch (timedate_style) { - case PLAYLIST_LAST_PLAYED_STYLE_YMD_HMS_AM_PM: - last_played_strftime(runtime_log, tmp, sizeof(tmp), " %Y/%m/%d - %I:%M:%S %p"); + case PLAYLIST_LAST_PLAYED_STYLE_YMD_HMS_AMPM: + last_played_strftime(runtime_log, tmp, sizeof(tmp), " %Y-%m-%d %I:%M:%S %p"); strlcpy(str, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), len); strlcat(str, tmp, len); return; - case PLAYLIST_LAST_PLAYED_STYLE_YMD_HM_AM_PM: - last_played_strftime(runtime_log, tmp, sizeof(tmp), " %Y/%m/%d - %I:%M %p"); + case PLAYLIST_LAST_PLAYED_STYLE_YMD_HM_AMPM: + last_played_strftime(runtime_log, tmp, sizeof(tmp), " %Y-%m-%d %I:%M %p"); strlcpy(str, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), len); strlcat(str, tmp, len); return; - case PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_HMS_AM_PM: - last_played_strftime(runtime_log, tmp, sizeof(tmp), " %m/%d/%Y - %I:%M:%S %p"); + case PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_HMS_AMPM: + last_played_strftime(runtime_log, tmp, sizeof(tmp), " %m-%d-%Y %I:%M:%S %p"); strlcpy(str, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), len); strlcat(str, tmp, len); return; - case PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_HM_AM_PM: - last_played_strftime(runtime_log, tmp, sizeof(tmp), " %m/%d/%Y - %I:%M %p"); + case PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_HM_AMPM: + last_played_strftime(runtime_log, tmp, sizeof(tmp), " %m-%d-%Y %I:%M %p"); strlcpy(str, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), len); strlcat(str, tmp, len); return; - case PLAYLIST_LAST_PLAYED_STYLE_MD_HM_AM_PM: - last_played_strftime(runtime_log, tmp, sizeof(tmp), " %m/%d - %I:%M %p"); + case PLAYLIST_LAST_PLAYED_STYLE_MD_HM_AMPM: + last_played_strftime(runtime_log, tmp, sizeof(tmp), " %m-%d %I:%M %p"); strlcpy(str, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), len); strlcat(str, tmp, len); return; - case PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY_HMS_AM_PM: - last_played_strftime(runtime_log, tmp, sizeof(tmp), " %d/%m/%Y - %I:%M:%S %p"); + case PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY_HMS_AMPM: + last_played_strftime(runtime_log, tmp, sizeof(tmp), " %d-%m-%Y %I:%M:%S %p"); strlcpy(str, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), len); strlcat(str, tmp, len); return; - case PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY_HM_AM_PM: - last_played_strftime(runtime_log, tmp, sizeof(tmp), " %d/%m/%Y - %I:%M %p"); + case PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY_HM_AMPM: + last_played_strftime(runtime_log, tmp, sizeof(tmp), " %d-%m-%Y %I:%M %p"); strlcpy(str, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), len); strlcat(str, tmp, len); return; - case PLAYLIST_LAST_PLAYED_STYLE_DDMM_HM_AM_PM: - last_played_strftime(runtime_log, tmp, sizeof(tmp), " %d/%m - %I:%M %p"); + case PLAYLIST_LAST_PLAYED_STYLE_DDMM_HM_AMPM: + last_played_strftime(runtime_log, tmp, sizeof(tmp), " %d-%m %I:%M %p"); strlcpy(str, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), len); strlcat(str, tmp, len); return; @@ -755,80 +755,80 @@ void runtime_log_get_last_played_str(runtime_log_t *runtime_log, switch (timedate_style) { case PLAYLIST_LAST_PLAYED_STYLE_YMD_HM: - n = snprintf(str, len, "%s %04u/%02u/%02u - %02u:%02u", + n = snprintf(str, len, "%s %04u-%02u-%02u %02u:%02u", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), runtime_log->last_played.year, runtime_log->last_played.month, runtime_log->last_played.day, runtime_log->last_played.hour, runtime_log->last_played.minute); return; case PLAYLIST_LAST_PLAYED_STYLE_YMD: - n = snprintf(str, len, "%s %04u/%02u/%02u", + n = snprintf(str, len, "%s %04u-%02u-%02u", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), runtime_log->last_played.year, runtime_log->last_played.month, runtime_log->last_played.day); return; case PLAYLIST_LAST_PLAYED_STYLE_YM: - n = snprintf(str, len, "%s %04u/%02u", + n = snprintf(str, len, "%s %04u-%02u", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), runtime_log->last_played.year, runtime_log->last_played.month); return; case PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_HMS: - n = snprintf(str, len, "%s %02u/%02u/%04u - %02u:%02u:%02u", + n = snprintf(str, len, "%s %02u-%02u-%04u %02u:%02u:%02u", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), runtime_log->last_played.month, runtime_log->last_played.day, runtime_log->last_played.year, runtime_log->last_played.hour, runtime_log->last_played.minute, runtime_log->last_played.second); return; case PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_HM: - n = snprintf(str, len, "%s %02u/%02u/%04u - %02u:%02u", + n = snprintf(str, len, "%s %02u-%02u-%04u %02u:%02u", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), runtime_log->last_played.month, runtime_log->last_played.day, runtime_log->last_played.year, runtime_log->last_played.hour, runtime_log->last_played.minute); return; case PLAYLIST_LAST_PLAYED_STYLE_MD_HM: - n = snprintf(str, len, "%s %02u/%02u - %02u:%02u", + n = snprintf(str, len, "%s %02u-%02u %02u:%02u", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), runtime_log->last_played.month, runtime_log->last_played.day, runtime_log->last_played.hour, runtime_log->last_played.minute); return; case PLAYLIST_LAST_PLAYED_STYLE_MDYYYY: - n = snprintf(str, len, "%s %02u/%02u/%04u", + n = snprintf(str, len, "%s %02u-%02u-%04u", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), runtime_log->last_played.month, runtime_log->last_played.day, runtime_log->last_played.year); return; case PLAYLIST_LAST_PLAYED_STYLE_MD: - n = snprintf(str, len, "%s %02u/%02u", + n = snprintf(str, len, "%s %02u-%02u", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), runtime_log->last_played.month, runtime_log->last_played.day); return; case PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY_HMS: - n = snprintf(str, len, "%s %02u/%02u/%04u - %02u:%02u:%02u", + n = snprintf(str, len, "%s %02u-%02u-%04u %02u:%02u:%02u", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), runtime_log->last_played.day, runtime_log->last_played.month, runtime_log->last_played.year, runtime_log->last_played.hour, runtime_log->last_played.minute, runtime_log->last_played.second); return; case PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY_HM: - n = snprintf(str, len, "%s %02u/%02u/%04u - %02u:%02u", + n = snprintf(str, len, "%s %02u-%02u-%04u %02u:%02u", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), runtime_log->last_played.day, runtime_log->last_played.month, runtime_log->last_played.year, runtime_log->last_played.hour, runtime_log->last_played.minute); return; case PLAYLIST_LAST_PLAYED_STYLE_DDMM_HM: - n = snprintf(str, len, "%s %02u/%02u - %02u:%02u", + n = snprintf(str, len, "%s %02u-%02u %02u:%02u", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), runtime_log->last_played.day, runtime_log->last_played.month, runtime_log->last_played.hour, runtime_log->last_played.minute); return; case PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY: - n = snprintf(str, len, "%s %02u/%02u/%04u", + n = snprintf(str, len, "%s %02u-%02u-%04u", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), runtime_log->last_played.day, runtime_log->last_played.month, runtime_log->last_played.year); return; case PLAYLIST_LAST_PLAYED_STYLE_DDMM: - n = snprintf(str, len, "%s %02u/%02u", + n = snprintf(str, len, "%s %02u-%02u", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), runtime_log->last_played.day, runtime_log->last_played.month); return; case PLAYLIST_LAST_PLAYED_STYLE_YMD_HMS: default: - n = snprintf(str, len, "%s %04u/%02u/%02u - %02u:%02u:%02u", + n = snprintf(str, len, "%s %04u-%02u-%02u %02u:%02u:%02u", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), runtime_log->last_played.year, runtime_log->last_played.month, runtime_log->last_played.day, runtime_log->last_played.hour, runtime_log->last_played.minute, runtime_log->last_played.second); @@ -854,7 +854,7 @@ bool runtime_log_has_runtime(runtime_log_t *runtime_log) { if (!runtime_log) return false; - + return !((runtime_log->runtime.hours == 0) && (runtime_log->runtime.minutes == 0) && (runtime_log->runtime.seconds == 0)); @@ -865,7 +865,7 @@ bool runtime_log_has_last_played(runtime_log_t *runtime_log) { if (!runtime_log) return false; - + return !((runtime_log->last_played.year == 0) && (runtime_log->last_played.month == 0) && (runtime_log->last_played.day == 0) && @@ -880,45 +880,45 @@ bool runtime_log_has_last_played(runtime_log_t *runtime_log) void runtime_log_save(runtime_log_t *runtime_log) { int n; - char value_string[64]; /* 64 characters should be + char value_string[64]; /* 64 characters should be enough for a very long runtime... :) */ RtlJSONContext context = {0}; RFILE *file = NULL; - + if (!runtime_log) return; - + RARCH_LOG("Saving runtime log file: %s\n", runtime_log->path); - + /* Attempt to open log file */ file = filestream_open(runtime_log->path, RETRO_VFS_FILE_ACCESS_WRITE, RETRO_VFS_FILE_ACCESS_HINT_NONE); - + if (!file) { RARCH_ERR("Failed to open runtime log file: %s\n", runtime_log->path); return; } - + /* Initialise JSON writer */ context.writer = JSON_Writer_Create(NULL); context.file = file; - + if (!context.writer) { RARCH_ERR("Failed to create JSON writer.\n"); goto end; } - + /* Configure JSON writer */ JSON_Writer_SetOutputEncoding(context.writer, JSON_UTF8); JSON_Writer_SetOutputHandler(context.writer, &RtlJSONOutputHandler); JSON_Writer_SetUserData(context.writer, &context); - + /* Write output file */ JSON_Writer_WriteStartObject(context.writer); JSON_Writer_WriteNewLine(context.writer); - + /* > Version entry */ JSON_Writer_WriteSpace(context.writer, 2); JSON_Writer_WriteString(context.writer, "version", @@ -929,7 +929,7 @@ void runtime_log_save(runtime_log_t *runtime_log) STRLEN_CONST("1.0"), JSON_UTF8); JSON_Writer_WriteComma(context.writer); JSON_Writer_WriteNewLine(context.writer); - + /* > Runtime entry */ value_string[0] = '\0'; n = snprintf(value_string, @@ -938,7 +938,7 @@ void runtime_log_save(runtime_log_t *runtime_log) runtime_log->runtime.seconds); if ((n < 0) || (n >= 64)) n = 0; /* Silence GCC warnings... */ - + JSON_Writer_WriteSpace(context.writer, 2); JSON_Writer_WriteString(context.writer, "runtime", STRLEN_CONST("runtime"), JSON_UTF8); @@ -948,7 +948,7 @@ void runtime_log_save(runtime_log_t *runtime_log) strlen(value_string), JSON_UTF8); JSON_Writer_WriteComma(context.writer); JSON_Writer_WriteNewLine(context.writer); - + /* > Last played entry */ value_string[0] = '\0'; n = snprintf(value_string, sizeof(value_string), @@ -959,7 +959,7 @@ void runtime_log_save(runtime_log_t *runtime_log) runtime_log->last_played.second); if ((n < 0) || (n >= 64)) n = 0; /* Silence GCC warnings... */ - + JSON_Writer_WriteSpace(context.writer, 2); JSON_Writer_WriteString(context.writer, "last_played", STRLEN_CONST("last_played"), JSON_UTF8); @@ -968,14 +968,14 @@ void runtime_log_save(runtime_log_t *runtime_log) JSON_Writer_WriteString(context.writer, value_string, strlen(value_string), JSON_UTF8); JSON_Writer_WriteNewLine(context.writer); - + /* > Finalise */ JSON_Writer_WriteEndObject(context.writer); JSON_Writer_WriteNewLine(context.writer); - + /* Free JSON writer */ JSON_Writer_Free(context.writer); - + end: /* Close log file */ filestream_close(file); @@ -999,7 +999,7 @@ void runtime_log_convert_usec2hms(retro_time_t usec, *seconds = (unsigned)(usec / 1000000); *minutes = *seconds / 60; *hours = *minutes / 60; - + *seconds -= *minutes * 60; *minutes -= *hours * 60; } @@ -1023,27 +1023,27 @@ void runtime_update_playlist( #if defined(HAVE_MENU) && (defined(HAVE_OZONE) || defined(HAVE_MATERIALUI)) const char *menu_ident = menu_driver_ident(); #endif - + /* Sanity check */ if (!playlist) return; - + if (idx >= playlist_get_size(playlist)) return; - + /* Set fallback playlist 'runtime_status' * (saves 'if' checks later...) */ update_entry.runtime_status = PLAYLIST_RUNTIME_MISSING; - + /* 'Attach' runtime/last played strings */ runtime_str[0] = '\0'; last_played_str[0] = '\0'; update_entry.runtime_str = runtime_str; update_entry.last_played_str = last_played_str; - + /* Read current playlist entry */ playlist_get_index(playlist, idx, &entry); - + /* Attempt to open log file */ runtime_log = runtime_log_init( entry->path, @@ -1051,7 +1051,7 @@ void runtime_update_playlist( dir_runtime_log, dir_playlist, log_per_core); - + if (runtime_log) { /* Check whether a non-zero runtime has been recorded */ @@ -1060,24 +1060,24 @@ void runtime_update_playlist( /* Read current runtime */ runtime_log_get_runtime_hms(runtime_log, &update_entry.runtime_hours, &update_entry.runtime_minutes, &update_entry.runtime_seconds); - + runtime_log_get_runtime_str(runtime_log, runtime_str, sizeof(runtime_str)); - + /* Read last played timestamp */ runtime_log_get_last_played(runtime_log, &update_entry.last_played_year, &update_entry.last_played_month, &update_entry.last_played_day, &update_entry.last_played_hour, &update_entry.last_played_minute, &update_entry.last_played_second); - + runtime_log_get_last_played_str(runtime_log, last_played_str, sizeof(last_played_str), timedate_style); - + /* Playlist entry now contains valid runtime data */ update_entry.runtime_status = PLAYLIST_RUNTIME_VALID; } - + /* Clean up */ free(runtime_log); } - + #if defined(HAVE_MENU) && (defined(HAVE_OZONE) || defined(HAVE_MATERIALUI)) /* Ozone and GLUI require runtime/last played strings * to be populated even when no runtime is recorded */ @@ -1095,7 +1095,7 @@ void runtime_update_playlist( } } #endif - + /* Update playlist */ playlist_update_runtime(playlist, idx, &update_entry, false); } diff --git a/runtime_file.h b/runtime_file.h index 3733085456..2f396c72a8 100644 --- a/runtime_file.h +++ b/runtime_file.h @@ -73,14 +73,14 @@ enum playlist_sublabel_last_played_style_type PLAYLIST_LAST_PLAYED_STYLE_DDMM_HM, PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY, PLAYLIST_LAST_PLAYED_STYLE_DDMM, - PLAYLIST_LAST_PLAYED_STYLE_YMD_HMS_AM_PM, - PLAYLIST_LAST_PLAYED_STYLE_YMD_HM_AM_PM, - PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_HMS_AM_PM, - PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_HM_AM_PM, - PLAYLIST_LAST_PLAYED_STYLE_MD_HM_AM_PM, - PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY_HMS_AM_PM, - PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY_HM_AM_PM, - PLAYLIST_LAST_PLAYED_STYLE_DDMM_HM_AM_PM, + PLAYLIST_LAST_PLAYED_STYLE_YMD_HMS_AMPM, + PLAYLIST_LAST_PLAYED_STYLE_YMD_HM_AMPM, + PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_HMS_AMPM, + PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_HM_AMPM, + PLAYLIST_LAST_PLAYED_STYLE_MD_HM_AMPM, + PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY_HMS_AMPM, + PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY_HM_AMPM, + PLAYLIST_LAST_PLAYED_STYLE_DDMM_HM_AMPM, PLAYLIST_LAST_PLAYED_STYLE_LAST };