From: Fraxinas Date: Fri, 11 Jun 2010 21:06:20 +0000 (+0200) Subject: Merge branch 'experimental' of git.opendreambox.org:/git/enigma2 into experimental X-Git-Tag: 3.0.0~28^2~50 X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/681626f670c65e4ab063dd08840559c767da32fb?hp=f7f442a1d0845e7dfd923c1d783eb612357f3e94 Merge branch 'experimental' of git.opendreambox.org:/git/enigma2 into experimental --- diff --git a/configure.ac b/configure.ac index ecde57d6..05c3a8eb 100755 --- a/configure.ac +++ b/configure.ac @@ -92,7 +92,6 @@ data/defaults/Makefile data/defaults/Dream/Makefile data/defaults/Dream/hdbouquets/Makefile data/defaults/Dream/sdbouquets/Makefile -data/dm800se/Makefile data/extensions/Makefile data/skin_default/Makefile data/skin_default/menu/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index fcc29a8d..1ed9444b 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = countries fonts defaults extensions skin_default dm800se +SUBDIRS = countries fonts defaults extensions skin_default dist_pkgdata_DATA = \ defaultsatlists.xml \ diff --git a/data/dm800se/Makefile.am b/data/dm800se/Makefile.am deleted file mode 100644 index 11eb2d00..00000000 --- a/data/dm800se/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -installdir = $(pkgdatadir)/dm800se - -dist_install_DATA = \ - skin.xml diff --git a/data/dm800se/skin.xml b/data/dm800se/skin.xml deleted file mode 100644 index e5ff26cd..00000000 --- a/data/dm800se/skin.xml +++ /dev/null @@ -1,366 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - <color name="Background" color="#25062748" /> - <color name="LabelForeground" color="#ffffff" /> - <color name="ListboxBackground" color="#25062748" /> - <color name="ListboxForeground" color="#ffffff" /> - <color name="ListboxSelectedBackground" color="#254f7497" /> - <color name="ListboxSelectedForeground" color="#ffffff" /> - <color name="ListboxMarkedBackground" color="#ff0000" /> - <color name="ListboxMarkedForeground" color="#ffffff" /> - <color name="ListboxMarkedAndSelectedBackground" color="#800000" /> - <color name="ListboxMarkedAndSelectedForeground" color="#ffffff" /> - <color name="WindowTitleForeground" color="#ffffff" /> - <color name="WindowTitleBackground" color="#25062748" /> - <!-- Main screen border png's --> - <borderset name="bsWindow"> - <pixmap pos="bpTopLeft" filename="skin_default/b_tl.png" /> - <pixmap pos="bpTop" filename="skin_default/b_t.png" /> - <pixmap pos="bpTopRight" filename="skin_default/b_tr.png" /> - <pixmap pos="bpLeft" filename="skin_default/b_l.png" /> - <pixmap pos="bpRight" filename="skin_default/b_r.png" /> - <pixmap pos="bpBottomLeft" filename="skin_default/b_bl.png" /> - <pixmap pos="bpBottom" filename="skin_default/b_b.png" /> - <pixmap pos="bpBottomRight" filename="skin_default/b_br.png" /> - </borderset> - </windowstyle> - <!-- Main screen colors (id=1 LCD) --> - <windowstyle type="skinned" id="1"> - <color name="Background" color="#000000" /> - <color name="LabelForeground" color="#ffffff" /> - <color name="ListboxBackground" color="#000000" /> - <color name="ListboxForeground" color="#ffffff" /> - <color name="ListboxSelectedBackground" color="#000000" /> - <color name="ListboxSelectedForeground" color="#ffffff" /> - <color name="ListboxMarkedBackground" color="#000000" /> - <color name="ListboxMarkedForeground" color="#ffffff" /> - <color name="ListboxMarkedAndSelectedBackground" color="#000000" /> - <color name="ListboxMarkedAndSelectedForeground" color="#ffffff" /> - <color name="WindowTitleForeground" color="#ffffff" /> - <color name="WindowTitleBackground" color="#000000" /> - </windowstyle> - <!-- Fonts --> - <fonts> - <!-- <font filename="md_khmurabi_10.ttf" name="Regular" scale="90" /> --> - <font filename="nmsbd.ttf" name="Regular" scale="90" /> - <font filename="lcd.ttf" name="LCD" scale="100" /> - <font filename="ae_AlMateen.ttf" name="Replacement" scale="90" replacement="1" /> - <font filename="tuxtxt.ttf" name="Console" scale="100" /> - </fonts> - <!-- Subtitle effects --> - <subtitles> - <sub name="Subtitle_TTX" font="Regular;30" shadowColor="#40101010" shadowOffset="3,3" /> - <sub name="Subtitle_Regular" font="Regular;30" foregroundColor="#DCDCDC" shadowColor="#40101010" shadowOffset="3,3" /> - <sub name="Subtitle_Bold" font="Replacement;30" foregroundColor="#DCDCDC" shadowColor="#40101010" shadowOffset="3,3" /> - <sub name="Subtitle_Italic" font="Regular;30" foregroundColor="#DCAAAA" shadowColor="#40101010" shadowOffset="3,3" /> - <!-- omitting foregroundColor attribute will enable auto-assignment of color --> - </subtitles> - <!-- Main infobar --> - <screen name="InfoBar" flags="wfNoBorder" position="0,380" size="720,160" title="InfoBar" backgroundColor="transparent"> - <!-- Background --> - <ePixmap position="0,0" zPosition="-1" size="720,160" pixmap="skin_default/info-bg.png" /> - <ePixmap position="27,73" size="665,71" pixmap="skin_default/screws.png" alphatest="on" transparent="1" /> - <!-- Signal Quality --> - <eLabel text="SNR" position="205,3" size="40,22" font="Regular;16" backgroundColor="#102e59" foregroundColor="#cccccc" shadowColor="#27384f" shadowOffset="-1,-1" transparent="1" /> - <widget source="session.FrontendStatus" render="Label" position="242,3" size="80,22" font="Regular;16" backgroundColor="#102e59" foregroundColor="#e7e7e7" shadowColor="#27384f" shadowOffset="-1,-1" transparent="1"> - <convert type="FrontendInfo">SNRdB</convert> - </widget> - <!-- Bit error rate --> - <eLabel text="BER" position="317,3" size="40,22" font="Regular;16" backgroundColor="#102e59" foregroundColor="#cccccc" shadowColor="#27384f" shadowOffset="-1,-1" transparent="1" noWrap="1" /> - <widget source="session.FrontendStatus" render="Label" position="355,3" size="43,22" font="Regular;16" backgroundColor="#102e59" foregroundColor="#e7e7e7" shadowColor="#27384f" shadowOffset="-1,-1" transparent="1" noWrap="1"> - <convert type="FrontendInfo">BER</convert> - </widget> - <!-- Channellogo (Picon) --> - <widget source="session.CurrentService" render="Picon" position="49,4" zPosition="1" size="70,53" alphatest="on"> - <convert type="ServiceName">Reference</convert> - </widget> - <!-- Service name --> - <widget source="session.CurrentService" render="Label" position="130,30" size="360,27" font="Regular;21" valign="center" halign="right" noWrap="1" backgroundColor="#263c59" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1"> - <convert type="ServiceName">Name</convert> - </widget> - <!-- Time --> - <ePixmap pixmap="skin_default/icons/clock.png" position="600,23" size="14,14" alphatest="on" /> - <widget source="global.CurrentTime" render="Label" position="615,21" size="55,24" font="Regular;21" halign="right" backgroundColor="#4e5a74" transparent="1"> - <convert type="ClockToText">Default</convert> - </widget> - <!-- tuners in use? --> - <widget source="session.FrontendInfo" render="Pixmap" position="142,6" size="8,9" pixmap="skin_default/nim_active.png" alphatest="on"> - <convert type="FrontendInfo">NUMBER</convert> - <convert type="ValueRange">0,0</convert> - <convert type="ConditionalShowHide" /> - </widget> - <widget source="session.FrontendInfo" render="Pixmap" position="142,19" size="8,9" pixmap="skin_default/nim_active.png" alphatest="on"> - <convert type="FrontendInfo">NUMBER</convert> - <convert type="ValueRange">1,1</convert> - <convert type="ConditionalShowHide" /> - </widget> - <widget source="session.FrontendInfo" render="Pixmap" position="142,32" size="8,9" pixmap="skin_default/nim_active.png" alphatest="on"> - <convert type="FrontendInfo">NUMBER</convert> - <convert type="ValueRange">2,2</convert> - <convert type="ConditionalShowHide" /> - </widget> - <widget source="session.FrontendInfo" render="Pixmap" position="142,45" size="8,9" pixmap="skin_default/nim_active.png" alphatest="on"> - <convert type="FrontendInfo">NUMBER</convert> - <convert type="ValueRange">3,3</convert> - <convert type="ConditionalShowHide" /> - </widget> - <widget source="session.TunerInfo" render="FixedLabel" text="A" position="129,4" size="15,13" font="Regular;14" backgroundColor="#4e5a74" transparent="1"> - <convert type="TunerInfo">TunerUseMask</convert> - <convert type="ValueBitTest">1</convert> - <convert type="ConditionalShowHide" /> - </widget> - <widget source="session.TunerInfo" render="FixedLabel" text="B" position="129,17" size="15,13" font="Regular;14" backgroundColor="#4e5a74" transparent="1"> - <convert type="TunerInfo">TunerUseMask</convert> - <convert type="ValueBitTest">2</convert> - <convert type="ConditionalShowHide" /> - </widget> - <widget source="session.TunerInfo" render="FixedLabel" text="C" position="129,30" size="15,13" font="Regular;14" backgroundColor="#4e5a74" transparent="1"> - <convert type="TunerInfo">TunerUseMask</convert> - <convert type="ValueBitTest">4</convert> - <convert type="ConditionalShowHide" /> - </widget> - <widget source="session.TunerInfo" render="FixedLabel" text="D" position="129,43" size="15,13" font="Regular;14" backgroundColor="#4e5a74" transparent="1"> - <convert type="TunerInfo">TunerUseMask</convert> - <convert type="ValueBitTest">8</convert> - <convert type="ConditionalShowHide" /> - </widget> - <!-- Crypt icon (encrypted service?) --> - <ePixmap position="563,48" zPosition="0" size="107,15" pixmap="skin_default/icons/icons_off.png" /> - <widget source="session.CurrentService" render="Pixmap" pixmap="skin_default/icons/icon_crypt.png" position="563,48" zPosition="1" size="12,16" alphatest="on"> - <convert type="ServiceInfo">IsCrypted</convert> - <convert type="ConditionalShowHide" /> - </widget> - <!-- Teletext icon (is teletext available?) --> - <widget source="session.CurrentService" render="Pixmap" pixmap="skin_default/icons/icon_txt.png" position="580,48" zPosition="1" size="26,16" alphatest="on"> - <convert type="ServiceInfo">HasTelext</convert> - <convert type="ConditionalShowHide" /> - </widget> - <!-- Videoformat icon (16:9?) --> - <widget source="session.CurrentService" render="Pixmap" pixmap="skin_default/icons/icon_format.png" position="611,48" zPosition="1" size="29,16" alphatest="on"> - <convert type="ServiceInfo">IsWidescreen</convert> - <convert type="ConditionalShowHide" /> - </widget> - <!-- Audio icon (is there multichannel audio?) --> - <widget source="session.CurrentService" render="Pixmap" pixmap="skin_default/icons/icon_dolby.png" position="645,48" zPosition="1" size="26,16" alphatest="on"> - <convert type="ServiceInfo">IsMultichannel</convert> - <convert type="ConditionalShowHide" /> - </widget> - <!-- Progressbar (current event duration)--> - <ePixmap pixmap="skin_default/progress_bg.png" position="48,77" size="84,7" transparent="1" alphatest="on" /> - <widget source="session.Event_Now" render="Progress" pixmap="skin_default/progress_small.png" position="50,78" zPosition="1" size="80,5" transparent="1"> - <convert type="EventTime">Progress</convert> - </widget> - <!-- Blinking pixmap (recording in progress?) --> - <ePixmap pixmap="skin_default/icons/icon_rec_off.png" position="561,21" size="34,21" /> - <widget source="session.RecordState" render="Pixmap" pixmap="skin_default/icons/icon_rec.png" position="561,21" zPosition="1" size="34,21"> - <convert type="ConditionalShowHide">Blink</convert> - </widget> - <!-- Event (now) --> - <ePixmap pixmap="skin_default/icons/icon_event.png" position="182,78" size="15,10" alphatest="on" /> - <widget source="session.Event_Now" render="Label" position="205,73" size="60,24" font="Regular;20" backgroundColor="#34406f" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1"> - <convert type="EventTime">StartTime</convert> - <convert type="ClockToText">Default</convert> - </widget> - <widget source="session.Event_Now" render="Label" position="265,73" size="320,24" font="Regular;20" noWrap="1" backgroundColor="#34406f" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1"> - <convert type="EventName">Name</convert> - </widget> - <widget source="session.Event_Now" render="Label" position="585,73" size="85,24" font="Regular;20" backgroundColor="#34406f" shadowColor="#1d354c" shadowOffset="-1,-1" halign="right" transparent="1"> - <convert type="EventTime">Remaining</convert> - <convert type="RemainingToText">InMinutes</convert> - </widget> - <!-- Event (next) --> - <widget source="session.Event_Next" render="Label" position="205,97" size="60,24" font="Regular;20" backgroundColor="#071f38" foregroundColor="#c3c3c9" transparent="1"> - <convert type="EventTime">StartTime</convert> - <convert type="ClockToText">Default</convert> - </widget> - <widget source="session.Event_Next" render="Label" position="265,97" size="320,24" font="Regular;20" noWrap="1" backgroundColor="#071f38" foregroundColor="#c3c3c9" transparent="1"> - <convert type="EventName">Name</convert> - </widget> - <widget source="session.Event_Next" render="Label" position="585,97" size="85,24" font="Regular;20" backgroundColor="#071f38" foregroundColor="#c3c3c9" halign="right" transparent="1"> - <convert type="EventTime">Duration</convert> - <convert type="ClockToText">InMinutes</convert> - </widget> - <!-- Red button (is recording possible?) --> - <ePixmap pixmap="skin_default/buttons/button_red_off.png" position="212,130" size="15,16" alphatest="on" /> - <widget source="RecordingPossible" render="Pixmap" pixmap="skin_default/buttons/button_red.png" position="212,130" zPosition="1" size="15,16" alphatest="on"> - <convert type="ConditionalShowHide" /> - </widget> - <!--eLabel text="Record" position="232,130" size="80,22" font="Regular;16" foregroundColor="#7f848d" backgroundColor="#182946" transparent="1" /--> - <widget source="ShowRecordOnRed" render="FixedLabel" text="Record" position="232,130" zPosition="1" size="80,22" font="Regular;16" foregroundColor="#7f848d" backgroundColor="#182946" transparent="1"> - <convert type="ConditionalShowHide" /> - </widget> - <widget source="RecordingPossible" render="FixedLabel" text="Record" position="232,130" zPosition="1" size="80,22" font="Regular;16" backgroundColor="#182946" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1"> - <convert type="ConditionalShowHide" /> - </widget> - <!-- Green button (is subservices available?) --> - <ePixmap pixmap="skin_default/buttons/button_green_off.png" position="315,130" size="15,16" alphatest="on" /> - <widget source="session.CurrentService" render="Pixmap" pixmap="skin_default/buttons/button_green.png" position="315,130" zPosition="1" size="15,16" alphatest="on"> - <convert type="ServiceInfo">SubservicesAvailable</convert> - <convert type="ConditionalShowHide" /> - </widget> - <eLabel text="Subservices" position="335,130" size="100,22" font="Regular;16" foregroundColor="#7f848d" backgroundColor="#182946" transparent="1" /> - <widget source="session.CurrentService" render="FixedLabel" text="Subservices" position="335,130" zPosition="1" size="100,22" font="Regular;16" backgroundColor="#182946" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1"> - <convert type="ServiceInfo">SubservicesAvailable</convert> - <convert type="ConditionalShowHide" /> - </widget> - <!-- Yellow button (is timeshift possible?) --> - <ePixmap pixmap="skin_default/buttons/button_yellow_off.png" position="440,130" size="15,16" alphatest="on" /> - <widget source="TimeshiftPossible" render="Pixmap" pixmap="skin_default/buttons/button_yellow.png" position="440,130" zPosition="1" size="15,16" alphatest="on"> - <convert type="ConditionalShowHide" /> - </widget> - <widget source="ShowTimeshiftOnYellow" render="FixedLabel" text="Timeshift" position="460,130" zPosition="1" size="85,22" font="Regular;16" foregroundColor="#7f848d" backgroundColor="#182946" shadowOffset="-1,-1" transparent="1"> - <convert type="ConditionalShowHide" /> - </widget> - <widget source="TimeshiftPossible" render="FixedLabel" text="Timeshift" position="460,130" zPosition="1" size="85,22" font="Regular;16" backgroundColor="#182946" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1"> - <convert type="ConditionalShowHide" /> - </widget> - - <!-- Yellow button (used for audio on boxes with new rc?) --> - <widget source="ShowAudioOnYellow" render="Pixmap" pixmap="skin_default/buttons/button_yellow.png" position="440,130" zPosition="1" size="15,16" alphatest="on"> - <convert type="ConditionalShowHide" /> - </widget> - <widget source="ShowAudioOnYellow" render="FixedLabel" text="Audio" position="460,130" zPosition="1" size="85,22" font="Regular;16" backgroundColor="#182946" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1"> - <convert type="ConditionalShowHide" /> - </widget> - <!-- Blue button (is extensions available?) --> - <ePixmap pixmap="skin_default/buttons/button_blue_off.png" position="545,130" size="15,16" alphatest="on" /> - <widget source="ExtensionsAvailable" render="Pixmap" pixmap="skin_default/buttons/button_blue.png" position="545,130" zPosition="1" size="15,16" alphatest="on"> - <convert type="ConditionalShowHide" /> - </widget> - <eLabel text="Extensions" position="565,130" size="110,22" font="Regular;16" foregroundColor="#7f848d" backgroundColor="#182946" transparent="1" /> - <widget source="ExtensionsAvailable" render="FixedLabel" text="Extensions" position="565,130" zPosition="1" size="110,22" font="Regular;16" backgroundColor="#182946" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1"> - <convert type="ConditionalShowHide" /> - </widget> - </screen> - <!-- Main menu --> - <screen name="menu_mainmenu" position="center,center" size="380,285" title="Main menu"> - <widget source="title" render="Label" position="170,10" size="200,35" font="Regular;23" /> - <widget source="menu" render="Listbox" position="170,55" size="200,225" scrollbarMode="showOnDemand"> - <convert type="StringList" /> - </widget> - <widget source="menu" render="Pixmap" pixmap="skin_default/menu/shutdown.png" position="20,20" size="128,128" alphatest="on"> - <convert type="MenuEntryCompare">standby_restart_list</convert> - <convert type="ConditionalShowHide" /> - </widget> - <widget source="menu" render="Pixmap" pixmap="skin_default/menu/setup.png" position="20,20" size="128,128" alphatest="on"> - <convert type="MenuEntryCompare">setup_selection</convert> - <convert type="ConditionalShowHide" /> - </widget> - <widget source="menu" render="Pixmap" pixmap="skin_default/menu/plugins.png" position="20,20" size="128,128" alphatest="on"> - <convert type="MenuEntryCompare">plugin_selection</convert> - <convert type="ConditionalShowHide" /> - </widget> - <widget source="menu" render="Pixmap" pixmap="skin_default/menu/information.png" position="20,20" size="128,128" alphatest="on"> - <convert type="MenuEntryCompare">info_screen</convert> - <convert type="ConditionalShowHide" /> - </widget> - <widget source="menu" render="Pixmap" pixmap="skin_default/menu/scart.png" position="20,20" size="128,128" alphatest="on"> - <convert type="MenuEntryCompare">scart_switch</convert> - <convert type="ConditionalShowHide" /> - </widget> - <widget source="menu" render="Pixmap" pixmap="skin_default/menu/timer.png" position="20,20" size="128,128" alphatest="on"> - <convert type="MenuEntryCompare">timer_edit</convert> - <convert type="ConditionalShowHide" /> - </widget> - <widget source="menu" render="Pixmap" pixmap="skin_default/menu/media_player.png" position="20,20" size="128,128" alphatest="on"> - <convert type="MenuEntryCompare">media_player</convert> - <convert type="ConditionalShowHide" /> - </widget> - <widget source="menu" render="Pixmap" pixmap="skin_default/menu/dvd_player.png" position="20,20" size="128,128" alphatest="on"> - <convert type="MenuEntryCompare">dvd_player</convert> - <convert type="ConditionalShowHide" /> - </widget> - <widget source="menu" render="Pixmap" pixmap="skin_default/menu/subtitles.png" position="20,20" size="128,128" alphatest="on"> - <convert type="MenuEntryCompare">subtitle_selection</convert> - <convert type="ConditionalShowHide"/> - </widget> - </screen> - <!-- Movieplayer infobar --> - <screen name="MoviePlayer" flags="wfNoBorder" position="0,380" size="720,160" title="InfoBar" backgroundColor="transparent"> - <!-- Background --> - <ePixmap position="0,0" pixmap="skin_default/info-bg_mp.png" zPosition="-1" size="720,160" /> - <ePixmap position="29,40" pixmap="skin_default/screws_mp.png" size="665,104" alphatest="on" /> - <!-- colorbuttons --> - <ePixmap position="48,70" pixmap="skin_default/icons/mp_buttons.png" size="108,13" alphatest="on" /> - <!-- Servicename --> - <ePixmap pixmap="skin_default/icons/icon_event.png" position="207,78" size="15,10" alphatest="on" /> - <widget source="session.CurrentService" render="Label" position="230,73" size="360,40" font="Regular;20" backgroundColor="#263c59" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1"> - <convert type="ServiceName">Name</convert> - </widget> - <!-- movie length --> - <widget source="session.CurrentService" render="Label" position="580,73" size="90,24" font="Regular;20" halign="right" backgroundColor="#4e5a74" transparent="1"> - <convert type="ServicePosition">Length</convert> - </widget> - <!-- Elapsed time --> - <widget source="session.CurrentService" render="Label" position="205,129" size="100,20" font="Regular;18" halign="center" valign="center" backgroundColor="#06224f" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1"> - <convert type="ServicePosition">Position</convert> - </widget> - <!-- Progressbar (movie position)--> - <widget source="session.CurrentService" render="PositionGauge" position="300,133" size="270,10" zPosition="2" pointer="skin_default/position_pointer.png:540,0" transparent="1" foregroundColor="#20224f"> - <convert type="ServicePosition">Gauge</convert> - </widget> - <!-- Remaining time --> - <widget source="session.CurrentService" render="Label" position="576,129" size="100,20" font="Regular;18" halign="center" valign="center" backgroundColor="#06224f" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1"> - <convert type="ServicePosition">Remaining,Negate</convert> - </widget> - </screen> - - <!-- LCD screen (main) --> - <screen name="InfoBarSummary" position="0,0" size="132,64"> - <widget source="session.CurrentService" render="Label" position="3,0" size="90,25" font="Regular;14" halign="center" valign="center" > - <convert type="ServiceName">Name</convert> - </widget> - <widget source="session.Event_Now" render="Progress" position="8,27" size="80,5" borderWidth="1"> - <convert type="EventTime">Progress</convert> - </widget> - <widget source="global.CurrentTime" render="Label" position="3,32" size="65,32" font="Regular;26" halign="right" valign="top"> - <convert type="ClockToText">Format:%H:%M</convert> - </widget> - <widget source="global.CurrentTime" render="Label" position="70,34" zPosition="1" size="26,30" font="Regular;14" valign="top"> - <convert type="ClockToText">Format:%S</convert> - </widget> - <widget source="session.RecordState" render="FixedLabel" text=" " position="6,30" zPosition="1" size="120,34"> - <convert type="ConfigEntryTest">config.usage.blinking_display_clock_during_recording,True,CheckSourceBoolean</convert> - <convert type="ConditionalShowHide">Blink</convert> - </widget> - </screen> - - <!-- LCD screen (channelselection) --> - <screen name="ChannelSelection_summary" position="0,0" size="132,64"> - <widget source="parent.ServiceEvent" render="Label" position="3,0" size="90,25" font="Regular;14" halign="center" valign="center" > - <convert type="ServiceName">Name</convert> - </widget> - <widget source="parent.ServiceEvent" render="Progress" position="8,27" size="80,5" borderWidth="1"> - <convert type="EventTime">Progress</convert> - </widget> - <widget source="global.CurrentTime" render="Label" position="3,32" size="65,32" font="Regular;26" halign="right" valign="top"> - <convert type="ClockToText">Format:%H:%M</convert> - </widget> - <widget source="global.CurrentTime" render="Label" position="70,34" zPosition="1" size="26,30" font="Regular;14" valign="top"> - <convert type="ClockToText">Format:%S</convert> - </widget> - </screen> -</skin> diff --git a/data/skin.xml b/data/skin.xml index 32adb2be..868fbc4b 100755 --- a/data/skin.xml +++ b/data/skin.xml @@ -61,6 +61,20 @@ <color name="WindowTitleForeground" color="#ffffff" /> <color name="WindowTitleBackground" color="#000000" /> </windowstyle> + <windowstyle type="skinned" id="2"> + <color name="Background" color="#000000" /> + <color name="LabelForeground" color="#ffffff" /> + <color name="ListboxBackground" color="#000000" /> + <color name="ListboxForeground" color="#ffffff" /> + <color name="ListboxSelectedBackground" color="#000000" /> + <color name="ListboxSelectedForeground" color="#ffffff" /> + <color name="ListboxMarkedBackground" color="#000000" /> + <color name="ListboxMarkedForeground" color="#ffffff" /> + <color name="ListboxMarkedAndSelectedBackground" color="#000000" /> + <color name="ListboxMarkedAndSelectedForeground" color="#ffffff" /> + <color name="WindowTitleForeground" color="#ffffff" /> + <color name="WindowTitleBackground" color="#000000" /> + </windowstyle> <!-- Fonts --> <fonts> <!-- <font filename="md_khmurabi_10.ttf" name="Regular" scale="90" /> --> diff --git a/data/skin_default.xml b/data/skin_default.xml index aceafd73..a2bcc6f7 100755 --- a/data/skin_default.xml +++ b/data/skin_default.xml @@ -203,9 +203,7 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count > 7 and 2 or 3) </applet> </screen> - <screen name="ChoiceBox_summary" position="0,0" size="132,64"> - <widget source="parent.summary_list" render="Label" position="6,0" size="126,64" font="Regular;11" /> - </screen> + <!-- Common interface --> <screen name="MMIDialog" position="center,center" size="450,270"> <widget name="title" position="10,10" size="430,25" font="Regular;23" /> @@ -550,10 +548,6 @@ newwidth = wsize[0] self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) </applet> </screen> - <screen name="MessageBox_summary" position="0,0" size="132,64"> - <widget source="parent.Text" render="Label" position="0,0" size="132,52" font="Regular;11" halign="center" valign="center" /> - <widget source="parent.selectedChoice" render="Label" position="6,50" size="120,14" font="Regular;14" halign="center" valign="center" /> - </screen> <!-- Minute input --> <screen name="MinuteInput" position="center,center" size="280,60" title="Seek"> <widget name="minutes" position="80,15" size="160,25" halign="right" font="Regular;23" /> @@ -1093,11 +1087,55 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) <ePixmap pixmap="skin_default/volume.png" position="0,0" size="214,21" /> <widget name="Volume" pixmap="skin_default/progress_small.png" position="31,7" zPosition="1" size="168,7" transparent="1" /> </screen> + <!-- JobView --> + <screen name="JobView" position="center,center" size="520,350" title="Job View"> + <widget source="job_name" render="Label" position="20,12" size="480,60" font="Regular;28" /> + <widget source="job_task" render="Label" position="20,90" size="480,50" font="Regular;23" /> + <widget source="job_progress" render="Progress" position="20,162" size="480,36" borderWidth="2" backgroundColor="#254f7497" /> + <widget source="job_progress" render="Label" position="120,166" size="280,32" font="Regular;28" foregroundColor="#000000" zPosition="2" halign="center" transparent="1" > + <convert type="ProgressToText" /> + </widget> + <widget source="job_status" render="Label" position="20,212" size="480,26" font="Regular;23" /> + <widget name="config" position="20,254" size="480,20" /> + <widget source="cancelable" render="Pixmap" pixmap="skin_default/buttons/red.png" position="20,300" size="140,40" alphatest="on" > + <convert type="ConditionalShowHide" /> + </widget> + <widget source="cancelable" render="FixedLabel" text="Cancel" position="20,300" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" > + <convert type="ConditionalShowHide" /> + </widget> + <widget source="finished" render="Pixmap" pixmap="skin_default/buttons/green.png" position="190,300" size="140,40" alphatest="on" > + <convert type="ConditionalShowHide" /> + </widget> + <widget source="finished" render="FixedLabel" text="OK" font="Regular;20" halign="center" valign="center" position="190,300" size="140,40" transparent="1" backgroundColor="#1f771f" > + <convert type="ConditionalShowHide" /> + </widget> + <widget source="backgroundable" render="Pixmap" pixmap="skin_default/buttons/blue.png" position="360,300" size="140,40" alphatest="on" > + <convert type="ConditionalShowHide" /> + </widget> + <widget source="backgroundable" render="FixedLabel" text="Continue in background" font="Regular;20" halign="center" valign="center" position="360,300" size="140,40" transparent="1" backgroundColor="#18188b" > + <convert type="ConditionalShowHide" /> + </widget> + </screen> + <!-- VirtualKeyBoard --> + <screen name="VirtualKeyBoard" position="center,center" size="560,350" zPosition="99" title="Virtual KeyBoard"> + <ePixmap pixmap="skin_default/vkey_text.png" position="9,35" zPosition="-4" size="542,52" alphatest="on" /> + <widget name="header" position="10,10" size="500,20" font="Regular;20" transparent="1" noWrap="1" /> + <widget name="text" position="12,35" size="536,46" font="Regular;46" transparent="1" noWrap="1" halign="right" /> + <widget name="list" position="10,100" size="540,225" selectionDisabled="1" transparent="1" /> + </screen> + <!-- FileBrowser --> + <screen name="FileBrowser" position="center,center" size="520,430" title="DVD File Browser" > + <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" /> + <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" /> + <widget source="key_red" render="Label" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" /> + <widget source="key_green" render="Label" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" /> + <widget name="filelist" position="5,50" size="510,370" scrollbarMode="showOnDemand" /> + </screen> <!-- LCD/OLED Screens --> <!-- LCD screen (channelselection) --> - <screen name="ChannelSelection_summary" position="0,0" size="132,64"> + <screen name="ChannelSelection_summary" position="0,0" size="132,64" id="1"> <widget source="parent.ServiceEvent" render="Label" position="6,0" size="120,25" font="Regular;14" halign="center" valign="center" > <convert type="ServiceName">Name</convert> </widget> @@ -1110,9 +1148,21 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) <widget source="global.CurrentTime" render="Label" position="100,34" zPosition="1" size="26,30" font="Regular;16" valign="top"> <convert type="ClockToText">Format:%S</convert> </widget> + </screen> + <!-- Color OLED screen (ChannelSelection) --> + <screen name="ChannelSelection_summary" position="0,0" size="96,64" id="2"> + <widget source="parent.ServiceEvent" render="Label" position="0,0" size="96,25" font="Regular;14" halign="center" valign="center" > + <convert type="ServiceName">Name</convert> + </widget> + <widget source="parent.ServiceEvent" render="Progress" position="0,27" size="96,5" borderWidth="1" > + <convert type="EventTime">Progress</convert> + </widget> + <widget source="global.CurrentTime" render="Label" position="0,32" size="96,32" font="Regular;32" halign="center" valign="center" foregroundColor="#FFFFFF" backgroundColor="#000000" > + <convert type="ClockToText">Format:%H:%M</convert> + </widget> </screen> <!-- LCD screen (main) --> - <screen name="InfoBarSummary" position="0,0" size="132,64"> + <screen name="InfoBarSummary" position="0,0" size="132,64" id="1"> <widget source="session.CurrentService" render="Label" position="6,0" size="120,25" font="Regular;14" halign="center" valign="center" > <convert type="ServiceName">Name</convert> </widget> @@ -1130,15 +1180,24 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) <convert type="ConditionalShowHide">Blink</convert> </widget> </screen> - <!-- LCD screen (menus) --> - <screen name="MenuSummary" position="0,0" size="132,64"> - <widget source="parent.title" render="Label" position="6,0" size="120,32" font="Regular;14" halign="center" valign="center"/> - <widget source="parent.menu" render="Label" position="6,32" size="120,32" font="Regular;16" halign="center" valign="center"> - <convert type="StringListSelection" /> + <!-- Color OLED screen (main) --> + <screen name="InfoBarSummary" position="0,0" size="96,64" id="2"> + <widget source="session.CurrentService" render="Label" position="0,0" size="96,25" font="Regular;14" halign="center" valign="center" > + <convert type="ServiceName">Name</convert> + </widget> + <widget source="session.Event_Now" render="Progress" position="0,27" size="96,5" borderWidth="1" > + <convert type="EventTime">Progress</convert> + </widget> + <widget source="global.CurrentTime" render="Label" position="0,32" size="96,32" font="Regular;32" halign="center" valign="center" foregroundColor="#FFFFFF" backgroundColor="#000000" > + <convert type="ClockToText">Format:%H:%M</convert> + </widget> + <widget source="session.RecordState" render="FixedLabel" text=" " position="0,32" zPosition="1" size="96,32"> + <convert type="ConfigEntryTest">config.usage.blinking_display_clock_during_recording,True,CheckSourceBoolean</convert> + <convert type="ConditionalShowHide">Blink</convert> </widget> </screen> <!-- LCD screen (movieplayer) --> - <screen name="InfoBarMoviePlayerSummary" position="0,0" size="132,64"> + <screen name="InfoBarMoviePlayerSummary" position="0,0" size="132,64" id="1"> <widget source="session.CurrentService" render="Label" position="6,0" size="120,25" font="Regular;14" halign="center" valign="center" > <convert type="ServiceName">Name</convert> </widget> @@ -1153,18 +1212,89 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) <convert type="ConditionalShowHide">Blink</convert> </widget> </screen> + <!-- Color OLED screen (movieplayer) --> + <screen name="InfoBarMoviePlayerSummary" position="0,0" size="96,64" id="2"> + <widget source="session.CurrentService" render="Label" position="0,0" size="96,25" font="Regular;14" halign="center" valign="center" > + <convert type="ServiceName">Name</convert> + </widget> + <widget source="session.CurrentService" render="Progress" position="0,27" size="96,5" borderWidth="1" > + <convert type="ServicePosition">Position</convert> + </widget> + <widget source="global.CurrentTime" render="Label" position="0,32" size="96,32" font="Regular;32" halign="center" valign="center" foregroundColor="#FFFFFF" backgroundColor="#000000" > + <convert type="ClockToText">Format:%H:%M</convert> + </widget> + <widget source="session.RecordState" render="FixedLabel" text=" " position="0,32" zPosition="1" size="96,32"> + <convert type="ConfigEntryTest">config.usage.blinking_display_clock_during_recording,True,CheckSourceBoolean</convert> + <convert type="ConditionalShowHide">Blink</convert> + </widget> + </screen> + <!-- LCD screen (ChoiceBox) --> + <screen name="ChoiceBox_summary" position="0,0" size="132,64" id="1"> + <widget source="parent.summary_list" render="Label" position="6,0" size="126,64" font="Regular;11" /> + </screen> + <!-- Color OLED screen (ChoiceBox) --> + <screen name="ChoiceBox_summary" position="0,0" size="96,64" id="2"> + <widget source="parent.summary_list" render="Label" position="0,0" size="96,64" font="Regular;10" /> + </screen> + <!-- LCD screen (MessageBox) --> + <screen name="MessageBox_summary" position="0,0" size="132,64" id="1"> + <widget source="parent.Text" render="Label" position="0,0" size="132,52" font="Regular;11" halign="center" valign="center" /> + <widget source="parent.selectedChoice" render="Label" position="6,50" size="120,14" font="Regular;14" halign="center" valign="center" /> + </screen> + <!-- Color OLED screen (MessageBox) --> + <screen name="MessageBox_summary" position="0,0" size="96,64" id="2"> + <widget source="parent.Text" render="Label" position="0,0" size="96,52" font="Regular;10" halign="center" valign="center" /> + <widget source="parent.selectedChoice" render="Label" position="0,50" size="96,14" font="Regular;12" halign="center" valign="center" /> + </screen> + + <!-- LCD screen (menus) --> + <screen name="MenuSummary" position="0,0" size="132,64" id="1"> + <widget source="parent.title" render="Label" position="6,0" size="120,32" font="Regular;14" halign="center" valign="center"/> + <widget source="parent.menu" render="Label" position="6,32" size="120,32" font="Regular;16" halign="center" valign="center"> + <convert type="StringListSelection" /> + </widget> + </screen> + <!-- Color OLED screen (menus) --> + <screen name="MenuSummary" position="0,0" size="96,64" id="2"> + <widget source="parent.title" render="Label" position="0,0" size="96,32" font="Regular;14" halign="center" valign="center"/> + <widget source="parent.menu" render="Label" position="0,32" size="96,32" font="Regular;14" halign="center" valign="center"> + <convert type="StringListSelection" /> + </widget> + </screen> + <!-- LCD screen (ServiceScan) --> + <screen name="ServiceScanSummary" position="0,0" size="132,64" id="1"> + <widget name="Title" position="6,4" size="120,42" font="Regular;16" transparent="1" /> + <widget name="Service" position="6,22" size="120,26" font="Regular;12" transparent="1" /> + <widget name="scan_progress" position="6,50" zPosition="1" borderWidth="1" size="56,12" backgroundColor="dark" /> + </screen> + <!-- Color OLED screen (ServiceScan) --> + <screen name="ServiceScanSummary" position="0,0" size="96,64" id="2"> + <widget name="Title" position="0,0" size="96,30" font="Regular;14" transparent="1" /> + <widget name="Service" position="0,30" size="96,20" font="Regular;10" transparent="1" /> + <widget name="scan_progress" position="0,50" zPosition="1" borderWidth="1" size="96,12" backgroundColor="dark" /> + </screen> <!-- LCD screen (setup) --> - <screen name="SetupSummary" position="0,0" size="132,64"> + <screen name="SetupSummary" position="0,0" size="132,64" id="1"> <widget source="SetupTitle" render="Label" position="6,0" size="120,16" font="Regular;12" /> <widget source="SetupEntry" render="Label" position="6,16" size="120,32" font="Regular;12" /> <widget source="SetupValue" render="Label" position="6,48" size="120,16" font="Regular;12" /> </screen> + <!-- Color OLED screen (setup) --> + <screen name="SetupSummary" position="0,0" size="96,64" id="2"> + <widget source="SetupTitle" render="Label" position="0,0" size="96,16" font="Regular;10" /> + <widget source="SetupEntry" render="Label" position="0,16" size="96,32" font="Regular;10" /> + <widget source="SetupValue" render="Label" position="0,48" size="96,16" font="Regular;10" /> + </screen> <!-- LCD screen (misc) --> - <screen name="SimpleSummary" position="0,0" size="132,64"> + <screen name="SimpleSummary" position="0,0" size="132,64" id="1"> <widget source="parent.Title" render="Label" position="6,0" size="120,64" font="Regular;16" halign="center" valign="center" /> </screen> + <!-- Color OLED screen (misc) --> + <screen name="SimpleSummary" position="0,0" size="96,64" id="2"> + <widget source="parent.Title" render="Label" position="0,0" size="96,64" font="Regular;14" halign="center" valign="center" /> + </screen> <!-- LCD screen (standby) --> - <screen name="StandbySummary" position="0,0" size="132,64"> + <screen name="StandbySummary" position="0,0" size="132,64" id="1"> <widget source="global.CurrentTime" render="Label" position="6,0" size="120,64" font="Regular;40" halign="center" valign="center"> <convert type="ClockToText">Format:%H:%M</convert> </widget> @@ -1173,37 +1303,18 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) <convert type="ConditionalShowHide">Blink</convert> </widget> </screen> - <!-- JobView --> - <screen name="JobView" position="center,center" size="520,350" title="Job View"> - <widget source="job_name" render="Label" position="20,12" size="480,60" font="Regular;28" /> - <widget source="job_task" render="Label" position="20,90" size="480,50" font="Regular;23" /> - <widget source="job_progress" render="Progress" position="20,162" size="480,36" borderWidth="2" backgroundColor="#254f7497" /> - <widget source="job_progress" render="Label" position="120,166" size="280,32" font="Regular;28" foregroundColor="#000000" zPosition="2" halign="center" transparent="1" > - <convert type="ProgressToText" /> - </widget> - <widget source="job_status" render="Label" position="20,212" size="480,26" font="Regular;23" /> - <widget name="config" position="20,254" size="480,20" /> - <widget source="cancelable" render="Pixmap" pixmap="skin_default/buttons/red.png" position="20,300" size="140,40" alphatest="on" > - <convert type="ConditionalShowHide" /> - </widget> - <widget source="cancelable" render="FixedLabel" text="Cancel" position="20,300" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" > - <convert type="ConditionalShowHide" /> - </widget> - <widget source="finished" render="Pixmap" pixmap="skin_default/buttons/green.png" position="190,300" size="140,40" alphatest="on" > - <convert type="ConditionalShowHide" /> - </widget> - <widget source="finished" render="FixedLabel" text="OK" font="Regular;20" halign="center" valign="center" position="190,300" size="140,40" transparent="1" backgroundColor="#1f771f" > - <convert type="ConditionalShowHide" /> - </widget> - <widget source="backgroundable" render="Pixmap" pixmap="skin_default/buttons/blue.png" position="360,300" size="140,40" alphatest="on" > - <convert type="ConditionalShowHide" /> + <!-- Color OLED screen (standby) --> + <screen name="StandbySummary" position="0,0" size="96,64" id="2"> + <widget source="global.CurrentTime" render="Label" position="0,0" size="96,64" font="Regular;40" halign="center" valign="center"> + <convert type="ClockToText">Format:%H:%M</convert> </widget> - <widget source="backgroundable" render="FixedLabel" text="Continue in background" font="Regular;20" halign="center" valign="center" position="360,300" size="140,40" transparent="1" backgroundColor="#18188b" > - <convert type="ConditionalShowHide" /> + <widget source="session.RecordState" render="FixedLabel" position="0,0" zPosition="1" size="96,64" text=" "> + <convert type="ConfigEntryTest">config.usage.blinking_display_clock_during_recording,True,CheckSourceBoolean</convert> + <convert type="ConditionalShowHide">Blink</convert> </widget> </screen> - <!-- JobView Summary --> - <screen name="JobView_summary" position="0,0" size="132,64"> + <!-- LCD screen (JobView) --> + <screen name="JobView_summary" position="0,0" size="132,64" id="1"> <widget source="parent.summary_job_name" render="Label" position="6,4" size="120,42" font="Regular;16" /> <widget source="parent.summary_job_task" render="Label" position="6,22" size="120,26" font="Regular;12" /> <widget source="parent.summary_job_progress" render="Progress" position="6,50" size="60,12" borderWidth="1" zPosition="1" /> @@ -1211,19 +1322,29 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) <convert type="ProgressToText" /> </widget> </screen> - <!-- VirtualKeyBoard --> - <screen name="VirtualKeyBoard" position="center,center" size="560,350" zPosition="99" title="Virtual KeyBoard"> - <ePixmap pixmap="skin_default/vkey_text.png" position="9,35" zPosition="-4" size="542,52" alphatest="on" /> - <widget name="header" position="10,10" size="500,20" font="Regular;20" transparent="1" noWrap="1" /> - <widget name="text" position="12,35" size="536,46" font="Regular;46" transparent="1" noWrap="1" halign="right" /> - <widget name="list" position="10,100" size="540,225" selectionDisabled="1" transparent="1" /> + <!-- Color OLED screen (JobView) --> + <screen name="JobView_summary" position="0,0" size="96,64" id="2"> + <widget source="parent.summary_job_name" render="Label" position="0,4" size="96,42" font="Regular;14" /> + <widget source="parent.summary_job_task" render="Label" position="0,22" size="96,26" font="Regular;10" /> + <widget source="parent.summary_job_progress" render="Progress" position="0,50" size="60,12" borderWidth="1" zPosition="1" /> + <widget source="parent.summary_job_progress" render="Label" position="60,50" size="36,12" font="Regular;10" zPosition="2" halign="center" transparent="1" > + <convert type="ProgressToText" /> + </widget> </screen> - <!-- FileBrowser --> - <screen name="FileBrowser" position="center,center" size="520,430" title="DVD File Browser" > - <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" /> - <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" /> - <widget source="key_red" render="Label" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" /> - <widget source="key_green" render="Label" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" /> - <widget name="filelist" position="5,50" size="510,370" scrollbarMode="showOnDemand" /> + <!-- LCD screen (Wizard) --> + <screen name="WizardSummary" position="0,0" size="132,64" id="1"> + <widget source="text" render="Label" position="6,0" size="120,16" font="Regular;16" transparent="1" /> + <widget source="parent.list" render="Label" position="6,18" size="120,46" font="Regular;12"> + <convert type="StringListSelection" /> + </widget> </screen> + <!-- Color OLED screen (Wizard) --> + <screen name="WizardSummary" position="0,0" size="96,64" id="2"> + <widget source="text" render="Label" position="0,0" size="96,16" font="Regular;14" transparent="1" /> + <widget source="parent.list" render="Label" position="0,18" size="96,46" font="Regular;12"> + <convert type="StringListSelection" /> + </widget> + </screen> + + </skin> diff --git a/lib/dvb/epgcache.cpp b/lib/dvb/epgcache.cpp index 48cbfbfd..1e8414c3 100644 --- a/lib/dvb/epgcache.cpp +++ b/lib/dvb/epgcache.cpp @@ -1457,7 +1457,7 @@ void eEPGCache::channel_data::readData( const __u8 *data) } tidMap &seenSections = this->seenSections[map]; tidMap &calcedSections = this->calcedSections[map]; - if ( state == 1 && calcedSections == seenSections || state > 1 ) + if ( (state == 1 && calcedSections == seenSections) || state > 1 ) { eDebugNoNewLine("[EPGC] "); switch (source) @@ -2562,7 +2562,7 @@ void eEPGCache::PMTready(eDVBServicePMTHandler *pmthandler) { __u8 buffer[10]; (*desc)->writeToBuffer(buffer); - if (!strncmp((unsigned char*)buffer+2, "EPGDATA", 7)) + if (!strncmp((char*)buffer+2, "EPGDATA", 7)) { eServiceReferenceDVB ref; if (!pmthandler->getServiceReference(ref)) @@ -2571,7 +2571,7 @@ void eEPGCache::PMTready(eDVBServicePMTHandler *pmthandler) messages.send(Message(Message::got_mhw2_channel_pid, ref, pid)); } } - else if(!strncmp((unsigned char*)buffer+2, "FICHAS", 6)) + else if(!strncmp((char*)buffer+2, "FICHAS", 6)) { eServiceReferenceDVB ref; if (!pmthandler->getServiceReference(ref)) @@ -2580,7 +2580,7 @@ void eEPGCache::PMTready(eDVBServicePMTHandler *pmthandler) messages.send(Message(Message::got_mhw2_summary_pid, ref, pid)); } } - else if(!strncmp((unsigned char*)buffer+2, "GENEROS", 7)) + else if(!strncmp((char*)buffer+2, "GENEROS", 7)) { eServiceReferenceDVB ref; if (!pmthandler->getServiceReference(ref)) diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp index bd8f0028..0081e324 100644 --- a/lib/dvb/frontend.cpp +++ b/lib/dvb/frontend.cpp @@ -1124,7 +1124,7 @@ static void fillDictWithSatelliteData(ePyObject dict, const FRONTENDPARAMETERS & PutToDict(dict, "orbital_position", orb_pos); PutToDict(dict, "polarization", polarization); - switch(parm_u_qpsk_fec_inner) + switch((int)parm_u_qpsk_fec_inner) { case FEC_1_2: tmp = eDVBFrontendParametersSatellite::FEC_1_2; break; case FEC_2_3: tmp = eDVBFrontendParametersSatellite::FEC_2_3; break; diff --git a/lib/dvb/sec.h b/lib/dvb/sec.h index 5d73bb7b..ef8b1e0c 100644 --- a/lib/dvb/sec.h +++ b/lib/dvb/sec.h @@ -133,6 +133,12 @@ public: { return secSequence.size(); } + eSecCommandList &operator=(const eSecCommandList &lst) + { + secSequence = lst.secSequence; + cur = begin(); + return *this; + } }; #endif diff --git a/lib/gdi/font.cpp b/lib/gdi/font.cpp index f27a8f77..74cda40e 100644 --- a/lib/gdi/font.cpp +++ b/lib/gdi/font.cpp @@ -6,6 +6,11 @@ #include <pthread.h> #include <sys/types.h> #include <unistd.h> +#include <byteswap.h> + +#ifndef BYTE_ORDER +#error "no BYTE_ORDER defined!" +#endif // use this for init Freetype... #include <ft2build.h> @@ -766,8 +771,9 @@ void eTextPara::blit(gDC &dc, const ePoint &offset, const gRGB &background, cons gColor *lookup8, lookup8_invert[16]; gColor *lookup8_normal=0; + __u16 lookup16_normal[16], lookup16_invert[16], *lookup16; __u32 lookup32_normal[16], lookup32_invert[16], *lookup32; - + if (surface->bpp == 8) { if (surface->clut.data) @@ -781,10 +787,33 @@ void eTextPara::blit(gDC &dc, const ePoint &offset, const gRGB &background, cons opcode=0; } else opcode=1; + } else if (surface->bpp == 16) + { + opcode=2; + for (int i=0; i<16; ++i) + { +#define BLEND(y, x, a) (y + (((x-y) * a)>>8)) + unsigned char da = background.a, dr = background.r, dg = background.g, db = background.b; + int sa = i * 16; + if (sa < 256) + { + dr = BLEND(background.r, foreground.r, sa) & 0xFF; + dg = BLEND(background.g, foreground.g, sa) & 0xFF; + db = BLEND(background.b, foreground.b, sa) & 0xFF; + } +#undef BLEND +#if BYTE_ORDER == LITTLE_ENDIAN + lookup16_normal[i] = bswap_16(((db >> 3) << 11) | ((dg >> 2) << 5) | (dr >> 3)); +#else + lookup16_normal[i] = ((db >> 3) << 11) | ((dg >> 2) << 5) | (dr >> 3); +#endif + da ^= 0xFF; + } + for (int i=0; i<16; ++i) + lookup16_invert[i]=lookup16_normal[i^0xF]; } else if (surface->bpp == 32) { opcode=3; - for (int i=0; i<16; ++i) { #define BLEND(y, x, a) (y + (((x-y) * a)>>8)) @@ -809,7 +838,7 @@ void eTextPara::blit(gDC &dc, const ePoint &offset, const gRGB &background, cons eWarning("can't render to %dbpp", surface->bpp); return; } - + gRegion area(eRect(0, 0, surface->x, surface->y)); gRegion clip = dc.getClip() & area; @@ -835,10 +864,12 @@ void eTextPara::blit(gDC &dc, const ePoint &offset, const gRGB &background, cons if (!(i->flags & GS_INVERT)) { lookup8 = lookup8_normal; + lookup16 = lookup16_normal; lookup32 = lookup32_normal; } else { lookup8 = lookup8_invert; + lookup16 = lookup16_invert; lookup32 = lookup32_invert; } @@ -873,46 +904,76 @@ void eTextPara::blit(gDC &dc, const ePoint &offset, const gRGB &background, cons d+=diff*buffer_stride; } if (sx>0) - for (int ay=0; ay<sy; ay++) - { - if (!opcode) // 4bit lookup to 8bit + { + switch(opcode) { + case 0: // 4bit lookup to 8bit + for (int ay=0; ay<sy; ay++) { register __u8 *td=d; register int ax; - for (ax=0; ax<sx; ax++) - { + { register int b=(*s++)>>4; if(b) *td++=lookup8[b]; else td++; } - } else if (opcode == 1) // 8bit direct + s+=glyph_bitmap->pitch-sx; + d+=buffer_stride; + } + break; + case 1: // 8bit direct + for (int ay=0; ay<sy; ay++) { register __u8 *td=d; register int ax; for (ax=0; ax<sx; ax++) - { + { register int b=*s++; *td++^=b; } - } else + s+=glyph_bitmap->pitch-sx; + d+=buffer_stride; + } + break; + case 2: // 16bit + for (int ay=0; ay<sy; ay++) + { + register __u16 *td=(__u16*)d; + register int ax; + for (ax=0; ax<sx; ax++) + { + register int b=(*s++)>>4; + if(b) + *td++=lookup16[b]; + else + td++; + } + s+=glyph_bitmap->pitch-sx; + d+=buffer_stride; + } + break; + case 3: // 32bit + for (int ay=0; ay<sy; ay++) { register __u32 *td=(__u32*)d; register int ax; for (ax=0; ax<sx; ax++) - { + { register int b=(*s++)>>4; if(b) *td++=lookup32[b]; else td++; } + s+=glyph_bitmap->pitch-sx; + d+=buffer_stride; } - s+=glyph_bitmap->pitch-sx; - d+=buffer_stride; + default: + break; } + } } } } diff --git a/lib/gdi/glcddc.cpp b/lib/gdi/glcddc.cpp index 8612c70b..a593cfa3 100644 --- a/lib/gdi/glcddc.cpp +++ b/lib/gdi/glcddc.cpp @@ -14,13 +14,13 @@ gLCDDC::gLCDDC() surface.x=lcd->size().width(); surface.y=lcd->size().height(); - surface.bpp=8; - surface.bypp=1; surface.stride=lcd->stride(); + surface.bypp=surface.stride / surface.x; + surface.bpp=surface.bypp*8; surface.data=lcd->buffer(); - - surface.clut.colors=256; + surface.clut.colors=0; surface.clut.data=0; + m_pixmap = new gPixmap(&surface); } diff --git a/lib/gdi/gpixmap.cpp b/lib/gdi/gpixmap.cpp index 3e643108..0e8d39ec 100644 --- a/lib/gdi/gpixmap.cpp +++ b/lib/gdi/gpixmap.cpp @@ -3,6 +3,11 @@ #include <lib/gdi/gpixmap.h> #include <lib/gdi/region.h> #include <lib/gdi/accel.h> +#include <byteswap.h> + +#ifndef BYTE_ORDER +#error "no BYTE_ORDER defined!" +#endif gLookup::gLookup() :size(0), lookup(0) @@ -154,6 +159,26 @@ void gPixmap::fill(const gRegion ®ion, const gColor &color) { for (int y=area.top(); y<area.bottom(); y++) memset(((__u8*)surface->data)+y*surface->stride+area.left(), color.color, area.width()); + } else if (surface->bpp == 16) + { + __u32 icol; + + if (surface->clut.data && color < surface->clut.colors) + icol=(surface->clut.data[color].a<<24)|(surface->clut.data[color].r<<16)|(surface->clut.data[color].g<<8)|(surface->clut.data[color].b); + else + icol=0x10101*color; +#if BYTE_ORDER == LITTLE_ENDIAN + __u16 col = bswap_16(((icol & 0xFF) >> 3) << 11 | ((icol & 0xFF00) >> 10) << 5 | (icol & 0xFF0000) >> 19); +#else + __u16 col = ((icol & 0xFF) >> 3) << 11 | ((icol & 0xFF00) >> 10) << 5 | (icol & 0xFF0000) >> 19; +#endif + for (int y=area.top(); y<area.bottom(); y++) + { + __u16 *dst=(__u16*)(((__u8*)surface->data)+y*surface->stride+area.left()*surface->bypp); + int x=area.width(); + while (x--) + *dst++=col; + } } else if (surface->bpp == 32) { __u32 col; @@ -208,18 +233,33 @@ void gPixmap::fill(const gRegion ®ion, const gRGB &color) while (x--) *dst++=col; } + } else if (surface->bpp == 16) + { + __u32 icol = color.argb(); +#if BYTE_ORDER == LITTLE_ENDIAN + __u16 col = bswap_16(((icol & 0xFF) >> 3) << 11 | ((icol & 0xFF00) >> 10) << 5 | (icol & 0xFF0000) >> 19); +#else + __u16 col = ((icol & 0xFF) >> 3) << 11 | ((icol & 0xFF00) >> 10) << 5 | (icol & 0xFF0000) >> 19; +#endif + for (int y=area.top(); y<area.bottom(); y++) + { + __u16 *dst=(__u16*)(((__u8*)surface->data)+y*surface->stride+area.left()*surface->bypp); + int x=area.width(); + while (x--) + *dst++=col; + } } else eWarning("couldn't rgbfill %d bpp", surface->bpp); } } -static void blit_8i_to_32(__u32 *dst, __u8 *src, __u32 *pal, int width) +static inline void blit_8i_to_32(__u32 *dst, __u8 *src, __u32 *pal, int width) { while (width--) *dst++=pal[*src++]; } -static void blit_8i_to_32_at(__u32 *dst, __u8 *src, __u32 *pal, int width) +static inline void blit_8i_to_32_at(__u32 *dst, __u8 *src, __u32 *pal, int width) { while (width--) { @@ -232,6 +272,25 @@ static void blit_8i_to_32_at(__u32 *dst, __u8 *src, __u32 *pal, int width) } } +static inline void blit_8i_to_16(__u16 *dst, __u8 *src, __u32 *pal, int width) +{ + while (width--) + *dst++=pal[*src++] & 0xFFFF; +} + +static inline void blit_8i_to_16_at(__u16 *dst, __u8 *src, __u32 *pal, int width) +{ + while (width--) + { + if (!(pal[*src]&0x80000000)) + { + src++; + dst++; + } else + *dst++=pal[*src++] & 0xFFFF; + } +} + /* WARNING, this function is not endian safe! */ static void blit_8i_to_32_ab(__u32 *dst, __u8 *src, __u32 *pal, int width) { @@ -441,6 +500,95 @@ void gPixmap::blit(const gPixmap &src, const eRect &_pos, const gRegion &clip, i srcptr+=src.surface->stride; dstptr+=surface->stride; } + } else if ((surface->bpp == 16) && (src.surface->bpp==8)) + { + __u8 *srcptr=(__u8*)src.surface->data; + __u8 *dstptr=(__u8*)surface->data; // !! + __u32 pal[256]; + + for (int i=0; i<256; ++i) + { + __u32 icol; + if (src.surface->clut.data && (i<src.surface->clut.colors)) + icol=(src.surface->clut.data[i].a<<24)|(src.surface->clut.data[i].r<<16)|(src.surface->clut.data[i].g<<8)|(src.surface->clut.data[i].b); + else + icol=0x010101*i; +#if BYTE_ORDER == LITTLE_ENDIAN + pal[i] = bswap_16(((icol & 0xFF) >> 3) << 11 | ((icol & 0xFF00) >> 10) << 5 | (icol & 0xFF0000) >> 19); +#else + pal[i] = ((icol & 0xFF) >> 3) << 11 | ((icol & 0xFF00) >> 10) << 5 | (icol & 0xFF0000) >> 19; +#endif + pal[i]^=0xFF000000; + } + + srcptr+=srcarea.left()*src.surface->bypp+srcarea.top()*src.surface->stride; + dstptr+=area.left()*surface->bypp+area.top()*surface->stride; + + if (flag & blitAlphaBlend) + eWarning("ignore unsupported 8bpp -> 16bpp alphablend!"); + + for (int y=0; y<area.height(); y++) + { + int width=area.width(); + unsigned char *psrc=(unsigned char*)srcptr; + __u16 *dst=(__u16*)dstptr; + if (flag & blitAlphaTest) + blit_8i_to_16_at(dst, psrc, pal, width); + else + blit_8i_to_16(dst, psrc, pal, width); + srcptr+=src.surface->stride; + dstptr+=surface->stride; + } + } else if ((surface->bpp == 16) && (src.surface->bpp==32)) + { + __u8 *srcptr=(__u8*)src.surface->data; + __u8 *dstptr=(__u8*)surface->data; + + srcptr+=srcarea.left()+srcarea.top()*src.surface->stride; + dstptr+=area.left()+area.top()*surface->stride; + + if (flag & blitAlphaBlend) + eWarning("ignore unsupported 32bpp -> 16bpp alphablend!"); + + for (int y=0; y<area.height(); y++) + { + int width=area.width(); + __u32 *srcp=(__u32*)srcptr; + __u16 *dstp=(__u16*)dstptr; + + if (flag & blitAlphaTest) + { + while (width--) + { + if (!((*srcp)&0xFF000000)) + { + srcp++; + dstp++; + } else + { + __u32 icol = *srcp++; +#if BYTE_ORDER == LITTLE_ENDIAN + *dstp++ = bswap_16(((icol & 0xFF) >> 3) << 11 | ((icol & 0xFF00) >> 10) << 5 | (icol & 0xFF0000) >> 19); +#else + *dstp++ = ((icol & 0xFF) >> 3) << 11 | ((icol & 0xFF00) >> 10) << 5 | (icol & 0xFF0000) >> 19; +#endif + } + } + } else + { + while (width--) + { + __u32 icol = *srcp++; +#if BYTE_ORDER == LITTLE_ENDIAN + *dstp++ = bswap_16(((icol & 0xFF) >> 3) << 11 | ((icol & 0xFF00) >> 10) << 5 | (icol & 0xFF0000) >> 19); +#else + *dstp++ = ((icol & 0xFF) >> 3) << 11 | ((icol & 0xFF00) >> 10) << 5 | (icol & 0xFF0000) >> 19; +#endif + } + } + srcptr+=src.surface->stride; + dstptr+=surface->stride; + } } else eWarning("cannot blit %dbpp from %dbpp", surface->bpp, src.surface->bpp); } @@ -488,27 +636,34 @@ static inline int sgn(int a) void gPixmap::line(const gRegion &clip, ePoint start, ePoint dst, gColor color) { __u8 *srf8 = 0; - __u32 *srf32 = 0; + __u16 *srf16 = 0; + __u32 *srf32 = 0; int stride = surface->stride; - + if (clip.rects.empty()) return; - + + __u16 col16; __u32 col = 0; if (surface->bpp == 8) - { srf8 = (__u8*)surface->data; - } else if (surface->bpp == 32) + else { srf32 = (__u32*)surface->data; - if (surface->clut.data && color < surface->clut.colors) col=(surface->clut.data[color].a<<24)|(surface->clut.data[color].r<<16)|(surface->clut.data[color].g<<8)|(surface->clut.data[color].b); else col=0x10101*color; - col^=0xFF000000; + col^=0xFF000000; } - + + if (surface->bpp == 16) +#if BYTE_ORDER == LITTLE_ENDIAN + col16=bswap_16(((col & 0xFF) >> 3) << 11 | ((col & 0xFF00) >> 10) << 5 | (col & 0xFF0000) >> 19); +#else + col16=((col & 0xFF) >> 3) << 11 | ((col & 0xFF00) >> 10) << 5 | (col & 0xFF0000) >> 19; +#endif + int xa = start.x(), ya = start.y(), xb = dst.x(), yb = dst.y(); int dx, dy, x, y, s1, s2, e, temp, swap, i; dy=abs(yb-ya); @@ -526,7 +681,7 @@ void gPixmap::line(const gRegion &clip, ePoint start, ePoint dst, gColor color) } else swap=0; e = 2*dy-dx; - + int lasthit = 0; for(i=1; i<=dx; i++) { @@ -563,20 +718,25 @@ void gPixmap::line(const gRegion &clip, ePoint start, ePoint dst, gColor color) } while (!clip.rects[a].contains(x, y)); lasthit = a; } - + if (srf8) srf8[y * stride + x] = color; - if (srf32) + else if (srf16) + srf16[y * stride/2 + x] = col16; + else srf32[y * stride/4 + x] = col; fail: while (e>=0) { - if (swap==1) x+=s1; - else y+=s2; + if (swap==1) + x+=s1; + else + y+=s2; e-=2*dx; } - if (swap==1) - y+=s2; + + if (swap==1) + y+=s2; else x+=s1; e+=2*dy; diff --git a/lib/gdi/lcd.cpp b/lib/gdi/lcd.cpp index 0908d890..a953ef0d 100644 --- a/lib/gdi/lcd.cpp +++ b/lib/gdi/lcd.cpp @@ -14,13 +14,19 @@ eDBoxLCD *eDBoxLCD::instance; -eLCD::eLCD(eSize size): res(size) +eLCD::eLCD() { lcdfd = -1; locked=0; - _buffer=new unsigned char[res.height()*res.width()]; - memset(_buffer, 0, res.height()*res.width()); - _stride=res.width(); +} + +void eLCD::setSize(int xres, int yres, int bpp) +{ + res = eSize(xres, yres); + _buffer=new unsigned char[xres * yres * bpp/8]; + memset(_buffer, 0, res.height()*res.width()*bpp/8); + _stride=res.width()*bpp/8; + eDebug("lcd buffer %p %d bytes, stride %d", _buffer, xres*yres*bpp/8, _stride); } eLCD::~eLCD() @@ -42,8 +48,9 @@ void eLCD::unlock() locked=0; } -eDBoxLCD::eDBoxLCD(): eLCD(eSize(132, 64)) +eDBoxLCD::eDBoxLCD() { + int xres=132, yres=64, bpp=8; is_oled = 0; #ifndef NO_LCD lcdfd = open("/dev/dbox/oled0", O_RDWR); @@ -75,13 +82,37 @@ eDBoxLCD::eDBoxLCD(): eLCD(eSize(132, 64)) int i=LCD_MODE_BIN; ioctl(lcdfd, LCD_IOCTL_ASC_MODE, &i); inverted=0; + FILE *f = fopen("/proc/stb/lcd/xres", "r"); + if (f) + { + int tmp; + if (fscanf(f, "%x", &tmp) == 1) + xres = tmp; + fclose(f); + f = fopen("/proc/stb/lcd/yres", "r"); + if (f) + { + if (fscanf(f, "%x", &tmp) == 1) + yres = tmp; + fclose(f); + f = fopen("/proc/stb/lcd/bpp", "r"); + if (f) + { + if (fscanf(f, "%x", &tmp) == 1) + bpp = tmp; + fclose(f); + } + } + is_oled = 3; + } } + setSize(xres, yres, bpp); } void eDBoxLCD::setInverted(unsigned char inv) { inverted=inv; - update(); + update(); } int eDBoxLCD::setLCDContrast(int contrast) @@ -145,42 +176,52 @@ eDBoxLCD *eDBoxLCD::getInstance() void eDBoxLCD::update() { - if (!is_oled || is_oled == 2) + if (lcdfd >= 0) { - unsigned char raw[132*8]; - int x, y, yy; - for (y=0; y<8; y++) + if (!is_oled || is_oled == 2) { - for (x=0; x<132; x++) + unsigned char raw[132*8]; + int x, y, yy; + for (y=0; y<8; y++) { - int pix=0; - for (yy=0; yy<8; yy++) + for (x=0; x<132; x++) { - pix|=(_buffer[(y*8+yy)*132+x]>=108)<<yy; + int pix=0; + for (yy=0; yy<8; yy++) + { + pix|=(_buffer[(y*8+yy)*132+x]>=108)<<yy; + } + raw[y*132+x]=(pix^inverted); } - raw[y*132+x]=(pix^inverted); } - } - if (lcdfd >= 0) write(lcdfd, raw, 132*8); - } else - { - unsigned char raw[64*64]; - int x, y; - memset(raw, 0, 64*64); - for (y=0; y<64; y++) + } + else if (is_oled == 3) { + FILE *f = fopen("/tmp/bla", "w+"); + if (f) { + fwrite(_buffer, _stride * res.height(), 1, f); + fclose(f); + } + write(lcdfd, _buffer, _stride * res.height()); + } + else { - int pix=0; - for (x=0; x<128 / 2; x++) + unsigned char raw[64*64]; + int x, y; + memset(raw, 0, 64*64); + for (y=0; y<64; y++) { - pix = (_buffer[y*132 + x * 2 + 2] & 0xF0) |(_buffer[y*132 + x * 2 + 1 + 2] >> 4); - if (inverted) - pix = 0xFF - pix; - raw[y*64+x] = pix; + int pix=0; + for (x=0; x<128 / 2; x++) + { + pix = (_buffer[y*132 + x * 2 + 2] & 0xF0) |(_buffer[y*132 + x * 2 + 1 + 2] >> 4); + if (inverted) + pix = 0xFF - pix; + raw[y*64+x] = pix; + } } - } - if (lcdfd >= 0) write(lcdfd, raw, 64*64); + } } } diff --git a/lib/gdi/lcd.h b/lib/gdi/lcd.h index 99f921b5..e7b4c2c4 100644 --- a/lib/gdi/lcd.h +++ b/lib/gdi/lcd.h @@ -13,10 +13,11 @@ class eLCD { #ifdef SWIG - eLCD(eSize size); + eLCD(); ~eLCD(); #else protected: + void setSize(int xres, int yres, int bpp); eSize res; unsigned char *_buffer; int lcdfd; @@ -29,12 +30,11 @@ public: int islocked() { return locked; } bool detected() { return lcdfd >= 0; } #ifndef SWIG - eLCD(eSize size); + eLCD(); virtual ~eLCD(); __u8 *buffer() { return (__u8*)_buffer; } int stride() { return _stride; } eSize size() { return res; } - virtual void update()=0; #endif }; diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index 9520f972..2deb2bf7 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -293,17 +293,9 @@ class SecConfigure: sec.setLNBLOFH(10600000) sec.setLNBThreshold(11700000) elif currLnb.lof.value == "unicable": - if currLnb.unicable.value == "unicable_user": -#TODO satpositions for satcruser - sec.setLNBLOFL(currLnb.lofl.value * 1000) - sec.setLNBLOFH(currLnb.lofh.value * 1000) - sec.setLNBThreshold(currLnb.threshold.value * 1000) - sec.setLNBSatCR(currLnb.satcruser.index) - sec.setLNBSatCRvco(currLnb.satcrvcouser[currLnb.satcruser.index].value*1000) - sec.setLNBSatCRpositions(1) #HACK - elif currLnb.unicable.value == "unicable_matrix": - manufacturer_name = currLnb.unicableMatrixManufacturer.value - manufacturer = currLnb.unicableMatrix[manufacturer_name] + def setupUnicable(configManufacturer, ProductDict): + manufacturer_name = configManufacturer.value + manufacturer = ProductDict[manufacturer_name] product_name = manufacturer.product.value sec.setLNBSatCR(manufacturer.scr[product_name].index) sec.setLNBSatCRvco(manufacturer.vco[product_name][manufacturer.scr[product_name].index].value*1000) @@ -311,22 +303,22 @@ class SecConfigure: sec.setLNBLOFL(manufacturer.lofl[product_name][0].value * 1000) sec.setLNBLOFH(manufacturer.lofh[product_name][0].value * 1000) sec.setLNBThreshold(manufacturer.loft[product_name][0].value * 1000) - currLnb.unicableMatrixManufacturer.save_forced = True + configManufacturer.save_forced = True manufacturer.product.save_forced = True manufacturer.vco[product_name][manufacturer.scr[product_name].index].save_forced = True + + if currLnb.unicable.value == "unicable_user": +#TODO satpositions for satcruser + sec.setLNBLOFL(currLnb.lofl.value * 1000) + sec.setLNBLOFH(currLnb.lofh.value * 1000) + sec.setLNBThreshold(currLnb.threshold.value * 1000) + sec.setLNBSatCR(currLnb.satcruser.index) + sec.setLNBSatCRvco(currLnb.satcrvcouser[currLnb.satcruser.index].value*1000) + sec.setLNBSatCRpositions(1) #HACK + elif currLnb.unicable.value == "unicable_matrix": + setupUnicable(currLnb.unicableMatrixManufacturer, currLnb.unicableMatrix) elif currLnb.unicable.value == "unicable_lnb": - manufacturer_name = currLnb.unicableLnbManufacturer.value - manufacturer = currLnb.unicableLnb[manufacturer_name] - product_name = manufacturer.product.value - sec.setLNBSatCR(manufacturer.scr[product_name].index) - sec.setLNBSatCRvco(manufacturer.vco[product_name][manufacturer.scr[product_name].index].value*1000) - sec.setLNBSatCRpositions(manufacturer.positions[product_name][0].value) - sec.setLNBLOFL(manufacturer.lofl[product_name][0].value * 1000) - sec.setLNBLOFH(manufacturer.lofh[product_name][0].value * 1000) - sec.setLNBThreshold(manufacturer.loft[product_name][0].value * 1000) - currLnb.unicableLnbManufacturer.save_forced = True - manufacturer.product.save_forced = True - manufacturer.vco[product_name][manufacturer.scr[product_name].index].save_forced = True + setupUnicable(currLnb.unicableLnbManufacturer, currLnb.unicableLnb) elif currLnb.lof.value == "c_band": sec.setLNBLOFL(5150000) sec.setLNBLOFH(5150000) @@ -1138,72 +1130,60 @@ def InitNimManager(nimmgr): else: section.unicable = ConfigSelection(choices = {"unicable_user": _("User defined")}, default = "unicable_user") - if lnb < 3: - section.unicableMatrix = ConfigSubDict() - section.unicableMatrixManufacturer = ConfigSelection(choices = UnicableMatrixManufacturers, default = UnicableMatrixManufacturers[0]) - for y in unicablematrixproducts: - products = unicablematrixproducts[y].keys() + def fillUnicableConf(sectionDict, unicableproducts, vco_null_check): + for y in unicableproducts: + products = unicableproducts[y].keys() products.sort() tmp = ConfigSubsection() tmp.product = ConfigSelection(choices = products, default = products[0]) tmp.scr = ConfigSubDict() tmp.vco = ConfigSubDict() + tmp.lofl = ConfigSubDict() + tmp.lofh = ConfigSubDict() + tmp.loft = ConfigSubDict() + tmp.positions = ConfigSubDict() for z in products: scrlist = [] - vcolist = unicablematrixproducts[y][z] + vcolist = unicableproducts[y][z] tmp.vco[z] = ConfigSubList() for cnt in range(1,1+len(vcolist)-1): vcofreq = int(vcolist[cnt-1]) - if vcofreq == 0: + if vcofreq == 0 and vco_null_check: scrlist.append(("%d" %cnt,"SCR %d " %cnt +_("not used"))) else: scrlist.append(("%d" %cnt,"SCR %d" %cnt)) tmp.vco[z].append(ConfigInteger(default=vcofreq, limits = (vcofreq, vcofreq))) - tmp.scr[z] = ConfigSelection(choices = scrlist, default = scrlist[0][0]) - section.unicableMatrix[y] = tmp + tmp.scr[z] = ConfigSelection(choices = scrlist, default = scrlist[0][0]) + + positions = int(vcolist[len(vcolist)-1][0]) + tmp.positions[z] = ConfigSubList() + tmp.positions[z].append(ConfigInteger(default=positions, limits = (positions, positions))) + + lofl = vcolist[len(vcolist)-1][1] + tmp.lofl[z] = ConfigSubList() + tmp.lofl[z].append(ConfigInteger(default=lofl, limits = (lofl, lofl))) + + lofh = int(vcolist[len(vcolist)-1][2]) + tmp.lofh[z] = ConfigSubList() + tmp.lofh[z].append(ConfigInteger(default=lofh, limits = (lofh, lofh))) + + loft = int(vcolist[len(vcolist)-1][3]) + tmp.loft[z] = ConfigSubList() + tmp.loft[z].append(ConfigInteger(default=loft, limits = (loft, loft))) + sectionDict[y] = tmp + + if lnb < 3: + print "MATRIX" + section.unicableMatrix = ConfigSubDict() + section.unicableMatrixManufacturer = ConfigSelection(UnicableMatrixManufacturers, UnicableMatrixManufacturers[0]) + fillUnicableConf(section.unicableMatrix, unicablematrixproducts, True) if lnb < 2: + print "LNB" section.unicableLnb = ConfigSubDict() section.unicableLnbManufacturer = ConfigSelection(UnicableLnbManufacturers, UnicableLnbManufacturers[0]) - for y in unicablelnbproducts: - products = unicablelnbproducts[y].keys() - products.sort() - tmp = ConfigSubsection() - tmp.product = ConfigSelection(choices = products, default = products[0]) - tmp.scr = ConfigSubDict() - tmp.vco = ConfigSubDict() - tmp.lofl = ConfigSubDict() - tmp.lofh = ConfigSubDict() - tmp.loft = ConfigSubDict() - tmp.positions = ConfigSubDict() - for z in products: - scrlist = [] - vcolist = unicablelnbproducts[y][z] - tmp.vco[z] = ConfigSubList() - for cnt in range(1,1+len(vcolist)-1): - scrlist.append(("%d" %cnt,"SCR %d" %cnt)) - vcofreq = int(vcolist[cnt-1]) - tmp.vco[z].append(ConfigInteger(default=vcofreq, limits = (vcofreq, vcofreq))) - tmp.scr[z] = ConfigSelection(choices = scrlist, default = scrlist[0][0]) - - positions = int(vcolist[len(vcolist)-1][0]) - tmp.positions[z] = ConfigSubList() - tmp.positions[z].append(ConfigInteger(default=positions, limits = (positions, positions))) - - lofl = vcolist[len(vcolist)-1][1] - tmp.lofl[z] = ConfigSubList() - tmp.lofl[z].append(ConfigInteger(default=lofl, limits = (lofl, lofl))) - - lofh = int(vcolist[len(vcolist)-1][2]) - tmp.lofh[z] = ConfigSubList() - tmp.lofh[z].append(ConfigInteger(default=lofh, limits = (lofh, lofh))) - - loft = int(vcolist[len(vcolist)-1][3]) - tmp.loft[z] = ConfigSubList() - tmp.loft[z].append(ConfigInteger(default=loft, limits = (loft, loft))) - - section.unicableLnb[y] = tmp - + fillUnicableConf(section.unicableLnb, unicablelnbproducts, False) + #TODO satpositions for satcruser section.satcruser = ConfigSelection(advanced_lnb_satcruser_choices, default="1") tmp = ConfigSubList() diff --git a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py index e092e82f..64b4ae50 100755 --- a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py +++ b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py @@ -88,8 +88,8 @@ class FileBrowser(Screen): self.close(None) class DVDSummary(Screen): - skin = """ - <screen position="0,0" size="132,64"> + skin = ( + """<screen name="DVDSummary" position="0,0" size="132,64" id="1"> <widget source="session.CurrentService" render="Label" position="5,4" size="120,28" font="Regular;12" transparent="1" > <convert type="ServiceName">Name</convert> </widget> @@ -101,7 +101,20 @@ class DVDSummary(Screen): <widget source="session.CurrentService" render="Progress" position="6,46" size="60,18" borderWidth="1" > <convert type="ServicePosition">Position</convert> </widget> - </screen>""" + </screen>""", + """<screen name="DVDSummary" position="0,0" size="96,64" id="2"> + <widget source="session.CurrentService" render="Label" position="0,0" size="96,25" font="Regular;12" transparent="1" > + <convert type="ServiceName">Name</convert> + </widget> + <widget name="DVDPlayer" position="0,26" size="96,12" font="Regular;10" transparent="1" /> + <widget name="Chapter" position="0,40" size="66,12" font="Regular;10" transparent="1" halign="left" /> + <widget source="session.CurrentService" render="Label" position="66,40" size="30,12" font="Regular;10" transparent="1" halign="right" > + <convert type="ServicePosition">Position</convert> + </widget> + <widget source="session.CurrentService" render="Progress" position="0,52" size="96,12" borderWidth="1" > + <convert type="ServicePosition">Position</convert> + </widget> + </screen>""") def __init__(self, session, parent): Screen.__init__(self, session, parent) diff --git a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py index 15806e8c..e4bdba12 100755 --- a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py +++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py @@ -925,12 +925,17 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB self.clear_playlist() class MediaPlayerLCDScreen(Screen): - skin = """ - <screen position="0,0" size="132,64" title="LCD Text"> + skin = ( + """<screen name="MediaPlayerLCDScreen" position="0,0" size="132,64" id="1"> <widget name="text1" position="4,0" size="132,35" font="Regular;16"/> <widget name="text3" position="4,36" size="132,14" font="Regular;10"/> <widget name="text4" position="4,49" size="132,14" font="Regular;10"/> - </screen>""" + </screen>""", + """<screen name="MediaPlayerLCDScreen" position="0,0" size="96,64" id="2"> + <widget name="text1" position="0,0" size="96,35" font="Regular;14"/> + <widget name="text3" position="0,36" size="96,14" font="Regular;10"/> + <widget name="text4" position="0,49" size="96,14" font="Regular;10"/> + </screen>""") def __init__(self, session, parent): Screen.__init__(self, session) diff --git a/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py b/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py old mode 100644 new mode 100755 index 8986560b..7a0da851 --- a/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py +++ b/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py @@ -39,13 +39,19 @@ class writeNAND(Task): self.output_line = data class NFISummary(Screen): - skin = """ - <screen position="0,0" size="132,64"> + skin = ( + """<screen name="NFISummary" position="0,0" size="132,64" id="1"> <widget source="title" render="Label" position="2,0" size="120,14" valign="center" font="Regular;12" /> <widget source="content" render="Label" position="2,14" size="120,34" font="Regular;12" transparent="1" zPosition="1" /> - <widget source="job_progresslabel" render="Label" position="66,50" size="60,14" font="Regular;12" transparent="1" halign="right" zPosition="0" /> <widget source="job_progressbar" render="Progress" position="2,50" size="66,14" borderWidth="1" /> - </screen>""" + <widget source="job_progresslabel" render="Label" position="66,50" size="60,14" font="Regular;12" transparent="1" halign="right" zPosition="0" /> + </screen>""", + """<screen name="NFISummary" position="0,0" size="96,64" id="2"> + <widget source="title" render="Label" position="0,0" size="96,14" valign="center" font="Regular;10" /> + <widget source="content" render="Label" position="0,14" size="96,34" font="Regular;10" transparent="1" zPosition="1" /> + <widget source="job_progressbar" render="Progress" position="0,50" size="50,14" borderWidth="1" /> + <widget source="job_progresslabel" render="Label" position="50,50" size="46,14" font="Regular;10" transparent="1" halign="right" zPosition="0" /> + </screen>""") def __init__(self, session, parent): Screen.__init__(self, session, parent) diff --git a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py old mode 100644 new mode 100755 index 3c76685e..9b9044ee --- a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py +++ b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py @@ -12,14 +12,22 @@ from Tools.HardwareInfo import HardwareInfo config.misc.showtestcard = ConfigBoolean(default = False) class VideoWizardSummary(WizardSummary): - skin = """ - <screen position="0,0" size="132,64"> + skin = ( + """<screen name="VideoWizardSummary" position="0,0" size="132,64" id="1"> <widget name="text" position="6,4" size="120,40" font="Regular;12" transparent="1" /> <widget source="parent.list" render="Label" position="6,40" size="120,21" font="Regular;14"> <convert type="StringListSelection" /> </widget> <!--widget name="pic" pixmap="%s" position="6,22" zPosition="10" size="64,64" transparent="1" alphatest="on"/--> - </screen>""" #% (resolveFilename(SCOPE_PLUGINS, "SystemPlugins/Videomode/lcd_Scart.png")) + </screen>""", + """<screen name="VideoWizardSummary" position="0,0" size="96,64" id="2"> + <widget name="text" position="0,4" size="96,40" font="Regular;12" transparent="1" /> + <widget source="parent.list" render="Label" position="0,40" size="96,21" font="Regular;14"> + <convert type="StringListSelection" /> + </widget> + <!--widget name="pic" pixmap="%s" position="0,22" zPosition="10" size="64,64" transparent="1" alphatest="on"/--> + </screen>""") + #% (resolveFilename(SCOPE_PLUGINS, "SystemPlugins/Videomode/lcd_Scart.png")) def __init__(self, session, parent): WizardSummary.__init__(self, session, parent) diff --git a/main/enigma.cpp b/main/enigma.cpp index 3f420b4b..b8554d58 100644 --- a/main/enigma.cpp +++ b/main/enigma.cpp @@ -172,11 +172,11 @@ int main(int argc, char **argv) eTextPara::forceReplacementGlyph(i); eWidgetDesktop dsk(eSize(720, 576)); - eWidgetDesktop dsk_lcd(eSize(132, 64)); - + eWidgetDesktop dsk_lcd(my_lcd_dc->size()); + dsk.setStyleID(0); - dsk_lcd.setStyleID(1); - + dsk_lcd.setStyleID(my_lcd_dc->size().width() == 96 ? 2 : 1); + /* if (double_buffer) { eDebug(" - double buffering found, enable buffered graphics mode."); diff --git a/po/ar.po b/po/ar.po index 87850cc0..f84bab07 100755 --- a/po/ar.po +++ b/po/ar.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: tuxbox-enigma 0.0.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-11 10:44+0000\n" -"PO-Revision-Date: 2010-05-18 22:10+0200\n" -"Last-Translator: Hazem <moustafagamal@hotmail.com>\n" +"PO-Revision-Date: 2010-06-09 10:34+0200\n" +"Last-Translator: Mladen <acid-burn@opendreambox.org>\n" "Language-Team: Arabic <moustafagamal@hotmail.com>\n" "Language: ar\n" "MIME-Version: 1.0\n" @@ -393,9 +393,8 @@ msgstr "" "انتهاء التسجيل بالمؤقت ، يجب إغلاق الدريم بوكس \n" "أغلاق الان؟" -# msgid "A graphical EPG for all services of an specific bouquet" -msgstr "" +msgstr "دليل برامج الكترونى بيانى لكل قنوات باقه معينه" msgid "" "A mount entry with this name already exists!\n" @@ -498,7 +497,7 @@ msgid "Abort" msgstr "الغاء" msgid "Abort this Wizard." -msgstr "" +msgstr "إلغاء هذه النافذه" # msgid "About" @@ -580,17 +579,15 @@ msgstr "إضافه إعدادات شبكه ؟" msgid "Add new AutoTimer" msgstr "إضافة مؤقت تلقائى جديد" -# msgid "Add new network mount point" -msgstr "" +msgstr "إضافة نقطة إعتلاء شبكه جديده" # msgid "Add timer" msgstr "أضف مؤقت" -# msgid "Add timer as disabled on conflict" -msgstr "" +msgstr "إضافة مؤقت غير مفعل عند التعارض" msgid "Add title" msgstr "إضافة عنوان" @@ -700,9 +697,8 @@ msgstr "الفا" msgid "Alternative radio mode" msgstr "وضع راديو بديل" -# msgid "Alternative services tuner priority" -msgstr "" +msgstr "أولوية الموالف للقنوات البديله" # msgid "Always ask before sending" @@ -768,11 +764,12 @@ msgstr "" "هل أنت متأكد أنك تريد إستعادة بالك أب الاينجما2 ؟\n" "سيتم عمل إعادة تشغيل الاينجما2 بعد الاستعاده" -# msgid "" "Are you sure you want to save this network mount?\n" "\n" msgstr "" +"هل أنت متاكد إنك تريد حفظ `تلاء الشبكه هذا ؟\n" +"\n" msgid "Artist" msgstr "الفنان" @@ -829,9 +826,8 @@ msgstr "" msgid "Auto flesh" msgstr "" -# msgid "Auto scart switching" -msgstr "" +msgstr "التحول الآلى الى السكارت" msgid "AutoTimer Editor" msgstr "محرر المؤقت الالى" @@ -902,21 +898,18 @@ msgstr "جارى عمل باك أب........" msgid "Backup system settings" msgstr "عمل باك أب لأعدادات النظام" -# msgid "Band" -msgstr "" +msgstr "نطاق" -# msgid "Bandwidth" -msgstr "" +msgstr "عرض النطاق" # msgid "Begin of \"after event\" timespan" msgstr "" -# msgid "Begin of timespan" -msgstr "" +msgstr "بداية المدى الزمنى" # msgid "Begin time" @@ -926,9 +919,8 @@ msgstr "وقت البدأ" msgid "Behavior of 'pause' when paused" msgstr "" -# msgid "Behavior of 0 key in PiP-mode" -msgstr "" +msgstr "سلوك الذر 0 فى وضعية صوره داخل صوره" # msgid "Behavior when a movie is started" @@ -954,13 +946,11 @@ msgstr "منع الحد من الضوضاء" msgid "Blue boost" msgstr "الدعم الازرق" -# msgid "Bookmarks" -msgstr "" +msgstr "الاشارات المرجعيه" -# msgid "Bouquets" -msgstr "" +msgstr "الباقات" msgid "Brazil" msgstr "البرازيل" @@ -994,13 +984,11 @@ msgid "" "displayed." msgstr "بالضغط على ذر موافق من الريموت كونترول ، سيظهر شريط المعلومات" -# msgid "C" -msgstr "" +msgstr "سى" -# msgid "C-Band" -msgstr "" +msgstr "سي باند" msgid "CDInfo" msgstr "بيانات القرص المدمج" @@ -1060,7 +1048,7 @@ msgstr "مركز الشاشه عند الحافه العليا" # msgid "Change active delay" -msgstr "" +msgstr "تغيير التأخير النشط" # msgid "Change bouquets in quickzap" @@ -1076,15 +1064,15 @@ msgstr "تغيير الدليل" # msgid "Change hostname" -msgstr "" +msgstr "تغيير أسم المضيف" # msgid "Change pin code" -msgstr "" +msgstr "تغيير الرقم السرى" # msgid "Change service pin" -msgstr "" +msgstr "تغيير الرقم السرى للقناه" msgid "Change service pins" msgstr "تغيير الرقم السرى للخدمه" @@ -1094,7 +1082,7 @@ msgstr "تغيير الرقم السرى للضبط" # msgid "Change step size" -msgstr "" +msgstr "تغيير مقاس الخطوه" # msgid "Change the hostname of your Dreambox." @@ -1119,17 +1107,15 @@ msgstr "قناه غير موجوده فى قائمة الخدمات" msgid "Channel:" msgstr "قناه:" -# msgid "Channellist menu" -msgstr "" +msgstr "قائمة لائحة القنوات" # msgid "Channels" msgstr "قنوات" -# msgid "Chap." -msgstr "" +msgstr "فصل" msgid "Chapter" msgstr "فصل" @@ -1189,7 +1175,7 @@ msgstr "تنظيف" # msgid "Cleanup Wizard" -msgstr "" +msgstr "نافذة التنظيف" msgid "Cleanup Wizard settings" msgstr "إعدادات نافذة التنظيف" @@ -1205,7 +1191,7 @@ msgstr "مسح الذاكره عند الخروج:" # msgid "Clear log" -msgstr "" +msgstr "مسح السجل" msgid "Close" msgstr "أغلاق" @@ -1235,13 +1221,11 @@ msgstr "" msgid "Coderate LP" msgstr "" -# msgid "Collection name" -msgstr "" +msgstr "اسم المجموعه" -# msgid "Collection settings" -msgstr "" +msgstr "إعدادات المجموعه" msgid "Color Format" msgstr "نسق الالـوان" @@ -1263,9 +1247,8 @@ msgstr "" msgid "Common Interface" msgstr "وحده النفاذ المشروط" -# msgid "Common Interface Assignment" -msgstr "" +msgstr "تحديد وحدة النفاذ المشروط" msgid "CommonInterface" msgstr "وحـدة النفـاذ المشروط" @@ -1379,10 +1362,10 @@ msgstr "" # msgid "Create DVD-ISO" -msgstr "" +msgstr "تكوين دى فى دى إيزو" msgid "Create a new AutoTimer." -msgstr "" +msgstr "تكوين مؤقت آلى جديد" msgid "Create a new timer using the classic editor" msgstr "أنشأ مؤقت جديد باستخدام المحرر الكلاسيكى" @@ -1483,7 +1466,7 @@ msgstr "قائمة عناوين دى فى دى" # msgid "DVD media toolbox" -msgstr "" +msgstr "صندوق أدوات وسيط دى فى دى" msgid "Danish" msgstr "دنماركى" @@ -1496,7 +1479,7 @@ msgstr "قرر إذا كنت تريد تشغيل أو تعطيل نافذة إع # msgid "Decide what should be done when crashlogs are found." -msgstr "" +msgstr "قرر ماذا يجب أن يحدث عند وجود سجل عطب ." msgid "Decide what should happen to the crashlogs after submission." msgstr "قرر مصير سجل العطب بعد إرساله." @@ -1544,9 +1527,8 @@ msgstr "مسح البند" msgid "Delete failed!" msgstr "فشل المسح" -# msgid "Delete mount" -msgstr "" +msgstr "مسح الاعتلاء" #, python-format msgid "" @@ -1609,20 +1591,18 @@ msgstr "حذف الكفاف الرقمى" # msgid "Dir:" -msgstr "" +msgstr "دليل:" -# msgid "Direct playback of linked titles without menu" -msgstr "" +msgstr "عرض مباشر لعناوين مربوطه بدون قائمه" -# #, python-format msgid "Directory %s nonexistent." -msgstr "" +msgstr "الدليل %s غير موجود" # msgid "Directory browser" -msgstr "" +msgstr "متصفح الدليل" msgid "Disable" msgstr "تعطيل" @@ -1716,15 +1696,16 @@ msgid "" "Do you really want to initialize the harddisk?\n" "All data on the disk will be lost!" msgstr "" +"هل تريد فعلا تهيئة القرص الصلب ؟ \n" +"سيتم فقد كل البيانات على القرص!" #, python-format msgid "Do you really want to remove directory %s from the disk?" msgstr "هل تريد فعلا حذف الدليل %s من القرص؟" -# #, python-format msgid "Do you really want to remove your bookmark of %s?" -msgstr "" +msgstr "هل تريد فعلا حذف مرجعية %s ؟" # msgid "Do you want to burn this collection to DVD medium?" @@ -1769,7 +1750,7 @@ msgstr "هل تريد إستعادة الاعدادات ؟" # msgid "Do you want to resume this playback?" -msgstr "" +msgstr "هل تريد إستئناف هذا العرض؟" # msgid "Do you want to see more entries?" @@ -1852,9 +1833,8 @@ msgstr "جارى تحميل لقطات. رجاء الانتظار..." msgid "Dreambox format data DVD (HDTV compatible)" msgstr "" -# msgid "Dreambox software because updates are available." -msgstr "" +msgstr "البرنامج التشغيلى للدريم بوكس لتوافر تحديثات" # msgid "Duration: " @@ -1963,17 +1943,14 @@ msgstr "دليل البرنامج الالكترونى" msgid "Enable" msgstr "تفعيل" -# msgid "Enable /media" -msgstr "" +msgstr "تفعيل /الوسيط" -# msgid "Enable 5V for active antenna" -msgstr "" +msgstr "تفعيل 5ف للهوائى النشط" -# msgid "Enable Cleanup Wizard?" -msgstr "" +msgstr "تفعيل نافذة التنظيف ؟" # msgid "Enable Filtering" @@ -1999,9 +1976,8 @@ msgstr "تفعيل توثيق HTTPS" msgid "Enable Service Restriction" msgstr "تفعيل محدودية الخدمه" -# msgid "Enable Streaming Authentication" -msgstr "" +msgstr "تفعيل التصديق على التدفق" # msgid "Enable multiple bouquets" @@ -2094,9 +2070,8 @@ msgstr "" msgid "Enter IP to scan..." msgstr "" -# msgid "Enter Rewind at speed" -msgstr "" +msgstr "أدخل سرعة الرجوع" msgid "Enter main menu..." msgstr "دخول القائمه الرئيسيه" @@ -2132,9 +2107,8 @@ msgstr "أدخل أسم المستخدم:" msgid "Enter your email address so that we can contact you if needed." msgstr "أدخل عنوان بريدك الألكترونى ليتم الاتصال بك عند الحاجه." -# msgid "Enter your search term(s)" -msgstr "" +msgstr "أدخل شروط البحث" msgid "Entertainment" msgstr "ترفيه" @@ -2184,9 +2158,8 @@ msgstr "درجة تطور التنفيذ:" msgid "Execution finished!!" msgstr "إنهاء التنفيذ !!" -# msgid "Exif" -msgstr "" +msgstr "كسيف" msgid "Exit" msgstr "خروج" @@ -2218,9 +2191,8 @@ msgstr "إعدادات متقدمه" msgid "Extended Software" msgstr "برنامج تشغيلى متقدم" -# msgid "Extended Software Plugin" -msgstr "" +msgstr "بلج إن البرنامج التشغيلى الممتد" msgid "Extensions" msgstr "إضافات" @@ -2228,9 +2200,8 @@ msgstr "إضافات" msgid "Extensions management" msgstr "التحكم فى الاضافات" -# msgid "FEC" -msgstr "" +msgstr "FEC" msgid "Factory reset" msgstr "العوده الى إعدادات المصنع" @@ -2298,6 +2269,9 @@ msgid "" "it's Description.\n" "Press BLUE to add a new restriction and YELLOW to remove the selected one." msgstr "" +"المرشحات أداه قويه أخرى عند تطابق الاحداث . يمكن قصر المؤقتعلى أيام أسبوع " +"معينه أو على تماثل حدث بكلمات داخله مثل الوصف \n" +"أضغط الزر الازرق لإضافة قصر جديد أو الزر الاصفر لحذف ما تختاره" # msgid "Finetune" @@ -2332,12 +2306,13 @@ msgstr "سيتم تنفيذ الاعمال الاتيه بعد أن تضغط ع msgid "Format" msgstr "نسق" -# #, python-format msgid "" "Found a total of %d matching Events.\n" "%d Timer were added and %d modified." msgstr "" +"تم العثور على إجمالى %d أحداث متطابقه \n" +"تم إضافة مؤقت %d وتم تعديل %d" # msgid "Frame repeat count during non-smooth winding" @@ -2435,9 +2410,8 @@ msgstr "" msgid "German" msgstr "المانـى" -# msgid "Germany" -msgstr "" +msgstr "المانيا" # msgid "Getting plugin information. Please wait..." @@ -2449,15 +2423,14 @@ msgstr "" # msgid "Goto 0" -msgstr "" +msgstr "الذهاب الى 0" -# msgid "Goto position" -msgstr "" +msgstr "الذهل للموضع" # msgid "Graphical Multi EPG" -msgstr "" +msgstr "دليل برامج بيانى متعدد" msgid "Great Britain" msgstr "بريطانيا" @@ -2465,17 +2438,14 @@ msgstr "بريطانيا" msgid "Greek" msgstr "اليونان" -# msgid "Green boost" -msgstr "" +msgstr "دعم أخضر" -# msgid "Guard Interval" -msgstr "" +msgstr "فاصل الحرس" -# msgid "Guard interval mode" -msgstr "" +msgstr "وضعية فاصل الحرس" # msgid "Guess existing timer based on begin/end" @@ -2486,11 +2456,11 @@ msgstr "فيديو فائق الوضوح" # msgid "HTTP Port" -msgstr "" +msgstr "منفذ HTTP" # msgid "HTTPS Port" -msgstr "" +msgstr "منفذ HTTPS" # msgid "Harddisk" @@ -2507,23 +2477,20 @@ msgstr "مسـاعده" # msgid "Hidden network SSID" -msgstr "" +msgstr "شبكه مخفيه SSID" # msgid "Hidden networkname" msgstr "إسم شبكه مخفى" -# msgid "Hierarchy Information" -msgstr "" +msgstr "معلومات التسلسل الهرمى" -# msgid "Hierarchy mode" -msgstr "" +msgstr "وضعية التسلسل الهرمى" -# msgid "High bitrate support" -msgstr "" +msgstr "دعم معدل البث العالى" msgid "History" msgstr "تاريخ" @@ -2543,13 +2510,11 @@ msgstr "كم دقيقه تريد أن تسجل ؟" msgid "How to handle found crashlogs?" msgstr "كيف أتعامل من سجل العطب" -# msgid "Howto & Style" -msgstr "" +msgstr "الكيفيه والنمط" -# msgid "Hue" -msgstr "" +msgstr "درجة لون" # msgid "Hungarian" @@ -2563,24 +2528,22 @@ msgstr "عنوان IP" msgid "IP:" msgstr "" -# msgid "ISO file is too large for this filesystem!" -msgstr "" +msgstr "ملف الايزو كبير جدا على ملفات النظام !" -# msgid "ISO path" -msgstr "" +msgstr "مسار أيزو" # msgid "Icelandic" -msgstr "" +msgstr "ايسلندى" # #, python-format msgid "" "If this is enabled an existing timer will also be considered recording an " "event if it records at least 80% of the it." -msgstr "" +msgstr "عند تفعيل هذا سيعتبر المؤقت الحالى يسجل حدثإذا سجل على الاقل 80% منه" msgid "" "If you see this, something is wrong with\n" @@ -2608,46 +2571,44 @@ msgstr "" "لا تهتم بظلال الاضاءه الان . سيتم عمل الاعادادت لها فى الخطوه القادمه \n" "إذا كنت تتقبل النتيجه ، أضغط موافق" -# msgid "Image flash utility" -msgstr "" +msgstr "استخدام شحن الفلاش" # msgid "Import AutoTimer" -msgstr "" +msgstr "إستيراد مؤقت آلى" # msgid "Import existing Timer" -msgstr "" +msgstr "إستيراد المؤقت الموجود" # msgid "Import from EPG" -msgstr "" +msgstr "استيراد من دليل البرامج الالكترونى" # msgid "In Progress" -msgstr "" +msgstr "جارى التقدم" # msgid "" "In order to record a timer, the TV was switched to the recording service!\n" -msgstr "" +msgstr "لكى تسجل مؤقت ، يجب تحويل التليفزيون الى القناه التى ستسجل منها ! \n" msgid "Include" msgstr "يشمل" # msgid "Include your email and name (optional) in the mail?" -msgstr "" +msgstr "تضمين بريدك الالكترونى (إختيارى) فى البريد ؟ " # msgid "Increase delay" msgstr "زيادة التأخير؟" -# #, python-format msgid "Increase delay by %i ms (can be set)" -msgstr "" +msgstr "زيادة التأخير بمقدار %i مللى ثانيه (يمكن الضبط)" # msgid "Increased voltage" @@ -2668,9 +2629,8 @@ msgstr "معلومات" msgid "InfoBar" msgstr "شريط المعلومات" -# msgid "Infobar timeout" -msgstr "" +msgstr "وقت ظهور شريط المعلومات" # msgid "Information" @@ -2684,9 +2644,8 @@ msgstr "" msgid "Initial location in new timers" msgstr "" -# msgid "Initialization" -msgstr "" +msgstr "تهيئه" # msgid "Initialize" @@ -2696,9 +2655,8 @@ msgstr "تفعيل البدأ" msgid "Initializing Harddisk..." msgstr "تفعيل القرص الصلب" -# msgid "Input" -msgstr "" +msgstr "مدخل" # msgid "Install" @@ -2783,11 +2741,10 @@ msgstr "" msgid "Invalid response from server." msgstr "رد غير صالح من الخادم" -# # File: tmp/enigma2_plugins/genuinedreambox/src/plugin.py, line: 177 #, python-format msgid "Invalid response from server. Please report: %s" -msgstr "" +msgstr "رد غير صالح من الخادم . من فضلك أبلغ %s" msgid "Invalid selection" msgstr "إختيار غير صالح" @@ -3048,13 +3005,11 @@ msgstr "أجعل هذه العلامه مجرد علامه" msgid "Manage extensions" msgstr "التحكم فى الاضافات" -# msgid "Manage network shares" -msgstr "" +msgstr "التحكم فى مشاركات الشبكه" -# msgid "Manage your network shares..." -msgstr "" +msgstr "التحكم فى مشاركات شبكتك ..." # msgid "Manage your receiver's software" @@ -3144,9 +3099,8 @@ msgstr "وضعيه" msgid "Model: " msgstr "موديل :" -# msgid "Modify existing timers" -msgstr "" +msgstr "تعديل المؤقتات الحاليه" # msgid "Modulation" @@ -3220,11 +3174,12 @@ msgstr "نوع الاعتلاء" msgid "MountManager" msgstr "المتحكم فى الاعتلاء" -# msgid "" "Mounted/\n" "Unmounted" msgstr "" +"تم الاعتلاء/\n" +"تم فك الاعتلاء" # msgid "Mountpoints management" @@ -3287,9 +3242,8 @@ msgstr "تحرك للغرب" msgid "Movie location" msgstr "مكان الفيلم" -# msgid "Movielist menu" -msgstr "" +msgstr "قائمة سجل الافلام" # msgid "Multi EPG" @@ -3298,9 +3252,8 @@ msgstr "دليل برامج متعدد" msgid "Multimedia" msgstr "وسائط متعدده" -# msgid "Multiple service support" -msgstr "" +msgstr "دعم خدمات متعدده" # msgid "Multisat" @@ -3389,9 +3342,8 @@ msgstr "ضبط أسم الخادم" msgid "Nameserver settings" msgstr "إعدادات اسم الخادم" -# msgid "Netmask" -msgstr "" +msgstr "قناع الشبكه" msgid "Network" msgstr "الشبكه" @@ -3520,9 +3472,8 @@ msgid "" "forward/backward!" msgstr "" -# msgid "No free tuner!" -msgstr "" +msgstr "لا يوجد موالف حر !" # msgid "No network connection available." @@ -3566,11 +3517,12 @@ msgstr "لا للجميع" msgid "No tuner is configured for use with a diseqc positioner!" msgstr "لم يتم العثور على موالف مهيأ للعمل مع موتور دايزك !" -# msgid "" "No tuner is enabled!\n" "Please setup your tuner settings before you start a service scan." msgstr "" +"لا يوجد موالف مفعل \n" +"من فضلك أضبط إعدادات الموالف قبل البحث عن القنوات ." # msgid "No useable USB stick found" @@ -3665,7 +3617,7 @@ msgstr "غير خطى" # msgid "Nonprofits & Activism" -msgstr "" +msgstr "غير ربحى والنشاط" # msgid "North" @@ -3681,6 +3633,8 @@ msgid "" "Not enough diskspace. Please free up some diskspace and try again. (%d MB " "required, %d MB available)" msgstr "" +"لا يوجد مساحه كافيه على القرص، من فضلك حرر مساحه وحاول ثانيه.(مطلوب %d " +"ميجاالمطلوب %d ميجا)" # msgid "Not fetching feed entries" @@ -3808,9 +3762,8 @@ msgstr "PIDs" msgid "Package list update" msgstr "تحديث قائمة الباقات" -# msgid "Package removal failed.\n" -msgstr "" +msgstr "فشل حذف الرزمه \n" msgid "Package removed successfully.\n" msgstr "تم حذف الرزمه بنجاح \n" @@ -3923,9 +3876,8 @@ msgstr "من فضلك أعد التشغيل" msgid "Please Select Medium to be Scanned" msgstr "من فضلك أختار الوسيط المطلوب فحصه" -# msgid "Please add titles to the compilation." -msgstr "" +msgstr "من فضلك أدخل عناوين للتأليف" msgid "Please change recording endtime" msgstr "من فضلك قم بتغيير وقت إنتهاء التسجيل" @@ -3980,16 +3932,14 @@ msgstr "من فضلك أدخل أسم للعلامه الجديده" msgid "Please enter a new filename" msgstr "من فضلك أدخل اسم جديد للملف" -# msgid "Please enter filename (empty = use current date)" -msgstr "" +msgstr "من فضلك أدخل اسم ملف (فارغ= استخدم التارخ الحالى)" msgid "Please enter name of the new directory" msgstr "من فضلك أدخل أسم الدليل الجديد" -# msgid "Please enter the correct pin code" -msgstr "" +msgstr "من فضلك أدخل الرقم السرى الصحيح" msgid "Please enter the old pin code" msgstr "من فضلك أدخل الرقم السرى القديم" @@ -4020,13 +3970,11 @@ msgstr "من فضلك أضغط موافق للاستمرار" msgid "Please press OK!" msgstr "من فضلك اضغط موافق" -# msgid "Please provide a Text to match" -msgstr "" +msgstr "من فضلك أدخل نص لمقارنته" -# msgid "Please select .NFI flash image file from medium" -msgstr "" +msgstr "من فضلك أختار ملف صورة فلاش NFI من وسيط" msgid "Please select a playlist to delete..." msgstr "أختار قائمة العرض المراد مسحها..." @@ -4034,9 +3982,8 @@ msgstr "أختار قائمة العرض المراد مسحها..." msgid "Please select a playlist..." msgstr "من فضلك أختار قائمة العرض..." -# msgid "Please select a standard feed or try searching for videos." -msgstr "" +msgstr "من فضلك أستخدم تغذيه قياسيه أو حاول البحث عن فيديوهات" msgid "Please select a subservice to record..." msgstr "من فضلك أختار الخدمه الفرعيه المطلوب تسجيلها..." @@ -4062,7 +4009,7 @@ msgstr "" # msgid "Please select target directory or medium" -msgstr "" +msgstr "من فضلك إختار الدليل الهدف أو الوسيط" msgid "Please select the movie path..." msgstr "من فضلك أختار مسار الفيلم..." @@ -4160,9 +4107,8 @@ msgstr "انتظر من فضلك ...يتم تحميل القائمه..." msgid "Plugin browser" msgstr "متصفح البلج إنز" -# msgid "Plugin manager activity information" -msgstr "" +msgstr "معلومات نشاط متحكم البلج إن" # msgid "Plugin manager help" @@ -4237,11 +4183,12 @@ msgstr "ضبط الموتور" msgid "Positioner storage" msgstr "" -# msgid "" "Power state to change to after recordings. Select \"standard\" to not change " "the default behavior of enigma2 or values changed by yourself." msgstr "" +"حالة الطاقه التى سيتم التغيير إليها بعد التسجيلات . أختار \"قياسى\" لعدم " +"تغيير القيم الافتراضيه للاينجما2 أو القيم المعدله بواسطتك" # msgid "Power threshold in mA" @@ -4276,9 +4223,8 @@ msgstr "اضغط موافق لتحرير الاعدادات المختاره" msgid "Press OK to edit the settings." msgstr "أضغط موافق لتحرير الاعدادات" -# msgid "Press OK to expand this host" -msgstr "" +msgstr "أضغط موافق لتوسيع هذا المضيف" #, python-format msgid "Press OK to get further details for %s" @@ -4305,9 +4251,8 @@ msgstr "أضغط موافق لتختار مزود" msgid "Press OK to select." msgstr "أضغط موافق لتختار" -# msgid "Press OK to select/deselect a CAId." -msgstr "" +msgstr "إضغط موافق لاختيار/الغاء اختيار CAId" # msgid "Press OK to start the scan" @@ -4334,9 +4279,8 @@ msgstr "معاينة المؤقت الالى" msgid "Preview menu" msgstr "معاينة القائمه" -# msgid "Primary DNS" -msgstr "" +msgstr "دى إن اس أبتدائى" msgid "Priority" msgstr "أولويه" @@ -4356,17 +4300,15 @@ msgstr "إحمى الضبط" msgid "Provider" msgstr "مزود" -# msgid "Provider to scan" -msgstr "" +msgstr "المزود الذى سيتم البحث فيه" # msgid "Providers" msgstr "مقدمو الخدمه" -# msgid "Published" -msgstr "" +msgstr "تم النشر" # msgid "Python frontend for /tmp/mmi.socket" @@ -4433,9 +4375,8 @@ msgstr "هل تريد فعلا الاغلاق الان ؟" msgid "Reboot" msgstr "إعادة التشغيل" -# msgid "Recently featured" -msgstr "" +msgstr "تم تميزها حديثا" # msgid "Reception Settings" @@ -4456,7 +4397,7 @@ msgstr "" # #, python-format msgid "Record time limited due to conflicting timer %s" -msgstr "" +msgstr "وقت تسجيل محدود لوجود مؤقت متعارض %s" msgid "Recorded files..." msgstr "ملفات مسجله..." @@ -4499,7 +4440,7 @@ msgstr "إعادة تحميل" # msgid "Reload Black-/Whitelists" -msgstr "" +msgstr "إعادة تحميل القائمه السوداء/البيضاء" msgid "Remember service pin" msgstr "تذكر الرقم السرى للخدمه" @@ -4512,7 +4453,7 @@ msgstr "حذف" # msgid "Remove Bookmark" -msgstr "" +msgstr "حذف إشاره مرجعيه" msgid "Remove Plugins" msgstr "حذف الـبلج إنز" @@ -4574,9 +4515,8 @@ msgstr "نوع الإعاده" msgid "Repeating event currently recording... What do you want to do?" msgstr "" -# msgid "Repeats" -msgstr "" +msgstr "إعادات" msgid "Require description to be unique" msgstr "يحتاج وصف ليكون فريدا" @@ -4601,7 +4541,7 @@ msgstr "" # msgid "Reset saved position" -msgstr "" +msgstr "إعادة المواقع المحفوظه للوضع الافتراضى" msgid "Reset video enhancement settings to system defaults?" msgstr "إعادة إعدادات تعزيز الفيديو الى إفتراضيات النظام ؟" @@ -4645,9 +4585,8 @@ msgstr "إستعادة الباك أب" msgid "Restore is running..." msgstr "الاستعاده قيد التنفيذ" -# msgid "Restore running" -msgstr "" +msgstr "إستعادة التنفيذ" msgid "Restore system settings" msgstr "إستعادة إعدادات النظام" @@ -4672,7 +4611,7 @@ msgstr "إستعادة الوضع الى%s" #. TRANSLATORS: (Some translators seem to have interpreted it as a #. TRANSLATORS: question or a choice, but it is a statement.) msgid "Resuming playback" -msgstr "" +msgstr "إستئناف العرض" msgid "Return to file browser" msgstr "العوده الى متصفح الملفات" @@ -4695,7 +4634,7 @@ msgstr "" # msgid "Rotor turning speed" -msgstr "" +msgstr "سرعة توليف الموتور" # msgid "Running" @@ -4714,7 +4653,7 @@ msgstr "S-Video" # msgid "SINGLE LAYER DVD" -msgstr "" +msgstr "دى فى دى أحادى الطبقه" # msgid "SNR" @@ -4827,7 +4766,7 @@ msgstr "البحث عن شبكات لاسلكيه" # msgid "Scan additional SR" -msgstr "" +msgstr "البحث عن SR إضافى" # msgid "Scan band EU HYPER" @@ -4891,6 +4830,8 @@ msgid "" "Scan your network for wireless access points and connect to them using your " "selected wireless device.\n" msgstr "" +"أبحث فى الشبكه عن نقاط دخول لاسلكيه وأتصل بهم باستخدامجهزك اللاسلكى " +"المختار.\n" # msgid "" @@ -4921,9 +4862,8 @@ msgstr "منطقة البحث:" msgid "Search restricted content:" msgstr "بحث محتويات محدوده:" -# msgid "Search strictness" -msgstr "" +msgstr "دقة البحث" msgid "Search type" msgstr "نوع البحث" @@ -4944,10 +4884,9 @@ msgstr "بحث عن الشبكه. رجاء الانتظار..." msgid "Secondary DNS" msgstr "" -# # File: tmp/enigma2_plugins/genuinedreambox/src/plugin.py, line: 160 msgid "Security service not running." -msgstr "" +msgstr "خدمة الامن لا تعمل" # msgid "Seek" @@ -5030,7 +4969,7 @@ msgstr "" # msgid "Select the location to save the recording to." -msgstr "" +msgstr "اختار المكان الذى ستحفظ فيه التسجيلات" msgid "Select type of Filter" msgstr "أختار نوع الفلتر" @@ -5040,7 +4979,7 @@ msgstr "أختار مصدر الترقيه المراد تحريره" # msgid "Select video input with up/down buttons" -msgstr "" +msgstr "أختار مدخل الفيديو بأزرار أعلى/أسفا" msgid "Select video mode" msgstr "أختار اسلوب الفيديو" @@ -6933,11 +6872,12 @@ msgstr "ماذا تريد ان تبحث ؟" msgid "What to do with submitted crashlogs?" msgstr "" -# msgid "" "When this option is enabled the AutoTimer won't match events where another " "timer with the same description already exists in the timer list." msgstr "" +"عند تفعيل هذا الخيار ، المؤقت الالى لن يطابق أحداث عند وجودمؤقت آخر بنفس " +"الوصف فى قائمة المؤقت" msgid "" "When you do a factory reset, you will lose ALL your configuration data\n" @@ -7607,9 +7547,8 @@ msgstr "إنهاء تحرير البدائل" msgid "end bouquet edit" msgstr "إنتهاء تحرير الباقه" -# msgid "end cut here" -msgstr "" +msgstr "إنتهاء القطع هنا" # msgid "end favourites edit" @@ -7625,9 +7564,8 @@ msgstr "مساوى لـــ" msgid "exact match" msgstr "تطابق كامل" -# msgid "exit DVD player or return to file browser" -msgstr "" +msgstr "الخروج من مشغل الدى فى دى أو العوده الى متصفح الملفات" msgid "exit mediaplayer" msgstr "الخروج من مشغل الوسائط" @@ -7657,9 +7595,8 @@ msgstr "" msgid "filename" msgstr "اسم الملف" -# msgid "fine-tune your display" -msgstr "" +msgstr "التوليف الدقيق للعرض" # msgid "forward to the next chapter" @@ -7727,9 +7664,8 @@ msgstr "تفعيل الكـام" msgid "init modules" msgstr "" -# msgid "insert mark here" -msgstr "" +msgstr "ضع علامه هنا" msgid "jump back to the previous title" msgstr "الانتقال خلفا للعنوان السابق" @@ -7841,9 +7777,8 @@ msgstr "مطلقا" msgid "next channel" msgstr "القناه التاليه" -# msgid "next channel in history" -msgstr "" +msgstr "القناه التاليه فى التاريخ" # msgid "no" @@ -7893,13 +7828,11 @@ msgstr "غير مستخدمه" msgid "nothing connected" msgstr "لا شيئ متصل" -# msgid "of a DUAL layer medium used." -msgstr "" +msgstr "من وسيط ثنائى الطبقه مستخدم" -# msgid "of a SINGLE layer medium used." -msgstr "" +msgstr "من وسيط أحادى الطبقه مستخدم" # msgid "off" @@ -7909,13 +7842,11 @@ msgstr "لا يعمـل!" msgid "on" msgstr "يعمل!" -# msgid "on READ ONLY medium." -msgstr "" +msgstr "على وسيط قراءه فقط" -# msgid "on Weekday" -msgstr "" +msgstr "فى يوم الاسبوع" # msgid "once" @@ -7944,15 +7875,14 @@ msgstr "وقف مؤقت" # msgid "play entry" -msgstr "" +msgstr "عرض المدخل" -# msgid "play from next mark or playlist entry" -msgstr "" +msgstr "أعرض من العلامه التاليه أو من قائمة العرض" # msgid "play from previous mark or playlist entry" -msgstr "" +msgstr "عرض من العلامه السابقه أو من مدخل قائمة العرض" msgid "please press OK when ready" msgstr "من فضلك أضغط موافق عندما تكون مستعد" @@ -7965,7 +7895,7 @@ msgstr "القناه السابقه" # msgid "previous channel in history" -msgstr "" +msgstr "القناه السابقه تاريخيا" msgid "record" msgstr "تسجيل" @@ -7978,11 +7908,11 @@ msgstr "أحمر" # msgid "remove a nameserver entry" -msgstr "" +msgstr "حذف مدخلأسم الخادم" # msgid "remove after this position" -msgstr "" +msgstr "حذف بعد هذا المكان" msgid "remove all alternatives" msgstr "حذف كل البدائل" @@ -7992,11 +7922,11 @@ msgstr "أحذف كل علامات وجد حديثا" # msgid "remove before this position" -msgstr "" +msgstr "حذف قبل هذا المكان" # msgid "remove bookmark" -msgstr "" +msgstr "حذف المرجعيه" msgid "remove directory" msgstr "حذف الدليل" @@ -8009,7 +7939,7 @@ msgstr "حذف من الحمايه الابويه" # msgid "remove new found flag" -msgstr "" +msgstr "حذف الاعلام التى وجدت حديثا" msgid "remove selected satellite" msgstr "حذف القمر المختار" @@ -8052,9 +7982,8 @@ msgstr "بتم البحث الان %d %%" msgid "scan state" msgstr "حاله البحث" -# msgid "second" -msgstr "" +msgstr "ثانوى" # msgid "second cable of motorized LNB" @@ -8085,7 +8014,7 @@ msgstr "أختار الواجهه" # msgid "select menu entry" -msgstr "" +msgstr "أختار مدخل قائمه" msgid "select movie" msgstr "أختار الفيلم" @@ -8105,7 +8034,7 @@ msgstr "الرقم السرى للاعدادات" # msgid "show DVD main menu" -msgstr "" +msgstr "أعرض قائمة دى فى دى الرئيسيه" # msgid "show EPG..." @@ -8173,9 +8102,8 @@ msgstr "تخطى للأمام" msgid "skip forward (enter time)" msgstr "تخطى للأمام (أدخل الوقت)" -# msgid "slide picture in loop" -msgstr "" +msgstr "صورة الشريحة في حلقة" msgid "sort by date" msgstr "تصنيف حسب التاريخ" @@ -8220,7 +8148,7 @@ msgstr "" # msgid "switch to bookmarks" -msgstr "" +msgstr "الانتقال الى المرجعيات" msgid "switch to filelist" msgstr "الانتقال الى قائمة الملفات" @@ -8272,7 +8200,7 @@ msgstr "قناه غير معروفه" # msgid "until standby/restart" -msgstr "" +msgstr "حتى وضع الانتظار/إعادة التشغيل" # msgid "use as HDD replacement" @@ -8310,9 +8238,8 @@ msgstr "تم الحذف بنجاح" msgid "weekly" msgstr "اسبوعى" -# msgid "whitelist" -msgstr "" +msgstr "القائمه البيضاء" msgid "working" msgstr "يعمل" diff --git a/po/fi.po b/po/fi.po index f1313133..c736512c 100755 --- a/po/fi.po +++ b/po/fi.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: tuxbox-enigma 0.0.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-11 10:44+0000\n" -"PO-Revision-Date: 2010-05-19 18:15+0200\n" -"Last-Translator: Timo <timojarvenpaa@hotmail.com>\n" +"PO-Revision-Date: 2010-06-09 10:42+0200\n" +"Last-Translator: Mladen <acid-burn@opendreambox.org>\n" "Language-Team: none\n" "Language: fi\n" "MIME-Version: 1.0\n" @@ -3259,11 +3259,11 @@ msgid "Match Timespan: %02d:%02d - %02d:%02d" msgstr "Haun aikajakso: %02d:%02d - %02d:%02d" msgid "Match title" -msgstr "Haun otsikko" +msgstr "Hae ohjelmanimi" #, python-format msgid "Match title: %s" -msgstr "Haun otsikko: %s" +msgstr "Hae ohjelmanimi: %s" msgid "Max. Bitrate: " msgstr "Maks. bittimäärä: " @@ -4640,7 +4640,7 @@ msgid "Radio" msgstr "Radio" msgid "Ralink" -msgstr "" +msgstr "Ralink" # msgid "Ram Disk" @@ -5267,11 +5267,13 @@ msgstr "Etsi" msgid "Select" msgstr "Valitse" -# msgid "" "Select \"exact match\" to enforce \"Match title\" to match exactly or " "\"partial match\" if you only want to search for a part of the event title." msgstr "" +"Valitse \"täysin sama\" pakottaaksesi \"Hae ohjelmanimi\" hakemaan täysin " +"vastaava tai \"osittainen vastaavuus\" jos haluat hakea vain osan ohjelman " +"nimestä." # msgid "Select HDD" @@ -5526,12 +5528,12 @@ msgstr "Mukautusvalintojen laajuus" msgid "Setup for the Audio Sync Plugin" msgstr "Audio Sync -lisäosan asetukset" -# #, python-format msgid "" "Shall the USB stick wizard proceed and program the image file %s into flash " "memory?" msgstr "" +"Saako USB-muistiavustaja jatkaa ja kirjoittaa päivityksen %s flash-muistiin?" # msgid "Sharpness" @@ -5889,13 +5891,11 @@ msgstr "Lopetetaanko tallenteen toistaminen?" msgid "Stop test" msgstr "Lopeta testi" -# msgid "Stop testing plane after # failed transponders" -msgstr "" +msgstr "Monenko toimimattoman transponderin jälkeen testaus lopetetaan" -# msgid "Stop testing plane after # successful transponders" -msgstr "" +msgstr "Monenko toimivan transponderin jälkeen testaus lopetetaan" # msgid "Store position" @@ -5964,10 +5964,12 @@ msgstr "Symbolinopeus" msgid "System" msgstr "Järjestelmä" -# #. TRANSLATORS: Add here whatever should be shown in the "translator" about screen, up to 6 lines (use \n for newline) msgid "TRANSLATOR_INFO" msgstr "" +"Suomenkielinen käännös: Timo Järvenpää\n" +"timojarvenpaa@hotmail.com\n" +"huoltovalikko.keskustelupalstat.com" # msgid "TS file is too large for ISO9660 level 1!" @@ -6067,12 +6069,13 @@ msgstr "" "värinäppäimien takaa löytyviä\n" "toimintoja." -# msgid "" "Thank you for using the wizard. Your new AutoTimer has been added to the " "List.\n" "Please press OK to continue." msgstr "" +"Uusi automaattiajastus on lisätty.\n" +"Jatka painamalla OK." # msgid "" @@ -6083,58 +6086,65 @@ msgstr "" "DVD-standardi ei tue H.264 (HDTV) videota. Haluatko luoda Dreamboxin omassa " "formaatissa olevan data-DVD:n? Levy ei toistu normaaleissa DVD-soittimissa." -# msgid "" "The NetworkWizard extension is not installed!\n" "Please install it." msgstr "" +"Verkkoavustajaa ei ole asennettu!\n" +"Asenna se." -# msgid "" "The Softwaremanagement extension is not installed!\n" "Please install it." msgstr "" +"Ohjelmistohallinnan lisäosaa ei ole asennettu!\n" +"Asenna se." -# msgid "" "The Timer will not be added to the List.\n" "Please press OK to close this Wizard." msgstr "" +"Ajastusta ei lisätä luetteloon.\n" +"Sulje avustaja painamalla OK." -# msgid "" "The Timespan of an AutoTimer is the first 'advanced' attribute. If a " "timespan is specified an event will only match this AutoTimer if it lies " "inside of this timespan." msgstr "" +"Automaattiajastuksen aikajakso on ensimmäinen 'laajempi' hakutieto. Jos " +"aikajakso on määritetty, ohjelma haetaan tällä automaattiajastuksella vain " +"jos se on aikajakson sisällä." -# msgid "" "The USB stick is now bootable. Do you want to download the latest image from " "the feed server and save it on the stick?" msgstr "" +"USB-muisti on nyt automaattisesti käynnistyvä. Haluatko ladata uusimman " +"päivityksen ja tallentaa sen muistitikulle?" # msgid "The backup failed. Please choose a different backup location." msgstr "Varmuuskopiointi epäonnistui. Valitse toinen varmuuskopiointipaikka." -# msgid "" "The counter can automatically be reset to the limit at certain intervals." -msgstr "" +msgstr "Laskuri voidaan nollata raja-arvoon tietyin väliajoin." -# #, python-format msgid "" "The directory %s is not writable.\n" "Make sure you select a writable directory instead." msgstr "" +"Hakemistoon %s ei voida tallentaa.\\Valitse hakemisto johon voidaan " +"tallentaa." -# msgid "" "The editor to be used for new AutoTimers. This can either be the Wizard or " "the classic editor." msgstr "" +"Automaattiajastuksien muokkaus. Tämä voi olla avustettu tai klassinen " +"muokkaustila." # #, python-format @@ -6176,9 +6186,8 @@ msgstr "" "Oletusarvojen asennus on suoritettu. Voit jatkaa Dreamboxin asetusten " "muokkausta painamalla OK." -# msgid "The match attribute is mandatory." -msgstr "" +msgstr "Vastaavuuden hakutieto on pakollinen." # msgid "" @@ -6271,9 +6280,8 @@ msgstr "Avustaja on lopettanut. Paina OK." msgid "There are at least " msgstr "Saatavilla ainakin" -# msgid "There are currently no outstanding actions." -msgstr "" +msgstr "Ei suorittamattomia tehtäviä." # msgid "There are no default services lists in your image." @@ -6283,9 +6291,8 @@ msgstr "Oletuskanavalistoja ei löydy. Paina OK." msgid "There are no default settings in your image." msgstr "Oletusarvoja ei löydy. Paina OK." -# msgid "There are no updates available." -msgstr "" +msgstr "Päivityksiä ei ole saatavilla." # msgid "There are now " @@ -6303,20 +6310,20 @@ msgstr "" msgid "There was an error downloading the packetlist. Please try again." msgstr "Virhe ladattaessa IPKG-ohjelmapakettiluetteloa. Yritä uudestaan." -# msgid "There was an error getting the feed entries. Please try again." -msgstr "" +msgstr "Virhe haettaessa feedien nimiä. Yritä uudestaan." # msgid "There was an error. The package:" msgstr "Tapahtui virhe. Paketti:" -# # File: tmp/enigma2_plugins/genuinedreambox/src/plugin.py, line: 130 msgid "" "There's a certificate update available for your dreambox. Would you like to " "apply this update now?" msgstr "" +"Dreamboxiisi on saatavilla päivitetty sertifikaatti. Asennetaanko päivitys " +"nyt?" # #, python-format @@ -6360,32 +6367,34 @@ msgstr "Tässä kuussa" msgid "This Week" msgstr "Tällä viikolla" -# msgid "" "This is a name you can give the AutoTimer. It will be shown in the Overview " "and the Preview." msgstr "" +"Voit antaa nimen automaattiajastukselle. Se näkyy yleisnäkymässä ja " +"esikatselussa." # msgid "This is step number 2." msgstr "Tämä on vaihe 2." -# msgid "" "This is the delay in hours that the AutoTimer will wait after a search to " "search the EPG again." msgstr "" +"Aika (tunteina) jonka automaattiajastus odottaa haun jälkeen ennen uuden EPG-" +"haun aloittamista." -# msgid "This is the help screen. Feed me with something to display." -msgstr "" +msgstr "Ohjesivu..." -# msgid "" "This is what will be looked for in event titles. Note that looking for e.g. " "german umlauts can be tricky as you have to know the encoding the channel " "uses." msgstr "" +"Tätä etsitään ohjelmien nimistä. Huomaa, että ääkkösten haku voi olla " +"hankalaa koska sinun pitää tietää kanavan käyttämä merkkikoodaus." # msgid "This plugin is installed." @@ -6403,9 +6412,8 @@ msgstr "Tämä lisäosa asennetaan." msgid "This plugin will be removed." msgstr "Tämä lisäosa poistetaan." -# msgid "This setting controls the behavior when a timer matches a found event." -msgstr "" +msgstr "Tämä valitsee mitä tapahtuu kun ajastus täsmää löydettyyn ohjelmaan." # msgid "" @@ -6470,12 +6478,14 @@ msgstr "" msgid "This test detects your configured LAN-Adapter." msgstr "Tämä testi tunnistaa määrittelemäsi verkkosovittimen." -# msgid "" "This toggles the behavior on timer conflicts. If an AutoTimer matches an " "event that conflicts with an existing timer it will not ignore this event " "but add it disabled." msgstr "" +"Tämä valitsee mita tapahtuu päällekkäisissä ajastuksissa. Jos " +"automaattiajastus löytää ohjelman, joka on päällekkäinen olemassa olevan " +"ajastuksen kanssa, se lisää uuden ajastuksen mutta kytkee sen pois päältä." # msgid "Three" @@ -6501,13 +6511,11 @@ msgstr "Torstai" msgid "Time" msgstr "Aika" -# msgid "Time in minutes to append to recording." -msgstr "" +msgstr "Lisäaika (minuutteina) tallennuksen loppuun." -# msgid "Time in minutes to prepend to recording." -msgstr "" +msgstr "Lisäaika (minuutteina) tallennuksen alkuun." # msgid "Time/Date Input" @@ -6547,9 +6555,8 @@ msgstr "" "Ajastusten päällekkäisyys havaittu!\n" "Tarkista ajastusasetukset!" -# msgid "Timer record location" -msgstr "" +msgstr "Ajastuksien tallennushakemisto" # msgid "Timer sanity error" @@ -6571,9 +6578,8 @@ msgstr "Ajastuksen tyyppi" msgid "Timeshift" msgstr "Ajansiirto" -# msgid "Timeshift location" -msgstr "" +msgstr "Ajansiirron tallennushakemisto" # msgid "Timeshift not possible!" @@ -6595,7 +6601,6 @@ msgstr "Ominaisuudet" msgid "Titleset mode" msgstr "Tila" -# msgid "" "To update your Dreambox firmware, please follow these steps:\n" "1) Turn off your box with the rear power switch and plug in the bootable USB " @@ -6604,6 +6609,12 @@ msgid "" "for 10 seconds.\n" "3) Wait for bootup and follow instructions of the wizard." msgstr "" +"Päivitä Dreamboxin ohjelmisto näiden ohjeiden mukaisesti:\n" +"1) Kytke virta pois päältä takapaneelin kytkimestä ja liitä automaattisesti " +"käynnistyvä USB-muistitikku.\n" +"2) Kytke virta takaisin päälle ja pidä etupaneelin nuoli alas -näppäintä 10 " +"sekuntia pohjassa.\n" +"3) Odota käynnistymistä ja seuraa ohjeita." # msgid "Today" @@ -6629,9 +6640,8 @@ msgstr "Äänipurske A/B" msgid "Top favorites" msgstr "Suosituimmat" -# msgid "Top rated" -msgstr "" +msgstr "Parhaiten sijoittuneet" # msgid "Track" @@ -6661,9 +6671,8 @@ msgstr "Lähetin" msgid "Transponder Type" msgstr "Lähettimen tyyppi" -# msgid "Travel & Events" -msgstr "" +msgstr "Matkailu ja tapahtumat" # msgid "Tries left:" @@ -6681,13 +6690,11 @@ msgstr "Haetaan kaapeliverkon lähetystaajuuksia...odota..." msgid "Trying to download a new packetlist. Please wait..." msgstr "Ladataan uusinta IPKG-ohjelmapakettiluetteloa. Odota..." -# msgid "Trying to download the Youtube feed entries. Please wait..." -msgstr "" +msgstr "Ladataan Youtube-feedejä. Odota..." -# msgid "Trying to download the Youtube search results. Please wait..." -msgstr "" +msgstr "Ladataan Youtube-hakutuloksia. Odota..." # msgid "Tue" @@ -6725,9 +6732,8 @@ msgstr "Virittimien asetukset" msgid "Tuner status" msgstr "Virittimen tila" -# msgid "Tuner type" -msgstr "" +msgstr "Virittimen tyyppi" # msgid "Turkish" @@ -6757,11 +6763,11 @@ msgstr "USB-muisti" msgid "USB stick wizard" msgstr "USB-muistiavustaja" -# msgid "" "USB stick wizard finished. Your dreambox will now restart with your new " "image!" msgstr "" +"USB-muistiavustaja on valmis. Dreambox käynnistyy nyt uudella ohjelmistolla!" # msgid "Ukrainian" @@ -6795,43 +6801,40 @@ msgstr "Kumoa asennus" msgid "Undo uninstall" msgstr "Kumoa as.poisto" -# msgid "UnhandledKey" -msgstr "" +msgstr "TuntematonNäppäin" -# msgid "Unicable" -msgstr "" +msgstr "Unicable" -# msgid "Unicable LNB" -msgstr "" +msgstr "Unicable LNB" -# msgid "Unicable Martix" -msgstr "" +msgstr "Unicable matrix" # msgid "Uninstall" msgstr "Poista asennus" -# msgid "United States" -msgstr "" +msgstr "Yhdysvallat" # msgid "Universal LNB" msgstr "Universaali LNB" msgid "Unknown network adapter." -msgstr "" +msgstr "Tuntematon verkkosovitin" -# msgid "" "Unless this is enabled AutoTimer will NOT automatically look for events " "matching your AutoTimers but only when you leave the GUI with the green " "button." msgstr "" +"Jos tätä ei ole valittu päälle, automaattiajastus ei hae " +"automaattiajastettuja ohjelmia, niitä haetaan vain samalla kun poistut " +"käyttöliittymästä vihreällä näppäimellä." # msgid "Unmount failed" @@ -6848,29 +6851,29 @@ msgstr "Päivitä" msgid "Update done..." msgstr "Päivitys tehty..." -# # File: tmp/enigma2_plugins/genuinedreambox/src/plugin.py, line: 170 msgid "" "Update done... The genuine dreambox test will now be rerun and should not " "ask you to update again." msgstr "" +"Päivitys valmis... Dreamboxin aitoustesti käynnistyy uudelleen eikä sen " +"pitäisi kysyä päivitystä enää." msgid "Updatefeed not available." msgstr "Päivityslähde ei ole saatavilla." -# # File: tmp/enigma2_plugins/genuinedreambox/src/plugin.py, line: 150 msgid "" "Updating failed. Nothing is broken, just the update couldn't be applied." msgstr "" +"Päivitys epäonnistui. Mikään ei ole rikki, päivitystä ei vain voitu asentaa." # msgid "Updating finished. Here is the result:" msgstr "Päivitys suoritettu. Tulos:" -# msgid "Updating software catalog" -msgstr "" +msgstr "Päivitetään ohjelmistoluetteloa" msgid "Updating, please wait..." msgstr "Päivitetään, odota..." @@ -6891,15 +6894,15 @@ msgstr "Päivitetään" msgid "Upgrading Dreambox... Please wait" msgstr "Päivitetään Dreamboxia... Odota" -# msgid "Upper bound of timespan." -msgstr "" +msgstr "Aikajakson yläraja." -# msgid "" "Upper bound of timespan. Nothing after this time will be matched. Offsets " "are not taken into account!" msgstr "" +"Aikajakson yläraja. Mitään tämän jälkeistä ei haeta. Lisäaikoja ei oteta " +"huomioon!" # msgid "Use" @@ -6917,9 +6920,8 @@ msgstr "Sovitin käytössä" msgid "Use Power Measurement" msgstr "Käytä virran mittausta" -# msgid "Use a custom location" -msgstr "" +msgstr "Käytä muokattua tallennushakemistoa" # msgid "Use a gateway" @@ -6933,9 +6935,8 @@ msgstr "Hyppivä kelaus kun nopeus ylittää" msgid "Use power measurement" msgstr "Käytä virran mittausta" -# msgid "Use the Networkwizard to configure selected network adapter" -msgstr "" +msgstr "Muokkaa valitun verkkosovittimen asetuksia verkkoavustajan opastamana" # msgid "Use the Networkwizard to configure your Network\n" @@ -6999,13 +7000,11 @@ msgstr "Käytetty kanavahakutyyppi" msgid "User defined" msgstr "Käyttäjän määrittelemä" -# msgid "User management" -msgstr "" +msgstr "Käyttäjien hallinta" -# msgid "Usermanager" -msgstr "" +msgstr "Käyttäjien hallinta" # msgid "Username" @@ -7016,13 +7015,12 @@ msgstr "Käyttäjänimi" msgid "VCR scart" msgstr "SCART-läpivienti" -# msgid "VMGM (intro trailer)" -msgstr "" +msgstr "VMGM (intro trailer)" msgid "" "Verify your Dreambox authenticity by running the genuine dreambox plugin!" -msgstr "" +msgstr "Tarkista Dreamboxin aitous suorittamalla Aito Dreambox -lisäosa!" # msgid "Vertical" @@ -7080,17 +7078,15 @@ msgstr "" msgid "Video mode selection." msgstr "Video-tilan valinta." -# msgid "Videobrowser exit behavior:" -msgstr "" +msgstr "Toiminta lopetuksessa:" # msgid "Videoenhancement Setup" msgstr "Kuvanparannusasetukset" -# msgid "Videoplayer stop/exit behavior:" -msgstr "" +msgstr "Toiminta pysäytyksessä/lopetuksessa:" # msgid "View Count" @@ -7104,17 +7100,15 @@ msgstr "Näytä tallenteita..." msgid "View Photos..." msgstr "Näytä kuvia..." -# msgid "View Rass interactive..." -msgstr "" +msgstr "Näytä Rass interactive..." # msgid "View Video CD..." msgstr "Katso Video-CD..." -# msgid "View active downloads" -msgstr "" +msgstr "Näytä aktiiviset lataukset" # msgid "View details" @@ -7136,9 +7130,8 @@ msgstr "Näytä saatavilla olevat näyttö ja käyttöliittymälaajennukset" msgid "View list of available EPG extensions." msgstr "Näytä saatavilla olevat EPG-laajennukset" -# msgid "View list of available Satellite equipment extensions." -msgstr "" +msgstr "Näytä saatavilla olevat satelliittilaitteistojen laajennukset." # msgid "View list of available communication extensions." @@ -7172,25 +7165,21 @@ msgstr "Näytä saatavilla olevat ohjelmistolaajennukset" msgid "View list of available system extensions" msgstr "Näytä saatavilla olevat järjestelmälaajennukset" -# msgid "View related videos" -msgstr "" +msgstr "Näytä liittyvät videot" -# msgid "View response videos" -msgstr "" +msgstr "Näytä vastausvideot" # msgid "View teletext..." msgstr "Näytä teksti-tv..." -# msgid "View, edit or delete mountpoints on your Dreambox." -msgstr "" +msgstr "Näytä, muokkaa tai poista Dreamboxin liitoksia." -# msgid "View, edit or delete usernames and passwords for your network." -msgstr "" +msgstr "Näytä, muokkaa tai poista verkon käyttäjänimiä ja salasanoja." # msgid "Views: " @@ -7217,10 +7206,10 @@ msgid "WEP" msgstr "WEP" msgid "WLAN adapter." -msgstr "" +msgstr "WLAN-sovitin" msgid "WLAN connection" -msgstr "" +msgstr "WLAN-yhteys" # msgid "WPA" @@ -7250,13 +7239,11 @@ msgstr "Odottaa" msgid "Warn if free space drops below (kB):" msgstr "Varoita jos tyhjä tila putoaa alle (kB):" -# msgid "Webinterface" -msgstr "" +msgstr "Web-liittymä" -# msgid "Webinterface: Main Setup" -msgstr "" +msgstr "Web-liittymä: asetukset" # msgid "Wed" @@ -7309,7 +7296,6 @@ msgstr "" "päivityksessä ja varmuuskopioinnissa sekä asetusten palauttamisessa " "päivityksen jälkeen." -# msgid "" "Welcome to the MyTube Youtube Player.\n" "\n" @@ -7324,8 +7310,18 @@ msgid "" "\n" "The Help button shows this help again." msgstr "" +"Tervetuloa MyTube Youtube-soittimeen.\n" +"\n" +"Bouquet+ näppäimellä pääset hakukenttään ja bouquet- näppäimellä videoihin.\n" +"\n" +"OK-näppäin toistaa videon.\n" +"\n" +"Info-näppäin näyttää videon kuvaustekstin.\n" +"\n" +"Menu-näppäimellä voit muuttaa lisäasetuksia.\n" +"\n" +"Help-näppäin näyttää tämän ohjeruudun uudestaan." -# msgid "" "Welcome to the MyTube Youtube Player.\n" "\n" @@ -7337,6 +7333,14 @@ msgid "" "\n" "Press exit to get back to the input field." msgstr "" +"Tervetuloa MyTube Youtube-soittimeen.\n" +"\n" +"Kun kirjoitat hakusanoja, saat hakusanaan sopivia ehdotuksia.\n" +"\n" +"Valitse ehdotus painamalla nuoli alas -näppäintä ja aloita haku painamalla " +"OK-näppäintä.\n" +"\n" +"Exit-näppäimellä pääset takaisin hakusanan syöttöön." # msgid "" @@ -7369,13 +7373,16 @@ msgstr "" "\n" "Siirry seuraavaan vaiheeseen painamalla OK-nappia." -# msgid "" "Welcome.\n" "\n" "This Wizard will help you to create a new AutoTimer by providing " "descriptions for common settings." msgstr "" +"Tervetuloa.\n" +"\n" +"Tämä toiminto näyttää kuvaukset yleisimmistä asetuksista joiden avulla voit " +"luoda uusia automaattiajastuksia" # # Ohjatun alkuasennuksen (Start Wizard) aloitusruutu. Teksti on @@ -7417,13 +7424,13 @@ msgstr "Kanavahaun lisäasetukset:" msgid "What to do with submitted crashlogs?" msgstr "Mitä lähetetyille lokeille tehdään?" -# msgid "" "When this option is enabled the AutoTimer won't match events where another " "timer with the same description already exists in the timer list." msgstr "" +"Kun tämä asetus on päällä, automaattiajastus ei hae ohjelmia joille on jo " +"olemassa ajastus samalla kuvauksella." -# msgid "" "When you do a factory reset, you will lose ALL your configuration data\n" "(including bouquets, services, satellite data ...)\n" @@ -7432,6 +7439,12 @@ msgid "" "\n" "Really do a factory reset?" msgstr "" +"Jos palautat tehdasasetukset, häviää kaikki tekemäsi omat asetukset\n" +"(sisältäen suosikkilistat, kanavat, satelliitit ...)\n" +"Tehdasasetusten palautuksen jälkeen vastaanotin käynnistyy automaattisesti " +"uudelleen!\n" +"\n" +"Haluatko palauttaa tehdasasetukset?" # msgid "Where do you want to backup your settings?" @@ -7457,21 +7470,22 @@ msgstr "Langaton verkko" msgid "Wireless Network State" msgstr "WLAN-verkon tila" -# msgid "" "With this option enabled the channel to record on can be changed to a " "alternative service it is restricted to." msgstr "" +"Kun tämä asetus on valittu, tallennuskanava voidaan vaihtaa vaihtoehtoiseksi " +"määritellylle kanavalle." -# msgid "" "With this option you can restrict the AutoTimer to a certain ammount of " "scheduled recordings. Set this to 0 to disable this functionality." msgstr "" +"Tällä asetuksella voit rajoittaa automaattiajastuksen lisäämien ajastusten " +"määrää. Aseta arvoksi 0 jos et halua käyttää rajoitusta." -# msgid "Wizard" -msgstr "" +msgstr "Avustaja" # msgid "Write error while recording. Disk full?\n" @@ -7497,9 +7511,8 @@ msgstr "Vuosi" msgid "Yes" msgstr "Kyllä" -# msgid "Yes to all" -msgstr "" +msgstr "Kyllä kaikkiin" # msgid "Yes, and delete this movie" @@ -7513,13 +7526,11 @@ msgstr "Kyllä, älä kysy uudestaan" msgid "Yes, backup my settings!" msgstr "Kyllä, varmuuskopioi asetukset!" -# msgid "Yes, but play next video" -msgstr "" +msgstr "Kyllä, mutta toista seuraava video" -# msgid "Yes, but play previous video" -msgstr "" +msgstr "Kyllä, mutta toista edellinen video" # msgid "Yes, do a manual scan now" @@ -7533,9 +7544,8 @@ msgstr "Kyllä, tee automaattihaku nyt" msgid "Yes, do another manual scan now" msgstr "Kyllä, tee toinen manuaalihaku nyt" -# msgid "Yes, keep them." -msgstr "" +msgstr "Kyllä, säilytä ne." # msgid "Yes, perform a shutdown now." @@ -7575,20 +7585,20 @@ msgstr "Voit valita, mitä haluat asentaa..." msgid "You can install this plugin." msgstr "Voit asentaa tämän lisäosan." -# msgid "You can only burn Dreambox recordings!" -msgstr "" +msgstr "Voit polttaa vain Dreamboxin tallenteita!" # msgid "You can remove this plugin." msgstr "Voit poistaa tämän lisäosan." -# msgid "" "You can set the basic properties of an AutoTimer here.\n" "While 'Name' is just a human-readable name displayed in the Overview, 'Match " "in title' is what is looked for in the EPG." msgstr "" +"Tässä voit muuttaa automaattiajastuksen ominaisuuksia.\\'Nimi' on käytössä " +"vain yleisnäkymässä, 'Hae ohjelmanimi' on se mitä haetaan EPG:stä." # msgid "You cannot delete this!" @@ -7611,19 +7621,22 @@ msgid "" "You chose not to install anything. Please press OK finish the install wizard." msgstr "Et valinnut mitään asennettavaksi. Poistu painamalla OK." -# msgid "" "You did not provide a valid 'Match in title' Attribute for your new " "AutoTimer.\n" "As this is a mandatory Attribute you cannot continue without doing so." msgstr "" +"En syöttänyt kunnollista 'Hae ohjelmanimi' hakutietoa uudelle " +"automaattiajastukselle.\n" +"Koska kyseinen tieto on pakollinen, et voi jatkaa ennen kuin olet tehnyt sen." -# #, python-format msgid "" "You entered \"%s\" as Text to match.\n" "Do you want to remove trailing whitespaces?" msgstr "" +"Syötit \"%s\" hakutekstiksi.\n" +"Haluatko poistaa lopussa olevat välilyönnit?" # msgid "" @@ -7675,27 +7688,33 @@ msgstr "" "\n" "Haluatko asettaa tunnusluvun nyt?" -# msgid "" "You successfully configured a new AutoTimer. Do you want to add it to the " "list?\n" "\n" "You can go back a step by pressing EXIT on your remote." msgstr "" +"Olet luonut uuden automaattiajastuksen. Haluatko lisätä sen listalle?.\n" +"\n" +"Voit palata askeleen taaksepäin exit-näppäimellä." -# msgid "" "Your 'Match in title' Attribute ends with a Whitespace.\n" "Please confirm if this was intentional, if not they will be removed." msgstr "" +"Syöttämäsi 'Hae ohjelmanimi' hakutieto päättyy välilyöntiin.\n" +"Vahvista, että tämä on tahallista. Muussa tapauksessa välilyönti poistetaan." -# msgid "" "Your Dreambox is now ready to use.\n" "\n" "Your internet connection is working now.\n" "\n" msgstr "" +"Dreambox on nyt valmis käyttöön.\n" +"\n" +"Verkkoyhteys toimii.\n" +"\n" # msgid "" @@ -7721,22 +7740,23 @@ msgid "" "process." msgstr "Varmuuskopiointi onnistui. Päivitys jatkuu eteenpäin." -# msgid "" "Your collection exceeds the size of a single layer medium, you will need a " "blank dual layer DVD!" msgstr "" +"Tallenteet eivät mahdu yksipuoliselle DVD:lle, tarvitset tyhjän dual layer " +"DVD-levyn." -# #, python-format msgid "" "Your config file is not well-formed:\n" "%s" msgstr "" +"Asetustiedosto ei ole kunnollinen:\n" +"%s" -# msgid "Your current collection will get lost!" -msgstr "" +msgstr "Nykyinen kokoelma häviää!" # msgid "Your dreambox is shutting down. Please stand by..." @@ -7778,17 +7798,14 @@ msgstr "Nimi (ei pakollinen):" msgid "Your network configuration has been activated." msgstr "Verkkoasetukset on aktivoitu." -# msgid "Your network mount has been activated." -msgstr "" +msgstr "Verkkojako on aktivoitu." -# msgid "Your network mount has been removed." -msgstr "" +msgstr "Verkkojako on poistettu." -# msgid "Your network mount has been updated." -msgstr "" +msgstr "Verkkojako on päivitetty." # msgid "" @@ -7802,15 +7819,13 @@ msgstr "" "\n" "Valitse mitä haluat tehdä seuraavaksi." -# msgid "Zap back to previously tuned service?" -msgstr "" +msgstr "Palataanko aikaisemmalle kanavalle?" -# msgid "Zap back to service before positioner setup?" msgstr "" "Vaihdetaanko takaisin kanavalle, jota katsottiin\n" -"ennen moottoriasetuksien tekoa?" +"ennen moottoriasetuksien muutosta?" # msgid "Zap back to service before satfinder?" @@ -7818,12 +7833,13 @@ msgstr "" "Vaihdetaanko takaisin kanavalle, jota katsottiin\n" "ennen satelliittietsimen käyttöä?" -# msgid "Zap back to service before tuner setup?" msgstr "" +"Vaihdetaanko takaisin kanavalle, jota katsottiin\n" +"ennen viritinasetuksien muutosta?" msgid "Zydas" -msgstr "" +msgstr "Zydas" # msgid "[alternative edit]" @@ -7841,13 +7857,14 @@ msgstr "[Suosikkien lisäys ja poisto]" msgid "[move mode]" msgstr "[Suosikkien järjestely]" -# msgid "a gui to assign services/providers to common interface modules" msgstr "" +"Käyttöliittymä kanavien/palvelutarjoajien määrittämiseen CI-moduuleille" -# msgid "a gui to assign services/providers/caids to common interface modules" msgstr "" +"Käyttöliittymä kanavien/palvelutarjoajien/CAId:en määrittämiseen CI-" +"moduuleille" # msgid "abort alternatives edit" @@ -7869,9 +7886,8 @@ msgstr "alkaa juuri" msgid "activate current configuration" msgstr "aktivoi nykyiset asetukset" -# msgid "activate network adapter configuration" -msgstr "" +msgstr "aktivoi verkkosovittimen asetukset" # msgid "add AutoTimer..." @@ -7962,7 +7978,7 @@ msgid "alphabetic sort" msgstr "Aakkosjärjestys" msgid "assigned CAIds:" -msgstr "" +msgstr "määritetyt CAId:t:" # msgid "assigned Services/Provider:" @@ -8025,13 +8041,11 @@ msgstr "sininen" msgid "burn audio track (%s)" msgstr "Polta ääniraita (%s)" -# msgid "case-insensitive search" -msgstr "" +msgstr "merkkikokoriippumaton haku" -# msgid "case-sensitive search" -msgstr "" +msgstr "merkkikokoriippuvainen haku" # msgid "change recording (duration)" diff --git a/po/it.po b/po/it.po index 5ef98e69..1411f464 100755 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: enigma2 v2.6 Italian Locale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-11 10:44+0000\n" -"PO-Revision-Date: 2010-05-14 16:00+0200\n" +"PO-Revision-Date: 2010-05-21 23:06+0200\n" "Last-Translator: spaeleus <spaeleus@croci.org>\n" "Language-Team: WWW.LINSAT.NET <spaeleus@croci.org>\n" "Language: it\n" @@ -413,7 +413,7 @@ msgstr "" "Mantenere la propria versione?" msgid "A demo plugin for TPM usage." -msgstr "Un plugin dimostrativo per luso di TPM" +msgstr "Un plugin dimostrativo per l'uso di TPM" # msgid "" diff --git a/po/nl.po b/po/nl.po index ff1a84f9..143f3a07 100755 --- a/po/nl.po +++ b/po/nl.po @@ -7,13 +7,15 @@ msgstr "" "Project-Id-Version: enigma2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-11 10:44+0000\n" -"PO-Revision-Date: 2010-06-09 08:52+0100\n" -"Last-Translator: Fraxinas <andreas.frisch@multimedia-labs.de>\n" -"Language-Team: <Benny.DeTandt@gmail.com>\n" +"PO-Revision-Date: 2010-06-08 16:12+0200\n" +"Last-Translator: Benny <Benny.DeTandt@gmail.com>\n" +"Language-Team: <Benny.DeTandt@gmail.com>\n" +"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Pootle 2.0.3\n" "X-Poedit-Language: Nederlands\n" "X-Poedit-SourceCharset: iso-8859-15\n" "X-Poedit-Country: NEDERLAND\n" @@ -104,7 +106,7 @@ msgid "" "Scan for local extensions and install them." msgstr "" "\n" -"Zoek naar locale extensies en installeer." +"Zoek naar locale extensies en installeer deze." # msgid "" @@ -136,9 +138,8 @@ msgstr "" msgid " " msgstr " " -# msgid " Results" -msgstr "" +msgstr " Resultaten" # msgid " extensions." @@ -295,9 +296,8 @@ msgstr "1.1" msgid "1.2" msgstr "1.2" -# msgid "12V output" -msgstr "12V Uitgang" +msgstr "12V uitgang" # msgid "13 V" @@ -323,7 +323,6 @@ msgstr "16:9" msgid "16:9 Letterbox" msgstr "16:9 Letterbox" -# msgid "16:9 always" msgstr "Altijd 16:9" @@ -421,7 +420,7 @@ msgstr "" "Wilt u uw versie behouden?" msgid "A demo plugin for TPM usage." -msgstr "" +msgstr "Een demo plugin voor TPM gebruik." # msgid "" @@ -449,7 +448,7 @@ msgid "" "Update existing entry and continue?\n" msgstr "" "Deze verbinding bestaat reeds met deze naam!\n" -"Bestaande item overschrijven en verder gaan ?\n" +"Bestaande item overschrijven en verder gaan?\n" # #, python-format @@ -557,13 +556,11 @@ msgstr "Afbreken" # msgid "Abort this Wizard." -msgstr "Deze wizard afsluiten" +msgstr "Deze wizard afsluiten." -# msgid "About" msgstr "Uw Dreambox" -# msgid "About..." msgstr "Uw Dreambox" @@ -663,13 +660,12 @@ msgstr "Aan boeket toevoegen" msgid "Add to favourites" msgstr "Aan favorieten toevoegen" -# msgid "Add zap timer instead of record timer?" -msgstr "" +msgstr "Voeg een zap timer toe i.p.v. een opnametimer?" # msgid "Added: " -msgstr "" +msgstr "Toegevoegd:" # msgid "" @@ -764,7 +760,7 @@ msgstr "Transparantie" # msgid "Alternative radio mode" -msgstr "Alternative radio modus" +msgstr "Alternatieve radio modus" # msgid "Alternative services tuner priority" @@ -784,15 +780,14 @@ msgstr "Een lege bestandsnaam is ongeldig." # msgid "An error occured." -msgstr "" +msgstr "Er is een fout opgetreden." # msgid "An unknown error occured!" msgstr "Een onbekende fout is gebeurd!" -# msgid "Anonymize crashlog?" -msgstr "Anonimiseren crashlog?" +msgstr "Crashlog anoniem maken?" # msgid "Arabic" @@ -856,7 +851,7 @@ msgstr "Artiest" # msgid "Ascending" -msgstr "" +msgstr "Oplopend" # msgid "Ask before shutdown:" @@ -871,7 +866,7 @@ msgid "Aspect Ratio" msgstr "Beeldverhouding" msgid "Atheros" -msgstr "" +msgstr "Atheros" # msgid "Audio" @@ -883,11 +878,11 @@ msgstr "Audio Opties..." # msgid "Audio Sync" -msgstr "" +msgstr "Audio synchronisatie" # msgid "Audio Sync Setup" -msgstr "" +msgstr "Audio synchronisatie instellen" # msgid "Australia" @@ -947,7 +942,7 @@ msgstr "Automatisch zoeken" # msgid "Autos & Vehicles" -msgstr "" +msgstr "Auto's & Voertuigen" # msgid "Autowrite timer" @@ -1079,7 +1074,7 @@ msgstr "Beschrijf DVD" # msgid "Burn existing image to DVD" -msgstr "Brand deze image op DVD" +msgstr "Schrijf deze image op DVD" # msgid "Burn to DVD" @@ -1094,7 +1089,7 @@ msgid "" "By pressing the OK Button on your remote control, the info bar is being " "displayed." msgstr "" -"Door op de OK Knop van de afstandsbediening te drukken, word de infobalk " +"Door op de OK Knop van de afstandsbediening te drukken, wordt de infobalk " "zichtbaar." # @@ -1106,9 +1101,8 @@ msgid "C-Band" msgstr "C-Band" # -#, fuzzy msgid "CDInfo" -msgstr "Info" +msgstr "CD Info" # msgid "CI assignment" @@ -1131,9 +1125,8 @@ msgid "Cache Thumbnails" msgstr "Miniatuurafbeeldingen cachen" # -#, fuzzy msgid "Can't connect to server. Please check your network!" -msgstr "Controleer uw netwerkinstellingen a.u.b.!" +msgstr "Kan de server niet bereiken. Controleer uw netwerkinstellingen a.u.b.!" # msgid "Canada" @@ -1161,15 +1154,15 @@ msgstr "Catalaans" # msgid "Center screen at the lower border" -msgstr "" +msgstr "Centreer het scherm bij onderste rand." # msgid "Center screen at the upper border" -msgstr "" +msgstr "Centreer het scherm bij bovenste rand." # msgid "Change active delay" -msgstr "" +msgstr "Wijzig de actieve vertraging" # msgid "Change bouquets in quickzap" @@ -1177,7 +1170,7 @@ msgstr "Verander van boeket tijdens zappen" # msgid "Change default recording offset?" -msgstr "" +msgstr "Wijzig de standaard opname afwijking?" # msgid "Change dir." @@ -1326,7 +1319,7 @@ msgstr "Vóór zoeken alle zenders wissen?" # msgid "Clear history on Exit:" -msgstr "" +msgstr "Wis historiek bij afsluiten:" # msgid "Clear log" @@ -1364,7 +1357,6 @@ msgstr "Coderate HP" msgid "Coderate LP" msgstr "Coderate LP" -# msgid "Collection name" msgstr "DVD naam" @@ -1486,7 +1478,7 @@ msgstr "De inhoud past niet op deze DVD!" # msgid "Continue in background" -msgstr "Verder in de achtergrond" +msgstr "Verder op de achtergrond" # msgid "Continue playing" @@ -1498,7 +1490,7 @@ msgstr "Contrast" # msgid "Could not connect to Dreambox .NFI Image Feed Server:" -msgstr "Kan niet connecteren naar Dreambox .NFI Feed Server:" +msgstr "Kan geen verbinding maken naar de .NFI Feed Server:" # msgid "Could not load Medium! No disc inserted?" @@ -1555,7 +1547,7 @@ msgstr "Nieuwe timer instellen met de wizard" # msgid "Create movie folder failed" -msgstr "Aanmaken van de opname map is mislukt" +msgstr "Aanmaken van de opnamemap is mislukt" # #, python-format @@ -1641,7 +1633,7 @@ msgstr "DHCP" # msgid "DUAL LAYER DVD" -msgstr "" +msgstr "DUBBEL LAYER DVD" # msgid "DVB-S" @@ -1689,12 +1681,12 @@ msgstr "Beslissen wat er moet gebeuren met de crashlogs na indiening." # msgid "Decrease delay" -msgstr "" +msgstr "Verlaag vertraging" # #, python-format msgid "Decrease delay by %i ms (can be set)" -msgstr "" +msgstr "Verlaag vertraging met %i ms (instelbaar)" # msgid "Deep Standby" @@ -1742,7 +1734,7 @@ msgstr "Verwijderen mislukt!" # msgid "Delete mount" -msgstr "" +msgstr "Verwijder verbinding" # #, python-format @@ -1755,7 +1747,7 @@ msgstr "" # msgid "Descending" -msgstr "" +msgstr "Aflopend" # msgid "Description" @@ -1854,13 +1846,11 @@ msgstr "Timer uitschakelen" msgid "Disabled" msgstr "Gedeactiveerd" -# msgid "Discard changes and close plugin" -msgstr "" +msgstr "Annuleer alle wijzigingen en sluit de plugin" -# msgid "Discard changes and close screen" -msgstr "" +msgstr "Annuleer de wijzigingen en sluit het scherm" # msgid "Disconnect" @@ -1890,9 +1880,8 @@ msgstr "Display instellingen" msgid "Display and Userinterface" msgstr "Display en gebruikersinterface" -# msgid "Display search results by:" -msgstr "" +msgstr "Zoekresultaten weergeven door:" # #, python-format @@ -1927,7 +1916,7 @@ msgstr "" # msgid "Do you really want to exit?" -msgstr "" +msgstr "Wilt u werkelijk afsluiten?" # msgid "" @@ -2001,7 +1990,7 @@ msgstr "Wilt u het afspelen vervolgen?" # msgid "Do you want to see more entries?" -msgstr "" +msgstr "Wilt u meer items zien?" # msgid "" @@ -2068,7 +2057,7 @@ msgstr "Download Video" # msgid "Download location" -msgstr "" +msgstr "Download locatie" # msgid "Download of USB flasher boot image failed: " @@ -2090,21 +2079,17 @@ msgstr "Downloading" msgid "Downloading plugin information. Please wait..." msgstr "Ophalen informatie. Een ogenblik a.u.b..." -# msgid "Downloading screenshots. Please wait..." -msgstr "" +msgstr "Downloaden van schermvoorbeeld. Even geduld aub ..." -# msgid "Dreambox format data DVD (HDTV compatible)" msgstr "Dreambox formaat data DVD (HDTV compatibel)" -# msgid "Dreambox software because updates are available." msgstr "Dreambox software want er zijn updates beschikbaar." -# msgid "Duration: " -msgstr "" +msgstr "Duur:" # msgid "Dutch" @@ -2239,29 +2224,26 @@ msgstr "Activeer Cleanup Wizard?" msgid "Enable Filtering" msgstr "Filters inschakelen" -# msgid "Enable HTTP Access" -msgstr "" +msgstr "Activeer HTTP toegang" -# msgid "Enable HTTP Authentication" -msgstr "" +msgstr "Activeer HTTP authenticatie" # msgid "Enable HTTPS Access" -msgstr "" +msgstr "Activeer HTTPS toegang" # msgid "Enable HTTPS Authentication" -msgstr "" +msgstr "Activeer HTTPS authenticatie" # msgid "Enable Service Restriction" msgstr "Activeer service beperking" -# msgid "Enable Streaming Authentication" -msgstr "" +msgstr "Activeer streaming authenticatie" # msgid "Enable multiple bouquets" @@ -2271,11 +2253,12 @@ msgstr "Meerdere boeketten toestaan" msgid "Enable parental control" msgstr "Zet kinderslot aan" -# msgid "" "Enable this to be able to access the AutoTimer Overview from within the " "extension menu." msgstr "" +"Activeer deze optie om de AutoTimer vanuit het uitbreidingsmenu te kunnen " +"instellen." # msgid "Enable timer" @@ -2285,11 +2268,12 @@ msgstr "Timer activeren" msgid "Enabled" msgstr "Ingeschakeld" -# msgid "" "Encoding the channel uses for it's EPG data. You only need to change this if " "you're searching for special characters like the german umlauts." msgstr "" +"Codering die het kanaal gebruikt voor het EPG data. U hoeft dit alleen te " +"veranderen als u op zoek bent naar speciale tekens, zoals de Duitse umlauts." # msgid "Encrypted: " @@ -2408,9 +2392,8 @@ msgid "Enter your email address so that we can contact you if needed." msgstr "" "Geef uw e-mailadres, zodat wij contact met u kunnen opnemen indien nodig." -# msgid "Enter your search term(s)" -msgstr "" +msgstr "Geef uw zoekterm (en)" # msgid "Entertainment" @@ -2449,10 +2432,8 @@ msgstr "Alles is in orde" msgid "Exact match" msgstr "Exacte overeenkomst" -# -#, fuzzy msgid "Exceeds dual layer medium!" -msgstr "overschrijdt dubbel lagen medium!" +msgstr "Overschrijdt dubbel lagen medium!" # msgid "Exclude" @@ -2573,13 +2554,12 @@ msgstr "Snel spoelen" msgid "Favourites" msgstr "Favorieten" -# msgid "Fetching feed entries" -msgstr "" +msgstr "Ophalen Feed items" # msgid "Fetching search entries" -msgstr "" +msgstr "Ophalen zoek items" # msgid "Filesystem Check" @@ -2642,7 +2622,6 @@ msgstr "Flash" msgid "Flashing failed" msgstr "Flashen mislukt" -# msgid "Following tasks will be done after you press OK!" msgstr "Volgende taken worden uitgevoerd nadat u op OK drukt!" @@ -2748,12 +2727,11 @@ msgstr "Algemene PCM vertraging (ms)" msgid "Genre" msgstr "Genre" -# msgid "Genuine Dreambox" -msgstr "" +msgstr "Echtheid Dreambox" msgid "Genuine Dreambox validation failed!" -msgstr "" +msgstr "Echtheid Dreambox validatie mislukt!" # msgid "German" @@ -2769,7 +2747,7 @@ msgstr "Gegevens worden opgehaald. Een ogenblikje geduld a.u.b..." # msgid "Global delay" -msgstr "" +msgstr "Globale vertraging" # msgid "Goto 0" @@ -2879,9 +2857,8 @@ msgstr "Hoeveel minuten wilt u opnemen?" msgid "How to handle found crashlogs?" msgstr "Hoe om te gaan met gevonden crashlogs?" -# msgid "Howto & Style" -msgstr "" +msgstr "Hoe & Stijl" # msgid "Hue" @@ -2911,12 +2888,13 @@ msgstr "ISO pad" msgid "Icelandic" msgstr "Ijslands" -# #, python-format msgid "" "If this is enabled an existing timer will also be considered recording an " "event if it records at least 80% of the it." msgstr "" +"Indien ingeschakeld wordt een programma al als opgenomen beschouwd als een " +"andere timer eral 80% van opneemt." # msgid "" @@ -2984,12 +2962,11 @@ msgstr "Vermeld uw e-mailadres en naam (optioneel) in de mail?" # msgid "Increase delay" -msgstr "" +msgstr "Verhoog vertraging" -# #, python-format msgid "Increase delay by %i ms (can be set)" -msgstr "" +msgstr "Verhoog vertraging met %i ms (kan ingesteld worden)" # msgid "Increased voltage" @@ -3124,7 +3101,7 @@ msgid "Internal Flash" msgstr "Intern geheugen" msgid "Internal LAN adapter." -msgstr "" +msgstr "Interne LAN adapter." # msgid "Invalid Location" @@ -3140,16 +3117,14 @@ msgstr "Ongeldige map geselecteerd: %s" msgid "Invalid response from Security service pls restart again" msgstr "" -# # File: tmp/enigma2_plugins/genuinedreambox/src/plugin.py, line: 132 msgid "Invalid response from server." -msgstr "" +msgstr "Ongeldige reactie van de server." -# # File: tmp/enigma2_plugins/genuinedreambox/src/plugin.py, line: 177 #, python-format msgid "Invalid response from server. Please report: %s" -msgstr "" +msgstr "Ongeldige reactie van de server. Melding:%s" # # L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:228 @@ -3243,7 +3218,7 @@ msgid "LAN Adapter" msgstr "LAN adapter" msgid "LAN connection" -msgstr "" +msgstr "LAN verbinding" # msgid "LNB" @@ -3348,7 +3323,7 @@ msgstr "Laad lengte van opnames in opname menu" # msgid "Load feed on startup:" -msgstr "" +msgstr "Laad feed bij het opstarten:" # msgid "Load movie-length" @@ -3362,13 +3337,11 @@ msgstr "Lokaal netwerk" msgid "Local share name" msgstr "Lokale gedeelde map" -# msgid "Location" msgstr "Locatie" -# msgid "Location for instant recordings" -msgstr "Locatie voor directe opnamen" +msgstr "Locatie voor directe opnames" # msgid "Lock:" @@ -3386,9 +3359,8 @@ msgstr "Lange toetsdruk" msgid "Longitude" msgstr "Lengtegraad" -# msgid "Lower bound of timespan." -msgstr "" +msgstr "De ondergrens van de tijdspanne." # msgid "" @@ -3467,20 +3439,18 @@ msgstr "" # msgid "Match title" -msgstr "" +msgstr "Match titel" -# #, python-format msgid "Match title: %s" -msgstr "" +msgstr "Match titel: %s" # msgid "Max. Bitrate: " msgstr "Max. Bitrate: " -# msgid "Maximum duration (in m)" -msgstr "" +msgstr "Maximum duur (in min)" # msgid "" @@ -3562,7 +3532,7 @@ msgstr "Maandelijks" # msgid "More video entries." -msgstr "" +msgstr "Meer video items." # msgid "Mosquito noise reduction" @@ -3570,27 +3540,27 @@ msgstr "Mosquito ruisonderdrukking" # msgid "Most discussed" -msgstr "" +msgstr "Meest besproken" # msgid "Most linked" -msgstr "" +msgstr "De meeste gekoppeld" # msgid "Most popular" -msgstr "" +msgstr "De populairste" # msgid "Most recent" -msgstr "" +msgstr "Meest recenste" # msgid "Most responded" -msgstr "" +msgstr "Meest beantwoorde" # msgid "Most viewed" -msgstr "" +msgstr "Meest bekeken" # msgid "Mount failed" @@ -3642,51 +3612,51 @@ msgstr "Draai oost" # msgid "Move plugin screen" -msgstr "" +msgstr "Verplaats het plugin scherm" # msgid "Move screen down" -msgstr "" +msgstr "Verplaats scherm omlaag" # msgid "Move screen to the center of your TV" -msgstr "" +msgstr "Verplaats scherm naar het midden van uw TV" # msgid "Move screen to the left" -msgstr "" +msgstr "Verplaats scherm naar links" # msgid "Move screen to the lower left corner" -msgstr "" +msgstr "Verplaats scherm naar de linker benedenhoek" # msgid "Move screen to the lower right corner" -msgstr "" +msgstr "Verplaats scherm naar de rechter benedenhoek" # msgid "Move screen to the middle of the left border" -msgstr "" +msgstr "Verplaats scherm naar het midden van de linker rand" # msgid "Move screen to the middle of the right border" -msgstr "" +msgstr "Verplaats scherm naar het midden van de rechter rand" # msgid "Move screen to the right" -msgstr "" +msgstr "Verplaats scherm naar rechts" # msgid "Move screen to the upper left corner" -msgstr "" +msgstr "Verplaats scherm naar de linker bovenhoek" # msgid "Move screen to the upper right corner" -msgstr "" +msgstr "Verplaats scherm naar de rechter bovenhoek" # msgid "Move screen up" -msgstr "" +msgstr "Verplaats scherm omhoog" # msgid "Move west" @@ -3726,19 +3696,19 @@ msgstr "Geluid uit" # msgid "My TubePlayer" -msgstr "" +msgstr "My TubePlayer" # msgid "MyTube Settings" -msgstr "" +msgstr "MyTube instellingen" # msgid "MyTubePlayer" -msgstr "" +msgstr "MyTubePlayer" # msgid "MyTubePlayer Help" -msgstr "" +msgstr "MyTubePlayer Help" # msgid "MyTubePlayer active video downloads" @@ -3746,7 +3716,7 @@ msgstr "" # msgid "MyTubePlayer settings" -msgstr "" +msgstr "MyTubePlayer instellingen" # msgid "MyTubeVideoInfoScreen" @@ -3817,9 +3787,8 @@ msgstr "Netwerk" msgid "Network Configuration..." msgstr "Netwerk configuratie..." -# msgid "Network Mount" -msgstr "Netwerk verbinding" +msgstr "Netwerkverbinding" # msgid "Network SSID" @@ -3850,7 +3819,7 @@ msgid "Network test..." msgstr "Netwerk test..." msgid "Network test: " -msgstr "" +msgstr "Netwerk test: " # msgid "Network:" @@ -3975,9 +3944,8 @@ msgstr "" msgid "No picture on TV? Press EXIT and retry." msgstr "Geen beeld op uw TV? Druk op exit en probeer opnieuw." -# msgid "No playable video found! Stop playing this movie?" -msgstr "" +msgstr "Geen afspeelbare video gevonden! Stop met afspelen?" # msgid "No positioner capable frontend found." @@ -4031,9 +3999,8 @@ msgstr "" "Wilt u de menu pincode nu wijzigen?\n" "Indien u 'nee' kiest, blijft het menu onbeveiligd!" -# msgid "No videos to display" -msgstr "" +msgstr "Geen video's weer te geven" # msgid "No wireless networks found! Please refresh." @@ -4069,13 +4036,11 @@ msgstr "" "Controleer of er een compatibel WLAN apparaat is geplaatst of activeer uw " "lokale netwerk interface." -# msgid "No, but play video again" -msgstr "" +msgstr "Nee, maar speel video opnieuw" -# msgid "No, but restart from begin" -msgstr "Nee, vanaf begin herstarten" +msgstr "Nee, maar vanaf begin herstarten" # msgid "No, but switch to video entries." @@ -4166,9 +4131,8 @@ msgstr "" "vlakken van elkaar kunt onderscheiden.\n" "Indien het resultaat nu goed is, druk dan op OK." -# msgid "Number of scheduled recordings left." -msgstr "" +msgstr "Aantal geplande opnames beschikbaar." # msgid "OK" @@ -4230,9 +4194,8 @@ msgstr "AutoTimers gemaakt tijdens deze sessie" msgid "Only Free scan" msgstr "Alleen ongecodeerde zenders scannen" -# msgid "Only extensions." -msgstr "Enkel extensies" +msgstr "Enkel extensies." # msgid "Only match during timespan" @@ -4247,9 +4210,8 @@ msgstr "Alleen op service: %s" msgid "Open Context Menu" msgstr "Open context menu" -# msgid "Open plugin menu" -msgstr "" +msgstr "Open plugin menu" # msgid "Optionally enter your name if you want to." @@ -4332,13 +4294,11 @@ msgstr "Wachtwoord" msgid "Pause movie at end" msgstr "Pauzeer afspelen aan het einde" -# msgid "People & Blogs" -msgstr "" +msgstr "Mensen & Blogs" -# msgid "Pets & Animals" -msgstr "" +msgstr "Huisdieren & Dieren" # msgid "Phone number" @@ -4383,11 +4343,11 @@ msgstr "Muziek afspelen..." # msgid "Play YouTube movies" -msgstr "" +msgstr "Speel YouTube filmpjes" # msgid "Play next video" -msgstr "" +msgstr "Speel volgende video" # msgid "Play recorded movies..." @@ -4395,7 +4355,7 @@ msgstr "Opname afspelen..." # msgid "Play video again" -msgstr "" +msgstr "Speel video opnieuw" # msgid "Please Reboot" @@ -4502,9 +4462,8 @@ msgstr "Geef uw e-mail adres hier:" msgid "Please enter your name here (optional):" msgstr "Geef hier uw naam (optioneel):" -# msgid "Please enter your search term." -msgstr "" +msgstr "Vul uw zoekterm in." # msgid "Please follow the instructions on the TV" @@ -4630,10 +4589,8 @@ msgstr "" "Gebruik de omhoog/omlaag toeten om de gewenste taal te selecteren. Druk " "daarna op OK." -# -#, fuzzy msgid "Please wait (Step 2)" -msgstr "Eventjes geduld..." +msgstr "Eventjes geduld (stap 2)" # msgid "Please wait for activation of your network configuration..." @@ -4875,13 +4832,11 @@ msgstr "Druk op geel om deze interface als standaard in te stellen." msgid "Prev" msgstr "Vorige" -# msgid "Preview" -msgstr "Preview" +msgstr "Voorbeeld" -# msgid "Preview AutoTimer" -msgstr "AutoTimer preview" +msgstr "AutoTimer voorbeeld" # msgid "Preview menu" @@ -4923,9 +4878,8 @@ msgstr "Zoek op provider" msgid "Providers" msgstr "Providers" -# msgid "Published" -msgstr "" +msgstr "Geplaatst" # msgid "Python frontend for /tmp/mmi.socket" @@ -4968,7 +4922,7 @@ msgstr "Random" # msgid "Rating" -msgstr "" +msgstr "Waardering" # msgid "Ratings: " @@ -5006,9 +4960,8 @@ msgstr "Nu uitschakelen?" msgid "Reboot" msgstr "Herstarten" -# msgid "Recently featured" -msgstr "" +msgstr "Recent aanbevolen" # msgid "Reception Settings" @@ -5079,9 +5032,8 @@ msgstr "" msgid "Reload" msgstr "Herlaad" -# msgid "Reload Black-/Whitelists" -msgstr "" +msgstr "Herlaad zwarte-/witte lijst" # msgid "Remember service pin" @@ -5338,7 +5290,7 @@ msgstr "S-Video" # msgid "SINGLE LAYER DVD" -msgstr "" +msgstr "ENKEL LAYER DVD" # msgid "SNR" @@ -5522,7 +5474,7 @@ msgstr "Zoek band US SUPER" # msgid "Scan range" -msgstr "" +msgstr "Scanbereik" # msgid "" @@ -5537,7 +5489,6 @@ msgid "" "selected wireless device.\n" msgstr "" -# msgid "" "Scans default lamedbs sorted by satellite with a connected dish positioner" msgstr "" @@ -5546,15 +5497,15 @@ msgstr "" # msgid "Science & Technology" -msgstr "" +msgstr "Wetenschap & Technologie" # msgid "Search Term(s)" -msgstr "" +msgstr "Zoekterm(en)" # msgid "Search category:" -msgstr "" +msgstr "Zoek categorie:" # msgid "Search east" @@ -5570,11 +5521,11 @@ msgstr "Zoeken naar gedeelde mappen." # msgid "Search region:" -msgstr "" +msgstr "Zoek regio:" # msgid "Search restricted content:" -msgstr "" +msgstr "Zoek beperkte inhoud:" # msgid "Search strictness" @@ -5682,7 +5633,7 @@ msgstr "Selecteer interface" # msgid "Select new feed to view." -msgstr "" +msgstr "Selecteer nieuwe feed om te bekijken." # msgid "Select package" @@ -5707,7 +5658,7 @@ msgstr "Selecteer de toets die u wilt instellen op %i ms..." # msgid "Select the location to save the recording to." -msgstr "" +msgstr "Selecteer de locatie om de opnames op te slaan." # msgid "Select type of Filter" @@ -5735,7 +5686,7 @@ msgstr "Secteer draadloos netwerk" # msgid "Select your choice." -msgstr "" +msgstr "Selecteer uw keuze." # msgid "Selected source image" @@ -5896,7 +5847,7 @@ msgstr "Scherpte" # msgid "Short Movies" -msgstr "" +msgstr "Korte films" # msgid "Should this AutoTimer be restricted to a timespan?" @@ -6102,7 +6053,7 @@ msgstr "Sorry, geen detail gegevens beschikbaar!" # msgid "Sorry, video is not available!" -msgstr "" +msgstr "Sorry, video is niet beschikbaar!" # msgid "" @@ -6171,12 +6122,12 @@ msgstr "Afsluiten" # #, python-format msgid "Standby Fan %d PWM" -msgstr "" +msgstr "Standby Fan %d PWM" # #, python-format msgid "Standby Fan %d Voltage" -msgstr "" +msgstr "Standby Fan %d Voltage" # msgid "Start Webinterface" @@ -6208,7 +6159,7 @@ msgstr "Start op" # msgid "Std. Feeds" -msgstr "" +msgstr "Std. Feeds" # msgid "Step east" @@ -6405,7 +6356,7 @@ msgstr "Test Type" # # File: tmp/enigma2_plugins/genuinedreambox/src/plugin.py, line: 80 msgid "Test again" -msgstr "" +msgstr "Test opnieuw" # msgid "Test mode" @@ -6888,7 +6839,7 @@ msgstr "Tijd" # msgid "Time in minutes to append to recording." -msgstr "" +msgstr "Tijd in minuten toe te voegen aan de opname." # msgid "Time in minutes to prepend to recording." @@ -7020,7 +6971,7 @@ msgstr "Top favorieten" # msgid "Top rated" -msgstr "" +msgstr "Best gewaardeerd" # msgid "Track" @@ -7052,7 +7003,7 @@ msgstr "Transponder type" # msgid "Travel & Events" -msgstr "" +msgstr "Reizen & Evenementen" # msgid "Tries left:" @@ -7217,7 +7168,7 @@ msgid "Universal LNB" msgstr "Universeel LNB" msgid "Unknown network adapter." -msgstr "" +msgstr "Onbekende netwerkadapter." # msgid "" @@ -7476,7 +7427,7 @@ msgstr "" # msgid "View Count" -msgstr "" +msgstr "Bekijk aantal" # msgid "View Movies..." @@ -7496,7 +7447,7 @@ msgstr "Bekijk Video CD..." # msgid "View active downloads" -msgstr "" +msgstr "Bekijk actieve downloads" # msgid "View details" @@ -7578,7 +7529,7 @@ msgstr "" # msgid "Views: " -msgstr "" +msgstr "Bekeken:" # msgid "Virtual KeyBoard" @@ -7601,10 +7552,10 @@ msgid "WEP" msgstr "WEP" msgid "WLAN adapter." -msgstr "" +msgstr "WLAN-adapter." msgid "WLAN connection" -msgstr "" +msgstr "WLAN verbinding" # msgid "WPA" @@ -7900,11 +7851,11 @@ msgstr "Ja, mijn instellingen opslaan!" # msgid "Yes, but play next video" -msgstr "" +msgstr "Ja, maar speel volgende video af" # msgid "Yes, but play previous video" -msgstr "" +msgstr "Ja, maar speel vorige video af" # msgid "Yes, do a manual scan now" @@ -8151,7 +8102,7 @@ msgstr "" # msgid "Your current collection will get lost!" -msgstr "" +msgstr "Uw huidige collectie zal verloren gaan!" # msgid "Your dreambox is shutting down. Please stand by..." @@ -8234,7 +8185,7 @@ msgid "Zap back to service before tuner setup?" msgstr "Wilt u terugkeren naar de vorige zender?" msgid "Zydas" -msgstr "" +msgstr "Zydas" # msgid "[alternative edit]" diff --git a/po/pl.po b/po/pl.po index d9cb0ab5..8cc36be6 100755 --- a/po/pl.po +++ b/po/pl.po @@ -416,7 +416,7 @@ msgstr "" "Czy zachować aktualną wersję?" msgid "A demo plugin for TPM usage." -msgstr "" +msgstr "Plugin demo dla użytku TPM." # msgid "" @@ -864,7 +864,7 @@ msgid "Aspect Ratio" msgstr "Format obrazu:" msgid "Atheros" -msgstr "" +msgstr "Atheros" # msgid "Audio" @@ -2736,7 +2736,7 @@ msgid "Genuine Dreambox" msgstr "Autentyczność Dreamboxa" msgid "Genuine Dreambox validation failed!" -msgstr "" +msgstr "Weryfikacja autentyczności Dreamboxa nieudana!" # msgid "German" @@ -3108,7 +3108,7 @@ msgid "Internal Flash" msgstr "Wewnętrzny Flash" msgid "Internal LAN adapter." -msgstr "" +msgstr "Wewnętrzny adapter LAN." # msgid "Invalid Location" @@ -3222,7 +3222,7 @@ msgid "LAN Adapter" msgstr "Adapter LAN" msgid "LAN connection" -msgstr "" +msgstr "Połączenie LAN" # msgid "LNB" @@ -3834,7 +3834,7 @@ msgid "Network test..." msgstr "Testowanie połączenia sieciowego..." msgid "Network test: " -msgstr "" +msgstr "Test sieci:" # msgid "Network:" @@ -4929,7 +4929,7 @@ msgid "Radio" msgstr "Radio" msgid "Ralink" -msgstr "" +msgstr "Ralink" # msgid "Ram Disk" @@ -5509,6 +5509,8 @@ msgid "" "Scan your network for wireless access points and connect to them using your " "selected wireless device.\n" msgstr "" +"Skanuj sieć w poszukiwaniu punktów dostępu i połączenia z nimi używając " +"wybranego urządzenia.\n" # msgid "" @@ -7199,7 +7201,7 @@ msgid "Universal LNB" msgstr "Uniwersalny LNB" msgid "Unknown network adapter." -msgstr "" +msgstr "Nieznany adapter sieciowy." # msgid "" @@ -7384,7 +7386,7 @@ msgstr "VMGM (intro trailer)" msgid "" "Verify your Dreambox authenticity by running the genuine dreambox plugin!" -msgstr "" +msgstr "Sprawdź autentyczność Dreamboxa uruchamiając plugin autentyczności!" # msgid "Vertical" @@ -7580,10 +7582,10 @@ msgid "WEP" msgstr "WEP" msgid "WLAN adapter." -msgstr "" +msgstr "Adapter WLAN." msgid "WLAN connection" -msgstr "" +msgstr "Połączenie WLAN." # msgid "WPA" @@ -8232,7 +8234,7 @@ msgid "Zap back to service before tuner setup?" msgstr "Przełączyć spowrotem na kanał przed konfiguracją?" msgid "Zydas" -msgstr "" +msgstr "Zydas" # msgid "[alternative edit]" diff --git a/po/sv.po b/po/sv.po index 3c0bd76a..f4fbd6bf 100755 --- a/po/sv.po +++ b/po/sv.po @@ -8,15 +8,15 @@ msgstr "" "Project-Id-Version: tuxbox-enigma 0.0.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-11 10:44+0000\n" -"PO-Revision-Date: 2010-04-09 08:43+0200\n" +"PO-Revision-Date: 2010-05-28 13:08+0200\n" "Last-Translator: Wee <weegull@hotmail.com>\n" "Language-Team: WeeGull <weegull@hotmail.com>\n" +"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.2\n" +"X-Generator: Pootle 2.0.3\n" "X-Poedit-Language: Swedish\n" "X-Poedit-SourceCharset: iso-8859-15\n" "X-Poedit-Country: SWEDEN\n" @@ -161,43 +161,43 @@ msgstr " trÃ¥dlöst nätverk hittat!" # msgid "#000000" -msgstr "" +msgstr "#000000" # msgid "#0064c7" -msgstr "" +msgstr "#0064c7" # msgid "#25062748" -msgstr "" +msgstr "#25062748" # msgid "#389416" -msgstr "" +msgstr "#389416" # msgid "#80000000" -msgstr "" +msgstr "#80000000" # msgid "#80ffffff" -msgstr "" +msgstr "#80ffffff" # msgid "#bab329" -msgstr "" +msgstr "#bab329" # msgid "#f23d21" -msgstr "" +msgstr "#f23d21" # msgid "#ffffff" -msgstr "" +msgstr "#ffffff" # msgid "#ffffffff" -msgstr "" +msgstr "#ffffffff" # msgid "%H:%M" @@ -269,11 +269,11 @@ msgstr "" # msgid "0" -msgstr "" +msgstr "0" # msgid "1" -msgstr "" +msgstr "1" # msgid "1 wireless network found!" @@ -329,11 +329,11 @@ msgstr "18 V" # msgid "2" -msgstr "" +msgstr "2" # msgid "3" -msgstr "" +msgstr "3" # msgid "30 minutes" @@ -341,7 +341,7 @@ msgstr "30 minuter" # msgid "4" -msgstr "" +msgstr "4" # msgid "4:3" @@ -357,7 +357,7 @@ msgstr "4:3 PanScan" # msgid "5" -msgstr "" +msgstr "5" # msgid "5 minutes" @@ -365,7 +365,7 @@ msgstr "5 minuter" # msgid "6" -msgstr "" +msgstr "6" # msgid "60 minutes" @@ -373,15 +373,15 @@ msgstr "60 minuter" # msgid "7" -msgstr "" +msgstr "7" # msgid "8" -msgstr "" +msgstr "8" # msgid "9" -msgstr "" +msgstr "9" # msgid "<Current movielist location>" @@ -417,7 +417,7 @@ msgstr "" "Vill du behÃ¥lla din version?" msgid "A demo plugin for TPM usage." -msgstr "" +msgstr "Ett demoplugin för TPM användning." # msgid "" @@ -745,7 +745,7 @@ msgstr "Alla Satelliter" # msgid "All Time" -msgstr "" +msgstr "All Time" # msgid "All non-repeating timers" @@ -868,7 +868,7 @@ msgid "Aspect Ratio" msgstr "Bildformat" msgid "Atheros" -msgstr "" +msgstr "Atheros" # msgid "Audio" @@ -2281,6 +2281,8 @@ msgid "" "Encoding the channel uses for it's EPG data. You only need to change this if " "you're searching for special characters like the german umlauts." msgstr "" +"Teckentabellen som den här kanalen avänder för EPG data. Du behöver bara " +"ändra detta om du söker efter speciella tecken exempelvis åäö." # msgid "Encrypted: " @@ -2449,7 +2451,7 @@ msgstr "Exkludera" # msgid "Execute \"after event\" during timespan" -msgstr "" +msgstr "Utför \"efter händelse\" under tidsspann" msgid "Execution Progress:" msgstr "Exekvering pÃ¥gÃ¥r:" @@ -2592,6 +2594,11 @@ msgid "" "it's Description.\n" "Press BLUE to add a new restriction and YELLOW to remove the selected one." msgstr "" +"Filter är en kraftfull metod när matchade händelser söks. En AutoTimer kan " +"begränsas till en viss veckodag eller matchade text i en häändelse " +"exempelvis Beskrivning.\n" +"Tryck BlÃ¥ för att lägga till begränsning och Gul för att ta bort vald " +"begränsning." # msgid "Finetune" @@ -2737,7 +2744,7 @@ msgid "Genuine Dreambox" msgstr "Äkta Dreambox" msgid "Genuine Dreambox validation failed!" -msgstr "" +msgstr "Äkta Dreambox validering misslyckades!" # msgid "German" @@ -2789,7 +2796,7 @@ msgstr "Guard intervalläge" # msgid "Guess existing timer based on begin/end" -msgstr "" +msgstr "Gissa exiisterande timer baserat pÃ¥ start/slut" # msgid "HD videos" @@ -2895,12 +2902,13 @@ msgstr "ISO sökväg" msgid "Icelandic" msgstr "Isländska" -# #, python-format msgid "" "If this is enabled an existing timer will also be considered recording an " "event if it records at least 80% of the it." msgstr "" +"Om detta är aktiverat kommer existerande timer ocksÃ¥ behandlas som en " +"inspelning om inspelningen är 80% av händelsen." # msgid "" @@ -3011,7 +3019,7 @@ msgstr "Initial plats för nya timers" # msgid "Initialization" -msgstr "" +msgstr "Initieringen" # msgid "Initialize" @@ -3106,7 +3114,7 @@ msgid "Internal Flash" msgstr "Intern Flash" msgid "Internal LAN adapter." -msgstr "" +msgstr "Intern LAN adapter" # msgid "Invalid Location" @@ -3120,22 +3128,22 @@ msgstr "Ogiltigt bibliotek valt: %s" # # File: tmp/enigma2_plugins/genuinedreambox/src/plugin.py, line: 304 msgid "Invalid response from Security service pls restart again" -msgstr "" +msgstr "Ogiltig respons frÃ¥n Säkerhetstjänst, vänligen starta om" # # File: tmp/enigma2_plugins/genuinedreambox/src/plugin.py, line: 132 msgid "Invalid response from server." -msgstr "" +msgstr "Ogiltig respons frÃ¥n server." # # File: tmp/enigma2_plugins/genuinedreambox/src/plugin.py, line: 177 #, python-format msgid "Invalid response from server. Please report: %s" -msgstr "" +msgstr "Ogiltig respons frÃ¥n server. Vänligen rapportera: %s" # msgid "Invalid selection" -msgstr "" +msgstr "Ogiltigt val" # msgid "Inversion" @@ -3165,6 +3173,12 @@ msgid "" "Service (inside a Bouquet).\n" "Press BLUE to add a new restriction and YELLOW to remove the selected one." msgstr "" +"Det är möjligt att begränsa en AutoTimer till vissa kanaler eller " +"favoritlista eller neka specifika sÃ¥dana.\n" +"En händelse kommer endast att matcha denna AutoTimer om det är pÃ¥ en " +"specifik och inte förnekas kanal (inuti en favoritlista)\n" +"Tryck BlÃ¥ för att lägga till en ny begränsning och Gul för att ta bort de " +"markerade en." # msgid "Italian" @@ -3190,12 +3204,12 @@ msgstr "Bara skala" # #, python-format msgid "Key %(Key)s successfully set to %(delay)i ms" -msgstr "" +msgstr "Tangent %(Key)s sattes till %(delay)i ms" # #, python-format msgid "Key %(key)s (current value: %(value)i ms)" -msgstr "" +msgstr "Tangent %(key)s (nuvarande värde: %(value)i ms)" # msgid "Keyboard" @@ -3218,7 +3232,7 @@ msgid "LAN Adapter" msgstr "LAN Adapter" msgid "LAN connection" -msgstr "" +msgstr "LAN anslutning" # msgid "LNB" @@ -3363,13 +3377,15 @@ msgstr "Longitud" # msgid "Lower bound of timespan." -msgstr "" +msgstr "Lägre gräns för tidsspann." # msgid "" "Lower bound of timespan. Nothing before this time will be matched. Offsets " "are not taken into account!" msgstr "" +"Lägre gräns för tidsspann. Inget före den här tiden kommer matchas. Offset " +"är inte med i beräkningen." # msgid "MMC Card" @@ -3438,16 +3454,16 @@ msgstr "Marginal innan inspelning (i minuter)" # #, python-format msgid "Match Timespan: %02d:%02d - %02d:%02d" -msgstr "" +msgstr "Matcha tidsspann: %02d:%02d - %02d:%02d" # msgid "Match title" -msgstr "" +msgstr "Matcha titel" # #, python-format msgid "Match title: %s" -msgstr "" +msgstr "Matcha titel: %s" # msgid "Max. Bitrate: " @@ -3455,13 +3471,15 @@ msgstr "Max. Bitrate: " # msgid "Maximum duration (in m)" -msgstr "" +msgstr "Maximum varaktighet (i min) " # msgid "" "Maximum event duration to match. If an event is longer than this ammount of " "time (without offset) it won't be matched." msgstr "" +"Maximum händelse varaktighet att matcha. Om en händelse är längre än denna " +"tid (utan offset) kommer de inte matchas." # msgid "Media player" @@ -3509,7 +3527,7 @@ msgstr "Modell: " # msgid "Modify existing timers" -msgstr "" +msgstr "Ändra befintliga timers" # msgid "Modulation" @@ -3533,7 +3551,7 @@ msgstr "MÃ¥ndag" # msgid "Monthly" -msgstr "" +msgstr "MÃ¥nadsvis" # msgid "More video entries." @@ -3617,51 +3635,51 @@ msgstr "Flytta öst" # msgid "Move plugin screen" -msgstr "" +msgstr "Flytta plugin bildrutan" # msgid "Move screen down" -msgstr "" +msgstr "Flytta blidrutan nedÃ¥t" # msgid "Move screen to the center of your TV" -msgstr "" +msgstr "Flytta bildrutan till mitten av TV skärmen" # msgid "Move screen to the left" -msgstr "" +msgstr "Flytta bildrutan till vänster" # msgid "Move screen to the lower left corner" -msgstr "" +msgstr "Flytta bildrutan till nedre vänstra hörnet" # msgid "Move screen to the lower right corner" -msgstr "" +msgstr "Flytta bildrutan till nedre högra hörnet" # msgid "Move screen to the middle of the left border" -msgstr "" +msgstr "Flytta bildrutan till mitten av vänstra kanten" # msgid "Move screen to the middle of the right border" -msgstr "" +msgstr "Flytta bildrutan till mitten av högra kanten" # msgid "Move screen to the right" -msgstr "" +msgstr "Flytta bildrutan till höger" # msgid "Move screen to the upper left corner" -msgstr "" +msgstr "Flytta bildrutan till övre vänstra hörnet" # msgid "Move screen to the upper right corner" -msgstr "" +msgstr "Flytta bildrutan till övre högra hörnet" # msgid "Move screen up" -msgstr "" +msgstr "Flytta bildrutan uppÃ¥t" # msgid "Move west" @@ -3825,7 +3843,7 @@ msgid "Network test..." msgstr "Nätverk test..." msgid "Network test: " -msgstr "" +msgstr "Nätverkstest: " # msgid "Network:" @@ -4379,7 +4397,7 @@ msgstr "Vänligen ange media som ska undersökas" # msgid "Please add titles to the compilation." -msgstr "" +msgstr "Vänligen lägg till titel till sammanställningen." # msgid "Please change recording endtime" @@ -4498,7 +4516,7 @@ msgstr "Vänligen tryck OK!" # msgid "Please provide a Text to match" -msgstr "" +msgstr "Vänligen ange en text för matchning" # msgid "Please select .NFI flash image file from medium" @@ -4672,7 +4690,7 @@ msgstr "Pluginhanterare hjälp" # #, python-format msgid "Plugin: %(plugin)s , Version: %(version)s" -msgstr "" +msgstr "Plugin: %(plugin)s , Version: %(version)s" # msgid "Plugins" @@ -4696,11 +4714,11 @@ msgstr "Polska" # msgid "Poll Interval (in h)" -msgstr "" +msgstr "Avsökningsintervall (i tim)" # msgid "Poll automatically" -msgstr "" +msgstr "Sök automatiskt" # msgid "Port A" @@ -4747,6 +4765,8 @@ msgid "" "Power state to change to after recordings. Select \"standard\" to not change " "the default behavior of enigma2 or values changed by yourself." msgstr "" +"Strömläge efter inspelning. Väl \"standard\" för att inte ändra standard för " +"Enigma2 eller värde ändrat av dig." # msgid "Power threshold in mA" @@ -4774,7 +4794,7 @@ msgstr "Tryck OK för aktivera inställningarna." # msgid "Press OK to collapse this host" -msgstr "" +msgstr "Tryck OK för att kollapsa den här värden" # msgid "Press OK to edit selected settings." @@ -4786,7 +4806,7 @@ msgstr "Tryck OK för att ändra inställningar." # msgid "Press OK to expand this host" -msgstr "" +msgstr "Tryck OK för att expandera den här värden" # #, python-format @@ -4795,7 +4815,7 @@ msgstr "Tryck OK för att fÃ¥ utförligare information om %s" # msgid "Press OK to mount this share!" -msgstr "" +msgstr "Tryck OK för att montera den här delningen!" # msgid "Press OK to mount!" @@ -4843,11 +4863,11 @@ msgstr "FöregÃ¥ende" # msgid "Preview" -msgstr "" +msgstr "Förhandsgranskning" # msgid "Preview AutoTimer" -msgstr "" +msgstr "Förhandsgranska AutoTimer" # msgid "Preview menu" @@ -4922,7 +4942,7 @@ msgid "Radio" msgstr "Radio" msgid "Ralink" -msgstr "" +msgstr "Ralink" # msgid "Ram Disk" @@ -4986,11 +5006,11 @@ msgstr "Spela in" # msgid "Record a maximum of x times" -msgstr "" +msgstr "Inspela maximum av x gÃ¥nger" # msgid "Record on" -msgstr "" +msgstr "Inspelning pÃ¥" # #, python-format @@ -5007,7 +5027,7 @@ msgstr "Spelar in" # msgid "Recording paths" -msgstr "" +msgstr "Inspelningssökväg" # msgid "Recording(s) are in progress or coming up in few seconds!" @@ -5047,15 +5067,15 @@ msgstr "Uppdatera" # msgid "Reload Black-/Whitelists" -msgstr "" +msgstr "Ladda om Black-/Whitelistor" # msgid "Remember service pin" -msgstr "" +msgstr "Kom ihÃ¥g service pin" # msgid "Remember service pin cancel" -msgstr "" +msgstr "Avbryt kom ihÃ¥g service pin" # msgid "Remove" @@ -5091,7 +5111,7 @@ msgstr "Ta bort plugins" # msgid "Remove selected AutoTimer" -msgstr "" +msgstr "Ta bort vald AutoTimer" # msgid "Remove the broken .NFI file?" @@ -5148,14 +5168,14 @@ msgstr "Upprepningar" # msgid "Require description to be unique" -msgstr "" +msgstr "Begärd beskrivning mÃ¥ste vara unik" # msgid "Required medium type:" -msgstr "" +msgstr "Nödvändig mediatyp:" msgid "Rescan" -msgstr "" +msgstr "Återscanna" # msgid "Reset" @@ -5167,11 +5187,11 @@ msgstr "Återställ och omnumrera titelnamnen" # msgid "Reset count" -msgstr "" +msgstr "Nollställ räkning" # msgid "Reset saved position" -msgstr "" +msgstr "Återställ sparad position" # msgid "Reset video enhancement settings to system defaults?" @@ -5235,7 +5255,7 @@ msgstr "Återskapa systeminställningar" # msgid "Restrict \"after event\" to a certain timespan?" -msgstr "" +msgstr "Begränsa \"efter händelse\" till ett visst tidsintervall?" # msgid "Resume from last position" @@ -5244,7 +5264,7 @@ msgstr "Återuppspela frÃ¥n senaste position" # #, python-format msgid "Resume position at %s" -msgstr "" +msgstr "Återuppta vid position %s" # #. TRANSLATORS: The string "Resuming playback" flashes for a moment @@ -5303,7 +5323,7 @@ msgstr "S-Video" # msgid "SINGLE LAYER DVD" -msgstr "" +msgstr "SINGLE LAYER DVD" # msgid "SNR" @@ -5335,7 +5355,7 @@ msgstr "Satellit utrustning installation" # msgid "Satellite equipment" -msgstr "" +msgstr "Satellitutrustning" # msgid "Satellites" @@ -5367,19 +5387,19 @@ msgstr "Spara spellista" # msgid "Save current delay to key" -msgstr "" +msgstr "Spara nuvarande fördröjning till tangent" # msgid "Save to key" -msgstr "" +msgstr "Spara till tangent" # msgid "Save values and close plugin" -msgstr "" +msgstr "Spara värden och stäng plugin" # msgid "Save values and close screen" -msgstr "" +msgstr "Spara värden och stäng bildruta" # msgid "Scaler sharpness" @@ -5399,7 +5419,7 @@ msgstr "Sök Filer..." # msgid "Scan NFS share" -msgstr "" +msgstr "Sök NFS delning" # msgid "Scan QAM128" @@ -5487,7 +5507,7 @@ msgstr "Sök US SUPER band" # msgid "Scan range" -msgstr "" +msgstr "SökomfÃ¥ng" # msgid "" @@ -5501,6 +5521,8 @@ msgid "" "Scan your network for wireless access points and connect to them using your " "selected wireless device.\n" msgstr "" +"Sök ditt nätverk efter trÃ¥dlös acccesspunkt coh ansluter till den med din " +"valda trÃ¥dlösa enhet.\n" # msgid "" @@ -5541,11 +5563,11 @@ msgstr "Sök begränsat innehÃ¥ll" # msgid "Search strictness" -msgstr "" +msgstr "Sök strikt" # msgid "Search type" -msgstr "" +msgstr "Typ av sökning" # msgid "Search west" @@ -5561,7 +5583,7 @@ msgstr "Sök efter nyinstallerade eller borttagna paket. Vänligen vänta..." # msgid "Searching your network. Please wait..." -msgstr "" +msgstr "Söker ditt nätverk. Vänligen vänta..." # msgid "Secondary DNS" @@ -5584,6 +5606,9 @@ msgid "" "Select \"exact match\" to enforce \"Match title\" to match exactly or " "\"partial match\" if you only want to search for a part of the event title." msgstr "" +"Välj \"exakt matchning\" för att tvinga \"Match titel\" för exakt matchning " +"eller \"partiell matchning\" om du enbart vill söka efter en del av händelse " +"titel." # msgid "Select HDD" @@ -5603,7 +5628,7 @@ msgstr "Välj en film" # msgid "Select a timer to import" -msgstr "" +msgstr "Välj timer för import" # msgid "Select audio mode" @@ -5615,7 +5640,7 @@ msgstr "Välj ljudspÃ¥r" # msgid "Select bouquet to record on" -msgstr "" +msgstr "Välj favorit för inspelning" # msgid "Select channel to record from" @@ -5623,7 +5648,7 @@ msgstr "Välj kanal att spela in frÃ¥n" # msgid "Select channel to record on" -msgstr "" +msgstr "Välj kanal för inspelning" # msgid "Select files for backup. Currently selected:\n" @@ -5664,15 +5689,15 @@ msgstr "Välj kanal att lägga till..." # #, python-format msgid "Select the key you want to set to %i ms" -msgstr "" +msgstr "Välj tangent som du vill använda till %i ms" # msgid "Select the location to save the recording to." -msgstr "" +msgstr "Välj plats för spara inspelningar till." # msgid "Select type of Filter" -msgstr "" +msgstr "Välj typ av filter" # msgid "Select upgrade source to edit." @@ -5688,7 +5713,7 @@ msgstr "Välj videoläge" # msgid "Select whether or not you want to enforce case correctness." -msgstr "" +msgstr "Välj om du vill eller inte vill tvinga lägeskorrekthet" # msgid "Select wireless network" @@ -5744,7 +5769,7 @@ msgstr "Kanalsökning" # msgid "Service delay" -msgstr "" +msgstr "Fördröjning" # msgid "Service has been added to the favourites." @@ -5792,7 +5817,7 @@ msgstr "Kanaler" # msgid "Set End Time" -msgstr "" +msgstr "Sätt sluttid" # msgid "Set Voltage and 22KHz" @@ -5805,7 +5830,7 @@ msgstr "Ställ tillgängligt internminne varningströskel." # #, python-format msgid "Set delay to %i ms (can be set)" -msgstr "" +msgstr "Sätt fördröjning till %i ms (kan sättas)" # msgid "Set interface as default Interface" @@ -5817,15 +5842,15 @@ msgstr "Ange gräns" # msgid "Set maximum duration" -msgstr "" +msgstr "Sätt maximum längd" # msgid "Set this NO to disable this AutoTimer." -msgstr "" +msgstr "Sätt detta till Nej för att avaktivera den här AutoTimer." # msgid "Setting key canceled" -msgstr "" +msgstr "Inställningtangent avbruten" # msgid "Settings" @@ -5841,7 +5866,7 @@ msgstr "Installationsläge" # msgid "Setup for the Audio Sync Plugin" -msgstr "" +msgstr "Installation av Audio Synk Plugin" # #, python-format @@ -5849,6 +5874,7 @@ msgid "" "Shall the USB stick wizard proceed and program the image file %s into flash " "memory?" msgstr "" +"Ska USB stick guiden fortsätta och programmera imagefilen %s i flashminnet?" # msgid "Sharpness" @@ -5860,16 +5886,16 @@ msgstr "Kortfilmer" # msgid "Should this AutoTimer be restricted to a timespan?" -msgstr "" +msgstr "Ska den här AutoTimer vara begränsad till ett tidsintervall?" # msgid "Should this AutoTimer only match up to a certain event duration?" -msgstr "" +msgstr "Ska den här AutoTimer enbart mactah upp till en viss händelselängd?" # msgid "" "Should timers created by this AutoTimer be recorded to a custom location?" -msgstr "" +msgstr "Ska timers skapade av AutoTimer spelas in till annan plats?" # msgid "Show Info" @@ -5889,11 +5915,11 @@ msgstr "Visa blinkande klocka i display under inspelning" # msgid "Show event-progress in channel selection" -msgstr "" +msgstr "Visa händelse-utveckling i kanallistan" # msgid "Show in extension menu" -msgstr "" +msgstr "Visa i utökningsmenyn" # msgid "Show infobar on channel change" @@ -6081,7 +6107,7 @@ msgstr "Sortera A-Z" # msgid "Sort AutoTimer" -msgstr "" +msgstr "Sortera AutoTimer" # #. TRANSLATORS: This must fit into the header button in the EPG-List @@ -6131,12 +6157,12 @@ msgstr "Viloläge / Omstart" # #, python-format msgid "Standby Fan %d PWM" -msgstr "" +msgstr "Standby fläkt %d PWM" # #, python-format msgid "Standby Fan %d Voltage" -msgstr "" +msgstr "Standby fläkt %d Volt" # msgid "Start Webinterface" @@ -6176,17 +6202,17 @@ msgstr "Stega öst" # msgid "Step in ms for arrow keys" -msgstr "" +msgstr "Steg i mS för piltangeterna" # #, python-format msgid "Step in ms for key %i" -msgstr "" +msgstr "Steg i mS för tangent %i" # #, python-format msgid "Step in ms for keys '%s'" -msgstr "" +msgstr "Steg i mS för tangenter '%s'" # msgid "Step west" @@ -6282,7 +6308,7 @@ msgstr "Byt till föregÃ¥ende underkanal" # msgid "Switchable tuner types:" -msgstr "" +msgstr "Växlingbara tunertyper:" # msgid "Symbol Rate" @@ -6330,7 +6356,7 @@ msgstr "Märke 3" # msgid "Tags the Timer/Recording will have." -msgstr "" +msgstr "Märkning Timer/Inspelning kommer att ha." # msgid "Tags: " @@ -6399,6 +6425,8 @@ msgid "" "List.\n" "Please press OK to continue." msgstr "" +"Tack för att du använder guide. Din nya AutoTimer har lagts till i listan.\n" +"Vänligen tryck OK för att fortsätta." # msgid "" @@ -6415,18 +6443,24 @@ msgid "" "The NetworkWizard extension is not installed!\n" "Please install it." msgstr "" +"Utökningen Nätverksguiden är inte installerad!\n" +"Vänligen installera den." # msgid "" "The Softwaremanagement extension is not installed!\n" "Please install it." msgstr "" +"Utökningen Mjukvaruhanterare är inte installerad!\n" +"Vänligen installera den." # msgid "" "The Timer will not be added to the List.\n" "Please press OK to close this Wizard." msgstr "" +"Timer kommer inte läggas till i listan.\n" +"Vänligen tryck OK för att stänga guiden." # msgid "" @@ -6434,6 +6468,9 @@ msgid "" "timespan is specified an event will only match this AutoTimer if it lies " "inside of this timespan." msgstr "" +"Tidsintervallet för en AutTimer är det första 'avancerade' attributet. Om " +"ett tidsintervall är angett kommer en händelse bara att matcha om AutoTimer " +"är innaför tidsintervallet." # msgid "" @@ -6450,7 +6487,7 @@ msgstr "Backupen misslyckades, välj en annan plats för din backup " # msgid "" "The counter can automatically be reset to the limit at certain intervals." -msgstr "" +msgstr "Räknaren kan automatiskt Ã¥terställas till gränsen med vissa intervall." # #, python-format @@ -6466,6 +6503,8 @@ msgid "" "The editor to be used for new AutoTimers. This can either be the Wizard or " "the classic editor." msgstr "" +"Editorn kan användas för nya AutoTimer. Detta kan vara guiden eller vanliga " +"editorn." # #, python-format @@ -6509,7 +6548,7 @@ msgstr "" # msgid "The match attribute is mandatory." -msgstr "" +msgstr "Match attributet är ett krav" # msgid "" @@ -6647,6 +6686,8 @@ msgid "" "There's a certificate update available for your dreambox. Would you like to " "apply this update now?" msgstr "" +"Det finne en uppdatering till ditt certifikat för din Dreambox. Vill du " +"uppdatera nu?" # #, python-format @@ -6695,6 +6736,8 @@ msgid "" "This is a name you can give the AutoTimer. It will be shown in the Overview " "and the Preview." msgstr "" +"Detta är ett namn som du kan ange för AutoTimer. Det kommer visas i " +"Överblick och i Förhandvisning." # msgid "This is step number 2." @@ -6705,6 +6748,8 @@ msgid "" "This is the delay in hours that the AutoTimer will wait after a search to " "search the EPG again." msgstr "" +"Detta är fördröjningen i timmar som AutoTimer kommer vänta efter en sökning " +"innan den söker i EPG igen." # msgid "This is the help screen. Feed me with something to display." @@ -6716,6 +6761,9 @@ msgid "" "german umlauts can be tricky as you have to know the encoding the channel " "uses." msgstr "" +"Detta är vad som kommer sökas efter i händelse titel. Notera att sökning " +"efter exempelvis svenska åäö kan vara lite svÃ¥rt dÃ¥ du mÃ¥ste veta vilken " +"teckentabell som kanalen använder sig av." # msgid "This plugin is installed." @@ -6736,6 +6784,8 @@ msgstr "Den pluginen kommer att tas bort." # msgid "This setting controls the behavior when a timer matches a found event." msgstr "" +"Den här inställningen kontrollerar uppförandet när en timer matchar en " +"hittad händelse." # msgid "" @@ -6807,6 +6857,9 @@ msgid "" "event that conflicts with an existing timer it will not ignore this event " "but add it disabled." msgstr "" +"Detta växlar beteende vid timern konflikter. Om en AutoTimer matchar en " +"händelse som strider mot en befintlig timer det inte kommer att ignorera " +"det, men lägga till den som avaktiverad." # msgid "Three" @@ -6834,11 +6887,11 @@ msgstr "Tid" # msgid "Time in minutes to append to recording." -msgstr "" +msgstr "Tid i minuter som ska läggas till efter inspelning." # msgid "Time in minutes to prepend to recording." -msgstr "" +msgstr "Tid i minuter som ska läggas till innan inspelning." # msgid "Time/Date Input" @@ -7160,7 +7213,7 @@ msgid "Universal LNB" msgstr "Universal LNB" msgid "Unknown network adapter." -msgstr "" +msgstr "Okänd nätverksadapter." # msgid "" @@ -7352,7 +7405,7 @@ msgstr "VMGM (intro trailer)" msgid "" "Verify your Dreambox authenticity by running the genuine dreambox plugin!" -msgstr "" +msgstr "Kontrollera din Dreamboxs äkthet genom att köra äkta Dreambox plugin!" # msgid "Vertical" @@ -7469,7 +7522,7 @@ msgstr "Visa lista över tillgängliga EPG utökningar." # msgid "View list of available Satellite equipment extensions." -msgstr "" +msgstr "Se listan över tillgängliga Satellitutrustning utökningar!" # msgid "View list of available communication extensions." @@ -7548,10 +7601,10 @@ msgid "WEP" msgstr "WEP" msgid "WLAN adapter." -msgstr "" +msgstr "WLAN adapter." msgid "WLAN connection" -msgstr "" +msgstr "WLAN anslutning" # msgid "WPA" @@ -7812,6 +7865,8 @@ msgid "" "With this option enabled the channel to record on can be changed to a " "alternative service it is restricted to." msgstr "" +"Med den hör optionen aktiverad kan kanalen som ska spelas in ändras till en " +"alternativ kanal som den är begränsad till." # msgid "" @@ -8049,12 +8104,18 @@ msgid "" "\n" "You can go back a step by pressing EXIT on your remote." msgstr "" +"Du har lyckats konfigurera en ny AutoTimer. Vill du lägga till den i " +"listan?\n" +"\n" +"Du kan gÃ¥ tillbaka ett steg genom att trycka pÃ¥ EXIT pÃ¥ fjärrkontrollen." # msgid "" "Your 'Match in title' Attribute ends with a Whitespace.\n" "Please confirm if this was intentional, if not they will be removed." msgstr "" +"Din 'Match i titel' attribut slutar med ett Whitespace.\n" +"Vänligen bekräfta om det var meningen, om inte kommer det tas bort." # msgid "" @@ -8196,7 +8257,7 @@ msgid "Zap back to service before tuner setup?" msgstr "Zappa tillbaka till kanalen som användes innan tuner installation?" msgid "Zydas" -msgstr "" +msgstr "Zydas" # msgid "[alternative edit]" @@ -8339,7 +8400,7 @@ msgid "alphabetic sort" msgstr "sortera alfabetiskt" msgid "assigned CAIds:" -msgstr "" +msgstr "tilldelade CAIds:" # msgid "assigned Services/Provider:" @@ -8402,11 +8463,11 @@ msgstr "bränn ljudspÃ¥r (%s)" # msgid "case-insensitive search" -msgstr "" +msgstr "Skiftläges okänslig sökning" # msgid "case-sensitive search" -msgstr "" +msgstr "Skiftläges känslig sökning" # msgid "change recording (duration)" diff --git a/skin.py b/skin.py index 064fd219..b490f739 100755 --- a/skin.py +++ b/skin.py @@ -241,6 +241,8 @@ def applySingleAttribute(guiObject, desktop, attrib, value, scale = ((1,1),(1,1) guiObject.setShadowOffset(parsePosition(value, scale)) elif attrib == 'noWrap': guiObject.setNoWrap(1) + elif attrib == 'id': + pass else: raise SkinError("unsupported attribute " + attrib + "=" + value) except int: @@ -395,12 +397,16 @@ def loadSkinData(desktop): for (path, dom_skin) in skins: loadSingleSkinData(desktop, dom_skin, path) -def lookupScreen(name): +def lookupScreen(name, style_id): for (path, skin) in dom_skins: # first, find the corresponding screen element for x in skin.findall("screen"): if x.attrib.get('name', '') == name: - return x, path + screen_style_id = x.attrib.get('id', '-1') + if screen_style_id == '-1' and name.find('ummary') > 0: + screen_style_id = '1' + if (style_id != 2 and int(screen_style_id) == -1) or int(screen_style_id) == style_id: + return x, path return None, None class additionalWidget: @@ -412,9 +418,11 @@ def readSkin(screen, skin, names, desktop): name = "<embedded-in-'%s'>" % screen.__class__.__name__ + style_id = desktop.getStyleID(); + # try all skins, first existing one have priority for n in names: - myscreen, path = lookupScreen(n) + myscreen, path = lookupScreen(n, style_id) if myscreen is not None: # use this name for debug output name = n @@ -427,7 +435,15 @@ def readSkin(screen, skin, names, desktop): # try uncompiled embedded skin if myscreen is None and getattr(screen, "skin", None): print "Looking for embedded skin" - myscreen = screen.parsedSkin = xml.etree.cElementTree.fromstring(screen.skin) + skin_tuple = screen.skin + if not isinstance(skin_tuple, tuple): + skin_tuple = (skin_tuple,) + for sskin in skin_tuple: + parsedSkin = xml.etree.cElementTree.fromstring(sskin) + screen_style_id = parsedSkin.attrib.get('id', '-1') + if (style_id != 2 and int(screen_style_id) == -1) or int(screen_style_id) == style_id: + myscreen = screen.parsedSkin = parsedSkin + break #assert myscreen is not None, "no skin for screen '" + repr(names) + "' found!" if myscreen is None: