Sort by category title, feed title (#7702)

* Sort by category name, feed name
fix https://github.com/FreshRSS/FreshRSS/issues/7698
Note that sorting is done with the default SQL collation for now, meaning that lower-case vs. upper-case and diacritics are influencing the sorting order. Improvements left for future work.
Watch out that those sorting criteria are slower due to additional joins, additional requests, and poorer indexes.

* i18n:pl

Co-authored-by: Inverle <inverle@proton.me>

* i18n: nl

Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>

* Fix preserve sort

---------

Co-authored-by: Inverle <inverle@proton.me>
Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>

26 files changed, 208 insertions, 0 deletions

diff --git a/app/i18n/cs/index.php b/app/i18n/cs/index.php
index 3516da812..aa0c0df3b 100644
--- a/app/i18n/cs/index.php
+++ b/app/i18n/cs/index.php
@@ -77,8 +77,16 @@ return array(
 		'search_short' => 'Hledat',
 		'sort' => array(
 			'_' => 'Sorting criteria',	// TODO
+			'c' => array(
+				'name_asc' => 'Category, feed titles A→Z',	// TODO
+				'name_desc' => 'Category, feed titles Z→A',	// TODO
+			),
 			'date_asc' => 'Publication date 1→9',	// TODO
 			'date_desc' => 'Publication date 9→1',	// TODO
+			'f' => array(
+				'name_asc' => 'Feed title A→Z',	// TODO
+				'name_desc' => 'Feed title Z→A',	// TODO
+			),
 			'id_asc' => 'Freshly received last',	// TODO
 			'id_desc' => 'Freshly received first',	// TODO
 			'link_asc' => 'Link A→Z',	// TODO
diff --git a/app/i18n/de/index.php b/app/i18n/de/index.php
index 94d871ea7..681915519 100644
--- a/app/i18n/de/index.php
+++ b/app/i18n/de/index.php
@@ -77,8 +77,16 @@ return array(
 		'search_short' => 'Suchen',
 		'sort' => array(
 			'_' => 'Sorting criteria',	// TODO
+			'c' => array(
+				'name_asc' => 'Category, feed titles A→Z',	// TODO
+				'name_desc' => 'Category, feed titles Z→A',	// TODO
+			),
 			'date_asc' => 'Publication date 1→9',	// TODO
 			'date_desc' => 'Publication date 9→1',	// TODO
+			'f' => array(
+				'name_asc' => 'Feed title A→Z',	// TODO
+				'name_desc' => 'Feed title Z→A',	// TODO
+			),
 			'id_asc' => 'Freshly received last',	// TODO
 			'id_desc' => 'Freshly received first',	// TODO
 			'link_asc' => 'Link A→Z',	// TODO
diff --git a/app/i18n/el/index.php b/app/i18n/el/index.php
index 655846518..47b2a958d 100644
--- a/app/i18n/el/index.php
+++ b/app/i18n/el/index.php
@@ -77,8 +77,16 @@ return array(
 		'search_short' => 'Search',	// TODO
 		'sort' => array(
 			'_' => 'Sorting criteria',	// TODO
+			'c' => array(
+				'name_asc' => 'Category, feed titles A→Z',	// TODO
+				'name_desc' => 'Category, feed titles Z→A',	// TODO
+			),
 			'date_asc' => 'Publication date 1→9',	// TODO
 			'date_desc' => 'Publication date 9→1',	// TODO
+			'f' => array(
+				'name_asc' => 'Feed title A→Z',	// TODO
+				'name_desc' => 'Feed title Z→A',	// TODO
+			),
 			'id_asc' => 'Freshly received last',	// TODO
 			'id_desc' => 'Freshly received first',	// TODO
 			'link_asc' => 'Link A→Z',	// TODO
diff --git a/app/i18n/en-us/index.php b/app/i18n/en-us/index.php
index a80ccc56b..3bce04e8a 100644
--- a/app/i18n/en-us/index.php
+++ b/app/i18n/en-us/index.php
@@ -77,8 +77,16 @@ return array(
 		'search_short' => 'Search',	// IGNORE
 		'sort' => array(
 			'_' => 'Sorting criteria',	// IGNORE
+			'c' => array(
+				'name_asc' => 'Category, feed titles A→Z',	// IGNORE
+				'name_desc' => 'Category, feed titles Z→A',	// IGNORE
+			),
 			'date_asc' => 'Publication date 1→9',	// IGNORE
 			'date_desc' => 'Publication date 9→1',	// IGNORE
+			'f' => array(
+				'name_asc' => 'Feed title A→Z',	// IGNORE
+				'name_desc' => 'Feed title Z→A',	// IGNORE
+			),
 			'id_asc' => 'Freshly received last',	// IGNORE
 			'id_desc' => 'Freshly received first',	// IGNORE
 			'link_asc' => 'Link A→Z',	// IGNORE
diff --git a/app/i18n/en/index.php b/app/i18n/en/index.php
index 61ff073ae..c5404e6ce 100644
--- a/app/i18n/en/index.php
+++ b/app/i18n/en/index.php
@@ -77,8 +77,16 @@ return array(
 		'search_short' => 'Search',
 		'sort' => array(
 			'_' => 'Sorting criteria',
+			'c' => array(
+				'name_asc' => 'Category, feed titles A→Z',
+				'name_desc' => 'Category, feed titles Z→A',
+			),
 			'date_asc' => 'Publication date 1→9',
 			'date_desc' => 'Publication date 9→1',
+			'f' => array(
+				'name_asc' => 'Feed title A→Z',
+				'name_desc' => 'Feed title Z→A',
+			),
 			'id_asc' => 'Freshly received last',
 			'id_desc' => 'Freshly received first',
 			'link_asc' => 'Link A→Z',
diff --git a/app/i18n/es/index.php b/app/i18n/es/index.php
index b7e407df6..82b63898d 100644
--- a/app/i18n/es/index.php
+++ b/app/i18n/es/index.php
@@ -77,8 +77,16 @@ return array(
 		'search_short' => 'Buscar',
 		'sort' => array(
 			'_' => 'Sorting criteria',	// TODO
+			'c' => array(
+				'name_asc' => 'Category, feed titles A→Z',	// TODO
+				'name_desc' => 'Category, feed titles Z→A',	// TODO
+			),
 			'date_asc' => 'Publication date 1→9',	// TODO
 			'date_desc' => 'Publication date 9→1',	// TODO
+			'f' => array(
+				'name_asc' => 'Feed title A→Z',	// TODO
+				'name_desc' => 'Feed title Z→A',	// TODO
+			),
 			'id_asc' => 'Freshly received last',	// TODO
 			'id_desc' => 'Freshly received first',	// TODO
 			'link_asc' => 'Link A→Z',	// TODO
diff --git a/app/i18n/fa/index.php b/app/i18n/fa/index.php
index 77bb966a0..283bbf805 100644
--- a/app/i18n/fa/index.php
+++ b/app/i18n/fa/index.php
@@ -77,8 +77,16 @@ return array(
 		'search_short' => ' جستجو',
 		'sort' => array(
 			'_' => 'Sorting criteria',	// TODO
+			'c' => array(
+				'name_asc' => 'Category, feed titles A→Z',	// TODO
+				'name_desc' => 'Category, feed titles Z→A',	// TODO
+			),
 			'date_asc' => 'Publication date 1→9',	// TODO
 			'date_desc' => 'Publication date 9→1',	// TODO
+			'f' => array(
+				'name_asc' => 'Feed title A→Z',	// TODO
+				'name_desc' => 'Feed title Z→A',	// TODO
+			),
 			'id_asc' => 'Freshly received last',	// TODO
 			'id_desc' => 'Freshly received first',	// TODO
 			'link_asc' => 'Link A→Z',	// TODO
diff --git a/app/i18n/fi/index.php b/app/i18n/fi/index.php
index 7d8331e1c..f844caa86 100644
--- a/app/i18n/fi/index.php
+++ b/app/i18n/fi/index.php
@@ -77,8 +77,16 @@ return array(
 		'search_short' => 'Haku',
 		'sort' => array(
 			'_' => 'Sorting criteria',	// TODO
+			'c' => array(
+				'name_asc' => 'Category, feed titles A→Z',	// TODO
+				'name_desc' => 'Category, feed titles Z→A',	// TODO
+			),
 			'date_asc' => 'Publication date 1→9',	// TODO
 			'date_desc' => 'Publication date 9→1',	// TODO
+			'f' => array(
+				'name_asc' => 'Feed title A→Z',	// TODO
+				'name_desc' => 'Feed title Z→A',	// TODO
+			),
 			'id_asc' => 'Freshly received last',	// TODO
 			'id_desc' => 'Freshly received first',	// TODO
 			'link_asc' => 'Link A→Z',	// TODO
diff --git a/app/i18n/fr/index.php b/app/i18n/fr/index.php
index b4ebcb335..b6aae67fb 100644
--- a/app/i18n/fr/index.php
+++ b/app/i18n/fr/index.php
@@ -77,8 +77,16 @@ return array(
 		'search_short' => 'Rechercher',
 		'sort' => array(
 			'_' => 'Critère de tri',
+			'c' => array(
+				'name_asc' => 'Catégorie, flux (titres) A→Z',
+				'name_desc' => 'Catégorie, flux (titres) Z→A',
+			),
 			'date_asc' => 'Date de publication 1→9',
 			'date_desc' => 'Date de publication 9→1',
+			'f' => array(
+				'name_asc' => 'Flux (titre) A→Z',
+				'name_desc' => 'Flux (titre) Z→A',
+			),
 			'id_asc' => 'Reçus récemment en dernier',
 			'id_desc' => 'Reçus récemment en premier',
 			'link_asc' => 'Lien A→Z',
diff --git a/app/i18n/he/index.php b/app/i18n/he/index.php
index ad9b4f514..843b0b843 100644
--- a/app/i18n/he/index.php
+++ b/app/i18n/he/index.php
@@ -77,8 +77,16 @@ return array(
 		'search_short' => 'חיפוש',
 		'sort' => array(
 			'_' => 'Sorting criteria',	// TODO
+			'c' => array(
+				'name_asc' => 'Category, feed titles A→Z',	// TODO
+				'name_desc' => 'Category, feed titles Z→A',	// TODO
+			),
 			'date_asc' => 'Publication date 1→9',	// TODO
 			'date_desc' => 'Publication date 9→1',	// TODO
+			'f' => array(
+				'name_asc' => 'Feed title A→Z',	// TODO
+				'name_desc' => 'Feed title Z→A',	// TODO
+			),
 			'id_asc' => 'Freshly received last',	// TODO
 			'id_desc' => 'Freshly received first',	// TODO
 			'link_asc' => 'Link A→Z',	// TODO
diff --git a/app/i18n/hu/index.php b/app/i18n/hu/index.php
index fe7e74535..51604b9f1 100755
--- a/app/i18n/hu/index.php
+++ b/app/i18n/hu/index.php
@@ -77,8 +77,16 @@ return array(
 		'search_short' => 'Keresés',
 		'sort' => array(
 			'_' => 'Rendezési sorrend',
+			'c' => array(
+				'name_asc' => 'Category, feed titles A→Z',	// TODO
+				'name_desc' => 'Category, feed titles Z→A',	// TODO
+			),
 			'date_asc' => 'Kiadás dátuma 1→9',
 			'date_desc' => 'Kiadás dátuma 9→1',
+			'f' => array(
+				'name_asc' => 'Feed title A→Z',	// TODO
+				'name_desc' => 'Feed title Z→A',	// TODO
+			),
 			'id_asc' => 'Frissen fogadott utoljára',
 			'id_desc' => 'Frissen fogadott először',
 			'link_asc' => 'Link A→Z',	// TODO
diff --git a/app/i18n/id/index.php b/app/i18n/id/index.php
index f177c1c91..fe7e515fa 100644
--- a/app/i18n/id/index.php
+++ b/app/i18n/id/index.php
@@ -77,8 +77,16 @@ return array(
 		'search_short' => 'Cari',
 		'sort' => array(
 			'_' => 'Kriteria pengurutan',
+			'c' => array(
+				'name_asc' => 'Category, feed titles A→Z',	// TODO
+				'name_desc' => 'Category, feed titles Z→A',	// TODO
+			),
 			'date_asc' => 'Tanggal publikasi 1→9',
 			'date_desc' => 'Tanggal publikasi 9→1',
+			'f' => array(
+				'name_asc' => 'Feed title A→Z',	// TODO
+				'name_desc' => 'Feed title Z→A',	// TODO
+			),
 			'id_asc' => 'Yang baru diterima terakhir',
 			'id_desc' => 'Yang baru diterima paling awal',
 			'link_asc' => 'Tautan A→Z',
diff --git a/app/i18n/it/index.php b/app/i18n/it/index.php
index 6cbd457ca..a111c55ff 100644
--- a/app/i18n/it/index.php
+++ b/app/i18n/it/index.php
@@ -77,8 +77,16 @@ return array(
 		'search_short' => 'Cerca',
 		'sort' => array(
 			'_' => 'Ordina per',
+			'c' => array(
+				'name_asc' => 'Category, feed titles A→Z',	// TODO
+				'name_desc' => 'Category, feed titles Z→A',	// TODO
+			),
 			'date_asc' => 'Data di pubblicazione 1→9',
 			'date_desc' => 'Data di pubblicazione 9→1',
+			'f' => array(
+				'name_asc' => 'Feed title A→Z',	// TODO
+				'name_desc' => 'Feed title Z→A',	// TODO
+			),
 			'id_asc' => 'Dal meno recente',
 			'id_desc' => 'Dal più recente',
 			'link_asc' => 'Link A→Z',	// IGNORE
diff --git a/app/i18n/ja/index.php b/app/i18n/ja/index.php
index 69b5b30db..30543572b 100644
--- a/app/i18n/ja/index.php
+++ b/app/i18n/ja/index.php
@@ -77,8 +77,16 @@ return array(
 		'search_short' => '検索',
 		'sort' => array(
 			'_' => '並べ替え',
+			'c' => array(
+				'name_asc' => 'Category, feed titles A→Z',	// TODO
+				'name_desc' => 'Category, feed titles Z→A',	// TODO
+			),
 			'date_asc' => '公開日順 1→9',
 			'date_desc' => '公開日順 9→1',
+			'f' => array(
+				'name_asc' => 'Feed title A→Z',	// TODO
+				'name_desc' => 'Feed title Z→A',	// TODO
+			),
 			'id_asc' => '新着を最後に並べる',
 			'id_desc' => '新着を最初に並べる',
 			'link_asc' => 'リンクURL順 A→Z',
diff --git a/app/i18n/ko/index.php b/app/i18n/ko/index.php
index 9c1387499..c5190211c 100644
--- a/app/i18n/ko/index.php
+++ b/app/i18n/ko/index.php
@@ -77,8 +77,16 @@ return array(
 		'search_short' => '검색',
 		'sort' => array(
 			'_' => 'Sorting criteria',	// TODO
+			'c' => array(
+				'name_asc' => 'Category, feed titles A→Z',	// TODO
+				'name_desc' => 'Category, feed titles Z→A',	// TODO
+			),
 			'date_asc' => 'Publication date 1→9',	// TODO
 			'date_desc' => 'Publication date 9→1',	// TODO
+			'f' => array(
+				'name_asc' => 'Feed title A→Z',	// TODO
+				'name_desc' => 'Feed title Z→A',	// TODO
+			),
 			'id_asc' => 'Freshly received last',	// TODO
 			'id_desc' => 'Freshly received first',	// TODO
 			'link_asc' => 'Link A→Z',	// TODO
diff --git a/app/i18n/lv/index.php b/app/i18n/lv/index.php
index 72998ae2e..ba66438d8 100644
--- a/app/i18n/lv/index.php
+++ b/app/i18n/lv/index.php
@@ -77,8 +77,16 @@ return array(
 		'search_short' => 'Meklēt',
 		'sort' => array(
 			'_' => 'Sorting criteria',	// TODO
+			'c' => array(
+				'name_asc' => 'Category, feed titles A→Z',	// TODO
+				'name_desc' => 'Category, feed titles Z→A',	// TODO
+			),
 			'date_asc' => 'Publication date 1→9',	// TODO
 			'date_desc' => 'Publication date 9→1',	// TODO
+			'f' => array(
+				'name_asc' => 'Feed title A→Z',	// TODO
+				'name_desc' => 'Feed title Z→A',	// TODO
+			),
 			'id_asc' => 'Freshly received last',	// TODO
 			'id_desc' => 'Freshly received first',	// TODO
 			'link_asc' => 'Link A→Z',	// TODO
diff --git a/app/i18n/nl/index.php b/app/i18n/nl/index.php
index 5b1600370..ebf3c3123 100644
--- a/app/i18n/nl/index.php
+++ b/app/i18n/nl/index.php
@@ -77,8 +77,16 @@ return array(
 		'search_short' => 'Zoeken',
 		'sort' => array(
 			'_' => 'Sorteercriteria',
+			'c' => array(
+				'name_asc' => 'Categorie, feedtitels A→Z',
+				'name_desc' => 'Categorie, feedtitels Z→A',
+			),
 			'date_asc' => 'Publicatiedatum 1→9',
 			'date_desc' => 'Publicatiedatum 9→1',
+			'f' => array(
+				'name_asc' => 'Feedtitel A→Z',
+				'name_desc' => 'Feedtitel Z→A',
+			),
 			'id_asc' => 'Nieuw ontvangen laatst',
 			'id_desc' => 'Nieuw ontvangen eerst',
 			'link_asc' => 'Link A→Z',	// IGNORE
diff --git a/app/i18n/oc/index.php b/app/i18n/oc/index.php
index 0dbaeb16d..35479da95 100644
--- a/app/i18n/oc/index.php
+++ b/app/i18n/oc/index.php
@@ -77,8 +77,16 @@ return array(
 		'search_short' => 'Recercar',
 		'sort' => array(
 			'_' => 'Sorting criteria',	// TODO
+			'c' => array(
+				'name_asc' => 'Category, feed titles A→Z',	// TODO
+				'name_desc' => 'Category, feed titles Z→A',	// TODO
+			),
 			'date_asc' => 'Publication date 1→9',	// TODO
 			'date_desc' => 'Publication date 9→1',	// TODO
+			'f' => array(
+				'name_asc' => 'Feed title A→Z',	// TODO
+				'name_desc' => 'Feed title Z→A',	// TODO
+			),
 			'id_asc' => 'Freshly received last',	// TODO
 			'id_desc' => 'Freshly received first',	// TODO
 			'link_asc' => 'Link A→Z',	// TODO
diff --git a/app/i18n/pl/index.php b/app/i18n/pl/index.php
index b4cab9b90..850294bee 100644
--- a/app/i18n/pl/index.php
+++ b/app/i18n/pl/index.php
@@ -77,8 +77,16 @@ return array(
 		'search_short' => 'Szukaj',
 		'sort' => array(
 			'_' => 'Kryteria sortowania',
+			'c' => array(
+				'name_asc' => 'Tytuł kategorii i kanału A→Z',
+				'name_desc' => 'Tytuł kategorii i kanału Z→A',
+			),
 			'date_asc' => 'Data publikacji 1→9',
 			'date_desc' => 'Data publikacji 9→1',
+			'f' => array(
+				'name_asc' => 'Tytuł kanału A→Z',
+				'name_desc' => 'Tytuł kanału Z→A',
+			),
 			'id_asc' => 'Najpożniej otrzymane',
 			'id_desc' => 'Najwcześniej otrzymane',
 			'link_asc' => 'Odnośnik A→Z',
diff --git a/app/i18n/pt-br/index.php b/app/i18n/pt-br/index.php
index 17b2aa8d9..8623574c9 100644
--- a/app/i18n/pt-br/index.php
+++ b/app/i18n/pt-br/index.php
@@ -77,8 +77,16 @@ return array(
 		'search_short' => 'Buscar',
 		'sort' => array(
 			'_' => 'Sorting criteria',	// TODO
+			'c' => array(
+				'name_asc' => 'Category, feed titles A→Z',	// TODO
+				'name_desc' => 'Category, feed titles Z→A',	// TODO
+			),
 			'date_asc' => 'Publication date 1→9',	// TODO
 			'date_desc' => 'Publication date 9→1',	// TODO
+			'f' => array(
+				'name_asc' => 'Feed title A→Z',	// TODO
+				'name_desc' => 'Feed title Z→A',	// TODO
+			),
 			'id_asc' => 'Freshly received last',	// TODO
 			'id_desc' => 'Freshly received first',	// TODO
 			'link_asc' => 'Link A→Z',	// TODO
diff --git a/app/i18n/pt-pt/index.php b/app/i18n/pt-pt/index.php
index 914649c83..c1fd4344d 100644
--- a/app/i18n/pt-pt/index.php
+++ b/app/i18n/pt-pt/index.php
@@ -77,8 +77,16 @@ return array(
 		'search_short' => 'Pesquisar',
 		'sort' => array(
 			'_' => 'Sorting criteria',	// TODO
+			'c' => array(
+				'name_asc' => 'Category, feed titles A→Z',	// TODO
+				'name_desc' => 'Category, feed titles Z→A',	// TODO
+			),
 			'date_asc' => 'Publication date 1→9',	// TODO
 			'date_desc' => 'Publication date 9→1',	// TODO
+			'f' => array(
+				'name_asc' => 'Feed title A→Z',	// TODO
+				'name_desc' => 'Feed title Z→A',	// TODO
+			),
 			'id_asc' => 'Freshly received last',	// TODO
 			'id_desc' => 'Freshly received first',	// TODO
 			'link_asc' => 'Link A→Z',	// TODO
diff --git a/app/i18n/ru/index.php b/app/i18n/ru/index.php
index 952d32c49..35fed08ca 100644
--- a/app/i18n/ru/index.php
+++ b/app/i18n/ru/index.php
@@ -77,8 +77,16 @@ return array(
 		'search_short' => 'Поиск',
 		'sort' => array(
 			'_' => 'Sorting criteria',	// TODO
+			'c' => array(
+				'name_asc' => 'Category, feed titles A→Z',	// TODO
+				'name_desc' => 'Category, feed titles Z→A',	// TODO
+			),
 			'date_asc' => 'Publication date 1→9',	// TODO
 			'date_desc' => 'Publication date 9→1',	// TODO
+			'f' => array(
+				'name_asc' => 'Feed title A→Z',	// TODO
+				'name_desc' => 'Feed title Z→A',	// TODO
+			),
 			'id_asc' => 'Freshly received last',	// TODO
 			'id_desc' => 'Freshly received first',	// TODO
 			'link_asc' => 'Link A→Z',	// TODO
diff --git a/app/i18n/sk/index.php b/app/i18n/sk/index.php
index d4392c569..5810af5f8 100644
--- a/app/i18n/sk/index.php
+++ b/app/i18n/sk/index.php
@@ -77,8 +77,16 @@ return array(
 		'search_short' => 'Hľadať',
 		'sort' => array(
 			'_' => 'Sorting criteria',	// TODO
+			'c' => array(
+				'name_asc' => 'Category, feed titles A→Z',	// TODO
+				'name_desc' => 'Category, feed titles Z→A',	// TODO
+			),
 			'date_asc' => 'Publication date 1→9',	// TODO
 			'date_desc' => 'Publication date 9→1',	// TODO
+			'f' => array(
+				'name_asc' => 'Feed title A→Z',	// TODO
+				'name_desc' => 'Feed title Z→A',	// TODO
+			),
 			'id_asc' => 'Freshly received last',	// TODO
 			'id_desc' => 'Freshly received first',	// TODO
 			'link_asc' => 'Link A→Z',	// TODO
diff --git a/app/i18n/tr/index.php b/app/i18n/tr/index.php
index a7ed2eaa7..01ad218ad 100644
--- a/app/i18n/tr/index.php
+++ b/app/i18n/tr/index.php
@@ -77,8 +77,16 @@ return array(
 		'search_short' => 'Ara',
 		'sort' => array(
 			'_' => 'Sıralama kriteri',
+			'c' => array(
+				'name_asc' => 'Category, feed titles A→Z',	// TODO
+				'name_desc' => 'Category, feed titles Z→A',	// TODO
+			),
 			'date_asc' => 'Yayın tarihi 1→9',
 			'date_desc' => 'Yayın tarihi 9→1',
+			'f' => array(
+				'name_asc' => 'Feed title A→Z',	// TODO
+				'name_desc' => 'Feed title Z→A',	// TODO
+			),
 			'id_asc' => 'Son alınanlar en sonda',
 			'id_desc' => 'Son alınanlar başta',
 			'link_asc' => 'Bağlantı A→Z',
diff --git a/app/i18n/zh-cn/index.php b/app/i18n/zh-cn/index.php
index f02326ec9..cd389f8b8 100644
--- a/app/i18n/zh-cn/index.php
+++ b/app/i18n/zh-cn/index.php
@@ -77,8 +77,16 @@ return array(
 		'search_short' => '搜索',
 		'sort' => array(
 			'_' => 'Sorting criteria',	// TODO
+			'c' => array(
+				'name_asc' => 'Category, feed titles A→Z',	// TODO
+				'name_desc' => 'Category, feed titles Z→A',	// TODO
+			),
 			'date_asc' => 'Publication date 1→9',	// TODO
 			'date_desc' => 'Publication date 9→1',	// TODO
+			'f' => array(
+				'name_asc' => 'Feed title A→Z',	// TODO
+				'name_desc' => 'Feed title Z→A',	// TODO
+			),
 			'id_asc' => 'Freshly received last',	// TODO
 			'id_desc' => 'Freshly received first',	// TODO
 			'link_asc' => 'Link A→Z',	// TODO
diff --git a/app/i18n/zh-tw/index.php b/app/i18n/zh-tw/index.php
index 99a4c718b..2122bc4f0 100644
--- a/app/i18n/zh-tw/index.php
+++ b/app/i18n/zh-tw/index.php
@@ -77,8 +77,16 @@ return array(
 		'search_short' => '搜尋',
 		'sort' => array(
 			'_' => 'Sorting criteria',	// TODO
+			'c' => array(
+				'name_asc' => 'Category, feed titles A→Z',	// TODO
+				'name_desc' => 'Category, feed titles Z→A',	// TODO
+			),
 			'date_asc' => 'Publication date 1→9',	// TODO
 			'date_desc' => 'Publication date 9→1',	// TODO
+			'f' => array(
+				'name_asc' => 'Feed title A→Z',	// TODO
+				'name_desc' => 'Feed title Z→A',	// TODO
+			),
 			'id_asc' => 'Freshly received last',	// TODO
 			'id_desc' => 'Freshly received first',	// TODO
 			'link_asc' => 'Link A→Z',	// TODO