message cosmetics
authorpieterg <pieterg@users.sourceforge.net>
Fri, 16 Nov 2012 17:40:15 +0000 (18:40 +0100)
committerpieterg <pieterg@users.sourceforge.net>
Fri, 16 Nov 2012 17:43:08 +0000 (18:43 +0100)
mostly capital corrections

71 files changed:
data/menu.xml
data/setup.xml
data/skin.xml
data/skin_default.xml
data/startwizard.xml
lib/python/Components/AVSwitch.py
lib/python/Components/Converter/genre.py
lib/python/Components/DiskInfo.py
lib/python/Components/FileList.py
lib/python/Components/Harddisk.py
lib/python/Components/MovieList.py
lib/python/Components/Task.py
lib/python/Components/UsageConfig.py
lib/python/Components/config.py
lib/python/Plugins/DemoPlugins/TestPlugin/plugin.py
lib/python/Plugins/Extensions/CutListEditor/ui.py
lib/python/Plugins/Extensions/DVDBurn/Process.py
lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py
lib/python/Plugins/Extensions/DVDBurn/TitleList.py
lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py
lib/python/Plugins/Extensions/DVDPlayer/plugin.py
lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py
lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpgSetup.py
lib/python/Plugins/Extensions/MediaPlayer/plugin.py
lib/python/Plugins/Extensions/MediaScanner/plugin.py
lib/python/Plugins/Extensions/PicturePlayer/plugin.py
lib/python/Plugins/Extensions/PicturePlayer/ui.py
lib/python/Plugins/SystemPlugins/CableScan/plugin.py
lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py
lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py
lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py
lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py
lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py
lib/python/Plugins/SystemPlugins/NetworkWizard/meta/plugin_networkwizard.xml
lib/python/Plugins/SystemPlugins/NetworkWizard/networkwizard.xml
lib/python/Plugins/SystemPlugins/NetworkWizard/plugin.py
lib/python/Plugins/SystemPlugins/OSD3DSetup/plugin.py
lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py
lib/python/Plugins/SystemPlugins/SkinSelector/plugin.py
lib/python/Plugins/SystemPlugins/SoftwareManager/imagewizard.xml
lib/python/Plugins/SystemPlugins/SoftwareManager/meta/plugin_softwaremanager.xml
lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py
lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py
lib/python/Plugins/SystemPlugins/VideoTune/plugin.py
lib/python/Plugins/SystemPlugins/Videomode/plugin.py
lib/python/Plugins/SystemPlugins/WirelessLan/meta/plugin_wirelesslan.xml
lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
lib/python/Screens/About.py
lib/python/Screens/ChannelSelection.py
lib/python/Screens/Console.py
lib/python/Screens/DVD.py
lib/python/Screens/EpgSelection.py
lib/python/Screens/HelpMenu.py
lib/python/Screens/InfoBar.py
lib/python/Screens/InfoBarGenerics.py
lib/python/Screens/LocationBox.py
lib/python/Screens/Menu.py
lib/python/Screens/MovieSelection.py
lib/python/Screens/NetworkSetup.py
lib/python/Screens/ParentalControlSetup.py
lib/python/Screens/PluginBrowser.py
lib/python/Screens/RecordPaths.py
lib/python/Screens/ScanSetup.py
lib/python/Screens/ServiceInfo.py
lib/python/Screens/SleepTimerEdit.py
lib/python/Screens/SoftwareUpdate.py
lib/python/Screens/Standby.py
lib/python/Screens/TimerEdit.py
lib/python/Screens/TimerEntry.py

index 59a1a37..c403d1c 100644 (file)
@@ -1,4 +1,4 @@
-<menu text="Mainmenu" title="Main menu">
+<menu text="Main menu" title="Main menu">
        <id val="mainmenu" />
 <!-- the following types are allowed:
        <screen [module="mod"] [screen="classname"]>[arguments]</screen> 
                <item level="1" text="Plugins" entryID="plugin_selection"><screen module="PluginBrowser" screen="PluginBrowser" /></item>
                <menu level="0" text="Setup" flushConfigOnClose="1" entryID="setup_selection" >
                        <id val="setup" />
-                       <menu weight="7" level="0" text="Service Searching" entryID="service_searching_selection">
+                       <menu weight="7" level="0" text="Service searching" entryID="service_searching_selection">
                                <id val="scan" />
                                <item text="Tuner configuration" entryID="tuner_setup"><screen module="Satconfig" screen="NimSelection" /></item>
-                               <item text="Automatic Scan" entryID="auto_scan"><screen module="ScanSetup" screen="ScanSimple" /></item>
-                               <item text="Manual Scan" entryID="manual_scan"><screen module="ScanSetup" /></item>
+                               <item text="Automatic scan" entryID="auto_scan"><screen module="ScanSetup" screen="ScanSimple" /></item>
+                               <item text="Manual scan" entryID="manual_scan"><screen module="ScanSetup" /></item>
                        </menu>
                        <menu weight="5" level="0" text="System" entryID="system_selection">
                                <id val="system" />
@@ -45,8 +45,8 @@
                                        <id val="harddisk" />
                                        <item level="1" entryID="harddisk_setup"><setup id="harddisk"/></item>
                                        <item level="0" text="Initialization" entryID="harddisk_init"><screen module="HarddiskSetup" screen="HarddiskSelection"/></item>
-                                       <item level="0" text="Filesystem Check" entryID="harddisk_check"><screen module="HarddiskSetup" screen="HarddiskFsckSelection"/></item>
-                                       <item level="0" text="Convert filesystem ext3 to ext4" entryID="harddisk_convert" requires="ext4"><screen module="HarddiskSetup" screen="HarddiskConvertExt4Selection"/></item>
+                                       <item level="0" text="Filesystem check" entryID="harddisk_check"><screen module="HarddiskSetup" screen="HarddiskFsckSelection"/></item>
+                                       <item level="0" text="Convert ext3 filesystem to ext4" entryID="harddisk_convert" requires="ext4"><screen module="HarddiskSetup" screen="HarddiskConvertExt4Selection"/></item>
                                </menu>
                                <item level="0" text="Network" entryID="network_setup"><screen module="NetworkSetup" screen="NetworkAdapterSelection" /></item>
                                <item level="1" text="Input devices" entryID="input_device_setup"><screen module="InputDeviceSetup" screen="InputDeviceSelection" /></item>
@@ -74,13 +74,13 @@ self.session.openWithCallback(msgClosed, FactoryReset)
                        </item>
                        <item weight="15" level="0" text="Software update" entryID="software_update"><screen module="SoftwareUpdate" screen="UpdatePlugin" /></item>
                </menu>
-               <menu text="Standby / Restart" entryID="standby_restart_list">
+               <menu text="Standby / restart" entryID="standby_restart_list">
                        <id val="shutdown" />
-                       <item text="Sleep Timer" entryID="sleep"><screen module="SleepTimerEdit" screen="SleepTimerEdit" /></item>
+                       <item text="Sleep timer" entryID="sleep"><screen module="SleepTimerEdit" screen="SleepTimerEdit" /></item>
                        <item text="Standby" entryID="standby"><screen module="Standby" screen="Standby"/></item>
                        <item text="Restart" entryID="restart"><screen module="Standby" screen="TryQuitMainloop">2</screen></item>
                        <item text="Restart enigma" entryID="restart_enigma"><screen module="Standby" screen="TryQuitMainloop">3</screen></item>
-                       <item text="Deep Standby" requires="DeepstandbySupport" entryID="deep_standby"><screen module="Standby" screen="TryQuitMainloop">1</screen></item>
+                       <item text="Deep standby" requires="DeepstandbySupport" entryID="deep_standby"><screen module="Standby" screen="TryQuitMainloop">1</screen></item>
                        <item text="Shutdown" requires="!DeepstandbySupport" entryID="deep_standby"><screen module="Standby" screen="TryQuitMainloop">1</screen></item>
                </menu>
 </menu>
index 57d6c7f..965b9b4 100644 (file)
@@ -20,7 +20,7 @@
                <item level="1" text="12V output" description="12V output" requires="12V_Output.">config.usage.output_12V</item>
                <item level="2" text="Alternative services tuner priority" description="Configure which tuner type will be preferred, when the same service is available on different types of tuners.">config.usage.alternatives_priority</item>
                <item level="2" text="Preferred tuner" description="Configure which tuner will be preferred, when more than one tuner is available. If set to 'auto' the system will give priority to the tuner having the lowest number of channels/satellites.">config.usage.frontend_priority</item>
-               <item level="2" text="Disable background scanning" description="When tuned to a service the system will normally scan the transponder for any changes and save them. Only set to 'yes' if you're absolutely sure what you're doing.">config.misc.disable_background_scan</item>
+               <item level="2" text="Disable background scanning" description="When enabled, the receiver will no longer monitor the tuned transponder for possible changes. Do not use this option unless you know what you are doing.">config.misc.disable_background_scan</item>
                <item level="2" text="Create more detailed crash log" description="Add more details to the crash log">config.crash.details</item>
                <item level="2" text="Include EIT in http streams" description="When enabled, EIT data will be included in http streams. This allows a client receiver to show EPG.">config.streaming.stream_eit</item>
                <item level="2" text="Include AIT in http streams" description="When enabled, AIT data will be included in http streams. This allows a client receiver to use HbbTV.">config.streaming.stream_ait</item>
                <item level="0" text="Show animation while busy" description="Show busy indicator when the system is busy.">config.usage.show_spinner</item>
                <item level="1" text="Show positioner movement" description="Configure whether or not an icon should be shown when your motorized dish is moving.">config.usage.showdish</item>
                <item level="1" text="Enable multiple bouquets" description="When enabled, services may be grouped in multiple bouquets.">config.usage.multibouquet</item>
-               <item level="1" text="Multi-EPG bouquet selection" description="Enable bouquet selection in Multi-EPG">config.usage.multiepg_ask_bouquet</item>
+               <item level="1" text="Multi-EPG bouquet selection" description="Enable bouquet selection in multi-EPG">config.usage.multiepg_ask_bouquet</item>
                <item level="1" text="Alternative numbering mode" description="When enabled, channel numbering will start at '1' for each bouquet.">config.usage.alternative_number_mode</item>
-               <item level="1" text="Change bouquets in quickzap" description="When enabled, continue to the next bouquet when the last channel of the current bouquet is reached, while changing channels.">config.usage.quickzap_bouquet_change</item>
-               <item level="1" text="Hide channel list in radio mode" description="If set to 'yes', the channel selection list will be hidden while listening to a radio channel">config.usage.e1like_radio_mode</item>
+               <item level="1" text="Change bouquets in quickzap" description="When enabled, continue to the next bouquet when the last channel of the current bouquet is reached while changing channels.">config.usage.quickzap_bouquet_change</item>
+               <item level="1" text="Hide channel list in radio mode" description="When enabled, the channel selection list will be hidden while listening to a radio channel">config.usage.e1like_radio_mode</item>
                <item level="1" text="Action on long powerbutton press" description="Configure the function of a long press on the power button.">config.usage.on_long_powerpress</item>
                <item level="1" text="Action on short powerbutton press" description="Configure the function of a short press on the power button.">config.usage.on_short_powerpress</item>
                <item level="1" text="Position of completed timers in timerlist" description="Configure where completed timers show up in the timer list.">config.usage.timerlist_finished_timer_position</item>
-               <item level="0" text="Infobar timeout" description="Configure for how long the infobar will remain visible after activation.">config.usage.infobar_timeout</item>
+               <item level="0" text="Info bar timeout" description="Configure for how long the infobar will remain visible after activation.">config.usage.infobar_timeout</item>
                <item level="0" text="Show event-progress in channel selection" description="Set the type of the progress indication in the channel selection screen.">config.usage.show_event_progress_in_servicelist</item>
                <item level="0" text="Show channel numbers in channel selection" description="When enabled, show channel numbers in the channel selection screen.">config.usage.show_channel_numbers_in_servicelist</item>
                <item level="2" text="Show infobar on channel change" description="When enabled, the infobar will be displayed when changing channels.">config.usage.show_infobar_on_zap</item>
@@ -97,8 +97,8 @@
        </setup>
        <setup key="recording" title="Record">
                <item level="1" text="Recordings always have priority" description="When enabled, a recording is allowed to interrupt live tv, when there are no free tuners.">config.recording.asktozap</item>
-               <item level="0" text="Margin before record (minutes)" description="When nonzero, a recording will start earlier than the starting time as indicated by the EPG.">config.recording.margin_before</item>
-               <item level="0" text="Margin after record (minutes)" description="When nonzero, a recording will stop later than the ending time as indicated by the EPG.">config.recording.margin_after</item>
+               <item level="0" text="Margin before recording (minutes)" description="When nonzero, a recording will start earlier than the starting time indicated by the EPG.">config.recording.margin_before</item>
+               <item level="0" text="Margin after recording (minutes)" description="When nonzero, a recording will stop later than the ending time indicated by the EPG.">config.recording.margin_after</item>
                <item level="2" text="Show message when recording starts" description="When enabled, a popup message will be shown when a recording starts.">config.usage.show_message_when_recording_starts</item>
                <item level="2" text="Show movie lengths in movielist" description="When enabled, the lenght of each recording will be shown in the movielist (this might cause some additional loading time).">config.usage.load_length_of_movies_in_moviellist</item>
                <item level="2" text="Show status icons in movielist" description="Configure the type of status indication icons shown in the movielist.">config.usage.show_icons_in_movielist</item>
                <item level="2" text="Behavior when a movie reaches the end" description="Configure the behavior when reaching the end of a movie, during movie playback.">config.usage.on_movie_eof</item>
                <item level="2" text="Display message before playing next movie" description="When enabled, a popup message will be shown when a movie has finished and the next one will start.">config.usage.next_movie_msg</item>
                <item level="2" text="Behavior of 'pause' when paused" description="Configure the behavior of the 'pause' key when movie playback is already paused.">config.seek.on_pause</item>
-               <item level="2" text="Custom skip time for '1'/'3'-keys" description="Configure the skip time interval on the '1'/'3'-keys.">config.seek.selfdefined_13</item>
-               <item level="2" text="Custom skip time for '4'/'6'-keys" description="Configure the skip time interval on the '4'/'6'-keys.">config.seek.selfdefined_46</item>
-               <item level="2" text="Custom skip time for '7'/'9'-keys" description="Configure the skip time interval on the '7'/'9'-keys.">config.seek.selfdefined_79</item>
+               <item level="2" text="Custom skip time for '1'/'3' buttons" description="Configure the skip time interval for the '1'/'3' buttons.">config.seek.selfdefined_13</item>
+               <item level="2" text="Custom skip time for '4'/'6' buttons" description="Configure the skip time interval for the '4'/'6' buttons.">config.seek.selfdefined_46</item>
+               <item level="2" text="Custom skip time for '7'/'9' buttons" description="Configure the skip time interval for the '7'/'9' buttons.">config.seek.selfdefined_79</item>
                <item level="2" text="Fast forward speeds" description="Configure the possible fast forward speeds.">config.seek.speeds_forward</item>
                <item level="2" text="Rewind speeds" description="Configure the possible rewind speeds.">config.seek.speeds_backward</item>
                <item level="2" text="Slow motion speeds" description="Configure the slow motion speeds.">config.seek.speeds_slowmotion</item>
-               <item level="2" text="Initial fast forward speed" description="Configure the initial fast forward speed. When you press the fast forward key, winding will start at this speed.">config.seek.enter_forward</item>
-               <item level="2" text="Initial rewind speed" description="Configure the initial rewind speed. When you press the rewind key, winding will start at this speed.">config.seek.enter_backward</item>
+               <item level="2" text="Initial fast forward speed" description="Configure the initial fast forward speed. When you press the fast forward button, winding will start at this speed.">config.seek.enter_forward</item>
+               <item level="2" text="Initial rewind speed" description="Configure the initial rewind speed. When you press the rewind button, winding will start at this speed.">config.seek.enter_backward</item>
                <item level="2" text="Limit character set for recording filenames" description="Limit the characters that can be used in recording filenames to (7 bit) ascii. This ensures compatibility with operating systems or file systems with limited character sets.">config.recording.ascii_filenames</item>
                <item level="2" text="Composition of the recording filenames" description="Configure how recording filenames are constructed.">config.recording.filename_composition</item>
                <item level="2" text="Remove completed timers after (days)" description="Configure the number of days old timers are kept before they are automatically removed from the timer list.">config.recording.keep_timers</item>
-               <item level="1" text="Use trash can in movielist" description="When enabled, deleted recordings are moved to the trash can, instead of being immediately deleted.">config.usage.movielist_trashcan</item>
+               <item level="1" text="Use trash can in movielist" description="When enabled, deleted recordings are moved to the trash can, instead of being deleted immediately.">config.usage.movielist_trashcan</item>
                <item level="1" text="Remove items from trash can after (days)" description="Configure the number of days after which items are automaticaly removed from the trash can.">config.usage.movielist_trashcan_days</item>
                <item level="1" text="Disk space to reserve for recordings (in GB)" description="Configure the minimum amount of disk space to be available for recordings. When the amount of space drops below this value, deleted items will be removed from the trash can.">config.usage.movielist_trashcan_reserve</item>
                <item level="2" text="Background delete option" description="Configure on which devices the background delete option should be used.">config.misc.erase_flags</item>
                <item level="1" text="Modulator">config.rfmod.enable</item>
                <item level="2" text="Test mode">config.rfmod.test</item>
                <item level="2" text="Sound">config.rfmod.sound</item>
-               <item level="2" text="Soundcarrier">config.rfmod.soundcarrier</item>
+               <item level="2" text="Sound carrier">config.rfmod.soundcarrier</item>
                <item level="1" text="Channel">config.rfmod.channel</item>
                <item level="1" text="Finetune">config.rfmod.finetune</item>
        </setup>
index 28064f3..d344fcb 100644 (file)
@@ -49,7 +49,7 @@
        <!-- Fonts -->
        <!-- Fonts are already in skin_default.xml -->
        <!-- Main infobar -->
-       <screen name="InfoBar" flags="wfNoBorder" position="0,380" size="720,160" title="InfoBar" backgroundColor="transparent">
+       <screen name="InfoBar" flags="wfNoBorder" position="0,380" size="720,160" title="Info bar" 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" />
                </widget>
        </screen>
        <!-- Movieplayer infobar -->
-       <screen name="MoviePlayer" flags="wfNoBorder" position="0,380" size="720,160" title="InfoBar" backgroundColor="transparent">
+       <screen name="MoviePlayer" flags="wfNoBorder" position="0,380" size="720,160" title="Info bar" 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" />
index de3db7a..6a82e44 100644 (file)
                <widget name="menu" position="10,10" size="340,230" scrollbarMode="showOnDemand" />
        </screen>
        <!-- Channel selection - TV -->
-       <screen name="ChannelSelection" position="center,center" size="560,430" title="Channel Sslection">
+       <screen name="ChannelSelection" position="center,center" size="560,430" title="Channel selection">
                <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" />
                <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" />
@@ -326,11 +326,11 @@ self.autoResize()
                <widget name="list" position="11,75" size="540,350" scrollbarMode="showOnDemand" />
        </screen>
        <!-- Eventview context menu -->
-       <screen name="EventViewContextMenu" position="150,160" size="400,260" title="Eventview menu" >
+       <screen name="EventViewContextMenu" position="150,160" size="400,260" title="Event view menu" >
                <widget name="menu" position="10,10" size="390,250" scrollbarMode="showOnDemand" />
        </screen>
        <!-- Eventview -->
