Merge pull request #38 from BitRemote-Team/repo-sync/BitRemoteDev/def…

…ault

🔄 synced file(s) with BitRemote-Team/BitRemoteDev

README.md

@@ -24,7 +24,7 @@ App Strings: [{lang}.lproj](/Strings)
 GitHub Readme: [README.{lang}.md](/READMEs)
 
 ## Supported Downloaders
-- [WIP] aria2
+- aria2
 - qBittorrent
 - Transmission
 - Synology Download Station

READMEs/README.chs.md

@@ -24,7 +24,7 @@ App Strings: [{lang}.lproj](/Strings)
 GitHub Readme: [README.{lang}.md](/READMEs)
 
 ## 支持的下载器
-- [开发中] aria2
+- aria2
 - qBittorrent
 - Transmission
 - Synology Download Station

READMEs/README.cht.md

@@ -24,7 +24,7 @@ App Strings: [{lang}.lproj](/Strings)
 GitHub Readme: [README.{lang}.md](/READMEs)
 
 ## 支援的下載軟體
-- [開發中] aria2
+- aria2
 - qBittorrent
 - Transmission
 - Synology Download Station

READMEs/README.de.md

@@ -24,7 +24,7 @@ App Strings: [{lang}.lproj](/Strings)
 GitHub Readme: [README.{lang}.md](/READMEs)
 
 ## Supported Downloaders
-- [WIP] aria2
+- aria2
 - qBittorrent
 - Transmission
 - Synology Download Station

READMEs/README.jpn.md

@@ -24,7 +24,7 @@ App Strings: [{lang}.lproj](/Strings)
 GitHub Readme: [README.{lang}.md](/READMEs)
 
 ## 対応ダウンローダー
-- [開発中] aria2
+- aria2
 - qBittorrent
 - Transmission
 - Synology Download Station

READMEs/README.ko.md

@@ -24,7 +24,7 @@ App Strings: [{lang}.lproj](/Strings)
 GitHub Readme: [README.{lang}.md](/READMEs)
 
 ## Supported Downloaders
-- [WIP] aria2
+- aria2
 - qBittorrent
 - Transmission
 - Synology Download Station

Strings/en.lproj/Constant.strings

@@ -6,35 +6,6 @@
 
 */
 
-"null" = "(null)";
-
-"markdown.link" = "[%@](%@)";
-
-"presentation_mode_mark" = "*****";
-
-"magnet.prefix" = "magnet:?xt=urn:btih:";
-
-"prompt.client_host.default" = "https://domain:port";
-"prompt.client_host.aria2" = "https://domain:port/jsonrpc";
-"prompt.client_host.transmission" = "https://domain:port/transmission/rpc";
-
-"trial.jwt.public_key" = "
------BEGIN PUBLIC KEY-----
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAt90AiuR3QUjm91oYL2pe
-hoOkJcgTo5w+Ftt0X08Qpf/s8DRXEdiYafRqQ2DhJ6PWn9CdKnKZFoFbUZ2K+WFi
-JrCQjODL+ver17oCdTTxCqInwXATk/Zpe8T+kyjnjbUwbVUV74ecPRJjBZTkC5Lm
-0WRP2Pcc//Zh9d66ZDzcLOKS/8mtRikeDK/uQ7+znoK+8irUjszQT53Wbqjguv+l
-mS1XGF+OjBpV+K0q6YyPhlQRYyp10FxAa85VRKTM8K8QnVBtEfhiywfWzpcEaFkF
-jqvpxPyB+coCtiVSCSj343HVYTalN1uxBdx3BUhUzF4/a6zlkrKWP6NbBrd3l1yd
-XUDMHw9xxU0AjQClIjtNCMFnzMG2W3TOfyI2Vx5he9UkHkNCq/MjKJto+psl3iUI
-vVo6oLFmyt2Hr9zj/NekwA/3k/YMixoiQz6C+z2EZX93PIk2Fur5imFFx7v+CnZg
-1oiftK9KF+q9r8me4ko+jD8WN1huHsT+m2hkF2i5IqYiqPdxA3SYP5XAQOJPlF17
-Pn/fI6s5pN/mWWh8Kg1PlBMbXNG3oj/hdPtPxRpPU7YGIwqPDWbxevADPtKTiTeC
-s1EyOmSOI2VhfolmKqwJQenVexRNGxFYp7gAtkAGvcdgHCOAeufZaO1MZqbAiz8h
-PTlC39V/Fz2Rg6vrm6WgTR8CAwEAAQ==
------END PUBLIC KEY-----
-";
-
 // MARK: App
 "app.name" = "BitRemote";
 "app.website" = "https://bitremote.app";
