From b6ca7ba97af1bafc422d6f466bb260c493f8c609 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 25 Oct 2016 19:57:04 +0200 Subject: [PATCH] Get rid of hardcoded strings --- config.def.h | 1 - intl/english.h | 82 ---------------------------------- intl/french.h | 82 ---------------------------------- intl/intl.h | 22 --------- intl/italian.h | 82 ---------------------------------- intl/japanese.h | 82 ---------------------------------- intl/msg_hash_us.c | 8 ++++ intl/russian.h | 84 ----------------------------------- intl/spanish.h | 82 ---------------------------------- menu/cbs/menu_cbs_get_value.c | 28 ++++++++---- msg_hash.h | 4 ++ 11 files changed, 31 insertions(+), 526 deletions(-) delete mode 100644 intl/english.h delete mode 100644 intl/french.h delete mode 100644 intl/intl.h delete mode 100644 intl/italian.h delete mode 100644 intl/japanese.h delete mode 100644 intl/russian.h delete mode 100644 intl/spanish.h diff --git a/config.def.h b/config.def.h index 745e52d79b..5b7ea8b22d 100644 --- a/config.def.h +++ b/config.def.h @@ -882,7 +882,6 @@ static char buildbot_server_url[] = ""; static char buildbot_assets_server_url[] = "http://buildbot.libretro.com/assets/"; #ifndef IS_SALAMANDER -#include "intl/intl.h" /* User 1 */ static const struct retro_keybind retro_keybinds_1[] = { diff --git a/intl/english.h b/intl/english.h deleted file mode 100644 index 915de6f295..0000000000 --- a/intl/english.h +++ /dev/null @@ -1,82 +0,0 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2010-2014 - Hans-Kristian Arntzen - * Copyright (C) 2011-2016 - Daniel De Matteis - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - -#ifndef __INTL_ENGLISH_H -#define __INTL_ENGLISH_H - -#define RETRO_LBL_JOYPAD_B "RetroPad B Button" -#define RETRO_LBL_JOYPAD_Y "RetroPad Y Button" -#define RETRO_LBL_JOYPAD_SELECT "RetroPad Select Button" -#define RETRO_LBL_JOYPAD_START "RetroPad Start Button" -#define RETRO_LBL_JOYPAD_UP "RetroPad D-Pad Up" -#define RETRO_LBL_JOYPAD_DOWN "RetroPad D-Pad Down" -#define RETRO_LBL_JOYPAD_LEFT "RetroPad D-Pad Left" -#define RETRO_LBL_JOYPAD_RIGHT "RetroPad D-Pad Right" -#define RETRO_LBL_JOYPAD_A "RetroPad A Button" -#define RETRO_LBL_JOYPAD_X "RetroPad X Button" -#define RETRO_LBL_JOYPAD_L "RetroPad L Button" -#define RETRO_LBL_JOYPAD_R "RetroPad R Button" -#define RETRO_LBL_JOYPAD_L2 "RetroPad L2 Button" -#define RETRO_LBL_JOYPAD_R2 "RetroPad R2 Button" -#define RETRO_LBL_JOYPAD_L3 "RetroPad L3 Button" -#define RETRO_LBL_JOYPAD_R3 "RetroPad R3 Button" -#define RETRO_LBL_TURBO_ENABLE "Turbo Enable" -#define RETRO_LBL_ANALOG_LEFT_X "Left Analog X" -#define RETRO_LBL_ANALOG_LEFT_Y "Left Analog Y" -#define RETRO_LBL_ANALOG_RIGHT_X "Right Analog X" -#define RETRO_LBL_ANALOG_RIGHT_Y "Right Analog Y" -#define RETRO_LBL_ANALOG_LEFT_X_PLUS "Left Analog X +" -#define RETRO_LBL_ANALOG_LEFT_X_MINUS "Left Analog X -" -#define RETRO_LBL_ANALOG_LEFT_Y_PLUS "Left Analog Y +" -#define RETRO_LBL_ANALOG_LEFT_Y_MINUS "Left Analog Y -" -#define RETRO_LBL_ANALOG_RIGHT_X_PLUS "Right Analog X +" -#define RETRO_LBL_ANALOG_RIGHT_X_MINUS "Right Analog X -" -#define RETRO_LBL_ANALOG_RIGHT_Y_PLUS "Right Analog Y +" -#define RETRO_LBL_ANALOG_RIGHT_Y_MINUS "Right Analog Y -" -#define RETRO_LBL_FAST_FORWARD_KEY "Fast Forward" -#define RETRO_LBL_FAST_FORWARD_HOLD_KEY "Fast Forward Hold" -#define RETRO_LBL_LOAD_STATE_KEY "Load State" -#define RETRO_LBL_SAVE_STATE_KEY "Save State" -#define RETRO_LBL_FULLSCREEN_TOGGLE_KEY "Fullscreen Toggle" -#define RETRO_LBL_QUIT_KEY "Quit Key" -#define RETRO_LBL_STATE_SLOT_PLUS "State Slot Plus" -#define RETRO_LBL_STATE_SLOT_MINUS "State Slot Minus" -#define RETRO_LBL_REWIND "Rewind" -#define RETRO_LBL_MOVIE_RECORD_TOGGLE "Movie Record Toggle" -#define RETRO_LBL_PAUSE_TOGGLE "Pause Toggle" -#define RETRO_LBL_FRAMEADVANCE "Frame Advance" -#define RETRO_LBL_RESET "Reset" -#define RETRO_LBL_SHADER_NEXT "Next Shader" -#define RETRO_LBL_SHADER_PREV "Previous Shader" -#define RETRO_LBL_CHEAT_INDEX_PLUS "Cheat Index Plus" -#define RETRO_LBL_CHEAT_INDEX_MINUS "Cheat Index Minus" -#define RETRO_LBL_CHEAT_TOGGLE "Cheat Toggle" -#define RETRO_LBL_SCREENSHOT "Screenshot" -#define RETRO_LBL_MUTE "Mute Audio" -#define RETRO_LBL_OSK "Enable On-Screen Keyboard" -#define RETRO_LBL_NETPLAY_FLIP "Netplay Flip Users" -#define RETRO_LBL_SLOWMOTION "Slowmotion" -#define RETRO_LBL_ENABLE_HOTKEY "Enable Hotkey" -#define RETRO_LBL_VOLUME_UP "Volume Up" -#define RETRO_LBL_VOLUME_DOWN "Volume Down" -#define RETRO_LBL_OVERLAY_NEXT "Next Overlay" -#define RETRO_LBL_DISK_EJECT_TOGGLE "Disk Eject Toggle" -#define RETRO_LBL_DISK_NEXT "Disk Swap Next" -#define RETRO_LBL_DISK_PREV "Disk Swap Previous" -#define RETRO_LBL_GRAB_MOUSE_TOGGLE "Grab mouse toggle" -#define RETRO_LBL_MENU_TOGGLE "Menu toggle" - -#endif diff --git a/intl/french.h b/intl/french.h deleted file mode 100644 index e41f05a794..0000000000 --- a/intl/french.h +++ /dev/null @@ -1,82 +0,0 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2010-2014 - Hans-Kristian Arntzen - * Copyright (C) 2011-2016 - Daniel De Matteis - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - -#ifndef __INTL_FRENCH_H -#define __INTL_FRENCH_H - -#define RETRO_LBL_JOYPAD_B "Bouton RetroPad B" -#define RETRO_LBL_JOYPAD_Y "Bouton RetroPad Y" -#define RETRO_LBL_JOYPAD_SELECT "Bouton RetroPad Select" -#define RETRO_LBL_JOYPAD_START "Bouton RetroPad Start" -#define RETRO_LBL_JOYPAD_UP "RetroPad D-Pad Up" -#define RETRO_LBL_JOYPAD_DOWN "Croix directionnelle RetroPad Haut" -#define RETRO_LBL_JOYPAD_LEFT "Croix directionnelle RetroPad Gauche" -#define RETRO_LBL_JOYPAD_RIGHT "Croix directionnelle RetroPad Droite" -#define RETRO_LBL_JOYPAD_A "Bouton RetroPad A" -#define RETRO_LBL_JOYPAD_X "Bouton RetroPad X" -#define RETRO_LBL_JOYPAD_L "Bouton RetroPad L" -#define RETRO_LBL_JOYPAD_R "Bouton RetroPad R" -#define RETRO_LBL_JOYPAD_L2 "Bouton RetroPad L2" -#define RETRO_LBL_JOYPAD_R2 "Bouton RetroPad R2" -#define RETRO_LBL_JOYPAD_L3 "Bouton RetroPad L3" -#define RETRO_LBL_JOYPAD_R3 "Bouton RetroPad R3" -#define RETRO_LBL_TURBO_ENABLE "Turbo Activé" -#define RETRO_LBL_ANALOG_LEFT_X "Analogue Gauche X" -#define RETRO_LBL_ANALOG_LEFT_Y "Analogue Gauche Y" -#define RETRO_LBL_ANALOG_RIGHT_X "Analogue Droite X" -#define RETRO_LBL_ANALOG_RIGHT_Y "Analogue Droite Y" -#define RETRO_LBL_ANALOG_LEFT_X_PLUS "Analogue Gauche X +" -#define RETRO_LBL_ANALOG_LEFT_X_MINUS "Analogue Gauche X -" -#define RETRO_LBL_ANALOG_LEFT_Y_PLUS "Analogue Gauche Y +" -#define RETRO_LBL_ANALOG_LEFT_Y_MINUS "Analogue Gauche Y -" -#define RETRO_LBL_ANALOG_RIGHT_X_PLUS "Analogue Droite X +" -#define RETRO_LBL_ANALOG_RIGHT_X_MINUS "Analogue Droite X -" -#define RETRO_LBL_ANALOG_RIGHT_Y_PLUS "Analogue Droite Y +" -#define RETRO_LBL_ANALOG_RIGHT_Y_MINUS "Analogue Droite Y -" -#define RETRO_LBL_FAST_FORWARD_KEY "Avance Rapide" -#define RETRO_LBL_FAST_FORWARD_HOLD_KEY "Avance Rapide Appui Maintenu" -#define RETRO_LBL_LOAD_STATE_KEY "Charger une savestate" -#define RETRO_LBL_SAVE_STATE_KEY "Sauvegarder une savestate" -#define RETRO_LBL_FULLSCREEN_TOGGLE_KEY "Mode plein écran" -#define RETRO_LBL_QUIT_KEY "Quitter" -#define RETRO_LBL_STATE_SLOT_PLUS "État Slot Suivant" -#define RETRO_LBL_STATE_SLOT_MINUS "État Slot Antérieur" -#define RETRO_LBL_REWIND "Rembobinage" -#define RETRO_LBL_MOVIE_RECORD_TOGGLE "Commutateur enregistrement vidéo" -#define RETRO_LBL_PAUSE_TOGGLE "Pause" -#define RETRO_LBL_FRAMEADVANCE "Défiler image" -#define RETRO_LBL_RESET "Reset" -#define RETRO_LBL_SHADER_NEXT "Prochain Shader" -#define RETRO_LBL_SHADER_PREV "Précédent Shader" -#define RETRO_LBL_CHEAT_INDEX_PLUS "Index Cheat Suivant" -#define RETRO_LBL_CHEAT_INDEX_MINUS "Index Cheat Antérieur" -#define RETRO_LBL_CHEAT_TOGGLE "Commutateur Mode Triche" -#define RETRO_LBL_SCREENSHOT "Capture d'écran" -#define RETRO_LBL_MUTE "Couper le son" -#define RETRO_LBL_OSK "Active le clavier visuel" -#define RETRO_LBL_NETPLAY_FLIP "Inversement des joueurs Netplay" -#define RETRO_LBL_SLOWMOTION "Ralenti" -#define RETRO_LBL_ENABLE_HOTKEY "Active raccourci clavier" -#define RETRO_LBL_VOLUME_UP "Augmenter le volume" -#define RETRO_LBL_VOLUME_DOWN "Diminuer le volume" -#define RETRO_LBL_OVERLAY_NEXT "Prochain Overlay" -#define RETRO_LBL_DISK_EJECT_TOGGLE "Commutateur éjecter le disque" -#define RETRO_LBL_DISK_NEXT "Prochain Changement Disque" -#define RETRO_LBL_DISK_PREV "Précédent Changement Disque" -#define RETRO_LBL_GRAB_MOUSE_TOGGLE "Commutateur capturer la souris" -#define RETRO_LBL_MENU_TOGGLE "Commutateur Menu" - -#endif diff --git a/intl/intl.h b/intl/intl.h deleted file mode 100644 index dc2774ddfa..0000000000 --- a/intl/intl.h +++ /dev/null @@ -1,22 +0,0 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2010-2014 - Hans-Kristian Arntzen - * Copyright (C) 2011-2016 - Daniel De Matteis - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - -#ifndef __INTL_INTERNATIONAL_H -#define __INTL_INTERNATIONAL_H - -#include "english.h" - -#endif diff --git a/intl/italian.h b/intl/italian.h deleted file mode 100644 index c601eff262..0000000000 --- a/intl/italian.h +++ /dev/null @@ -1,82 +0,0 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2010-2014 - Hans-Kristian Arntzen - * Copyright (C) 2011-2016 - Daniel De Matteis - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - -#ifndef __INTL_ITALIAN_H -#define __INTL_ITALIAN_H - -#define RETRO_LBL_JOYPAD_B "Tasto B RetroPad" -#define RETRO_LBL_JOYPAD_Y "Tasto Y RetroPad" -#define RETRO_LBL_JOYPAD_SELECT "Tasto Select RetroPad" -#define RETRO_LBL_JOYPAD_START "Tasto Start RetroPad" -#define RETRO_LBL_JOYPAD_UP "Croce direzionale Sù RetroPad" -#define RETRO_LBL_JOYPAD_DOWN "Croce direzionale Giù RetroPad" -#define RETRO_LBL_JOYPAD_LEFT "Croce direzionale Sinistra RetroPad" -#define RETRO_LBL_JOYPAD_RIGHT "Croce direzionale Destra RetroPad" -#define RETRO_LBL_JOYPAD_A "Tasto A RetroPad" -#define RETRO_LBL_JOYPAD_X "Tasto X RetroPad" -#define RETRO_LBL_JOYPAD_L "Tasto L RetroPad" -#define RETRO_LBL_JOYPAD_R "Tasto R RetroPad" -#define RETRO_LBL_JOYPAD_L2 "Tasto L2 RetroPad" -#define RETRO_LBL_JOYPAD_R2 "Tasto R2 RetroPad" -#define RETRO_LBL_JOYPAD_L3 "Tasto L3 RetroPad" -#define RETRO_LBL_JOYPAD_R3 "Tasto R3 RetroPad" -#define RETRO_LBL_TURBO_ENABLE "Abilita Turbo" -#define RETRO_LBL_ANALOG_LEFT_X "Analogico Sinistro X" -#define RETRO_LBL_ANALOG_LEFT_Y "Analogico Sinistro Y" -#define RETRO_LBL_ANALOG_RIGHT_X "Analogico Destro X" -#define RETRO_LBL_ANALOG_RIGHT_Y "Analogico Destro Y" -#define RETRO_LBL_ANALOG_LEFT_X_PLUS "Analogico Sinistro X +" -#define RETRO_LBL_ANALOG_LEFT_X_MINUS "Analogico Sinistro X -" -#define RETRO_LBL_ANALOG_LEFT_Y_PLUS "Analogico Sinistro Y +" -#define RETRO_LBL_ANALOG_LEFT_Y_MINUS "Analogico Sinistro Y -" -#define RETRO_LBL_ANALOG_RIGHT_X_PLUS "Analogico Destro X +" -#define RETRO_LBL_ANALOG_RIGHT_X_MINUS "Analogico Destro X -" -#define RETRO_LBL_ANALOG_RIGHT_Y_PLUS "Analogico Destro Y +" -#define RETRO_LBL_ANALOG_RIGHT_Y_MINUS "Analogico Destro Y -" -#define RETRO_LBL_FAST_FORWARD_KEY "Avanti Veloce" -#define RETRO_LBL_FAST_FORWARD_HOLD_KEY "Tieni Premuto Avanti Veloce" -#define RETRO_LBL_LOAD_STATE_KEY "Carica Stato" -#define RETRO_LBL_SAVE_STATE_KEY "Salva Stato" -#define RETRO_LBL_FULLSCREEN_TOGGLE_KEY "Interrutore Schermo Intero" -#define RETRO_LBL_QUIT_KEY "Tasto Esci" -#define RETRO_LBL_STATE_SLOT_PLUS "Stato Slot Successivo" -#define RETRO_LBL_STATE_SLOT_MINUS "Stato Slot Precedente" -#define RETRO_LBL_REWIND "Riavvolgi" -#define RETRO_LBL_MOVIE_RECORD_TOGGLE "Interruttore Registrazione Video" -#define RETRO_LBL_PAUSE_TOGGLE "Pausa" -#define RETRO_LBL_FRAMEADVANCE "Avanza Fotogramma" -#define RETRO_LBL_RESET "Azzera" -#define RETRO_LBL_SHADER_NEXT "Prossimo Shader" -#define RETRO_LBL_SHADER_PREV "Shader Precedente" -#define RETRO_LBL_CHEAT_INDEX_PLUS "Indice dei Trucchi Successivo" -#define RETRO_LBL_CHEAT_INDEX_MINUS "Indice dei Trucchi Anteriore" -#define RETRO_LBL_CHEAT_TOGGLE "Interruttore Trucchi" -#define RETRO_LBL_SCREENSHOT "Cattura Schermata" -#define RETRO_LBL_MUTE "Silenzia Audio" -#define RETRO_LBL_OSK "Abilita Tastiera a Schermo" -#define RETRO_LBL_NETPLAY_FLIP "Cambia Utenti Netplay" -#define RETRO_LBL_SLOWMOTION "Rallentatore" -#define RETRO_LBL_ENABLE_HOTKEY "Abilita Tasti Rapidi" -#define RETRO_LBL_VOLUME_UP "Aumenta Volume" -#define RETRO_LBL_VOLUME_DOWN "Abbassa Volume" -#define RETRO_LBL_OVERLAY_NEXT "Overlay Successivo" -#define RETRO_LBL_DISK_EJECT_TOGGLE "Interruttore Espelli Disco" -#define RETRO_LBL_DISK_NEXT "Cambia Disco Successivo" -#define RETRO_LBL_DISK_PREV "Cambia Disco Precedente" -#define RETRO_LBL_GRAB_MOUSE_TOGGLE "Attiva presa mouse" -#define RETRO_LBL_MENU_TOGGLE "Menù a comparsa" - -#endif diff --git a/intl/japanese.h b/intl/japanese.h deleted file mode 100644 index 6db1617ad0..0000000000 --- a/intl/japanese.h +++ /dev/null @@ -1,82 +0,0 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2010-2014 - Hans-Kristian Arntzen - * Copyright (C) 2011-2016 - Daniel De Matteis - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - -#ifndef __INTL_JAPANESE_H -#define __INTL_JAPANESE_H - -#define RETRO_LBL_JOYPAD_B "レトロパッドのBボタン" -#define RETRO_LBL_JOYPAD_Y "レトロパッドのYボタン" -#define RETRO_LBL_JOYPAD_SELECT "レトロパッドのセレクトボタン" -#define RETRO_LBL_JOYPAD_START "レトロパッドのスタートボタン" -#define RETRO_LBL_JOYPAD_UP "レトロパッドの十字ボタンの上" -#define RETRO_LBL_JOYPAD_DOWN "レトロパッドの十字ボタンの下" -#define RETRO_LBL_JOYPAD_LEFT "レトロパッドの十字ボタンの左" -#define RETRO_LBL_JOYPAD_RIGHT "レトロパッドの十字ボタンの右" -#define RETRO_LBL_JOYPAD_A "レトロパッドのAボタン" -#define RETRO_LBL_JOYPAD_X "レトロパッドのXボタン" -#define RETRO_LBL_JOYPAD_L "レトロパッドのLボタン" -#define RETRO_LBL_JOYPAD_R "レトロパッドのRボタン" -#define RETRO_LBL_JOYPAD_L2 "レトロパッドのL2ボタン" -#define RETRO_LBL_JOYPAD_R2 "レトロパッドのR2ボタン" -#define RETRO_LBL_JOYPAD_L3 "レトロパッドのL3ボタン" -#define RETRO_LBL_JOYPAD_R3 "レトロパッドのR3ボタン" -#define RETRO_LBL_TURBO_ENABLE "ターボを有効" -#define RETRO_LBL_ANALOG_LEFT_X "左のアナログのX" -#define RETRO_LBL_ANALOG_LEFT_Y "左のアナログのY" -#define RETRO_LBL_ANALOG_RIGHT_X "右のアナログのX" -#define RETRO_LBL_ANALOG_RIGHT_Y "右のアナログのY" -#define RETRO_LBL_ANALOG_LEFT_X_PLUS "左のアナログのX +" -#define RETRO_LBL_ANALOG_LEFT_X_MINUS "左のアナログのX -" -#define RETRO_LBL_ANALOG_LEFT_Y_PLUS "左のアナログのY +" -#define RETRO_LBL_ANALOG_LEFT_Y_MINUS "左のアナログのY -" -#define RETRO_LBL_ANALOG_RIGHT_X_PLUS "右のアナログのX +" -#define RETRO_LBL_ANALOG_RIGHT_X_MINUS "右のアナログのX -" -#define RETRO_LBL_ANALOG_RIGHT_Y_PLUS "右のアナログのY +" -#define RETRO_LBL_ANALOG_RIGHT_Y_MINUS "右のアナログのY -" -#define RETRO_LBL_FAST_FORWARD_KEY "早送り" -#define RETRO_LBL_FAST_FORWARD_HOLD_KEY "早送りホールド" -#define RETRO_LBL_LOAD_STATE_KEY "状態をロード" -#define RETRO_LBL_SAVE_STATE_KEY "状態保存" -#define RETRO_LBL_FULLSCREEN_TOGGLE_KEY "フルスクリーンに切り替え" -#define RETRO_LBL_QUIT_KEY "終了キー" -#define RETRO_LBL_STATE_SLOT_PLUS "次の状態スロット" -#define RETRO_LBL_STATE_SLOT_MINUS "前の状態スロット" -#define RETRO_LBL_REWIND "巻き戻し" -#define RETRO_LBL_MOVIE_RECORD_TOGGLE "録画" -#define RETRO_LBL_PAUSE_TOGGLE "一時停止" -#define RETRO_LBL_FRAMEADVANCE "コマ送り" -#define RETRO_LBL_RESET "リセット" -#define RETRO_LBL_SHADER_NEXT "次のシェーダー" -#define RETRO_LBL_SHADER_PREV "前のシェーダー" -#define RETRO_LBL_CHEAT_INDEX_PLUS "次のチートインデックス" -#define RETRO_LBL_CHEAT_INDEX_MINUS "前のチートインデックス" -#define RETRO_LBL_CHEAT_TOGGLE "チートを切り替え" -#define RETRO_LBL_SCREENSHOT "スクリーンショット" -#define RETRO_LBL_MUTE "消音" -#define RETRO_LBL_OSK "ソフトウェアキーボードを切りがえ" -#define RETRO_LBL_NETPLAY_FLIP "ネットプレイのユーザ交換" -#define RETRO_LBL_SLOWMOTION "スローモーション" -#define RETRO_LBL_ENABLE_HOTKEY "ホットキーを有効" -#define RETRO_LBL_VOLUME_UP "音量を増す" -#define RETRO_LBL_VOLUME_DOWN "音量を減る" -#define RETRO_LBL_OVERLAY_NEXT "次のオーバーレイ" -#define RETRO_LBL_DISK_EJECT_TOGGLE "ディスクを取り出し" -#define RETRO_LBL_DISK_NEXT "次のディスクに切り替え" -#define RETRO_LBL_DISK_PREV "前のディスクに切り替え" -#define RETRO_LBL_GRAB_MOUSE_TOGGLE "マウスグラブを切り替え" -#define RETRO_LBL_MENU_TOGGLE "メニューに切り替え" - -#endif diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c index df08444d45..039eff7db6 100644 --- a/intl/msg_hash_us.c +++ b/intl/msg_hash_us.c @@ -4710,6 +4710,14 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg) return "L3 button (thumb)"; case MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R3: return "R3 button (thumb)"; + case MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X: + return "Left Analog X"; + case MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y: + return "Left Analog Y"; + case MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X: + return "Right Analog X"; + case MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y: + return "Right Analog Y"; case MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_PLUS: return "Left analog X+ (right)"; case MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_MINUS: diff --git a/intl/russian.h b/intl/russian.h deleted file mode 100644 index 36b841b2d0..0000000000 --- a/intl/russian.h +++ /dev/null @@ -1,84 +0,0 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2010-2014 - Hans-Kristian Arntzen - * Copyright (C) 2011-2015 - Daniel De Matteis - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - -#ifndef __INTL_RUSSIAN_H -#define __INTL_RUSSIAN_H - -/* lack of force_iso_8859_1 is intentional - ISO-8859-1 does not contain the Cyrillic characters */ - -#define RETRO_LBL_JOYPAD_B "RetroPad, кнопка B" -#define RETRO_LBL_JOYPAD_Y "RetroPad, кнопка Y" -#define RETRO_LBL_JOYPAD_SELECT "RetroPad, кнопка Select" -#define RETRO_LBL_JOYPAD_START "RetroPad, кнопка Start" -#define RETRO_LBL_JOYPAD_UP "RetroPad, D-Pad вверх" -#define RETRO_LBL_JOYPAD_DOWN "RetroPad, D-Pad вниз" -#define RETRO_LBL_JOYPAD_LEFT "RetroPad, D-Pad влево" -#define RETRO_LBL_JOYPAD_RIGHT "RetroPad, D-Pad вправо" -#define RETRO_LBL_JOYPAD_A "RetroPad, кнопка A" -#define RETRO_LBL_JOYPAD_X "RetroPad, кнопка X" -#define RETRO_LBL_JOYPAD_L "RetroPad, кнопка L1" -#define RETRO_LBL_JOYPAD_R "RetroPad, кнопка R1" -#define RETRO_LBL_JOYPAD_L2 "RetroPad, кнопка L2" -#define RETRO_LBL_JOYPAD_R2 "RetroPad, кнопка R2" -#define RETRO_LBL_JOYPAD_L3 "RetroPad, кнопка L3" -#define RETRO_LBL_JOYPAD_R3 "RetroPad, кнопка R3" -#define RETRO_LBL_TURBO_ENABLE "Активация турбо" -#define RETRO_LBL_ANALOG_LEFT_X "Левый джойстик, ось X" -#define RETRO_LBL_ANALOG_LEFT_Y "Левый джойстик, ось Y" -#define RETRO_LBL_ANALOG_RIGHT_X "Правый джойстик, ось X" -#define RETRO_LBL_ANALOG_RIGHT_Y "Правый джойстик, ось Y" -#define RETRO_LBL_ANALOG_LEFT_X_PLUS "Левый джойстик, ось X +" -#define RETRO_LBL_ANALOG_LEFT_X_MINUS "Левый джойстик, ось X -" -#define RETRO_LBL_ANALOG_LEFT_Y_PLUS "Левый джойстик, ось Y +" -#define RETRO_LBL_ANALOG_LEFT_Y_MINUS "Левый джойстик, ось Y -" -#define RETRO_LBL_ANALOG_RIGHT_X_PLUS "Правый джойстик, ось X +" -#define RETRO_LBL_ANALOG_RIGHT_X_MINUS "Правый джойстик, ось X -" -#define RETRO_LBL_ANALOG_RIGHT_Y_PLUS "Правый джойстик, ось Y +" -#define RETRO_LBL_ANALOG_RIGHT_Y_MINUS "Правый джойстик, ось Y -" -#define RETRO_LBL_FAST_FORWARD_KEY "Ускорение" -#define RETRO_LBL_FAST_FORWARD_HOLD_KEY "Удерживать ускорение" -#define RETRO_LBL_LOAD_STATE_KEY "Загрузка" -#define RETRO_LBL_SAVE_STATE_KEY "Сохранение" -#define RETRO_LBL_FULLSCREEN_TOGGLE_KEY "Полноэкранный режим" -#define RETRO_LBL_QUIT_KEY "Выход из RetroArch" -#define RETRO_LBL_STATE_SLOT_PLUS "Повысить слот сохранения" -#define RETRO_LBL_STATE_SLOT_MINUS "Понизить слот сохранения" -#define RETRO_LBL_REWIND "Перемотка" -#define RETRO_LBL_MOVIE_RECORD_TOGGLE "Вкл./выкл. запись" -#define RETRO_LBL_PAUSE_TOGGLE "Пауза" -#define RETRO_LBL_FRAMEADVANCE "Покадровая перемотка" -#define RETRO_LBL_RESET "Сброс" -#define RETRO_LBL_SHADER_NEXT "Загрузить след. шейдер" -#define RETRO_LBL_SHADER_PREV "Загрузить пред. шейдер" -#define RETRO_LBL_CHEAT_INDEX_PLUS "Следующий чит-код" -#define RETRO_LBL_CHEAT_INDEX_MINUS "Предыдущий чит-код" -#define RETRO_LBL_CHEAT_TOGGLE "Вкл./откл. чит-код" -#define RETRO_LBL_SCREENSHOT "Скриншот" -#define RETRO_LBL_MUTE "Откл./вкл. звук" -#define RETRO_LBL_OSK "Вызов оверлея клавиатуры" -#define RETRO_LBL_NETPLAY_FLIP "Смена игроков в сетевой игре" -#define RETRO_LBL_SLOWMOTION "Замедление" -#define RETRO_LBL_ENABLE_HOTKEY "Активация горячей клавиши" -#define RETRO_LBL_VOLUME_UP "Увеличить громкость" -#define RETRO_LBL_VOLUME_DOWN "Уменьшить громкость " -#define RETRO_LBL_OVERLAY_NEXT "Загрузить след. оверлей" -#define RETRO_LBL_DISK_EJECT_TOGGLE "Откр./закр. лоток cd-привода" -#define RETRO_LBL_DISK_NEXT "Загрузить след. диск" -#define RETRO_LBL_DISK_PREV "Загрузить пред. диск" -#define RETRO_LBL_GRAB_MOUSE_TOGGLE "Перехват мыши" -#define RETRO_LBL_MENU_TOGGLE "Вызов меню" - -#endif diff --git a/intl/spanish.h b/intl/spanish.h deleted file mode 100644 index f2c6747aca..0000000000 --- a/intl/spanish.h +++ /dev/null @@ -1,82 +0,0 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2010-2014 - Hans-Kristian Arntzen - * Copyright (C) 2011-2016 - Daniel De Matteis - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - -#ifndef __INTL_SPANISH_H -#define __INTL_SPANISH_H - -#define RETRO_LBL_JOYPAD_B "Botón B RetroPad" -#define RETRO_LBL_JOYPAD_Y "Botón Y RetroPad" -#define RETRO_LBL_JOYPAD_SELECT "Botón Select RetroPad" -#define RETRO_LBL_JOYPAD_START "Botón Start RetroPad" -#define RETRO_LBL_JOYPAD_UP "Cruceta arriba RetroPad" -#define RETRO_LBL_JOYPAD_DOWN "Cruceta abajo RetroPad" -#define RETRO_LBL_JOYPAD_LEFT "Cruceta izda. RetroPad" -#define RETRO_LBL_JOYPAD_RIGHT "Cruceta dcha. RetroPad" -#define RETRO_LBL_JOYPAD_A "Botón A RetroPad" -#define RETRO_LBL_JOYPAD_X "Botón X RetroPad" -#define RETRO_LBL_JOYPAD_L "Botón L RetroPad" -#define RETRO_LBL_JOYPAD_R "Botón R RetroPad" -#define RETRO_LBL_JOYPAD_L2 "Botón L2 RetroPad" -#define RETRO_LBL_JOYPAD_R2 "Botón R2 RetroPad" -#define RETRO_LBL_JOYPAD_L3 "Botón L3 RetroPad" -#define RETRO_LBL_JOYPAD_R3 "Botón R3 RetroPad" -#define RETRO_LBL_TURBO_ENABLE "Activar turbo" -#define RETRO_LBL_ANALOG_LEFT_X "X analógico izdo." -#define RETRO_LBL_ANALOG_LEFT_Y "Y analógico izdo." -#define RETRO_LBL_ANALOG_RIGHT_X "X analógico dcho." -#define RETRO_LBL_ANALOG_RIGHT_Y "Y analógico dcho." -#define RETRO_LBL_ANALOG_LEFT_X_PLUS "X + analógico izdo." -#define RETRO_LBL_ANALOG_LEFT_X_MINUS "X - analógico izdo." -#define RETRO_LBL_ANALOG_LEFT_Y_PLUS "Y + analógico izdo." -#define RETRO_LBL_ANALOG_LEFT_Y_MINUS "Y - analógico izdo." -#define RETRO_LBL_ANALOG_RIGHT_X_PLUS "X + analógico dcho." -#define RETRO_LBL_ANALOG_RIGHT_X_MINUS "X - analógico dcho." -#define RETRO_LBL_ANALOG_RIGHT_Y_PLUS "Y + analógico dcho." -#define RETRO_LBL_ANALOG_RIGHT_Y_MINUS "Y - analógico dcho." -#define RETRO_LBL_FAST_FORWARD_KEY "Acelerador" -#define RETRO_LBL_FAST_FORWARD_HOLD_KEY "Alternar acelerador" -#define RETRO_LBL_LOAD_STATE_KEY "Carga rápida" -#define RETRO_LBL_SAVE_STATE_KEY "Guardado rápido" -#define RETRO_LBL_FULLSCREEN_TOGGLE_KEY "Alt. pantalla completa" -#define RETRO_LBL_QUIT_KEY "Tecla de abandonar" -#define RETRO_LBL_STATE_SLOT_PLUS "Siguiente ranura rápida" -#define RETRO_LBL_STATE_SLOT_MINUS "Ranura rápida anterior" -#define RETRO_LBL_REWIND "Rebobinar" -#define RETRO_LBL_MOVIE_RECORD_TOGGLE "Alt. grabación" -#define RETRO_LBL_PAUSE_TOGGLE "Alternar pausa" -#define RETRO_LBL_FRAMEADVANCE "Avanzar fotograma" -#define RETRO_LBL_RESET "Reiniciar" -#define RETRO_LBL_SHADER_NEXT "Siguiente shader" -#define RETRO_LBL_SHADER_PREV "Shader anterior" -#define RETRO_LBL_CHEAT_INDEX_PLUS "Siguiente índice de trucos" -#define RETRO_LBL_CHEAT_INDEX_MINUS "Índice de trucos anterior" -#define RETRO_LBL_CHEAT_TOGGLE "Alternar trucos" -#define RETRO_LBL_SCREENSHOT "Capturar pantalla" -#define RETRO_LBL_MUTE "Silenciar sonido" -#define RETRO_LBL_OSK "Activar teclado en pantalla" -#define RETRO_LBL_NETPLAY_FLIP "Cambiar usuario de red" -#define RETRO_LBL_SLOWMOTION "Cámara lenta" -#define RETRO_LBL_ENABLE_HOTKEY "Activar teclas rápidas" -#define RETRO_LBL_VOLUME_UP "Subir volumen" -#define RETRO_LBL_VOLUME_DOWN "Bajar volumen" -#define RETRO_LBL_OVERLAY_NEXT "Siguiente sobreimposición" -#define RETRO_LBL_DISK_EJECT_TOGGLE "Alt. expulsar disco" -#define RETRO_LBL_DISK_NEXT "Cambiar a siguiente disco" -#define RETRO_LBL_DISK_PREV "Cambiar a disco anterior" -#define RETRO_LBL_GRAB_MOUSE_TOGGLE "Alternar captura de ratón" -#define RETRO_LBL_MENU_TOGGLE "Alternar menú" - -#endif diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c index 45a600a7f9..b3fcdf8964 100644 --- a/menu/cbs/menu_cbs_get_value.c +++ b/menu/cbs/menu_cbs_get_value.c @@ -40,7 +40,6 @@ #include "../../performance_counters.h" #include "../../paths.h" #include "../../runloop.h" -#include "../../intl/intl.h" #include "../../wifi/wifi_driver.h" #ifndef BIND_ACTION_GET_VALUE @@ -49,13 +48,6 @@ cbs->action_get_value_ident = #name; #endif -const char axis_labels[4][128] = { - RETRO_LBL_ANALOG_LEFT_X, - RETRO_LBL_ANALOG_LEFT_Y, - RETRO_LBL_ANALOG_RIGHT_X, - RETRO_LBL_ANALOG_RIGHT_Y -}; - static void menu_action_setting_disp_set_label_cheat_num_passes( file_list_t* list, unsigned *w, unsigned type, unsigned i, @@ -497,7 +489,25 @@ static void menu_action_setting_disp_set_label_input_desc( else - strlcpy(s, axis_labels[remap_id], len); + { + const char *str = NULL; + switch (remap_id) + { + case 0: + str = msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X); + break; + case 1: + str = msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y); + break; + case 2: + str = msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X); + break; + case 3: + str = msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y); + break; + } + strlcpy(s, str, len); + } *w = 19; strlcpy(s2, path, len2); diff --git a/msg_hash.h b/msg_hash.h index 4fec60b6d1..cda9932697 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -489,6 +489,10 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R2, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L3, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R3, + MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X, + MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y, + MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X, + MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_PLUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_MINUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_PLUS,