From 8795b43db356adc056f875ac0e25c2d55e611a4b Mon Sep 17 00:00:00 2001 From: hippydave Date: Mon, 8 Jul 2019 23:17:35 +0100 Subject: [PATCH] UnStar -> Unstar, remove duplicate language strings --- common/language.c | 16 ++-------------- common/language.h | 2 +- common/menu.c | 4 ++-- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/common/language.c b/common/language.c index f8a95bb..4780c88 100644 --- a/common/language.c +++ b/common/language.c @@ -334,23 +334,11 @@ const char* const g_strings[StrId_Max][16] = [StrId_Actions_Star] = { STR_EN("Star"), - STR_FR("Star"), - STR_DE("Star"), - STR_ES("Star"), - STR_JP("Star"), - STR_KO("Star"), - STR_TW("Star"), }, - [StrId_Actions_UnStar] = + [StrId_Actions_Unstar] = { - STR_EN("UnStar"), - STR_FR("UnStar"), - STR_DE("UnStar"), - STR_ES("UnStar"), - STR_JP("UnStar"), - STR_KO("UnStar"), - STR_TW("UnStar"), + STR_EN("Unstar"), }, [StrId_ThemeMenu] = diff --git a/common/language.h b/common/language.h index 8bf1f34..1604f3d 100644 --- a/common/language.h +++ b/common/language.h @@ -24,7 +24,7 @@ typedef enum StrId_Actions_Back, StrId_Actions_Apply, StrId_Actions_Star, - StrId_Actions_UnStar, + StrId_Actions_Unstar, StrId_MsgBox_OK, diff --git a/common/menu.c b/common/menu.c index c1dabc7..d5becbf 100644 --- a/common/menu.c +++ b/common/menu.c @@ -725,10 +725,10 @@ void menuLoop(void) { drawButtons(menu, false, &menupath_x_endpos); if(active_entry != NULL && active_entry->type != ENTRY_TYPE_THEME) { - getX = GetTextXCoordinate(interuiregular18, menupath_x_endpos - 32, textGetString(StrId_Actions_UnStar), 'r'); + getX = GetTextXCoordinate(interuiregular18, menupath_x_endpos - 32, textGetString(StrId_Actions_Unstar), 'r'); DrawText(fontscale7, getX - 36, 720 - 47 + 24, themeCurrent.textColor, themeCurrent.buttonXText); if (active_entry->starred) { - DrawText(interuiregular18, getX, 720 - 47 + 24, themeCurrent.textColor, textGetString(StrId_Actions_UnStar)); + DrawText(interuiregular18, getX, 720 - 47 + 24, themeCurrent.textColor, textGetString(StrId_Actions_Unstar)); } else { DrawText(interuiregular18, getX, 720 - 47 + 24, themeCurrent.textColor, textGetString(StrId_Actions_Star)); }