Skip to content

Keep aspect ratio of channel logos #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kecksk0enig wants to merge 2 commits into
base: master
Choose a base branch
from
+390 −76
Open

Keep aspect ratio of channel logos #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5d4378
Modified string template, fix typo and provide better german translation
kecksk0enig Jul 3, 2013
aac1f8f
Keep aspectratio on channel logos, decrease memory consumption if vie…
kecksk0enig Jul 3, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions res/layout/channel_list_widget.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,25 @@
android:layout_marginRight="5sp"
>

<ImageView
android:id="@+id/ch_icon"
android:layout_width="64sp"
android:layout_height="64sp"
android:layout_margin="3dip"
android:scaleType="matrix" />
<FrameLayout
android:layout_width="64dp"
android:layout_height="64dp"
android:foregroundGravity="clip_horizontal" >

<ImageView
android:id="@+id/ch_icon"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_margin="3dip" />

<ImageView
android:id="@+id/ch_icon_rec"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_gravity="bottom|right"
android:layout_margin="3dip" />

</FrameLayout>

<LinearLayout
android:layout_width="fill_parent"
Expand Down
211 changes: 177 additions & 34 deletions res/values-de/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,184 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources>
<string name="app_name">TVHGuide</string>

<string name="menu_help">Hilfe</string>
<string name="menu_settings">Einstellungen</string>
<string name="menu_refresh">Aktualisieren</string>
<string name="menu_tags">Tags</string>
<string name="menu_recordings">Aufnahmen</string>
<string name="app_name">"TVHGuide"</string>
<string name="menu_help">"Hilfe"</string>
<string name="menu_settings">"Einstellungen"</string>
<string name="menu_refresh">"Aktualisieren"</string>
<string name="menu_tags">"Tags"</string>
<string name="menu_recordings">"Aufnahmen"</string>
<string name="menu_record">"Aufnahme"</string>
<string name="menu_record_cancel">"Aufnahme abbrechen"</string>
<string name="menu_record_remove">"Aufnahme entfernen"</string>
<string name="pref_host">"Hostname"</string>
<string name="pref_host_sum">"Hostname eingeben"</string>
<string name="pref_port">"Port"</string>
<string name="pref_port_sum">"Server-Port eingeben"</string>
<string name="pref_user">"Benutzername"</string>
<string name="pref_user_sum">"Benutzername eingeben"</string>
<string name="pref_pass">"Passwort"</string>
<string name="pref_pass_sum">"Passwort eingeben"</string>
<string name="pref_ui">"Benutzerschnittstelle"</string>
<string name="pref_icons">"Kanal-Logos"</string>
<string name="pref_icons_sum">"Kanal-Logos anzeigen? (verbraucht mehr Speicher)"</string>
<string name="pref_theme">"Helles Thema"</string>
<string name="pref_theme_sum">"Helle Darstellung benutzen?"</string>
<string name="pref_res">"Auflösung"</string>
<string name="pref_res_sum">"Maximale Auflösung für den Transcoder"</string>
<string name="pref_acodec">"Audio-Codec"</string>
<string name="pref_acodec_sum">"Audio-Codec des Transcoders verwenden"</string>
<string name="pref_vcodec">"Video-Codec"</string>
<string name="pref_vcodec_sum">"Video-Codec des Transcoder verwenden"</string>
<string name="pref_scodec">"Untertitel Codec"</string>
<string name="pref_scodec_sum">"Untertitel Codec des Transcoder verwenden"</string>
<string name="pref_container">"Medien-Container"</string>
<string name="pref_container_sum">"Bevorzugter Medien-Container"</string>
<string name="pref_playback">"Wiedergabe"</string>
<string name="pref_http_port">"HTTP-Port"</string>
<string name="pref_http_port_sum">"HTTP-Port des Servers"</string>
<string name="pref_transcode">"Stream transkodieren"</string>
<string name="pref_transcode_sum">"Transkodiere Stream während live Wiedergabe"</string>
<string name="pref_external">"Bevorzuge externen Videoplayer"</string>
<string name="pref_external_sum">"Soll ein externer Video-Player benutz werden? (z.B. BSPlayer)"</string>
<string name="err_auth">"Zugriff verweigert"</string>
<string name="err_inv">"Ungültige Antwort vom Server"</string>
<string name="err_connect">"Keine Verbindung zum Server möglich"</string>
<string name="err_con_lost">"Verbindung zum Server verloren"</string>
<string name="inf_load">"Ladevorgang läuft&#8230;"</string> <!-- &#8230; is equivalent to ... -->
<string name="inf_load_ext">"Bitte warten Sie ein paar Sekunden&#8230;"</string> <!-- &#8230; is equivalent to ... -->
<string name="pr_all_channels">"Alle Kanäle"</string>
<string name="pr_get_more">"Mehr"</string>
<string name="pr_season">"Staffel"</string>
<string name="pr_episode">"Folge"</string>
<string name="pr_part">"Teil"</string>
<string name="pr_airing">"Ausstrahlung"</string>
<string name="pr_star_rating">"Bewertung"</string>
<string name="pr_content_type">"Genre"</string>
<string name="pr_series_info">"Teil"</string>

