Skip to content

Commit

Permalink
Merge remote-tracking branch 'e2/master'
Browse files Browse the repository at this point in the history 
Conflicts:
	Makefile.am
	autotimer/src/AutoTimer.py
	autotimer/src/AutoTimerEditor.py
	autotimer/src/plugin.py
	bonjour/CONTROL/control
	configure.ac
	dreammediathek/CONTROL/control
	dvdbackup/CONTROL/control
	dvdbackup/po/DVDBackup.pot
	dvdbackup/po/de.po
	dvdbackup/po/it.po
	easymedia/src/shoutcast.png
	epgrefresh/po/EPGRefresh.pot
	epgrefresh/po/de.po
	epgrefresh/po/it.po
	eurotictv/src/plugin.py
	fritzcall/po/nl.po
	merlinepgcenter/src/HelperFunctions.py
	mytube/CONTROL/control
	mytube/src/plugin.py
	networkbrowser/CONTROL/control
	networkbrowser/po/de.po
	passwordchanger/CONTROL/control
	pluginsort/CONTROL/control
	pluginsort/src/plugin.py
	vps/po/cs.po
	vps/po/de.po
	vps/po/it.po
	vps/po/vps.pot
	webinterface/CONTROL/control
	yttrailer/CONTROL/control
  • Loading branch information
Andy Blackburn committed Jul 13, 2012
2 parents 23cffc7 + 00d1c23 commit def3dc4
Show file tree
Hide file tree
Showing 662 changed files with 25,131 additions and 6,483 deletions.
3 changes: 2 additions & 1 deletion .gitignore
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ configure
depcomp depcomp
enigma2-plugins-config.h enigma2-plugins-config.h
enigma2-plugins-config.h.in enigma2-plugins-config.h.in
enigma2-plugins-config.h.in~
index-enigma2-plugins.xml index-enigma2-plugins.xml
install-sh install-sh
libtool libtool
Expand All @@ -30,4 +31,4 @@ stamp-h1
*.lo *.lo
*.mo *.mo
*.o *.o

*.bak
4 changes: 0 additions & 4 deletions 3dsettings/CONTROL/control
View file
Original file line number Original file line Diff line number Diff line change
@@ -1,6 +1,2 @@
Package: enigma2-plugin-systemplugins-3dsettings
Version: 1.0
Description: 3D OSD Switcher Description: 3D OSD Switcher
Maintainer: Dr. Best <dr.best@dreambox-tools.info>
Homepage: http://www.dreambox-tools.info
Depends: enigma2 Depends: enigma2
33 changes: 32 additions & 1 deletion 3dsettings/po/3dsettings.pot
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -8,56 +8,87 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-12-23 18:35+0200\n" "POT-Creation-Date: 2012-05-01 23:19+CEST\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n" "Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"


#: plugin.py:76
msgid "off" msgid "off"
msgstr "" msgstr ""


#: plugin.py:76
msgid "on with side by side" msgid "on with side by side"
msgstr "" msgstr ""


#: plugin.py:76
msgid "on with top/bottom" msgid "on with top/bottom"
msgstr "" msgstr ""


#: plugin.py:172
msgid "Cancel"
msgstr ""

#: plugin.py:173
msgid "OK"
msgstr ""

#: plugin.py:196
msgid "Side by side" msgid "Side by side"
msgstr "" msgstr ""


#: plugin.py:197
msgid "Top/Bottom" msgid "Top/Bottom"
msgstr "" msgstr ""


#: plugin.py:199 plugin.py:202
msgid "2D mode" msgid "2D mode"
msgstr "" msgstr ""


#: plugin.py:207
msgid "Show side by side option in extension menu" msgid "Show side by side option in extension menu"
msgstr "" msgstr ""


#: plugin.py:208
msgid "Show top/bottom option in extension menu" msgid "Show top/bottom option in extension menu"
msgstr "" msgstr ""


#: plugin.py:209
msgid "Switch OSD automatically" msgid "Switch OSD automatically"
msgstr "" msgstr ""


#: plugin.py:211
msgid "Turn off display"
msgstr ""