-       <screen name="EventView" position="center,center" size="560,430" title="Eventview">
+       <screen name="EventView" position="center,center" size="560,430" title="Event view">
                <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" />
                <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" />
@@ -518,7 +518,7 @@ self.autoResize()
                <widget name="year" position="94,47" size="339,17" font="Regular;16" valign="top" transparent="1" />
                <widget name="genretext" position="20,65" size="74,17" font="Regular;16" valign="top" foregroundColor="#cccccc" transparent="1" />
                <widget name="genre" position="94,65" size="339,17" font="Regular;16" valign="top" transparent="1" />
-               <eLabel name="nowPlaying" position="20,92" size="413,16" text="Now Playing" font="Regular;14" foregroundColor="#ffc435" transparent="1" />
+               <eLabel name="nowPlaying" position="20,92" size="413,16" text="Now playing" font="Regular;14" foregroundColor="#ffc435" transparent="1" />
                <widget name="title" position="20,108" size="413,18" font="Regular;16" valign="top" transparent="1" />
                <widget name="coverArt" pixmap="skin_default/no_coverArt.png" position="446,11" size="116,116" transparent="1" alphatest="blend" />
                <ePixmap pixmap="skin_default/icons/mp_buttons.png" position="454,136" size="108,13" alphatest="on" />
@@ -771,7 +771,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
                <panel name="PinInputTemplate" />
        </screen>
        <!-- Picture in picture setup -->
-       <screen name="PiPSetup" position="center,center" size="600,150" backgroundColor="transparent" flags="wfNoBorder" title="PiPSetup">
+       <screen name="PiPSetup" position="center,center" size="600,150" backgroundColor="transparent" flags="wfNoBorder" title="PiP setup">
                <widget name="text" position="0,0" size="600,150" font="Regular;23" />
        </screen>
        <!-- Plugin browser -->
@@ -1172,7 +1172,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
                </widget>
        </screen>
        <!-- VirtualKeyBoard -->
-       <screen name="VirtualKeyBoard" position="center,center" size="560,350" zPosition="99" title="Virtual keyBoard">
+       <screen name="VirtualKeyBoard" position="center,center" size="560,350" zPosition="99" title="Virtual keyboard">
                <ePixmap pixmap="skin_default/vkey_text.png" position="9,45" zPosition="-4" size="542,52" alphatest="on" />
                <widget source="country" render="Pixmap" position="490,0" size="60,40" alphatest="on" borderWidth="2" borderColor="yellow" >
                        <convert type="ValueToPixmap">LanguageCode</convert>
index 3c5496b..fc1a0ed 100644 (file)
@@ -42,7 +42,7 @@ self.selectKey("OK")
                        <condition>
 self.condition = not config.misc.installwizard.ipkgloaded.value
                        </condition>
-                       <text value="Your receiver is not connected to the internet" />
+                       <text value="Your receiver does not have an internet connection" />
                        <list>
                                <listentry caption="Check the internet connection again" step="update" />
                                <listentry caption="Skip internet connection check (disables automatic package installation)" step="nima" />
index a4fc3f0..f4e561c 100644 (file)
@@ -94,9 +94,9 @@ def InitAVSwitch():
        # TRANSLATORS: (aspect ratio policy: black bars on top/bottom) in doubt, keep english term.
        "letterbox": _("Letterbox"),
        # TRANSLATORS: (aspect ratio policy: cropped content on left/right) in doubt, keep english term
-       "panscan": _("Pan&Scan"),
+       "panscan": _("Pan&scan"),
        # TRANSLATORS: (aspect ratio policy: display as fullscreen, even if this breaks the aspect)
-       "scale": _("Just Scale")}
+       "scale": _("Just scale")}
        if os.path.exists("/proc/stb/video/policy2_choices") and "auto" in open("/proc/stb/video/policy2_choices").readline():
                # TRANSLATORS: (aspect ratio policy: always try to display as fullscreen, when there is no content (black bars) on left/right, even if this breaks the aspect.
                policy2_choices.update({"auto": _("Auto")})
@@ -105,11 +105,11 @@ def InitAVSwitch():
        # TRANSLATORS: (aspect ratio policy: black bars on left/right) in doubt, keep english term.
        "pillarbox": _("Pillarbox"),
        # TRANSLATORS: (aspect ratio policy: cropped content on left/right) in doubt, keep english term
-       "panscan": _("Pan&Scan"),
+       "panscan": _("Pan&scan"),
        # TRANSLATORS: (aspect ratio policy: display as fullscreen, with stretching the left/right)
        "nonlinear": _("Nonlinear"),
        # TRANSLATORS: (aspect ratio policy: display as fullscreen, even if this breaks the aspect)
-       "scale": _("Just Scale")}
+       "scale": _("Just scale")}
        if os.path.exists("/proc/stb/video/policy_choices") and "auto" in open("/proc/stb/video/policy_choices").readline():
                # TRANSLATORS: (aspect ratio policy: always try to display as fullscreen, when there is no content (black bars) on left/right, even if this breaks the aspect.
                policy_choices.update({"auto": _("Auto")})
index 0624910..eb358be 100644 (file)
@@ -14,7 +14,7 @@ maintype = [  _("Reserved"),
                _("Arts/Culture"),
                _("Social/Political/Economics"),
                _("Education/Science/..."),
-               _("Leisure hobies"),
+               _("Leisure hobbies"),
                _("Other")]
 
 
index eb8a450..0026ad8 100644 (file)
@@ -35,7 +35,7 @@ class DiskInfo(VariableText, GUIComponent):
                                        free = "%d MB" % (free >> 20)
                                else:
                                        free = "%d GB" % (free >> 30)
-                               self.setText(" ".join((free, percent, _("free diskspace"))))
+                               self.setText(_("%s %s free disk space") % (free, percent))
                        except:
                                # occurs when f_blocks is 0 or a similar error
                                self.setText("-?-")
index fe3b28b..2adbce5 100644 (file)
@@ -182,9 +182,9 @@ class FileList(MenuList):
 
                if directory is not None and self.showDirectories and not self.isTop:
                        if directory == self.current_mountpoint and self.showMountpoints:
-                               self.list.append(FileEntryComponent(name = "<" +_("List of Storage Devices") + ">", absolute = None, isDir = True))
+                               self.list.append(FileEntryComponent(name = "<" +_("List of storage devices") + ">", absolute = None, isDir = True))
                        elif (directory != "/") and not (self.inhibitMounts and self.getMountpoint(directory) in self.inhibitMounts):
-                               self.list.append(FileEntryComponent(name = "<" +_("Parent Directory") + ">", absolute = '/'.join(directory.split('/')[:-2]) + '/', isDir = True))
+                               self.list.append(FileEntryComponent(name = "<" +_("Parent directory") + ">", absolute = '/'.join(directory.split('/')[:-2]) + '/', isDir = True))
 
                if self.showDirectories:
                        for x in directories:
@@ -390,9 +390,9 @@ class MultiFileSelectList(FileList):
 
                if directory is not None and self.showDirectories and not self.isTop:
                        if directory == self.current_mountpoint and self.showMountpoints:
-                               self.list.append(MultiFileSelectEntryComponent(name = "<" +_("List of Storage Devices") + ">", absolute = None, isDir = True))
+                               self.list.append(MultiFileSelectEntryComponent(name = "<" +_("List of storage devices") + ">", absolute = None, isDir = True))
                        elif (directory != "/") and not (self.inhibitMounts and self.getMountpoint(directory) in self.inhibitMounts):
-                               self.list.append(MultiFileSelectEntryComponent(name = "<" +_("Parent Directory") + ">", absolute = '/'.join(directory.split('/')[:-2]) + '/', isDir = True))
+                               self.list.append(MultiFileSelectEntryComponent(name = "<" +_("Parent directory") + ">", absolute = '/'.join(directory.split('/')[:-2]) + '/', isDir = True))
 
                if self.showDirectories:
                        for x in directories:
index d0f5564..fb49d03 100644 (file)
@@ -279,17 +279,17 @@ class Harddisk:
 
                task = UnmountTask(job, self)
 
-               task = Task.PythonTask(job, _("Kill partition table"))
+               task = Task.PythonTask(job, _("Removing partition table"))
                task.work = self.killPartitionTable
                task.weighting = 1
 
-               task = Task.LoggingTask(job, _("Reread partition table"))
+               task = Task.LoggingTask(job, _("Rereading partition table"))
                task.weighting = 1
                task.setTool('sfdisk')
                task.args.append('-R')
                task.args.append(self.disk_path)
 
-               task = Task.ConditionTask(job, _("Wait for partition"), timeoutCount=20)
+               task = Task.ConditionTask(job, _("Waiting for partition"), timeoutCount=20)
                task.check = lambda: not os.path.exists(self.partitionPath("1"))
                task.weighting = 1
 
@@ -302,7 +302,7 @@ class Harddisk:
                        else:
                                use_parted = False
 
-               task = Task.LoggingTask(job, _("Create Partition"))
+               task = Task.LoggingTask(job, _("Creating partition"))
                task.weighting = 5
                if use_parted:
                        task.setTool('parted')
@@ -330,11 +330,11 @@ class Harddisk:
                                # Smaller disks (CF cards, sticks etc) don't need that
                                task.initial_input = "0,\n;\n;\n;\ny\n"
 
-               task = Task.ConditionTask(job, _("Wait for partition"))
+               task = Task.ConditionTask(job, _("Waiting for partition"))
                task.check = lambda: os.path.exists(self.partitionPath("1"))
                task.weighting = 1
 
-               task = MkfsTask(job, _("Create Filesystem"))
+               task = MkfsTask(job, _("Creating filesystem"))
                if isFileSystemSupported("ext4"):
                        task.setTool("mkfs.ext4")
                        if size > 20000:
@@ -358,7 +358,7 @@ class Harddisk:
                task = MountTask(job, self)
                task.weighting = 3
 
-               task = Task.ConditionTask(job, _("Wait for mount"), timeoutCount=20)
+               task = Task.ConditionTask(job, _("Waiting for mount"), timeoutCount=20)
                task.check = self.mountDevice
                task.weighting = 1
 
@@ -373,7 +373,7 @@ class Harddisk:
                return -5
 
        def createCheckJob(self):
-               job = Task.Job(_("Checking Filesystem..."))
+               job = Task.Job(_("Checking filesystem..."))
                if self.findMount():
                        # Create unmount task if it was not mounted
                        UnmountTask(job, self)
@@ -387,14 +387,14 @@ class Harddisk:
                task.args.append('-p')
                task.args.append(dev)
                MountTask(job, self)
-               task = Task.ConditionTask(job, _("Wait for mount"))
+               task = Task.ConditionTask(job, _("Waiting for mount"))
                task.check = self.mountDevice
                return job
 
        def createExt4ConversionJob(self):
                if not isFileSystemSupported('ext4'):
                        raise Exception, _("You system does not support ext4")
-               job = Task.Job(_("Convert ext3 to ext4..."))
+               job = Task.Job(_("Converting ext3 to ext4..."))
                if not os.path.exists('/sbin/tune2fs'):
                        addInstallTask(job, 'e2fsprogs-tune2fs')
                if self.findMount():
@@ -423,7 +423,7 @@ class Harddisk:
                task.args.append('-D')
                task.args.append(dev)
                MountTask(job, self)
-               task = Task.ConditionTask(job, _("Wait for mount"))
+               task = Task.ConditionTask(job, _("Waiting for mount"))
                task.check = self.mountDevice
                return job
 
@@ -597,17 +597,17 @@ class HarddiskManager:
                self.enumerateBlockDevices()
                # Find stuff not detected by the enumeration
                p = (
-                       ("/media/hdd", _("Harddisk")),
+                       ("/media/hdd", _("Hard disk")),
                        ("/media/card", _("Card")),
-                       ("/media/cf", _("Compact Flash")),
-                       ("/media/mmc1", _("MMC Card")),
-                       ("/media/net", _("Network Mount")),
-                       ("/media/net1", _("Network Mount") + " 1"),
-                       ("/media/net2", _("Network Mount") + " 2"),
-                       ("/media/net3", _("Network Mount") + " 3"),
-                       ("/media/ram", _("Ram Disk")),
-                       ("/media/usb", _("USB Stick")),
-                       ("/", _("Internal Flash"))
+                       ("/media/cf", _("Compact flash")),
+                       ("/media/mmc1", _("MMC card")),
+                       ("/media/net", _("Network mount")),
+                       ("/media/net1", _("Network mount %s") % ("1")),
+                       ("/media/net2", _("Network mount %s") % ("2")),
+                       ("/media/net3", _("Network mount %s") % ("3")),
+                       ("/media/ram", _("Ram disk")),
+                       ("/media/usb", _("USB stick")),
+                       ("/", _("Internal flash"))
                )
                known = set([os.path.normpath(a.mountpoint) for a in self.partitions if a.mountpoint])
                for m,d in p:
index ec906a9..96c2a9d 100644 (file)
@@ -290,7 +290,7 @@ class MovieList(GUIComponent):
                                if txt == ".Trash":
                                        res.append(MultiContentEntryPixmapAlphaTest(pos=(0,1), size=(iconSize,24), png=self.iconTrash))
                                        res.append(MultiContentEntryText(pos=(iconSize+2, 0), size=(width-166, self.itemHeight), font = 0, flags = RT_HALIGN_LEFT, text = _("Deleted items")))
-                                       res.append(MultiContentEntryText(pos=(width-145, 4), size=(145, self.itemHeight), font=1, flags=RT_HALIGN_RIGHT, text=_("Trashcan")))
+                                       res.append(MultiContentEntryText(pos=(width-145, 4), size=(145, self.itemHeight), font=1, flags=RT_HALIGN_RIGHT, text=_("Trash can")))
                                        return res
                        res.append(MultiContentEntryPixmapAlphaTest(pos=(0,1), size=(iconSize,iconSize), png=self.iconFolder))
                        res.append(MultiContentEntryText(pos=(iconSize+2, 0), size=(width-166, self.itemHeight), font = 0, flags = RT_HALIGN_LEFT, text = txt))
index bf6782c..a7a30d6 100644 (file)
@@ -39,7 +39,7 @@ class Job(object):
        progress = property(getProgress)
 
        def getStatustext(self):
-               return { self.NOT_STARTED: _("Waiting"), self.IN_PROGRESS: _("In Progress"), self.FINISHED: _("Finished"), self.FAILED: _("Failed") }[self.status]
+               return { self.NOT_STARTED: _("Waiting"), self.IN_PROGRESS: _("In progress"), self.FINISHED: _("Finished"), self.FAILED: _("Failed") }[self.status]
 
        def task_progress_changed_CB(self):
                self.state_changed()
@@ -401,7 +401,7 @@ class JobManager:
 #
 #class CreatePartitionTask(Task):
 #      def __init__(self, device):
-#              Task.__init__(self, _("Create Partition"))
+#              Task.__init__(self, "Creating partition")
 #              self.device = device
 #              self.setTool("/sbin/sfdisk")
 #              self.args += ["-f", self.device + "disc"]
@@ -410,7 +410,7 @@ class JobManager:
 #
 #class CreateFilesystemTask(Task):
 #      def __init__(self, device, partition = 1, largefile = True):
-#              Task.__init__(self, _("Create Filesystem"))
+#              Task.__init__(self, "Creating filesystem")
 #              self.setTool("/sbin/mkfs.ext")
 #              if largefile:
 #                      self.args += ["-T", "largefile"]
@@ -419,7 +419,7 @@ class JobManager:
 #
 #class FilesystemMountTask(Task):
 #      def __init__(self, device, partition = 1, filesystem = "ext3"):
-#              Task.__init__(self, _("Mounting Filesystem"))
+#              Task.__init__(self, "Mounting filesystem")
 #              self.setTool("/bin/mount")
 #              if filesystem is not None:
 #                      self.args += ["-t", filesystem]
@@ -450,7 +450,7 @@ class DiskspacePrecondition(Condition):
                        return False
 
        def getErrorMessage(self, task):
-               return _("Not enough diskspace. Please free up some diskspace and try again. (%d MB required, %d MB available)") % (self.diskspace_required / 1024 / 1024, self.diskspace_available / 1024 / 1024)
+               return _("Not enough disk space. Please free up some disk space and try again. (%d MB required, %d MB available)") % (self.diskspace_required / 1024 / 1024, self.diskspace_available / 1024 / 1024)
 
 class ToolExistsPrecondition(Condition):
        def check(self, task):
index 71a75cd..335db2d 100644 (file)
@@ -27,11 +27,11 @@ def InitUsageConfig():
        choicelist = []
        for i in range(1, 12):
                choicelist.append(("%d" % i, ngettext("%d second", "%d seconds", i) % i))
-       config.usage.infobar_timeout = ConfigSelection(default = "5", choices = [("0", _("no timeout"))] + choicelist)
+       config.usage.infobar_timeout = ConfigSelection(default = "5", choices = [("0", _("No timeout"))] + choicelist)
        config.usage.show_infobar_on_zap = ConfigYesNo(default = True)
        config.usage.show_infobar_on_skip = ConfigYesNo(default = True)
        config.usage.show_infobar_on_event_change = ConfigYesNo(default = False)
-       config.usage.show_second_infobar = ConfigSelection(default = None, choices = [(None, _("None")), ("0", _("no timeout"))] + choicelist + [("EPG",_("EPG"))]) 
+       config.usage.show_second_infobar = ConfigSelection(default = None, choices = [(None, _("None")), ("0", _("No timeout"))] + choicelist + [("EPG",_("EPG"))]) 
        config.usage.show_spinner = ConfigYesNo(default = True)
        config.usage.enable_tt_caching = ConfigYesNo(default = True)
        choicelist = []
@@ -43,13 +43,13 @@ def InitUsageConfig():
        for i in (3600, 7200, 14400):
                h = i / 3600
                choicelist.append(("%d" % i, ngettext("%d hour", "%d hours", h) % h))
-       config.usage.hdd_standby = ConfigSelection(default = "300", choices = [("0", _("no standby"))] + choicelist)
+       config.usage.hdd_standby = ConfigSelection(default = "300", choices = [("0", _("No standby"))] + choicelist)
        config.usage.output_12V = ConfigSelection(default = "do not change", choices = [
-               ("do not change", _("do not change")), ("off", _("off")), ("on", _("on")) ])
+               ("do not change", _("Do not change")), ("off", _("Off")), ("on", _("On")) ])
 
        config.usage.pip_zero_button = ConfigSelection(default = "standard", choices = [
-               ("standard", _("standard")), ("swap", _("swap PiP and main picture")),
-               ("swapstop", _("move PiP to main picture")), ("stop", _("stop PiP")) ])
+               ("standard", _("Standard")), ("swap", _("Swap PiP and main picture")),
+               ("swapstop", _("Move PiP to main picture")), ("stop", _("Stop PiP")) ])
 
        config.usage.default_path = ConfigText(default = resolveFilename(SCOPE_HDD))
        config.usage.timer_path = ConfigText(default = "<default>")
