Merge branch 'main' of https://github.com/Catfriend1/syncthing-android

app/src/main/java/com/nutomic/syncthingandroid/service/NotificationHandler.java

@@ -81,9 +81,9 @@ public NotificationHandler(Context context) {
             mInfoChannel = new NotificationChannel(
                     CHANNEL_INFO, mContext.getString(R.string.notifications_other_channel),
                     NotificationManager.IMPORTANCE_LOW);
-            mPersistentChannel.enableVibration(false);
-            mPersistentChannel.setSound(null, null);
-            mPersistentChannel.setShowBadge(true);
+            mInfoChannel.enableVibration(false);
+            mInfoChannel.setSound(null, null);
+            mInfoChannel.setShowBadge(true);
             mNotificationManager.createNotificationChannel(mInfoChannel);
         } else {
             mPersistentChannel = null;

app/src/main/play/listings/fr-FR/full-description.txt

@@ -1,7 +1,7 @@
-This is a fork of the Syncthing-Android wrapper for Syncthing that brings major enhancements like:
-* Folder, device and overall sync progress can easily be read off the UI.
-* "Syncthing Camera" - an optional feature (with optional permission to use the camera) where you can take pictures with your friend, partner, ... on two phones into one shared and private Syncthing folder. No cloud involved. - FEATURE CURRENTLY IN BETA STAGE -
-* "Sync every hour" to save even more battery
+Fork francisé de Syncthing-Android wrapper pour Syncthing qui amène des améliorations majeures comme :
+* Partages, Appareils et vue globale du processus de synchronisation facilement lus depuis le GUI.
+* "Syncthing Camera" - une fonctionnalité optionelle (avec une permission optionnelle pour utiliser l'appareil photo) qui vous permet de prendre des photos avec un ami ou partenaire, ... depuis deux téléphones vers un dossier partagé et privé Syncthing. Donc sans stockkage cloud dans la recette. - FONCTION ACTUELLEMENT EN BETA TEST -
+* "Planning d'exécution" pour économiser encore plus la batterie.
 * Individual sync conditions can be applied per device and per folder
 * Recent changes UI, click to open files.
 * Changes to folder and device config can be made regardless if Syncthing is running or not
@@ -20,19 +20,19 @@ Goals of the fork:
 Comparison between upstream and fork at the time of writing this:
 * Both contain the syncthing binary built from the official source at GitHub
 * Syncing functionality and reliability depends on the syncthing binary submodule version.
-* Fork gets along with upstream and sometimes they pick up my improvements.
-* Strategy and release frequency is different
-* Only the wrapper containing the Android UI is addressed by the fork.
+* Le fork suit la version officielle et parfois elle adopte mes améliorations.
+* La stratégie et la fréquence de mise à jour sont différentes.
+* Seul le wrapper contenant le GUI Android UI est concerné par le fork.
 
-Website: https://github.com/Catfriend1/syncthing-android
+Site web : https://github.com/Catfriend1/syncthing-android
 
-Code source: https://github.com/Catfriend1/syncthing-android
+Code source : https://github.com/Catfriend1/syncthing-android
 
-How Syncthing writes to external SD card: https://github.com/Catfriend1/syncthing-android/blob/master/wiki/SD-card-write-access.md
+Comment Syncthing écrit sur les SD card externes : https://github.com/Catfriend1/syncthing-android/blob/master/wiki/SD-card-write-access.md
 
-Wiki, FAQ and helpful articles: https://github.com/Catfriend1/syncthing-android/wiki
+Wiki, FAQ et articles utiles : https://github.com/Catfriend1/syncthing-android/wiki
 
 Questions: https://github.com/Catfriend1/syncthing-android/issues
 
-Please help with the
-Translation: https://hosted.weblate.org/projects/syncthing/android/catfriend1
+Merci d'aider à
+La traduction : https://hosted.weblate.org/projects/syncthing/android/catfriend1

app/src/main/play/listings/fr-FR/short-description.txt

@@ -1 +1 @@
-Wrapper for Syncthing - Une synchronisation de fichiers ouverte, décentralisée
+Wrapper for Syncthing - Une synchronisation de fichiers ouverte, décentralisée

app/src/main/play/listings/fr-FR/title.txt

@@ -1 +1 @@
-Syncthing-Fork
+Syncthing-Fork

app/src/main/play/release-notes/en-GB/beta.txt

@@ -1,4 +1,4 @@
-* Syncthing v1.27.3
+* Syncthing v1.27.4
 
 Enhanced
 --

app/src/main/play/release-notes/en-GB/default.txt

@@ -1,4 +1,4 @@
-* Syncthing v1.27.3
+* Syncthing v1.27.4
 
 Enhanced
 --

app/src/main/res/values-bg/strings.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string name="app_name">Syncthing-Fork</string>
-    <string name="app_description">Отворено и заслужаващо доверие приложение за децентрализирано синхронизиране на файлове.</string>
+    <string name="app_description">Отворено и заслужаващо доверие приложение за нецентрализирано синхронизиране на файлове.</string>
     <!-- FirstStartActivity -->
     <!-- Title for dialog displayed on first start -->
-    <string name="welcome_title">Добре дошли в Syncthing за Android</string>
+    <string name="welcome_title">Добре дошли при Syncthing за Андроид</string>
     <!-- Slide "Ignore battery optimizations" -->
     <string name="ignore_doze_permission_title">Пестене на батерия</string>
     <string name="cont">Напред</string>
@@ -53,7 +53,7 @@
     <!-- Same as upload_title with a colon and space appended -->
     <string name="upload_title_colon">"Качване: "</string>
     <!-- Title for current RAM usage -->
-    <string name="ram_usage">RAM в употреба</string>
+    <string name="ram_usage">Използвана памет</string>
     <!-- Title for announce server status -->
     <string name="announce_server">Сървър за откриване на устройства</string>
     <string name="restart">Рестартиране</string>
@@ -142,21 +142,21 @@
     <string name="enable_relaying">Разрешава препращане</string>
     <string name="usage_reporting"> Анонимен доклад за ползване на програмата</string>
     <string name="export_config">Изнасяне на настройките</string>
-    <string name="use_tor_title">Ползване на Tor</string>
+    <string name="use_tor_title">Ползване на Тор</string>
     <!-- Dialog shown before config export -->
     <string name="dialog_confirm_export">Наистина ли желаете настройките да бъдат изнесени\? Съществуващите файлове ще бъдат презаписани.
 \n
 \nВНИМАНИЕ! Програми могат да извлекат частния ви ключ от генерирания файл, а чрез него да свалят и синхронизират файлове.</string>
     <!-- Dialog shown before config import -->
-    <string name="dialog_confirm_import">Наистина ли желаете внасянето на нови настройки\? Съществуващите файлове ще бъдат презаписани.</string>
+    <string name="dialog_confirm_import">Желаете ли да внесете нови настройки? Съществуващите файлове ще бъдат презаписани.</string>
     <!-- Toast shown after config was exported -->
     <string name="config_export_successful">Настройките са изнесени в %1$s</string>
     <string name="import_config">Внасяне на настройки</string>
     <!-- Toast shown after config was imported -->
     <string name="config_imported_successful">Настройките са внесени</string>
     <string name="config_import_failed">Внасянето на настройките се провали. Уверете се, че файловете са в %1$s</string>
     <!-- Title for the preference to reset Syncthing indexes -->
-    <string name="st_reset_database_title">Нулиране на базата данни</string>
+    <string name="st_reset_database_title">Нулиране на базата от данни</string>
     <!-- Syncthing was reset -->
     <string name="st_reset_database_done">Базата данни на Syncthing е нулирана успешно</string>
     <string name="category_about">За програмата</string>
@@ -201,19 +201,19 @@
     <!-- Text of the notification shown when a restart is needed -->
     <string name="restart_notification_text">Натиснете за рестартиране на Syncthing</string>
     <!-- Shown when a device ID is copied to the clipboard -->
-    <string name="device_id_copied_to_clipboard">Идентификаторът на устройството е копиран в клипборда</string>
+    <string name="device_id_copied_to_clipboard">Идентификаторът на устройството е копиран</string>
     <!-- Strings representing units for file sizes, from smallest to largest -->
     <string name="file_size_unit_B">B</string>
-    <string name="file_size_unit_KiB">KiB</string>
+    <string name="file_size_unit_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 name="transfer_rate_unit_B_s">B/s</string>
+    <string name="transfer_rate_unit_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>
+    <string name="transfer_rate_unit_TiB_s">ТБ/с</string>
     <string name="state_scanning">Сканиране</string>
     <string name="state_syncing">Синхронизиране (%1$d%%)</string>
     <string name="state_error">Грешка</string>
@@ -222,4 +222,24 @@
     <!-- Format string for folder size, eg "500 MiB / 1 GiB" -->
     <string name="folder_size_format">%1$s / %2$s</string>
     <string name="file_versioning">Версии на файловете</string>
-</resources>
+    <string name="sync_only_wifi_ssids_location_permission_rejected_dialog_content">Android 8.1 и по-нов изисква достъп до местоположението, за да бъде прочетен идентификатора на безжичната мрежа. Можете да използвате тази възможност само ако сте предоставили това разрешение.</string>
+    <string name="dialog_all_files_access_not_supported">Устройството не поддържа достъп до всички файлове</string>
+    <string name="override_changes">Налагане на местни промени</string>
+    <string name="status_fragment_title">Състояние</string>
+    <string name="folder_fileWatcher">Наблюдаване за промени</string>
+    <string name="respect_battery_saving_title">Отчитане на пестенето на батерия от Андроид</string>
+    <string name="respect_master_sync_title">Отчитане на синхрането на данни от Андроид</string>
+    <string name="respect_master_sync_summary">Спира Syncthing, когато настройката за автом. синхр. на данни от Андроид е изключена</string>
+    <string name="use_proxy">Свързване през мрежов посредник</string>
+    <string name="do_not_use_proxy">Няма настроен мрежов посредник.</string>
+    <string name="use_tor_summary">Пренасочва целия трафик през мрежата на Тор с цел поверителност. Изисква Orbot. Изключва настройките за мрежов посредник.</string>
+    <string name="toast_invalid_socks_proxy_address">Неприемлив синтаксис за мрежов посредник \'socks5://[IP/HOSTNAME]:[PORT]\'</string>
+    <string name="http_proxy_address_title">Мрежов посредник за HTTP(S)</string>
+    <string name="toast_invalid_http_proxy_address">Неприемлив синтаксис за мрежов посредник \'http://[IP/HOSTNAME]:[PORT]\'</string>
+    <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="toast_invalid_environment_variables">Стойността е недействително наименование на променлива на средата.</string>
+    <string name="copy_exception">Грешка при споделяне, проверете дневника на приложението</string>
+    <string name="cleanout_after_description">Броят дни за запазване на файловете в кошчето. Нула значи завинаги.</string>
+</resources>

app/src/main/res/values-fi/strings.xml

@@ -12,9 +12,9 @@
 \n
 \n</string>
     <!-- Slide "Storage Permission" -->
-    <string name="storage_permission_title">Tallennustilan käyttöoikeus</string>
-    <string name="storage_permission_desc">Syncthing tarvitsee pääsyn tallennustilaasi synkronoidakseen.</string>
-    <string name="dialog_all_files_access_not_supported">Laitteesi ei tue pääsyä kaikkiin tiedostoihin</string>
+    <string name="storage_permission_title">Tallennustilan lupa</string>
+    <string name="storage_permission_desc">Syncthing on käytettävä tallennustilaa tiedostojen synkronointia varten.</string>
+    <string name="dialog_all_files_access_not_supported">Laitteesi ei tue kaikkien tiedostojen käyttöä</string>
     <!-- Slide "Ignore battery optimizations" -->
     <string name="ignore_doze_permission_title">Akun käytön optimointi</string>
     <string name="ignore_doze_permission_os_notice">Android TV:t tiedettävästi sulkevat toisinaan sovelluksen, kun se on käynnissä taustalla. Ratkaisu on saatavilla wikissä kohdassa \'%1$s/%2$s.</string>
@@ -36,7 +36,7 @@
     <string name="generic_error">Virhe</string>
     <string name="generic_help">Ohje</string>
     <string name="grant_permission">Myönnä käyttöoikeus</string>
-    <string name="permission_granted">Käyttöoikeus myönnetty</string>
+    <string name="permission_granted">Lupa myönnetty</string>
     <string name="reason">Syy:</string>
     <string name="accept">Hyväksy</string>
     <string name="ignore">Ohita</string>
@@ -80,7 +80,7 @@
     <string name="no">Ei</string>
     <string name="open_website">Avaa verkkosivu</string>
     <string name="toast_write_storage_permission_required">Tämä sovellus vaatii tallennustilan kirjoitusoikeuden</string>
-    <string name="device_rejected">Laite \"%1$s\" haluaa yhdistää</string>
+    <string name="device_rejected">Laite \"%1$s\" haluaa muodostaa yhteyden</string>
     <string name="folder_rejected">Laite \"%1$s\" haluaa jakaa kansion \"%2$s\"</string>
     <!-- StateDialogActivity -->
     <!-- Text for FoldersFragment and DevicesFragment loading view -->
@@ -442,4 +442,12 @@
     <string name="browse">Selaa</string>
     <string name="share_device_id_chooser">Jaa laitteen ID</string>
     <string name="custom_sync_conditions_description">Antaa sinun valita poikkeukset globaaleihin käyntiehtoihin</string>
-</resources>
+    <string name="pause_device">Keskeytä laite</string>
+    <string name="folder_type_send_receive">Lähetä ja vastaanota</string>
+    <string name="pull_order_random">satunnainen</string>
+    <string name="pull_order_alphabetic">Aakkosellinen</string>
+    <string name="pull_order_smallest_first">Pienin ensin</string>
+    <string name="pull_order_largest_first">Suurin ensin</string>
+    <string name="pull_order_oldest_first">Vanhin ensin</string>
+    <string name="pull_order_newest_first">Uusin ensin</string>
+</resources>