#: plugin.py:214
msgid "Offset" msgid "Offset"
msgstr "" msgstr ""


#: plugin.py:252 plugin.py:266
msgid "3D settings" msgid "3D settings"
msgstr "" msgstr ""


#: plugin.py:260
msgid "3D: Enable side by side menu" msgid "3D: Enable side by side menu"
msgstr "" msgstr ""


#: plugin.py:262
msgid "3D: Enable top/bottom menu" msgid "3D: Enable top/bottom menu"
msgstr "" msgstr ""


#: plugin.py:264
msgid "3D: 2D menu"
msgstr ""

#: plugin.py:264
msgid "3D: disable 3D menu" msgid "3D: disable 3D menu"
msgstr "" msgstr ""


#: plugin.py:266
msgid "Change 3D settings" msgid "Change 3D settings"
msgstr "" msgstr ""


37 changes: 35 additions & 2 deletions 3dsettings/po/de.po
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 3D Settings\n" "Project-Id-Version: 3D Settings\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-12-23 18:35+0200\n" "POT-Creation-Date: 2012-05-01 23:19+CEST\n"
"PO-Revision-Date: \n" "PO-Revision-Date: \n"
"Last-Translator: Dr.Best <dr.best@dreambox-tools.info>\n" "Last-Translator: Shaderman <shaderman@dreambox-tools.info>\n"
"Language-Team: Dr. Best <dr.best@dreambox-tools.info>\n" "Language-Team: Dr. Best <dr.best@dreambox-tools.info>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
Expand All @@ -13,48 +13,81 @@ msgstr ""
"X-Poedit-Country: Germany\n" "X-Poedit-Country: Germany\n"
"X-Poedit-SourceCharset: utf-8\n" "X-Poedit-SourceCharset: utf-8\n"


#: plugin.py:76
msgid "off" msgid "off"
msgstr "Aus" msgstr "Aus"


#: plugin.py:76
msgid "on with side by side" msgid "on with side by side"
msgstr "an mit Nebeneinander-Anzeige" msgstr "an mit Nebeneinander-Anzeige"


#: plugin.py:76
msgid "on with top/bottom" msgid "on with top/bottom"
msgstr "an mit Oben/Unten-Anzeige" msgstr "an mit Oben/Unten-Anzeige"


#: plugin.py:172
msgid "Cancel"
msgstr "Beenden"

#: plugin.py:173
msgid "OK"
msgstr "OK"

#: plugin.py:196
msgid "Side by side" msgid "Side by side"
msgstr "Nebeneinander" msgstr "Nebeneinander"


#: plugin.py:197
msgid "Top/Bottom" msgid "Top/Bottom"
msgstr "Oben/Unten" msgstr "Oben/Unten"


#: plugin.py:199
#: plugin.py:202
msgid "2D mode" msgid "2D mode"
msgstr "2D Modus" msgstr "2D Modus"


#: plugin.py:207
msgid "Show side by side option in extension menu" msgid "Show side by side option in extension menu"
msgstr "Aktiviere Nebeneinander Option in Extension-Menü" msgstr "Aktiviere Nebeneinander Option in Extension-Menü"


#: plugin.py:208
msgid "Show top/bottom option in extension menu" msgid "Show top/bottom option in extension menu"
msgstr "Aktiviere Oben/Unten Option in Extension-Menü" msgstr "Aktiviere Oben/Unten Option in Extension-Menü"


#: plugin.py:209
msgid "Switch OSD automatically" msgid "Switch OSD automatically"
msgstr "Automatisch umstellen" msgstr "Automatisch umstellen"


#: plugin.py:211
msgid "Turn off display"
msgstr "Display ausschalten"

#: plugin.py:214
msgid "Offset" msgid "Offset"
msgstr "Offset" msgstr "Offset"


#: plugin.py:252
#: plugin.py:266
msgid "3D settings" msgid "3D settings"
msgstr "3D Einstellungen" msgstr "3D Einstellungen"