@@ -75,13 +75,13 @@ def InitUsageConfig():
                ("expert", _("Expert")) ])
 
        config.usage.on_long_powerpress = ConfigSelection(default = "show_menu", choices = [
-               ("show_menu", _("show shutdown menu")),
-               ("shutdown", _("immediate shutdown")),
+               ("show_menu", _("Show shutdown menu")),
+               ("shutdown", _("Immediate shutdown")),
                ("standby", _("Standby")) ] )
        
        config.usage.on_short_powerpress = ConfigSelection(default = "standby", choices = [
-               ("show_menu", _("show shutdown menu")),
-               ("shutdown", _("immediate shutdown")),
+               ("show_menu", _("Show shutdown menu")),
+               ("shutdown", _("Immediate shutdown")),
                ("standby", _("Standby")) ] )
 
 
@@ -100,10 +100,10 @@ def InitUsageConfig():
        config.misc.disable_background_scan = ConfigYesNo(default = False)
 
        config.usage.show_event_progress_in_servicelist = ConfigSelection(default = 'barright', choices = [
-               ('barleft', _("Progress Bar Left")),
-               ('barright', _("Progress Bar Right")),
-               ('percleft', _("Percentage Left")),
-               ('percright', _("Percentage Right")),
+               ('barleft', _("Progress bar left")),
+               ('barright', _("Progress bar right")),
+               ('percleft', _("Percentage left")),
+               ('percright', _("Percentage right")),
                ('no', _("No")) ])
        config.usage.show_channel_numbers_in_servicelist = ConfigYesNo(default = True)
        config.usage.show_event_progress_in_servicelist.addNotifier(refreshServiceList)
@@ -117,7 +117,7 @@ def InitUsageConfig():
        config.usage.show_icons_in_movielist = ConfigSelection(default = 'i', choices = [
                ('o', _("Off")),
                ('p', _("Progress")),
-               ('s', _("Progress Small")),
+               ('s', _("Small progress")),
                ('i', _("Icons")),
        ])
        config.usage.movielist_unseen = ConfigYesNo(default = False)
@@ -208,13 +208,13 @@ def InitUsageConfig():
 
        config.seek.on_pause = ConfigSelection(default = "play", choices = [
                ("play", _("Play")),
-               ("step", _("Singlestep (GOP)")),
+               ("step", _("Single step (GOP)")),
                ("last", _("Last speed")) ])
 
 
        config.crash = ConfigSubsection()
        config.crash.details = ConfigYesNo(default = False)
-       config.usage.timerlist_finished_timer_position = ConfigSelection(default = "end", choices = [("beginning", _("at beginning")), ("end", _("at end"))])
+       config.usage.timerlist_finished_timer_position = ConfigSelection(default = "end", choices = [("beginning", _("At beginning")), ("end", _("At end"))])
 
        def updateEnterForward(configElement):
                if not configElement.value:
@@ -273,13 +273,13 @@ def InitUsageConfig():
        choicelist = []
        for i in range(45000, 945000, 45000):
                choicelist.append(("%d" % i, "%2.1f sec" % (i / 90000.)))
-       config.subtitles.subtitle_noPTSrecordingdelay = ConfigSelection(default = "315000", choices = [("0", _("No Delay"))] + choicelist)
+       config.subtitles.subtitle_noPTSrecordingdelay = ConfigSelection(default = "315000", choices = [("0", _("No delay"))] + choicelist)
 
        config.subtitles.dvb_subtitles_yellow = ConfigYesNo(default = False)
-       config.subtitles.dvb_subtitles_original_position = ConfigSelection(default = "0", choices = [("0", _("original")), ("1", _("fixed")), ("2", _("relative"))])
+       config.subtitles.dvb_subtitles_original_position = ConfigSelection(default = "0", choices = [("0", _("Original")), ("1", _("Fixed")), ("2", _("Relative"))])
        config.subtitles.dvb_subtitles_centered = ConfigYesNo(default = False)
        config.subtitles.dvb_subtitles_backtrans = ConfigSelection(default = "0", choices = [
-               ("0", _("no transparency")),
+               ("0", _("No transparency")),
                ("25", "10%"),
                ("50", "20%"),
                ("75", "30%"),
@@ -289,7 +289,7 @@ def InitUsageConfig():
                ("175", "70%"),
                ("200", "80%"),
                ("225", "90%"),
-               ("255", _("full transparency"))])
+               ("255", _("Full transparency"))])
        config.subtitles.pango_subtitles_yellow = ConfigYesNo(default = False)
 
        config.autolanguage = ConfigSubsection()
@@ -314,7 +314,7 @@ def InitUsageConfig():
                ("ita", _("Italian")),
                ("lat", _("Latvian")),
                ("lit", _("Lithuanian")),
-               ("ltz", _("Letzeburgesch")),
+               ("ltz", _("Luxembourgish")),
                ("nor", _("Norwegian")),
                ("pol", _("Polish")),
                ("por", _("Portuguese")),
index 2940b35..83362a0 100644 (file)
@@ -1144,7 +1144,7 @@ class ConfigDirectory(ConfigText):
 
        def getMulti(self, selected):
                if self.text == "":
-                       return ("mtext"[1-selected:], _("List of Storage Devices"), range(0))
+                       return ("mtext"[1-selected:], _("List of storage devices"), range(0))
                else:
                        return ConfigText.getMulti(self, selected)
 
index d79510c..422de55 100644 (file)
@@ -44,7 +44,7 @@ class Test(Screen):
                #self.onShown.append(self.openTest)
 
        def openTest(self):
-               self.session.openWithCallback(self.mycallback, MessageBox, _("Test-Messagebox?"))
+               self.session.openWithCallback(self.mycallback, MessageBox, "Test messagebox")
 
 #              self.session.open(InputBox)
        
@@ -73,9 +73,7 @@ class Test(Screen):
 
 def main(session, **kwargs):
        session.open(Test)
-       #session.openWithCallback(test, MessageBox, _("Test-Messagebox?"), timeout = 10)
-       #session.openWithCallback(test, ChoiceBox, title="Delete everything on this receiver?", list=[(_("yes"), "yes"), (_("no"), "no"), (_("perhaps"), "perhaps"), (_("ask me tomorrow"), "ask me tomorrow"), (_("leave me alone with this!"), "yes")])
-       
+
 def test(returnValue):
        print "You entered", returnValue
 
index 482001d..dc1ce3d 100644 (file)
@@ -202,7 +202,7 @@ class CutListEditor(Screen, InfoBarBase, InfoBarSeek, InfoBarCueSheetSupport, He
        def showTutorial(self):
                if not self.tutorial_seen:
                        self.tutorial_seen = True
-                       self.session.open(MessageBox,_("Welcome to the Cutlist editor.\n\nSeek to the start of the stuff you want to cut away. Press OK, select 'start cut'.\n\nThen seek to the end, press OK, select 'end cut'. That's it."), MessageBox.TYPE_INFO)
+                       self.session.open(MessageBox,_("Welcome to the cutlist editor.\n\nSeek to the start of the stuff you want to cut away. Press OK, select 'start cut'.\n\nThen seek to the end, press OK, select 'end cut'. That's it."), MessageBox.TYPE_INFO)
 
        def checkSkipShowHideLock(self):
                pass
index 70fd500..276ba90 100644 (file)
@@ -302,7 +302,7 @@ class BurnTaskPostcondition(Condition):
        def getErrorMessage(self, task):
                return {
                        task.ERROR_NOTWRITEABLE: _("Medium is not a writeable DVD!"),
-                       task.ERROR_LOAD: _("Could not load Medium! No disc inserted?"),
+                       task.ERROR_LOAD: _("Could not load medium! No disc inserted?"),
                        task.ERROR_SIZE: _("Content does not fit on DVD!"),
                        task.ERROR_WRITE_FAILED: _("Write failed!"),
                        task.ERROR_DVDROM: _("No (supported) DVDROM found!"),
index 99259f7..1f24101 100644 (file)
@@ -62,7 +62,7 @@ class FileBrowser(Screen, HelpableScreen):
                self.onLayoutFinish.append(self.layoutFinished)
 
        def layoutFinished(self):
-               self.setTitle(_("DVD File Browser"))
+               self.setTitle(_("DVD file browser"))
 
        def getDir(self, currentVal=None, defaultDir=None):
                if currentVal:
index aff1ab9..4e6ec29 100644 (file)
@@ -85,7 +85,7 @@ class TitleList(Screen, HelpableScreen):
                self["error_label"] = StaticText()
                self["space_label_single"] = StaticText()
                self["space_label_dual"] = StaticText()
-               self["hint"] = StaticText(_("Advanced Options"))
+               self["hint"] = StaticText(_("Advanced options"))
                self["medium_label"] = MultiColorLabel()
                self["space_bar_single"] = Progress()
                self["space_bar_dual"] = Progress()
@@ -99,7 +99,7 @@ class TitleList(Screen, HelpableScreen):
                self.onLayoutFinish.append(self.layoutFinished)
 
        def layoutFinished(self):
-               self.setTitle(_("DVD Titlelist"))
+               self.setTitle(_("DVD titlelist"))
 
        def checkBackgroundJobs(self):
                for job in job_manager.getPendingJobs():
@@ -295,7 +295,7 @@ class TitleList(Screen, HelpableScreen):
                if len(list):
                        self["key_red"].text = _("Remove title")
                        self["key_yellow"].text = _("Title properties")
-                       self["title_label"].text = _("Table of content for collection") + " \"" + self.project.settings.name.getValue() + "\":"
+                       self["title_label"].text = _("Table of contents for collection") + " \"" + self.project.settings.name.getValue() + "\":"
                else:
                        self["key_red"].text = ""
                        self["key_yellow"].text = ""
index 956f054..fce0939 100644 (file)
@@ -40,7 +40,7 @@ class TitleProperties(Screen,ConfigListScreen):
 
                self["key_red"] = StaticText(_("Cancel"))
                self["key_green"] = StaticText(_("OK"))
-               self["key_yellow"] = StaticText(_("Edit Title"))
+               self["key_yellow"] = StaticText(_("Edit title"))
                self["key_blue"] = StaticText()
                self["serviceinfo"] = StaticText()
 
@@ -82,19 +82,19 @@ class TitleProperties(Screen,ConfigListScreen):
                        if config.usage.setup_level.index >= 2: # expert+
                                for audiotrack in self.properties.audiotracks:
                                        DVB_aud = audiotrack.DVB_lang.getValue() or audiotrack.pid.getValue()
-                                       self.list.append(getConfigListEntry(_("burn audio track (%s)") % DVB_aud, audiotrack.active))
+                                       self.list.append(getConfigListEntry(_("Burn audio track (%s)") % DVB_aud, audiotrack.active))
                                        if audiotrack.active.getValue():
-                                               self.list.append(getConfigListEntry(_("audio track (%s) format") % DVB_aud, audiotrack.format))
-                                               self.list.append(getConfigListEntry(_("audio track (%s) language") % DVB_aud, audiotrack.language))
+                                               self.list.append(getConfigListEntry(_("Audio track (%s) format") % DVB_aud, audiotrack.format))
+                                               self.list.append(getConfigListEntry(_("Audio track (%s) language") % DVB_aud, audiotrack.language))
                                                
-                               self.list.append(getConfigListEntry("DVD " + _("Aspect Ratio"), self.properties.aspect))
+                               self.list.append(getConfigListEntry("DVD " + _("Aspect ratio"), self.properties.aspect))
                                if self.properties.aspect.getValue() == "16:9":
                                        self.list.append(getConfigListEntry("DVD " + "widescreen", self.properties.widescreen))
                                else:
                                        self.list.append(getConfigListEntry("DVD " + "widescreen", self.properties.crop))
                        if len(title.chaptermarks) == 0:
                                self.list.append(getConfigListEntry(_("Auto chapter split every ? minutes (0=never)"), self.properties.autochapter))
-                       infotext = "DVB " + _("Title") + ': ' + title.DVBname + "\n" + _("Description") + ': ' + title.DVBdescr + "\n" + _("Channel") + ': ' + title.DVBchannel + '\n' + _("Begin time") + title.formatDVDmenuText(": $D.$M.$Y, $T\n", self.title_idx+1)
+                       infotext = "DVB " + _("Title") + ': ' + title.DVBname + "\n" + _("Description") + ': ' + title.DVBdescr + "\n" + _("Channel") + ': ' + title.DVBchannel + '\n' + _("Start time") + title.formatDVDmenuText(": $D.$M.$Y, $T\n", self.title_idx+1)
                        chaptermarks = title.getChapterMarks(template="$h:$m:$s")
                        chapters_count = len(chaptermarks)
                        if chapters_count >= 1:
index 95da431..96b3d81 100644 (file)
@@ -88,7 +88,7 @@ def menu(menuid, **kwargs):
                        if onPartitionChange not in harddiskmanager.on_partition_list_change:
                                harddiskmanager.on_partition_list_change.append(onPartitionChange)
                if detected_DVD:
-                       return [(_("DVD Player"), play, "dvd_player", 46)]
+                       return [(_("DVD player"), play, "dvd_player", 46)]
        return []
 
 def Plugins(**kwargs):
index 651246a..a465899 100644 (file)
@@ -40,9 +40,9 @@ config.misc.graph_mepg.items_per_page_listscreen = ConfigSelectionNumber(min = 3
 config.misc.graph_mepg.default_mode = ConfigYesNo(default = False)
 config.misc.graph_mepg.overjump = ConfigYesNo(default = True)
 config.misc.graph_mepg.servicetitle_mode = ConfigSelection(default = "picon+servicename", choices = [
-       ("servicename", _("Service Name")),
+       ("servicename", _("Service name")),
        ("picon", _("Picon")),
-       ("picon+servicename", _("Picon and Service Name")) ])
+       ("picon+servicename", _("Picon and service name")) ])
 config.misc.graph_mepg.roundTo = ConfigSelection(default = "900", choices = [("900", _("%d minutes") % 15), ("1800", _("%d minutes") % 30), ("3600", _("%d minutes") % 60)])
 config.misc.graph_mepg.OKButton = ConfigSelection(default = "info", choices = [("info", _("Show detailed event info")), ("zap", _("Zap to selected channel"))])
 
@@ -746,15 +746,15 @@ class GraphMultiEPG(Screen, HelpableScreen):
                self["okactions"] = HelpableActionMap(self, "OkCancelActions",
                        {
                                "cancel": (self.closeScreen,   _("Exit EPG")),
-                               "ok":     (self.eventSelected, _("Configurable, Zap or detailed event info"))
+                               "ok":     (self.eventSelected, _("Zap to selected channel, or show detailed event info (depends on configuration)"))
                        }, -1)
                self["okactions"].csel = self
                self["epgactions"] = HelpableActionMap(self, "EPGSelectActions",
                        {
-                               "timerAdd":    (self.timerAdd,       _("Add/Remove timer for current event")),
+                               "timerAdd":    (self.timerAdd,       _("Add/remove timer for current event")),
                                "info":        (self.infoKeyPressed, _("Show detailed event info")),
                                "red":         (self.zapTo,          _("Zap to selected channel")),
-                               "yellow":      (self.swapMode,       _("Swap from normal to list mode")),       
+                               "yellow":      (self.swapMode,       _("Switch between normal mode and list mode")),    
                                "blue":        (self.enterDateTime,  _("Goto specific data/time")),
                                "menu":        (self.showSetup,      _("Setup menu")),
                                "nextBouquet": (self.nextBouquet,    _("Show bouquet selection menu")),
@@ -767,17 +767,17 @@ class GraphMultiEPG(Screen, HelpableScreen):
 
                self["inputactions"] = HelpableActionMap(self, "InputActions",
                        {
-                               "left":  (self.leftPressed,  _("Goto previous event")),
-                               "right": (self.rightPressed, _("Goto next event")),
+                               "left":  (self.leftPressed,  _("Go to previous event")),
+                               "right": (self.rightPressed, _("Go to next event")),
                                "1":     (self.key1,         _("Set time window to 1 hour")),
                                "2":     (self.key2,         _("Set time window to 2 hours")),
                                "3":     (self.key3,         _("Set time window to 3 hours")),
                                "4":     (self.key4,         _("Set time window to 4 hours")),
                                "5":     (self.key5,         _("Set time window to 5 hours")),
-                               "7":     (self.prevPage,     _("Goto previous page of service")),
-                               "9":     (self.nextPage,     _("Goto next page of service")),
-                               "8":     (self.toTop,        _("Goto first service")),
-                               "0":     (self.toEnd,        _("Goto last service"))
+                               "7":     (self.prevPage,     _("Go to previous page of service")),
+                               "9":     (self.nextPage,     _("Go to next page of service")),
+                               "8":     (self.toTop,        _("Go to first service")),
+                               "0":     (self.toEnd,        _("Go to last service"))
                        }, -1)
                self["inputactions"].csel = self
 
index de6db8d..5a8ce84 100644 (file)
@@ -46,15 +46,15 @@ class GraphMultiEpgSetup(Screen, ConfigListScreen):
        def createSetup(self):
                print "Creating Graph Epg Setup"
                self.list = [ ]
-               self.list.append(getConfigListEntry(_("Event Fontsize (relative to skin size)"), config.misc.graph_mepg.ev_fontsize))
-               self.list.append(getConfigListEntry(_("Time Scale"), config.misc.graph_mepg.prev_time_period))
-               self.list.append(getConfigListEntry(_("Items per Page "), config.misc.graph_mepg.items_per_page))
-               self.list.append(getConfigListEntry(_("Items per Page for Listscreen"), config.misc.graph_mepg.items_per_page_listscreen))
-               self.list.append(getConfigListEntry(_("Listscreen default at start user interface"), config.misc.graph_mepg.default_mode))
-               self.list.append(getConfigListEntry(_("Skip Empty Services"), config.misc.graph_mepg.overjump))
-               self.list.append(getConfigListEntry(_("Service Title mode"), config.misc.graph_mepg.servicetitle_mode))
+               self.list.append(getConfigListEntry(_("Event font size (relative to skin size)"), config.misc.graph_mepg.ev_fontsize))
+               self.list.append(getConfigListEntry(_("Time scale"), config.misc.graph_mepg.prev_time_period))
+               self.list.append(getConfigListEntry(_("Items per page "), config.misc.graph_mepg.items_per_page))
+               self.list.append(getConfigListEntry(_("Items per page for list screen"), config.misc.graph_mepg.items_per_page_listscreen))
+               self.list.append(getConfigListEntry(_("Start with list screen"), config.misc.graph_mepg.default_mode))
+               self.list.append(getConfigListEntry(_("Skip empty services"), config.misc.graph_mepg.overjump))
+               self.list.append(getConfigListEntry(_("Service title mode"), config.misc.graph_mepg.servicetitle_mode))
                self.list.append(getConfigListEntry(_("Round start time on"), config.misc.graph_mepg.roundTo))
-               self.list.append(getConfigListEntry(_("Function on OK button"), config.misc.graph_mepg.OKButton))
+               self.list.append(getConfigListEntry(_("Function of OK button"), config.misc.graph_mepg.OKButton))
 
                self["config"].list = self.list
                self["config"].l.setList(self.list)
index 7a0d3b3..dc532e2 100644 (file)
@@ -159,25 +159,25 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB
 
                self["OkCancelActions"] = HelpableActionMap(self, "OkCancelActions", 
                        {
-                               "ok": (self.ok, _("add file to playlist")),
-                               "cancel": (self.exit, _("exit mediaplayer")),
+                               "ok": (self.ok, _("Add file to playlist")),
+                               "cancel": (self.exit, _("Exit mediaplayer")),
                        }, -2)
 
                self["MediaPlayerActions"] = HelpableActionMap(self, "MediaPlayerActions", 
                        {
-                               "play": (self.xplayEntry, _("play entry")),
-                               "pause": (self.pauseEntry, _("pause")),
-                               "stop": (self.stopEntry, _("stop entry")),
-                               "previous": (self.previousMarkOrEntry, _("play from previous mark or playlist entry")),
-                               "next": (self.nextMarkOrEntry, _("play from next mark or playlist entry")),
-                               "menu": (self.showMenu, _("menu")),
-                               "skipListbegin": (self.skip_listbegin, _("jump to listbegin")),
-                               "skipListend": (self.skip_listend, _("jump to listend")),
-                               "prevBouquet": (self.switchToPlayList, _("switch to playlist")),
-                               "nextBouquet": (self.switchToFileList, _("switch to filelist")),
-                               "delete": (self.deletePlaylistEntry, _("delete playlist entry")),
-                               "shift_stop": (self.clear_playlist, _("clear playlist")),
-                               "shift_record": (self.playlist.PlayListShuffle, _("shuffle playlist")),
+                               "play": (self.xplayEntry, _("Play entry")),
+                               "pause": (self.pauseEntry, _("Pause")),
+                               "stop": (self.stopEntry, _("Stop entry")),
+                               "previous": (self.previousMarkOrEntry, _("Play from previous mark or playlist entry")),
+                               "next": (self.nextMarkOrEntry, _("Play from next mark or playlist entry")),
+                               "menu": (self.showMenu, _("Menu")),
+                               "skipListbegin": (self.skip_listbegin, _("Jump to beginning of list")),
+                               "skipListend": (self.skip_listend, _("Jump to end of list")),
+                               "prevBouquet": (self.switchToPlayList, _("Switch to playlist")),
+                               "nextBouquet": (self.switchToFileList, _("Switch to filelist")),
+                               "delete": (self.deletePlaylistEntry, _("Delete playlist entry")),
+                               "shift_stop": (self.clear_playlist, _("Clear playlist")),
+                               "shift_record": (self.playlist.PlayListShuffle, _("Shuffle playlist")),
                                "subtitles": (self.subtitleSelection, _("Subtitle selection")),
                        }, -2)
 
@@ -290,13 +290,13 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB
                currPlay = self.session.nav.getCurrentService()
                sTagAudioCodec = currPlay.info().getInfoString(iServiceInformation.sTagAudioCodec)
                print "[__evAudioDecodeError] audio-codec %s can't be decoded by hardware" % (sTagAudioCodec)
-               self.session.open(MessageBox, _("This receiver can't decode %s streams!") % sTagAudioCodec, type = MessageBox.TYPE_INFO,timeout = 20 )
+               self.session.open(MessageBox, _("This receiver cannot decode %s streams!") % sTagAudioCodec, type = MessageBox.TYPE_INFO,timeout = 20 )
 
        def __evVideoDecodeError(self):
                currPlay = self.session.nav.getCurrentService()
                sTagVideoCodec = currPlay.info().getInfoString(iServiceInformation.sTagVideoCodec)
                print "[__evVideoDecodeError] video-codec %s can't be decoded by hardware" % (sTagVideoCodec)
-               self.session.open(MessageBox, _("This receiver can't decode %s streams!") % sTagVideoCodec, type = MessageBox.TYPE_INFO,timeout = 20 )
+               self.session.open(MessageBox, _("This receiver cannot decode %s streams!") % sTagVideoCodec, type = MessageBox.TYPE_INFO,timeout = 20 )
 
        def __evPluginError(self):
                currPlay = self.session.nav.getCurrentService()
@@ -502,26 +502,26 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB
        def showMenu(self):
                menu = []
                if len(self.cdAudioTrackFiles):
-                       menu.insert(0,(_("Play Audio-CD..."), "audiocd"))
+                       menu.insert(0,(_("Play audio-CD..."), "audiocd"))
                if self.currList == "filelist":
                        if self.filelist.canDescent():
-                               menu.append((_("add directory to playlist"), "copydir"))
+                               menu.append((_("Add directory to playlist"), "copydir"))
                        else:
-                               menu.append((_("add files to playlist"), "copyfiles"))
-                       menu.append((_("switch to playlist"), "playlist"))
+                               menu.append((_("Add files to playlist"), "copyfiles"))
+                       menu.append((_("Switch to playlist"), "playlist"))
                        if config.usage.setup_level.index >= 1: # intermediate+
-                               menu.append((_("delete file"), "deletefile"))
+                               menu.append((_("Delete file"), "deletefile"))
                else:
-                       menu.append((_("switch to filelist"), "filelist"))
-                       menu.append((_("clear playlist"), "clear"))
+                       menu.append((_("Switch to filelist"), "filelist"))
+                       menu.append((_("Clear playlist"), "clear"))
                        menu.append((_("Delete entry"), "deleteentry"))
                        if config.usage.setup_level.index >= 1: # intermediate+
-                               menu.append((_("shuffle playlist"), "shuffle"))
-               menu.append((_("hide player"), "hide"));
-               menu.append((_("load playlist"), "loadplaylist"));
+                               menu.append((_("Shuffle playlist"), "shuffle"))
+               menu.append((_("Hide player"), "hide"));
+               menu.append((_("Load playlist"), "loadplaylist"));
                if config.usage.setup_level.index >= 1: # intermediate+
-                       menu.append((_("save playlist"), "saveplaylist"));
-                       menu.append((_("delete saved playlist"), "deleteplaylist"));
+                       menu.append((_("Save playlist"), "saveplaylist"));
+                       menu.append((_("Delete saved playlist"), "deleteplaylist"));
                        menu.append((_("Edit settings"), "settings"))
                self.session.openWithCallback(self.menuCallback, ChoiceBox, title="", list=menu)
 
@@ -618,7 +618,7 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB
                self.updateCurrentInfo()
 
        def save_playlist(self):
-               self.session.openWithCallback(self.save_playlist2,InputBox, title=_("Please enter filename (empty = use current date)"),windowTitle = _("Save Playlist"), text=self.playlistname)
+               self.session.openWithCallback(self.save_playlist2,InputBox, title=_("Please enter filename (empty = use current date)"),windowTitle = _("Save playlist"), text=self.playlistname)
 
        def save_playlist2(self, name):
                if name is not None:
@@ -1013,7 +1013,7 @@ class MoviePlayer(InfoBarShowHide, \
                        list.append((_("Yes"), "quit"))
                        list.append((_("No"), "continue"))
                        if config.usage.setup_level.index >= 2: # expert+
-                               list.append((_("No, but restart from begin"), "restart"))
+                               list.append((_("No, but restart from beginning"), "restart"))
                        self.session.openWithCallback(self.leavePlayerConfirmed, ChoiceBox, title=_("Stop playing this movie?"), list = list)
                else:
                        self.close(0)
@@ -1049,7 +1049,7 @@ class MediaPlayerLCDScreen(Screen):
 
        def __init__(self, session, parent):
                Screen.__init__(self, session)
-               self["text1"] = Label("Mediaplayer")
+               self["text1"] = Label("Media player")
                self["text3"] = Label("")
                self["text4"] = Label("")
 
@@ -1126,7 +1126,7 @@ def filescan(**kwargs):
                                        ScanPath(path = "", with_subdirs = False),
                                ],
                        name = "Movie",
-                       description = _("View Movies..."),
+                       description = _("Watch movies..."),
                        openfnc = movielist_open,
                ),
                Scanner(mimetypes = ["video/x-vcd"],
@@ -1136,7 +1136,7 @@ def filescan(**kwargs):
                                        ScanPath(path = "MPEGAV", with_subdirs = False),
                                ],
                        name = "Video CD",
-                       description = _("View Video CD..."),
+                       description = _("View video CD..."),
                        openfnc = filescan_open,
                ),
                Scanner(mimetypes = ["audio/mpeg", "audio/x-wav", "application/ogg", "audio/x-flac"],
@@ -1145,7 +1145,7 @@ def filescan(**kwargs):
                                        ScanPath(path = "", with_subdirs = False),
                                ],
                        name = "Music",
-                       description = _("Play Music..."),
+                       description = _("Play music..."),
                        openfnc = filescan_open,
                ),
                Scanner(mimetypes = ["audio/x-cda"],
@@ -1154,7 +1154,7 @@ def filescan(**kwargs):
                                        ScanPath(path = "", with_subdirs = False),
                                ],
                        name = "Audio-CD",