@@ -80,3 +51,48 @@ PTlC39V/Fz2Rg6vrm6WgTR8CAwEAAQ==
 "API_availability.qBittorrent.tags" = "v4.3.2";
 "API_availability.qBittorrent.content_layout" = "v4.3.2";
 "API_availability.qBittorrent.stop_condition" = "v4.5.0";
+
+// MARK: Prompt
+"prompt.integer.zero" = "0";
+"prompt.integer.sixty_four" = "64";
+"prompt.double.one_point_zero" = "1.0";
+"prompt.double.zero_point_zero_zero" = "0.00";
+"prompt.string.sixty_four_megabytes" = "64M";
+"prompt.client_host.default" = "https://domain:port";
+"prompt.client_host.aria2" = "https://domain:port/jsonrpc";
+"prompt.client_host.transmission" = "https://domain:port/transmission/rpc";
+"prompt.username" = "Username";
+"prompt.password" = "Password";
+"prompt.referer" = "*";
+"prompt.header" = "Key: value";
+"prompt.proxy_server" = "https://proxy:port";
+"prompt.cookies" = "key1=value1; key2=value2;";
+"prompt.trackers" = "https://tracker1:port, https://tracker2:port";
+
+// MARK: Value
+"bt" = "BT";
+"http" = "HTTP";
+"null" = "(null)";
+
+"markdown.link" = "[%@](%@)";
+
+"presentation_mode_mark" = "*****";
+
+"magnet.prefix" = "magnet:?xt=urn:btih:";
+
+"trial.jwt.public_key" = "
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAt90AiuR3QUjm91oYL2pe
+hoOkJcgTo5w+Ftt0X08Qpf/s8DRXEdiYafRqQ2DhJ6PWn9CdKnKZFoFbUZ2K+WFi
+JrCQjODL+ver17oCdTTxCqInwXATk/Zpe8T+kyjnjbUwbVUV74ecPRJjBZTkC5Lm
+0WRP2Pcc//Zh9d66ZDzcLOKS/8mtRikeDK/uQ7+znoK+8irUjszQT53Wbqjguv+l
+mS1XGF+OjBpV+K0q6YyPhlQRYyp10FxAa85VRKTM8K8QnVBtEfhiywfWzpcEaFkF
+jqvpxPyB+coCtiVSCSj343HVYTalN1uxBdx3BUhUzF4/a6zlkrKWP6NbBrd3l1yd
+XUDMHw9xxU0AjQClIjtNCMFnzMG2W3TOfyI2Vx5he9UkHkNCq/MjKJto+psl3iUI
+vVo6oLFmyt2Hr9zj/NekwA/3k/YMixoiQz6C+z2EZX93PIk2Fur5imFFx7v+CnZg
+1oiftK9KF+q9r8me4ko+jD8WN1huHsT+m2hkF2i5IqYiqPdxA3SYP5XAQOJPlF17
+Pn/fI6s5pN/mWWh8Kg1PlBMbXNG3oj/hdPtPxRpPU7YGIwqPDWbxevADPtKTiTeC
+s1EyOmSOI2VhfolmKqwJQenVexRNGxFYp7gAtkAGvcdgHCOAeufZaO1MZqbAiz8h
+PTlC39V/Fz2Rg6vrm6WgTR8CAwEAAQ==
+-----END PUBLIC KEY-----
+";

Strings/en.lproj/Localizable.strings

@@ -20,7 +20,7 @@
 "app_error.description.not_found" = "The content you are looking for cannot be found.";
 "app_error.description.networking_failed" = "A network error occurred.";
 "app_error.description.database_corrupted" = "The database is corrupted.";
-"app_error.internal_error.description.missingAPI" = "The API is currently unavailable.";
+"app_error.internal_error.description.missing_API" = "The API is currently unavailable.";
 "app_error.internal_error.description.missing_parameters" = "Missing required parameters on API call.";
 "app_error.API_error.description.authentication_failed" = "The API call failed due to authentication issues.";
 "app_error.API_error.description.login_two_factor_authentication_failed" = "The login attempt failed due to two-factor authentication issues.";
