nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2025-01-07 10:42:07 +00:00
Code Releases Activity

TipsAndTricks: Add "Backup pictures from phone to computer" (fixes #257) (#299)

Browse source 
* Add tip: tip_ignore_delete (fixes #257)

* Add strings for tip (fixes #257)

* Updated de translation
This commit is contained in:
Catfriend1 2019-02-03 11:42:18 +01:00 committed by GitHub
parent b239eec38e
commit 72709f3cb8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/com/nutomic/syncthingandroid/activities/TipsAndTricksActivity.java
View file

@ -56,10 +56,6 @@ public class TipsAndTricksActivity extends SyncthingActivity {
}
}
// Fill tip title and text content.
mTipListAdapter.add(getString(R.string.tip_sync_on_local_network_title), getString(R.string.tip_sync_on_local_network_text));
mTipListAdapter.add(getString(R.string.tip_custom_sync_conditions_title), getString(R.string.tip_custom_sync_conditions_text));
// Tips referring to Huawei devices.
if ("huawei".equalsIgnoreCase(Build.MANUFACTURER)) {
String ipAddress = getString(R.string.tip_phone_ip_address_syntax);
@ -75,6 +71,11 @@ public class TipsAndTricksActivity extends SyncthingActivity {
mTipListAdapter.add(getString(R.string.tip_xiaomi_autostart_title), getString(R.string.tip_xiaomi_autostart_text));
}
// Fill tip title and text content.
mTipListAdapter.add(getString(R.string.tip_sync_on_local_network_title), getString(R.string.tip_sync_on_local_network_text));
mTipListAdapter.add(getString(R.string.tip_custom_sync_conditions_title), getString(R.string.tip_custom_sync_conditions_text));
mTipListAdapter.add(getString(R.string.tip_ignore_delete_title), getString(R.string.tip_ignore_delete_text));
// Set onClick listener and add adapter to recycler view.
mTipListAdapter.setOnClickListener(
new ItemClickListener() {

3
app/src/main/res/values-de/strings.xml
View file

@ -329,6 +329,9 @@ Bitte melden Sie auftretende Probleme via GitHub.</string>
<string name="tip_custom_sync_conditions_title">Sync-Bedingungen pro Ordner/Gerät festlegen</string>
<string name="tip_custom_sync_conditions_text">Diese Funktion wird in zukünftigen Releases weiter verbessert. Für den Moment wollten wir das App-Verhalten nicht \"umstürzen\", um bestehende Konfigurationen nicht zu \"brechen\". Deshalb können die \"individuellen Sync-Bedingungen\" für einen bestimmten Netzwerktyp erst festgelegt werden, wenn dieser Netzwerktyp vorher in den globalen Laufkonditionen aktiviert wurde.</string>
<string name="tip_ignore_delete_title">Bilder vom Telefon auf den Computer sichern?</string>
<string name="tip_ignore_delete_text">Wenn Du alle vom Telefon gemachten Bilder auf einen Computer sichern möchtest, teile den Ordner \'Kamera\' mit dem Computer. Öffne Syncthing auf dem Computer, füge den Ordner hinzu und gehe zu \'Aktionen\' > \'Erweitert\' > \'Kamera\' Ordner. Aktiviere \'Ignore Delete\' und klicke \'Speichern\'. Du kannst nun Bilder aus dem Kamera-Ordner vom Telefon löschen und sie bleiben auf dem Computer gesichert.</string>
<string name="tip_huawei_device_disconnected_title">Huawei: Workaround für \"Gerät getrennt\"</string>
<string name="tip_huawei_device_disconnected_text">Falls der Computer das Huawei-Gerät permanent als \"getrennt\" meldet, öffne die Syncthing-Oberfläche auf dem Computer. Gehe zu \"Externe Geräte\", klappe den Eintrag des Mobilgeräts aus, klicke \"Bearbeiten\", wechsle zu \"Erweitert\". Trage die IP-Adresse deines Mobilgeräts in \"Adressen\" wie folgt ein:\ntcp4://%1$s, dynamic\nFunktioniert sicher auf: Huawei P10</string>
<string name="tip_phone_ip_address_syntax">TELEFON_IP_ADRESSE</string>

3
app/src/main/res/values/strings.xml
View file

@ -332,6 +332,9 @@ Please report any problems you encounter via Github.</string>
<string name="tip_custom_sync_conditions_title">Use per folder/device custom sync conditions</string>
<string name="tip_custom_sync_conditions_text">This feature will still be improved in future releases. For now, we didn\'t want to break existing configs and app behaviour. That\'s why custom sync conditions for a certain network type can only be set if you enable syncing on the network in the global run conditions first.</string>
<string name="tip_ignore_delete_title">Backup pictures from phone to computer?</string>
<string name="tip_ignore_delete_text">If you\'d like to have all pictures made on your phone backed up to a computer, share the \'Camera\' folder with the computer. Open Syncthing on the computer, add the folder and go to \'Actions\' > \'Advanced\' > \'Camera\' folder. Enable \'Ignore Delete\' and click \'Save\'. You can now delete pictures from your camera folder on the phone and they will stay backed up on the computer.</string>
<string name="tip_huawei_device_disconnected_title">Huawei: \'device disconnected\' workaround</string>
<string name="tip_huawei_device_disconnected_text">If your desktop constantly reports your Huawei device as disconnected, open Syncthing UI of your desktop. Go to \'remote devices\', expand the phone\'s entry, click \'Edit\', switch to \'Advanced\'. Put your phone IP address into \'Addresses\' like this:\ntcp4://%1$s, dynamic\nConfirmed working for: Huawei P10</string>
<string name="tip_phone_ip_address_syntax">PHONE_IP_ADDRESS</string>