Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-03 19:36:26 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix file (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2016-03-05 18:50:56 +01:00
parent 8b5a6acc49
commit bc99bc2dca
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
language/Spanish/strings.po
View File

@ -1870,13 +1870,10 @@ msgid ""
"Press ''%1$s'' to quit,\n"
"Press ''%2$s'' to return to emulation."
msgstr ""
<<<<<<< HEAD
"¿Seguro que quieres salir?\n"
"\n"
"Presiona «%1$s» para salir,\n"
"Presiona «%2$s» para volver al emulador."
=======
>>>>>>> 057a6f64c9b40c53941a3e603efad046b724a3c1
#: src/emu/ui/ui.cpp:1967
msgid "Master Volume"