Skip to content
This repository has been archived by the owner on Dec 3, 2024. It is now read-only.

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@imsodin
imsodin authored Dec 3, 2023
2 parents 4c7e60c + 856495a commit 66946dd
Show file tree
Hide file tree
Showing 45 changed files with 1,199 additions and 1,585 deletions.
6 changes: 3 additions & 3 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
}

dependencies {
implementation 'eu.chainfire:libsuperuser:1.1.0.202004101746'
implementation 'eu.chainfire:libsuperuser:1.1.1'
implementation 'com.google.android.material:material:1.8.0'
implementation 'com.google.code.gson:gson:2.10.1'
implementation 'org.mindrot:jbcrypt:0.4'
Expand Down Expand Up @@ -37,8 +37,8 @@ android {
applicationId "com.nutomic.syncthingandroid"
minSdkVersion 21
targetSdkVersion 33
versionCode 4371
versionName "1.26.1"
versionCode 4372
versionName "1.27.0-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/ko-KR/full-description.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Syncthing은 기존의 폐쇄적인 동기화 및 클라우드를 대체할 수 있는 개방적이고, 믿을 수 있고, 분산된 서비스입니다. 귀하의 데이터는 귀하만의 소유이며 이를 어디에 보관할지, 제삼자와 공유할지, 그리고 인터넷으로 어떻게 전송할지를 결정할 권리가 귀하에게만 있습니다.
Syncthing은 기존의 동기화 및 클라우드 독점 서비스를 대체할 믿을 수 있는 오픈 소스 분산형 서비스입니다. 귀하의 데이터는 귀하만이 소유하므로 어디에 보관할지, 제삼자와 공유할지, 인터넷으로 어떻게 전송할지를 결정할 권리가 귀하에게만 있습니다.

홈페이지: https://syncthing.net/

Expand All @@ -8,4 +8,4 @@ Syncthing은 기존의 폐쇄적인 동기화 및 클라우드를 대체할 수

문제 제기: https://github.com/syncthing/syncthing-android/issues

개인정보처리방침: https://syncthing.net/android-privacy-policy
개인정보처리방침: https://syncthing.net/android-privacy-policy
2 changes: 1 addition & 1 deletion app/src/main/play/listings/ko-KR/short-description.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
개방적이고 믿을 수 있는 분산형 파일 동기화
믿을 수 있는 오픈 소스 분산형 파일 동기화
2 changes: 1 addition & 1 deletion app/src/main/play/listings/ko-KR/title.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Syncthing
Syncthing
6 changes: 3 additions & 3 deletions app/src/main/play/listings/pt-PT/full-description.txt
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
O Syncthing substitui serviços proprietários de sincronização e de nuvem por algo aberto, fiável e descentralizado. Os seus dados são somente seus e você merece escolher onde são armazenados, se são partilhados com terceiros ou como são transmitidos pela Internet.

Website: https://syncthing.net/
Página web: https://syncthing.net/

Código fonte: https://github.com/syncthing/syncthing-android

Forum: https://forum.syncthing.net/
Fórum: https://forum.syncthing.net/

Questões: https://github.com/syncthing/syncthing-android/issues

Privacy-policy: https://syncthing.net/android-privacy-policy
Política de privacidade: https://syncthing.net/android-privacy-policy
2 changes: 1 addition & 1 deletion app/src/main/play/listings/pt-PT/short-description.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Sincronização aberta, fiável e descentralizada
Sincronização aberta, fiável e descentralizada
2 changes: 1 addition & 1 deletion app/src/main/play/listings/pt-PT/title.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Syncthing
Syncthing
4 changes: 2 additions & 2 deletions app/src/main/play/release-notes/en-GB/default.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
* Update Syncthing to v1.26.1: https://github.com/syncthing/syncthing/releases/tag/v1.26.1
* App changelog: https://github.com/syncthing/syncthing-android/releases/tag/1.26.1
* Update Syncthing to v1.27.0-rc.2: https://github.com/syncthing/syncthing/releases/tag/v1.27.0-rc.2
* App changelog: https://github.com/syncthing/syncthing-android/releases/tag/1.27.0-rc.2
82 changes: 33 additions & 49 deletions app/src/main/res/values-bg/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,11 +163,9 @@
<!--Setting title-->
<string name="compression">Компресиране</string>
<!--Strings representing compression options-->
<string-array name="compress_entries">
<item>Изключено</item>
<item>Само мета информацията</item>
<item>Всички данни</item>
</string-array>
<string name="compress_never">Изключено</string>
<string name="compress_metadata">Само мета информацията</string>
<string name="compress_always">Всички данни</string>
<!--Setting title-->
<string name="introducer">Може да предлага други устройства</string>
<!--Setting title-->
Expand Down Expand Up @@ -217,11 +215,9 @@
<string name="sync_only_wifi_ssids_location_permission_rejected_dialog_title">Необходимо е резрешение</string>
<string name="sync_only_wifi_ssids_location_permission_rejected_dialog_content">От Android 8.1 нататък се изисква достъп до местоположението, за да бъде прочетен идентификатора на безжичната мрежа. Можете да използвате тази възможност само ако сте предоставили това разрешение.</string>
<string name="power_source_title">Работи при захранване от</string>
<string-array name="power_source_entries">
<item>Батерия или зарядно.</item>
<item>Зарядно.</item>
<item>Батерия.</item>
</string-array>
<string name="power_source_ac_and_battery_power">Батерия или зарядно.</string>
<string name="power_source_ac_power">Зарядно.</string>
<string name="power_source_battery_power">Батерия.</string>
<string name="respect_battery_saving_title">Ползване на настройката за пестене на батерия от Андроид</string>
<string name="respect_battery_saving_summary">Спира Syncthing при включен режим за пестене на батерия.</string>
<string name="respect_master_sync_title">Ползване на настройката за синхр. на данни от Андроид</string>
Expand All @@ -238,11 +234,9 @@
<string name="use_root_summary">Може да предизвика разнообразни проблеми със Syncthing и като цяло с устройството. При възникване на проблем може да се наложи преинсталиране на Syncthing.</string>
<string name="notification_type_title">Известия</string>
<string name="notification_type_summary">Изберете тип известия</string>
<string-array name="notification_type_entries">
<item>Нормални</item>
<item>С нисък приоритет</item>
<item>Без известия</item>
</string-array>
<string name="notification_type_normal">Нормални</string>
<string name="notification_type_low_priority">С нисък приоритет</string>
<string name="notification_type_none">Без известия</string>
<string name="preference_language_title">Език</string>
<string name="preference_language_summary">Смяна на езика на приложението</string>
<string name="start_into_web_gui_title">Стартиране на уеб интерфейса</string>
Expand All @@ -252,26 +246,20 @@
<string name="preference_theme_option_light">Светла</string>
<string name="preference_theme_option_dark">Тъмна</string>
<string name="pref_language_default">Стандартен език</string>
<string-array name="folder_types">
<item>Изпращане и получаване</item>
<item>Само изпращане</item>
<item>Само получаване</item>
</string-array>
<string-array name="pull_order_types">
<item>Произволен</item>
<item>Азбучен ред</item>
<item>Първо най-малките</item>
<item> Първо най-големите</item>
<item>Първо най-старите</item>
<item>Първо най-новите</item>
</string-array>
<string-array name="versioning_types">
<item>Без</item>
<item>„Кошче за боклук“</item>
<item>Обикновени</item>
<item>Разпределени</item>
<item>Външно управление</item>
</string-array>
<string name="folder_type_send_receive">Изпращане и получаване</string>
<string name="folder_type_send_only">Само изпращане</string>
<string name="folder_type_receive_only">Само получаване</string>
<string name="pull_order_random">Произволен</string>
<string name="pull_order_alphabetic">Азбучен ред</string>
<string name="pull_order_smallest_first">Първо най-малките</string>
<string name="pull_order_largest_first"> Първо най-големите</string>
<string name="pull_order_oldest_first">Първо най-старите</string>
<string name="pull_order_newest_first">Първо най-новите</string>
<string name="versioning_type_none">Без</string>
<string name="versioning_type_trashcan">„Кошче за боклук“</string>
<string name="versioning_type_simple">Обикновени</string>
<string name="versioning_type_staggered">Разпределени</string>
<string name="versioning_type_external">Външно управление</string>
<string name="device_name">Име на устройството</string>
<string name="listen_address">Адрес за слушане на синхронизиращия протокол</string>
<string name="max_recv_kbps">Ограничаване на скорост при изтегляне (KiB/s)</string>
Expand Down Expand Up @@ -466,21 +454,17 @@
<!--Shown when a device ID is copied to the clipboard-->
<string name="device_id_copied_to_clipboard">Идентификаторът на устройството е копиран в клипборда</string>
<!--Strings representing units for file sizes, from smallest to largest-->
<string-array name="file_size_units">
<item>B</item>
<item>KiB</item>
<item>MiB</item>
<item>GiB</item>
<item>TiB</item>
</string-array>
<string name="file_size_unit_B">B</string>
<string name="file_size_unit_KiB">KiB</string>
<string name="file_size_unit_MiB">MiB</string>
<string name="file_size_unit_GiB">GiB</string>
<string name="file_size_unit_TiB">TiB</string>
<!--Strings representing units for transfer rates, from smallest to largest-->
<string-array name="transfer_rate_units">
<item>B/s</item>
<item>KiB/s</item>
<item>MiB/s</item>
<item>GiB/s</item>
<item>TiB/s</item>
</string-array>
<string name="transfer_rate_unit_B_s">B/s</string>
<string name="transfer_rate_unit_KiB_s">KiB/s</string>
<string name="transfer_rate_unit_MiB_s">MiB/s</string>
<string name="transfer_rate_unit_GiB_s">GiB/s</string>
<string name="transfer_rate_unit_TiB_s">TiB/s</string>
<!--Possible folder states-->
<string name="state_idle">В готовност</string>
<string name="state_scanning">Сканиране</string>
Expand Down
82 changes: 33 additions & 49 deletions app/src/main/res/values-ca-rES/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,11 +163,9 @@
<!--Setting title-->
<string name="compression">Compressió</string>
<!--Strings representing compression options-->
<string-array name="compress_entries">
<item>Mai</item>
<item>Metadades</item>
<item>Sempre</item>
</string-array>
<string name="compress_never">Mai</string>
<string name="compress_metadata">Metadades</string>
<string name="compress_always">Sempre</string>
<!--Setting title-->
<string name="introducer">Introductor</string>
<!--Setting title-->
Expand Down Expand Up @@ -217,11 +215,9 @@
<string name="sync_only_wifi_ssids_location_permission_rejected_dialog_title">Calen permisos</string>
<string name="sync_only_wifi_ssids_location_permission_rejected_dialog_content">A partir d\'Android 8.1, es necessita el permís d\'ubicació per poder llegir el nom de les xarxes Wi-Fi. Només podreu fer-ho si doneu aquest permís.</string>
<string name="power_source_title">Activa quan el dispositiu estigui funcionant</string>
<string-array name="power_source_entries">
<item>Endollat i amb bateria.</item>
<item>Endollat.</item>
<item>Amb bateria.</item>
</string-array>
<string name="power_source_ac_and_battery_power">Endollat i amb bateria.</string>
<string name="power_source_ac_power">Endollat.</string>
<string name="power_source_battery_power">Amb bateria.</string>
<string name="respect_battery_saving_title">Respecta la configuració d\'estalvi de bateria de l\'Android</string>
<string name="respect_battery_saving_summary">Desactiva el Syncthing durant el mode d\'estalvi de bateria.</string>
<string name="respect_master_sync_title">Respecta l\'ajustament de l\'Android d\'\'Auto-sincronitzar dades\'</string>
Expand All @@ -238,11 +234,9 @@
<string name="use_root_summary">Aquesta característica és inestable i podria causar problemes amb el Syncthing i amb el vostre dispositiu. Si us trobeu amb problemes, potser haureu de reinstal·lar el Syncthing.</string>
<string name="notification_type_title">Notificació</string>
<string name="notification_type_summary">Seleccioneu el tipus de notificació</string>
<string-array name="notification_type_entries">
<item>Normal</item>
<item>Baixa Prioritat</item>
<item>Cap</item>
</string-array>
<string name="notification_type_normal">Normal</string>
<string name="notification_type_low_priority">Baixa Prioritat</string>
<string name="notification_type_none">Cap</string>
<string name="preference_language_title">Idioma</string>
<string name="preference_language_summary">Canvieu l\'idioma de l\'aplicació</string>
<string name="start_into_web_gui_title">Inicia amb la interfície web directament</string>
Expand All @@ -252,26 +246,20 @@
<string name="preference_theme_option_light">Clar</string>
<string name="preference_theme_option_dark">Fosc</string>
<string name="pref_language_default">Idioma per defecte</string>
<string-array name="folder_types">
<item>Envia i rep</item>
<item>Només envia</item>
<item>Només rep</item>
</string-array>
<string-array name="pull_order_types">
<item>Aleatori</item>
<item>Alfabètic</item>
<item>Primer el més petit</item>
<item>Primer el més gran</item>
<item>Primer el més antic</item>
<item>Primer el més nou</item>
</string-array>
<string-array name="versioning_types">
<item>Cap</item>
<item>Paperera</item>
<item>Simple</item>
<item>Escalonat</item>
<item>Extern</item>
</string-array>
<string name="folder_type_send_receive">Envia i rep</string>
<string name="folder_type_send_only">Només envia</string>
<string name="folder_type_receive_only">Només rep</string>
<string name="pull_order_random">Aleatori</string>
<string name="pull_order_alphabetic">Alfabètic</string>
<string name="pull_order_smallest_first">Primer el més petit</string>
<string name="pull_order_largest_first">Primer el més gran</string>
<string name="pull_order_oldest_first">Primer el més antic</string>
<string name="pull_order_newest_first">Primer el més nou</string>
<string name="versioning_type_none">Cap</string>
<string name="versioning_type_trashcan">Paperera</string>
<string name="versioning_type_simple">Simple</string>
<string name="versioning_type_staggered">Escalonat</string>
<string name="versioning_type_external">Extern</string>
<string name="device_name">Nom del dispositiu</string>
<string name="listen_address">Adreces d\'escolta del protocol de sincronització</string>
<string name="max_recv_kbps">Límit de transferència entrant (KiB/s)</string>
Expand Down Expand Up @@ -466,21 +454,17 @@
<!--Shown when a device ID is copied to the clipboard-->
<string name="device_id_copied_to_clipboard">S\'ha copiat la ID del dispositiu al porta-retalls</string>
<!--Strings representing units for file sizes, from smallest to largest-->
<string-array name="file_size_units">
<item>B</item>
<item>KiB</item>
<item>MiB</item>
<item>GiB</item>
<item>TiB</item>
</string-array>
<string name="file_size_unit_B">B</string>
<string name="file_size_unit_KiB">KiB</string>
<string name="file_size_unit_MiB">MiB</string>
<string name="file_size_unit_GiB">GiB</string>
<string name="file_size_unit_TiB">TiB</string>
<!--Strings representing units for transfer rates, from smallest to largest-->
<string-array name="transfer_rate_units">
<item>B/s</item>
<item>KiB/s</item>
<item>MiB/s</item>
<item>GiB/s</item>
<item>TiB/s</item>
</string-array>
<string name="transfer_rate_unit_B_s">B/s</string>
<string name="transfer_rate_unit_KiB_s">KiB/s</string>
<string name="transfer_rate_unit_MiB_s">MiB/s</string>
<string name="transfer_rate_unit_GiB_s">GiB/s</string>
<string name="transfer_rate_unit_TiB_s">TiB/s</string>
<!--Possible folder states-->
<string name="state_idle">Inactiu</string>
<string name="state_scanning">Escanejant</string>
Expand Down
Loading

0 comments on commit 66946dd

Please sign in to comment.