diff options
| -rw-r--r-- | common/setup.cpp | 6 | ||||
| -rw-r--r-- | media/mediaManager.cpp | 2 | ||||
| -rw-r--r-- | po/de.po | 11 | ||||
| -rw-r--r-- | po/fi_FI.po | 20 |
4 files changed, 33 insertions, 6 deletions
diff --git a/common/setup.cpp b/common/setup.cpp index ed6e929..52b4600 100644 --- a/common/setup.cpp +++ b/common/setup.cpp @@ -30,7 +30,7 @@ void cMenuSetupUPnP::Update(){ Add(new cMenuEditBoolItem(tr("Use expert settings"),&switchExpertSettings)); if(switchExpertSettings){ - cOsdItem *wsCat = new cOsdItem("--- Webserver settings -------------------------------------------------------"); + cOsdItem *wsCat = new cOsdItem(cString::sprintf("--- %s ---", tr("Webserver settings"))); wsCat->SetSelectable(false); Add(wsCat); @@ -45,7 +45,7 @@ void cMenuSetupUPnP::Update(){ Add(new cMenuEditIntItem(tr("Live webserver port (0=auto)"), &lvport, 0, 65536)); } - cOsdItem *usCat = new cOsdItem("--- UPnP server settings -----------------------------------------------------"); + cOsdItem *usCat = new cOsdItem(cString::sprintf("--- %s ---", tr("UPnP server settings"))); usCat->SetSelectable(false); Add(usCat); @@ -67,7 +67,7 @@ void cMenuSetupUPnP::Update(){ } Add(new cMenuEditIntItem(tr("UPnP server port (0=auto)"), &upnpport, 0, 65536)); - cOsdItem *dbCat = new cOsdItem("--- Database settings --------------------------------------------------------"); + cOsdItem *dbCat = new cOsdItem(cString::sprintf("--- %s ---", tr("Database settings"))); dbCat->SetSelectable(false); Add(dbCat); diff --git a/media/mediaManager.cpp b/media/mediaManager.cpp index de87aa6..e8f25e6 100644 --- a/media/mediaManager.cpp +++ b/media/mediaManager.cpp @@ -382,7 +382,7 @@ int cMediaManager::CreateResponse(MediaRequest& request, const string& select, c ++request.numberReturned; } - request.result = ixmlDocumenttoString(DIDLDoc); + request.result = ixmlNodetoString((IXML_Node*)DIDLDoc); ixmlDocument_free(DIDLDoc); return UPNP_E_SUCCESS; @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: vdr-upnp 1.0.0\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2012-11-01 16:37+0100\n" +"POT-Creation-Date: 2012-11-01 19:47+0200\n" "PO-Revision-Date: 2012-11-01 16:04+0100\n" "Last-Translator: Denis Loh <denis.loh@web.de>\n" "Language-Team: German\n" @@ -181,6 +181,9 @@ msgstr "aktiv" msgid "Use expert settings" msgstr "Experteneinstellungen" +msgid "Webserver settings" +msgstr "" + msgid "Webserver root directory" msgstr "Webserverwurzelverzeichnis" @@ -196,6 +199,9 @@ msgstr "\"Live\"-Plugin als Webseite verwenden" msgid "Live webserver port (0=auto)" msgstr "Webserver port des Live-Plugins (0=auto)" +msgid "UPnP server settings" +msgstr "" + msgid "Generate new device UUID" msgstr "Neue Geräte-UUID generieren" @@ -226,5 +232,8 @@ msgstr "Netzwerkkarte einstellen" msgid "UPnP server port (0=auto)" msgstr "UPnP Serverport (0=auto)" +msgid "Database settings" +msgstr "" + msgid "Path to database file" msgstr "Pfad zur Datenbankdatei" diff --git a/po/fi_FI.po b/po/fi_FI.po index 03ee81b..f888089 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: vdr-upnp 1.0.0\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2012-10-31 10:31+0200\n" +"POT-Creation-Date: 2012-11-01 19:47+0200\n" "PO-Revision-Date: 2012-10-31 10:31+0200\n" "Last-Translator: Rolf Ahrenberg\n" "Language-Team: Finnish <vdr@linuxtv.org>\n" @@ -19,6 +19,15 @@ msgstr "" msgid "UPnP/DLNA compliant Media Server functionality for VDR" msgstr "UPnP/DLNA-mediapalvelin VDR:lle" +msgid "" +" The UPnP/DLNA server is designed to detect everything automatically.\n" +" Therefore the user is not required to change most of the settings.\n" +" \n" +" -d <DB directory> --db-dir=<DB directory> Specifies the directory\n" +" where the the database\n" +" file shall be located.\n" +msgstr "" + msgid "Invalid action" msgstr "" @@ -163,6 +172,9 @@ msgstr "käytössä" msgid "Use expert settings" msgstr "Näytä lisäasetukset" +msgid "Webserver settings" +msgstr "Web-palvelimen asetukset" + msgid "Webserver root directory" msgstr "Web-palvelimen juurihakemisto" @@ -178,6 +190,9 @@ msgstr "Käytä \"live\"-laajennosta esityksiin" msgid "Live webserver port (0=auto)" msgstr "Live-laajennoksen portti (0=auto)" +msgid "UPnP server settings" +msgstr "UPnP-palvelimen asetukset" + msgid "Generate new device UUID" msgstr "Luo uusi UUID laitteelle" @@ -208,5 +223,8 @@ msgstr "Aseta verkkosovitin" msgid "UPnP server port (0=auto)" msgstr "UPnP-palvelimen portti (0=auto)" +msgid "Database settings" +msgstr "Tietokanta-asetukset" + msgid "Path to database file" msgstr "Tiedostopolku tietokannalle" |