From 58540750806724af108bee67eb260c89f3c82ec8 Mon Sep 17 00:00:00 2001
From: massimilianoLe <44651815+massimilianoLe@users.noreply.github.com>
Date: Fri, 23 Nov 2018 10:28:37 +0100
Subject: [PATCH 1/2] pull to refresh page (#219)

---
 .../github/dfa/diaspora_android/web/BrowserFragment.java | 8 ++++++++
 app/src/main/res/layout/browser__fragment.xml            | 9 +++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/github/dfa/diaspora_android/web/BrowserFragment.java b/app/src/main/java/com/github/dfa/diaspora_android/web/BrowserFragment.java
index 28db279b..32a1e83a 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/web/BrowserFragment.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/web/BrowserFragment.java
@@ -33,6 +33,7 @@ import com.github.dfa.diaspora_android.ui.theme.ThemeHelper;
 import com.github.dfa.diaspora_android.ui.theme.ThemedFragment;
 import com.github.dfa.diaspora_android.util.AppLog;
 import com.github.dfa.diaspora_android.util.AppSettings;
+import android.support.v4.widget.SwipeRefreshLayout;//pull to refresh
 
 /**
  * Fragment with a webView and a ProgressBar.
@@ -50,6 +51,7 @@ public class BrowserFragment extends ThemedFragment {
     protected WebSettings webSettings;
 
     protected String pendingUrl;
+    protected SwipeRefreshLayout swipe;//pull to refresh
 
     @Override
     protected int getLayoutResId() {
@@ -90,6 +92,11 @@ public class BrowserFragment extends ThemedFragment {
         webView.setParentActivity(getActivity());
 
         this.setRetainInstance(true);
+
+        //pull to refresh
+  swipe = view.findViewById(R.id.swipe);
+  swipe.setOnRefreshListener(() -> reloadUrl());
+  swipe.setDistanceToTriggerSync(20000);
     }
 
     @Override
@@ -192,6 +199,7 @@ public class BrowserFragment extends ThemedFragment {
                 @Override
                 public void run() {
                     getWebView().reload();
+                    swipe.setRefreshing(false);//pull to refresh
                 }
             });
 
diff --git a/app/src/main/res/layout/browser__fragment.xml b/app/src/main/res/layout/browser__fragment.xml
index 96daf8b1..9f534a0a 100644
--- a/app/src/main/res/layout/browser__fragment.xml
+++ b/app/src/main/res/layout/browser__fragment.xml
@@ -5,11 +5,16 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:context="com.github.dfa.diaspora_android.activity.MainActivity">
 
+    <android.support.v4.widget.SwipeRefreshLayout
+        android:id="@+id/swipe"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
     <com.github.dfa.diaspora_android.web.ContextMenuWebView
         android:id="@+id/webView"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
-
+    </android.support.v4.widget.SwipeRefreshLayout>
+    
     <ProgressBar
         android:id="@+id/progressBar"
         style="@style/Widget.AppCompat.ProgressBar.Horizontal"
@@ -18,4 +23,4 @@
         android:indeterminate="false"
         android:progressDrawable="@drawable/progressbar" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>

From 04e89e516c5c8dfe1e89410d58e18c27816fcf20 Mon Sep 17 00:00:00 2001
From: Gregor Santner <gsantner@users.noreply.github.com>
Date: Fri, 23 Nov 2018 10:31:00 +0100
Subject: [PATCH 2/2] New Crowdin translations (#218)

---
 app/src/main/res/values-af/strings.xml | 71 ++++++++++++++++++++++++++
 app/src/main/res/values-ca/strings.xml |  2 +-
 app/src/main/res/values-pt/strings.xml | 11 ++++
 3 files changed, 83 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index dbdd3fbf..06d131e7 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -2,10 +2,56 @@
 <!--Generated by crowdin.com-->
 <resources>
     <!-- Application -->
+    <string name="open_navdrawer">Maak navigasie balk oop</string>
+    <string name="close_navdrawer">Sluit navigasie balk</string>
+    <string name="reload">Herlaai</string>
     <!-- Common Words -->
+    <string name="settings">Instellings</string>
+    <string name="notifications">Kennisgewings</string>
+    <string name="conversations">Gesprekke</string>
+    <string name="stream">Stroom</string>
+    <string name="profile">Profiel</string>
+    <string name="aspects">Aspekte</string>
+    <string name="activities">Aktiwiteite</string>
+    <string name="commented">Opgemerk</string>
+    <string name="mentions">Aantal keer genoem</string>
+    <string name="public_">Publiek</string>
+    <string name="search">Soek</string>
+    <string name="contacts">Kontakte</string>
+    <string name="changelog">Verandering-log</string>
+    <string name="statistics">Statistiek</string>
     <!-- Notifications dropdown menu -->
+    <string name="all_notifications">Alle kennisgewings</string>
+    <string name="also_commented">Ook Opgemerk</string>
+    <string name="comment_on_post">Lewer kommentaar op hierdie plasing</string>
+    <string name="mentioned">Aantal keer genoem</string>
+    <string name="reshared">Herdeel</string>
+    <string name="started_sharing">Begin deel</string>
     <!-- Pod Activity -->
+    <string name="confirmation">Bevestiging</string>
+    <string name="do_you_want_to_exit">Wil jy uitgaan?</string>
     <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <string name="more">Meer</string>
+    <string name="help_license">Omtrent | Hulp</string>
+    <string name="followed_tags">Gevolgde merkers</string>
+    <string name="public_activities">Publieke aktiwiteite</string>
+    <string name="reports">Verslae</string>
+    <string name="share_link_as_text">Deel skakel as teks</string>
+    <string name="share_screenshot_of_webpage">Deel vriesbeeld van webbladsy</string>
+    <string name="take_screenshot_of_webpage">Neem vriesbeeld van webbladsy</string>
+    <string name="saving_image_to">Stoor beeld na</string>
+    <string name="saving_screenshot_as">Stoor vriesbeeld as:</string>
+    <string name="link_adress_copied">Skakel adres gekopieer…</string>
+    <string name="new_post">Nuwe Plasing</string>
+    <string name="go_to_top">Gaan tot bo</string>
+    <string name="search_by_tags_or_persons__appspecific">Soek met merkers of persone</string>
+    <string name="exit_app">Verlaat toep</string>
+    <string name="toggle_mobile_desktop_view">Wissel Mobiele/Monitor oogpunt</string>
+    <string name="share_dotdotdot">Deel…</string>
+    <string name="by_tags">met merkers</string>
+    <string name="by_people">met mense</string>
+    <string name="please_add_a_name">Voer asseblief \'n naam in</string>
+    <string name="share_link_address">Deel skakel adres</string>
     <!-- More from MainActivity -->
     <!-- Permissions -->
     <!-- Operability -->
@@ -15,11 +61,36 @@
     <!-- Themes -->
     <!-- Notifications dropdown -->
     <!-- Font size -->
+    <string name="font_size">Fontgrootte</string>
+    <string name="normal">Normaal</string>
+    <string name="large">Groot</string>
+    <string name="huge">Masief</string>
     <!-- Load images -->
+    <string name="load_images">Laai beelde</string>
     <!-- Screen rotation -->
+    <string name="screen_rotation">Skerm Rotasie</string>
+    <string name="control_screen_rotation">Beheer outomatiese skermrotasie</string>
+    <string name="default_">Verstek</string>
+    <string name="portrait">Portret</string>
+    <string name="landscape">Landskap</string>
     <!-- Proxy -->
+    <string name="load_tor_preset">Laai Tor voorkeure</string>
+    <string name="host">Gasheer</string>
+    <string name="port">Poort</string>
+    <string name="app_needs_restart_to_disable_proxy_usage">Toep moet herlaai om volmag te deaktiveer</string>
+    <string name="orbot_proxy_preset_loaded">Orbot volmag voorkeure gelaai</string>
     <!-- Chrome custom tabs -->
     <!-- Diaspora Settings -->
+    <string name="personal_settings">Persoonlike instellings</string>
     <!-- More -->
+    <string name="miscellaneous">Diverse</string>
+    <string name="full_reset">Volle herstel</string>
+    <string name="block_advertisments">Blok advertensies</string>
+    <string name="about">Omtrent</string>
+    <string name="license">Lisensie</string>
+    <string name="debugging">Ontfouting</string>
+    <string name="application">Toepassing</string>
+    <string name="device">Toestel</string>
+    <string name="diaspora_pod__appspecific">diaspora * Pod</string>
     <!-- License & help (large amount of text) -->
 </resources>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 4b784686..1e73dcf0 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -120,7 +120,7 @@ Aneu a: Configuració del sistema - Aplicacions - dandelion*. A la secció de pe
     <string name="load_images">Carrega imatges</string>
     <string name="toggle_image_loading_to_save_mobile_data">Commuta la càrrega d\'imatges a p. ex. estalvia dades mòbils</string>
     <!-- Screen rotation -->
-    <string name="screen_rotation">Rotació de la pantalla</string>
+    <string name="screen_rotation">Rotació de pantalla</string>
     <string name="control_screen_rotation">Control automàtic de la rotació de la pantalla</string>
     <string name="default_">Per defecte</string>
     <string name="sensor_ignore_system_settings">Sensor\n(ignora la configuració del sistema)</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index dfa9bb31..fef3255b 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -64,11 +64,15 @@
     <!-- More from MainActivity -->
     <string name="unable_to_load_image">Não foi possível carregar a imagem</string>
     <!-- Permissions -->
+    <string name="permission_denied">Permissão recusada.</string>
+    <string name="permission_granted_try_again">Permissão concedida. Tente novamente.</string>
     <string name="protocol">Protocolo</string>
     <string name="missing_value">Valor em falta</string>
+    <string name="hide_statusbar_in_mainview">Ocultar barra de estado na vista principal</string>
     <string name="hide_statusbar">Ocultar barra de estado</string>
     <string name="show_title_in_main_view">Mostrar título na vista principal</string>
     <string name="show_title">Mostrar título</string>
+    <string name="launcher_shortcut">Atalho para o lançador</string>
     <!-- Operability -->
     <!-- Category Titles -->
     <string name="appearance">Aparência</string>
@@ -76,6 +80,7 @@
     <!-- Visuals -->
     <!-- Navigiation Slider -->
     <string name="navigation_drawer">Controlo de navegação</string>
+    <string name="control_visibility_of_entries_nav_drawer">Controlar exibição das entradas no menu de navegação</string>
     <string name="user">Utilizador</string>
     <string name="general">Geral</string>
     <string name="admin">Administrador</string>
@@ -109,10 +114,14 @@
     <!-- Proxy -->
     <string name="proxy">Proxy</string>
     <string name="enable_proxy">Ativar proxy</string>
+    <string name="host">Servidor</string>
+    <string name="port">Porta</string>
+    <string name="app_needs_restart_to_disable_proxy_usage">Tem que reiniciar a aplicação para aplicar a alteração</string>
     <!-- Chrome custom tabs -->
     <!-- Diaspora Settings -->
     <string name="personal_settings">Definições pessoais</string>
     <string name="manage_your_contact_list">Gerir lista de contactos</string>
+    <string name="change_account">Mudar de conta</string>
     <string name="clear_cache">Limpar cache</string>
     <!-- More -->
     <string name="miscellaneous">Diversos</string>
@@ -136,9 +145,11 @@
     <string name="translate_the_app">Traduzir a aplicação!</string>
     <string name="let_me_translate">Quero participar</string>
     <string name="report_bugs">Reportar erros</string>
+    <string name="spread_the_word">Passe a palavra!</string>
     <string name="share_the_app">Partilhar plicação</string>
     <!-- License & help (large amount of text) -->
     <string name="maintainers">Desenvolvimento</string>
+    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Esta aplicação está a ser desenvolvida e mantida por &lt;br&gt;&lt;br&gt;%1$s</string>
     <string name="contributors">Colaboradores</string>
     <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;Obrigado!</string>
     <string name="gnu_gplv3_license">Licença GNU GPLv3+</string>