-                       description = _("Play Audio-CD..."),
+                       description = _("Play audio-CD..."),
                        openfnc = audioCD_open,
                ),
                ]
@@ -1162,7 +1162,7 @@ def filescan(**kwargs):
 from Plugins.Plugin import PluginDescriptor
 def Plugins(**kwargs):
        return [
-               PluginDescriptor(name = "MediaPlayer", description = "Play back media files", where = PluginDescriptor.WHERE_PLUGINMENU, needsRestart = False, fnc = main),
-               PluginDescriptor(name = "MediaPlayer", where = PluginDescriptor.WHERE_FILESCAN, needsRestart = False, fnc = filescan),
-               PluginDescriptor(name = "MediaPlayer", description = "Play back media files", where = PluginDescriptor.WHERE_MENU, needsRestart = False, fnc = menu)
+               PluginDescriptor(name = _("Media player"), description = _("Play back media files"), where = PluginDescriptor.WHERE_PLUGINMENU, needsRestart = False, fnc = main),
+               PluginDescriptor(name = _("Media player"), where = PluginDescriptor.WHERE_FILESCAN, needsRestart = False, fnc = filescan),
+               PluginDescriptor(name = _("Media player"), description = _("Play back media files"), where = PluginDescriptor.WHERE_MENU, needsRestart = False, fnc = menu)
        ]
index 71b44b4..737ef7e 100644 (file)
@@ -39,7 +39,7 @@ def scan(session):
        from Screens.ChoiceBox import ChoiceBox
        parts = [ (r.tabbedDescription(), r.mountpoint, session) for r in harddiskmanager.getMountedPartitions(onlyhotplug = False) if os.access(r.mountpoint, os.F_OK|os.R_OK) ]
        parts.append( (_("Memory") + "\t/tmp", "/tmp", session) )
-       session.openWithCallback(mountpoint_choosen, ChoiceBox, title = _("Please Select Medium to be Scanned"), list = parts)
+       session.openWithCallback(mountpoint_choosen, ChoiceBox, title = _("Please select medium to be scanned"), list = parts)
 
 def main(session, **kwargs):
        scan(session)
@@ -84,7 +84,7 @@ def autostart(reason, **kwargs):
 
 def Plugins(**kwargs):
        return [
-               PluginDescriptor(name="MediaScanner", description=_("Scan Files..."), where = PluginDescriptor.WHERE_PLUGINMENU, needsRestart = True, fnc=main),
+               PluginDescriptor(name=_("Media scanner"), description=_("Scan files..."), where = PluginDescriptor.WHERE_PLUGINMENU, needsRestart = True, fnc=main),
 #              PluginDescriptor(where = PluginDescriptor.WHERE_MENU, fnc=menuHook),
                PluginDescriptor(where = PluginDescriptor.WHERE_SESSIONSTART, needsRestart = True, fnc = sessionstart),
                PluginDescriptor(where = PluginDescriptor.WHERE_AUTOSTART, needsRestart = True, fnc = autostart)
index 36f2f57..ede5a11 100644 (file)
@@ -37,11 +37,11 @@ def filescan(**kwargs):
                                        ScanPath(path = "", with_subdirs = False),
                                ],
                        name = "Pictures", 
-                       description = _("View Photos..."),
+                       description = _("View photos..."),
                        openfnc = filescan_open,
                )
 
 def Plugins(**kwargs):
        return \
