updated Finnish translations and fixed tr() usage (thanks to Rolf Ahrenberg)

4 files changed, 80 insertions, 66 deletions

diff --git a/HISTORY b/HISTORY
index 6596541..ff1385f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2,6 +2,7 @@ VDR Plugin 'rpihddevice' Revision History
 -----------------------------------------
 
 - new:
+  - updated Finnish translations and fixed tr() usage (thanks to Rolf Ahrenberg)
   - use fast deinterlacer for HD streams
   - added high level OSD with GPU support
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 15bb07d..6ea219f 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -23,6 +23,27 @@ msgstr "Videoformat nicht unterstützt!"
 msgid "HD output device for Raspberry Pi"
 msgstr "HD Ausgabegerät für Raspberry Pi"
 
+msgid "analog"
+msgstr "analog"
+
+msgid "HDMI"
+msgstr "HDMI"
+
+msgid "box"
+msgstr "einrahmen"
+
+msgid "crop"
+msgstr "abschneiden"
+
+msgid "stretch"
+msgstr "dehnen"
+
+msgid "default"
+msgstr "Voreinstellung"
+
+msgid "follow video"
+msgstr "wie Video"
+
 msgid "Resolution"
 msgstr "Auflösung"
 
@@ -43,24 +64,3 @@ msgstr "Audio EDID ignorieren"
 
 msgid "Use GPU accelerated OSD"
 msgstr "OSD mit GPU-Unterstützung"
-
-msgid "analog"
-msgstr "analog"
-
-msgid "HDMI"
-msgstr "HDMI"
-
-msgid "box"
-msgstr "einrahmen"
-
-msgid "crop"
-msgstr "abschneiden"
-
-msgid "stretch"
-msgstr "dehnen"
-
-msgid "don't change"
-msgstr "nicht ändern"
-
-msgid "follow video"
-msgstr "wie Video"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 76d63dc..7fd4e39 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -22,14 +22,35 @@ msgstr "Kuvaformaatti ei ole tuettu!"
 msgid "HD output device for Raspberry Pi"
 msgstr "Raspberry Pi HD-ulostulolaite"
 
+msgid "analog"
+msgstr "analoginen"
+
+msgid "HDMI"
+msgstr "HDMI"
+
+msgid "box"
+msgstr "kehystys"
+
+msgid "crop"
+msgstr "leikkaus"
+
+msgid "stretch"
+msgstr "venytys"
+
+msgid "default"
+msgstr "oletus"
+
+msgid "follow video"
+msgstr "lähetteen mukaan"
+
 msgid "Resolution"
-msgstr ""
+msgstr "Resoluutio"
 
 msgid "Frame Rate"
-msgstr ""
+msgstr "Ruudunpäivitys"
 
 msgid "Video Framing"
-msgstr ""
+msgstr "Kuvan rajaustapa"
 
 msgid "Audio Port"
 msgstr "Äänilähtö"
@@ -40,23 +61,5 @@ msgstr "Digitaaliäänen läpivienti"
 msgid "Ignore Audio EDID"
 msgstr "Jätä äänen EDID huomioimatta"
 
-msgid "analog"
-msgstr "analoginen"
-
-msgid "HDMI"
-msgstr "HDMI"
-
-msgid "box"
-msgstr ""
-
-msgid "crop"
-msgstr ""
-
-msgid "stretch"
-msgstr ""
-
-msgid "don't change"
-msgstr ""
-
-msgid "follow video"
-msgstr ""
+msgid "Use GPU accelerated OSD"
+msgstr "Käytä GPU-kiihdytettyä OSD:tä"
diff --git a/setup.c b/setup.c
index fd6f545..a7b7b5c 100644
--- a/setup.c
+++ b/setup.c
@@ -31,6 +31,30 @@ public:
 		m_video(video),
 		m_osd(osd)
 	{
+		m_audioport[0] = tr("analog");
+		m_audioport[1] = tr("HDMI");
+
+		m_videoFraming[0] = tr("box");
+		m_videoFraming[1] = tr("crop");
+		m_videoFraming[2] = tr("stretch");
+
+		m_videoResolution[0] = tr("default");
+		m_videoResolution[1] = tr("follow video");
+		m_videoResolution[2] = "720x480";
+		m_videoResolution[3] = "720x576";
+		m_videoResolution[4] = "1280x720";
+		m_videoResolution[5] = "1920x1080";
+
+		m_videoFrameRate[0] = tr("default");
+		m_videoFrameRate[1] = tr("follow video");
+		m_videoFrameRate[2] = "24p";
+		m_videoFrameRate[3] = "25p";
+		m_videoFrameRate[4] = "30p";
+		m_videoFrameRate[5] = "50i";
+		m_videoFrameRate[6] = "50p";
+		m_videoFrameRate[7] = "60i";
+		m_videoFrameRate[8] = "60p";
+
 		Setup();
 	}
 
@@ -78,17 +102,17 @@ private:
 		if (cRpiDisplay::GetVideoPort() == cRpiVideoPort::eHDMI)
 		{
 			Add(new cMenuEditStraItem(
-				tr("Resolution"), &m_video.resolution, 6, s_videoResolution));
+				tr("Resolution"), &m_video.resolution, 6, m_videoResolution));
 
 			Add(new cMenuEditStraItem(
-				tr("Frame Rate"), &m_video.frameRate, 9, s_videoFrameRate));
+				tr("Frame Rate"), &m_video.frameRate, 9, m_videoFrameRate));
 		}
 
 		Add(new cMenuEditStraItem(
-				tr("Video Framing"), &m_video.framing, 3, s_videoFraming));
+				tr("Video Framing"), &m_video.framing, 3, m_videoFraming));
 
 		Add(new cMenuEditStraItem(
-				tr("Audio Port"), &m_audio.port, 2, s_audioport));
+				tr("Audio Port"), &m_audio.port, 2, m_audioport));
 
 		if (m_audio.port == 1)
 		{
@@ -111,26 +135,12 @@ private:
 	cRpiSetup::VideoParameters m_video;
 	cRpiSetup::OsdParameters   m_osd;
 
-	static const char *const s_audioport[2];
-	static const char *const s_videoFraming[3];
-	static const char *const s_videoResolution[6];
-	static const char *const s_videoFrameRate[9];
+	const char *m_audioport[2];
+	const char *m_videoFraming[3];
+	const char *m_videoResolution[6];
+	const char *m_videoFrameRate[9];
 };
 
-const char *const cRpiSetupPage::s_audioport[] =
-		{ tr("analog"), tr("HDMI") };
-
-const char *const cRpiSetupPage::s_videoFraming[] =
-		{ tr("box"), tr("crop"), tr("stretch") };
-
-const char *const cRpiSetupPage::s_videoResolution[] =
-		{ tr("don't change"), tr("follow video"),
-			"720x480", "720x576", "1280x720", "1920x1080" };
-
-const char *const cRpiSetupPage::s_videoFrameRate[] =
-		{ tr("don't change"), tr("follow video"),
-			"24p", "25p", "30p", "50i", "50p", "60i", "60p"	};
-
 /* ------------------------------------------------------------------------- */
 
 cRpiSetup* cRpiSetup::s_instance = 0;