Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Stefan Schüller 2019-03-03 01:03:44 +01:00
commit 5cc7e740a6
6 changed files with 350 additions and 31 deletions

View File

@ -1,5 +1,5 @@
<h1 align="center">
Thorium, a Android PeerTube Client
Thorium, an Android PeerTube Client
</h1>
[![Latest release](https://img.shields.io/github/release/sschueller/peertube-android.svg)](https://github.com/sschueller/peertube-android/releases/latest)

View File

@ -1,11 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name" translatable="false">Thorium</string>
<string name="title_activity_video_play">VideoPlayActivity</string>
<string name="title_activity_settings">সেটিংস</string>
<string name="title_activity_login">সাইন ইন</string>
<!-- Strings related to login -->
<string name="prompt_server">সার্ভার</string>
<string name="prompt_email">ইমেল / ইয়ুজারনেম</string>
@ -16,37 +14,26 @@
<string name="error_invalid_password">পাসওয়ার্ড খুব ছোট</string>
<string name="error_incorrect_password">ভুল পাসওয়ার্ড</string>
<string name="error_field_required">এটি জরুরি ফিল্ড</string>
<string name="permission_rationale">"Contacts permissions are needed for providing email
completions."
</string>
<string name="permission_rationale">Grant contact permission for email completion.</string>
<!-- Action bar -->
<string name="action_bar_title_search">সার্চ</string>
<string name="action_bar_title_settings">সেটিং</string>
<string name="action_bar_title_logout">লগ আউট</string>
<!-- Bottom navigation bar -->
<string name="bottom_nav_title_overview">হোম</string>
<string name="bottom_nav_title_trending">"Trending"</string>
<string name="bottom_nav_title_subscriptions">Subscriptions</string>
<string name="bottom_nav_title_account">একাউন্ট</string>
<!-- Strings related to Settings -->
<string name="peertube_required_server_version" translatable="false">1.0.0-alpha.7</string>
<string name="pref_default_api_base_url" formatted="false" translatable="false">https://troll.tv</string>
<string name="pref_title_peertube_server">PeerTube Server</string>
<!-- Strings related to Video meta data -->
<string name="meta_data_seperator" translatable="false">\u0020-\u0020</string>
<string name="meta_data_views">\u0020Views</string>
<string name="meta_data_owner_seperator" translatable="false">\@</string>
<string name="video_row_video_thumbnail">Video Thumbnail</string>
<string name="video_row_account_avatar">Account Avatar</string>
<string name="pref_title_show_nsfw">NSFW দেখাও</string>
<string name="pref_description_show_nsfw">NSFW content will be shown if enabled.</string>
<string name="pref_language">ভাষা ফিলটার</string>
@ -63,12 +50,11 @@
<string name="descr_overflow_button">আরও</string>
<string name="menu_share">শেয়ার</string>
<string name="playback_channel_name" translatable="false">PeerTube</string>
<string name="invalid_url">Invalid Url!</string>
<string name="invalid_url">Invalid URL.</string>
<string name="pref_title_dark_mode">ডার্ক মোড</string>
<string name="pref_description_dark_mode">Restart App for Dark Mode to take effect.</string>
<string name="pref_title_app_theme">App Theme</string>
<string name="pref_description_app_theme">Restart App for theme to take effect.</string>
<string name="pref_description_app_theme">Restart app for theme to take effect.</string>
<string name="ab">Abkhazian</string>
<string name="aa">Afar</string>
<string name="af">Afrikaans</string>
@ -261,7 +247,6 @@
<string name="yo">Yoruba</string>
<string name="za">Zhuang</string>
<string name="zu">Zulu</string>
<string name="red">লাল</string>
<string name="pink">গোলাপি</string>
<string name="purple">বেগুনি</string>
@ -284,8 +269,6 @@
<string name="video_speed_10">Normal</string>
<string name="video_speed_15">1.5x</string>
<string name="video_speed_20">2x</string>
<string name="video_speed_active_icon" translatable="false">{faw-check}</string>
<string name="video_expand_icon" translatable="false">{faw-expand}</string>
<string name="video_compress_icon" translatable="false">{faw-compress}</string>
@ -295,18 +278,15 @@
<string name="video_share_icon" translatable="false">{faw-share}</string>
<string name="video_download_icon" translatable="false">{faw-download}</string>
<string name="video_save_icon" translatable="false">{faw-save}</string>
<string name="pref_title_background_play">Background Playback</string>
<string name="pref_description_background_play">If enabled, continues to play video in background.</string>
<string name="bottom_nav_title_local">Local</string>
<string name="title_activity_account">একাউন্ট</string>
<string name="menu_video_more_report">রিপোর্ট</string>
<string name="menu_video_more_blacklist">Blacklist</string>
<string name="video_download_permission_error">Can not download video without write permission</string>
<string name="video_rating_failed">Rating Failed</string>
<string name="video_login_required_for_service">এই সেবা ব্যবহারের জন্য লগ ইন করুন</string>
<string name="video_meta_button_share">শেয়ার</string>
<string name="video_meta_button_download">ডাউনলোড</string>
<string name="video_meta_button_privacy">Privacy</string>
@ -314,8 +294,6 @@
<string name="video_meta_button_license">License</string>
<string name="video_meta_button_language">ভাষা</string>
<string name="video_meta_button_tags">Tags</string>
<!-- Constants, Don't translate -->
<string name="pref_token_access" translatable="false">pref_token_access</string>
<string name="pref_token_refresh" translatable="false">pref_token_refresh</string>

View File

@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="title_activity_settings">Einstellungen</string>
<string name="title_activity_login">Anmelden</string>
<string name="prompt_server">Server</string>
<string name="prompt_email">Kontoname</string>
<string name="prompt_password">Passwort</string>
<string name="action_sign_in">Anmelden</string>
<string name="action_sign_in_short">Anmelden</string>
<string name="error_invalid_email">Ungültige E-Mail-Adresse</string>
<string name="action_bar_title_search">Suche</string>
<string name="action_bar_title_logout">Abmelden</string>
<string name="action_bar_title_account">Konto</string>
<string name="bottom_nav_title_overview">Übersicht</string>
<string name="bottom_nav_title_local">Lokal</string>
<string name="bottom_nav_title_subscriptions">Abos</string>
<string name="bottom_nav_title_account">Konto</string>
<string name="pref_title_peertube_server">PeerTube Server</string>
<string name="title_activity_video_play">VideoPlayActivity</string>
<string name="error_invalid_password">Dieses Passwort ist zu kurz</string>
<string name="error_incorrect_password">Dieses Passwort ist falsch</string>
<string name="action_bar_title_settings">Einstellungen</string>
<string name="bottom_nav_title_recent">Aktuell</string>
<string name="meta_data_views">" Abrufe"</string>
<string name="video_row_video_thumbnail">Video Vorschaubild</string>
<string name="video_row_account_avatar">Konto Avatar</string>
<string name="pref_title_show_nsfw">NSFW Inhalt</string>
<string name="pref_description_show_nsfw">Zeigen NSFW Inhalt</string>
<string name="pref_language">Sprachfilter</string>
<string name="pref_title_license">Lizenz</string>
<string name="pref_title_version">Version</string>
<string name="search_hint">PeerTube durchsuchen</string>
<string name="title_activity_search">Suche</string>
<string name="no_data_available">Keine Ergebnisse</string>
<string name="descr_overflow_button">Mehr</string>
<string name="menu_share">Teilen</string>
<string name="invalid_url">Ungültige URL.</string>
<string name="pref_title_dark_mode">Dunkler Modus</string>
<string name="pref_title_app_theme">Farbschema</string>
</resources>

View File

@ -0,0 +1,293 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="title_activity_settings">Inställningar</string>
<string name="title_activity_login">Logga in</string>
<string name="prompt_server">Server</string>
<string name="prompt_email">E-post / Användarnamn</string>
<string name="prompt_password">Lösenord</string>
<string name="action_sign_in">Logga in</string>
<string name="action_sign_in_short">Logga in</string>
<string name="error_invalid_email">E-postadressen är inte giltig</string>
<string name="error_invalid_password">Lösenordet är för kort</string>
<string name="error_incorrect_password">Lösenordet stämmer inte</string>
<string name="error_field_required">Obligatoriskt fält</string>
<string name="action_bar_title_search">Sök</string>
<string name="action_bar_title_settings">Inställningar</string>
<string name="action_bar_title_logout">Logga ut</string>
<string name="action_bar_title_account">Konto</string>
<string name="bottom_nav_title_overview">Översikt</string>
<string name="bottom_nav_title_trending">Populärt</string>
<string name="bottom_nav_title_recent">Nyligen tillagt</string>
<string name="bottom_nav_title_local">Lokalt</string>
<string name="bottom_nav_title_subscriptions">Prenumerationer</string>
<string name="bottom_nav_title_account">Konto</string>
<string name="pref_title_peertube_server">PeerTube-server</string>
<string name="meta_data_views">" Visningar"</string>
<string name="video_row_video_thumbnail">Videominiatyr</string>
<string name="video_row_account_avatar">Kontoavatar</string>
<string name="pref_title_show_nsfw">Känsligt innehåll</string>
<string name="pref_description_show_nsfw">Visa känsligt innehåll</string>
<string name="pref_language">Språkfilter</string>
<string name="pref_description_language">Välj ett språk för att inte visa videor på samtliga språk.</string>
<string name="pref_title_torrent_player">Torrent-videospelare</string>
<string name="pref_description_torrent_player">Videouppspelning via en torrent-ström. Detta kräver lagringsåtkomst. (Alfa-version, inte stabilt!)</string>
<string name="pref_title_license">Licens</string>
<string name="pref_title_version">Version</string>
<string name="search_hint">Sök på PeerTube</string>
<string name="title_activity_search">Sök</string>
<string name="no_data_available">Inga resultat</string>
<string name="descr_overflow_button">Mer</string>
<string name="menu_share">Dela</string>
<string name="invalid_url">Ogiltig webbadress.</string>
<string name="pref_title_dark_mode">Mörkt tema</string>
<string name="pref_description_dark_mode">Starta om appen för att visa med mörkt tema.</string>
<string name="pref_title_app_theme">App-tema</string>
<string name="pref_description_app_theme">Starta om appen för att ladda in det nya temat.</string>
<string name="ab">Abchaziska</string>
<string name="aa">Afar</string>
<string name="af">Afrikaans</string>
<string name="ak">Akan</string>
<string name="sq">Albanska</string>
<string name="ase">Amerikanskt teckenspråk</string>
<string name="am">Amhariska</string>
<string name="ar">Arabiska</string>
<string name="an">Aragonska</string>
<string name="hy">Armeniska</string>
<string name="as">Assamesiska</string>
<string name="av">Avariska</string>
<string name="ay">Aymara</string>
<string name="az">Azerbajdzjanska</string>
<string name="bm">Bambara</string>
<string name="ba">Basjkiriska</string>
<string name="eu">Baskiska</string>
<string name="be">Vitryska</string>
<string name="bn">Bengali</string>
<string name="bi">Bislama</string>
<string name="bs">Bosniska</string>
<string name="bzs">Brasilianskt teckenspråk</string>
<string name="br">Bretonska</string>
<string name="bfi">Brittiskt teckenspråk</string>
<string name="bg">Bulgariska</string>
<string name="my">Burmesiska</string>
<string name="ca">Katalanska</string>
<string name="ch">Chamorro</string>
<string name="ce">Tjetjenska</string>
<string name="zh">Kinesiska</string>
<string name="csl">Kinesiskt teckenspråk</string>
<string name="cv">Tjuvasjiska</string>
<string name="kw">Korniska</string>
<string name="co">Korsikanska</string>
<string name="cr">Cree</string>
<string name="hr">Kroatiska</string>
<string name="cs">Tjeckiska</string>
<string name="cse">Tjeckiskt teckenspråk</string>
<string name="da">Danska</string>
<string name="dsl">Danskt teckenspråk</string>
<string name="dv">Divehi</string>
<string name="nl">Nederländska</string>
<string name="dz">Dzongkha</string>
<string name="en">Engelska</string>
<string name="eo">Esperanto</string>
<string name="et">Estniska</string>
<string name="ee">Ewe</string>
<string name="fo">Färöiska</string>
<string name="fj">Fijianska</string>
<string name="fi">Finska</string>
<string name="fr">Franska</string>
<string name="fsl">Franskt teckenspråk</string>
<string name="ff">Fula</string>
<string name="gl">Galiciska</string>
<string name="lg">Luganda</string>
<string name="ka">Georgiska</string>
<string name="de">Tyska</string>
<string name="gsg">Tyskt teckenspråk</string>
<string name="gn">Guaraní</string>
<string name="gu">Gujarati</string>
<string name="ht">Haitisk kreol</string>
<string name="ha">Hausa</string>
<string name="he">Hebreiska</string>
<string name="hz">Herero</string>
<string name="hi">Hindi</string>
<string name="ho">Hiri motu</string>
<string name="hu">Ungerska</string>
<string name="is">Isländska</string>
<string name="ig">Igbo</string>
<string name="id">Indonesiska</string>
<string name="iu">Inuktitut</string>
<string name="ik">Iñupiaq</string>
<string name="ga">Iriska</string>
<string name="it">Italienska</string>
<string name="ja">Japanska</string>
<string name="jsl">Japanskt teckenspråk</string>
<string name="jv">Javanesiska</string>
<string name="kl">Grönländska</string>
<string name="kn">Kannada</string>
<string name="kr">Kanuri</string>
<string name="ks">Kashmiri</string>
<string name="kk">Kazakiska</string>
<string name="km">Khmer</string>
<string name="ki">Kikuyu</string>
<string name="rw">Rwanda</string>
<string name="ky">Kirgiziska</string>
<string name="tlh">Klingon</string>
<string name="kv">Komi</string>
<string name="kg">Kikongo</string>
<string name="ko">Koreanska</string>
<string name="avk">Kotava</string>
<string name="kj">Kwanyama</string>
<string name="ku">Kurdiska</string>
<string name="lo">Lao</string>
<string name="lv">Lettiska</string>
<string name="li">Limburgiska</string>
<string name="ln">Lingala</string>
<string name="lt">Litauiska</string>
<string name="jbo">Lojban</string>
<string name="lu">Luba-Katanga</string>
<string name="lb">Luxemburgiska</string>
<string name="mk">Makedonska</string>
<string name="mg">Malagassiska</string>
<string name="ms">Malajiska</string>
<string name="ml">Malayalam</string>
<string name="mt">Maltesiska</string>
<string name="gv">Manx</string>
<string name="mi">Maori</string>
<string name="mr">Marathi</string>
<string name="mh">Marshallesiska</string>
<string name="el">Modern grekiska (1453)</string>
<string name="mn">Mongoliska</string>
<string name="na">Nauruanska</string>
<string name="nv">Navajo</string>
<string name="ng">Ndonga</string>
<string name="ne">Nepali</string>
<string name="nd">Nordndebele</string>
<string name="se">Nordsamiska</string>
<string name="no">Norska</string>
<string name="nb">Bokmål</string>
<string name="nn">Nynorska</string>
<string name="ny">Chichewa</string>
<string name="oc">Occitanska</string>
<string name="oj">Ojibwa</string>
<string name="or">Oriya</string>
<string name="om">Oromo</string>
<string name="os">Ossetiska</string>
<string name="pks">Pakistanskt teckenspråk</string>
<string name="pa">Punjabi</string>
<string name="fa">Persiska</string>
<string name="pl">Polska</string>
<string name="pt">Portugisiska</string>
<string name="ps">Pashto</string>
<string name="qu">Quechua</string>
<string name="ro">Rumänska</string>
<string name="rm">Rätoromanska</string>
<string name="rn">Kirundi</string>
<string name="ru">Ryska</string>
<string name="rsl">Ryskt teckenspråk</string>
<string name="sm">Samoanska</string>
<string name="sg">Sango</string>
<string name="sc">Sardiska</string>
<string name="sdl">Saudiskt teckenspråk</string>
<string name="gd">Skotsk gäliska</string>
<string name="sr">Serbiska</string>
<string name="sh">Serbokroatiska</string>
<string name="sn">Shona</string>
<string name="ii">Nuosu</string>
<string name="sd">Sindhi</string>
<string name="si">Singalesiska</string>
<string name="sk">Slovakiska</string>
<string name="sl">Slovenska</string>
<string name="so">Somaliska</string>
<string name="sfs">Sydafrikanskt teckenspråk</string>
<string name="nr">Sydndebele</string>
<string name="st">Sesotho</string>
<string name="es">Spanska</string>
<string name="su">Sundanesiska</string>
<string name="sw">Swahili</string>
<string name="ss">SiSwati</string>
<string name="sv">Svenska</string>
<string name="swl">Svenskt teckenspråk</string>
<string name="tl">Tagalog</string>
<string name="ty">Tahitiska</string>
<string name="tg">Tadzjikiska</string>
<string name="ta">Tamil</string>
<string name="tt">Tatariska</string>
<string name="te">Telugu</string>
<string name="th">Thai</string>
<string name="bo">Tibetanska</string>
<string name="ti">Tigrinska</string>
<string name="to">Tonganska</string>
<string name="ts">Tsonga</string>
<string name="tn">Setswana</string>
<string name="tr">Turkiska</string>
<string name="tk">Turkmeniska</string>
<string name="tw">Twi</string>
<string name="ug">Uiguriska</string>
<string name="uk">Ukrainska</string>
<string name="ur">Urdu</string>
<string name="uz">Uzbekiska</string>
<string name="ve">Venda</string>
<string name="vi">Vietnamesiska</string>
<string name="wa">Vallonska</string>
<string name="cy">Kymriska</string>
<string name="fy">Västfrisiska</string>
<string name="wo">Wolof</string>
<string name="xh">Xhosa</string>
<string name="yi">Jiddisch</string>
<string name="yo">Yoruba</string>
<string name="za">Zhuang</string>
<string name="zu">Zulu</string>
<string name="red">Röd</string>
<string name="pink">Rosa</string>
<string name="purple">Lila</string>
<string name="deeppurple">Mörklila</string>
<string name="indigo">Indigo</string>
<string name="blue">Blå</string>
<string name="lightblue">Ljusblå</string>
<string name="cyan">Cyan</string>
<string name="teal">Turkos</string>
<string name="green">Grön</string>
<string name="lightgreen">Ljusgrön</string>
<string name="lime">Gulgrön</string>
<string name="yellow">Gul</string>
<string name="amber">Gulorange</string>
<string name="orange">Orange</string>
<string name="deeporange">Mörkorange</string>
<string name="brown">Brun</string>
<string name="gray">Grå</string>
<string name="bluegray">Gråblå</string>
<string name="video_speed_05">0,5×</string>
<string name="video_speed_10">Normal</string>
<string name="video_speed_15">1,5×</string>
<string name="video_speed_20">2×</string>
<string name="pref_title_background_play">Spela upp i bakgrunden</string>
<string name="title_activity_account">Konto</string>
<string name="menu_video_more_report">Rapportera</string>
<string name="menu_video_more_blacklist">Svartlista</string>
<string name="video_download_permission_error">Kan inte ladda ner video utan skrivbehörighet</string>
<string name="video_rating_failed">Bedömningen kunde inte genomföras</string>
<string name="video_login_required_for_service">Du måste logga in för att använda den här tjänsten</string>
<string name="video_meta_button_share">Dela</string>
<string name="video_meta_button_download">Ladda ner</string>
<string name="video_meta_button_privacy">Hantering av personuppgifter</string>
<string name="video_meta_button_category">Kategori</string>
<string name="video_meta_button_license">Licens</string>
<string name="video_meta_button_language">Språk</string>
<string name="video_meta_button_tags">Taggar</string>
<string name="menu_video_options_playback_speed">Uppspelningshastighet</string>
<string name="menu_video_options_quality">Kvalitet</string>
<string name="account_bottom_menu_videos">Videor</string>
<string name="account_bottom_menu_channels">Kanaler</string>
<string name="account_bottom_menu_about">Om</string>
<string name="account_about_account">Konto:</string>
<string name="account_about_subscribers">Prenumeranter:</string>
<string name="account_about_description">Beskrivning:</string>
<string name="account_about_joined">Gick med:</string>
<string name="api_error">Någonting gick snett, försök gärna igen om en stund!</string>
<string name="title_activity_video_play">VideoPlayActivity</string>
<string name="permission_rationale">Ge åtkomst till kontakter för komplettering av e-postadresser.</string>
<string name="title_activity_url_video_play">UrlVideoPlayActivity</string>
<string name="pref_description_license">
\n<b>GNU Affero General Public License v3.0</b>
\n
\nRättigheterna den här starka copyleft-licensen ger, ges på villkoret att det licenserade verkets källkods samtliga delar och modifikationer görs tillgänglig under samma licens, detta gäller även större verk som använder det licenserade verket. Copyright- och licensnotiser måste bevaras. Bidragsgivare ger ett uttryckligt godkännande av patenträttigheter. Källkodens samtliga delar och modifikationer måste göras tillgänglig när en modifierad version används för att tillhandahålla en service över ett nätverk.</string>
<string name="pref_description_background_play">Videor kommer fortsätta spelas i bakgrunden om detta aktiveras.</string>
</resources>

View File

@ -63,4 +63,12 @@
<string name="pref_description_torrent_player">视频通过一个种子下载,此选项需要存储权限(实验阶段,不稳定!)</string>
<string name="action_bar_title_logout">退出</string>
<string name="zh">中文</string>
<string name="title_activity_video_play">视频播放Activity</string>
<string name="error_field_required">本字段必填</string>
<string name="action_bar_title_account">账户</string>
<string name="bottom_nav_title_recent">最近</string>
<string name="video_row_video_thumbnail">视频缩略图</string>
<string name="video_row_account_avatar">账号头像</string>
<string name="title_activity_url_video_play">Url视频播放Activity</string>
<string name="api_error">出故障了,请稍候再试</string>
</resources>

View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources><string name="title_activity_video_play">影片播放活動</string>
<resources>
<string name="title_activity_video_play">影片播放活動</string>
<string name="title_activity_settings">設定</string>
<string name="title_activity_login">登入</string>
<string name="prompt_server">伺服器</string>
@ -11,8 +12,7 @@
<string name="error_invalid_password">這個密碼太短了</string>
<string name="error_incorrect_password">這個密碼不正確</string>
<string name="error_field_required">這個欄位為必填</string>
<string name="permission_rationale">"聯絡人權限是電子郵件
\n 完成功能所必須。"</string>
<string name="permission_rationale">授予連絡人電子郵件完成權限。</string>
<string name="action_bar_title_search">搜尋</string>
<string name="action_bar_title_settings">設定</string>
<string name="action_bar_title_logout">登出</string>
@ -30,7 +30,7 @@
<string name="pref_title_show_nsfw">NSFW 內容</string>
<string name="pref_description_show_nsfw">顯示 NSFW 內容</string>
<string name="pref_language">語言過濾器</string>
<string name="pref_description_language">選取要顯示的影片語言。若未選取則將會顯示所有語言的所有影片。</string>
<string name="pref_description_language">選取所要的影片語言,而不是以所有的語言顯示全部影片。</string>
<string name="title_activity_url_video_play">Url影片播放活動</string>
<string name="pref_title_torrent_player">種子影片播放器</string>
<string name="pref_description_torrent_player">透過種子串流播放影片。這需要儲存權限。Alpha 版,不穩定!)</string>
@ -45,7 +45,7 @@
<string name="no_data_available">沒有結果</string>
<string name="descr_overflow_button">更多</string>
<string name="menu_share">分享</string>
<string name="invalid_url">無效的 Url</string>
<string name="invalid_url">無效的 URL。</string>
<string name="pref_title_dark_mode">深色模式</string>
<string name="pref_description_dark_mode">重新啟動應用程式以讓深色模式生效。</string>
<string name="pref_title_app_theme">應用程式主題</string>