Changes for dandelion

.travis.yml

@@ -23,6 +23,8 @@ env:
 branches:
   except:
   - l10n_master
+  - l10n_master2
+  - crowdin
 notifications:
   webhooks:
     urls:

CHANGELOG.md

@@ -1,7 +1,9 @@
 # v0.2.0-next
+- App name changed to **dandelion\***
+- Rotation options
 
 
-# v0.2.0
+# v0.2.0a
 - Added: Customizable Theme Colors!
 - Improved account setup with easy tor hidden service configuration
 - Eye candy for the settings activity

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 We are always open for any kind of contribution. (PR's, bug reports, feature requests, translations, ..)  
-If you got any questions feel free to join our XMPP/Jabber conference at `diaspora-android@conference.jabberhead.tk` or [Gitter](https://gitter.im/Diaspora-for-Android/diaspora-android).  
+If you got any questions feel free to join our IRC conference at `#dandelion @irc.freenode.net` or [Gitter](https://gitter.im/Diaspora-for-Android/diaspora-android).  
 Note that the main project members are mostly busy with their job/university/school and may not react or start coding immediately.
 
-We use Crowdin to translate Diaspora for Android. Join our project here:   <https://crowdin.com/project/diaspora-for-android/invite>  
+We use Crowdin to translate dandelion\*. Join our project here:   <https://crowdin.com/project/diaspora-for-android/invite>  
 If your desired language is not listed please contact the maintainers/owner.  

README.md

@@ -1,33 +1,33 @@
 [![F-Droid](https://f-droid.org/wiki/images/0/06/F-Droid-button_get-it-on.png)](https://f-droid.org/repository/browse/?fdid=com.github.dfa.diaspora_android)
 
-<a name="badgers"></a>[![Build Status](https://travis-ci.org/Diaspora-for-Android/diaspora-android.svg?branch=master)](https://travis-ci.org/Diaspora-for-Android/diaspora-android)
+<a name="badgers"></a>[![Build Status](https://travis-ci.org/Diaspora-for-Android/dandelion.svg?branch=master)](https://travis-ci.org/Diaspora-for-Android/dandelion)
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/diaspora-for-android/localized.svg)](https://crowdin.com/project/diaspora-for-android)
-[![Chat - FreeNode IRC](https://img.shields.io/badge/chat-on%20freenode-blue.svg)](https://kiwiirc.com/client/irc.freenode.net/?nick=user-dfa|?#diaspora-for-android)
+[![Chat - FreeNode IRC](https://img.shields.io/badge/chat-on%20freenode-blue.svg)](https://kiwiirc.com/client/irc.freenode.net/?nick=user-dandelion|?#dandelion)
-[![Chat - Gitter](https://img.shields.io/badge/chat-on%20gitter-blue.svg)](https://gitter.im/Diaspora-for-Android/diaspora-android)
+[![Chat - Gitter](https://img.shields.io/badge/chat-on%20gitter-blue.svg)](https://gitter.im/Diaspora-for-Android/dandelion)
 
 
-# DiasporaForAndroid
+# dandelion\*
 
 This is an unofficial webview based client for the community-run, distributed social network **[Diaspora*](https://diasporafoundation.org/)**. It's currently under development and should be used with that in mind. Please submit any bugs you might find.  
 
-- Download ([F-Droid](https://f-droid.org/repository/browse/?fdid=com.github.dfa.diaspora_android), [Release Archive](https://github.com/Diaspora-for-Android/diaspora-android/releases))
+- Download ([F-Droid](https://f-droid.org/repository/browse/?fdid=com.github.dfa.diaspora_android), [Release Archive](https://github.com/Diaspora-for-Android/dandelion/releases))
-- Watch [Changelog](https://github.com/Diaspora-for-Android/diaspora-android/blob/master/CHANGELOG.md)
+- Watch [Changelog](https://github.com/Diaspora-for-Android/dandelion/blob/master/CHANGELOG.md)
-- See [Screenshots](https://github.com/Diaspora-for-Android/diaspora-android/blob/master/SCREENSHOTS.md)
+- See [Screenshots](https://github.com/Diaspora-for-Android/dandelion/blob/master/SCREENSHOTS.md)
 
 ## Contributions
 We are always open for any kind of contribution. (PR's, bug reports, feature requests, translations, ..)  
 If you got any questions feel free to contact us on IRC, XMPP or Gitter. You can start chatting by clicking on the [blue chat badges](#badgers) listed on top.
 
-We use Crowdin to translate Diaspora for Android. Join our project here: <https://crowdin.com/project/diaspora-for-android/invite>. If your desired language is not listed please contact the maintainers/owner.  
+We use Crowdin to translate dandelion\*. Join our project here: <https://crowdin.com/project/diaspora-for-android/invite>. If your desired language is not listed please contact the maintainers/owner.  
 
 Note that the main project members are working on this project for free during leisure time, are mostly busy with their job/university/school, and may not react or start coding immediately.
 
 ### License
-Diaspora for Android is released under GNU GENERAL PUBLIC LICENSE (see [LICENCE](https://github.com/Diaspora-for-Android/diaspora-android/blob/master/LICENSE.md)).
+dandelion\* is released under GNU GENERAL PUBLIC LICENSE (see [LICENCE](https://github.com/Diaspora-for-Android/dandelion/blob/master/LICENSE.md)).
 
 ### WebApp
-The app is developed as a WebApp because currently Diaspora doesn't have an API that can be used to create a native interface to retrieve the user's data, publications, direct messages and so on. That's why there are only WebApps for Diaspora out there.  
+The app is developed as a WebApp because currently diaspora\* doesn't have an API that can be used to create a native interface to retrieve the user's data, publications, direct messages and so on. That's why there are only WebApps for diaspora\* out there.  
-[Stay tuned on Diaspora* Issues](https://github.com/diaspora/diaspora/labels/api) about API.
+[Stay tuned on diaspora\* issues](https://github.com/diaspora/diaspora/labels/api) about API.
 
 Why is a WebApp better than using the mobile site on a browser?  
 Basically it provides better integration with the system (events coming into and going out of the app), notifications, customized interface and functions and a nice little icon that takes you directly to your favorite social network :)
@@ -36,7 +36,7 @@ Basically it provides better integration with the system (events coming into and
 The minimum Android version supported is Jelly Bean, Android v4.2.0 / API 17
 
 ### App Permissions
-Diaspora for Android requires access to the Internet and to external storage to be able to upload photos when creating a new post and for taking screenshots.
+dandelion\* requires access to the Internet and to external storage to be able to upload photos when creating a new post and for taking screenshots.
 
 ## Maintainers
 - gsantner ([GitHub](https://github.com/gsantner), [Web](https://gsantner.github.io), [diaspora*](https://pod.geraspora.de/people/d1cbdd70095301341e834860008dbc6c))  

app/src/main/AndroidManifest.xml

@@ -43,7 +43,7 @@
             android:windowSoftInputMode="adjustResize"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:theme="@style/DiasporaLight.NoActionBar"
-            android:label="@string/diaspora">
+            android:label="@string/app_name">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java

@@ -904,7 +904,7 @@ public class MainActivity extends ThemedActivity
         String body = WebHelper.replaceUrlWithMarkdown(sharedBody);
         if (appSettings.isAppendSharedViaApp()) {
             AppLog.v(this, "Append app reference to shared text");
-            body = body + "\n\n" + getString(R.string.shared_by_diaspora_android);
+            body = body + "\n\n" + getString(R.string.shared_via_app);
         }
         final String escapedBody = WebHelper.escapeHtmlText(body);
         if (sharedSubject != null) {

app/src/main/java/com/github/dfa/diaspora_android/receiver/UpdateTitleReceiver.java

@@ -55,7 +55,7 @@ public class UpdateTitleReceiver extends BroadcastReceiver {
             if (subUrl.startsWith(DiasporaUrlHelper.SUBURL_STREAM)) {
                 setTitle(R.string.nav_stream);
             } else if (subUrl.startsWith(DiasporaUrlHelper.SUBURL_POSTS)) {
-                setTitle(R.string.diaspora);
+                setTitle(R.string.app_name);
             } else if (subUrl.startsWith(DiasporaUrlHelper.SUBURL_NOTIFICATIONS)) {
                 setTitle(R.string.notifications);
             } else if (subUrl.startsWith(DiasporaUrlHelper.SUBURL_CONVERSATIONS)) {

app/src/main/res/values-de/strings-preferences.xml

@@ -3,6 +3,7 @@
 <resources>
   <!-- Key Names (Untranslatable) -->
   <!-- Themes -->
+  <!-- Operability -->
   <!-- Navigiation Slider -->
   <!-- PodProfile -->
   <!-- More -->
@@ -36,6 +37,7 @@
   <!-- Load images -->
   <string name="pref_title__load_images">Lade Bilder</string>
   <string name="pref_desc__load_images">Deaktiviere das Laden von Bildern, um den Datenverbrauch zu verringern</string>
+  <!-- Rotate Screen -->
   <!-- Proxy -->
   <string name="pref_title__http_proxy_load_tor_preset">Tor Voreinstellungen laden</string>
   <string name="pref_desc__http_proxy_load_tor_preset">Proxy Einstellungen für Tor (Orbot) HTTP Proxy laden</string>

app/src/main/res/values-de/strings.xml

@@ -2,7 +2,6 @@
 <!--Generated by crowdin.com-->
 <resources>
   <!-- App - AppName specific -->
-  <string name="shared_by_diaspora_android">*[geteilt durch #DiasporaForAndroid]*</string>
   <!-- Application -->
   <string name="reload">Aktualisieren</string>
   <!-- Common Words -->

app/src/main/res/values-es/strings-preferences.xml

@@ -3,6 +3,9 @@
 <resources>
   <!-- Key Names (Untranslatable) -->
   <!-- Themes -->
+  <!-- Operability -->
+  <string name="pref_title__topbar_stream_shortcut">Barra de herramientas superior carga la portada</string>
+  <string name="pref_desc__topbar_stream_shortcut">Haga clic en un espacio vacío en la barra de herramientas superior para abrir portada</string>
   <!-- Navigiation Slider -->
   <!-- PodProfile -->
   <!-- More -->
@@ -10,6 +13,7 @@
   <string name="pref_cat__visuals">Apariencia</string>
   <string name="pref_cat__network">Red</string>
   <string name="pref_cat__pod_settings">Ajustes del Pod</string>
+  <string name="pref_cat__operability">Operatividad</string>
   <!-- Visuals -->
   <!-- Navigiation Slider -->
   <string name="pref_title__sub_nav_slider">Control deslizante de navegación</string>
@@ -36,6 +40,7 @@
   <!-- Load images -->
   <string name="pref_title__load_images">Cargar imágenes</string>
   <string name="pref_desc__load_images">Desactivar la carga de de imágenes a datos móviles seguros</string>
+  <!-- Rotate Screen -->
   <!-- Proxy -->
   <string name="pref_title__http_proxy_load_tor_preset">Cargar Tor predeterminado</string>
   <string name="pref_desc__http_proxy_load_tor_preset">Cargar la configuración del proxy de Tor (Orbot) HTTP Proxy</string>

app/src/main/res/values-es/strings.xml

@@ -2,7 +2,6 @@
 <!--Generated by crowdin.com-->
 <resources>
   <!-- App - AppName specific -->
-  <string name="shared_by_diaspora_android">*[compartido vía #DiasporaForAndroid]*</string>
   <!-- Application -->
   <string name="reload">Recargar</string>
   <!-- Common Words -->

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

@@ -3,6 +3,9 @@
 <resources>
   <!-- Key Names (Untranslatable) -->
   <!-- Themes -->
+  <!-- Operability -->
+  <string name="pref_title__topbar_stream_shortcut">La barre du haut charge le flux</string>
+  <string name="pref_desc__topbar_stream_shortcut">Cliquez sur un espace vide sur la barre du haut pour ouvrir le flux</string>
   <!-- Navigiation Slider -->
   <!-- PodProfile -->
   <!-- More -->
@@ -10,6 +13,7 @@
   <string name="pref_cat__visuals">Apparence</string>
   <string name="pref_cat__network">Paramètres du réseau</string>
   <string name="pref_cat__pod_settings">Paramètres du pod</string>
+  <string name="pref_cat__operability">Opérabilité</string>
   <!-- Visuals -->
   <!-- Navigiation Slider -->
   <string name="pref_title__sub_nav_slider">Barre de défilement</string>
@@ -36,6 +40,7 @@
   <!-- Load images -->
   <string name="pref_title__load_images">Charger les images</string>
   <string name="pref_desc__load_images">Désactiver le chargements des images pour préserver la data mobile</string>
+  <!-- Rotate Screen -->
   <!-- Proxy -->
   <string name="pref_title__http_proxy_load_tor_preset">Charger la pré-configuration Tor</string>
   <string name="pref_desc__http_proxy_load_tor_preset">Charger les paramètres proxy pour Tor (Orbot) HTTP Proxy</string>

app/src/main/res/values-fr/strings.xml

@@ -2,7 +2,6 @@
 <!--Generated by crowdin.com-->
 <resources>
   <!-- App - AppName specific -->
-  <string name="shared_by_diaspora_android">*[partagé via #DiasporaForAndroid]*</string>
   <!-- Application -->
   <string name="reload">Rafraîchir</string>
   <!-- Common Words -->

app/src/main/res/values-it/strings-preferences.xml

@@ -3,6 +3,9 @@
 <resources>
   <!-- Key Names (Untranslatable) -->
   <!-- Themes -->
+  <!-- Operability -->
+  <string name="pref_title__topbar_stream_shortcut">La barra superiore apre lo stream</string>
+  <string name="pref_desc__topbar_stream_shortcut">Premi su uno spazio vuoto nella barra degli strumenti superiore per aprire lo stream</string>
   <!-- Navigiation Slider -->
   <!-- PodProfile -->
   <!-- More -->
@@ -10,6 +13,7 @@
   <string name="pref_cat__visuals">Aspetto</string>
   <string name="pref_cat__network">Rete</string>
   <string name="pref_cat__pod_settings">Impostazioni pod</string>
+  <string name="pref_cat__operability">Operabilità</string>
   <!-- Visuals -->
   <!-- Navigiation Slider -->
   <string name="pref_title__sub_nav_slider">Menù di navigazione</string>
@@ -36,6 +40,12 @@
   <!-- Load images -->
   <string name="pref_title__load_images">Carica immagini</string>
   <string name="pref_desc__load_images">Disabilita il caricamento delle immagini per risparmiare la rete dati</string>
+  <!-- Rotate Screen -->
+  <string name="pref_title__screen_rotation">Rotazione dello schermo</string>
+  <string name="pref_desc__screen_rotation">Controlla la rotazione automatica dello schermo</string>
+  <string name="rotation_auto">Automatica</string>
+  <string name="rotation_portrait">Verticale</string>
+  <string name="rotation_landscape">Orizzontale</string>
   <!-- Proxy -->
   <string name="pref_title__http_proxy_load_tor_preset">Carica i valori predefiniti di Tor</string>
   <string name="pref_desc__http_proxy_load_tor_preset">Carica le impostazioni del proxy per il proxy HTTP di Tor (Orbot)</string>

app/src/main/res/values-it/strings.xml

@@ -2,7 +2,6 @@
 <!--Generated by crowdin.com-->
 <resources>
   <!-- App - AppName specific -->
-  <string name="shared_by_diaspora_android">*[condiviso con #DiasporaForAndroid]*</string>
   <!-- Application -->
   <string name="reload">Ricarica</string>
   <!-- Common Words -->

app/src/main/res/values-ja/strings-about.xml

@@ -36,7 +36,7 @@
   <string name="fragment_license__contributors">貢献者</string>
   <string name="fragment_license__contributors_thank_you">%1$s&lt;br&gt;&lt;br&gt;ありがとうございます!</string>
   <string name="fragment_license__license_button">GNU GPLv3+ ライセンス</string>
-  <string name="fragment_license__thirdparty_libs">サードパーティ製ライブラリー</string>
+  <string name="fragment_license__thirdparty_libs">サードパーティ ライブラリー</string>
   <string name="fragment_license__thirdparty_libs_text">以下のライブラリーが使用されます:</string>
   <string name="fragment_license__misc_leafpic">LeafPic からいくつかのインスピレーションとコードを得ました。チェックしてみてください。同様のフリーソフトウェアです!</string>
   <string name="fragment_license__misc_leafpic_button">さらに詳しく</string>

app/src/main/res/values-ja/strings-preferences.xml

@@ -3,6 +3,9 @@
 <resources>
   <!-- Key Names (Untranslatable) -->
   <!-- Themes -->
+  <!-- Operability -->
+  <string name="pref_title__topbar_stream_shortcut">上部ツールバーでストリームを読み込み</string>
+  <string name="pref_desc__topbar_stream_shortcut">上部ツールバーの空白部分をクリックして、ストリームを開きます。</string>
   <!-- Navigiation Slider -->
   <!-- PodProfile -->
   <!-- More -->
@@ -10,6 +13,7 @@
   <string name="pref_cat__visuals">外観</string>
   <string name="pref_cat__network">ネットワーク</string>
   <string name="pref_cat__pod_settings">ポッドの設定</string>
+  <string name="pref_cat__operability">操作性</string>
   <!-- Visuals -->
   <!-- Navigiation Slider -->
   <string name="pref_title__sub_nav_slider">ナビゲーション スライダー</string>
@@ -36,6 +40,7 @@
   <!-- Load images -->
   <string name="pref_title__load_images">画像の読み込み</string>
   <string name="pref_desc__load_images">安全なモバイルデータのため、画像の読み込みを無効にします</string>
+  <!-- Rotate Screen -->
   <!-- Proxy -->
   <string name="pref_title__http_proxy_load_tor_preset">Tor プリセットを読み込む</string>
   <string name="pref_desc__http_proxy_load_tor_preset">Tor (Orbot) HTTP プロキシのプロキシ設定を読み込みます</string>

app/src/main/res/values-ja/strings.xml

@@ -2,7 +2,6 @@
 <!--Generated by crowdin.com-->
 <resources>
   <!-- App - AppName specific -->
-  <string name="shared_by_diaspora_android">*[#DiasporaForAndroid でシェア]*</string>
   <!-- Application -->
   <string name="reload">再読み込み</string>
   <!-- Common Words -->

app/src/main/res/values-kn/strings-preferences.xml

@@ -3,6 +3,7 @@
 <resources>
   <!-- Key Names (Untranslatable) -->
   <!-- Themes -->
+  <!-- Operability -->
   <!-- Navigiation Slider -->
   <!-- PodProfile -->
   <!-- More -->
@@ -14,6 +15,7 @@
   <!-- Font size -->
   <!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
   <!-- Load images -->
+  <!-- Rotate Screen -->
   <!-- Proxy -->
   <!-- Chrome custom tabs -->
   <!-- Diaspora Settings -->

app/src/main/res/values-ml/strings-preferences.xml

@@ -3,6 +3,7 @@
 <resources>
   <!-- Key Names (Untranslatable) -->
   <!-- Themes -->
+  <!-- Operability -->
   <!-- Navigiation Slider -->
   <!-- PodProfile -->
   <!-- More -->
@@ -22,6 +23,7 @@
   <!-- Load images -->
   <string name="pref_title__load_images">ചിത്രങ്ങൾ കാണിക്കണമോ</string>
   <string name="pref_desc__load_images">മൊബൈൽ ഡാറ്റ ഉപഭോഗം കുറയ്ക്കാനായി ചിത്രങ്ങൾ ലോഡ് ചെയ്യാതിരിക്കുക</string>
+  <!-- Rotate Screen -->
   <!-- Proxy -->
   <string name="pref_title__proxy_enabled">പ്രോക്സി അനുവദിക്കൂ</string>
   <!-- Chrome custom tabs -->

app/src/main/res/values-ml/strings.xml

@@ -2,7 +2,6 @@
 <!--Generated by crowdin.com-->
 <resources>
   <!-- App - AppName specific -->
-  <string name="shared_by_diaspora_android">*[ #DiasporaForAndroid ഉപയോഗിച്ച് ഷെയർ ചെയ്തത്]*</string>
   <!-- Application -->
   <string name="reload">റീലോഡ്</string>
   <!-- Common Words -->

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

@@ -3,6 +3,7 @@
 <resources>
   <!-- Key Names (Untranslatable) -->
   <!-- Themes -->
+  <!-- Operability -->
   <!-- Navigiation Slider -->
   <!-- PodProfile -->
   <!-- More -->
@@ -36,6 +37,7 @@
   <!-- Load images -->
   <string name="pref_title__load_images">Afbeeldingen laden</string>
   <string name="pref_desc__load_images">Afbeelding laden uitschakelen om mobiele data te besparen</string>
+  <!-- Rotate Screen -->
   <!-- Proxy -->
   <string name="pref_title__http_proxy_load_tor_preset">Tor Voorinstelling laden</string>
   <string name="pref_desc__http_proxy_load_tor_preset">Laden van de proxy-instellingen voor HTTP-Proxy Tor (Orbot)</string>

app/src/main/res/values-nl/strings.xml

@@ -2,7 +2,6 @@
 <!--Generated by crowdin.com-->
 <resources>
   <!-- App - AppName specific -->
-  <string name="shared_by_diaspora_android">*[gedeeld door #DiasporaForAndroid]*</string>
   <!-- Application -->
   <string name="reload">Herladen</string>
   <!-- Common Words -->

app/src/main/res/values-pl/strings-preferences.xml

@@ -3,6 +3,9 @@
 <resources>
   <!-- Key Names (Untranslatable) -->
   <!-- Themes -->
+  <!-- Operability -->
+  <string name="pref_title__topbar_stream_shortcut">Górny pasek narzędzi wczytuje strumień</string>
+  <string name="pref_desc__topbar_stream_shortcut">By otworzyć strumień kliknij na pustą przestrzeń w górnym pasku narzędziowym</string>
   <!-- Navigiation Slider -->
   <!-- PodProfile -->
   <!-- More -->
@@ -10,6 +13,7 @@
   <string name="pref_cat__visuals">Wygląd</string>
   <string name="pref_cat__network">Sieć</string>
   <string name="pref_cat__pod_settings">Ustawienia poda</string>
+  <string name="pref_cat__operability">Obsługa</string>
   <!-- Visuals -->
   <!-- Navigiation Slider -->
   <string name="pref_title__sub_nav_slider">Pasek nawigacji</string>
@@ -36,6 +40,7 @@
   <!-- Load images -->
   <string name="pref_title__load_images">Wczytuj obrazy</string>
   <string name="pref_desc__load_images">Odznacz by wyłączyć wczytywanie obrazów, np. w celu oszczędzania transferu</string>
+  <!-- Rotate Screen -->
   <!-- Proxy -->
   <string name="pref_title__http_proxy_load_tor_preset">Wczytaj domyślną konfigurację Tora</string>
   <string name="pref_desc__http_proxy_load_tor_preset">Wczytaj ustawienia proxy HTTP Tora (Orbot)</string>

app/src/main/res/values-pl/strings.xml

@@ -2,7 +2,6 @@
 <!--Generated by crowdin.com-->
 <resources>
   <!-- App - AppName specific -->
-  <string name="shared_by_diaspora_android">*[udostępnione za pomocą #DiasporaForAndroid]*</string>
   <!-- Application -->
   <string name="reload">Odśwież</string>
   <!-- Common Words -->

app/src/main/res/values-pt-rBR/strings-preferences.xml

@@ -3,6 +3,7 @@
 <resources>
   <!-- Key Names (Untranslatable) -->
   <!-- Themes -->
+  <!-- Operability -->
   <!-- Navigiation Slider -->
   <!-- PodProfile -->
   <!-- More -->
@@ -22,6 +23,7 @@
   <!-- Load images -->
   <string name="pref_title__load_images">Carregar imagens</string>
   <string name="pref_desc__load_images">Desabilitar o carregamento de imagens para economizar seus créditos</string>
+  <!-- Rotate Screen -->
   <!-- Proxy -->
   <string name="pref_title__proxy_enabled">Habilitar o Proxy</string>
   <!-- Chrome custom tabs -->

app/src/main/res/values-pt-rBR/strings.xml

@@ -2,7 +2,6 @@
 <!--Generated by crowdin.com-->
 <resources>
   <!-- App - AppName specific -->
-  <string name="shared_by_diaspora_android">*[compartilhado por #DiasporaForAndroid]*</string>
   <!-- Application -->
   <string name="reload">Atualizar</string>
   <!-- Common Words -->

app/src/main/res/values-ru/strings-about.xml

@@ -16,5 +16,28 @@
   <string name="fragment_debug__pod_profile_name">Имя профиля пода: %1$s</string>
   <string name="fragment_debug__pod_profile_url">Домен пода: %1$s</string>
   <string name="fragment_debug__toast_log_copied">Журнал отладки скопирован в буфер обмена</string>
+  <string name="fragment_about__about_text">DiasporaForAndroid - это приложение-компаньон для социальной сети Диаспора*. Приложение добавляет такие функции как полезные панели инструментов и поддержку прокси-серверов (таких как Tor).</string>
+  <string name="fragment_about__contribute">Сделайте свой вклад!</string>
+  <string name="fragment_about__contribute_text">DiasporaForAndroid разрабатывается как свободное ПО и следует идеям проекта Диаспора*. Если вы хотите помочь - вперёд! В настоящее время мы является очень небольшой командой, поэтому мы высоко ценим любые виды помощи!</string>
+  <string name="fragment_about__contribute_button">Получить исходный код</string>
+  <string name="fragment_about__translate">Переведите приложение!</string>
+  <string name="fragment_about__translate_text">Приложение недоступно на вашем языке? Вы можете это изменить! Почему бы вам не помочь нам перевести его? Мы используем платформу crowdin, чтобы позволить любому сделать это.</string>
+  <string name="fragment_about__translate_button">Перейти к переводу</string>
+  <string name="fragment_about__feedback">Оставьте отзыв!</string>
+  <string name="fragment_about__feedback_text">DiasporaForAndroid всё ещё находится в разработке, так что, если у вас есть предложения или пожелания, пожалуйста, воспользуйтесь нашим трекером ошибок, чтобы сообщить нам об этом!</string>
+  <string name="fragment_about__feedback_button">Сообщить об ошибках</string>
+  <string name="fragment_about__spread_the_word">Расскажите друзьям!</string>
+  <string name="fragment_about__spread_the_word_text">Расскажите вашим друзьям и семье о Диаспоре* и #DiasporaForAndroid! Почему бы вам не разместить запись о вашем опыте в блоге? Мы будем рады услышать об этом!</string>
+  <string name="fragment_about__spread_the_word_button">Рассказать о приложении</string>
+  <string name="fragment_about__spread_the_word_share_text">Эй! Зацените #DiasporaForAndroid! %1$s</string>
   <!-- License & help (large amount of text) -->
+  <string name="fragment_license__maintainers">Мейнтейнеры</string>
+  <string name="fragment_license__maintainers_text">Это приложение в настоящее время разрабатывается и поддерживается следующими людьми: &lt;br&gt;&lt;br&gt;%1$s</string>
+  <string name="fragment_license__contributors">Участники</string>
+  <string name="fragment_license__contributors_thank_you">%1$s&lt;br&gt;&lt;br&gt;Спасибо вам!</string>
+  <string name="fragment_license__license_button">Лицензия GNU GPLv3+</string>
+  <string name="fragment_license__thirdparty_libs">Сторонние библиотеки</string>
+  <string name="fragment_license__thirdparty_libs_text">Используются следующие библиотеки:</string>
+  <string name="fragment_license__misc_leafpic">Мы вдохновлялись и взяли немного кода из LeafPic. Попробуйте это приложение, оно тоже является свободным ПО!</string>
+  <string name="fragment_license__misc_leafpic_button">Расскажите мне больше</string>
 </resources>

app/src/main/res/values-ru/strings-preferences.xml

@@ -3,6 +3,9 @@
 <resources>
   <!-- Key Names (Untranslatable) -->
   <!-- Themes -->
+  <!-- Operability -->
+  <string name="pref_title__topbar_stream_shortcut">Верхняя панель инструментов загружает Поток</string>
+  <string name="pref_desc__topbar_stream_shortcut">Нажмите на пустое пространство на верхней панели инструментов, чтобы открыть Поток</string>
   <!-- Navigiation Slider -->
   <!-- PodProfile -->
   <!-- More -->
@@ -10,6 +13,7 @@
   <string name="pref_cat__visuals">Внешний вид</string>
   <string name="pref_cat__network">Сеть</string>
   <string name="pref_cat__pod_settings">Настройки пода</string>
+  <string name="pref_cat__operability">Работоспособность</string>
   <!-- Visuals -->
   <!-- Navigiation Slider -->
   <string name="pref_title__sub_nav_slider">Слайдер навигации</string>
@@ -36,6 +40,7 @@
   <!-- Load images -->
   <string name="pref_title__load_images">Загрузка изображений</string>
   <string name="pref_desc__load_images">Отключить загрузку изображений для экономии трафика</string>
+  <!-- Rotate Screen -->
   <!-- Proxy -->
   <string name="pref_title__http_proxy_load_tor_preset">Загрузить шаблон конфигурации Tor</string>
   <string name="pref_desc__http_proxy_load_tor_preset">Загрузить настройки прокси для Tor (Orbot)</string>

app/src/main/res/values-ru/strings.xml

@@ -2,7 +2,6 @@
 <!--Generated by crowdin.com-->
 <resources>
   <!-- App - AppName specific -->
-  <string name="shared_by_diaspora_android">*[опубликовано из #DiasporaForAndroid]*</string>
   <!-- Application -->
   <string name="reload">Перезагрузить</string>
   <!-- Common Words -->

app/src/main/res/values/strings-about.xml

@@ -5,7 +5,7 @@
     <string name="about_activity__title_debug_info">Debugging</string>
     <string name="fragment_debug__section_app">Application</string>
     <string name="fragment_debug__section_device">Device</string>
-    <string name="fragment_debug__section_pod">Diaspora Pod</string>
+    <string name="fragment_debug__section_pod">diaspora* Pod</string>
     <string name="fragment_debug__section_log">Debug Log</string>
     <string name="fragment_debug__section_log_spam">Debug Log (Verbose)</string>
     <string name="fragment_debug__app_version">App Version: %1$s</string>
@@ -16,13 +16,13 @@
     <string name="fragment_debug__pod_profile_url">Pod Domain: %1$s</string>
     <string name="fragment_debug__toast_log_copied">Debug log copied to clipboard</string>
 
-    <string name="fragment_about__about" translatable="false">@string/diaspora_for_android</string>
+    <string name="fragment_about__about" translatable="false">@string/dandelion</string>
-    <string name="fragment_about__about_text">DiasporaForAndroid is your companion app for browsing the social network diaspora*. It adds features like useful toolbars and support for proxy servers like the Tor Network to your social experience.</string>
+    <string name="fragment_about__about_text">dandelion* is your companion app for browsing the social network diaspora*. It adds features like useful toolbars and support for proxy servers like the Tor Network to your social experience.</string>
 
     <string name="fragment_about__contribute">Contribute Code!</string>
-    <string name="fragment_about__contribute_text">DiasporaForAndroid is developed free as in Freedom and follows the ideas of the diaspora* project. If you want to contribute, go ahead! Currently we are a very small team, so we greatly appreciate any kind of help!</string>
+    <string name="fragment_about__contribute_text">dandelion* is developed free as in Freedom and follows the ideas of the diaspora* project. If you want to contribute, go ahead! Currently we are a very small team, so we greatly appreciate any kind of help!</string>
     <string name="fragment_about__contribute_button">Get the source</string>
-    <string name="fragment_about__contribute_link" translatable="false">https://github.com/Diaspora-for-Android/diaspora-android</string>
+    <string name="fragment_about__contribute_link" translatable="false">https://github.com/Diaspora-for-Android/dandelion</string>
 
     <string name="fragment_about__translate">Translate the App!</string>
     <string name="fragment_about__translate_text">The app is not available in your language? You can change that! Why don\'t you help us by translating it? We use the crowdin platform to enable anyone to translate the app.</string>
@@ -30,14 +30,14 @@
     <string name="fragment_about__translate_link" translatable="false">https://crowdin.com/project/diaspora-for-android/invite</string>
 
     <string name="fragment_about__feedback">Give Feedback!</string>
-    <string name="fragment_about__feedback_text">DiasporaForAndroid is still in development, so if you have suggestions or any kind of feedback, please use our bug tracker to let us know!</string>
+    <string name="fragment_about__feedback_text">dandelion* is still in development, so if you have suggestions or any kind of feedback, please use our bug tracker to let us know!</string>
     <string name="fragment_about__feedback_button">Report Bugs</string>
-    <string name="fragment_About__feedback_link" translatable="false">https://github.com/Diaspora-for-Android/diaspora-android/issues</string>
+    <string name="fragment_About__feedback_link" translatable="false">https://github.com/Diaspora-for-Android/dandelion/issues</string>
 
     <string name="fragment_about__spread_the_word">Spread the word!</string>
-    <string name="fragment_about__spread_the_word_text">Tell your friends and family about diaspora* and #DiasporaForAndroid! Why don\'t you blog about your experiences? We\'d love to hear from you!</string>
+    <string name="fragment_about__spread_the_word_text">Tell your friends and family about diaspora* and #dandelion! Why don\'t you blog about your experiences? We\'d love to hear from you!</string>
     <string name="fragment_about__spread_the_word_button">Share the app</string>
-    <string name="fragment_about__spread_the_word_share_text">Hey! Check out #DiasporaForAndroid! %1$s</string>
+    <string name="fragment_about__spread_the_word_share_text">Hey! Check out #dandelion! %1$s</string>
     <string name="fragment_about__fdroid_link" translatable="false">https://f-droid.org/repository/browse/?fdid=com.github.dfa.diaspora_android</string>
 
 

app/src/main/res/values/strings-preferences.xml

@@ -138,7 +138,7 @@
     <string name="pref_title__sub_proxy">Proxy</string>
     <string name="pref_desc__sub_proxy" translatable="false">@string/pref_desc__http_proxy_enabled</string>
     <string name="pref_title__proxy_enabled">Enable Proxy</string>
-    <string name="pref_desc__http_proxy_enabled">Proxy Diaspora\'s traffic to circumvent firewalls.\nMay require restart. This might not work on some phones.</string>
+    <string name="pref_desc__http_proxy_enabled">Proxy dandelion*\'s traffic to circumvent firewalls.\nMay require restart. This might not work on some phones.</string>
     <string name="pref_title__http_proxy_host">Host</string>
     <string name="pref_title__http_proxy_port">Port</string>
     <string name="HTTP" translatable="false">HTTP</string>
@@ -153,7 +153,7 @@
 
     <!-- Diaspora Settings -->
     <string name="pref_title__personal_settings">Personal settings</string>
-    <string name="pref_desc__personal_settings">Open your Diaspora account settings</string>
+    <string name="pref_desc__personal_settings">Open your diaspora* account settings</string>
 
     <string name="pref_title__manage_contacts" translatable="false">@string/contacts</string>
     <string name="pref_desc__manage_contacts">Manage your contact list</string>
@@ -162,7 +162,7 @@
     <string name="pref_desc__manage_tags">Add and delete the hashtags you are following</string>
 
     <string name="pref_title__change_account">Change Account</string>
-    <string name="pref_desc__change_account">Erase local session data and switch to another Diaspora pod/account</string>
+    <string name="pref_desc__change_account">Erase local session data and switch to another diaspora* pod/account</string>
     <string name="pref_warning__change_account">This will erase all cookies and session data. Do you really want to change your account?</string>
 
     <string name="pref_title__clear_cache">Clear cache</string>

app/src/main/res/values/strings.xml

@@ -1,11 +1,12 @@
 <resources>
     <!-- App - AppName specific -->
+    <string name="dandelion" translatable="false">dandelion*</string>
     <string name="diaspora" translatable="false">diaspora*</string>
     <string name="diaspora_for_android" translatable="false">Diaspora for Android</string>
-    <string name="app_name" translatable="false">@string/diaspora</string>
+    <string name="app_name" translatable="false">@string/dandelion</string>
-    <string name="app_hashtag" translatable="false">#DiasporaForAndroid</string>
+    <string name="app_hashtag" translatable="false">#dandelion</string>
     <string name="app_subtitle" translatable="false">The community-run distributed social network</string>
-    <string name="shared_by_diaspora_android">*[shared by #DiasporaForAndroid]*</string>
+    <string name="shared_via_app" translatable="false">*[via #dandelion]*</string>
 
 
     <!-- Application -->