diff --git a/ChangeLog b/ChangeLog index 740218f44..92c21356e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,254 @@ +2017-11-02 Thilo Graf + + update version to 3.6.1 + start up AX/Mut@nt hd51 support + +2017-11-02 GetAway + + menue.cpp: dont use one-time init of a variable that could be changed on runtime + +2017-11-02 svenhoefer + + - rename can_set_display_brightness => display_can_set_brightness + +2017-11-02 svenhoefer + + - vfd-setup: use new display_can_deepstandby member from libstb-hal + + Build was broken with original cherry-pick. hw_caps_t was incomplete. + +2017-11-01 svenhoefer + + - simple_display: more readability in togglePower() function + + - simple_display: fix showRCLock() function + + - epgview: disable epgid debug code + +2017-11-01 TangoCash + + - movieplayer: add progress to vfd + +2017-11-01 svenhoefer + + - introduce simple_display.h; just a cleaned copy of lcdd.h + +2017-11-01 Striper + + - CMovieBrowser::info_hdd_level(): fix miscalculation + +2017-11-01 TangoCash + + fix hevc record + +2017-10-31 TangoCash + + add support for H265 + +2017-10-30 svenhoefer + + - acinclude: move default PUBLIC_HTTPDDIR from /var/httpd to /var/tuxbox/httpd + + - audioplayer: allow RC_previoussong and RC_nextsong + +2017-10-29 svenhoefer + + - rcinput: add some new keys ... + and translate KEY_VIDEO (list-key) to RC_favorites for ARM_HARDWARE + + - update: ask for copy settings to new image + + - update_menue: hide expert functions for ARM_HARDWARE + + - update: allow ofgwrite to flash another partition + + - zapit: add missing "case DVB_T2" to getDelSys() + + - channellist: add separator item to menu for a smoother view + + - update: fix osd flickering + + - hdd-menu: hide mmcblk devices from hdd-menu + +2017-10-29 Thilo Graf + + CLCD: fix possible compile error + error: declaration of 'power' shadows a global declaration [-Werror=shadow] + + CLCD: fix possible compile error + error: unused variable 'ret' [-Werror=unused-variable] + + CScreenShot: fix build + Some lines were wrong picked + +2017-10-29 TangoCash + + small zapit fix + +2017-10-29 svenhoefer + + - locale: minor changes in update-locales + + - update: allow online-update for AX/Mutant; add some beautiful ifdef's + #ifdefs not really beautiful but sometimes inevitable + +2017-10-29 J. Krieg + + cables.xml: update Unitymedia BW (former Kabel BW) - rearrangement channels, October 2017 + +2017-10-29 svenhoefer + + - update: allow tgz-tarballs for update via ofgwrite + + - yWeb: silent screenshots + +2017-10-29 TangoCash + + modify uhd channel detection to catch channels broadcasting not in DVB specs + +2017-10-29 svenhoefer + + - deutsch.locale: small spelling fixes + +2017-10-29 TangoCash + + modify autocreate HD _and_ UHD channels as seperate lists + + - zapit: detect uhd-channels + +2017-10-29 Striper + + - fix typo + +2017-10-29 svenhoefer + + - yWeb: fix 9eb1060cbb14f6a29ed289b52c0214ffc67503e0 + + - yWeb: enable auto-reload of screenshots + + - yWeb: signalize standby-mode in status-button's color; thx to fred_feuerstein + + let playback handle devices + + - yWeb: fix grab-handling + + - yWeb: fix manual selection of remote control + + - yWeb: add Mutant HD51 remote control; thx to fred_feuerstein + + - yWeb: improve rc_hd51.png + + - yWeb: fix up/down <-> pageup/pagedown keys; enable sleep key + + - yWeb: enable grab to do screenshots + +2017-10-29 svenhoefer + + - audio_select: copy full code from TangoCash + Just compile tested. Maybe some more alignments needed. + + Additional changes on cs playback_cs.h, because broken build + +2017-10-29 Thilo Graf + + data: add missing epglanguages.conf + +2017-10-29 TangoCash + + armbox: fix dimming vfd + + armbox: show grafical volume in vfd + + fix time in vfd + + fix some keys + + fix resolution icon in infoviewer + + update webif + + fix gstreamer playback + + fix select osd resolution + + adding 4k video settings for armbox + + start implementing hardware acceleration for armbox + you have to compile neutrino with "--enable-reschange" to use FullHD-OSD + +2017-10-29 vanhofen + + - add hd51; mostly ported from TangoCash's neutrino-mp + +2017-10-29 Thilo Graf + + src/Makefile.am: add missing possible static dir for libcoolstream.mt + + tuxtxt_common.h: add missing init to readcnt + + locales: generalize image settings, rewrite welcome text + + locales: use german entries for channel scan + + locales: complete plugin entry for plugins.hdd_dir + + locales: typo fix + + locales: message for record scan generalized + + locales: hint for followscreenings setup shortened + + locales: hint for moviebrowser setup shortened + + locales: hint for channel logo setup shortened + + locales: generalize system info hint + + locales: generalize channel logo option + + locales: use more shorter/plausible entries for hdd setup + + locales: use shorter warning message for local update + + locales: use more plausible name menue entry for theme reset + + locales: use more plausible entries for audio and epg plus + +2017-10-29 svenhoefer + + - add UHD icons to infoviewer + +2017-10-29 Thilo Graf + + icons/status/channel/Makefile: add entries for UHD status icons + +2017-10-29 Thilo Graf + + neutrino: add Liberation Fonts + + Based up commit from: + https://sourceforge.net/p/tuxbox-cvs/apps/ci/2577990c6e8effa45d04738e87c8082cf3ffe52d/ + +2017-10-29 Thilo Graf + + armbox: add configure lines for some useful options for paths and hd51 builds + +2017-10-24 Thilo Graf + + CNetworkSetup: disable network_services menu + Required with yocto build + +2017-10-23 M. Liebmann + + CLuaInstCurl: Add script functions + - encodeUri + - decodeUri + - setUriData + - Set Lua api version to 1.78 + + CLuaInstCurl: Fix CurlDownload() to send POST data + - Set Lua api version to 1.77 + 2017-10-17 Thilo Graf update version to 3.6.0 diff --git a/acinclude.m4 b/acinclude.m4 index 9b3763a56..9beb63611 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -172,6 +172,9 @@ TUXBOX_APPS_DIRECTORY_ONE(webtvdir,WEBTVDIR,datadir,/share,/tuxbox/neutrino/webt TUXBOX_APPS_DIRECTORY_ONE(webtvdir_var,WEBTVDIR_VAR,localstatedir,/var,/tuxbox/webtv, [--with-webtvdir_var=PATH ],[where to find the webtv content in /var]) +TUXBOX_APPS_DIRECTORY_ONE(webtvdir,WEBTVDIR,datadir,/share,/tuxbox/neutrino/webtv, + [--with-webtvdir=PATH ],[where to find the webtv content]) + TUXBOX_APPS_DIRECTORY_ONE(plugindir_mnt,PLUGINDIR_MNT,mntdir,/mnt,/plugins, [--with-plugindir_mnt=PATH ],[where to find the the extern plugins]) @@ -206,7 +209,7 @@ TUXBOX_APPS_DIRECTORY_ONE(hosted_httpddir,HOSTED_HTTPDDIR,mntdir,/mnt,/hosted, [--with-hosted_httpddir=PATH ],[where to find the the hosted files]) TUXBOX_APPS_DIRECTORY_ONE(flagdir,FLAGDIR,localstatedir,/var,/etc, - [--with-flagdir=PATH ],[where to find the the flagfiles]) + [--with-flagdir=PATH ],[where to find flagfiles]) ]) dnl automake <= 1.6 needs this specifications @@ -214,6 +217,7 @@ AC_SUBST(CONFIGDIR) AC_SUBST(DATADIR) AC_SUBST(FONTDIR) AC_SUBST(FONTDIR_VAR) +AC_SUBST(FLAGDIR) AC_SUBST(GAMESDIR) AC_SUBST(LIBDIR) AC_SUBST(MNTDIR) @@ -312,9 +316,9 @@ _TUXBOX_APPS_LIB_PKGCONFIG($1,$2) AC_DEFUN([TUXBOX_BOXTYPE],[ AC_ARG_WITH(boxtype, - [ --with-boxtype valid values: tripledragon,coolstream,spark,azbox,generic], + [ --with-boxtype valid values: tripledragon,coolstream,spark,azbox,generic,armbox], [case "${withval}" in - tripledragon|coolstream|spark|azbox|generic) + tripledragon|coolstream|spark|azbox|generic|armbox) BOXTYPE="$withval" ;; *) @@ -323,7 +327,8 @@ AC_ARG_WITH(boxtype, AC_ARG_WITH(boxmodel, [ --with-boxmodel valid for coolstream: hd1, hd2 - valid for generic: raspi], + valid for armbox: hd51 + valid for generic: raspi], [case "${withval}" in hd1|hd2) if test "$BOXTYPE" = "coolstream"; then @@ -344,6 +349,13 @@ AC_ARG_WITH(boxmodel, AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) fi ;; + hd51) + if test "$BOXTYPE" = "armbox"; then + BOXMODEL="$withval" + else + AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) + fi + ;; raspi) if test "$BOXTYPE" = "generic"; then BOXMODEL="$withval" @@ -365,6 +377,7 @@ AM_CONDITIONAL(BOXTYPE_TRIPLE, test "$BOXTYPE" = "tripledragon") AM_CONDITIONAL(BOXTYPE_COOL, test "$BOXTYPE" = "coolstream") AM_CONDITIONAL(BOXTYPE_SPARK, test "$BOXTYPE" = "spark") AM_CONDITIONAL(BOXTYPE_GENERIC, test "$BOXTYPE" = "generic") +AM_CONDITIONAL(BOXTYPE_ARMBOX, test "$BOXTYPE" = "armbox") AM_CONDITIONAL(BOXMODEL_CS_HD1,test "$BOXMODEL" = "hd1") AM_CONDITIONAL(BOXMODEL_CS_HD2,test "$BOXMODEL" = "hd2") @@ -381,6 +394,8 @@ elif test "$BOXTYPE" = "spark"; then AC_DEFINE(HAVE_SPARK_HARDWARE, 1, [building for a goldenmedia 990 or edision pingulux]) elif test "$BOXTYPE" = "generic"; then AC_DEFINE(HAVE_GENERIC_HARDWARE, 1, [building for a generic device like a standard PC]) +elif test "$BOXTYPE" = "armbox"; then + AC_DEFINE(HAVE_ARM_HARDWARE, 1, [building for an armbox]) fi # TODO: do we need more defines? @@ -389,6 +404,8 @@ if test "$BOXMODEL" = "hd1"; then elif test "$BOXMODEL" = "hd2"; then AC_DEFINE(BOXMODEL_CS_HD2, 1, [coolstream tank/trinity/trinity v2/trinity duo/zee2/link]) AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION,1,[enable change the osd resolution]) +elif test "$BOXMODEL" = "hd51"; then + AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION,1,[enable change the osd resolution]) elif test "$BOXMODEL" = "raspi"; then AC_DEFINE(BOXMODEL_RASPI, 1, [Raspberry pi]) fi diff --git a/data/fonts/LiberationSans-Bold.ttf b/data/fonts/LiberationSans-Bold.ttf new file mode 100644 index 000000000..2d7addc03 Binary files /dev/null and b/data/fonts/LiberationSans-Bold.ttf differ diff --git a/data/fonts/LiberationSans-BoldItalic.ttf b/data/fonts/LiberationSans-BoldItalic.ttf new file mode 100644 index 000000000..d78e96d8b Binary files /dev/null and b/data/fonts/LiberationSans-BoldItalic.ttf differ diff --git a/data/fonts/LiberationSans-Italic.ttf b/data/fonts/LiberationSans-Italic.ttf new file mode 100644 index 000000000..d13947859 Binary files /dev/null and b/data/fonts/LiberationSans-Italic.ttf differ diff --git a/data/fonts/LiberationSans-Regular.ttf b/data/fonts/LiberationSans-Regular.ttf new file mode 100644 index 000000000..59d2e251b Binary files /dev/null and b/data/fonts/LiberationSans-Regular.ttf differ diff --git a/data/fonts/liberation_sans/AUTHORS b/data/fonts/liberation_sans/AUTHORS new file mode 100644 index 000000000..e201c6e7c --- /dev/null +++ b/data/fonts/liberation_sans/AUTHORS @@ -0,0 +1,10 @@ +Font Designer: + Ascender Corporation. + http://www.ascendercorp.com/ + +Original Designer: + Steve Matteson + http://www.ascendercorp.com/typedesigners.html + +Current Maintainer: + Caius Chance diff --git a/data/fonts/liberation_sans/COPYING b/data/fonts/liberation_sans/COPYING new file mode 100644 index 000000000..d60c31a97 --- /dev/null +++ b/data/fonts/liberation_sans/COPYING @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/data/fonts/liberation_sans/ChangeLog b/data/fonts/liberation_sans/ChangeLog new file mode 100644 index 000000000..e30cc6462 --- /dev/null +++ b/data/fonts/liberation_sans/ChangeLog @@ -0,0 +1,151 @@ +* Mon 12 Jan 2009 Caius Chance +- Fixed copyright holder name typo for Sans Regular font (rhbz#479521). + +* Tue 09 Dec 2008 Caius Chance +- Changed cent sign glyph (U+00A2) to be coressed in Sans and Mono + (rhbz#474522). + +* Wed 03 Dec 2008 Caius Chance +- Started 1.04.93.devel. +- Fixed blurriness of U+03BC for Sans Regular font (rhbz#473481). +- Fixed src tarball mis-inclusion of dist files in Makefile. + +* Fri 28 Nov 2008 Caius Chance +- Corrected version number in Makefile. +- Fixed make target of source tarball. +- Uploaded 1.04.92 source tarball to release area. + +* Wed 15 Oct 2008 Caius Chance +- Fixed blurred 'u' and 'W' for Sans Bold font (rhbz#463036). +- Released as version 1.04.92 + +* Wed 17 Sep 2008 Caius Chance +- Fixed missing hinting instructions for all Mono fonts (rhbz#460090). +- Fixed missing hinting instructions for all Sans fonts (rhbz#460090). +- Fixed missing hinting instructions for all Serif fonts (rhbz#460090). +- Released as version 1.04.91 + +* Tue 09 Sep 2008 Caius Chance +- Backed up all released files in ./dist directory. + +* Fri 05 Sep 2008 Caius Chance +- Fixed incorrect glyph points and missing hinting instructions for: + Mono Bold Italic (up to U+2012) (rhbz#460090). + +* Mon 25 Aug 2008 Caius Chance +- Fixed incorrect glyph points and missing hinting instructions for: + U+0079, U+03BC, U+0431, U+2010..2012, U+1114117 (rhbz#458592). +- Released as version 1.04.90. + +* Thu 13 Jul 2008 Caius Chance +- Released as version 1.04. + +* Thu 12 Jun 2008 Caius Chance +- Released as version 1.04.beta2 (1.03.99). +- Added ZIP package building for non-tar users. +- rhbz#440992: + - Created Romanian "T/t/S/s with comma below" (U+0218..021B) on all fonts. + - Fixed "T/s with cedilla below" (U+0162/0163) on all fonts. + - Created "Hyphen" and "Non-Breaking Hyphen" (U+2010..2011) on all fonts. + +* Wed 11 Jun 2008 Caius Chance +- Added last Version 1.03 from original manufacturer. +- Renamed directory 'archive' to 'sandbox'. +- Added directory description in hosting home directory. +- Created ZIP packages for Version 1.03 and 1.04.beta. + +* Tue 04 Jun 2008 Caius Chance +- rhbz#440992: + - Created "Hyphen" and "Non-Breaking Hyphen" (U+2010..2011) on Sans Regular. + +* Mon 03 Jun 2008 Caius Chance +- rhbz#440992: + - Created Romanian "T/t/S/s with comma below" (U+0218..021B) on Sans Regular. + - Fixed "T/s with cedilla below" (U+0162/0163) on Sans Regular. + +* Fri 30 May 2008 Caius Chance +- Release Version 1.04.beta (liberation-fonts-1_04_beta). + +* Thu 29 May 2008 Caius Chance +- Correct SFD version numbers in "TTF Info" categor for correct version + number during export to TTFs. + +* Wed 28 May 2008 Caius Chance +- Reencoded with "Glyph Order" by FontForge. +- Corrected font name for all Regular fonts. +- Generated TTFs (experimantal, in "archive") with old stle kern and dummy + DSIG table. +- Updated README in 1.04b TTFs (experimental, in "archive"). + +* Tue 27 May 2008 Caius Chance +- Fixed Unicode name mis-mapping of Sans and Serif TTF files. +- Regenerate SFD files from Unicode name mis-mapping fixed Sans and Serif TTF + files. + +* Mon 26 May 2008 Caius Chance +- Fixed Unicode name mis-mapping of Mono TTF files. +- Regenerate SFD files from Unicode name mis-mapping fixed Mono TTF files. +========== +- Applied following patches submitted by Nicolas Spalinger + : + - We-need-versioned-tarballs. + - Add-ignore-file-so-the-VCS-does-not-track-the-folder. + - Adjust-path-for-various-Makefile-targets-subfolders. + - Fix-versionning-mismatch-in-the-binary-font-metadata. + - Add-some-description-and-extra-lines-to-the-build-ta. + - Reword-and-restructure-maintainers-recommendations. + - Some-rewording-of-the-readme-file. +========== + +* Thu May 22 2008 Caius Chance +- Added latest (1.03) TTF files from Ascender. (in 'archive') + +* Fri May 16 2008 Caius Chance +- Change source tree as 'trunk', 'tags', 'branches'. +========== +- Applied following patches submitted by Nicolas Spalinger + : + - Add-more-information-about-the-upstream-designer. + - Minor-typo-and-layout-fixes. + - Adjust-fontforge-path-with-env-as-a-source-build. +========== + +* Wed May 14 2008 Caius Chance +- Renamed target 'ttf' to 'build'. +- Removed 'Re-Package' chapter from README and refine contents. +- Changed AUTHORS contents. +- Created maintainer documentation MAINTAINER. + +* Tue May 06 2008 Caius Chance +- Refined clean target. +- Removed TTFs from git. + +* Fri May 02 2008 Caius Chance +- Imported into fedorahosted.org repository and be hosted. + https://fedorahosted.org/liberation-fonts/ +- Modified source root directory name definition in Makefile. +- Created 'dist' target for binary TTF tarball and 'src' for source tarball. +- Corrected Regular fonts filenames. +- Added TTF -> SFD make target. + +* Thu May 01 2008 Caius Chance +- Converted previous TTF files into SFD files to be open source. +- Created fontforge SFD -> TTF scripts. +- Created Makefile. +- Added documentations: AUTHORS, ChangeLog, README. + +* Thu Apr 10 2008 Caius Chance +- Fixed exchanged and incomplete glyphs (from Ascender). +- Repacked source tarball. +- Released version 1.03. + +* Tue Mar 25 2008 Caius Chance +- Fixed alignment mismatch of dot accents (from Ascender). +- Released version 1.02. + +* Mon Jan 14 2008 Caius Chance +- Updated new source tarball from Ascender. +- Released version 1.0. + +* Thu Jun 14 2007 Caius Chance +- Updated new source tarball from Ascender. diff --git a/data/fonts/liberation_sans/License.txt b/data/fonts/liberation_sans/License.txt new file mode 100644 index 000000000..b0e1f3edc --- /dev/null +++ b/data/fonts/liberation_sans/License.txt @@ -0,0 +1,19 @@ +LICENSE AGREEMENT AND LIMITED PRODUCT WARRANTY +LIBERATION FONT SOFTWARE + +This agreement governs the use of the Software and any updates to the Software, regardless of the delivery mechanism. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to the user ("Client") a license to this work pursuant to the GNU General Public License v.2 with the exceptions set forth below and such other terms as are set forth in this End User License Agreement. + + 1. The Software and License Exception. LIBERATION font software (the "Software") consists of TrueType-OpenType formatted font software for rendering LIBERATION typefaces in sans-serif, serif, and monospaced character styles. You are licensed to use, modify, copy, and distribute the Software pursuant to the GNU General Public License v.2 with the following exceptions: + + (a) As a special exception, if you create a document which uses this font, and embed this font or unaltered portions of this font into the document, this font does not by itself cause the resulting document to be covered by the GNU General Public License. This exception does not however invalidate any other reasons why the document might be covered by the GNU General Public License. If you modify this font, you may extend this exception to your version of the font, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. + + (b) As a further exception, any distribution of the object code of the Software in a physical product must provide you the right to access and modify the source code for the Software and to reinstall that modified version of the Software in object code form on the same physical product on which you received it. + + 2. Intellectual Property Rights. The Software and each of its components, including the source code, documentation, appearance, structure and organization are owned by Red Hat and others and are protected under copyright and other laws. Title to the Software and any component, or to any copy, modification, or merged portion shall remain with the aforementioned, subject to the applicable license. The "LIBERATION" trademark is a trademark of Red Hat, Inc. in the U.S. and other countries. This agreement does not permit Client to distribute modified versions of the Software using Red Hat's trademarks. If Client makes a redistribution of a modified version of the Software, then Client must modify the files names to remove any reference to the Red Hat trademarks and must not use the Red Hat trademarks in any way to reference or promote the modified Software. + + 3. Limited Warranty. To the maximum extent permitted under applicable law, the Software is provided and licensed "as is" without warranty of any kind, expressed or implied, including the implied warranties of merchantability, non-infringement or fitness for a particular purpose. Red Hat does not warrant that the functions contained in the Software will meet Client's requirements or that the operation of the Software will be entirely error free or appear precisely as described in the accompanying documentation. + + 4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential damages, including lost profits or lost savings arising out of the use or inability to use the Software, even if Red Hat or such dealer has been advised of the possibility of such damages. + + 5. General. If any provision of this agreement is held to be unenforceable, that shall not affect the enforceability of the remaining provisions. This agreement shall be governed by the laws of the State of North Carolina and of the United States, without regard to any conflict of laws provisions, except that the United Nations Convention on the International Sale of Goods shall not apply. +Copyright © 2007 Red Hat, Inc. All rights reserved. LIBERATION is a trademark of Red Hat, Inc. diff --git a/data/fonts/liberation_sans/README b/data/fonts/liberation_sans/README new file mode 100644 index 000000000..e57b91222 --- /dev/null +++ b/data/fonts/liberation_sans/README @@ -0,0 +1,68 @@ +1. What's this? +=============== + +The Liberation Fonts are intended to be open font replacements for the three +most commonly used fonts on Microsoft systems: Times New Roman, Arial, and +Courier New. + + +2. Requirements +=============== + + * fontforge. + - http://fontforge.sourceforge.net + + +3. Install +========== + +3.1 Decompress tarball + + You can extract the files by following command: + + $ tar zxvf liberation-fonts-[VERSION].tar.gz + +3.2 Build from the source + + Change into directory liberation-fonts-[VERSION]/ and build from sources by + following commands: + + $ cd liberation-fonts-[VERSION] + $ make + + The built font files will be available in 'build' directory. + +3.3 Install to system + + You can manually install the fonts by copying them to ~/.fonts for a + particular user, or to /usr/share/fonts/truetype/liberation for system-wide + availability + + +4. Usage +======== + +The fonts should be installed and detected by the system after installation. + + +5. License +========== + +Read the GPL v2 file 'COPYING' and the Liberation Fonts EULA file 'License.txt' +for more information. + +6. Credits +========== + +Special thanks to all liberation-fonts developers and users! + + * Caius Chance + - Current project maintainer. + + * Mark Webbink + - Coordinator. + + * Steve Matteson + - Ascender Corporation + + * And, all other contributors. diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index c82256df8..20b4ac890 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1,5 +1,6 @@ AUDIOSelectMenue.head Tonoptionen -EPGMenu.epgplus Vorschau-Übersicht (EPG Plus) +AUDIOSelectMenue.volume Tonspur und Lautstärkeanpassung +EPGMenu.epgplus EPG-Zeitlinien (EPG Plus) EPGMenu.eventinfo Info zur Sendung EPGMenu.eventlist Vorschau aktuelles Programm EPGMenu.head EPG - Programminformation @@ -231,6 +232,7 @@ bouquetname.hdtv HD-Kanäle bouquetname.new Neue Kanäle bouquetname.other Unbekannter Provider bouquetname.removed Gelöschte Kanäle +bouquetname.uhdtv UHD-Kanäle bouquetname.webtv WebTV-Kanäle buildinfo.compiled_on Build Host buildinfo.compiled_with Compiler Version @@ -288,7 +290,7 @@ channellist.head Alle Kanäle channellist.history Verlauf channellist.history_clear Verlauf löschen channellist.keep_numbers Dauerhafte Kanalnummern -channellist.make_hdlist Erzeuge Bouquet mit HD-Kanälen +channellist.make_hdlist Erzeuge Bouquets mit HD- und UHD-Kanälen channellist.make_newlist Erzeuge Bouquet mit neuen Kanälen channellist.make_removedlist Erzeuge Bouquet mit gelöschten Kanälen channellist.make_webtvlist Erzeuge Bouquet mit WebTV-Kanälen @@ -374,7 +376,7 @@ colorthememenu.head Theme auswählen colorthememenu.head2 Themes laden colorthememenu.menu_hints Hinweisfenster colorthememenu.name Themename -colorthememenu.neutrino_theme NI-Neutrino-HD Theme +colorthememenu.neutrino_theme Theme zurücksetzen colorthememenu.question Aktuelles Theme beibehalten? colorthememenu.save aktuelles Theme speichern colorthememenu.select1 Benutzer Theme @@ -673,7 +675,9 @@ flashupdate.cantopenfile kann Datei nicht öffnen flashupdate.cantopenmtd kann MTD nicht öffnen flashupdate.checkupdate_internet Online-Update flashupdate.checkupdate_local Lokales Update +flashupdate.choose_partition Partition wählen flashupdate.copy_image Kopiere Image in den Arbeitsspeicher +flashupdate.copy_settings Einstellungen ins neue Image übernehmen? flashupdate.createimage Image speichern flashupdate.createimage_add_env 'env' hinzufügen flashupdate.createimage_add_kernel 'kernel' hinzufügen @@ -723,7 +727,7 @@ flashupdate.namemode2_hostname_time ++.img flashupdate.new_found Updates verfügbar! flashupdate.new_notfound Keine Updates verfügbar! flashupdate.ng_noflash USB-Image aktiv, Update nicht möglich! -flashupdate.noversion Eine Versionsüberprüfung ist nur über das Online-Update möglich.\nWollen Sie das ausgewählte Image trotzdem installieren? +flashupdate.noversion Die Versionsüberprüfung ist nur bei Online-Aktualisierungen möglich.\nTrotzdem fortfahren? flashupdate.programmingflash programmiere Flash flashupdate.proxypassword Passwort flashupdate.proxypassword_hint1 Geben sie das Proxy-Passwort ein @@ -745,6 +749,8 @@ flashupdate.reallyflashmtd Wollen Sie den Flashvorgang wirklich durchführen?\n\ flashupdate.savesuccess Das Image wurde erfolgreich unter dem\nDateinamen %s gespeichert. flashupdate.selectimage Verfügbare Images und Updates flashupdate.settings Update-Einstellungen +flashupdate.start_ofgwrite Starte ofgwrite ... +flashupdate.start_selected_partition Starte ausgewählte Partition? flashupdate.titlereadflash Flash auslesen flashupdate.titlewriteflash Flash schreiben flashupdate.type_addon Erweiterung @@ -835,7 +841,7 @@ hdd_activate Übernehmen hdd_allow_set_recdir Erlaube sofort Aufnahmen hdd_check Dateisystemprüfung hdd_check_failed Datenträgerprüfung fehlgeschlagen -hdd_extended_settings Erweiterte Datenträgereinstellungen +hdd_extended_settings Erweiterte Einstellungen hdd_fast Schnell hdd_format Formatiere Datenträger hdd_format_failed Formatierung fehlgeschlagen! Stellen Sie sicher, dass der Datenträger nicht in Verwendung ist und versuchen Sie es erneut. @@ -857,7 +863,7 @@ hdd_info_unknown unbekannt hdd_manage Datenträger verwalten hdd_middle Mittel hdd_mount Mount -hdd_mount_failed Fehler! Überprüfen Sie ihre Datenträgereinstellungen. +hdd_mount_failed Fehler! Bitte Datenträgereinstellungen überprüfen. hdd_mount_ok Datenträger bereit hdd_mount_umount Mount/Unmount hdd_noise Akustikkontrolle (AAM) @@ -872,7 +878,7 @@ hdd_statfs_always immer hdd_statfs_recording nur während Aufnahme hdd_umount Aushängen hdd_umount_warn Datenträger aushängen -hdd_umounted Datenträger entfernt +hdd_umounted Gerät entfernt hdd_wakeup Interne Aufweckfunktion hdd_wakeup_msg Aufweckfunktion mit Nachricht hdd_wakeup_start Aufweckfunktion wird gestartet @@ -1158,7 +1164,7 @@ menu.hint_channellist_foot Definiert, welche Informationen im unteren Sendungsfe menu.hint_channellist_mode Wählen Sie die Start-Kanalliste im TV-Modus menu.hint_channellist_mode_radio Wählen Sie die Start-Kanalliste im Radio-Modus menu.hint_channellist_setup Wählen Sie die Anzeigeoptionen für die Kanalliste -menu.hint_channellist_show_channellogo Zeigt Senderlogos in Kanalliste, Eventliste, EPG-Plus, EPG-Ansicht und Moviebrowser. +menu.hint_channellist_show_channellogo Senderlogos aktivieren/deaktivieren. menu.hint_channellist_show_channelnumber Zeigt Kanalnummer in der Kanalliste. menu.hint_channellist_show_empty_favs Zeigt oder versteckt leere Bouquets in den Favoriten menu.hint_channellist_show_infobox Zeigt oder versteckt das untere Sendungsfenster @@ -1241,7 +1247,7 @@ menu.hint_inactive_back Ändern Sie die Hintergrundfarbe für deaktivierte Fenst menu.hint_inactive_textcolor Ändern Sie die Textfarbe für deaktivierte Fensterinhalte menu.hint_inet_radio Internetradio menu.hint_inetradio_autostart Spielt automatisch den ersten Eintrag der Favoriten-Liste ab -menu.hint_info Informationen über das Image, CPU, Arbeitsspeicher, Stream usw. +menu.hint_info Systeminformationen anzeigen. menu.hint_infobar_analogclock Zeigt eine Analoguhr anstatt der digitalen Anzeige der Zeit menu.hint_infobar_back Ändern Sie die Hintergrundfarbe für die Infobar menu.hint_infobar_buttons_usertitle Erzwingt die benutzerdefinierten Titel der Farbtasten @@ -1254,7 +1260,7 @@ menu.hint_infobar_ecminfo Anzeigen der ECM-Info, während die Infobar eingeblend menu.hint_infobar_filesys Zeigen den vom Flash- und einer HDD verwendeten Speicherplatz menu.hint_infobar_fonts Ändern Sie die Schriftgrößen in der Infobar menu.hint_infobar_logo Logo-, Kanalnummer- und Signal-Anzeige; Optionen in [Klammern] erscheinen in der kleinen Infobox -menu.hint_infobar_logo_dir Wählen Sie das externe Verzeichnis für die Senderlogos +menu.hint_infobar_logo_dir Verzeichnis für Senderlogos festlegen. menu.hint_infobar_on_epg Zeigt einen Hinweis bei EPG-Änderungen menu.hint_infobar_radiotext Zeigt Radiotext in einen Fenster, wenn verfügbar menu.hint_infobar_res Zeige die gesendete Auflösung in Symbolen @@ -1354,7 +1360,7 @@ menu.hint_leds_tv Definiert den Status der Power-LEDs im TV-Modus menu.hint_load Laden der Einstellungen aus einer Datei menu.hint_longkeypress_duration Tasten, die länger als die angegebene Zeit betätigt werden, werden als "langer Tastendruck" behandelt. menu.hint_lua Plugins ausführen -menu.hint_make_hdlist Bei aktiver Option wird ein Bouquet namens 'HD' erzeugt, in dem alle HD-Sender zusammengefasst sind +menu.hint_make_hdlist Bei aktiver Option werden Bouquets namens 'HD' und 'UHD' erzeugt, in denen alle HD- bzw. UHD-Sender zusammengefasst sind menu.hint_make_newlist Nach einer Kanalsuche wird ein Bouquet namens 'neue Kanäle' erzeugt menu.hint_make_removedlist Nach einer Kanalsuche wird ein Bouquet namens 'gelöschte Kanäle' erzeugt menu.hint_make_webtvlist Bei aktiver Option wird ein Bouquet namens 'WebTV' erzeugt, in dem alle WebTV-Sender zusammengefasst sind @@ -1378,7 +1384,7 @@ menu.hint_misc_onlineservices Konfigurieren und steuern von Online-Diensten wie menu.hint_misc_zapit Verwaltung der Start-Kanäle für den TV/Radio-Modus menu.hint_movie Wiedergabe von Filmen menu.hint_moviebrowser_fonts Ändern Sie die Schriftgrößen im Moviebrowser (Meine Aufnahmen) -menu.hint_moviebrowser_setup Legen Sie Auswahl- und Anzeigeoptionen des Moviebrowsers fest +menu.hint_moviebrowser_setup Auswahl- und Anzeigeoptionen einstellen. menu.hint_movieplayer_bisection_jump Startwert für den bisektionalen Modus, um mit Seite hoch/runter vor- bzw. zurückzuspringen menu.hint_movieplayer_plugin Wählen Sie ein Plugin, das mit einer Schnellstart-Taste im Movieplayer-Modus gestartet wird menu.hint_net_broadcast Ändern Sie die Broadcast-Adresse.\nWenn Sie unsicher sind, verwenden Sie zuletzt .255 @@ -1633,7 +1639,7 @@ menu.hint_sw_update System aktualisieren, Image sichern und wiederherstellen menu.hint_theme Wählen Sie ein vordefiniertes Farbschema, speichern oder laden Sie ihre eigenen Farbschemata menu.hint_timeouts Anzeigedauer für Menüs oder Infofenster, die sich automatisch schließen (0 deaktiviert) menu.hint_timeouts_static_messages Anzeigedauer für bestimmte Meldungen mit Benutzerinteraktion -menu.hint_timer_followscreenings Zeige Terminauswahl mit Folge-Events zur Timerprogrammierung. "Immer" zeigt die Auswahl auch dann, wenn nur ein Event gefunden wurde. +menu.hint_timer_followscreenings Zeige weitere Termine für Timerprogrammierung. "Immer" zeigt die Auswahl auch dann, wenn nur ein Event gefunden wurde. menu.hint_timers Hinzufügen, entfernen und bearbeiten geplanter Aufnahmen oder anderer Timer menu.hint_timezone Wählen Sie ihre Zeitzone aus menu.hint_tmdb_api_key Geben Sie den TMDb API Schlüssel ein. Eine leere Eingabe schaltet die TMDb-Unterstützung aus @@ -1958,7 +1964,7 @@ moviebrowser.menu_truncate Film kürzen moviebrowser.option_browser Anzeigeoptionen moviebrowser.reload_at_start Filminfos neu laden bei Start moviebrowser.remount_at_start Filmdepot verbinden bei Start -moviebrowser.scan_for_movies Filminfos neu laden +moviebrowser.scan_for_movies Suche Aufnahmen ... moviebrowser.serie_auto_create Serien automatisch zuordnen moviebrowser.serie_head Serie moviebrowser.serie_name Name ändern @@ -2358,9 +2364,9 @@ reset_channels Lösche Kanäle reset_confirm Sind Sie sich sicher? reset_removed Entferne gelöschte Kanäle reset_settings Einstellungen auf Standardwerte -satsetup.auto_scan Automatischer Scan (%s) -satsetup.auto_scan_all Automatischer Scan (alle Satelliten) -satsetup.cable Erweiterter Kabel-Scan +satsetup.auto_scan Automatische Suche (%s) +satsetup.auto_scan_all Automatische Suche (alle Satelliten) +satsetup.cable Kabel-Suchlauf satsetup.cable_nid Netzwerk ID satsetup.comm_input Committed Input satsetup.diseqc DiSEqC @@ -2759,8 +2765,8 @@ wizard.setup_advanced Erweitert wizard.setup_easy Einfach wizard.setup_type Installationstyp wizard.setup_type_hint Wählen Sie einfache Grundeinstellungen oder erweiterte Auswahlmöglichkeiten für die Installation -wizard.welcome_head Willkommen beim NI-Einrichtungs-Assistenten! -wizard.welcome_text NI-Image Info:\nIhre Set-Top-Box lässt sich bequem per Webinterface\nsteuern fuer z.B. Timer-Verwaltung oder Live-TV im Web-Browser.\nEin root-Passwort ist noch nicht gesetzt!\nDies sollte so bald wie möglich durch den Befehl "passwd"\nvia Telnet nachgeholt werden um Fremdzugriffe auf den Receiver zu verhindern.\nNächster Schritt? +wizard.welcome_head Willkommen zur Ersteinrichtung Ihres Receivers! +wizard.welcome_text Neutrino ist eine von der Tuxbox-Community entwickelte und gepflegte Benutzeroberfläche für Set-Top-Boxen und lebt von der Unterstützung der Nutzer und vielen freiwilligen beitragenden Helfern.\nSollten Sie Hilfe benötigen, Anregungen bzw. Verbesserungsvorschläge haben oder Fehler bemerken,\nkönnen Sie sich gerne auf unseren Supportseiten melden oder Kontakt aufnehmen. Kontakt- bzw. Webaddressen entnehmen Sie bitte hierfür im Hauptmenü unter "Informationen". \nIn den folgenden Schritten wird Sie Neutrino durch die Ersteinrichtung führen.\nSicherheitshinweis:\n Ihre Set-Top-Box lässt sich auch per Webinterface steuern, um zum Beispiel die Timer-Verwaltung zu nutzen oder Live-TV im Web-Browser zu schauen.\nAchten Sie bitte darauf, dass Ihr Gerät nicht von aussen zugänglich ist,\nda sonst ein unbefugter Zugriff über das Internet nicht ausgeschlossen werden kann!\nNächster Schritt? word.from ab word.in in youtube.dev_id YouTube Dev ID diff --git a/data/locale/english.locale b/data/locale/english.locale index 8a329d58f..0b165a3b4 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1,5 +1,6 @@ -AUDIOSelectMenue.head Audio Selection -EPGMenu.epgplus Eventlist overview (EPG Plus) +AUDIOSelectMenue.head Audio Options +AUDIOSelectMenue.volume Audio selection and volume adjustment +EPGMenu.epgplus EPG-Timelines (EPG Plus) EPGMenu.eventinfo Details current program EPGMenu.eventlist Eventlist current programm EPGMenu.head EPG - Program information @@ -231,6 +232,7 @@ bouquetname.hdtv HD channels bouquetname.new New channels bouquetname.other Unknown provider bouquetname.removed Removed channels +bouquetname.uhdtv UHD channels bouquetname.webtv WebTV channels buildinfo.compiled_on Build Host buildinfo.compiled_with Compiler version @@ -288,7 +290,7 @@ channellist.head All services channellist.history History channellist.history_clear Clear history channellist.keep_numbers Persistent channel numbers -channellist.make_hdlist Create list of HD channels +channellist.make_hdlist Create lists of HD and UHD channels channellist.make_newlist Create list of new channels channellist.make_removedlist Create list of removed channels channellist.make_webtvlist Create list of WebTV channels @@ -374,7 +376,7 @@ colorthememenu.head Select theme colorthememenu.head2 Load themes colorthememenu.menu_hints Hint box colorthememenu.name Theme name -colorthememenu.neutrino_theme NI-Neutrino-HD Theme +colorthememenu.neutrino_theme Reset theme colorthememenu.question Use selected theme? colorthememenu.save Save current theme colorthememenu.select1 User Theme @@ -672,7 +674,9 @@ flashupdate.cantopenfile can't open file flashupdate.cantopenmtd can't open MTD flashupdate.checkupdate_internet Online update flashupdate.checkupdate_local Local update +flashupdate.choose_partition Choose partition flashupdate.copy_image Copy Image to main memory +flashupdate.copy_settings Copy settings to new image? flashupdate.createimage Save image flashupdate.createimage_add_env Add 'env' to image flashupdate.createimage_add_kernel Add 'kernel' to image @@ -722,7 +726,7 @@ flashupdate.namemode2_hostname_time +