Skip to content

Commit

Permalink
Merge branch 'main' into improve_override_warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
imsodin authored Apr 1, 2024
2 parents 7a6ec4c + e50bca3 commit 951a16c
Show file tree
Hide file tree
Showing 44 changed files with 808 additions and 391 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Reporting Bugs

Please file bugs in the [Github Issue
Please file bugs in the [GitHub Issue
Tracker](https://github.com/syncthing/syncthing-android/issues). Bugs that
are not specific to Syncthing-Android should be reported to the
[main project](https://github.com/syncthing/syncthing/issues) instead.
Expand Down
4 changes: 2 additions & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ android {
applicationId = "com.nutomic.syncthingandroid"
minSdk = 21
targetSdk = 33
versionCode = 4384
versionName = "1.27.3"
versionCode = 4386
versionName = "1.27.5-rc.2"
testApplicationId = "com.nutomic.syncthingandroid.test"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/play/listings/de-DE/full-description.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Syncthing ersetzt die proprietären Synchronisierungs- und Cloud-Dienste, mit etwas offenem, vertrauenswürdigen und dezentralem. Deine Daten sind deine Daten und du allein entscheidest, wo sie gespeichert werden, ob sie mit Dritten geteilt und wie sie über das Internet übertragen werden.
Syncthing ersetzt die proprietären Synchronisierungs- und Cloud-Dienste, mit etwas offenem, vertrauenswürdigen und dezentralem. Die eigenen Daten bleiben die eigenen Daten und nur man ganz allein entscheidet, wo sie gespeichert werden, ob sie mit Dritten geteilt und wie sie über das Internet übertragen werden.

Webseite: https://syncthing.net/

Quellcode: https://github.com/syncthing/syncthing-android

Forum: https://forum.syncthing.net/

Vorgänge: https://github.com/syncthing/syncthing-android/issues
Probleme: https://github.com/syncthing/syncthing-android/issues

Datenschutzrichtlinie (englisch): https://syncthing.net/android-privacy-policy
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions app/src/main/play/listings/hi-IN/full-description.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third party and how it's transmitted over the Internet.
Syncthing मालिकाना सिंक और क्लाउड सेवाओं को कुछ खुली, भरोसेमंद और विकेंद्रीकृत सेवाओं से बदल देता है। आपका डेटा केवल आपका डेटा है और आप यह चुनने के पात्र हैं कि इसे कहाँ संग्रहीत किया जाता है, यदि इसे किसी तीसरे पक्ष के साथ साझा किया जाता है और इसे इंटरनेट पर कैसे प्रसारित किया जाता है।

Website: https://syncthing.net/
वेबसाइट: https://syncthing.net/

Source code: https://github.com/syncthing/syncthing-android
स्रोत कोड: https://github.com/syncthing/syncthing-android

Forum: https://forum.syncthing.net/
फोरम: https://forum.syncthing.net/

Issues: https://github.com/syncthing/syncthing-android/issues
मुद्दे: https://github.com/syncthing/syncthing-android/issues

Privacy-policy: https://syncthing.net/android-privacy-policy
गोपनीयता-नीति: https://syncthing.net/android-privacy-policy
2 changes: 1 addition & 1 deletion app/src/main/play/listings/hi-IN/short-description.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Open, trustworthy and decentralized file synchronization
खुला, विश्वसनीय और विकेंद्रीकृत फ़ाइल सिंक्रनाइज़ेशन
2 changes: 1 addition & 1 deletion app/src/main/play/listings/hi-IN/title.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
सिंकथिंग
Syncthing
4 changes: 2 additions & 2 deletions app/src/main/play/release-notes/en-GB/default.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
* Update Syncthing to v1.27.3: https://github.com/syncthing/syncthing/releases/tag/v1.27.3
* App changelog: https://github.com/syncthing/syncthing-android/releases/tag/1.27.3
* Update Syncthing to v1.27.5-rc.2: https://github.com/syncthing/syncthing/releases/tag/v1.27.5-rc.2
* App changelog: https://github.com/syncthing/syncthing-android/releases/tag/1.27.5-rc.2
4 changes: 2 additions & 2 deletions app/src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,9 @@
\nإذا أردت استخدام هذه الخاصية، اضغط الزِّر أعلاه لإعطاء Syncthing الصلاحيات اللازمة. يمكنك تخطي هذه الخطوة إذا شئت.</string>
<string name="welcome_text">Syncthing تطبيق حُر المصدر لمزامنة الملفات.
\nلمشاركة البيانات مع الأجهزة الأخرى، ستحتاج لإضافة مُعرِّفاتهم الخاصة لسِجِلِّ الأجهزة. بعد ذلك، يمكنك اختيار المجلدات التي تود مشاركتها مع كل جهاز في السجل.
\nنرجو إبلاغنا عن أي أعطال تواجهها من خلال متتبع المشاكل الخاص بنا على Github.</string>
\nنرجو إبلاغنا عن أي أعطال تواجهها من خلال متتبع المشاكل الخاص بنا على GitHub.</string>
<string name="welcome_title">مرحبا بك في Syncthing على نظام أندرويد</string>
<string name="introduction">مقدمة</string>
<string name="api_level_30_title">معلومات التحديث</string>
<string name="app_description">تطبيق حُر، موثوق، محلي الإدارة.</string>
</resources>
</resources>
Loading

0 comments on commit 951a16c

Please sign in to comment.