From a04e2051a8d89b6eb58d7564149356df357bcb8b Mon Sep 17 00:00:00 2001 From: Gregor Santner Date: Mon, 26 Sep 2016 16:28:17 +0200 Subject: [PATCH] Update TR; Update buildToolsVersion -> 24.0.2 --- .travis.yml | 2 +- app/build.gradle | 4 +- .../res/values-fr/strings-preferences.xml | 1 + .../res/values-it/strings-preferences.xml | 4 ++ .../res/values-ja/strings-preferences.xml | 2 + tools/localization/.gitignore | 1 - tools/localization/downloadLocalizations.sh | 40 ------------------- 7 files changed, 10 insertions(+), 44 deletions(-) delete mode 100755 tools/localization/.gitignore delete mode 100755 tools/localization/downloadLocalizations.sh diff --git a/.travis.yml b/.travis.yml index 74b79b85..41f1aaaa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ android: - tools - tools # TODO https://github.com/travis-ci/travis-ci/issues/6193 - platform-tools - - build-tools-24.0.1 + - build-tools-24.0.2 - android-24 - extra-android-m2repository before_cache: diff --git a/app/build.gradle b/app/build.gradle index 4cb94656..0e7cceec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,14 +3,14 @@ apply plugin: 'android-apt' android { compileSdkVersion 24 - buildToolsVersion "24.0.1" + buildToolsVersion "24.0.2" defaultConfig { applicationId "com.github.dfa.diaspora_android" minSdkVersion 17 targetSdkVersion 24 versionCode 8 - versionName "0.1.6" + versionName "0.1.6-next" } buildTypes { release { diff --git a/app/src/main/res/values-fr/strings-preferences.xml b/app/src/main/res/values-fr/strings-preferences.xml index 48b8d71d..0406f8e6 100644 --- a/app/src/main/res/values-fr/strings-preferences.xml +++ b/app/src/main/res/values-fr/strings-preferences.xml @@ -21,6 +21,7 @@ Charger les images Désactiver le chargements des images pour préserver la data mobile + Proxy Activer Proxy Serveur Proxy.\n(Nécessite un redémarrage) Hôte diff --git a/app/src/main/res/values-it/strings-preferences.xml b/app/src/main/res/values-it/strings-preferences.xml index 01fbf921..71aa9c99 100644 --- a/app/src/main/res/values-it/strings-preferences.xml +++ b/app/src/main/res/values-it/strings-preferences.xml @@ -21,11 +21,15 @@ Carica immagini Disabilita il caricamento delle immagini per risparmiare la rete dati + Proxy + @string/pref_desc__proxy_enabled Attiva proxy Traffico del proxy di Diaspora per bypassare i firewall.\nPuò essere necessario il riavvio dell\'app Host Porta + Schede personalizzate di Chrome + Apri collegamento esterno nelle schede personalizzate di Chrome. Per usare questa funzione Chromium o Google Chrome deve essere installato Impostazioni personali Apri le impostazioni del tuo account Diaspora diff --git a/app/src/main/res/values-ja/strings-preferences.xml b/app/src/main/res/values-ja/strings-preferences.xml index 909ff218..2d88e3e2 100644 --- a/app/src/main/res/values-ja/strings-preferences.xml +++ b/app/src/main/res/values-ja/strings-preferences.xml @@ -21,6 +21,8 @@ 画像の読み込み 安全なモバイルデータのため、画像の読み込みを無効にします + プロキシ + @string/pref_desc__proxy_enabled プロキシを有効にする Diaspora の通信をプロキシして、ファイアウォールに回避します。\n再起動が必要になることがあります ホスト diff --git a/tools/localization/.gitignore b/tools/localization/.gitignore deleted file mode 100755 index 98626981..00000000 --- a/tools/localization/.gitignore +++ /dev/null @@ -1 +0,0 @@ -crowdin.yaml diff --git a/tools/localization/downloadLocalizations.sh b/tools/localization/downloadLocalizations.sh deleted file mode 100755 index 86fc3252..00000000 --- a/tools/localization/downloadLocalizations.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash -######################################################### -# -# Title -# -# Created by Gregor Santer (gsantner), 2016 -# https://gsantner.github.io/ -# -######################################################### - - -#Pfade -SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -SCRIPTFILE=$(readlink -f $0) -SCRIPTPATH=$(dirname $SCRIPTFILE) -argc=$# - -######################################################### -cd "$SCRIPTDIR" - -if [ ! -f "crowdin.yaml" ] ; then - echo "project_identifier: diaspora-for-android" > 'crowdin.yaml' - echo "base_path: $(realpath '../../')" >>'crowdin.yaml' - echo "api_key: DONT_PUSH_API_KEY" >>'crowdin.yaml' - cat "../../crowdin.yaml" >> "crowdin.yaml" - echo "# Add all non locality languages here" >> "crowdin.yaml" - echo "# (e.g. enUS, enUK, deCH, deAT will automatically go into the right folder)" >> "crowdin.yaml" - echo "# Otherwise e.g. en would get added into the folder enEN (which is wrong)." >> "crowdin.yaml" - echo "# https://crowdin.com/page/api/language-codes contains supported language codes" >> "crowdin.yaml" - echo "# The first listed ones here are diffently managed by crowdin than on android" >> "crowdin.yaml" -fi - -if grep -q "DONT_PUSH" "crowdin.yaml" ; then - echo "Insert API key to crowdin.yaml" - echo "and update folder to the root folder of the repository" - exit -fi - -# Load latest translations -crowdin-cli download -b master