diff --git a/apps/bookmark.c b/apps/bookmark.c index 2411ddb0ee..3087b7302b 100644 --- a/apps/bookmark.c +++ b/apps/bookmark.c @@ -975,7 +975,7 @@ static int select_bookmark(const char* bookmark_file_name, { MENUITEM_STRINGLIST(menu_items, ID2P(LANG_BOOKMARK_CONTEXT_MENU), NULL, ID2P(LANG_BOOKMARK_CONTEXT_RESUME), - ID2P(LANG_BOOKMARK_CONTEXT_DELETE)); + ID2P(LANG_DELETE)); static const int menu_actions[] = { ACTION_STD_OK, ACTION_BMS_DELETE @@ -1295,7 +1295,7 @@ bool bookmark_exists(void) char* name = playlist_get_name(NULL, global_temp_buffer, sizeof(global_temp_buffer)); - if (!playlist_dynamic_only() && + if (!playlist_dynamic_only() && generate_bookmark_file_name(bm_filename, sizeof(bm_filename), name, -1)) { exist = file_exists(bm_filename); diff --git a/apps/lang/english-us.lang b/apps/lang/english-us.lang index 158978a186..a5e8c7e8b9 100644 --- a/apps/lang/english-us.lang +++ b/apps/lang/english-us.lang @@ -535,20 +535,6 @@ *: "Resume" - - id: LANG_BOOKMARK_CONTEXT_DELETE - desc: bookmark context menu, delete this bookmark - user: core - - *: "Delete" - - - *: "Delete" - - - *: "Delete" - - id: LANG_AUTO_BOOKMARK_QUERY desc: prompt for user to decide to create an bookmark @@ -4057,23 +4043,6 @@ alarm: "Waking up in" - - id: LANG_ALARM_MOD_SHUTDOWN - desc: The text that tells the user that the alarm time is ok and the device shuts off (for the RTC alarm mod). - user: core - - *: none - alarm: "Alarm Set" - - - *: none - alarm: "Alarm Set" - - - *: none - alarm: "Alarm set" - - id: LANG_ALARM_MOD_ERROR desc: The text that tells that the time is incorrect (for the RTC alarm mod). @@ -5288,23 +5257,6 @@ recording: "Pre-Record time" - - id: LANG_RECORD_DIRECTORY - desc: in recording settings_menu - user: core - - *: none - recording: "Directory" - - - *: none - recording: "Directory" - - - *: none - recording: "Directory" - - id: LANG_CLEAR_REC_DIR desc: @@ -6248,20 +6200,6 @@ *: "Reshuffle" - - id: LANG_CATALOG_VIEW - desc: in onplay playlist catalogue submenu - user: core - - *: "View Catalogue" - - - *: "View Catalog" - - - *: "View Catalog" - - id: LANG_CATALOG_ADD_TO_NEW desc: in onplay playlist catalogue submenu @@ -7022,20 +6960,6 @@ *: "Nothing to resume" - - id: LANG_PLAYLIST_CONTROL_UPDATE_ERROR - desc: Playlist error - user: core - - *: "Error updating playlist control file" - - - *: "Error updating playlist control file" - - - *: "Error updating playlist control file" - - id: LANG_PLAYLIST_ACCESS_ERROR desc: Playlist error @@ -7221,23 +7145,6 @@ iaudiom5,iaudiox5,iriverh100,iriverh120,iriverh300,recording,samsungyh*,sansac200*,sansae200*,vibe500: "" - - id: LANG_DB_INF - desc: -inf db for values below measurement - user: core - - *: none - recording: "-inf" - - - *: none - recording: "-inf" - - - *: none - recording: "minus infinity" - - id: LANG_BOOT_CHANGED desc: File browser discovered the boot file was changed @@ -7463,23 +7370,6 @@ charging: "Battery: Charging" - - id: LANG_BATTERY_TRICKLE_CHARGE - desc: in info display, shows that trickle charge is running - user: core - - *: none - charging: "Battery: Trickle Chg" - - - *: none - charging: "Battery: Trickle Chg" - - - *: none - charging: "Trickle charge" - - id: LANG_WARNING_BATTERY_LOW desc: general warning @@ -10411,20 +10301,6 @@ *: "Scrollbar width" - - id: LANG_SCROLLBAR_POSITION - desc: in Settings -> General -> Display -> Status-/Scrollbar - user: core - - *: "Scroll Bar Position" - - - *: "Scrollbar Position" - - - *: "Scrollbar position" - - id: LANG_COMPRESSOR desc: in sound settings @@ -10700,20 +10576,6 @@ *: "Skip to Outro" - - id: LANG_STATUSBAR_CUSTOM - desc: if this translation is compatible with LANG_CHANNEL_CUSTOM, then please use the same translation. it can be combined later then - user: core - - *: "Custom" - - - *: "Custom" - - - *: "Custom" - - id: VOICE_EXT_SBS desc: spoken only, for file extension @@ -12632,20 +12494,6 @@ *: "Moving track" - - id: LANG_NO_VIEWERS - desc: text for splash to indicate that no viewers are available - user: core - - *: "No viewers found" - - - *: "No viewers found" - - - *: "No viewers found" - - id: LANG_NEVER desc: in lcd settings @@ -14889,34 +14737,6 @@ *: "Cache will be rebuilt on next restart" - - id: LANG_PLAYLIST_CLEARED - desc: in the pictureflow splash messages - user: core - - *: "Playlist Cleared" - - - *: "Playlist Cleared" - - - *: "Playlist Cleared" - - - - id: LANG_ADDED_TO_PLAYLIST - desc: in the pictureflow splash messages - user: core - - *: "Added to playlist" - - - *: "Added to playlist" - - - *: "Added to playlist" - - id: LANG_ERROR_WRITING_CONFIG desc: in the pictureflow splash messages diff --git a/apps/lang/english.lang b/apps/lang/english.lang index c6e0a9ec61..6c09aa3d40 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang @@ -611,20 +611,6 @@ *: "Resume" - - id: LANG_BOOKMARK_CONTEXT_DELETE - desc: bookmark context menu, delete this bookmark - user: core - - *: "Delete" - - - *: "Delete" - - - *: "Delete" - - id: LANG_AUTO_BOOKMARK_QUERY desc: prompt for user to decide to create an bookmark @@ -4133,23 +4119,6 @@ alarm: "Waking up in" - - id: LANG_ALARM_MOD_SHUTDOWN - desc: The text that tells the user that the alarm time is ok and the device shuts off (for the RTC alarm mod). - user: core - - *: none - alarm: "Alarm Set" - - - *: none - alarm: "Alarm Set" - - - *: none - alarm: "Alarm set" - - id: LANG_ALARM_MOD_ERROR desc: The text that tells that the time is incorrect (for the RTC alarm mod). @@ -5364,23 +5333,6 @@ recording: "Pre-Record time" - - id: LANG_RECORD_DIRECTORY - desc: in recording settings_menu - user: core - - *: none - recording: "Directory" - - - *: none - recording: "Directory" - - - *: none - recording: "Directory" - - id: LANG_CLEAR_REC_DIR desc: @@ -6324,20 +6276,6 @@ *: "Reshuffle" - - id: LANG_CATALOG_VIEW - desc: in onplay playlist catalogue submenu - user: core - - *: "View Catalogue" - - - *: "View Catalogue" - - - *: "View Catalogue" - - id: LANG_CATALOG_ADD_TO_NEW desc: in onplay playlist catalogue submenu @@ -7098,20 +7036,6 @@ *: "Nothing to resume" - - id: LANG_PLAYLIST_CONTROL_UPDATE_ERROR - desc: Playlist error - user: core - - *: "Error updating playlist control file" - - - *: "Error updating playlist control file" - - - *: "Error updating playlist control file" - - id: LANG_PLAYLIST_ACCESS_ERROR desc: Playlist error @@ -7297,23 +7221,6 @@ iaudiom5,iaudiox5,iriverh100,iriverh120,iriverh300,recording,samsungyh*,sansac200*,sansae200*,vibe500: "" - - id: LANG_DB_INF - desc: -inf db for values below measurement - user: core - - *: none - recording: "-inf" - - - *: none - recording: "-inf" - - - *: none - recording: "minus infinity" - - id: LANG_BOOT_CHANGED desc: File browser discovered the boot file was changed @@ -7539,23 +7446,6 @@ charging: "Battery: Charging" - - id: LANG_BATTERY_TRICKLE_CHARGE - desc: in info display, shows that trickle charge is running - user: core - - *: none - charging: "Battery: Trickle Chg" - - - *: none - charging: "Battery: Trickle Chg" - - - *: none - charging: "Trickle charge" - - id: LANG_WARNING_BATTERY_LOW desc: general warning @@ -10487,20 +10377,6 @@ *: "Scroll bar width" - - id: LANG_SCROLLBAR_POSITION - desc: in Settings -> General -> Display -> Status-/Scrollbar - user: core - - *: "Scroll Bar Position" - - - *: "Scroll Bar Position" - - - *: "Scroll bar position" - - id: LANG_COMPRESSOR desc: in sound settings @@ -10776,20 +10652,6 @@ *: "Skip to Outro" - - id: LANG_STATUSBAR_CUSTOM - desc: if this translation is compatible with LANG_CHANNEL_CUSTOM, then please use the same translation. it can be combined later then - user: core - - *: "Custom" - - - *: "Custom" - - - *: "Custom" - - id: VOICE_EXT_SBS desc: spoken only, for file extension @@ -12708,20 +12570,6 @@ *: "Moving track" - - id: LANG_NO_VIEWERS - desc: text for splash to indicate that no viewers are available - user: core - - *: "No viewers found" - - - *: "No viewers found" - - - *: "No viewers found" - - id: LANG_NEVER desc: in lcd settings @@ -14965,34 +14813,6 @@ *: "Cache will be rebuilt on next restart" - - id: LANG_PLAYLIST_CLEARED - desc: in the pictureflow splash messages - user: core - - *: "Playlist Cleared" - - - *: "Playlist Cleared" - - - *: "Playlist Cleared" - - - - id: LANG_ADDED_TO_PLAYLIST - desc: in the pictureflow splash messages - user: core - - *: "Added to playlist" - - - *: "Added to playlist" - - - *: "Added to playlist" - - id: LANG_ERROR_WRITING_CONFIG desc: in the pictureflow splash messages