#: plugin.py:260
msgid "3D: Enable side by side menu" msgid "3D: Enable side by side menu"
msgstr "3D: Nebeneinander-Anzeige einschalten" msgstr "3D: Nebeneinander-Anzeige einschalten"


#: plugin.py:262
msgid "3D: Enable top/bottom menu" msgid "3D: Enable top/bottom menu"
msgstr "3D Oben/Unten-Anzeige einschalten" msgstr "3D Oben/Unten-Anzeige einschalten"


#: plugin.py:264
msgid "3D: 2D menu"
msgstr "3D: 2D Menu"

#: plugin.py:264
msgid "3D: disable 3D menu" msgid "3D: disable 3D menu"
msgstr "3D: 3D Anzeige deaktivieren" msgstr "3D: 3D Anzeige deaktivieren"


#: plugin.py:266
msgid "Change 3D settings" msgid "Change 3D settings"
msgstr "3D Einstellungen bearbeiten" msgstr "3D Einstellungen bearbeiten"


50 changes: 28 additions & 22 deletions 3dsettings/po/it.po
View file
Original file line number Original file line Diff line number Diff line change
@@ -1,9 +1,11 @@
# Signed-off-by: Dario Croci <spaeleus@croci.org>
#
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: enigma2 plugin - 3dsettings\n" "Project-Id-Version: enigma2 plugin - 3dsettings\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-12-23 21:56+0100\n" "POT-Creation-Date: 2012-05-01 23:39+0100\n"
"PO-Revision-Date: 2011-12-23 22:44+0100\n" "PO-Revision-Date: 2012-05-01 23:42+0100\n"
"Last-Translator: Spaeleus <spaeleus@croci.org>\n" "Last-Translator: Spaeleus <spaeleus@croci.org>\n"
"Language-Team: www.linsat.net <spaeleus@croci.org>\n" "Language-Team: www.linsat.net <spaeleus@croci.org>\n"
"Language: \n" "Language: \n"
Expand All @@ -18,77 +20,81 @@ msgstr ""
"X-Poedit-SourceCharset: utf-8\n" "X-Poedit-SourceCharset: utf-8\n"
"X-Poedit-SearchPath-0: .../enigma2-plugins/3dsettings\n" "X-Poedit-SearchPath-0: .../enigma2-plugins/3dsettings\n"


#: .../enigma2-plugins/3dsettings/src/plugin.py:45 #: .../enigma2-plugins/3dsettings/src/plugin.py:76
msgid "off" msgid "off"
msgstr "Off" msgstr "Off"


#: .../enigma2-plugins/3dsettings/src/plugin.py:45 #: .../enigma2-plugins/3dsettings/src/plugin.py:76
msgid "on with side by side" msgid "on with side by side"
msgstr "Attiva: Affiancato" msgstr "Attiva: Affiancato"


#: .../enigma2-plugins/3dsettings/src/plugin.py:45 #: .../enigma2-plugins/3dsettings/src/plugin.py:76
msgid "on with top/bottom" msgid "on with top/bottom"
msgstr "Attivo: Sopra/Sotto" msgstr "Attivo: Sopra/Sotto"


#: .../enigma2-plugins/3dsettings/src/plugin.py:139 #: .../enigma2-plugins/3dsettings/src/plugin.py:172
msgid "Cancel" msgid "Cancel"
msgstr "Annull." msgstr "Annull."


#: .../enigma2-plugins/3dsettings/src/plugin.py:140 #: .../enigma2-plugins/3dsettings/src/plugin.py:173
msgid "OK" msgid "OK"
msgstr "Ok" msgstr "Ok"


#: .../enigma2-plugins/3dsettings/src/plugin.py:163 #: .../enigma2-plugins/3dsettings/src/plugin.py:196
msgid "Side by side" msgid "Side by side"
msgstr "Affiancato" msgstr "Affiancato"


#: .../enigma2-plugins/3dsettings/src/plugin.py:164 #: .../enigma2-plugins/3dsettings/src/plugin.py:197
msgid "Top/Bottom" msgid "Top/Bottom"
msgstr "Sopra/Sotto" msgstr "Sopra/Sotto"