<string name="pref_host">Hostname</string>
<string name="pref_host_sum">Hostnamen des Servers eingeben</string>
<string-array name="pr_content_type0">
<item>"Film / Drama"</item>
<item>"Nachrichten / Aktuelles"</item>
<item>"Show / Spielshow"</item>
<item>"Sport"</item>
<item>"Kinder / Jugend"</item>
<item>"Musik / Ballett / Tanz"</item>
<item>"Kunst / Kultur"</item>
<item>"Gesellschaft / Politik / Wirtschaft"</item>
<item>"Bildung / Wissenschaft"</item>
<item>"Freizeit / Hobbys"</item>
<item>"Verschiedenes"</item>
</string-array>
<string-array name="pr_content_type1">
<item>"Film / Drama"</item>
<item>"Krimi / Thriller"</item>
<item>"Abenteuer / Western / Krieg"</item>
<item>"Science Fiction / Fantasy / Horror"</item>
<item>"Komödie"</item>
<item>"Seife Oper / Melodrama / Folklore"</item>
<item>"Romanze"</item>
<item>"Historisches"</item>
<item>"Erwachsenen Film / Drama"</item>
</string-array>
<string-array name="pr_content_type2">
<item>"Nachrichten / Aktuelles"</item>
<item>"Nachrichten / Wetterbericht"</item>
<item>"Magazin"</item>
<item>"Dokumentation"</item>
<item>"Diskussion / Interview / Debatte"</item>
</string-array>
<string-array name="pr_content_type3">
<item>"Show / Spielshow"</item>
<item>"Spiel Show / Quiz / Contest"</item>
<item>"Varietee"</item>
<item>"Unterhaltung"</item>
</string-array>
<string-array name="pr_content_type4">
<item>"Sport"</item>
<item>"Sondersendung"</item>
<item>"Magazin"</item>
<item>"Fußball"</item>
<item>"Tennis / Squash"</item>
<item>"Mannschaftssport"</item>
<item>"Leichtathletik"</item>
<item>"Motorsport"</item>
<item>"Wassersport"</item>
<item>"Wintersport"</item>
<item>"Reitsport"</item>
<item>"Kampfsport"</item>
</string-array>
<string-array name="pr_content_type5">
<item>"Kinder / Jugend"</item>
<item>"Vorschul"</item>
<item>"Unterhaltung (6 bis 14-Jährigen)"</item>
<item>"Unterhaltung (10 bis 16-Jährigen)"</item>
<item>"Informativ / Bildung / Schulen"</item>
<item>"Cartoons / Puppets"</item>
</string-array>
<string-array name="pr_content_type6">
<item>"Musik / Ballett / Tanz"</item>
<item>"Rock und Pop"</item>
<item>"Klassik"</item>
<item>"Folk / Traditionelle Musik"</item>
<item>"Jazz"</item>
<item>"Musical / Oper"</item>
<item>"Ballet"</item>
</string-array>
<string-array name="pr_content_type7">
<item>"Kunst / Kultur"</item>
<item>"Darstellenden Kunst"</item>
<item>"Ästhetisches"</item>
<item>"Religion"</item>
<item>"Pop Kultur / Traditionelle Kunst"</item>
<item>"Literatur"</item>
<item>"Film / Kino"</item>
<item>"Experimenteller Film / Video"</item>
<item>"Rundfunk / Presse"</item>
<item>"Neue Medien"</item>
<item>"Magazin"</item>
<item>"Mode"</item>
</string-array>
<string-array name="pr_content_type8">
<item>"Gesellschaft / Politik / Wirtschaft"</item>
<item>"Magazin / Report / Dokumentation"</item>
<item>"Wirtschaft / Soziales Engagement"</item>
<item>"Bemerkenswerte Menschen"</item>
</string-array>
<string-array name="pr_content_type9">
<item>"Bildung / Wissenschaft"</item>
<item>"Natur / Tiere / Umwelt"</item>
<item>"Technik / Naturwissenschaften"</item>
<item>"Medizin / Physiologie / Psychologie"</item>
<item>"Ausland / Expeditionen"</item>
<item>"Soziales / Spirituelles"</item>
<item>"Weiterbildung"</item>
<item>"Sprachen"</item>
</string-array>
<string-array name="pr_content_type10">
<item>"Freizeit / Hobbys"</item>
<item>"Tourismus / Reisen"</item>
<item>"Handwerk"</item>
<item>"Motorsport"</item>
<item>"Fitness und Gesundheit"</item>
<item>"Kochen"</item>
<item>"Werbung / Shopping"</item>
<item>"Garten"</item>
</string-array>
<string-array name="pr_content_type11">
<item>"Verschiedenes"</item>
<item>"Schwarz / Weiß"</item>
<item>"Unveröffentlicht"</item>
<item>"Live-Sendung"</item>
</string-array>

