projects
/
drnoksnes
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8eb2eb6
)
random bug fixes
author
Javier S. Pedro
<maemo@javispedro.com>
Tue, 2 Feb 2010 00:13:52 +0000
(
01:13
+0100)
committer
Javier S. Pedro
<maemo@javispedro.com>
Tue, 2 Feb 2010 00:13:52 +0000
(
01:13
+0100)
gui/i18n/de.po
patch
|
blob
|
history
gui/i18n/drnoksnes_plugin.pot
patch
|
blob
|
history
gui/i18n/es.po
patch
|
blob
|
history
gui/i18n/pl.po
patch
|
blob
|
history
gui/i18n/sv.po
patch
|
blob
|
history
gui/settings.c
patch
|
blob
|
history
platform/osso.cpp
patch
|
blob
|
history
diff --git
a/gui/i18n/de.po
b/gui/i18n/de.po
index
9526b27
..
0e689fd
100644
(file)
--- a/
gui/i18n/de.po
+++ b/
gui/i18n/de.po
@@
-7,7
+7,7
@@
msgid ""
msgstr ""
"Project-Id-Version: drnoksnes\n"
"Report-Msgid-Bugs-To: maemo@javispedro.com\n"
msgstr ""
"Project-Id-Version: drnoksnes\n"
"Report-Msgid-Bugs-To: maemo@javispedro.com\n"
-"POT-Creation-Date: 2010-02-01 02:37+0100\n"
+"POT-Creation-Date: 2010-02-01 22:56+0100\n"
"PO-Revision-Date: 2010-01-28 09:50+0100\n"
"Last-Translator: Philipp Zabel <philipp.zabel@gmail.com>\n"
"Language-Team: German\n"
"PO-Revision-Date: 2010-01-28 09:50+0100\n"
"Last-Translator: Philipp Zabel <philipp.zabel@gmail.com>\n"
"Language-Team: German\n"
@@
-53,7
+53,7
@@
msgstr "Ton einschalten"
msgid "Display framerate"
msgstr "Bildwiederholrate anzeigen"
msgid "Display framerate"
msgstr "Bildwiederholrate anzeigen"
-#: plugin.c:334 settings.c:229
+#: plugin.c:334 settings.c:228
msgid "Accurate graphics"
msgstr "Akkurate Grafik"
msgid "Accurate graphics"
msgstr "Akkurate Grafik"
@@
-61,15
+61,15
@@
msgstr "Akkurate Grafik"
msgid "Framerate:"
msgstr "Bildwiederholrate:"
msgid "Framerate:"
msgstr "Bildwiederholrate:"
-#: plugin.c:347 settings.c:261
+#: plugin.c:347 settings.c:260
msgid "No speedhacks"
msgstr "Keine Speedhacks"
msgid "No speedhacks"
msgstr "Keine Speedhacks"
-#: plugin.c:348 settings.c:262
+#: plugin.c:348 settings.c:261
msgid "Safe hacks only"
msgstr "Nur sichere Hacks"
msgid "Safe hacks only"
msgstr "Nur sichere Hacks"
-#: plugin.c:349 settings.c:263
+#: plugin.c:349 settings.c:262
msgid "All speedhacks"
msgstr "Alle Speedhacks"
msgid "All speedhacks"
msgstr "Alle Speedhacks"
@@
-81,7
+81,7
@@
msgstr "Einstellungen..."
msgid "About…"
msgstr "Über..."
msgid "About…"
msgstr "Über..."
-#: plugin.c:456 settings.c:182
+#: plugin.c:456 settings.c:181
msgid "Settings"
msgstr "Einstellungen"
msgid "Settings"
msgstr "Einstellungen"
@@
-159,51
+159,51
@@
msgstr "Spieler %d Tasten"
msgid "Defaults"
msgstr "Standardeinstellungen"
msgid "Defaults"
msgstr "Standardeinstellungen"
-#: settings.c:52 settings.c:59 settings.c:61
+#: settings.c:51 settings.c:58 settings.c:60
msgid "2x zoom"
msgstr "2x Vergrößerung"
msgid "2x zoom"
msgstr "2x Vergrößerung"
-#: settings.c:54
+#: settings.c:53
msgid "Scale to fit"
msgstr "Auf Bildschirmgröße skalieren"
msgid "Scale to fit"
msgstr "Auf Bildschirmgröße skalieren"
-#: settings.c:55
+#: settings.c:54
msgid "Fill the entire screen"
msgstr "Den ganzen Bildschirm füllen"
msgid "Fill the entire screen"
msgstr "Den ganzen Bildschirm füllen"
-#: settings.c:58
+#: settings.c:57
msgid "Antialiased 2x zoom"
msgstr "2x Zoom mit Kantenglättung"
msgid "Antialiased 2x zoom"
msgstr "2x Zoom mit Kantenglättung"
-#: settings.c:64
+#: settings.c:63
msgid "No zoom"
msgstr "Kein Zoom"
msgid "No zoom"
msgstr "Kein Zoom"
-#: settings.c:201
+#: settings.c:200
msgid "Controls"
msgstr "Steuerung"
msgid "Controls"
msgstr "Steuerung"
-#: settings.c:208
+#: settings.c:207
msgid "Player 1"
msgstr "Spieler 1"
msgid "Player 1"
msgstr "Spieler 1"
-#: settings.c:217
+#: settings.c:216
msgid "Player 2"
msgstr "Spieler 2"
msgid "Player 2"
msgstr "Spieler 2"
-#: settings.c:223
+#: settings.c:222
msgid "Advanced"
msgstr "Erweitert"
msgid "Advanced"
msgstr "Erweitert"
-#: settings.c:236
+#: settings.c:235
msgid "Pause game in the background"
msgstr ""
msgid "Pause game in the background"
msgstr ""
-#: settings.c:243
+#: settings.c:242
msgid "Zoom"
msgstr "Zoom"
msgid "Zoom"
msgstr "Zoom"
-#: settings.c:255
+#: settings.c:254
msgid "Speedhacks"
msgstr "Speedhacks"
msgid "Speedhacks"
msgstr "Speedhacks"
diff --git
a/gui/i18n/drnoksnes_plugin.pot
b/gui/i18n/drnoksnes_plugin.pot
index
8963ace
..
f382822
100644
(file)
--- a/
gui/i18n/drnoksnes_plugin.pot
+++ b/
gui/i18n/drnoksnes_plugin.pot
@@
-8,7
+8,7
@@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: maemo@javispedro.com\n"
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: maemo@javispedro.com\n"
-"POT-Creation-Date: 2010-02-01 02:37+0100\n"
+"POT-Creation-Date: 2010-02-01 22:56+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@
-52,7
+52,7
@@
msgstr ""
msgid "Display framerate"
msgstr ""
msgid "Display framerate"
msgstr ""
-#: plugin.c:334 settings.c:229
+#: plugin.c:334 settings.c:228
msgid "Accurate graphics"
msgstr ""
msgid "Accurate graphics"
msgstr ""
@@
-60,15
+60,15
@@
msgstr ""
msgid "Framerate:"
msgstr ""
msgid "Framerate:"
msgstr ""
-#: plugin.c:347 settings.c:261
+#: plugin.c:347 settings.c:260
msgid "No speedhacks"
msgstr ""
msgid "No speedhacks"
msgstr ""
-#: plugin.c:348 settings.c:262
+#: plugin.c:348 settings.c:261
msgid "Safe hacks only"
msgstr ""
msgid "Safe hacks only"
msgstr ""
-#: plugin.c:349 settings.c:263
+#: plugin.c:349 settings.c:262
msgid "All speedhacks"
msgstr ""
msgid "All speedhacks"
msgstr ""
@@
-80,7
+80,7
@@
msgstr ""
msgid "About…"
msgstr ""
msgid "About…"
msgstr ""
-#: plugin.c:456 settings.c:182
+#: plugin.c:456 settings.c:181
msgid "Settings"
msgstr ""
msgid "Settings"
msgstr ""
@@
-158,51
+158,51
@@
msgstr ""
msgid "Defaults"
msgstr ""
msgid "Defaults"
msgstr ""
-#: settings.c:52 settings.c:59 settings.c:61
+#: settings.c:51 settings.c:58 settings.c:60
msgid "2x zoom"
msgstr ""
msgid "2x zoom"
msgstr ""
-#: settings.c:54
+#: settings.c:53
msgid "Scale to fit"
msgstr ""
msgid "Scale to fit"
msgstr ""
-#: settings.c:55
+#: settings.c:54
msgid "Fill the entire screen"
msgstr ""
msgid "Fill the entire screen"
msgstr ""
-#: settings.c:58
+#: settings.c:57
msgid "Antialiased 2x zoom"
msgstr ""
msgid "Antialiased 2x zoom"
msgstr ""
-#: settings.c:64
+#: settings.c:63
msgid "No zoom"
msgstr ""
msgid "No zoom"
msgstr ""
-#: settings.c:201
+#: settings.c:200
msgid "Controls"
msgstr ""
msgid "Controls"
msgstr ""
-#: settings.c:208
+#: settings.c:207
msgid "Player 1"
msgstr ""
msgid "Player 1"
msgstr ""
-#: settings.c:217
+#: settings.c:216
msgid "Player 2"
msgstr ""
msgid "Player 2"
msgstr ""
-#: settings.c:223
+#: settings.c:222
msgid "Advanced"
msgstr ""
msgid "Advanced"
msgstr ""
-#: settings.c:236
+#: settings.c:235
msgid "Pause game in the background"
msgstr ""
msgid "Pause game in the background"
msgstr ""
-#: settings.c:243
+#: settings.c:242
msgid "Zoom"
msgstr ""
msgid "Zoom"
msgstr ""
-#: settings.c:255
+#: settings.c:254
msgid "Speedhacks"
msgstr ""
msgid "Speedhacks"
msgstr ""
diff --git
a/gui/i18n/es.po
b/gui/i18n/es.po
index
39caaf2
..
f67e0df
100644
(file)
--- a/
gui/i18n/es.po
+++ b/
gui/i18n/es.po
@@
-7,7
+7,7
@@
msgid ""
msgstr ""
"Project-Id-Version: DrNokSnes 1.2.6\n"
"Report-Msgid-Bugs-To: maemo@javispedro.com\n"
msgstr ""
"Project-Id-Version: DrNokSnes 1.2.6\n"
"Report-Msgid-Bugs-To: maemo@javispedro.com\n"
-"POT-Creation-Date: 2010-02-01 02:37+0100\n"
+"POT-Creation-Date: 2010-02-01 22:56+0100\n"
"PO-Revision-Date: 2010-01-07 03:11+0100\n"
"Last-Translator: Javier <javier@javispedro.com>\n"
"Language-Team: Spanish <maemo@javispedro.com>\n"
"PO-Revision-Date: 2010-01-07 03:11+0100\n"
"Last-Translator: Javier <javier@javispedro.com>\n"
"Language-Team: Spanish <maemo@javispedro.com>\n"
@@
-54,7
+54,7
@@
msgstr "Activar sonido"
msgid "Display framerate"
msgstr "Mostrar velocidad"
msgid "Display framerate"
msgstr "Mostrar velocidad"
-#: plugin.c:334 settings.c:229
+#: plugin.c:334 settings.c:228
msgid "Accurate graphics"
msgstr "Mejores gráficos"
msgid "Accurate graphics"
msgstr "Mejores gráficos"
@@
-62,15
+62,15
@@
msgstr "Mejores gráficos"
msgid "Framerate:"
msgstr "Velocidad:"
msgid "Framerate:"
msgstr "Velocidad:"
-#: plugin.c:347 settings.c:261
+#: plugin.c:347 settings.c:260
msgid "No speedhacks"
msgstr "Sin speedhacks"
msgid "No speedhacks"
msgstr "Sin speedhacks"
-#: plugin.c:348 settings.c:262
+#: plugin.c:348 settings.c:261
msgid "Safe hacks only"
msgstr "Sólo hacks seguros"
msgid "Safe hacks only"
msgstr "Sólo hacks seguros"
-#: plugin.c:349 settings.c:263
+#: plugin.c:349 settings.c:262
msgid "All speedhacks"
msgstr "Todos los hacks"
msgid "All speedhacks"
msgstr "Todos los hacks"
@@
-82,7
+82,7
@@
msgstr "Ajustes…"
msgid "About…"
msgstr "Acerca de…"
msgid "About…"
msgstr "Acerca de…"
-#: plugin.c:456 settings.c:182
+#: plugin.c:456 settings.c:181
msgid "Settings"
msgstr "Ajustes"
msgid "Settings"
msgstr "Ajustes"
@@
-152,6
+152,7
@@
msgid "Zeemote"
msgstr "Zeemote"
#: keys.c:266
msgstr "Zeemote"
#: keys.c:266
+#, c-format
msgid "Player %d keys"
msgstr "Teclas del jugador %d"
msgid "Player %d keys"
msgstr "Teclas del jugador %d"
@@
-159,51
+160,51
@@
msgstr "Teclas del jugador %d"
msgid "Defaults"
msgstr "Por defecto"
msgid "Defaults"
msgstr "Por defecto"
-#: settings.c:52 settings.c:59 settings.c:61
+#: settings.c:51 settings.c:58 settings.c:60
msgid "2x zoom"
msgstr "Zoom 2x"
msgid "2x zoom"
msgstr "Zoom 2x"
-#: settings.c:54
+#: settings.c:53
msgid "Scale to fit"
msgstr "Ajustar a la pantalla"
msgid "Scale to fit"
msgstr "Ajustar a la pantalla"
-#: settings.c:55
+#: settings.c:54
msgid "Fill the entire screen"
msgstr "Rellenar toda la pantalla"
msgid "Fill the entire screen"
msgstr "Rellenar toda la pantalla"
-#: settings.c:58
+#: settings.c:57
msgid "Antialiased 2x zoom"
msgstr "Zoom 2x suavizado"
msgid "Antialiased 2x zoom"
msgstr "Zoom 2x suavizado"
-#: settings.c:64
+#: settings.c:63
msgid "No zoom"
msgstr "Sin zoom"
msgid "No zoom"
msgstr "Sin zoom"
-#: settings.c:201
+#: settings.c:200
msgid "Controls"
msgstr "Controles"
msgid "Controls"
msgstr "Controles"
-#: settings.c:208
+#: settings.c:207
msgid "Player 1"
msgstr "Jugador 1"
msgid "Player 1"
msgstr "Jugador 1"
-#: settings.c:217
+#: settings.c:216
msgid "Player 2"
msgstr "Jugador 2"
msgid "Player 2"
msgstr "Jugador 2"
-#: settings.c:223
+#: settings.c:222
msgid "Advanced"
msgstr "Avanzado"
msgid "Advanced"
msgstr "Avanzado"
-#: settings.c:236
+#: settings.c:235
msgid "Pause game in the background"
msgstr "Pausar juego en segundo plano"
msgid "Pause game in the background"
msgstr "Pausar juego en segundo plano"
-#: settings.c:243
+#: settings.c:242
msgid "Zoom"
msgstr "Zoom"
msgid "Zoom"
msgstr "Zoom"
-#: settings.c:255
+#: settings.c:254
msgid "Speedhacks"
msgstr "Speedhacks"
msgid "Speedhacks"
msgstr "Speedhacks"
@@
-238,4
+239,3
@@
msgstr "Carga rápida 2"
#: buttons.inc:27
msgid "Quick Save 2"
msgstr "Guardado rápido 2"
#: buttons.inc:27
msgid "Quick Save 2"
msgstr "Guardado rápido 2"
-
diff --git
a/gui/i18n/pl.po
b/gui/i18n/pl.po
index
8dda414
..
4a67197
100644
(file)
--- a/
gui/i18n/pl.po
+++ b/
gui/i18n/pl.po
@@
-7,7
+7,7
@@
msgid ""
msgstr ""
"Project-Id-Version: drnoksnes\n"
"Report-Msgid-Bugs-To: maemo@javispedro.com\n"
msgstr ""
"Project-Id-Version: drnoksnes\n"
"Report-Msgid-Bugs-To: maemo@javispedro.com\n"
-"POT-Creation-Date: 2010-02-01 02:37+0100\n"
+"POT-Creation-Date: 2010-02-01 22:56+0100\n"
"PO-Revision-Date: 2010-01-28 00:42+0100\n"
"Last-Translator: Tomasz Dominikowski <dominikowski@gmail.com>\n"
"Language-Team: Polish <dominikowski@gmail.com>\n"
"PO-Revision-Date: 2010-01-28 00:42+0100\n"
"Last-Translator: Tomasz Dominikowski <dominikowski@gmail.com>\n"
"Language-Team: Polish <dominikowski@gmail.com>\n"
@@
-53,7
+53,7
@@
msgstr "Włącz dźwięk"
msgid "Display framerate"
msgstr "Wyświetlaj liczbę klatek/s"
msgid "Display framerate"
msgstr "Wyświetlaj liczbę klatek/s"
-#: plugin.c:334 settings.c:229
+#: plugin.c:334 settings.c:228
msgid "Accurate graphics"
msgstr "Dokładna grafika"
msgid "Accurate graphics"
msgstr "Dokładna grafika"
@@
-61,15
+61,15
@@
msgstr "Dokładna grafika"
msgid "Framerate:"
msgstr "Klatek/s:"
msgid "Framerate:"
msgstr "Klatek/s:"
-#: plugin.c:347 settings.c:261
+#: plugin.c:347 settings.c:260
msgid "No speedhacks"
msgstr "Bez sztuczek z prędkością"
msgid "No speedhacks"
msgstr "Bez sztuczek z prędkością"
-#: plugin.c:348 settings.c:262
+#: plugin.c:348 settings.c:261
msgid "Safe hacks only"
msgstr "Tylko bezpieczne sztuczki"
msgid "Safe hacks only"
msgstr "Tylko bezpieczne sztuczki"
-#: plugin.c:349 settings.c:263
+#: plugin.c:349 settings.c:262
msgid "All speedhacks"
msgstr "Wszystkie sztuczki z prędkością"
msgid "All speedhacks"
msgstr "Wszystkie sztuczki z prędkością"
@@
-81,7
+81,7
@@
msgstr "Ustawienia..."
msgid "About…"
msgstr "O programie..."
msgid "About…"
msgstr "O programie..."
-#: plugin.c:456 settings.c:182
+#: plugin.c:456 settings.c:181
msgid "Settings"
msgstr "Ustawienia"
msgid "Settings"
msgstr "Ustawienia"
@@
-159,51
+159,51
@@
msgstr "Klawisze gracza %d"
msgid "Defaults"
msgstr "Domyślne"
msgid "Defaults"
msgstr "Domyślne"
-#: settings.c:52 settings.c:59 settings.c:61
+#: settings.c:51 settings.c:58 settings.c:60
msgid "2x zoom"
msgstr "2x przybliżenie"
msgid "2x zoom"
msgstr "2x przybliżenie"
-#: settings.c:54
+#: settings.c:53
msgid "Scale to fit"
msgstr "Dopasowanie"
msgid "Scale to fit"
msgstr "Dopasowanie"
-#: settings.c:55
+#: settings.c:54
msgid "Fill the entire screen"
msgstr "Wypełnienie ekranu"
msgid "Fill the entire screen"
msgstr "Wypełnienie ekranu"
-#: settings.c:58
+#: settings.c:57
msgid "Antialiased 2x zoom"
msgstr "Wygładzane 2x przybliżenie"
msgid "Antialiased 2x zoom"
msgstr "Wygładzane 2x przybliżenie"
-#: settings.c:64
+#: settings.c:63
msgid "No zoom"
msgstr "Bez przybliżenia"
msgid "No zoom"
msgstr "Bez przybliżenia"
-#: settings.c:201
+#: settings.c:200
msgid "Controls"
msgstr "Sterowanie"
msgid "Controls"
msgstr "Sterowanie"
-#: settings.c:208
+#: settings.c:207
msgid "Player 1"
msgstr "Gracz 1"
msgid "Player 1"
msgstr "Gracz 1"
-#: settings.c:217
+#: settings.c:216
msgid "Player 2"
msgstr "Gracz 2"
msgid "Player 2"
msgstr "Gracz 2"
-#: settings.c:223
+#: settings.c:222
msgid "Advanced"
msgstr "Zaawansowane"
msgid "Advanced"
msgstr "Zaawansowane"
-#: settings.c:236
+#: settings.c:235
msgid "Pause game in the background"
msgstr ""
msgid "Pause game in the background"
msgstr ""
-#: settings.c:243
+#: settings.c:242
msgid "Zoom"
msgstr "Przybliżenie"
msgid "Zoom"
msgstr "Przybliżenie"
-#: settings.c:255
+#: settings.c:254
msgid "Speedhacks"
msgstr "Sztuczki z prędkością"
msgid "Speedhacks"
msgstr "Sztuczki z prędkością"
diff --git
a/gui/i18n/sv.po
b/gui/i18n/sv.po
index
2511b9e
..
fb20c47
100644
(file)
--- a/
gui/i18n/sv.po
+++ b/
gui/i18n/sv.po
@@
-7,7
+7,7
@@
msgid ""
msgstr ""
"Project-Id-Version: DrNokSnes 1.2.5\n"
"Report-Msgid-Bugs-To: maemo@javispedro.com\n"
msgstr ""
"Project-Id-Version: DrNokSnes 1.2.5\n"
"Report-Msgid-Bugs-To: maemo@javispedro.com\n"
-"POT-Creation-Date: 2010-02-01 02:37+0100\n"
+"POT-Creation-Date: 2010-02-01 22:56+0100\n"
"PO-Revision-Date: 2010-01-28 05:00+0100\n"
"Last-Translator: Robert Hägerström <rofo1000@gmail.com>\n"
"Language-Team: Swedish\n"
"PO-Revision-Date: 2010-01-28 05:00+0100\n"
"Last-Translator: Robert Hägerström <rofo1000@gmail.com>\n"
"Language-Team: Swedish\n"
@@
-51,7
+51,7
@@
msgstr "Aktivera ljud"
msgid "Display framerate"
msgstr "Visa bildhastighet"
msgid "Display framerate"
msgstr "Visa bildhastighet"
-#: plugin.c:334 settings.c:229
+#: plugin.c:334 settings.c:228
msgid "Accurate graphics"
msgstr "Exakt grafik"
msgid "Accurate graphics"
msgstr "Exakt grafik"
@@
-59,15
+59,15
@@
msgstr "Exakt grafik"
msgid "Framerate:"
msgstr "Bildhastighet:"
msgid "Framerate:"
msgstr "Bildhastighet:"
-#: plugin.c:347 settings.c:261
+#: plugin.c:347 settings.c:260
msgid "No speedhacks"
msgstr "Inga speedhacks"
msgid "No speedhacks"
msgstr "Inga speedhacks"
-#: plugin.c:348 settings.c:262
+#: plugin.c:348 settings.c:261
msgid "Safe hacks only"
msgstr "Enbart säkra hack"
msgid "Safe hacks only"
msgstr "Enbart säkra hack"
-#: plugin.c:349 settings.c:263
+#: plugin.c:349 settings.c:262
msgid "All speedhacks"
msgstr "Alla speedhacks"
msgid "All speedhacks"
msgstr "Alla speedhacks"
@@
-79,7
+79,7
@@
msgstr "Inställningar…"
msgid "About…"
msgstr "Om…"
msgid "About…"
msgstr "Om…"
-#: plugin.c:456 settings.c:182
+#: plugin.c:456 settings.c:181
msgid "Settings"
msgstr "Inställningar"
msgid "Settings"
msgstr "Inställningar"
@@
-157,51
+157,51
@@
msgstr "Spelare %d tangenter"
msgid "Defaults"
msgstr "Standard"
msgid "Defaults"
msgstr "Standard"
-#: settings.c:52 settings.c:59 settings.c:61
+#: settings.c:51 settings.c:58 settings.c:60
msgid "2x zoom"
msgstr "Dubbel zoom"
msgid "2x zoom"
msgstr "Dubbel zoom"
-#: settings.c:54
+#: settings.c:53
msgid "Scale to fit"
msgstr "Skala för att passa"
msgid "Scale to fit"
msgstr "Skala för att passa"
-#: settings.c:55
+#: settings.c:54
msgid "Fill the entire screen"
msgstr "Fyll hela skärmen"
msgid "Fill the entire screen"
msgstr "Fyll hela skärmen"
-#: settings.c:58
+#: settings.c:57
msgid "Antialiased 2x zoom"
msgstr "Kantutjämnad dubbel zoom"
msgid "Antialiased 2x zoom"
msgstr "Kantutjämnad dubbel zoom"
-#: settings.c:64
+#: settings.c:63
msgid "No zoom"
msgstr "Ingen zoom"
msgid "No zoom"
msgstr "Ingen zoom"
-#: settings.c:201
+#: settings.c:200
msgid "Controls"
msgstr "Kontroller"
msgid "Controls"
msgstr "Kontroller"
-#: settings.c:208
+#: settings.c:207
msgid "Player 1"
msgstr "Spelare 1"
msgid "Player 1"
msgstr "Spelare 1"
-#: settings.c:217
+#: settings.c:216
msgid "Player 2"
msgstr "Spelare 2"
msgid "Player 2"
msgstr "Spelare 2"
-#: settings.c:223
+#: settings.c:222
msgid "Advanced"
msgstr "Avancerad"
msgid "Advanced"
msgstr "Avancerad"
-#: settings.c:236
+#: settings.c:235
msgid "Pause game in the background"
msgstr ""
msgid "Pause game in the background"
msgstr ""
-#: settings.c:243
+#: settings.c:242
msgid "Zoom"
msgstr "Zoom"
msgid "Zoom"
msgstr "Zoom"
-#: settings.c:255
+#: settings.c:254
msgid "Speedhacks"
msgstr "Speedhacks"
msgid "Speedhacks"
msgstr "Speedhacks"
diff --git
a/gui/settings.c
b/gui/settings.c
index
3ad26fb
..
e9318ad
100644
(file)
--- a/
gui/settings.c
+++ b/
gui/settings.c
@@
-46,13
+46,12
@@
struct scaler {
};
static struct scaler scalers[] = {
};
static struct scaler scalers[] = {
-
#if MAEMO_VERSION == 5
#ifdef __arm__
{"arm2x", N_("2x zoom")},
#endif /* __arm__ */
#if MAEMO_VERSION == 5
#ifdef __arm__
{"arm2x", N_("2x zoom")},
#endif /* __arm__ */
- {"hdsq", N_("Scale to fit")},
- {"hdfill", N_("Fill the entire screen")},
+ {"haasq", N_("Scale to fit")},
+ {"haafill", N_("Fill the entire screen")},
#elif MAEMO_VERSION == 4
#ifdef __arm__
{"xsp", N_("Antialiased 2x zoom")},
#elif MAEMO_VERSION == 4
#ifdef __arm__
{"xsp", N_("Antialiased 2x zoom")},
diff --git
a/platform/osso.cpp
b/platform/osso.cpp
index
d81b046
..
6eb9d93
100644
(file)
--- a/
platform/osso.cpp
+++ b/
platform/osso.cpp
@@
-66,6
+66,16
@@
static gint ossoAppCallback(const gchar *interface, const gchar *method,
return OSSO_OK;
}
return OSSO_OK;
}
+static gboolean ossoTimeoutCallback(gpointer data)
+{
+ if (startupCommand == STARTUP_COMMAND_UNKNOWN) {
+ // Assume that after N seconds we're not going to get a startup reason.
+ startupCommand = STARTUP_COMMAND_INVALID;
+ }
+
+ return FALSE; // This is a timeout, don't call us ever again.
+}
+
static void ossoHwCallback(osso_hw_state_t *state, gpointer data)
{
if (state->shutdown_ind) {
static void ossoHwCallback(osso_hw_state_t *state, gpointer data)
{
if (state->shutdown_ind) {
@@
-223,6
+233,12
@@
void OssoConfig()
createActionMappingsOnly();
}
createActionMappingsOnly();
}
+ // Time to read the startup command from D-Bus
+
+ // Timeout after 3 seconds, and assume we didn't receive any.
+ guint timeout = g_timeout_add_seconds(3, ossoTimeoutCallback, 0);
+ g_warn_if_fail(timeout > 0);
+
// Iterate the event loop since we want to catch the initial dbus messages
while (startupCommand == STARTUP_COMMAND_UNKNOWN) {
// This is not busylooping since we are blocking here
// Iterate the event loop since we want to catch the initial dbus messages
while (startupCommand == STARTUP_COMMAND_UNKNOWN) {
// This is not busylooping since we are blocking here