-               [PluginDescriptor(name=_("PicturePlayer"), description=_("fileformats (BMP, PNG, JPG, GIF)"), icon="pictureplayer.png", where = PluginDescriptor.WHERE_PLUGINMENU, needsRestart = False, fnc=main),
-                PluginDescriptor(name=_("PicturePlayer"), where = PluginDescriptor.WHERE_FILESCAN, needsRestart = False, fnc = filescan)]
+               [PluginDescriptor(name=_("Picture player"), description=_("fileformats (BMP, PNG, JPG, GIF)"), icon="pictureplayer.png", where = PluginDescriptor.WHERE_PLUGINMENU, needsRestart = False, fnc=main),
+                PluginDescriptor(name=_("Picture player"), where = PluginDescriptor.WHERE_FILESCAN, needsRestart = False, fnc = filescan)]
index 66e4ca4..3de2f20 100644 (file)
@@ -29,7 +29,7 @@ config.pic.textcolor = ConfigSelection(default="#0038FF48", choices = [("#000000
 
 class picshow(Screen):
        skin = """
-               <screen name="picshow" position="center,center" size="560,440" title="PicturePlayer" >
+               <screen name="picshow" position="center,center" size="560,440" title="Picture player" >
                        <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" />
                        <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" />
@@ -121,7 +121,7 @@ class picshow(Screen):
                        self.session.openWithCallback(self.callbackView, Pic_Full_View, self.filelist.getFileList(), self.filelist.getSelectionIndex(), self.filelist.getCurrentDirectory())
 
        def setConf(self, retval=None):
-               self.setTitle(_("PicturePlayer"))
+               self.setTitle(_("Picture player"))
                sc = getScale()
                #0=Width 1=Height 2=Aspect 3=use_cache 4=resize_type 5=Background(#AARRGGBB)
                self.picload.setPara((self["thn"].instance.size().width(), self["thn"].instance.size().height(), sc[0], sc[1], config.pic.cache.value, int(config.pic.resize.value), "#00000000"))
@@ -170,14 +170,14 @@ class Pic_Setup(Screen, ConfigListScreen):
 
        def createSetup(self):
                setup_list = [
-                       getConfigListEntry(_("Slideshow Interval (sec.)"), config.pic.slidetime),
-                       getConfigListEntry(_("Scaling Mode"), config.pic.resize),
-                       getConfigListEntry(_("Cache Thumbnails"), config.pic.cache),
-                       getConfigListEntry(_("show Infoline"), config.pic.infoline),
+                       getConfigListEntry(_("Slide show interval (sec.)"), config.pic.slidetime),
+                       getConfigListEntry(_("Scaling mode"), config.pic.resize),
+                       getConfigListEntry(_("Cache thumbnails"), config.pic.cache),
+                       getConfigListEntry(_("Show info line"), config.pic.infoline),
                        getConfigListEntry(_("Frame size in full view"), config.pic.framesize),
-                       getConfigListEntry(_("slide picture in loop"), config.pic.loop),
-                       getConfigListEntry(_("backgroundcolor"), config.pic.bgcolor),
-                       getConfigListEntry(_("textcolor"), config.pic.textcolor),
+                       getConfigListEntry(_("Slide picture in loop"), config.pic.loop),
+                       getConfigListEntry(_("Background color"), config.pic.bgcolor),
+                       getConfigListEntry(_("Text color"), config.pic.textcolor),
                ]
                self["config"].list = setup_list
                self["config"].l.setList(setup_list)
index c676ca8..0cb7142 100644 (file)
@@ -147,7 +147,7 @@ class CableScanScreen(ConfigListScreen, Screen):
                self.list.append(getConfigListEntry(_("Tuner"), self.scan_nims))
 
                self.list.append(getConfigListEntry(_('Frequency'), config.plugins.CableScan.frequency))
-               self.list.append(getConfigListEntry(_('Symbol Rate'), config.plugins.CableScan.symbolrate))
+               self.list.append(getConfigListEntry(_('Symbol rate'), config.plugins.CableScan.symbolrate))
                self.list.append(getConfigListEntry(_('Modulation'), config.plugins.CableScan.modulation))
                self.list.append(getConfigListEntry(_('Network ID'), config.plugins.CableScan.networkid))
                self.list.append(getConfigListEntry(_("Use official channel numbering"), config.plugins.CableScan.keepnumbering))
index b345428..dac279c 100644 (file)
@@ -118,12 +118,12 @@ class CIconfigMenu(Screen):
                self.filename = eEnv.resolve("${sysconfdir}/enigma2/ci") + str(self.ci_slot) + ".xml"
 
                self["key_red"] = StaticText(_("Delete"))
-               self["key_green"] = StaticText(_("add Service"))
-               self["key_yellow"] = StaticText(_("add Provider"))
-               self["key_blue"] = StaticText(_("select CAId"))
-               self["CAidList_desc"] = StaticText(_("assigned CAIds:"))
+               self["key_green"] = StaticText(_("Add service"))
+               self["key_yellow"] = StaticText(_("Add provider"))
+               self["key_blue"] = StaticText(_("Select CAId"))
+               self["CAidList_desc"] = StaticText(_("Assigned CAIds:"))
                self["CAidList"] = StaticText()
-               self["ServiceList_desc"] = StaticText(_("assigned Services/Provider:"))
+               self["ServiceList_desc"] = StaticText(_("Assigned services/provider:"))
                self["ServiceList_info"] = StaticText()
 
                self["actions"] = ActionMap(["ColorActions","SetupActions"],
@@ -186,7 +186,7 @@ class CIconfigMenu(Screen):
                if len(self.servicelist):
                        self["ServiceList_info"].setText("")
                else:
-                       self["ServiceList_info"].setText(_("no Services/Providers selected"))
+                       self["ServiceList_info"].setText(_("No services/providers selected"))
 
        def delete(self):
                cur = self["ServiceList"].getCurrent()
@@ -418,7 +418,7 @@ class myProviderSelection(ChannelSelectionBase):
                self["key_green"] = StaticText()
                self["key_yellow"] = StaticText()
                self["key_blue"] = StaticText()
-               self["introduction"] = StaticText(_("Press OK to select a Provider."))
+               self["introduction"] = StaticText(_("Press OK to select a provider."))
 
        def doNothing(self):
                pass
@@ -526,7 +526,7 @@ class myChannelSelection(ChannelSelectionBase):
                self["key_green"] = StaticText(_("All"))
                self["key_yellow"] = StaticText()
                self["key_blue"] = StaticText(_("Favourites"))
-               self["introduction"] = StaticText(_("Press OK to select a Provider."))
+               self["introduction"] = StaticText(_("Press OK to select a provider."))
 
        def __onExecCallback(self):
                self.setModeTv()
@@ -631,15 +631,15 @@ def main(session, **kwargs):
 
 def menu(menuid, **kwargs):
        if menuid == "setup" and eDVBCIInterfaces.getInstance().getNumOfSlots():
-               return [(_("Common Interface Assignment"), main, "ci_assign", 11)]
+               return [(_("Common Interface assignment"), main, "ci_assign", 11)]
        return [ ]
 
 def Plugins(**kwargs):
        if config.usage.setup_level.index > 1:
                return [PluginDescriptor( where = PluginDescriptor.WHERE_SESSIONSTART, needsRestart = False, fnc = sessionstart ),
                                PluginDescriptor( where = PluginDescriptor.WHERE_AUTOSTART, needsRestart = False, fnc = autostart ),
-                               PluginDescriptor( name = "CommonInterfaceAssignment", description = _("a gui to assign services/providers/caids to common interface modules"), where = PluginDescriptor.WHERE_MENU, needsRestart = False, fnc = menu )]
+                               PluginDescriptor( name = _("Common Interface assignment"), description = _("a gui to assign services/providers/caids to common interface modules"), where = PluginDescriptor.WHERE_MENU, needsRestart = False, fnc = menu )]
        else:
                return [PluginDescriptor( where = PluginDescriptor.WHERE_SESSIONSTART, needsRestart = False, fnc = sessionstart ),
                                PluginDescriptor( where = PluginDescriptor.WHERE_AUTOSTART, needsRestart = False, fnc = autostart ),
-                               PluginDescriptor( name = "CommonInterfaceAssignment", description = _("a gui to assign services/providers to common interface modules"), where = PluginDescriptor.WHERE_MENU, needsRestart = False, fnc = menu )]
+                               PluginDescriptor( name = _("Common Interface assignment"), description = _("a gui to assign services/providers to common interface modules"), where = PluginDescriptor.WHERE_MENU, needsRestart = False, fnc = menu )]
index ce0b1c6..cf32b22 100644 (file)
@@ -565,7 +565,7 @@ class DiseqcTesterTestTypeSelection(Screen, ConfigListScreen):
                Screen.__init__(self, session)
                # for the skin: first try MediaPlayerSettings, then Setup, this allows individual skinning
                self.skinName = ["DiseqcTesterTestTypeSelection", "Setup" ]
-               self.setup_title = _("DiSEqC-Tester settings")
+               self.setup_title = _("DiSEqC-tester settings")
                self.onChangedEntry = [ ]
                self.feid = feid
                
@@ -591,7 +591,7 @@ class DiseqcTesterTestTypeSelection(Screen, ConfigListScreen):
 
        def createSetup(self):
                self.testtype = ConfigSelection(choices={"quick": _("Quick"), "random": _("Random"), "complete": _("Complete")}, default = "quick")
-               self.testtypeEntry = getConfigListEntry(_("Test Type"), self.testtype)
+               self.testtypeEntry = getConfigListEntry(_("Test type"), self.testtype)
                self.list.append(self.testtypeEntry)
                
                self.loopsfailed = ConfigSelection(choices={"-1": "Every known", "1": "1", "2": "2", "3": "3", "4": "4", "5": "5", "6": "6", "7": "7", "8": "8"}, default = "3")
index 9a25a76..945f83f 100644 (file)
@@ -520,7 +520,7 @@ class NFIDownload(Screen):
                                else:
                                        version = result.group("version")
                                description = "\nOpendreambox %s\n%s image\n%s\n" % (result.group("OE_vers"), result.group("branch"), version)
-                               imagelist.append((url, name, _("Download %s from Server" ) % description, None))
+                               imagelist.append((url, name, _("Download %s from server" ) % description, None))
                self["menu"].setList(imagelist)
        
        def getUSBPartitions(self):
@@ -558,7 +558,7 @@ class NFIDownload(Screen):
                else:
                        dev = device_description
                message = _("Do you want to download the image to %s ?") % (dev)
-               choices = [(_("Yes"), self.ackedDestination), (_("List of Storage Devices"),self.openDeviceBrowser), (_("Cancel"),self.keyRed)]
+               choices = [(_("Yes"), self.ackedDestination), (_("List of storage devices"),self.openDeviceBrowser), (_("Cancel"),self.keyRed)]
                self.session.openWithCallback(self.ackDestination_query, ChoiceBox, title=message, list=choices)
 
        def ackDestination_query(self, choice):
@@ -643,7 +643,7 @@ class NFIDownload(Screen):
                self.feedDownloader16.getList(self.gotFeed, self.feed_failed)
                
        def feed_failed(self, message=""):
-               self["status"].text = _("Could not connect to receiver .NFI Image Feed Server:") + "\n" + str(message) + "\n" + _("Please check your network settings!")
+               self["status"].text = _("Could not connect to receiver .NFI image feed server:") + "\n" + str(message) + "\n" + _("Please check your network settings!")
 
        def gotFeed(self, feedlist, OE_vers):
                print "[gotFeed]", OE_vers
@@ -714,21 +714,21 @@ If you already have a prepared bootable USB stick, please insert it now. Otherwi
                                description = name
                message = _("You have chosen to create a new .NFI flasher bootable USB stick. This will repartition the USB stick and therefore all data on it will be erased.") + "\n"
                message += _("The following device was found:\n\n%s\n\nDo you want to write the USB flasher to this stick?") % description
-               choices = [(_("Yes"), self.ackedDestination), (_("List of Storage Devices"),self.askStartWizard), (_("Cancel"),self.close)]
+               choices = [(_("Yes"), self.ackedDestination), (_("List of storage devices"),self.askStartWizard), (_("Cancel"),self.close)]
                self.session.openWithCallback(self.ackDestination_query, ChoiceBox, title=message, list=choices)
                        
        def setMenu(self):
                self.menulist = []
                try:
                        latest_release = "Release %s (Opendreambox 1.5)" % self.feedlists[RELEASE][0][0][-9:-4]
-                       self.menulist.append((RELEASE, _("Get latest release image"), _("Download %s from Server" ) % latest_release, None))
+                       self.menulist.append((RELEASE, _("Get latest release image"), _("Download %s from server" ) % latest_release, None))
                except IndexError:
                        pass
 
                try:
                        dat = self.feedlists[EXPERIMENTAL][0][0][-12:-4]
                        latest_experimental = "Experimental %s-%s-%s (Opendreambox 1.6)" % (dat[:4], dat[4:6], dat[6:])
-                       self.menulist.append((EXPERIMENTAL, _("Get latest experimental image"), _("Download %s from Server") % latest_experimental, None))
+                       self.menulist.append((EXPERIMENTAL, _("Get latest experimental image"), _("Download %s from server") % latest_experimental, None))
                except IndexError:
                        pass
 
@@ -810,5 +810,5 @@ def filescan(**kwargs):
                                        ScanPath(path = "", with_subdirs = False),
                                ], 
                        name = "NFI", 
-                       description = (_("Download .NFI-Files for USB-Flasher")+"..."),
+                       description = (_("Download .NFI-Files for USB-flasher")+"..."),
                        openfnc = filescan_open, )
index b654476..2171bb5 100644 (file)
@@ -16,11 +16,11 @@ def Plugins(**kwargs):
                return [PluginDescriptor()]
        #return [PluginDescriptor(where = PluginDescriptor.WHERE_WIZARD, fnc = (9,NFIFlash))]
                # it's not possible to rewrite the flash memory with a system currently booted from it
-       return [PluginDescriptor(name=_("NFI Image Flashing"),
-               description=_("Download .NFI-Files for USB-Flasher"),
+       return [PluginDescriptor(name=_("NFI image flashing"),
+               description=_("Download .NFI-files for USB-flasher"),
                icon = "flash.png",
                where = PluginDescriptor.WHERE_SOFTWAREMANAGER,
                needsRestart = False,
-               fnc={"SoftwareSupported": NFICallFnc, "menuEntryName": lambda x: _("NFI Image Flashing"),
-                       "menuEntryDescription": lambda x: _("Download .NFI-Files for USB-Flasher")}),
+               fnc={"SoftwareSupported": NFICallFnc, "menuEntryName": lambda x: _("NFI image flashing"),
+                       "menuEntryDescription": lambda x: _("Download .NFI-files for USB-flasher")}),
                PluginDescriptor(name="nfi", where = PluginDescriptor.WHERE_FILESCAN, needsRestart = False, fnc = filescan)]
index cb954bb..8684187 100755 (executable)
@@ -231,11 +231,11 @@ class NetworkWizard(WizardLanguage, Rc):
                if data is not None:
                        if data is True:
                                if status is not None:
-                                       text1 = _("Your Dreambox is now ready to use.\n\nYour internet connection is working now.\n\n")
+                                       text1 = _("Your receiver is now ready to be used.\n\nYour internet connection is working.\n\n")
                                        text2 = _('Accesspoint:') + "\t" + str(status[self.selectedInterface]["accesspoint"]) + "\n"
                                        text3 = _('SSID:') + "\t" + str(status[self.selectedInterface]["essid"]) + "\n"
-                                       text4 = _('Link Quality:') + "\t" + str(status[self.selectedInterface]["quality"])+ "\n"
-                                       text5 = _('Signal Strength:') + "\t" + str(status[self.selectedInterface]["signal"]) + "\n"
+                                       text4 = _('Link quality:') + "\t" + str(status[self.selectedInterface]["quality"])+ "\n"
+                                       text5 = _('Signal strength:') + "\t" + str(status[self.selectedInterface]["signal"]) + "\n"
                                        text6 = _('Bitrate:') + "\t" + str(status[self.selectedInterface]["bitrate"]) + "\n"
                                        text7 = _('Encryption:') + " " + str(status[self.selectedInterface]["encryption"]) + "\n"
                                        text8 = _("Please press OK to continue.")
index 423365f..9e40548 100755 (executable)
@@ -8,7 +8,7 @@
                     <name>NetworkWizard</name>
                     <packagename>enigma2-plugin-systemplugins-networkwizard</packagename>
                     <shortdescription>Step by step network configuration</shortdescription>
-                    <description>With the NetworkWizard you can easily configure your network step by step.
+                    <description>With the network wizard you can easily configure your network step by step.
                     </description>
                     <screenshot src="http://www.dreamboxupdate.com/preview/plugin_networkwizard_en.jpg" />
           </info>
index f822489..a97d495 100755 (executable)
@@ -1,7 +1,7 @@
 <wizard>
         <step id="welcome">
                 <text value="Welcome.\n\nIf you want to connect your receiver to the Internet, this wizard will guide you through the basic network setup of your receiver.\n\nPress OK to start configuring your network" />
-                <displaytext value="Network Wizard" />
+                <displaytext value="Network wizard" />
                <code>
 self.clearSelectedKeys()
 self.selectKey("OK")
index 30a2423..879dc9e 100644 (file)
@@ -11,7 +11,7 @@ def startSetup(menuid):
        if menuid != "system": 
                return [ ]
 
-       return [(_("Network Wizard"), NetworkWizardMain, "nw_wizard", 40)]
+       return [(_("Network wizard"), NetworkWizardMain, "nw_wizard", 40)]
 
 def NetworkWizard(*args, **kwargs):
        from NetworkWizard import NetworkWizard
@@ -20,5 +20,5 @@ def NetworkWizard(*args, **kwargs):
 def Plugins(**kwargs):
        list = []
        if config.misc.firstrun.value:
-               list.append(PluginDescriptor(name=_("Network Wizard"), where = PluginDescriptor.WHERE_WIZARD, needsRestart = False, fnc=(25, NetworkWizard)))
+               list.append(PluginDescriptor(name=_("Network wizard"), where = PluginDescriptor.WHERE_WIZARD, needsRestart = False, fnc=(25, NetworkWizard)))
        return list
index 723b59c..fe99b0d 100644 (file)
@@ -2,7 +2,7 @@ from Screens.Screen import Screen
 from Components.ConfigList import ConfigListScreen
 from Components.config import config, ConfigSubsection, ConfigInteger, ConfigSelection, ConfigSlider, getConfigListEntry
 
-modelist = {"off": _("Off"), "auto": _("Auto"), "sidebyside": _("Side by Side"), "topandbottom": _("Top and Bottom")}
+modelist = {"off": _("Off"), "auto": _("Auto"), "sidebyside": _("Side by side"), "topandbottom": _("Top and bottom")}
 
 config.plugins.OSD3DSetup = ConfigSubsection()
 config.plugins.OSD3DSetup.mode = ConfigSelection(choices = modelist, default = "auto")
index 9a44926..8111980 100644 (file)
@@ -56,7 +56,7 @@ class PositionerSetup(Screen):
 
                        <eLabel text="Frequency:" position="320,290" size="120,22" font="Regular;20" foregroundColor="white"/>
                        <eLabel text="Polarisation:" position="320,315" size="120,22" font="Regular;20" foregroundColor="white"/>
-                       <eLabel text="Symbolrate:" position="320,340" size="120,22" font="Regular;20" foregroundColor="white"/>
+                       <eLabel text="Symbol rate:" position="320,340" size="120,22" font="Regular;20" foregroundColor="white"/>
                        <widget name="frequency_value" position="440,290" size="120,22" font="Regular;20" foregroundColor="white"/>
                        <widget name="polarisation" position="440,315" size="120,22" font="Regular;20" foregroundColor="white"/>
                        <widget name="symbolrate_value" position="440,340" size="120,22" font="Regular;20" foregroundColor="white"/>
@@ -285,9 +285,9 @@ class PositionerSetup(Screen):
        def createConfig(self):
                rotorposition = 1
                orb_pos = 0
-               self.printMsg((_("Using Tuner ") + "%s") % chr(0x41 + self.feid))
+               self.printMsg(_("Using tuner %s") % chr(0x41 + self.feid))
                if not self.advanced:
-                       self.printMsg((_("Configuration mode: ") + "%s") % _("simple"))
+                       self.printMsg(_("Configuration mode: %s") % _("simple"))
                        nim = config.Nims[self.feid]
                        self.sitelon = nim.longitude.float
                        self.longitudeOrientation = nim.longitudeOrientation.value
@@ -299,7 +299,7 @@ class PositionerSetup(Screen):
                        self.turningspeedH = nim.turningspeedH.float
                        self.turningspeedV = nim.turningspeedV.float
                else:   # it is advanced
-                       self.printMsg((_("Configuration mode: ") + "%s") % _("advanced"))
+                       self.printMsg(_("Configuration mode: %s") % _("advanced"))
                        fe_data = { }
                        self.frontend.getFrontendData(fe_data)
                        self.frontend.getTransponderData(fe_data, True)
@@ -314,7 +314,7 @@ class PositionerSetup(Screen):
                                                if lnbnum:
                                                        break
                                if lnbnum:
-                                       self.printMsg((_("Using LNB") + "%d") % lnbnum)
+                                       self.printMsg(_("Using LNB %d") % lnbnum)
                                        lnb = self.advancedconfig.lnb[lnbnum]
                        if not lnb:
                                self.logMsg(_("Warning: no LNB; using factory defaults."))
@@ -329,10 +329,10 @@ class PositionerSetup(Screen):
                self.orientation = ConfigSelection([("east", _("East")), ("west", _("West"))], m[1])
 
        def createSetup(self):
-               self.list.append((_("Tune and Focus"), self.positioner_tune, "tune"))
+               self.list.append((_("Tune and focus"), self.positioner_tune, "tune"))
                self.list.append((_("Movement"), self.positioner_move, "move"))
                self.list.append((_("Fine movement"), self.positioner_finemove, "finemove"))
-               self.list.append((_("Set Limits"), self.positioner_limits, "limits"))
+               self.list.append((_("Set limits"), self.positioner_limits, "limits"))
                self.list.append((_("Memory index"), self.positioner_storage, "storage"))
                self.list.append((_("Goto"), self.orbitalposition, "goto"))
                self.list.append((" ", self.orientation, "goto"))
@@ -448,7 +448,7 @@ class PositionerSetup(Screen):
                entry = self.getCurrentConfigPath()
                if entry == "tune":
                        # Auto focus
-                       self.printMsg(_("Auto-focus"))
+                       self.printMsg(_("Auto focus"))
                        print>>log, (_("Site latitude") + "      : %5.1f %s") % PositionerSetup.latitude2orbital(self.sitelat)
                        print>>log, (_("Site longitude") + "     : %5.1f %s") % PositionerSetup.longitude2orbital(self.sitelon)
                        Thread(target = self.autofocus).start()
@@ -515,7 +515,7 @@ class PositionerSetup(Screen):
                        self.gotoX(satlon)
                elif entry == "tune":
                        # Start USALS calibration
-                       self.printMsg(_("USALS Calibration"))
+                       self.printMsg(_("USALS calibration"))
                        print>>log, (_("Site latitude") + "      : %5.1f %s") % PositionerSetup.latitude2orbital(self.sitelat)
                        print>>log, (_("Site longitude") + "     : %5.1f %s") % PositionerSetup.longitude2orbital(self.sitelon)
                        Thread(target = self.gotoXcalibration).start()
index 1823a84..052cad1 100644 (file)
@@ -9,7 +9,7 @@ from Components.NimManager import nimmanager as nimmgr
 
 class SecParameterSetup(Screen, ConfigListScreen):
        skin = """
-               <screen position="100,100" size="560,400" title="Satellite Equipment Setup" >
+               <screen position="100,100" size="560,400" title="Satellite equipment setup" >
                        <widget name="config" position="10,10" size="540,390" />
                </screen>"""
        def __init__(self, session):
@@ -66,12 +66,12 @@ def SecSetupStart(menuid):
        # only show if DVB-S frontends are available
        for slot in nimmgr.nim_slots:
                if slot.isCompatible("DVB-S"):
-                       return [(_("Satellite Equipment Setup"), SecSetupMain, "satellite_equipment_setup", None)]
+                       return [(_("Satellite equipment setup"), SecSetupMain, "satellite_equipment_setup", None)]
 
        return [ ]
 
 def Plugins(**kwargs):
        if (nimmgr.hasNimType("DVB-S")):
-               return PluginDescriptor(name=_("Satellite Equipment Setup"), description="Setup your satellite equipment", where = PluginDescriptor.WHERE_MENU, needsRestart = False, fnc=SecSetupStart)
+               return PluginDescriptor(name=_("Satellite equipment setup"), description=_("Setup your satellite equipment"), where = PluginDescriptor.WHERE_MENU, needsRestart = False, fnc=SecSetupStart)
        else:
                return []
index fd2b5e1..d2f6f7f 100644 (file)
@@ -78,7 +78,7 @@ class SkinSelector(Screen):
                self.loadPreview()
 
        def info(self):
-               aboutbox = self.session.open(MessageBox,_("Enigma2 Skinselector\n\nIf you experience any problems please contact\nstephan@reichholf.net\n\n\xA9 2006 - Stephan Reichholf"), MessageBox.TYPE_INFO)
+               aboutbox = self.session.open(MessageBox,_("Enigma2 skin selector"), MessageBox.TYPE_INFO)
                aboutbox.setTitle(_("About..."))
 
        def find(self, arg, dirname, names):
index 9bc91e1..6f25769 100755 (executable)
@@ -17,7 +17,7 @@ self.selectKey("OK")
        </step>
 
        <step id="welcome">
-               <text value="Welcome to the Image upgrade wizard. The wizard will assist you in upgrading the firmware of your receiver by providing a backup facility for your current settings and a short explanation of how to upgrade your firmware." />
+               <text value="Welcome to the image upgrade wizard. The wizard will assist you in upgrading the firmware of your receiver by providing a backup facility for your current settings and a short explanation of how to upgrade your firmware." />
                <list>
                        <listentry caption="OK, guide me through the upgrade process" step="backupquestion" />
                        <listentry caption="Exit the wizard" step="end" />
index 8459e5f..5561f4c 100755 (executable)
@@ -7,8 +7,8 @@
                     <author>Dream Multimedia</author>
                     <name>SoftwareManager</name>
                     <packagename>enigma2-plugin-systemplugins-softwaremanager</packagename>
-                    <shortdescription>SoftwareManager manages your receiver software</shortdescription>
-                    <description>The SoftwareManager manages your receiver's software.\n
+                    <shortdescription>Software manager manages your receiver software</shortdescription>
+                    <description>The software manager manages your receiver's software.\n
                    It's easy to update your receiver's software, install or remove plugins or even backup and restore your system settings.
                     </description>
                     <screenshot src="http://www.dreamboxupdate.com/preview/plugin_softwaremanager_en.jpg" />
index 00c1dd2..573c389 100644 (file)
@@ -149,7 +149,7 @@ class UpdatePluginMenu(Screen):
                                                        menuEntryDescription = _('Extended Software Plugin')
                                                self.list.append(('default-plugin', menuEntryName, menuEntryDescription + self.oktext, callFnc))
                        if config.usage.setup_level.index >= 2: # expert+
-                               self.list.append(("advanced", _("Advanced Options"), _("\nAdvanced options and settings." ) + self.oktext, None))
+                               self.list.append(("advanced", _("Advanced pptions"), _("\nAdvanced options and settings." ) + self.oktext, None))
                elif self.menu == 1:
                        self.list.append(("advancedrestore", _("Advanced restore"), _("\nRestore your backups by date." ) + self.oktext, None))
                        self.list.append(("backuplocation", _("Select backup location"),  _("\nSelect your backup device.\nCurrent device: " ) + config.plugins.configurationbackup.backuplocation.value + self.oktext, None))
@@ -164,11 +164,11 @@ class UpdatePluginMenu(Screen):
                                                if p.__call__.has_key("menuEntryName"):
                                                        menuEntryName = p.__call__["menuEntryName"](None)
                                                else:
-                                                       menuEntryName = _('Advanced Software')
+                                                       menuEntryName = _('Advanced software')
                                                if p.__call__.has_key("menuEntryDescription"):
                                                        menuEntryDescription = p.__call__["menuEntryDescription"](None)
                                                else:
-                                                       menuEntryDescription = _('Advanced Software Plugin')
+                                                       menuEntryDescription = _('Advanced software plugin')
                                                self.list.append(('advanced-plugin', menuEntryName, menuEntryDescription + self.oktext, callFnc))
 
                self["menu"] = List(self.list)
@@ -892,9 +892,9 @@ class PluginManager(Screen, PackageInfoHandler):
                        elif tag == 'Network':
                                return(( _("Network"), _("View list of available networking extensions" ), tag, divpng ))
                        elif tag == 'CI':
-                               return(( _("CommonInterface"), _("View list of available CommonInterface extensions" ), tag, divpng ))
+                               return(( _("Common Interface"), _("View list of available CommonInterface extensions" ), tag, divpng ))
                        elif tag == 'Default':
-                               return(( _("Default Settings"), _("View list of available default settings" ), tag, divpng ))
+                               return(( _("Default settings"), _("View list of available default settings" ), tag, divpng ))
                        elif tag == 'SAT':
                                return(( _("Satellite equipment"), _("View list of available Satellite equipment extensions." ), tag, divpng ))
                        elif tag == 'Software':
@@ -902,7 +902,7 @@ class PluginManager(Screen, PackageInfoHandler):
                        elif tag == 'Multimedia':
                                return(( _("Multimedia"), _("View list of available multimedia extensions." ), tag, divpng ))
                        elif tag == 'Display':
-                               return(( _("Display and Userinterface"), _("View list of available Display and Userinterface extensions." ), tag, divpng ))
+                               return(( _("Display and userinterface"), _("View list of available display and userinterface extensions." ), tag, divpng ))
                        elif tag == 'EPG':
                                return(( _("Electronic Program Guide"), _("View list of available EPG extensions." ), tag, divpng ))
                        elif tag == 'Communication':
index 85c4eb0..836912b 100644 (file)
@@ -123,10 +123,10 @@ class TempFanControl(Screen, ConfigListScreen):
                
                self.list = []
                for count in range(fancontrol.getFanCount()):
-                       self.list.append(getConfigListEntry(_("Fan %d Voltage") % (count + 1), fancontrol.getConfig(count).vlt))
+                       self.list.append(getConfigListEntry(_("Fan %d voltage") % (count + 1), fancontrol.getConfig(count).vlt))
                        self.list.append(getConfigListEntry(_("Fan %d PWM") % (count + 1), fancontrol.getConfig(count).pwm))
-                       self.list.append(getConfigListEntry(_("Standby Fan %d Voltage") % (count + 1), fancontrol.getConfig(count).vlt_standby))
-                       self.list.append(getConfigListEntry(_("Standby Fan %d PWM") % (count + 1), fancontrol.getConfig(count).pwm_standby))
+                       self.list.append(getConfigListEntry(_("Standby fan %d voltage") % (count + 1), fancontrol.getConfig(count).vlt_standby))
+                       self.list.append(getConfigListEntry(_("Standby fan %d PWM") % (count + 1), fancontrol.getConfig(count).pwm_standby))
                
                ConfigListScreen.__init__(self, self.list, session = self.session)
                #self["config"].list = self.list
@@ -164,8 +164,8 @@ def main(session, **kwargs):
 def startMenu(menuid):
        if menuid != "system":
                return []
-       return [(_("Temperature and Fan control"), main, "tempfancontrol", 80)]
+       return [(_("Temperature and fan control"), main, "tempfancontrol", 80)]
 
 def Plugins(**kwargs):
-       return PluginDescriptor(name = "Temperature and Fan control", description = _("Temperature and Fan control"), where = PluginDescriptor.WHERE_MENU, needsRestart = False, fnc = startMenu)
+       return PluginDescriptor(name = _("Temperature and fan control"), description = _("Temperature and fan control"), where = PluginDescriptor.WHERE_MENU, needsRestart = False, fnc = startMenu)
 
index 944b8bb..f37296a 100644 (file)
@@ -395,5 +395,5 @@ def startSetup(menuid):
 def Plugins(**kwargs):
        list = []
        if config.usage.setup_level.index >= 2 and os_path.exists("/proc/stb/vmpeg/0/pep_apply"):
-               list.append(PluginDescriptor(name=_("Videoenhancement Setup"), description=_("Advanced Video Enhancement Setup"), where = PluginDescriptor.WHERE_MENU, needsRestart = False, fnc=startSetup))
+               list.append(PluginDescriptor(name=_("Video enhancement setup"), description=_("Advanced video enhancement setup"), where = PluginDescriptor.WHERE_MENU, needsRestart = False, fnc=startSetup))
        return list
index d7396dd..7b3e94d 100644 (file)
@@ -8,7 +8,7 @@ def startSetup(menuid):
        if menuid != "system": 
                return [ ]
 
-       return [(_("Video Fine-Tuning"), videoFinetuneMain, "video_finetune", None)]
+       return [(_("Video fine tuning"), videoFinetuneMain, "video_finetune", None)]
 
 def Plugins(**kwargs):
-       return PluginDescriptor(name=_("Video Fine-Tuning"), description=_("fine-tune your display"), where = PluginDescriptor.WHERE_MENU, needsRestart = False, fnc=startSetup)
+       return PluginDescriptor(name=_("Video fine tuning"), description=_("fine-tune your display"), where = PluginDescriptor.WHERE_MENU, needsRestart = False, fnc=startSetup)
index 7e56b81..c951962 100644 (file)
@@ -56,17 +56,17 @@ class VideoSetup(Screen, ConfigListScreen):
                level = config.usage.setup_level.index
 
                self.list = [
-                       getConfigListEntry(_("Video output"), config.av.videoport, _("This option configures which video output connector will be used."))
+                       getConfigListEntry(_("Video output"), config.av.videoport, _("Configures which video output connector will be used."))
                ]
 
                # if we have modes for this port:
                if config.av.videoport.value in config.av.videomode:
                        # add mode- and rate-selection:
-                       self.list.append(getConfigListEntry(pgettext("Video output mode", "Mode"), config.av.videomode[config.av.videoport.value], _("This option configures the video output mode (or resolution).")))
+                       self.list.append(getConfigListEntry(pgettext("Video output mode", "Mode"), config.av.videomode[config.av.videoport.value], _("Configure the video output mode (or resolution).")))
                        if config.av.videomode[config.av.videoport.value].value == 'PC':
-                               self.list.append(getConfigListEntry(_("Resolution"), config.av.videorate[config.av.videomode[config.av.videoport.value].value], _("This option configures the screen resolution in PC output mode.")))
+                               self.list.append(getConfigListEntry(_("Resolution"), config.av.videorate[config.av.videomode[config.av.videoport.value].value], _("Configure the screen resolution in PC output mode.")))
                        else:
-                               self.list.append(getConfigListEntry(_("Refresh rate"), config.av.videorate[config.av.videomode[config.av.videoport.value].value], _("This option configures the screen refresh rate.")))
+                               self.list.append(getConfigListEntry(_("Refresh rate"), config.av.videorate[config.av.videomode[config.av.videoport.value].value], _("Configure the refresh rate of the screen.")))
 
                port = config.av.videoport.value
                if port not in config.av.videomode:
@@ -78,7 +78,7 @@ class VideoSetup(Screen, ConfigListScreen):
                force_wide = self.hw.isWidescreenMode(port, mode)
 
                if not force_wide:
-                       self.list.append(getConfigListEntry(_("Aspect ratio"), config.av.aspect, _("This option configures the screen aspect ratio.")))
+                       self.list.append(getConfigListEntry(_("Aspect ratio"), config.av.aspect, _("Configure the aspect ratio of the screen.")))
 
                if force_wide or config.av.aspect.value in ("16_9", "16_10"):
                        self.list.extend((
index eca6c0f..6d43263 100755 (executable)
@@ -8,7 +8,7 @@
                     <name>WirelessLan</name>
                     <packagename>enigma2-plugin-systemplugins-wirelesslan</packagename>
                     <shortdescription>Configure your WLAN network interface</shortdescription>
-                    <description>The WirelessLan plugin helps you configuring your WLAN network interface.</description>
+                    <description>The wireless lan plugin helps you configuring your WLAN network interface.</description>
                     <screenshot src="http://www.dreamboxupdate.com/preview/plugin_wirelesslan_en.jpg" />
           </info>
 
index e7890ab..5efdc16 100644 (file)
@@ -45,7 +45,7 @@ config.plugins.wlan.psk = NoSave(ConfigPassword(default = "", fixed_size = False
 
 class WlanStatus(Screen):
        skin = """
-               <screen name="WlanStatus" position="center,center" size="560,400" title="Wireless Network State" >
+               <screen name="WlanStatus" position="center,center" size="560,400" title="Wireless network status" >
                        <ePixmap pixmap="skin_default/buttons/red.png" position="0,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" />
 
@@ -76,8 +76,8 @@ class WlanStatus(Screen):
                                    
                self["LabelBSSID"] = StaticText(_('Accesspoint:'))
                self["LabelESSID"] = StaticText(_('SSID:'))
-               self["LabelQuality"] = StaticText(_('Link Quality:'))
-               self["LabelSignal"] = StaticText(_('Signal Strength:'))
+               self["LabelQuality"] = StaticText(_('Link quality:'))
+               self["LabelSignal"] = StaticText(_('Signal strength:'))
                self["LabelBitrate"] = StaticText(_('Bitrate:'))
                self["LabelEnc"] = StaticText(_('Encryption:'))
                        
@@ -128,7 +128,7 @@ class WlanStatus(Screen):
                                        else:
                                                essid = status[self.iface]["essid"]
                                        if status[self.iface]["accesspoint"] == "Not-Associated":
-                                               accesspoint = _("Not-Associated")
+                                               accesspoint = _("Not associated")
                                                essid = _("No Connection")
                                        else:
                                                accesspoint = status[self.iface]["accesspoint"]
@@ -288,7 +288,7 @@ class WlanScan(Screen):
        def buildEntryComponent(self, essid, bssid, encrypted, iface, maxrate, signal):
                divpng = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/div-h.png"))
                encryption = encrypted and _("Yes") or _("No")
-               return((essid, bssid, _("Signal: ") + str(signal), _("Max. Bitrate: ") + str(maxrate), _("Encrypted: ") + encryption, _("Interface: ") + str(iface), divpng))
+               return((essid, bssid, _("Signal: ") + str(signal), _("Max. bitrate: ") + str(maxrate), _("Encrypted: ") + encryption, _("Interface: ") + str(iface), divpng))
 
        def updateAPList(self):
                newList = []
@@ -402,4 +402,4 @@ def configStrings(iface):
        return ret
 
 def Plugins(**kwargs):
-       return PluginDescriptor(name=_("Wireless LAN"), description=_("Connect to a Wireless Network"), where = PluginDescriptor.WHERE_NETWORKSETUP, needsRestart = False, fnc={"ifaceSupported": callFunction, "configStrings": configStrings, "WlanPluginEntry": lambda x: "Wireless Network Configuartion..."})
+       return PluginDescriptor(name=_("Wireless LAN"), description=_("Connect to a wireless network"), where = PluginDescriptor.WHERE_NETWORKSETUP, needsRestart = False, fnc={"ifaceSupported": callFunction, "configStrings": configStrings, "WlanPluginEntry": lambda x: _("Wireless network configuartion...")})
index 70476d2..12259f1 100644 (file)
@@ -15,13 +15,13 @@ class About(Screen):
 
                AboutText = _("Hardware: ") + about.getHardwareTypeString() + "\n"
                AboutText += _("Image: ") + about.getImageTypeString() + "\n"
-               AboutText += _("Kernel Version: ") + about.getKernelVersionString() + "\n"
+               AboutText += _("Kernel version: ") + about.getKernelVersionString() + "\n"
 
                EnigmaVersion = "Enigma: " + about.getEnigmaVersionString()
                self["EnigmaVersion"] = StaticText(EnigmaVersion)
                AboutText += EnigmaVersion + "\n"
 
-               ImageVersion = _("Last Upgrade: ") + about.getImageVersionString()
+               ImageVersion = _("Last upgrade: ") + about.getImageVersionString()
                self["ImageVersion"] = StaticText(ImageVersion)
                AboutText += ImageVersion + "\n"
 
index 1312182..74e23e6 100644 (file)
@@ -832,7 +832,7 @@ class ChannelSelectionBase(Screen):
                                "9": self.keyNumberGlobal,
                                "0": self.keyNumber0
                        })
-               self.maintitle = _("Channel Selection")
+               self.maintitle = _("Channel selection")
                self.recallBouquetMode()
 
        def getBouquetNumOffset(self, bouquet):
@@ -1063,7 +1063,7 @@ class ChannelSelectionBase(Screen):
                                                                cur_ref.getUnsignedData(3), # ONID
                                                                self.service_types[pos+1:])
                                                        ref = eServiceReference(refstr)