<string name="pref_port">Port</string>
<string name="pref_port_sum">Port der Servers eingeben</string>
<string name="pvr_scheduled">"Geplant"</string>
<string name="pvr_recording">"Aufzeichnung"</string>
<string name="pvr_completed">"Abgeschlossen"</string>
<string name="pvr_missed">"Entgangen"</string>
<string name="pvr_invalid">"Ungültig"</string>
<string name="ch_play">"Abspielen"</string>
<string name="ch_no_transmission">"Keine Übertragung"</string>
<string name="search_hint">"EPG durchsuchen"</string>
<string name="today">"heute"</string>

<string name="pref_user">Benutzername</string>
<string name="pref_user_sum">Benutzernamen eingeben</string>

<string name="pref_pass">Passwort</string>
<string name="pref_pass_sum">Passwort eingeben</string>

<string name="pref_icons">Kanal-Logos</string>
<string name="pref_icons_sum">Kanal-Logos anzeigen?</string>

<string name="err_auth">Zugriff verweigert</string>
<string name="err_inv">Ungültige Antwort des Servers</string>
<string name="err_connect">Konnte nicht mit dem Server verbinden</string>
<string name="err_con_lost">Verbindung zum Server verloren</string>

<string name="inf_load">Lade...</string>
<string name="inf_load_ext">Bitte warten Sie einen Moment...</string>

<string name="pr_all_channels">Alle Kanäle</string>

<string name="pvr_scheduled">Geplant</string>
<string name="pvr_recording">Aufnahme</string>
<string name="pvr_completed">Fertig</string>
<string name="pvr_missed">Verpasst</string>
<string name="pvr_invalid">Ungültig</string>
</resources>
129 changes: 129 additions & 0 deletions res/values-sv/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,133 @@

<string name="search_hint">Sök i programtablån</string>
<string name="today">idag</string>