#: .../enigma2-plugins/3dsettings/src/plugin.py:166 #: .../enigma2-plugins/3dsettings/src/plugin.py:199
#: .../enigma2-plugins/3dsettings/src/plugin.py:169 #: .../enigma2-plugins/3dsettings/src/plugin.py:202
msgid "2D mode" msgid "2D mode"
msgstr "Mod. 2D" msgstr "Mod. 2D"


#: .../enigma2-plugins/3dsettings/src/plugin.py:174 #: .../enigma2-plugins/3dsettings/src/plugin.py:207
msgid "Show side by side option in extension menu" msgid "Show side by side option in extension menu"
msgstr "Mostrare l'opzione \"Affiancato\" nel menu estensioni" msgstr "Mostrare l'opzione \"Affiancato\" nel menu estensioni"


#: .../enigma2-plugins/3dsettings/src/plugin.py:175 #: .../enigma2-plugins/3dsettings/src/plugin.py:208
msgid "Show top/bottom option in extension menu" msgid "Show top/bottom option in extension menu"
msgstr "Mostrare l'opzione \"Sopra/Sotto\" nel menu estensioni" msgstr "Mostrare l'opzione \"Sopra/Sotto\" nel menu estensioni"


#: .../enigma2-plugins/3dsettings/src/plugin.py:176 #: .../enigma2-plugins/3dsettings/src/plugin.py:209
msgid "Switch OSD automatically" msgid "Switch OSD automatically"
msgstr "Commutazione automatica OSD" msgstr "Commutazione automatica OSD"


#: .../enigma2-plugins/3dsettings/src/plugin.py:179 #: .../enigma2-plugins/3dsettings/src/plugin.py:211
msgid "Turn off display"
msgstr "Spegnere il display"

#: .../enigma2-plugins/3dsettings/src/plugin.py:214
msgid "Offset" msgid "Offset"
msgstr "Offset" msgstr "Offset"


#: .../enigma2-plugins/3dsettings/src/plugin.py:217 #: .../enigma2-plugins/3dsettings/src/plugin.py:252
#: .../enigma2-plugins/3dsettings/src/plugin.py:231 #: .../enigma2-plugins/3dsettings/src/plugin.py:266
msgid "3D settings" msgid "3D settings"
msgstr "3D: Impostazioni" msgstr "3D: Impostazioni"


#: .../enigma2-plugins/3dsettings/src/plugin.py:225 #: .../enigma2-plugins/3dsettings/src/plugin.py:260
msgid "3D: Enable side by side menu" msgid "3D: Enable side by side menu"
msgstr "3D: abilitare il menu \"Affiancato\"" msgstr "3D: abilitare il menu \"Affiancato\""


#: .../enigma2-plugins/3dsettings/src/plugin.py:227 #: .../enigma2-plugins/3dsettings/src/plugin.py:262
msgid "3D: Enable top/bottom menu" msgid "3D: Enable top/bottom menu"
msgstr "3D: abilitare il menu \"Sopra/Sotto\"" msgstr "3D: abilitare il menu \"Sopra/Sotto\""


#: .../enigma2-plugins/3dsettings/src/plugin.py:229 #: .../enigma2-plugins/3dsettings/src/plugin.py:264
msgid "3D: disable 3D menu" msgid "3D: disable 3D menu"
msgstr "3D: disabilitare menu 3D" msgstr "3D: disabilitare menu 3D"


#: .../enigma2-plugins/3dsettings/src/plugin.py:229 #: .../enigma2-plugins/3dsettings/src/plugin.py:264
msgid "3D: 2D menu" msgid "3D: 2D menu"
msgstr "3D: menu 2D" msgstr "3D: menu 2D"


#: .../enigma2-plugins/3dsettings/src/plugin.py:231 #: .../enigma2-plugins/3dsettings/src/plugin.py:266
msgid "Change 3D settings" msgid "Change 3D settings"
msgstr "Cambiare impostazioni 3D" msgstr "Cambiare impostazioni 3D"


Loading

0 comments on commit def3dc4

Please sign in to comment.