diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2016-03-05 18:50:56 +0100 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2016-03-05 18:50:56 +0100 |
commit | bc99bc2dca89bb9c9672d53ab594fa421e42d7d6 (patch) | |
tree | 484bdff12521b6d6e6c3ba842c1f848e3a205dfc /language | |
parent | 8b5a6acc49199ca062965cee5bd4f50f9476d576 (diff) |
fix file (nw)
Diffstat (limited to 'language')
-rw-r--r-- | language/Spanish/strings.po | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/language/Spanish/strings.po b/language/Spanish/strings.po index fc4562f2429..5ab8cd31ac6 100644 --- a/language/Spanish/strings.po +++ b/language/Spanish/strings.po @@ -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" |