-                                                       ref.setName(_("Current Transponder"))
+                                                       ref.setName(_("Current transponder"))
                                                        self.servicelist.addService(ref)
                                                self.servicelist.finishFill()
                                                if prev is not None:
index 00c2145..014412b 100644 (file)
@@ -41,7 +41,7 @@ class Console(Screen):
                self.setTitle(self.newtitle)
 
        def startRun(self):
-               self["text"].setText(_("Execution Progress:") + "\n\n")
+               self["text"].setText(_("Execution progress:") + "\n\n")
                print "Console: executing in run", self.run, " the command:", self.cmdlist[self.run]
                if self.container.execute(self.cmdlist[self.run]): #start of container application failed...
                        self.runFinished(-1) # so we must call runFinished manual
index b1f9468..5bd9b33 100644 (file)
@@ -95,7 +95,7 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
        ENABLE_RESUME_SUPPORT = True
        
        skin = """
-       <screen name="DVDPlayer" flags="wfNoBorder" position="0,380" size="720,160" title="InfoBar" backgroundColor="transparent" >
+       <screen name="DVDPlayer" flags="wfNoBorder" position="0,380" size="720,160" title="Info bar" backgroundColor="transparent" >
                <!-- Background -->
                <ePixmap position="0,0" zPosition="-2" size="720,160" pixmap="skin_default/info-bg_mp.png" alphatest="off" />
                <ePixmap position="29,40" zPosition="0" size="665,104" pixmap="skin_default/screws_mp.png" alphatest="on" transparent="1" />
@@ -433,7 +433,7 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
                        cur = self.session.nav.getCurrentlyPlayingServiceReference()
                        if cur and not cur.toString().endswith(harddiskmanager.getAutofsMountpoint(harddiskmanager.getCD())):
                            choices.insert(0,(_("Play DVD"), "playPhysical" ))
-               self.session.openWithCallback(self.exitCB, ChoiceBox, title=_("Leave DVD Player?"), list = choices)
+               self.session.openWithCallback(self.exitCB, ChoiceBox, title=_("Leave DVD player?"), list = choices)
 
        def sendKey(self, key):
                keys = self.getServiceInterface("keys")
index b51f5ca..4a729ba 100644 (file)
@@ -221,7 +221,7 @@ class EPGSelection(Screen):
        def setSortDescription(self):
                if self.sort_type == 1:
                        # TRANSLATORS: This must fit into the header button in the EPG-List
-                       self["key_yellow"].setText(_("Sort Time"))
+                       self["key_yellow"].setText(_("Sort time"))
                else:
                        # TRANSLATORS: This must fit into the header button in the EPG-List
                        self["key_yellow"].setText(_("Sort A-Z"))
index 305e355..e9ab25f 100644 (file)
@@ -35,7 +35,7 @@ class HelpMenu(Screen, Rc):
                        if selection[1] == "SHIFT":
                                self.selectKey("SHIFT")
                        elif selection[1] == "long":
-                               longText = _("Long Keypress")
+                               longText = _("Long key press")
                self["long_key"].setText(longText)
 
                self.selectKey(selection[0])
index b945fe5..209be6b 100644 (file)
@@ -61,8 +61,8 @@ class InfoBar(InfoBarBase, InfoBarShowHide,
                                InfoBarPlugins, InfoBarServiceErrorPopupSupport:
                        x.__init__(self)
 
-               self.helpList.append((self["actions"], "InfobarActions", [("showMovies", _("view recordings..."))]))
-               self.helpList.append((self["actions"], "InfobarActions", [("showRadio", _("hear radio..."))]))
+               self.helpList.append((self["actions"], "InfobarActions", [("showMovies", _("Watch recordings..."))]))
+               self.helpList.append((self["actions"], "InfobarActions", [("showRadio", _("Listen to the radio..."))]))
 
                self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
                        {
@@ -211,7 +211,7 @@ class MoviePlayer(InfoBarBase, InfoBarShowHide, \
                elif self.shown:
                        self.hide()
                elif answer is None:
-                       self.session.openWithCallback(self.leavePlayerOnExit, MessageBox, _("Exit Movieplayer?"), MessageBox.TYPE_YESNO, simple = True)
+                       self.session.openWithCallback(self.leavePlayerOnExit, MessageBox, _("Exit movie player?"), MessageBox.TYPE_YESNO, simple = True)
 
        def deleteConfirmed(self, answer):
                if answer:
index 38806b3..1b60722 100644 (file)
@@ -1730,7 +1730,7 @@ class InfoBarInstantRecord:
        def __init__(self):
                self["InstantRecordActions"] = HelpableActionMap(self, "InfobarInstantRecord",
                        {
-                               "instantRecord": (self.instantRecord, _("Instant Record...")),
+                               "instantRecord": (self.instantRecord, _("Instant recording...")),
                        })
                self.recording = []
 
@@ -1922,8 +1922,8 @@ class InfoBarSubserviceSelection:
 
                self["SubserviceQuickzapAction"] = HelpableActionMap(self, "InfobarSubserviceQuickzapActions",
                        {
-                               "nextSubservice": (self.nextSubservice, _("Switch to next subservice")),
-                               "prevSubservice": (self.prevSubservice, _("Switch to previous subservice"))
+                               "nextSubservice": (self.nextSubservice, _("Switch to next sub service")),
+                               "prevSubservice": (self.prevSubservice, _("Switch to previous sub service"))
                        }, -1)
                self["SubserviceQuickzapAction"].setEnabled(False)
 
@@ -1995,16 +1995,16 @@ class InfoBarSubserviceSelection:
                        if self.bouquets and len(self.bouquets):
                                keys = ["red", "blue", "",  "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" ] + [""] * n
                                if config.usage.multibouquet.value:
-                                       tlist = [(_("Quickzap"), "quickzap", service.subServices()), (_("Add to bouquet"), "CALLFUNC", self.addSubserviceToBouquetCallback), ("--", "")] + tlist
+                                       tlist = [(_("Quick zap"), "quickzap", service.subServices()), (_("Add to bouquet"), "CALLFUNC", self.addSubserviceToBouquetCallback), ("--", "")] + tlist
                                else:
-                                       tlist = [(_("Quickzap"), "quickzap", service.subServices()), (_("Add to favourites"), "CALLFUNC", self.addSubserviceToBouquetCallback), ("--", "")] + tlist
+                                       tlist = [(_("Quick zap"), "quickzap", service.subServices()), (_("Add to favourites"), "CALLFUNC", self.addSubserviceToBouquetCallback), ("--", "")] + tlist
                                selection += 3
                        else:
-                               tlist = [(_("Quickzap"), "quickzap", service.subServices()), ("--", "")] + tlist
+                               tlist = [(_("Quick zap"), "quickzap", service.subServices()), ("--", "")] + tlist
                                keys = ["red", "",  "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" ] + [""] * n
                                selection += 2
 
-                       self.session.openWithCallback(self.subserviceSelected, ChoiceBox, title=_("Please select a subservice..."), list = tlist, selection = selection, keys = keys, skin_name = "SubserviceSelection")
+                       self.session.openWithCallback(self.subserviceSelected, ChoiceBox, title=_("Please select a sub service..."), list = tlist, selection = selection, keys = keys, skin_name = "SubserviceSelection")
 
        def subserviceSelected(self, service):
                del self.bouquets
index 49994ca..12efb6b 100644 (file)
@@ -50,7 +50,7 @@ class LocationBox(Screen, NumericalTextInput, HelpableScreen):
                        <widget name="key_blue" position="405,415" zPosition="2" size="135,40" halign="center" valign="center" font="Regular;22" transparent="1" shadowColor="black" shadowOffset="-1,-1" />            
                </screen>"""
 
