vanitasvitae/dandelion
1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2024-11-22 04:12:08 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:Diaspora-for-Android/diaspora-android

Browse source
This commit is contained in:
vanitasvitae 2016-08-16 21:55:45 +02:00
commit 68e5a4a081
4 changed files with 31 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
SCREENSHOTS.md
View file

@ -1,14 +1,14 @@
<table>
<tr>
<td><img src="https://cloud.githubusercontent.com/assets/6735650/15806540/ada77adc-2b45-11e6-86a0-23467d4c5fc2.png" height="60%" width="60%"></td>
<td><img src="https://cloud.githubusercontent.com/assets/6735650/15806541/ada7f908-2b45-11e6-8c88-5e141ae1786f.png" height="60%" width="60%"></td>
<td><img src="https://cloud.githubusercontent.com/assets/6735650/15806544/adab9630-2b45-11e6-8337-0a84bd9c195d.png" height="60%" width="60%"></td>
<td><img src="https://cloud.githubusercontent.com/assets/6735650/15806542/adaa1580-2b45-11e6-95d9-ab4317dc0e05.png" height="60%" width="60%"></td>
<td><img src="https://cloud.githubusercontent.com/assets/7854206/17698079/5025aa3a-63b9-11e6-9c25-dda3020dd36f.png" height="60%" width="60%"></td>
<td><img src="https://cloud.githubusercontent.com/assets/7854206/17698080/503f9904-63b9-11e6-9eb7-9ad1500889af.png" height="60%" width="60%"></td>
<td><img src="https://cloud.githubusercontent.com/assets/7854206/17698082/50443bee-63b9-11e6-9881-d8e871453650.png" height="60%" width="60%"></td>
<td><img src="https://cloud.githubusercontent.com/assets/7854206/17698083/50488514-63b9-11e6-8a44-e7d7e43ae728.png" height="60%" width="60%"></td>
</tr>
<tr>
<td><img src="https://cloud.githubusercontent.com/assets/6735650/15806543/adaada24-2b45-11e6-96b2-9cb391aad0f9.png" height="60%" width="60%"></td>
<td><img src="https://cloud.githubusercontent.com/assets/6735650/15806545/adac1114-2b45-11e6-8875-5ba414cb1fbd.png" height="60%" width="60%"></td>
<td><img src="https://cloud.githubusercontent.com/assets/6735650/15806546/adc6caae-2b45-11e6-86f9-48402b752000.png" height="60%" width="60%"></td>
<td><img src="https://cloud.githubusercontent.com/assets/6735650/15806547/adc73890-2b45-11e6-9e46-3bb6b2ecc1c9.png" height="60%" width="60%"></td>
<td><img src="https://cloud.githubusercontent.com/assets/7854206/17698085/504b17ac-63b9-11e6-845f-273f9d0e50ff.png" height="60%" width="60%"></td>
<td><img src="https://cloud.githubusercontent.com/assets/7854206/17698084/504ab4b0-63b9-11e6-96a0-32bc27f4b0ab.png" height="60%" width="60%"></td>
<td><img src="https://cloud.githubusercontent.com/assets/7854206/17698081/503ff9a8-63b9-11e6-8c52-d14fdf973881.png" height="60%" width="60%"></td>
<td><img src="https://cloud.githubusercontent.com/assets/7854206/17698086/505cbd0e-63b9-11e6-8719-9398b81734a1.png" height="60%" width="60%"></td>
</tr>
</table>

2
app/src/main/res/values-fr/strings-preferences.xml
View file

@ -10,7 +10,7 @@
<string name="pref_cat__pod_settings">Paramètres du pod</string>
<!-- Visuals -->
<!-- Navigiation Slider -->
<string name="pref_title__sub_nav_slider">Barre de navigation</string>
<string name="pref_title__sub_nav_slider">Barre de défilement</string>
<string name="pref_desc__sub_nav_slider">Paramètres multiples pour le panneau de navigation</string>
<string name="pref_cat__visibility_nav_items">Visibilité de l’élément</string>
<!-- Font size -->

21
app/src/main/res/values-nl/strings-preferences.xml
View file

@ -10,6 +10,9 @@
<string name="pref_cat__pod_settings">Pod-instellingen</string>
<!-- Visuals -->
<!-- Navigiation Slider -->
<string name="pref_title__sub_nav_slider">Navigatie Slider</string>
<string name="pref_desc__sub_nav_slider">Meerdere instellingen voor de navigatie schuifbalk</string>
<string name="pref_cat__visibility_nav_items">Item Zichtbaarheid</string>
<!-- Font size -->
<string name="pref_title__font_size">Lettergrootte</string>
<!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
@ -18,6 +21,24 @@
<string name="pref_desc__load_images">Afbeelding laden uitschakelen om mobiele data te besparen</string>
<!-- Proxy -->
<string name="pref_title__proxy_enabled">Proxy inschakelen</string>
<string name="pref_desc__proxy_enabled">Gebruik een Proxy voor Diaspora om de firewalls te omzeilen.\nRestart nodig</string>
<string name="pref_title__proxy_host">Host</string>
<string name="pref_title__proxy_port">Poort</string>
<!-- Diaspora Settings -->
<string name="pref_title__personal_settings">Persoonlijke instellingen</string>
<string name="pref_desc__personal_settings">Open uw accountinstellingen van diaspora</string>
<string name="pref_title__manage_contacts">Contacten</string>
<string name="pref_desc__manage_contacts">Uw lijst met contactpersonen beheren</string>
<string name="pref_title__manage_tags">Beheren van Hashtags</string>
<string name="pref_desc__manage_tags">Toevoegen en verwijderen van de hashtags die u volgt</string>
<string name="pref_title__change_account">Account wijzigen</string>
<string name="pref_desc__change_account">Lokale sessiegegevens wissen en schakel over naar een andere Diaspora pod/account</string>
<string name="pref_warning__change_account">Dit zal alle cookies en sessiegegevens wissen. Wilt u echt uw account wijzigen?</string>
<string name="pref_title__clear_cache">Cache wissen</string>
<string name="pref_desc__clear_cache">WebView-cache leegmaken</string>
<string name="pref_desc__intellihide_toolbars">Boven- en onderkant werkbalken automatisch verbergen tijdens het scrollen</string>
<string name="pref_title__intellihide_toolbars">Werkbalken slim wegwerken</string>
<string name="pref_title__append_shared_via_app">Gedeeld-via-aankondiging toevoegen</string>
<string name="pref_desc__append_shared_via_app">Een verwijzing naar dit app (\"gedeeld door&#8230;\") toevoegen aan gedeelde teksten</string>
<!-- Recently added - Please move to right section-->
</resources>

2
app/src/main/res/values-nl/strings.xml
View file

@ -45,7 +45,7 @@
<string name="action_go_to_top">Terug naar boven</string>
<string name="action_search_by_tags_or_persons">Zoeken op tags of personen</string>
<string name="action_exit_app">App afsluiten</string>
<string name="action_toggle_desktop_page">Mobiele/desktop weergave in-/ uitschakelen</string>
<string name="action_toggle_desktop_page">Desktop weergave in-/uitschakelen</string>
<string name="action_share_dotdotdot">Delen&#8230;</string>
<string name="search_alert_tag">viaTags</string>
<string name="search_alert_people">via mensen</string>