@@ -116,44 +116,68 @@
 "new_task_view.prompt.savepath" = "/download";
 "new_task_view.prompt.nas_savepath" = "SharedFolder/Download";
 "new_task_view.title.cookies" = "Cookies";
-"new_task_view.prompt.cookies" = "key1=value1; key2=value2;";
 "new_task_view.title.paused" = "Adds as paused";
-"new_task_view.model.torrent_format.link" = "Link";
-"new_task_view.model.torrent_format.file" = "File";
+"new_task_view.model.source_format.link" = "Link";
+"new_task_view.model.source_format.file" = "File";
+"new_task_view.model.aria2.options_type.global" = "Global";
+"new_task_view.model.aria2.download_piece_selection_algorithm.default" = "Default";
+"new_task_view.model.aria2.download_piece_selection_algorithm.inorder" = "Inorder";
+"new_task_view.model.aria2.download_piece_selection_algorithm.random" = "Random";
+"new_task_view.model.aria2.download_piece_selection_algorithm.geom" = "Geometrical";
 "new_task_view.model.qBittorrent.torrent_stop_condition.none" = "None";
 "new_task_view.model.qBittorrent.torrent_stop_condition.metadata_received" = "Metadata received";
 "new_task_view.model.qBittorrent.torrent_stop_condition.files_checked" = "Files checked";
 "new_task_view.model.qBittorrent.torrent_content_layout.original" = "Original";
 "new_task_view.model.qBittorrent.torrent_content_layout.subfolder" = "Creates subfolder";
 "new_task_view.model.qBittorrent.torrent_content_layout.no_subfolder" = "Don't create subfolder";
-"new_task_view.qBittorrent_form.title.autoTMM" = "Automatic torrent management";
+"new_task_view.aria2_form.title.allows_overwrite" = "Allows overwrite";
+"new_task_view.aria2_form.title.max_download_limit" = "Max download limit (B/s)";
+"new_task_view.aria2_form.title.conditional_download" = "Conditional download";
+"new_task_view.aria2_form.title.file_allocation_method" = "File allocation method";
+"new_task_view.aria2_form.title.parameterized_URI" = "Parameterized URI";
+"new_task_view.aria2_form.title.force_save" = "Force save";
+"new_task_view.aria2_form.title.filename" = "Filename";
+"new_task_view.aria2_form.prompt.filename" = "File.txt";
+"new_task_view.aria2_form.title.split_count" = "Split count";
+"new_task_view.aria2_form.title.min_split_size" = "Min split size (Bytes)";
+"new_task_view.aria2_form.title.max_connection_per_server" = "Max connection per server";
+"new_task_view.aria2_form.title.lowest_speed_limit" = "Lowest speed limit (B/s)";
+"new_task_view.aria2_form.title.piece_selection_algorithm" = "Piece selection algorithm";
+"new_task_view.aria2_form.title.http_default_username" = "HTTP default username";
+"new_task_view.aria2_form.title.http_default_password" = "HTTP default password";
+"new_task_view.aria2_form.title.proxy_server" = "Proxy server";
+"new_task_view.aria2_form.title.proxy_username" = "Proxy username";
+"new_task_view.aria2_form.title.proxy_password" = "Proxy password";
+"new_task_view.aria2_form.title.referer" = "Referer";
+"new_task_view.aria2_form.title.custom_header" = "Custom header";
+"new_task_view.aria2_form.title.max_upload_limit" = "Max upload limit (B/s)";
+"new_task_view.aria2_form.title.max_peers" = "Max peers";
+"new_task_view.aria2_form.title.preferred_download_speed" = "Preferred download speed (B/s)";
+"new_task_view.aria2_form.title.remove_unselected_file" = "Remove unselected file";
+"new_task_view.aria2_form.title.stop_timeout" = "Stop timeout (secs)";
+"new_task_view.aria2_form.title.bt_tracker" = "BT tracker";
+"new_task_view.aria2_form.title.min_share_ratio" = "Min share ratio";
+"new_task_view.aria2_form.title.min_seed_time" = "Min seed time (mins)";
+"new_task_view.qBittorrent_form.title.auto_TMM" = "Automatic torrent management";
 "new_task_view.qBittorrent_form.title.rename" = "Rename torrent";
 "new_task_view.qBittorrent_form.prompt.rename" = "New torrent name";
 "new_task_view.qBittorrent_form.title.tags" = "Tags";
 "new_task_view.qBittorrent_form.prompt.tags" = "Tag1, Tag2";
 "new_task_view.qBittorrent_form.title.stop_condition" = "Stop condition";