<string-array name="pr_content_type0">
<item>Movie/Drama</item>
<item>News/Current affairs</item>
<item>Show/Game show</item>
<item>Sports</item>
<item>Children\'s / Youth</item>
<item>Music/Ballet/Dance</item>
<item>Arts/Culture</item>
<item>Social/Political issues/Economics</item>
<item>Education/Science/Factual</item>
<item>Leisure hobbies</item>
<item>Misc</item>
</string-array>

<string-array name="pr_content_type1">
<item>Movie/Drama</item>
<item>Detective/Thriller</item>
<item>Adventure/Western/War</item>
<item>Science Fiction/Fantasy/Horror</item>
<item>Comedy</item>
<item>Soap/Melodrama/Folkloric</item>
<item>Romance</item>
<item>Serious/ClassicalReligion/Historical</item>
<item>Adult Movie/Drama</item>
</string-array>

<string-array name="pr_content_type2">
<item>News/Current affairs</item>
<item>News/Weather Report</item>
<item>Magazine</item>
<item>Documentary</item>
<item>Discussion/Interview/Debate</item>
</string-array>

<string-array name="pr_content_type3">
<item>Show/Game show</item>
<item>Game show/Quiz/Contest</item>
<item>Variety</item>
<item>Talk</item>
</string-array>

<string-array name="pr_content_type4">
<item>Sports</item>
<item>Special Event</item>
<item>Magazine</item>
<item>Football/Soccer</item>
<item>Tennis/Squash</item>
<item>Team sports</item>
<item>Athletics</item>
<item>Motor Sport</item>
<item>Water Sport</item>
<item>Winter Sports</item>
<item>Equestrian</item>
<item>Martial sports</item>
</string-array>

<string-array name="pr_content_type5">
<item>Children\'s / Youth</item>
<item>Pre-school</item>
<item>Entertainment (6 to 14 year-olds)</item>
<item>Entertainment (10 to 16 year-olds)</item>
<item>Informational/Educational/Schools</item>
<item>Cartoons/Puppets</item>
</string-array>

<string-array name="pr_content_type6">
<item>Music/Ballet/Dance</item>
<item>Rock/Pop</item>
<item>Serious music/Classical Music</item>
<item>Folk/Traditional music</item>
<item>Jazz</item>
<item>Musical/Opera</item>
<item>Ballet</item>
</string-array>

<string-array name="pr_content_type7">
<item>Arts/Culture</item>
<item>Performing Arts</item>
<item>Fine Arts</item>
<item>Religion</item>
<item>Popular Culture/Tradital Arts</item>
<item>Literature</item>
<item>Film/Cinema</item>
<item>Experimental Film/Video</item>
<item>Broadcasting/Press</item>
<item>New Media</item>
<item>Magazine</item>
<item>Fashion</item>
</string-array>

<string-array name="pr_content_type8">
<item>Social/Political issues/Economics</item>
<item>Magazine/Report/Domentary</item>
<item>Economics/Social Advisory</item>
<item>Remarkable People</item>
</string-array>


<string-array name="pr_content_type9" >
<item>Education/Science/Factual</item>
<item>Nature/Animals/Environment</item>
<item>Technology/Natural sciences</item>
<item>Medicine/Physiology/Psychology</item>
<item>Foreign Countries/Expeditions</item>
<item>Social/Spiritual Sciences</item>
<item>Further Education</item>
<item>Languages</item>
</string-array>

<string-array name="pr_content_type10">
<item>Leisure hobbies</item>
<item>Tourism/Travel</item>
<item>Handicraft</item>
<item>Motoring</item>
<item>Fitness and Health</item>
<item>Cooking</item>
<item>Advertisement/Shopping</item>
<item>Gardening</item>
</string-array>

<string-array name="pr_content_type11">
<item>Misc</item>
<item>Black and White</item>
<item>Unpublished</item>
<item>Live Broadcast</item>
</string-array>

</resources>
Loading