Merge branch 'solosky:develop' into develop

Author: James-Makoto

docs/en/05+5-translation.md

@@ -63,7 +63,7 @@ In this example, we will add a Japanese (ja_JP) translation:
 
    `ja: '日本語',`
 
-3. Edit `index.js` while keeping its current structure, adding:
+3. Edit `web/src/i18n/index.js` while keeping its current structure, adding:
 
    ```js
    import elementJaLocale from 'element-ui/lib/locale/lang/ja' // element-ui

fw/application/Makefile

@@ -305,6 +305,7 @@ SRC_FILES += \
   $(PROJ_DIR)/i18n/nl_NL.c \
   $(PROJ_DIR)/i18n/pt_BR.c \
   $(PROJ_DIR)/i18n/pt_PT.c \
+  $(PROJ_DIR)/i18n/ru_RU.c \
   $(PROJ_DIR)/i18n/language.c \
   $(PROJ_DIR)/hal/hal_nfc_t2t.c \
   $(PROJ_DIR)/amiidb/db_amiibo.c \

fw/application/src/app/amiibo/scene/amiibo_scene_amiibo_detail_menu.c

@@ -125,16 +125,11 @@ static void amiibo_scene_amiibo_detail_menu_on_selected(mui_list_view_event_t ev
             amiibo_scene_amiibo_detail_no_key_msg(app);
             return;
         }
-        char txt[32];
         settings_data_t *p_settings = settings_get_data();
         p_settings->auto_gen_amiibo = !p_settings->auto_gen_amiibo;
-        snprintf(txt, sizeof(txt), "%s [%s]", getLangString(_L_AUTO_RANDOM_GENERATION),
-                 p_settings->auto_gen_amiibo ? getLangString(_L_ON) : getLangString(_L_OFF));
         settings_save();
 
-        string_set_str(p_item->text, txt);
-
-        mui_scene_dispatcher_previous_scene(app->p_scene_dispatcher);
+        mui_list_view_item_set_sub_text(p_item, (p_settings->auto_gen_amiibo ? getLangString(_L_ON_F) : getLangString(_L_OFF_F)));
     } break;
 
     case AMIIBO_DETAIL_MENU_REMOVE_AMIIBO: {
@@ -160,13 +155,11 @@ void amiibo_scene_amiibo_detail_menu_on_enter(void *user_data) {
 
     mui_list_view_add_item(app->p_list_view, 0xe1c5, getLangString(_L_RANDOM_GENERATION),
                            (void *)AMIIBO_DETAIL_MENU_RAND_UID);
-
-    char txt[32];
     settings_data_t *p_settings = settings_get_data();
 
-    snprintf(txt, sizeof(txt), "%s [%s]", getLangString(_L_AUTO_RANDOM_GENERATION),
-             p_settings->auto_gen_amiibo ? getLangString(_L_ON) : getLangString(_L_OFF));
-    mui_list_view_add_item(app->p_list_view, 0xe1c6, txt, (void *)AMIIBO_DETAIL_MENU_AUTO_RAND_UID);
+    mui_list_view_add_item_ext(app->p_list_view, 0xe1c6, getLangString(_L_AUTO_RANDOM_GENERATION), 
+     (p_settings->auto_gen_amiibo ? getLangString(_L_ON_F) : getLangString(_L_OFF_F)), 
+     (void *)AMIIBO_DETAIL_MENU_AUTO_RAND_UID);
     mui_list_view_add_item(app->p_list_view, 0xe1c7, getLangString(_L_DELETE_TAG),
                            (void *)AMIIBO_DETAIL_MENU_REMOVE_AMIIBO);
     mui_list_view_add_item(app->p_list_view, 0xe068, getLangString(_L_BACK_TO_DETAILS),

fw/application/src/app/amiibo/scene/amiibo_scene_file_browser_menu.c

@@ -255,7 +255,7 @@ static void amiibo_scene_file_browser_menu_on_selected(mui_list_view_event_t eve
 
     case FILE_BROWSER_MENU_REMOVE_FOLDER: {
         char msg[64];
-        snprintf(msg, sizeof(msg), "%s %s ?", getLangString(_L_DELETE), string_get_cstr(app->current_file));
+        snprintf(msg, sizeof(msg), _T(DELETE_FILE), string_get_cstr(app->current_file));
         mui_msg_box_set_header(app->p_msg_box, getLangString(_L_DELETE));
         mui_msg_box_set_message(app->p_msg_box, msg);
         mui_msg_box_set_btn_text(app->p_msg_box, getLangString(_L_DELETE), NULL, getLangString(_L_CANCEL));
@@ -298,9 +298,9 @@ void amiibo_scene_file_browser_menu_on_enter(void *user_data) {
                            (void *)FILE_BROWSER_MENU_CREATE_AMIIBO_BATCH);
     if (string_cmp_str(app->current_file, "..") != 0) {
         char txt[32];
-        snprintf(txt, sizeof(txt), "%s..", getLangString(_L_RENAME));
+        snprintf(txt, sizeof(txt), "%s", getLangString(_L_RENAME));
         mui_list_view_add_item(app->p_list_view, ICON_EMPTY, txt, (void *)FILE_BROWSER_MENU_RENAME_FOLDER);
-        snprintf(txt, sizeof(txt), "%s..", getLangString(_L_DELETE));
+        snprintf(txt, sizeof(txt), "%s", getLangString(_L_DELETE));
         mui_list_view_add_item(app->p_list_view, ICON_DELETE, txt, (void *)FILE_BROWSER_MENU_REMOVE_FOLDER);
     }
     mui_list_view_add_item(app->p_list_view, ICON_BACK, getLangString(_L_BACK_TO_FILE_LIST),

fw/application/src/app/amiidb/scene/amiidb_scene_amiibo_search.c

@@ -23,6 +23,21 @@ static void amiidb_scene_amiibo_search_text_input_event_cb(mui_text_input_event_
     }
 }
 
+static void amiidb_msg_box_error_cb(mui_msg_box_event_t event, mui_msg_box_t *p_msg_box) {
+    app_amiidb_t *app = p_msg_box->user_data;
+    mui_view_dispatcher_switch_to_view(app->p_view_dispatcher, AMIIDB_VIEW_ID_LIST);
+}
+
+static void amiidb_show_message(app_amiidb_t *app, const char *msg) {
+    mui_msg_box_set_header(app->p_msg_box, getLangString(_L_ERR));
+    mui_msg_box_set_message(app->p_msg_box, msg);
+    mui_msg_box_set_btn_text(app->p_msg_box, NULL, getLangString(_L_KNOW), NULL);
+    mui_msg_box_set_btn_focus(app->p_msg_box, 1);
+    mui_msg_box_set_event_cb(app->p_msg_box, amiidb_msg_box_error_cb);
+
+    mui_view_dispatcher_switch_to_view(app->p_view_dispatcher, AMIIDB_VIEW_ID_MSG_BOX);
+}
+
 static void amiidb_scene_amiibo_search_list_view_on_selected(mui_list_view_event_t event, mui_list_view_t *p_list_view,
                                                              mui_list_item_t *p_item) {
     uint16_t icon = p_item->icon;
@@ -49,6 +64,10 @@ static void amiidb_scene_amiibo_search_list_view_on_selected(mui_list_view_event
         mui_text_input_set_event_cb(app->p_text_input, amiidb_scene_amiibo_search_text_input_event_cb);
         mui_view_dispatcher_switch_to_view(app->p_view_dispatcher, AMIIDB_VIEW_ID_INPUT);
     } break;
+
+    case ICON_ERROR: {
+        amiidb_show_message(app, _T(APP_AMIIDB_MORE_MESSAGE));
+    } break;
     }
 }
 

fw/application/src/i18n/de_DE.c

@@ -51,7 +51,7 @@ const char * const lang_de_DE[_L_COUNT] = {
     [_L_FORMAT] = "Formatieren",
     [_L_FORMAT_STORAGE] = "Speicher formatieren",
     [_L_DELETE_ALL_DATA] = "Alle Daten löschen?",
-    [_L_DELETING_MESSAGE] = "Formatiere..",
+    [_L_DELETING_MESSAGE] = "Formatiere...",
     [_L_MESSAGE] = "Meldung",
     [_L_CONFIRM] = "Bestätigen",
     [_L_CANCEL] = "Abbrechen",
@@ -65,17 +65,18 @@ const char * const lang_de_DE[_L_COUNT] = {
     [_L_READ_FILE_FAILED] = "Lesen fehlgeschlagen",
     [_L_INPUT_FOLDER_NAME] = "Ordnername eingeben:",
     [_L_INPUT_AMIIBO_NAME] = "Amiibo Namen eingeben:",
-    [_L_DELETE] = "Löschen",
+    [_L_DELETE_FILE] = "%s löschen ?",
+    [_L_DELETE] = "Löschen...",
     [_L_INPUT_NEW_NAME] = "Neuen Namen eingeben:",
     [_L_INVALID_INPUT] = "Ungültige Eingabe",
-    [_L_CREATE_NEW_FOLDER] = "Neuer Ordner..",
-    [_L_CREATE_NEW_TAG] = "Neuer Tag..",
-    [_L_CREATE_NEW_TAG_BATCH] = "Mehrere Tags erstellen..",
+    [_L_CREATE_NEW_FOLDER] = "Neuer Ordner...",
+    [_L_CREATE_NEW_TAG] = "Neuer Tag...",
+    [_L_CREATE_NEW_TAG_BATCH] = "Mehrere Tags erstellen...",
     [_L_INPUT_TAG_NUM] = "Tag Anzahl eingeben:",
     [_L_CREATE_TOO_MANY_NUM] = "Sie können nur maximal %d Tags auf einmal erstellen.",
     [_L_CREATING_TAG_BATCH] = "Tag erstellen",
     [_L_CREATING_TAG_FAILED] = "Erstellen von Tag %s fehlgeschlagen!",
-    [_L_RENAME] = "Umbenennen",
+    [_L_RENAME] = "Umbenennen...",
     [_L_OPEN_FOLDER_FAILED] = "Ordner konnte nicht geöffnet werden",
     [_L_RENAME_FAILED] = "Umbenennen fehlgeschlagen\nFehlercode",
     [_L_MAIN_RETURN] = "[Zurück]",
@@ -97,35 +98,36 @@ const char * const lang_de_DE[_L_COUNT] = {
     [_L_MODE_RANDOM_AUTO_GEN] = "Zufällig (Auto.)",
     [_L_BLANK_TAG] = "Leerer NFC Tag",
     [_L_APP_AMIIDB] = "Amiibo Datenbank",
-    [_L_APP_AMMIDB_BROWSER] = "Navigieren..",
-    [_L_APP_AMIIDB_SEARCH] = "Suche..",
-    [_L_APP_AMIIDB_MY_FAVORITES] = "Meine Favoriten..",
-    [_L_APP_AMIIDB_MY_TAGS] = "Meine Amiibo..",
-    [_L_APP_AMIIDB_SETTINGS] = "Einstellungen..",
+    [_L_APP_AMMIDB_BROWSER] = "Navigieren...",
+    [_L_APP_AMIIDB_SEARCH] = "Suche...",
+    [_L_APP_AMIIDB_MY_FAVORITES] = "Meine Favoriten...",
+    [_L_APP_AMIIDB_MY_TAGS] = "Meine Amiibo...",
+    [_L_APP_AMIIDB_SETTINGS] = "Einstellungen...",
     [_L_APP_AMIIDB_EXIT] = "[Beenden]",
     [_L_APP_AMIIDB_BACK] = "[Zurück]",
     [_L_APP_AMIIDB_SETTINGS_AMIIBO_KEY] = "Schlüssel",
     [_L_APP_AMIIDB_SETTINGS_AMIIBO_KEY_LOADED] = "geladen",
     [_L_APP_AMIIDB_SETTINGS_AMIIBO_KEY_NOT_LOADED] = "NICHT geladen",
     [_L_APP_AMIIDB_SETTINGS_SLOT_NUM] = "Steckplatzanzahl",
-    [_L_APP_AMIIDB_DETAIL_FAVORITE] = "Favorit..",
-    [_L_APP_AMIIDB_DETAIL_SAVE_AS] = "Speichern unter..",
+    [_L_APP_AMIIDB_DETAIL_FAVORITE] = "Favorit...",
+    [_L_APP_AMIIDB_DETAIL_SAVE_AS] = "Speichern unter...",
     [_L_APP_AMIIDB_DETAIL_BACK_DETAIL] = "[Zurück zu Details]",
     [_L_APP_AMIIDB_DETAIL_BACK_LIST] = "[Zurück zur Liste]",
     [_L_APP_AMIIDB_SEARCH_HEAD] = "Suche:",
-    [_L_APP_AMIIDB_MORE] = "[Mehr..]",
+    [_L_APP_AMIIDB_MORE] = "[Mehr...]",
+    [_L_APP_AMIIDB_MORE_MESSAGE] = "Zu viele Ergebnisse. Bitte Suche eingrenzen.",
     [_L_APP_AMIIDB_EMPTY_TAG] = "<Leerer Amiibo>",
-    [_L_APP_AMIIDB_SLOT_DELETE] = "Zurücksetzen..",
+    [_L_APP_AMIIDB_SLOT_DELETE] = "Zurücksetzen...",
     [_L_APP_AMIIDB_CONFIRM] = "Bestätigen",
     [_L_APP_AMIIDB_CANCEL] = "Abbrechen",
     [_L_APP_AMIIDB_TIPS] = "Bestätigen",
-    [_L_APP_AMIIDB_NEW] = "Neu..",
-    [_L_APP_AMIIDB_EMPTY] = "Leeren..",
-    [_L_APP_AMIIDB_DELETE] = "Löschen..",
+    [_L_APP_AMIIDB_NEW] = "Neu...",
+    [_L_APP_AMIIDB_EMPTY] = "Leeren...",
+    [_L_APP_AMIIDB_DELETE] = "Löschen...",
     [_L_APP_AMIIDB_FAV_NEW_HEAD] = "Neuer Fav.-Ordner:",
     [_L_APP_AMIIDB_FAV_EMPTY_MSG] = "Fav.-Ordner leeren?",
     [_L_APP_AMIIDB_FAV_DELETE_MSG] = "Löschen Bestätigen?",
-    [_L_APP_AMIIDB_FAV_SELECT_FOLDER] = "Fav.-Ordner auswählen..",
+    [_L_APP_AMIIDB_FAV_SELECT_FOLDER] = "Fav.-Ordner auswählen...",
     [_L_APP_AMIIDB_FAV_SUCCESS] = "Favorit erstellt ",
     [_L_APP_AMIIDB_FAV_FAILED] = "Favorisieren fehlgeschlagen!",
     [_L_APP_AMIIDB_SLOT_SAVE_SUCCESS] = "Speichern erfolgreich",
@@ -135,21 +137,21 @@ const char * const lang_de_DE[_L_COUNT] = {
     [_L_APP_CHAMELEON_TAG_MF1_WRITE_DENIED] = "Verweigern",
     [_L_APP_CHAMELEON_TAG_MF1_WRITE_DECEIVE] = "Ignorieren",
     [_L_APP_CHAMELEON_TAG_MF1_WRITE_SHADOW] = "Cache",
-    [_L_APP_CHAMELEON_INITIALIZING] = "Daten initialisieren..",
+    [_L_APP_CHAMELEON_INITIALIZING] = "Daten initialisieren...",
     [_L_APP_CHAMELEON_CARD_SLOT] = "Steckplatz",
     [_L_APP_CHAMELEON_CARD_NICK] = "Spitzname",
     [_L_APP_CHAMELEON_CARD_ID] = "ID",
     [_L_APP_CHAMELEON_CARD_TYPE] = "Typ",
-    [_L_APP_CHAMELEON_CARD_DATA] = "Daten..",
-    [_L_APP_CHAMELEON_CARD_ADVANCED] = "Erweitert..",
-    [_L_APP_CHAMELEON_CARD_SLOT_SETTINGS] = "Steckplatz Einstellungen..",
+    [_L_APP_CHAMELEON_CARD_DATA] = "Daten...",
+    [_L_APP_CHAMELEON_CARD_ADVANCED] = "Erweitert...",
+    [_L_APP_CHAMELEON_CARD_SLOT_SETTINGS] = "Steckplatz Einstellungen...",
     [_L_APP_CHAMELEON_CARD_SLOT_NUM] = "Steckplatz Nummer",
     [_L_APP_CHAMELEON_CARD_SET_NICK_SUCCESS] = "Spitzname erfolgreich gesetzt",
     [_L_APP_CHAMELEON_CARD_SET_NICK_FAILED] = "Spitzname setzen fehlgeschlagen!",
     [_L_APP_CHAMELEON_CARD_INPUT_NICK] = "Spitznamen eingeben:",
-    [_L_APP_CHAMELEON_CARD_DATA_LOAD] = "Laden..",
-    [_L_APP_CHAMELEON_CARD_DATA_SAVE] = "Speichern..",
-    [_L_APP_CHAMELEON_CARD_DATA_FACTORY] = "Zurücksetzen..",
+    [_L_APP_CHAMELEON_CARD_DATA_LOAD] = "Laden...",
+    [_L_APP_CHAMELEON_CARD_DATA_SAVE] = "Speichern...",
+    [_L_APP_CHAMELEON_CARD_DATA_FACTORY] = "Zurücksetzen...",
     [_L_APP_CHAMELEON_CARD_DATA_FACTORY_SUCCESS] = "Daten zurückgesetzt",
     [_L_APP_CHAMELEON_CARD_DATA_LOAD_NOT_FOUND] = "Datei nicht gefunden",
     [_L_APP_CHAMELEON_CARD_DATA_LOAD_SIZE_NOT_MATCH] = "Dateigröße stimmt nicht überein",

fw/application/src/i18n/en_US.c

@@ -51,7 +51,7 @@ const char * const lang_en_US[_L_COUNT] = {
     [_L_FORMAT] = "Format",
     [_L_FORMAT_STORAGE] = "Format Storage",
     [_L_DELETE_ALL_DATA] = "This will delete all data. Confirm format?",
-    [_L_DELETING_MESSAGE] = "Formatting ..",
+    [_L_DELETING_MESSAGE] = "Formatting ...",
     [_L_MESSAGE] = "Message",
     [_L_CONFIRM] = "Confirm",
     [_L_CANCEL] = "Cancel",
@@ -65,17 +65,18 @@ const char * const lang_en_US[_L_COUNT] = {
     [_L_READ_FILE_FAILED] = "Failed read the file",
     [_L_INPUT_FOLDER_NAME] = "Input Folder Name:",
     [_L_INPUT_AMIIBO_NAME] = "Input Amiibo Name:",
-    [_L_DELETE] = "Delete",
+    [_L_DELETE_FILE] = "Delete %s ?",
+    [_L_DELETE] = "Delete...",
     [_L_INPUT_NEW_NAME] = "Input New Name:",
     [_L_INVALID_INPUT] = "Invalid Input",
-    [_L_CREATE_NEW_FOLDER] = "Create New Folder..",
-    [_L_CREATE_NEW_TAG] = "Create New Tag..",
-    [_L_CREATE_NEW_TAG_BATCH] = "Batch Create New Tag..",
+    [_L_CREATE_NEW_FOLDER] = "Create New Folder...",
+    [_L_CREATE_NEW_TAG] = "Create New Tag...",
+    [_L_CREATE_NEW_TAG_BATCH] = "Batch Create New Tag...",
     [_L_INPUT_TAG_NUM] = "Input Tag Number：",
     [_L_CREATE_TOO_MANY_NUM] = "Only max %d tags created in a batch.",
     [_L_CREATING_TAG_BATCH] = "Creating tag",
     [_L_CREATING_TAG_FAILED] = "Create tag %s failed!",
-    [_L_RENAME] = "Rename",
+    [_L_RENAME] = "Rename...",
     [_L_OPEN_FOLDER_FAILED] = "Failed to open folder",
     [_L_RENAME_FAILED] = "Failed to rename\nError code",
     [_L_MAIN_RETURN] = "[RETURN]",
@@ -97,35 +98,36 @@ const char * const lang_en_US[_L_COUNT] = {
     [_L_MODE_RANDOM_AUTO_GEN] = "Rand. (Auto)",
     [_L_BLANK_TAG] = "Blank NFC tag",
     [_L_APP_AMIIDB] = "Amiibo Database",
-    [_L_APP_AMMIDB_BROWSER] = "Browser..",
-    [_L_APP_AMIIDB_SEARCH] = "Search..",
-    [_L_APP_AMIIDB_MY_FAVORITES] = "My Favorites..",
-    [_L_APP_AMIIDB_MY_TAGS] = "My Amiibo..",
-    [_L_APP_AMIIDB_SETTINGS] = "Settings..",
+    [_L_APP_AMMIDB_BROWSER] = "Browser...",
+    [_L_APP_AMIIDB_SEARCH] = "Search...",
+    [_L_APP_AMIIDB_MY_FAVORITES] = "My Favorites...",
+    [_L_APP_AMIIDB_MY_TAGS] = "My Amiibo...",
+    [_L_APP_AMIIDB_SETTINGS] = "Settings...",
     [_L_APP_AMIIDB_EXIT] = "[Exit]",
     [_L_APP_AMIIDB_BACK] = "[Back]",
     [_L_APP_AMIIDB_SETTINGS_AMIIBO_KEY] = "Keys",
     [_L_APP_AMIIDB_SETTINGS_AMIIBO_KEY_LOADED] = "Loaded",
     [_L_APP_AMIIDB_SETTINGS_AMIIBO_KEY_NOT_LOADED] = "NOT Loaded",
     [_L_APP_AMIIDB_SETTINGS_SLOT_NUM] = "Slot Num.",
-    [_L_APP_AMIIDB_DETAIL_FAVORITE] = "Favorite..",
-    [_L_APP_AMIIDB_DETAIL_SAVE_AS] = "Save As..",
+    [_L_APP_AMIIDB_DETAIL_FAVORITE] = "Favorite...",
+    [_L_APP_AMIIDB_DETAIL_SAVE_AS] = "Save As...",
     [_L_APP_AMIIDB_DETAIL_BACK_DETAIL] = "[Back to Detail]",
     [_L_APP_AMIIDB_DETAIL_BACK_LIST] = "[Back to List]",
     [_L_APP_AMIIDB_SEARCH_HEAD] = "Search:",
-    [_L_APP_AMIIDB_MORE] = "[More..]",
+    [_L_APP_AMIIDB_MORE] = "[More...]",
+    [_L_APP_AMIIDB_MORE_MESSAGE] = "Too many results. Try a more specific search.",
     [_L_APP_AMIIDB_EMPTY_TAG] = "<Blank Amiibo>",
-    [_L_APP_AMIIDB_SLOT_DELETE] = "Reset..",
+    [_L_APP_AMIIDB_SLOT_DELETE] = "Reset...",
     [_L_APP_AMIIDB_CONFIRM] = "Confirm",
     [_L_APP_AMIIDB_CANCEL] = "Cancel",
     [_L_APP_AMIIDB_TIPS] = "Confirm",
-    [_L_APP_AMIIDB_NEW] = "New..",
-    [_L_APP_AMIIDB_EMPTY] = "Empty..",
-    [_L_APP_AMIIDB_DELETE] = "Delete..",
+    [_L_APP_AMIIDB_NEW] = "New...",
+    [_L_APP_AMIIDB_EMPTY] = "Empty...",
+    [_L_APP_AMIIDB_DELETE] = "Delete...",
     [_L_APP_AMIIDB_FAV_NEW_HEAD] = "New Fav. Folder:",
     [_L_APP_AMIIDB_FAV_EMPTY_MSG] = "Empty Fav. Folder?",
     [_L_APP_AMIIDB_FAV_DELETE_MSG] = "Confirm Delete?",
-    [_L_APP_AMIIDB_FAV_SELECT_FOLDER] = "Select Fav. Folder..",
+    [_L_APP_AMIIDB_FAV_SELECT_FOLDER] = "Select Fav. Folder...",
     [_L_APP_AMIIDB_FAV_SUCCESS] = "Favorite Success",
     [_L_APP_AMIIDB_FAV_FAILED] = "Favorite Failed!",
     [_L_APP_AMIIDB_SLOT_SAVE_SUCCESS] = "Save Success",
@@ -135,21 +137,21 @@ const char * const lang_en_US[_L_COUNT] = {
     [_L_APP_CHAMELEON_TAG_MF1_WRITE_DENIED] = "Deny",
     [_L_APP_CHAMELEON_TAG_MF1_WRITE_DECEIVE] = "Ignore",
     [_L_APP_CHAMELEON_TAG_MF1_WRITE_SHADOW] = "Cache",
-    [_L_APP_CHAMELEON_INITIALIZING] = "Initializing data ..",
+    [_L_APP_CHAMELEON_INITIALIZING] = "Initializing data ...",
     [_L_APP_CHAMELEON_CARD_SLOT] = "Slot",
     [_L_APP_CHAMELEON_CARD_NICK] = "Nick",
     [_L_APP_CHAMELEON_CARD_ID] = "ID",
     [_L_APP_CHAMELEON_CARD_TYPE] = "Type",
-    [_L_APP_CHAMELEON_CARD_DATA] = "Data..",
-    [_L_APP_CHAMELEON_CARD_ADVANCED] = "Advanced..",
-    [_L_APP_CHAMELEON_CARD_SLOT_SETTINGS] = "Slots Settings..",
-    [_L_APP_CHAMELEON_CARD_SLOT_NUM] = "Slot Num..",
+    [_L_APP_CHAMELEON_CARD_DATA] = "Data...",
+    [_L_APP_CHAMELEON_CARD_ADVANCED] = "Advanced...",
+    [_L_APP_CHAMELEON_CARD_SLOT_SETTINGS] = "Slots Settings...",
+    [_L_APP_CHAMELEON_CARD_SLOT_NUM] = "Slot Num...",
     [_L_APP_CHAMELEON_CARD_SET_NICK_SUCCESS] = "Set Nick Success",
     [_L_APP_CHAMELEON_CARD_SET_NICK_FAILED] = "Set Nick Failed!",
     [_L_APP_CHAMELEON_CARD_INPUT_NICK] = "Input Nick:",
-    [_L_APP_CHAMELEON_CARD_DATA_LOAD] = "Load..",
-    [_L_APP_CHAMELEON_CARD_DATA_SAVE] = "Save..",
-    [_L_APP_CHAMELEON_CARD_DATA_FACTORY] = "Factory..",
+    [_L_APP_CHAMELEON_CARD_DATA_LOAD] = "Load...",
+    [_L_APP_CHAMELEON_CARD_DATA_SAVE] = "Save...",
+    [_L_APP_CHAMELEON_CARD_DATA_FACTORY] = "Factory...",
     [_L_APP_CHAMELEON_CARD_DATA_FACTORY_SUCCESS] = "Data Factory Success",
     [_L_APP_CHAMELEON_CARD_DATA_LOAD_NOT_FOUND] = "File Not Found",
     [_L_APP_CHAMELEON_CARD_DATA_LOAD_SIZE_NOT_MATCH] = "File Size Not Match",