mirror of
https://github.com/gsantner/dandelion
synced 2024-11-16 17:32:08 +01:00
Changes request applyed
This commit is contained in:
parent
19d54c5c05
commit
e13b32ae21
16 changed files with 32 additions and 98 deletions
|
@ -100,8 +100,8 @@ public class BrowserFragment extends ThemedFragment {
|
|||
if (appSettings.isSwipeRefreshEnabled()){
|
||||
swipe.setEnabled( true );
|
||||
|
||||
}else {
|
||||
swipe.setRefreshing(false);
|
||||
} else {
|
||||
swipe.setRefreshing( false );
|
||||
swipe.setEnabled( false );
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -93,6 +93,6 @@
|
|||
<string name="device">Toestel</string>
|
||||
<string name="diaspora_pod__appspecific">diaspora * Pod</string>
|
||||
<!-- License & help (large amount of text) -->
|
||||
<string name="open_youtube_external_tabs_description">Bemagtig om Youtube links oop te maak in eksterne Toeps</string>
|
||||
<string name="pref_title__open_youtube_external">Youtube links</string>
|
||||
<string name="enable_to_open_youtube_links_on_external_app">Bemagtig om Youtube links oop te maak in eksterne Toeps</string>
|
||||
<string name="youtube_links">Youtube links</string>
|
||||
</resources>
|
||||
|
|
|
@ -200,6 +200,6 @@ diaspora*. Si voleu contribuir, endavant! Actualment som un equip molt petit, de
|
|||
<string name="the_following_libraries_are_used">S\'utilitzen les següents biblioteques:</string>
|
||||
<string name="inspiration_from_leafpic__appspecific">Prenem alguna inspiració i codi de LeafPic. Aneu a comprovar-ho, també és programari gratuït!</string>
|
||||
<string name="tell_me_more">Expliqueu-me més</string>
|
||||
<string name="open_youtube_external_tabs_description">Activeu-ho per obrir enllaços de Youtube en aplicacions externes</string>
|
||||
<string name="pref_title__open_youtube_external">Enllaços de YouTube</string>
|
||||
<string name="enable_to_open_youtube_links_on_external_app">Activeu-ho per obrir enllaços de Youtube en aplicacions externes</string>
|
||||
<string name="youtube_links">Enllaços de YouTube</string>
|
||||
</resources>
|
||||
|
|
|
@ -198,6 +198,6 @@
|
|||
<string name="the_following_libraries_are_used">Se utilizan las siguientes bibliotecas:</string>
|
||||
<string name="inspiration_from_leafpic__appspecific">Tomamos algo de inspiración y código de LeafPic. ¡Venga, tomad prestado, es software libre también!</string>
|
||||
<string name="tell_me_more">Saber más</string>
|
||||
<string name="open_youtube_external_tabs_description">Habilitar para abrir enlaces de Youtube en aplicaciones externas</string>
|
||||
<string name="pref_title__open_youtube_external">Enlaces de YouTube</string>
|
||||
<string name="enable_to_open_youtube_links_on_external_app">Habilitar para abrir enlaces de Youtube en aplicaciones externas</string>
|
||||
<string name="youtube_links">Enlaces de YouTube</string>
|
||||
</resources>
|
||||
|
|
|
@ -201,6 +201,6 @@
|
|||
<string name="the_following_libraries_are_used">Utilízase o seguinte código:</string>
|
||||
<string name="inspiration_from_leafpic__appspecific">Inspirámonos e collemos código de LeafPic. Bótalle un ollo, tamén é software libre!</string>
|
||||
<string name="tell_me_more">Cóntame máis</string>
|
||||
<string name="open_youtube_external_tabs_description">Activar para abrir vídeos YouTube nunha app externa</string>
|
||||
<string name="pref_title__open_youtube_external">Ligazóns YouTube</string>
|
||||
<string name="enable_to_open_youtube_links_on_external_app">Activar para abrir vídeos YouTube nunha app externa</string>
|
||||
<string name="youtube_links">Ligazóns YouTube</string>
|
||||
</resources>
|
||||
|
|
|
@ -198,6 +198,6 @@
|
|||
<string name="the_following_libraries_are_used">以下のライブラリーが使用されます:</string>
|
||||
<string name="inspiration_from_leafpic__appspecific">LeafPic からいくつかのインスピレーションとコードを得ました。チェックしてみてください。同様のフリーソフトウェアです!</string>
|
||||
<string name="tell_me_more">さらに詳しく</string>
|
||||
<string name="open_youtube_external_tabs_description">外部アプリで Youtube のリンクを開くことができます</string>
|
||||
<string name="pref_title__open_youtube_external">Youtube のリンク</string>
|
||||
<string name="enable_to_open_youtube_links_on_external_app">外部アプリで Youtube のリンクを開くことができます</string>
|
||||
<string name="youtube_links">Youtube のリンク</string>
|
||||
</resources>
|
||||
|
|
|
@ -156,6 +156,6 @@
|
|||
<string name="show_third_party_licenses">Bibliotecas de terceiros</string>
|
||||
<string name="the_following_libraries_are_used">Utilizamos as seguintes bibliotecas:</string>
|
||||
<string name="tell_me_more">Saber mais</string>
|
||||
<string name="open_youtube_external_tabs_description">Ative para abrir as ligações YouTube na aplicação externa</string>
|
||||
<string name="pref_title__open_youtube_external">Ligações YouTube</string>
|
||||
<string name="enable_to_open_youtube_links_on_external_app">Ative para abrir as ligações YouTube na aplicação externa</string>
|
||||
<string name="youtube_links">Ligações YouTube</string>
|
||||
</resources>
|
||||
|
|
|
@ -198,6 +198,6 @@
|
|||
<string name="the_following_libraries_are_used">Используются следующие библиотеки:</string>
|
||||
<string name="inspiration_from_leafpic__appspecific">Мы вдохновлялись и взяли немного кода из LeafPic. Попробуйте это приложение, оно тоже является свободным ПО!</string>
|
||||
<string name="tell_me_more">Расскажите мне больше</string>
|
||||
<string name="open_youtube_external_tabs_description">Открывать ссылки на Youtube во внешних приложениях</string>
|
||||
<string name="pref_title__open_youtube_external">Ссылки на Youtube</string>
|
||||
<string name="enable_to_open_youtube_links_on_external_app">Открывать ссылки на Youtube во внешних приложениях</string>
|
||||
<string name="youtube_links">Ссылки на Youtube</string>
|
||||
</resources>
|
||||
|
|
|
@ -201,6 +201,6 @@
|
|||
<string name="the_following_libraries_are_used">Sunt impreadas custas librerias:</string>
|
||||
<string name="inspiration_from_leafpic__appspecific">Amus pigadu ispiratzione e parte de su còdighe dae LeafPic. Abbistade·bos·lu, est fintzas cussu unu programma lìberu!</string>
|
||||
<string name="tell_me_more">Àteras informatziones</string>
|
||||
<string name="open_youtube_external_tabs_description">Abìlita pro abèrrere sos ligàmenes de Youtube in un\'aplicatzione esterna</string>
|
||||
<string name="pref_title__open_youtube_external">Ligàmenes de Youtube</string>
|
||||
<string name="enable_to_open_youtube_links_on_external_app">Abìlita pro abèrrere sos ligàmenes de Youtube in un\'aplicatzione esterna</string>
|
||||
<string name="youtube_links">Ligàmenes de Youtube</string>
|
||||
</resources>
|
||||
|
|
|
@ -1,25 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--Generated by crowdin.com-->
|
||||
<resources>
|
||||
<!-- Application -->
|
||||
<!-- Common Words -->
|
||||
<!-- Notifications dropdown menu -->
|
||||
<!-- Pod Activity -->
|
||||
<!-- Drawer, Menu, Toolbar, ContextMenu -->
|
||||
<!-- More from MainActivity -->
|
||||
<!-- Permissions -->
|
||||
<!-- Operability -->
|
||||
<!-- Category Titles -->
|
||||
<!-- Visuals -->
|
||||
<!-- Navigiation Slider -->
|
||||
<!-- Themes -->
|
||||
<!-- Notifications dropdown -->
|
||||
<!-- Font size -->
|
||||
<!-- Load images -->
|
||||
<!-- Screen rotation -->
|
||||
<!-- Proxy -->
|
||||
<!-- Chrome custom tabs -->
|
||||
<!-- Diaspora Settings -->
|
||||
<!-- More -->
|
||||
<!-- License & help (large amount of text) -->
|
||||
</resources>
|
|
@ -1,39 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--Generated by crowdin.com-->
|
||||
<resources>
|
||||
<!-- Application -->
|
||||
<!-- Common Words -->
|
||||
<string name="settings">Поставке</string>
|
||||
<string name="search">тражи</string>
|
||||
<string name="changelog">Дневник измена</string>
|
||||
<!-- Notifications dropdown menu -->
|
||||
<!-- Pod Activity -->
|
||||
<!-- Drawer, Menu, Toolbar, ContextMenu -->
|
||||
<string name="more">још</string>
|
||||
<string name="share_dotdotdot">Подели…</string>
|
||||
<!-- More from MainActivity -->
|
||||
<!-- Permissions -->
|
||||
<!-- Operability -->
|
||||
<!-- Category Titles -->
|
||||
<string name="network">Мрежа</string>
|
||||
<!-- Visuals -->
|
||||
<!-- Navigiation Slider -->
|
||||
<!-- Themes -->
|
||||
<!-- Notifications dropdown -->
|
||||
<string name="language_change_restart_description">Промените језик апликације. Поново покрените након тога</string>
|
||||
<string name="language">Језик</string>
|
||||
<!-- Font size -->
|
||||
<!-- Load images -->
|
||||
<!-- Screen rotation -->
|
||||
<!-- Proxy -->
|
||||
<!-- Chrome custom tabs -->
|
||||
<!-- Diaspora Settings -->
|
||||
<string name="clear_cache">Обриши кеш</string>
|
||||
<!-- More -->
|
||||
<string name="miscellaneous">разно</string>
|
||||
<string name="about">О програму</string>
|
||||
<string name="license">Лиценца</string>
|
||||
<!-- License & help (large amount of text) -->
|
||||
<string name="maintainers">Програмери</string>
|
||||
<string name="contributors">Сарадници</string>
|
||||
</resources>
|
|
@ -199,6 +199,6 @@
|
|||
<string name="the_following_libraries_are_used">我們使用了下列程式庫:</string>
|
||||
<string name="inspiration_from_leafpic__appspecific">我們從 LeafPic 應用程式得到一些啟發以及程式碼。去看看吧,它也是自由軟體喔!</string>
|
||||
<string name="tell_me_more">再多說一些</string>
|
||||
<string name="open_youtube_external_tabs_description">使用其他應用程式來開啟 Youtube 連結</string>
|
||||
<string name="pref_title__open_youtube_external">Youtube 連結</string>
|
||||
<string name="enable_to_open_youtube_links_on_external_app">使用其他應用程式來開啟 Youtube 連結</string>
|
||||
<string name="youtube_links">Youtube 連結</string>
|
||||
</resources>
|
||||
|
|
|
@ -253,11 +253,10 @@
|
|||
<string name="the_following_libraries_are_used">The following libraries are used:</string>
|
||||
<string name="inspiration_from_leafpic__appspecific">We took some inspiration and code from LeafPic. Go check it out, it\'s free software as well!</string>
|
||||
<string name="tell_me_more">Tell me more</string>
|
||||
<string name="open_youtube_external_tabs_description">Enable to open Youtube links on external app</string>
|
||||
<string name="pref_title__open_youtube_external">Youtube links</string>
|
||||
<string name="pref_desc__sub_theme">Change the theme of your channel</string>
|
||||
<string name="pref_title__sub_theme">Hubzilla theme settings</string>
|
||||
<string name="pref_title_swipe_refresh">Pull to refresh</string>
|
||||
<string name="swipe_refresh_description">Pulling down on top of page to refresh.\nYou need to restart the app for changes to take effect.</string>
|
||||
<string name="enable_to_open_youtube_links_on_external_app">Enable to open Youtube links on external app</string>
|
||||
<string name="youtube_links">Youtube links</string>
|
||||
<string name="change_the_theme_of_your_account">Change the theme of your account</string>
|
||||
<string name="pull_to_refresh">Pull to refresh</string>
|
||||
<string name="pulling_down_on_top_of_page_to_refresh">Pulling down on top of page to refresh.\nYou need to restart the app for changes to take effect.</string>
|
||||
|
||||
</resources>
|
||||
|
|
|
@ -77,8 +77,8 @@
|
|||
android:defaultValue="true"
|
||||
android:icon="@drawable/ic_open_yt_external_black_24px"
|
||||
android:key="@string/pref_key__open_youtube_external_enabled"
|
||||
android:summary="@string/open_youtube_external_tabs_description"
|
||||
android:title="@string/pref_title__open_youtube_external"/>
|
||||
android:summary="@string/enable_to_open_youtube_links_on_external_app"
|
||||
android:title="@string/youtube_links"/>
|
||||
|
||||
<com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
|
||||
android:defaultValue="false"
|
||||
|
@ -107,8 +107,8 @@
|
|||
android:defaultValue="true"
|
||||
android:icon="@drawable/ic_touch_app_black_24px"
|
||||
android:key="@string/pref_key__swipe_refresh_enabled"
|
||||
android:title="@string/pref_title_swipe_refresh"
|
||||
android:summary="@string/swipe_refresh_description"/>
|
||||
android:title="@string/pull_to_refresh"
|
||||
android:summary="@string/pulling_down_on_top_of_page_to_refresh"/>
|
||||
|
||||
</com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
|
||||
|
||||
|
|
|
@ -25,8 +25,8 @@
|
|||
<Preference
|
||||
android:icon="@drawable/ic_color_lens_black_24px"
|
||||
android:key="@string/pref_key__manage_theme"
|
||||
android:summary="@string/pref_desc__sub_theme"
|
||||
android:title="@string/pref_title__sub_theme"/>
|
||||
android:summary="@string/change_the_theme_of_your_account"
|
||||
android:title="@string/open_diaspora_account_settings__appspecific"/>
|
||||
|
||||
</com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
|
||||
</PreferenceScreen>
|
3
gradle/wrapper/gradle-wrapper.properties
vendored
3
gradle/wrapper/gradle-wrapper.properties
vendored
|
@ -1,6 +1,5 @@
|
|||
#Tue Jan 15 17:52:59 CET 2019
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
|
||||
|
|
Loading…
Reference in a new issue