-       def __init__(self, session, text = "", filename = "", currDir = None, bookmarks = None, userMode = False, windowTitle = _("Select Location"), minFree = None, autoAdd = False, editDir = False, inhibitDirs = [], inhibitMounts = []):
+       def __init__(self, session, text = "", filename = "", currDir = None, bookmarks = None, userMode = False, windowTitle = _("Select location"), minFree = None, autoAdd = False, editDir = False, inhibitDirs = [], inhibitMounts = []):
                # Init parents
                Screen.__init__(self, session)
                NumericalTextInput.__init__(self, handleTimeout = False)
@@ -92,7 +92,7 @@ class LocationBox(Screen, NumericalTextInput, HelpableScreen):
                # Buttons
                self["key_green"] = Button(_("OK"))
                self["key_yellow"] = Button(_("Rename"))
-               self["key_blue"] = Button(_("Remove Bookmark"))
+               self["key_blue"] = Button(_("Remove bookmark"))
                self["key_red"] = Button(_("Cancel"))
 
                # Background for Buttons
@@ -198,14 +198,14 @@ class LocationBox(Screen, NumericalTextInput, HelpableScreen):
                        self.currList = "filelist"
                        self["filelist"].selectionEnabled(1)
                        self["booklist"].selectionEnabled(0)
-                       self["key_blue"].text = _("Add Bookmark")
+                       self["key_blue"].text = _("Add bookmark")
                        self.updateTarget()
 
        def switchToBookList(self):
                self.currList = "booklist"
                self["filelist"].selectionEnabled(0)
                self["booklist"].selectionEnabled(1)
-               self["key_blue"].text = _("Remove Bookmark")
+               self["key_blue"].text = _("Remove bookmark")
                self.updateTarget()
 
        def addRemoveBookmark(self):
@@ -400,7 +400,7 @@ class LocationBox(Screen, NumericalTextInput, HelpableScreen):
                        self["target"].setText(''.join((currFolder, self.filename)))
                # Display a Warning otherwise
                else:
-                       self["target"].setText(_("Invalid Location"))
+                       self["target"].setText(_("Invalid location"))
 
        def showMenu(self):
                if not self.userMode and self.realBookmarks:
index ceae8d0..ddddd1e 100644 (file)
@@ -13,12 +13,6 @@ import xml.etree.cElementTree
 
 from Screens.Setup import Setup, getSetupTitle
 
-#              <item text="TV-Mode">self.setModeTV()</item>
-#              <item text="Radio-Mode">self.setModeRadio()</item>
-#              <item text="File-Mode">self.setModeFile()</item>
-#                      <item text="Sleep Timer"></item>
-
-
 # read the menu
 mdom = xml.etree.cElementTree.parse(resolveFilename(SCOPE_SKIN, 'menu.xml'))
 
index d83b6bd..d69c31d 100644 (file)
@@ -232,7 +232,7 @@ class MovieBrowserConfiguration(ConfigListScreen,Screen):
                
        def __init__(self, session, args = 0):
                self.session = session
-               self.setup_title = _("Movie List Configuration")
+               self.setup_title = _("Movie list configuration")
                Screen.__init__(self, session)
                cfg = ConfigSubsection()
                self.cfg = cfg