-"new_task_view.qBittorrent_form.title.skipChecking" = "Skips hash checking";
+"new_task_view.qBittorrent_form.title.skip_checking" = "Skips hash checking";
 "new_task_view.qBittorrent_form.title.content_layout" = "Content layout";
-"new_task_view.qBittorrent_form.title.rootFolder" = "Creates root folder";
-"new_task_view.qBittorrent_form.title.sequentialDownload" = "Enables sequential download";
-"new_task_view.qBittorrent_form.title.firstLastPiecePrio" = "Prioritizes download first last piece";
-"new_task_view.qBittorrent_form.title.upLimit" = "Upload rate limit (B/s)";
-"new_task_view.qBittorrent_form.prompt.upLimit" = "0";
-"new_task_view.qBittorrent_form.title.dlLimit" = "Download rate limit (B/s)";
-"new_task_view.qBittorrent_form.prompt.dlLimit" = "0";
-"new_task_view.qBittorrent_form.title.ratioLimit" = "Share ratio limit";
-"new_task_view.qBittorrent_form.prompt.ratioLimit" = "0.00";
-"new_task_view.qBittorrent_form.title.seedingTimeLimit" = "Seeding time limit (mins)";
-"new_task_view.qBittorrent_form.prompt.seedingTimeLimit" = "0";
+"new_task_view.qBittorrent_form.title.root_folder" = "Creates root folder";
+"new_task_view.qBittorrent_form.title.sequential_download" = "Enables sequential download";
+"new_task_view.qBittorrent_form.title.first_last_piece_prio" = "Prioritizes download first last piece";
+"new_task_view.qBittorrent_form.title.up_limit" = "Upload rate limit (B/s)";
+"new_task_view.qBittorrent_form.title.dl_limit" = "Download rate limit (B/s)";
+"new_task_view.qBittorrent_form.title.ratio_limit" = "Share ratio limit";
+"new_task_view.qBittorrent_form.title.seeding_time_limit" = "Seeding time limit (mins)";
 "new_task_view.transmission_form.title.labels" = "Labels";
 "new_task_view.transmission_form.prompt.labels" = "Label1, Label2";
 "new_task_view.transmission_form.title.peer_limit" = "Peer limit";
-"new_task_view.transmission_form.prompt.peer_limit" = "0";
 "new_task_view.transmission_form.title.bandwidth_priority" = "Bandwidth priority";
-"new_task_view.transmission_form.prompt.bandwidth_priority" = "0";
 "new_task_view.synology_download_station_form.title.FTP_authentication" = "FTP authentication";
-"new_task_view.synology_download_station_form.prompt.username" = "FTP username";
-"new_task_view.synology_download_station_form.prompt.password" = "FTP password";
 "new_task_view.QNAP_download_station_form.title.temp_savepath" = "Temporary folder";
 "new_task_view.torrent_picker.button.select_files" = "Select files";
 "new_task_view.torrent_picker.button.reselect_files" = "Reselect files";
@@ -195,8 +219,8 @@
 "task.status.name.unknown" = "Unknown";
 
 // MARK: SummaryTableColumn
-"summary_table_column.title.uploadedSize" = "UP %@";
-"summary_table_column.title.downloadedSize" = "DL %@";
+"summary_table_column.title.uploaded_size" = "UP %@";
+"summary_table_column.title.downloaded_size" = "DL %@";
 "summary_table_column.title.ratio" = "Ratio %@";
 
 // MARK: Tag
@@ -214,8 +238,8 @@
 "tasks_view.table_column_title.size" = "Size";
 "tasks_view.table_column_title.progress" = "Progress";
 "tasks_view.table_column_title.status" = "Status";
-"tasks_view.table_column_title.downloadSpeed" = "DL Speed";
-"tasks_view.table_column_title.uploadSpeed" = "UP Speed";
+"tasks_view.table_column_title.download_speed" = "DL Speed";
+"tasks_view.table_column_title.upload_speed" = "UP Speed";
 "tasks_view.table_column_title.eta" = "ETA";
 "tasks_view.table_column_title.seeds" = "Seeds";
 "tasks_view.table_column_title.leechs" = "Leechs";