diff --git a/src/main/java/com/nutomic/syncthingandroid/fragments/DrawerFragment.java b/src/main/java/com/nutomic/syncthingandroid/fragments/DrawerFragment.java index 990d0218..de63991a 100644 --- a/src/main/java/com/nutomic/syncthingandroid/fragments/DrawerFragment.java +++ b/src/main/java/com/nutomic/syncthingandroid/fragments/DrawerFragment.java @@ -1,7 +1,6 @@ package com.nutomic.syncthingandroid.fragments; import android.content.Intent; -import android.net.Uri; import android.os.Bundle; import android.support.v4.app.Fragment; import android.view.LayoutInflater; @@ -21,8 +20,6 @@ import java.util.Map; import java.util.Timer; import java.util.TimerTask; -import static android.content.Intent.ACTION_VIEW; - /** * Displays information about the local device. */ @@ -94,8 +91,6 @@ public class DrawerFragment extends Fragment implements RestApi.OnReceiveSystemI .setOnClickListener(this); view.findViewById(R.id.drawerActionShareId) .setOnClickListener(this); - view.findViewById(R.id.drawerActionDonate) - .setOnClickListener(this); view.findViewById(R.id.drawerActionRestart) .setOnClickListener(this); view.findViewById(R.id.drawerActionSettings) @@ -195,11 +190,6 @@ public class DrawerFragment extends Fragment implements RestApi.OnReceiveSystemI startActivity(Intent.createChooser(i, "Share device ID with")); mActivity.closeDrawer(); break; - case R.id.drawerActionDonate: - startActivity(new Intent(ACTION_VIEW, Uri.parse( - getString(R.string.donate_url)))); - mActivity.closeDrawer(); - break; case R.id.drawerActionSettings: startActivity(new Intent(mActivity, SettingsActivity.class) .setAction(SettingsActivity.ACTION_APP_SETTINGS)); diff --git a/src/main/res/drawable-hdpi/ic_attach_money_black_24dp.png b/src/main/res/drawable-hdpi/ic_attach_money_black_24dp.png deleted file mode 100644 index 92f1dad8..00000000 Binary files a/src/main/res/drawable-hdpi/ic_attach_money_black_24dp.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_attach_money_black_24dp.png b/src/main/res/drawable-xhdpi/ic_attach_money_black_24dp.png deleted file mode 100644 index 9f24ae8f..00000000 Binary files a/src/main/res/drawable-xhdpi/ic_attach_money_black_24dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_attach_money_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_attach_money_black_24dp.png deleted file mode 100644 index 2019afcb..00000000 Binary files a/src/main/res/drawable-xxhdpi/ic_attach_money_black_24dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxxhdpi/ic_attach_money_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_attach_money_black_24dp.png deleted file mode 100644 index 53cabf3a..00000000 Binary files a/src/main/res/drawable-xxxhdpi/ic_attach_money_black_24dp.png and /dev/null differ diff --git a/src/main/res/layout/fragment_drawer.xml b/src/main/res/layout/fragment_drawer.xml index 6c103c27..89d221a3 100644 --- a/src/main/res/layout/fragment_drawer.xml +++ b/src/main/res/layout/fragment_drawer.xml @@ -228,15 +228,6 @@ android:drawableStart="@drawable/ic_share_black_24dp" android:text="@string/share_device_id" /> - - Сървър за откриване на устройства - Дарете + Дарете Идентификатор на папката diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index dcc3949f..8e917025 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -52,7 +52,7 @@ Globální oznamování - Přispět + Přispět Restart diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index be287366..55a6de7a 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -52,7 +52,7 @@ Indexserver - Spenden + Spenden Neustart diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index 91634f76..b9bc4448 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -50,7 +50,7 @@ Servidor de Anuncio - Donar + Donar ID de carpeta diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index 85bd317c..976ab593 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -52,7 +52,7 @@ Serveur d\'annonce - Faire un don + Faire un don Redémarrer diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml index d28a559f..992d6db2 100644 --- a/src/main/res/values-hu/strings.xml +++ b/src/main/res/values-hu/strings.xml @@ -47,7 +47,7 @@ Memória használat - Támogatás + Támogatás Mappa azonosító diff --git a/src/main/res/values-in/strings.xml b/src/main/res/values-in/strings.xml index 83f09c83..ad9166f7 100644 --- a/src/main/res/values-in/strings.xml +++ b/src/main/res/values-in/strings.xml @@ -46,7 +46,7 @@ Server Penyiaran - Donasi + Donasi ID Folder diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index 66400768..91c612c9 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -52,7 +52,7 @@ Server Presenza Globale - Donazione + Donazione Riavvia ora diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml index 119814dd..d0a01f3e 100644 --- a/src/main/res/values-ja/strings.xml +++ b/src/main/res/values-ja/strings.xml @@ -52,7 +52,7 @@ アナウンスサーバー - 寄付 + 寄付 再起動 diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml index 6bcf9034..45cfc33c 100644 --- a/src/main/res/values-ko/strings.xml +++ b/src/main/res/values-ko/strings.xml @@ -43,7 +43,7 @@ 익명 서버 - 기부하기 + 기부하기 폴더 ID diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml index fdc754eb..2210df0a 100644 --- a/src/main/res/values-nb/strings.xml +++ b/src/main/res/values-nb/strings.xml @@ -50,7 +50,7 @@ Søketjener - Donér + Donér Mappe-ID diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index ecd89c9b..dc790d3c 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -52,7 +52,7 @@ Mededelingsserver - Doneren + Doneren Herstarten diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index ce8c89e4..657c71fb 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -52,7 +52,7 @@ Serwer ogłoszeniowy - Wspomóż + Wspomóż Uruchom ponownie diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml index d5998b9a..5ddc770a 100644 --- a/src/main/res/values-pt-rBR/strings.xml +++ b/src/main/res/values-pt-rBR/strings.xml @@ -52,7 +52,7 @@ Servidor de busca global - Doações + Doações Reiniciar diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml index eafd8221..1337da2d 100644 --- a/src/main/res/values-pt/strings.xml +++ b/src/main/res/values-pt/strings.xml @@ -50,7 +50,7 @@ Servidor de busca global - Doar + Doar ID da pasta diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index cdbbf191..bf75d8f2 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -52,7 +52,7 @@ Сервера анонсов - Пожертвовать + Пожертвовать Перезагрузить diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml index f75c83f9..1219f203 100644 --- a/src/main/res/values-sk/strings.xml +++ b/src/main/res/values-sk/strings.xml @@ -50,7 +50,7 @@ Ohlasovací server - Prispieť + Prispieť ID adresára diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml index 20d30595..bcb736b7 100644 --- a/src/main/res/values-tr/strings.xml +++ b/src/main/res/values-tr/strings.xml @@ -50,7 +50,7 @@ Bildirim Sunucusu - Bağış yap + Bağış yap Klasör ID diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml index 4dcaecc6..4985e536 100644 --- a/src/main/res/values-vi/strings.xml +++ b/src/main/res/values-vi/strings.xml @@ -52,7 +52,7 @@ Máy chủ thông báo - Quyên góp + Quyên góp Khởi chạy lại diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index 4b02358b..dc3776e9 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -52,7 +52,7 @@ 宣告服务器 - 捐赠 + 捐赠 重启 diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 202f2455..a0212153 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -92,11 +92,6 @@ Announce Server - - Donate - - https://syncthing.net/#donate - Restart @@ -351,6 +346,14 @@ Please report any problems you encounter via Github. https://github.com/Nutomic/syncthing-android/issues + + + Donate + + Help us pay for domains and hosting fees + + https://syncthing.net/#donate + Syncthing Version diff --git a/src/main/res/xml/app_settings.xml b/src/main/res/xml/app_settings.xml index 293f5e81..61d71474 100644 --- a/src/main/res/xml/app_settings.xml +++ b/src/main/res/xml/app_settings.xml @@ -179,6 +179,14 @@ android:data="@string/issue_tracker_url" /> + + + +