@@ -241,12 +241,12 @@ class MovieBrowserConfiguration(ConfigListScreen,Screen):
                cfg.description = ConfigYesNo(default=(config.movielist.description.value != MovieList.HIDE_DESCRIPTION))
                configList = [
                        getConfigListEntry(_("Sort"), cfg.moviesort),
-                       getConfigListEntry(_("show extended description"), cfg.description),
+                       getConfigListEntry(_("Show extended description"), cfg.description),
                        getConfigListEntry(_("Type"), cfg.listtype),
                        getConfigListEntry(_("Remember these settings for each folder"), config.movielist.settings_per_directory),
                        getConfigListEntry(_("Behavior when a movie reaches the end"), config.usage.on_movie_eof),
-                       getConfigListEntry(_("Load Length of Movies in Movielist"), config.usage.load_length_of_movies_in_moviellist),
-                       getConfigListEntry(_("Show status icons in Movielist"), config.usage.show_icons_in_movielist),
+                       getConfigListEntry(_("Load length of movies in movie list"), config.usage.load_length_of_movies_in_moviellist),
+                       getConfigListEntry(_("Show status icons in movie list"), config.usage.show_icons_in_movielist),
                        getConfigListEntry(_("Show icon for new/unseen items"), config.usage.movielist_unseen),
                        getConfigListEntry(_("Play audio in background"), config.movielist.play_audio_internal),
                        getConfigListEntry(_("Root directory"), config.movielist.root),
@@ -353,7 +353,7 @@ class MovieContextMenu(Screen):
                                # Plugins expect a valid selection, so only include them if we selected a non-dir 
                                menu.extend([(p.description, boundFunction(p, session, service)) for p in plugins.getPlugins(PluginDescriptor.WHERE_MOVIELIST)])
 
-               menu.append((_("Add Bookmark"), csel.do_addbookmark))
+               menu.append((_("Add bookmark"), csel.do_addbookmark))
                menu.append((_("create directory"), csel.do_createdir))
                menu.append((_("Network") + "...", csel.showNetworkSetup))
                menu.append((_("Settings") + "...", csel.configure))
@@ -471,7 +471,7 @@ class MovieSelection(Screen, HelpableScreen, SelectionEventInfo, InfoBarBase):
 
                self.playGoTo = None #1 - preview next item / -1 - preview previous
 
-               title = _("Movie Selection")
+               title = _("Movie selection")
                self.setTitle(title)
 
                # Need list for init
@@ -493,10 +493,10 @@ class MovieSelection(Screen, HelpableScreen, SelectionEventInfo, InfoBarBase):
 
                self["InfobarActions"] = HelpableActionMap(self, "InfobarActions", 
                        {
-                               "showMovies": (self.doPathSelect, _("select the movie path")),
+                               "showMovies": (self.doPathSelect, _("Select the movie path")),
                                "showRadio": (self.btn_radio, "?"),
                                "showTv": (self.btn_tv, _("Home")),
-                               "showText": (self.btn_text, _("on end of movie")),
+                               "showText": (self.btn_text, _("On end of movie")),
                        })
 
                self["NumberActions"] =  NumberActionMap(["NumberActions", "InputAsciiActions"],
@@ -524,21 +524,21 @@ class MovieSelection(Screen, HelpableScreen, SelectionEventInfo, InfoBarBase):
                        })
                self["MovieSelectionActions"] = HelpableActionMap(self, "MovieSelectionActions",
                        {
-                               "contextMenu": (self.doContext, _("menu")),
-                               "showEventInfo": (self.showEventInformation, _("show event details")),
+                               "contextMenu": (self.doContext, _("Menu")),
+                               "showEventInfo": (self.showEventInformation, _("Show event details")),
                        })
 
                self["ColorActions"] = HelpableActionMap(self, "ColorActions",
                        {
-                               "red": (self.btn_red, _("delete...")),
+                               "red": (self.btn_red, _("Delete...")),
                                "green": (self.btn_green, _("Move to other directory")),
-                               "yellow": (self.btn_yellow, _("select the movie path")),
-                               "blue": (self.btn_blue, _("show tag menu")),
+                               "yellow": (self.btn_yellow, _("Select the movie path")),
+                               "blue": (self.btn_blue, _("Show tag menu")),
                        })
                self["OkCancelActions"] = HelpableActionMap(self, "OkCancelActions",
                        {
-                               "cancel": (self.abort, _("exit movielist")),
-                               "ok": (self.itemSelected, _("select movie")),
+                               "cancel": (self.abort, _("Exit movie list")),
+                               "ok": (self.itemSelected, _("Select movie")),
                        })
                self["DirectionActions"] = HelpableActionMap(self, "DirectionActions",
                        {
@@ -592,7 +592,7 @@ class MovieSelection(Screen, HelpableScreen, SelectionEventInfo, InfoBarBase):
                                'copy': _("Copy"),
                                'reset': _("Reset"),
                                'tags': _("Tags"),
-                               'addbookmark': _("Add Bookmark"),
+                               'addbookmark': _("Add bookmark"),
                                'bookmarks': _("Location"),
                                'rename': _("Rename"),
                                'gohome': _("Home"),
@@ -1185,7 +1185,7 @@ class MovieSelection(Screen, HelpableScreen, SelectionEventInfo, InfoBarBase):
                        else:
                                self.session.open(
                                        MessageBox,
-                                       _("Directory %s nonexistent.") % (res),
+                                       _("Directory %s does not exist.") % (res),
                                        type = MessageBox.TYPE_ERROR,
                                        timeout = 5
                                        )
index 718e229..2d80acf 100644 (file)
@@ -44,15 +44,15 @@ class NetworkAdapterSelection(Screen,HelpableScreen):
                
                self["OkCancelActions"] = HelpableActionMap(self, "OkCancelActions",
                        {
-                       "cancel": (self.close, _("exit network interface list")),
-                       "ok": (self.okbuttonClick, _("select interface")),
+                       "cancel": (self.close, _("Exit network interface list")),
+                       "ok": (self.okbuttonClick, _("Select interface")),
                        })
 
                self["ColorActions"] = HelpableActionMap(self, "ColorActions",
                        {
-                       "red": (self.close, _("exit network interface list")),
-                       "green": (self.okbuttonClick, _("select interface")),
-                       "blue": (self.openNetworkWizard, _("Use the Networkwizard to configure selected network adapter")),
+                       "red": (self.close, _("Exit network interface list")),
+                       "green": (self.okbuttonClick, _("Select interface")),
+                       "blue": (self.openNetworkWizard, _("Use the network wizard to configure selected network adapter")),
                        })
                
                self["DefaultInterfaceAction"] = HelpableActionMap(self, "ColorActions",
@@ -147,7 +147,7 @@ class NetworkAdapterSelection(Screen,HelpableScreen):
                        self.list.append(self.buildInterfaceList(x[1],_(x[0]),default_int,active_int ))
                
                if os_path.exists(resolveFilename(SCOPE_PLUGINS, "SystemPlugins/NetworkWizard/networkwizard.xml")):
-                       self["key_blue"].setText(_("NetworkWizard"))
+                       self["key_blue"].setText(_("Network wizard"))
                self["list"].setList(self.list)
 
        def setDefaultInterface(self):
@@ -206,7 +206,7 @@ class NetworkAdapterSelection(Screen,HelpableScreen):
                        try:
                                from Plugins.SystemPlugins.NetworkWizard.NetworkWizard import NetworkWizard
                        except ImportError:
-                               self.session.open(MessageBox, _("The NetworkWizard extension is not installed!\nPlease install it."), type = MessageBox.TYPE_INFO,timeout = 10 )
+                               self.session.open(MessageBox, _("The network wizard extension is not installed!\nPlease install it."), type = MessageBox.TYPE_INFO,timeout = 10 )
                        else:
                                selection = self["list"].getCurrent()
                                if selection is not None:
@@ -229,15 +229,15 @@ class NameserverSetup(Screen, ConfigListScreen, HelpableScreen):
 
                self["OkCancelActions"] = HelpableActionMap(self, "OkCancelActions",
                        {
-                       "cancel": (self.cancel, _("exit nameserver configuration")),
-                       "ok": (self.ok, _("activate current configuration")),
+                       "cancel": (self.cancel, _("Exit nameserver configuration")),
+                       "ok": (self.ok, _("Activate current configuration")),
                        })
 
                self["ColorActions"] = HelpableActionMap(self, "ColorActions",
                        {
-                       "red": (self.cancel, _("exit nameserver configuration")),
-                       "green": (self.add, _("add a nameserver entry")),
-                       "yellow": (self.remove, _("remove a nameserver entry")),
+                       "red": (self.cancel, _("Exit nameserver configuration")),
+                       "green": (self.add, _("Add a nameserver entry")),
+                       "yellow": (self.remove, _("Remove a nameserver entry")),
                        })
 
                self["actions"] = NumberActionMap(["SetupActions"],
@@ -344,7 +344,7 @@ class AdapterSetup(Screen, ConfigListScreen, HelpableScreen):
                self["DNS2"] = StaticText()
                self["introduction"] = StaticText(_("Current settings:"))
 
-               self["IPtext"] = StaticText(_("IP Address"))
+               self["IPtext"] = StaticText(_("IP address"))
                self["Netmasktext"] = StaticText(_("Netmask"))
                self["Gatewaytext"] = StaticText(_("Gateway"))
 
@@ -444,14 +444,14 @@ class AdapterSetup(Screen, ConfigListScreen, HelpableScreen):
 
        def createSetup(self):
                self.list = []
-               self.InterfaceEntry = getConfigListEntry(_("Use Interface"), self.activateInterfaceEntry)
+               self.InterfaceEntry = getConfigListEntry(_("Use interface"), self.activateInterfaceEntry)
 
                self.list.append(self.InterfaceEntry)
                if self.activateInterfaceEntry.value:
                        self.dhcpEntry = getConfigListEntry(_("Use DHCP"), self.dhcpConfigEntry)
                        self.list.append(self.dhcpEntry)
                        if not self.dhcpConfigEntry.value:
-                               self.list.append(getConfigListEntry(_('IP Address'), self.ipConfigEntry))
+                               self.list.append(getConfigListEntry(_('IP address'), self.ipConfigEntry))
                                self.list.append(getConfigListEntry(_('Netmask'), self.netmaskConfigEntry))
                                self.gatewayEntry = getConfigListEntry(_('Use a gateway'), self.hasGatewayConfigEntry)
                                self.list.append(self.gatewayEntry)
@@ -470,13 +470,13 @@ class AdapterSetup(Screen, ConfigListScreen, HelpableScreen):
 
                                                self.hiddenSSID = getConfigListEntry(_("Hidden network"), config.plugins.wlan.hiddenessid)
                                                self.list.append(self.hiddenSSID)
-                                               self.wlanSSID = getConfigListEntry(_("Networkname (SSID)"), config.plugins.wlan.essid)
+                                               self.wlanSSID = getConfigListEntry(_("Network name (SSID)"), config.plugins.wlan.essid)
                                                self.list.append(self.wlanSSID)
                                                self.encryption = getConfigListEntry(_("Encryption"), config.plugins.wlan.encryption)
                                                self.list.append(self.encryption)                                               
 
-                                               self.encryptionType = getConfigListEntry(_("Encryption Keytype"), config.plugins.wlan.wepkeytype)
-                                               self.encryptionKey = getConfigListEntry(_("Encryption Key"), config.plugins.wlan.psk)
+                                               self.encryptionType = getConfigListEntry(_("Encryption key type"), config.plugins.wlan.wepkeytype)
+                                               self.encryptionKey = getConfigListEntry(_("Encryption key"), config.plugins.wlan.psk)
                                                
                                                if config.plugins.wlan.encryption.value != "Unencrypted":
                                                        if config.plugins.wlan.encryption.value == 'WEP':
@@ -800,7 +800,7 @@ class AdapterSetupConfiguration(Screen, HelpableScreen):
                if self["menulist"].getCurrent()[1] == 'test':
                        self["description"].setText(_("Test the network configuration of your receiver.\n" ) + self.oktext )
                if self["menulist"].getCurrent()[1] == 'dns':
-                       self["description"].setText(_("Edit the Nameserver configuration of your receiver.\n" ) + self.oktext )
+                       self["description"].setText(_("Edit the nameserver configuration of your receiver.\n" ) + self.oktext )
                if self["menulist"].getCurrent()[1] == 'scanwlan':
                        self["description"].setText(_("Scan your network for wireless access points and connect to them using your selected wireless device.\n" ) + self.oktext )
                if self["menulist"].getCurrent()[1] == 'wlanstatus':
@@ -808,7 +808,7 @@ class AdapterSetupConfiguration(Screen, HelpableScreen):
                if self["menulist"].getCurrent()[1] == 'lanrestart':
                        self["description"].setText(_("Restart your network connection and interfaces.\n" ) + self.oktext )
                if self["menulist"].getCurrent()[1] == 'openwizard':
-                       self["description"].setText(_("Use the Networkwizard to configure your Network\n" ) + self.oktext )
+                       self["description"].setText(_("Use the network wizard to configure your network\n" ) + self.oktext )
                if self["menulist"].getCurrent()[1][0] == 'extendedSetup':
                        self["description"].setText(_(self["menulist"].getCurrent()[1][1]) + self.oktext )
                
@@ -847,23 +847,23 @@ class AdapterSetupConfiguration(Screen, HelpableScreen):
                        if callFnc is not None:
                                self.extended = callFnc
                                if p.__call__.has_key("WlanPluginEntry"): # internally used only for WLAN Plugin
-                                       menu.append((_("Scan Wireless Networks"), "scanwlan"))
+                                       menu.append((_("Scan wireless networks"), "scanwlan"))
                                        if iNetwork.getAdapterAttribute(self.iface, "up"):
-                                               menu.append((_("Show WLAN Status"), "wlanstatus"))
+                                               menu.append((_("Show WLAN status"), "wlanstatus"))
                                else:
                                        if p.__call__.has_key("menuEntryName"):
                                                menuEntryName = p.__call__["menuEntryName"](self.iface)
                                        else:
-                                               menuEntryName = _('Extended Setup...')
+                                               menuEntryName = _('Extended setup...')
                                        if p.__call__.has_key("menuEntryDescription"):
                                                menuEntryDescription = p.__call__["menuEntryDescription"](self.iface)
                                        else:
-                                               menuEntryDescription = _('Extended Networksetup Plugin...')
+                                               menuEntryDescription = _('Extended network setup plugin...')
                                        self.extendedSetup = ('extendedSetup',menuEntryDescription, self.extended)
                                        menu.append((menuEntryName,self.extendedSetup))                                 
                        
                if os_path.exists(resolveFilename(SCOPE_PLUGINS, "SystemPlugins/NetworkWizard/networkwizard.xml")):
-                       menu.append((_("NetworkWizard"), "openwizard"))
+                       menu.append((_("Network wizard"), "openwizard"))
 
                return menu
 
@@ -1207,27 +1207,27 @@ class NetworkAdapterTest(Screen):
                self["infoshortcuts"].setEnabled(True)
                self["shortcuts"].setEnabled(False)
                if self.activebutton == 1: # Adapter Check
-                       self["InfoText"].setText(_("This test detects your configured LAN-Adapter."))
+                       self["InfoText"].setText(_("This test detects your configured LAN adapter."))
                        self["InfoTextBorder"].show()
                        self["InfoText"].show()
                        self["key_red"].setText(_("Back"))
                if self.activebutton == 2: #LAN Check
-                       self["InfoText"].setText(_("This test checks whether a network cable is connected to your LAN-Adapter.\nIf you get a \"disconnected\" message:\n- verify that a network cable is attached\n- verify that the cable is not broken"))
+                       self["InfoText"].setText(_("This test checks whether a network cable is connected to your LAN adapter.\nIf you get a \"disconnected\" message:\n- verify that a network cable is attached\n- verify that the cable is not broken"))
                        self["InfoTextBorder"].show()
                        self["InfoText"].show()
                        self["key_red"].setText(_("Back"))
                if self.activebutton == 3: #DHCP Check
-                       self["InfoText"].setText(_("This test checks whether your LAN Adapter is set up for automatic IP Address configuration with DHCP.\nIf you get a \"disabled\" message:\n - then your LAN Adapter is configured for manual IP Setup\n- verify thay you have entered correct IP informations in the AdapterSetup dialog.\nIf you get an \"enabeld\" message:\n-verify that you have a configured and working DHCP Server in your network."))
+                       self["InfoText"].setText(_("This test checks whether your LAN adapter is set up for automatic IP address configuration with DHCP.\nIf you get a \"disabled\" message:\n - then your LAN adapter is configured for manual IP setup\n- verify thay you have entered correct IP informations in the adapter setup dialog.\nIf you get an \"enabeld\" message:\n-verify that you have a configured and working DHCP server in your network."))
                        self["InfoTextBorder"].show()
                        self["InfoText"].show()
                        self["key_red"].setText(_("Back"))
                if self.activebutton == 4: # IP Check
-                       self["InfoText"].setText(_("This test checks whether a valid IP Address is found for your LAN Adapter.\nIf you get a \"unconfirmed\" message:\n- no valid IP Address was found\n- please check your DHCP, cabling and adapter setup"))
+                       self["InfoText"].setText(_("This test checks whether a valid IP address is found for your LAN adapter.\nIf you get a \"unconfirmed\" message:\n- no valid IP address was found\n- please check your DHCP, cabling and adapter setup"))
                        self["InfoTextBorder"].show()
                        self["InfoText"].show()
                        self["key_red"].setText(_("Back"))
                if self.activebutton == 5: # DNS Check
-                       self["InfoText"].setText(_("This test checks for configured Nameservers.\nIf you get a \"unconfirmed\" message:\n- please check your DHCP, cabling and Adapter setup\n- if you configured your Nameservers manually please verify your entries in the \"Nameserver\" Configuration"))
+                       self["InfoText"].setText(_("This test checks for configured nameservers.\nIf you get a \"unconfirmed\" message:\n- please check your DHCP, cabling and adapter setup\n- if you configured your nameservers manually please verify your entries in the \"Nameserver\" configuration"))
                        self["InfoTextBorder"].show()
                        self["InfoText"].show()
                        self["key_red"].setText(_("Back"))
@@ -1259,38 +1259,38 @@ class NetworkAdapterTest(Screen):
                self["key_yellow"].setText("")
 
        def setLabels(self):
-               self["Adaptertext"] = MultiColorLabel(_("LAN Adapter"))
+               self["Adaptertext"] = MultiColorLabel(_("LAN adapter"))
                self["Adapter"] = MultiColorLabel()
                self["AdapterInfo"] = MultiPixmap()
-               self["AdapterInfo_Text"] = MultiColorLabel(_("Show Info"))
+               self["AdapterInfo_Text"] = MultiColorLabel(_("Show info"))
                self["AdapterInfo_OK"] = Pixmap()
                
                if self.iface in iNetwork.wlan_interfaces:
-                       self["Networktext"] = MultiColorLabel(_("Wireless Network"))
+                       self["Networktext"] = MultiColorLabel(_("Wireless network"))
                else:
-                       self["Networktext"] = MultiColorLabel(_("Local Network"))
+                       self["Networktext"] = MultiColorLabel(_("Local network"))
                
                self["Network"] = MultiColorLabel()
                self["NetworkInfo"] = MultiPixmap()
-               self["NetworkInfo_Text"] = MultiColorLabel(_("Show Info"))
+               self["NetworkInfo_Text"] = MultiColorLabel(_("Show info"))
                self["NetworkInfo_Check"] = MultiPixmap()
                
                self["Dhcptext"] = MultiColorLabel(_("DHCP"))
                self["Dhcp"] = MultiColorLabel()
                self["DhcpInfo"] = MultiPixmap()
-               self["DhcpInfo_Text"] = MultiColorLabel(_("Show Info"))
+               self["DhcpInfo_Text"] = MultiColorLabel(_("Show info"))
                self["DhcpInfo_Check"] = MultiPixmap()
                
-               self["IPtext"] = MultiColorLabel(_("IP Address"))
+               self["IPtext"] = MultiColorLabel(_("IP address"))
                self["IP"] = MultiColorLabel()
                self["IPInfo"] = MultiPixmap()
-               self["IPInfo_Text"] = MultiColorLabel(_("Show Info"))
+               self["IPInfo_Text"] = MultiColorLabel(_("Show info"))
                self["IPInfo_Check"] = MultiPixmap()
                
                self["DNStext"] = MultiColorLabel(_("Nameserver"))
                self["DNS"] = MultiColorLabel()
                self["DNSInfo"] = MultiPixmap()
-               self["DNSInfo_Text"] = MultiColorLabel(_("Show Info"))
+               self["DNSInfo_Text"] = MultiColorLabel(_("Show info"))
                self["DNSInfo_Check"] = MultiPixmap()
                
                self["EditSettings_Text"] = MultiColorLabel(_("Edit settings"))
index 4494c6e..121b322 100644 (file)
@@ -98,7 +98,7 @@ class ParentalControlSetup(Screen, ConfigListScreen, ProtectedScreen):
                                self.editBouquetListEntry = getConfigListEntry(_("Edit bouquets list"), NoSave(ConfigNothing()))
                                self.list.append(self.editBouquetListEntry)
                                #New option to reload service lists (for example if bouquets have changed)
-                               self.reloadLists = getConfigListEntry(_("Reload Black-/Whitelists"), NoSave(ConfigNothing()))
+                               self.reloadLists = getConfigListEntry(_("Reload black-/white lists"), NoSave(ConfigNothing()))
                                self.list.append(self.reloadLists)
                                
                self["config"].list = self.list
index b69eb54..9845ebf 100644 (file)
@@ -49,8 +49,8 @@ class PluginBrowser(Screen):
 
                self.firsttime = True
 
-               self["red"] = Label(_("Remove Plugins"))
-               self["green"] = Label(_("Download Plugins"))
+               self["red"] = Label(_("Remove plugins"))
+               self["green"] = Label(_("Download plugins"))
                
                self.list = []
                self["list"] = PluginList(self.list)
@@ -128,7 +128,7 @@ class PluginBrowser(Screen):
                        try:
                                from Plugins.SystemPlugins.SoftwareManager.plugin import PluginManager
                        except ImportError:
-                               self.session.open(MessageBox, _("The Softwaremanagement extension is not installed!\nPlease install it."), type = MessageBox.TYPE_INFO,timeout = 10 )
+                               self.session.open(MessageBox, _("The software management extension is not installed!\nPlease install it."), type = MessageBox.TYPE_INFO,timeout = 10 )
                        else:
                                self.session.openWithCallback(self.PluginDownloadBrowserClosed, PluginManager)
 
@@ -199,7 +199,7 @@ class PluginDownloadBrowser(Screen):
                        if self.type == self.DOWNLOAD:
                                self.session.openWithCallback(self.runInstall, MessageBox, _("Do you really want to download\nthe plugin \"%s\"?") % sel.name)
                        elif self.type == self.REMOVE:
-                               self.session.openWithCallback(self.runInstall, MessageBox, _("Do you really want to REMOVE\nthe plugin \"%s\"?") % sel.name)
+                               self.session.openWithCallback(self.runInstall, MessageBox, _("Do you really want to remove\nthe plugin \"%s\"?") % sel.name)
 
        def requestClose(self):
                if self.plugins_changed:
index f4b6f4f..1f31897 100644 (file)
@@ -91,9 +91,9 @@ class RecordPathsSettings(Screen,ConfigListScreen):
                if config.usage.setup_level.index >= 2:
                        self.default_entry = getConfigListEntry(_("Default movie location"), self.default_dirname)
                        self.list.append(self.default_entry)
-                       self.timer_entry = getConfigListEntry(_("Timer record location"), self.timer_dirname)
+                       self.timer_entry = getConfigListEntry(_("Timer recording location"), self.timer_dirname)
                        self.list.append(self.timer_entry)
-                       self.instantrec_entry = getConfigListEntry(_("Instant record location"), self.instantrec_dirname)
+                       self.instantrec_entry = getConfigListEntry(_("Instant recording location"), self.instantrec_dirname)
                        self.list.append(self.instantrec_entry)
                else:
                        self.default_entry = getConfigListEntry(_("Movie location"), self.default_dirname)
index 57eb809..ec7a2cc 100644 (file)
@@ -169,7 +169,7 @@ class CableTransponderSearchSupport:
                                        parm.modulation = qam[data[4]]
                                        parm.inversion = inv[data[5]]
                                        self.__tlist.append(parm)
-                               tmpstr = _("Try to find used Transponders in cable network.. please wait...")
+                               tmpstr = _("Try to find used transponders in cable network.. please wait...")
                                tmpstr += "\n\n"
                                tmpstr += data[1]
                                tmpstr += " kHz "
@@ -419,7 +419,7 @@ class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport):
                                self.list.append(getConfigListEntry(_("Hierarchy info"), self.scan_ter.hierarchy))
                self.list.append(getConfigListEntry(_("Network scan"), self.scan_networkScan))
                self.list.append(getConfigListEntry(_("Clear before scan"), self.scan_clearallservices))
-               self.list.append(getConfigListEntry(_("Only Free scan"), self.scan_onlyfree))
+               self.list.append(getConfigListEntry(_("Only free scan"), self.scan_onlyfree))
                self["config"].list = self.list
                self["config"].l.setList(self.list)
 
@@ -965,7 +965,7 @@ class ScanSimple(ConfigListScreen, Screen, CableTransponderSearchSupport):
                                self.list.append(getConfigListEntry(_("Scan ") + nim.slot_name + " (" + nim.friendly_type + ")", nimconfig))
 
                ConfigListScreen.__init__(self, self.list)
-               self["header"] = Label(_("Automatic Scan"))
+               self["header"] = Label(_("Automatic scan"))
                self["footer"] = Label(_("Press OK to scan"))
 
        def runAsync(self, finished_cb):
index cde451a..94486f2 100644 (file)
@@ -140,24 +140,24 @@ class ServiceInfo(Screen):
                else:
                        if self.transponder_info:
                                tp_info = ConvertToHumanReadable(self.transponder_info)
-                               conv = { "tuner_type"           : _("Transponder Type"),
+                               conv = { "tuner_type"           : _("Transponder type"),
                                                 "system"                       : _("System"),
                                                 "modulation"           : _("Modulation"),
-                                                "orbital_position" : _("Orbital Position"),
+                                                "orbital_position" : _("Orbital position"),
                                                 "frequency"            : _("Frequency"),
-                                                "symbol_rate"          : _("Symbolrate"),
+                                                "symbol_rate"          : _("Symbol rate"),
                                                 "bandwidth"            : _("Bandwidth"),
                                                 "polarization"         : _("Polarization"),
                                                 "inversion"            : _("Inversion"),
                                                 "pilot"                        : _("Pilot"),
-                                                "rolloff"                      : _("Rolloff"),
+                                                "rolloff"                      : _("Roll-off"),
                                                 "fec_inner"            : _("FEC"),
                                                 "code_rate_lp"         : _("Coderate LP"),
                                                 "code_rate_hp"         : _("Coderate HP"),
                                                 "constellation"        : _("Constellation"),
-                                                "transmission_mode": _("Transmission Mode"),
-                                                "guard_interval"       : _("Guard Interval"),
-                                                "hierarchy_information": _("Hierarchy Information") }
+                                                "transmission_mode": _("Transmission mode"),
+                                                "guard_interval"       : _("Guard interval"),
+                                                "hierarchy_information": _("Hierarchy information") }
                                Labels = [(conv[i], tp_info[i], i == "orbital_position" and TYPE_VALUE_ORBIT_DEC or TYPE_VALUE_DEC) for i in tp_info.keys() if i in conv]
                                self.fillList(Labels)
 
index 0909149..446a2a5 100644 (file)
@@ -28,9 +28,9 @@ class SleepTimerEdit(Screen):
                self["current_status"] = Label()
                self.is_active = self.session.nav.SleepTimer.isActive()
                if self.is_active:
-                       self["current_status"].setText(_("Timer status:") + " " + _("Enabled"))
+                       self["current_status"].setText(_("Timer status:") + " " + _("enabled"))
                else:
-                       self["current_status"].setText(_("Timer status:") + " " + _("Disabled"))
+                       self["current_status"].setText(_("Timer status:") + " " + _("disabled"))
                
                if self.is_active:
                        self.time = self.session.nav.SleepTimer.getCurrentSleepTime()
@@ -80,7 +80,7 @@ class SleepTimerEdit(Screen):
                
                if config.SleepTimer.action.value == "shutdown":
                        if SystemInfo["DeepstandbySupport"]:
-                               shutdownString = _("Deep Standby")
+                               shutdownString = _("Deep standby")
                        else:
                                shutdownString = _("Shutdown")
                        self["green_text"].setText(_("Sleep timer action:") + " " + shutdownString)
@@ -88,9 +88,9 @@ class SleepTimerEdit(Screen):
                        self["green_text"].setText(_("Sleep timer action:") + " " + _("Standby"))
                
                if config.SleepTimer.ask.value:
-                       self["yellow_text"].setText(_("Ask before shutdown:") + " " + _("yes"))
+                       self["yellow_text"].setText(_("Confirm shutdown:") + " " + _("yes"))
                else:
-                       self["yellow_text"].setText(_("Ask before shutdown:") + " " + _("no"))
+                       self["yellow_text"].setText(_("Confirm shutdown:") + " " + _("no"))
                self["blue_text"].setText(_("Use time of currently running service"))
 
        def cancel(self):
index 8e539c5..71d400c 100644 (file)
@@ -76,11 +76,11 @@ class UpdatePlugin(Screen):
                        # TODO: Use Twisted's URL fetcher, urlopen is evil. And it can
                        # run in parallel to the package update.
                        if getBoxType() in urlopen("http://openpli.org/status").read().split(','):
-                               message = _("The current beta image might not be stable.\nFor more information see www.openpli.org.")
+                               message = _("The current beta image might not be stable.\nFor more information see %s.") % ("www.openpli.org")
                                picon = MessageBox.TYPE_ERROR
                                default = False
                except:
-                       message = _("The status of the current beta image could not be checked because www.openpli.org can not be reached.")
+                       message = _("The status of the current beta image could not be checked because %s can not be reached.") % ("www.openpli.org")
                        picon = MessageBox.TYPE_ERROR
                        default = False
                socket.setdefaulttimeout(currentTimeoutDefault)
index 8381694..6cb5214 100644 (file)
@@ -115,9 +115,9 @@ class QuitMainloopScreen(Screen):
                from Components.Label import Label
                text = { 1: _("Your receiver is shutting down"),
                        2: _("Your receiver is rebooting"),
-                       3: _("The User Interface of your receiver is restarting"),
+                       3: _("The user interface of your receiver is restarting"),
                        4: _("Your frontprocessor will be upgraded\nPlease wait until your receiver reboots\nThis may take a few minutes"),
-                       5: _("The User Interface of your receiver is restarting\ndue to an error in mytest.py"),
+                       5: _("The user interface of your receiver is restarting\ndue to an error in mytest.py"),
                        42: _("Unattended upgrade in progress\nPlease wait until your receiver reboots\nThis may take a few minutes") }.get(retvalue) 
                self["text"] = Label(text)
 
index 4c8ce3b..ea4e4c1 100644 (file)
@@ -53,7 +53,7 @@ class TimerEditList(Screen):
                                "up": self.up,
                                "down": self.down
                        }, -1)
-               self.setTitle(_("Timer Overview"))
+               self.setTitle(_("Timer overview"))
                self.session.nav.RecordTimer.on_state_change.append(self.onStateChange)
                self.onShown.append(self.updateState)
 
index 96a50ca..3ca5dd2 100644 (file)
@@ -149,9 +149,9 @@ class TimerEntry(Screen, ConfigListScreen):
                self.list = []
                self.list.append(getConfigListEntry(_("Name"), self.timerentry_name))
                self.list.append(getConfigListEntry(_("Description"), self.timerentry_description))
-               self.timerJustplayEntry = getConfigListEntry(_("Timer Type"), self.timerentry_justplay)
+               self.timerJustplayEntry = getConfigListEntry(_("Timer type"), self.timerentry_justplay)
                self.list.append(self.timerJustplayEntry)
-               self.timerTypeEntry = getConfigListEntry(_("Repeat Type"), self.timerentry_type)
+               self.timerTypeEntry = getConfigListEntry(_("Repeat type"), self.timerentry_type)
                self.list.append(self.timerTypeEntry)
 
                if self.timerentry_type.value == "once":
@@ -181,13 +181,13 @@ class TimerEntry(Screen, ConfigListScreen):
                if self.timerentry_type.value == "once":
                        self.list.append(self.entryDate)
                
-               self.entryStartTime = getConfigListEntry(_("StartTime"), self.timerentry_starttime)
+               self.entryStartTime = getConfigListEntry(_("Start time"), self.timerentry_starttime)
                self.list.append(self.entryStartTime)
                
-               self.entryShowEndTime = getConfigListEntry(_("Set End Time"), self.timerentry_showendtime)
+               self.entryShowEndTime = getConfigListEntry(_("Set end time"), self.timerentry_showendtime)
                if self.timerentry_justplay.value == "zap":
                        self.list.append(self.entryShowEndTime)
-               self.entryEndTime = getConfigListEntry(_("EndTime"), self.timerentry_endtime)
+               self.entryEndTime = getConfigListEntry(_("End time"), self.timerentry_endtime)
                if self.timerentry_justplay.value != "zap" or self.timerentry_showendtime.value:
                        self.list.append(self.entryEndTime)