From d0e72ec3d70717e59f0bded2102d9f514a572dcd Mon Sep 17 00:00:00 2001 From: Morgan Wong Date: Sun, 28 Apr 2019 20:01:01 +0800 Subject: [PATCH 01/15] (Update) Fine tune Chinese translation More accurate meaning. --- resources/lang/cn/user.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/cn/user.php b/resources/lang/cn/user.php index 22be163e3b..f6625c53d2 100644 --- a/resources/lang/cn/user.php +++ b/resources/lang/cn/user.php @@ -314,7 +314,7 @@ 'upload-bon' => 'Upload Added From BON Store', 'upload-recorded' => 'Recorded Upload', 'upload-true' => 'True Upload', - 'uploads' => '上传', + 'uploads' => '发布', 'uploads-table' => '上传列表', 'user' => '用户', 'user-id' => '用户名', From f7da442c20a1d534212431290d63079b7049ca1d Mon Sep 17 00:00:00 2001 From: Morgan Wong Date: Sun, 28 Apr 2019 20:01:57 +0800 Subject: [PATCH 02/15] (Update) Fine tune Chinese translation More accurate meaning. --- resources/lang/tw/user.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/tw/user.php b/resources/lang/tw/user.php index 1092146260..c798cd50d0 100644 --- a/resources/lang/tw/user.php +++ b/resources/lang/tw/user.php @@ -314,7 +314,7 @@ 'upload-bon' => 'Upload Added From BON Store', 'upload-recorded' => 'Recorded Upload', 'upload-true' => 'True Upload', - 'uploads' => '上傳', + 'uploads' => '發佈', 'uploads-table' => '上傳列表', 'user' => '用戶', 'user-id' => '用戶名', From 132cbfbc7a3f1ca29169d9dc3b351e58ace76957 Mon Sep 17 00:00:00 2001 From: Morgan Wong Date: Sun, 28 Apr 2019 21:35:50 +0800 Subject: [PATCH 03/15] (Update) Align labels wordings minors. --- resources/views/user/filters/uploads.blade.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/views/user/filters/uploads.blade.php b/resources/views/user/filters/uploads.blade.php index d14d825c1d..6740c8e436 100644 --- a/resources/views/user/filters/uploads.blade.php +++ b/resources/views/user/filters/uploads.blade.php @@ -53,20 +53,20 @@ class="{{ config('other.font-awesome') }} fa-download"> {{ ($upload->created_at ? $upload->created_at->diffForHumans() : 'N/A') }} @if ($upload->isPending()) - PENDING + @lang('torrent.pending') @elseif ($upload->isApproved()) APPROVED + data-original-title="Moderated By {{ $upload->moderated->username }} {{ $upload->moderated_at->diffForHumans() }}">@lang('torrent.approved') @elseif ($upload->isRejected()) REJECTED + data-original-title="Moderated By {{ $upload->moderated->username }} {{ $upload->moderated_at->diffForHumans() }}">@lang('torrent.rejected') @endif @if ($upload->seeders + $upload->leechers == 0) - DEAD + @lang('graveyard.dead') @elseif ($upload->seeders >= 1) - ALIVE + @lang('torrent.alive') @elseif ($upload->leechers >= 1 + $upload->seeders = 0) RESEED @else From 2039d1caa0b3f991dff6ce43566367905b7e521f Mon Sep 17 00:00:00 2001 From: Morgan Wong Date: Sun, 28 Apr 2019 21:43:13 +0800 Subject: [PATCH 04/15] (Update) Align labels wordings minors. --- .../views/user/private/uploads.blade.php | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/resources/views/user/private/uploads.blade.php b/resources/views/user/private/uploads.blade.php index 53486ffe0c..1d6bab3fc3 100644 --- a/resources/views/user/private/uploads.blade.php +++ b/resources/views/user/private/uploads.blade.php @@ -59,37 +59,37 @@ class="l-breadcrumb-item-link">
- +
- +
@@ -105,7 +105,7 @@ class="l-breadcrumb-item-link">
- +
@@ -186,20 +186,20 @@ class="{{ config('other.font-awesome') }} fa-download"> {{ ($upload->created_at && $upload->created_at != null ? $upload->created_at->diffForHumans() : 'N/A') }} @if ($upload->isPending()) - PENDING + @lang('torrent.pending') @elseif ($upload->isApproved()) APPROVED + data-original-title="Moderated By {{ $upload->moderated->username }} {{ $upload->moderated_at->diffForHumans() }}">@lang('torrent.approved') @elseif ($upload->isRejected()) REJECTED + data-original-title="Moderated By {{ $upload->moderated->username }} {{ $upload->moderated_at->diffForHumans() }}">@lang('torrent.rejected') @endif @if ($upload->seeders + $upload->leechers == 0) - DEAD + @lang('graveyard.dead') @elseif ($upload->seeders >= 1) - ALIVE + @lang('torrent.alive') @elseif ($upload->leechers >= 1 + $upload->seeders = 0) RESEED @else From 15d097bbd3f304612baf7b1d63d34f3c6a84749c Mon Sep 17 00:00:00 2001 From: Morgan Wong Date: Sun, 28 Apr 2019 21:44:42 +0800 Subject: [PATCH 05/15] (Update) Align labels wordings minors. --- resources/lang/en/torrent.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/en/torrent.php b/resources/lang/en/torrent.php index fdc0b5766b..936a8ccd13 100644 --- a/resources/lang/en/torrent.php +++ b/resources/lang/en/torrent.php @@ -52,7 +52,7 @@ 'featured-desc' => 'Featured torrents are 100% Free and Double Upload!', 'featured-until' => 'This Is A Featured Torrent Until', 'file' => 'File', - 'filters' => 'Search Filters', + 'filters' => 'Filters', 'fl-tokens-left' => 'You have :tokens left', 'freeleech' => 'Freeleech', 'freeleech-token' => 'Freeleech Token', From 062e79cb53b3eca28cf96c1a68fac883527193f2 Mon Sep 17 00:00:00 2001 From: Morgan Wong Date: Sun, 28 Apr 2019 21:45:29 +0800 Subject: [PATCH 06/15] (Update) Align labels wordings minors. --- resources/lang/cn/torrent.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/cn/torrent.php b/resources/lang/cn/torrent.php index 55474b4f25..cb43e38ad6 100644 --- a/resources/lang/cn/torrent.php +++ b/resources/lang/cn/torrent.php @@ -52,7 +52,7 @@ 'featured-desc' => '精选资源是 100% 免费下载 及 双倍上传量收益!', 'featured-until' => '精选资源有效至', 'file' => '文件', - 'filters' => '过滤搜寻', + 'filters' => '过滤', 'fl-tokens-left' => '你拥有 :tokens 免费令', 'freeleech' => '免费', 'freeleech-token' => '免费令', From d16059f63a18f830af319140b062cdae8682fd57 Mon Sep 17 00:00:00 2001 From: Morgan Wong Date: Sun, 28 Apr 2019 21:46:05 +0800 Subject: [PATCH 07/15] (Update) Align labels wordings minors. --- resources/lang/tw/torrent.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/tw/torrent.php b/resources/lang/tw/torrent.php index 2e00773799..7def279963 100644 --- a/resources/lang/tw/torrent.php +++ b/resources/lang/tw/torrent.php @@ -52,7 +52,7 @@ 'featured-desc' => '精選資源是 100% 免費下載 及 雙倍上傳量收益!', 'featured-until' => '精選資源有效至', 'file' => '文件', - 'filters' => '過濾搜尋', + 'filters' => '過濾', 'fl-tokens-left' => '你擁有 :tokens 免費令', 'freeleech' => '免費', 'freeleech-token' => '免費令', From 38100797d0a94d6b4f03035c527a89a5635f5fd7 Mon Sep 17 00:00:00 2001 From: Morgan Wong Date: Sun, 28 Apr 2019 21:59:12 +0800 Subject: [PATCH 08/15] (Update) Align labels wordings minors. --- resources/views/user/private/downloads.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/user/private/downloads.blade.php b/resources/views/user/private/downloads.blade.php index 77494d9969..d0f2ee38a4 100644 --- a/resources/views/user/private/downloads.blade.php +++ b/resources/views/user/private/downloads.blade.php @@ -76,7 +76,7 @@ class="l-breadcrumb-item-link">
@endif
- +
From e713d049efc58bb878e62fc85195d141138e4e17 Mon Sep 17 00:00:00 2001 From: Morgan Wong Date: Sun, 28 Apr 2019 22:02:23 +0800 Subject: [PATCH 09/15] (Update) Align labels wordings minors. --- resources/views/user/private/seeds.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/user/private/seeds.blade.php b/resources/views/user/private/seeds.blade.php index 02b180b36e..c016fc1587 100644 --- a/resources/views/user/private/seeds.blade.php +++ b/resources/views/user/private/seeds.blade.php @@ -124,7 +124,7 @@ class="l-breadcrumb-item-link">
- +
From a2b9828ae590195e97f642d8bb953ca7a9e31c19 Mon Sep 17 00:00:00 2001 From: Morgan Wong Date: Sun, 28 Apr 2019 22:09:37 +0800 Subject: [PATCH 10/15] (Update) Align labels wordings minors. --- resources/views/user/private/active.blade.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/user/private/active.blade.php b/resources/views/user/private/active.blade.php index 630d47501a..1c560ed148 100644 --- a/resources/views/user/private/active.blade.php +++ b/resources/views/user/private/active.blade.php @@ -59,7 +59,7 @@ class="l-breadcrumb-item-link">
- +
- +
From 07bafa30a639a2c2c2faabccb0edb6878e2323a7 Mon Sep 17 00:00:00 2001 From: Morgan Wong Date: Sun, 28 Apr 2019 22:14:57 +0800 Subject: [PATCH 11/15] (Update) Fine tune Chinese translation More accurate meaning. --- resources/lang/cn/torrent.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/cn/torrent.php b/resources/lang/cn/torrent.php index cb43e38ad6..5518c926c3 100644 --- a/resources/lang/cn/torrent.php +++ b/resources/lang/cn/torrent.php @@ -128,7 +128,7 @@ 'ready' => '这文件可以下载', 'rejected' => '拒绝', 'released' => '发布', - 'remaining' => 'Remaining', + 'remaining' => '剩馀', 'request-reseed' => '要求续种', 'requires-reseed' => '需要续种', 'resurrections' => '救活', From 6380fef0644c28480ec86737bdc3f8ecce7651fd Mon Sep 17 00:00:00 2001 From: Morgan Wong Date: Sun, 28 Apr 2019 22:15:41 +0800 Subject: [PATCH 12/15] (Update) Fine tune Chinese translation More accurate meaning. --- resources/lang/tw/torrent.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/tw/torrent.php b/resources/lang/tw/torrent.php index 7def279963..b164c3241d 100644 --- a/resources/lang/tw/torrent.php +++ b/resources/lang/tw/torrent.php @@ -128,7 +128,7 @@ 'ready' => '這文件可以下載', 'rejected' => '拒絕', 'released' => '發佈', - 'remaining' => 'Remaining', + 'remaining' => '剩餘', 'request-reseed' => '要求續種', 'requires-reseed' => '需要續種', 'resurrections' => '救活', From ec3301148d81d6567120ea37ca3af98f2cef1363 Mon Sep 17 00:00:00 2001 From: Morgan Wong Date: Sun, 28 Apr 2019 22:20:49 +0800 Subject: [PATCH 13/15] (Update) Align labels wordings minors. --- resources/views/user/private/torrents.blade.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/user/private/torrents.blade.php b/resources/views/user/private/torrents.blade.php index 74a0e4d909..1a80b519df 100644 --- a/resources/views/user/private/torrents.blade.php +++ b/resources/views/user/private/torrents.blade.php @@ -58,7 +58,7 @@ class="l-breadcrumb-item-link">
- +
- +
From f3b080932b6b76ddb361c4a9d9588e252619129d Mon Sep 17 00:00:00 2001 From: Morgan Wong Date: Sun, 28 Apr 2019 22:23:51 +0800 Subject: [PATCH 14/15] (Update) Align labels wordings minors. --- resources/views/user/private/unsatisfieds.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/user/private/unsatisfieds.blade.php b/resources/views/user/private/unsatisfieds.blade.php index 0f1dbf28c2..9ce5305821 100644 --- a/resources/views/user/private/unsatisfieds.blade.php +++ b/resources/views/user/private/unsatisfieds.blade.php @@ -74,7 +74,7 @@ class="l-breadcrumb-item-link">
- +
From e98dc99838877b98223611b1f9e679993157b76e Mon Sep 17 00:00:00 2001 From: Morgan Wong Date: Sun, 28 Apr 2019 22:52:51 +0800 Subject: [PATCH 15/15] (Update) Tidy up buttons order Swap the position of Categories Button and Cards Button. More Comfortable. --- resources/views/torrent/buttons.blade.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/views/torrent/buttons.blade.php b/resources/views/torrent/buttons.blade.php index 121cb2a986..64860bc0f4 100644 --- a/resources/views/torrent/buttons.blade.php +++ b/resources/views/torrent/buttons.blade.php @@ -1,11 +1,11 @@
- - @lang('torrent.cards') - @lang('torrent.categories') + + @lang('torrent.cards') + @lang('torrent.groupings') @@ -21,4 +21,4 @@ @lang('torrent.filters')
-
\ No newline at end of file +