choose bookmarklet reading order

2013-07-03 07:32:18 +02:00
parent 55d342861f
commit 4565a7c43f
30 changed files with 221 additions and 162 deletions
--- a/src/main/java/com/commafeed/frontend/pages/NextUnreadRedirectPage.java
+++ b/src/main/java/com/commafeed/frontend/pages/NextUnreadRedirectPage.java
@@ -38,10 +38,11 @@ public class NextUnreadRedirectPage extends WebPage {
 	public NextUnreadRedirectPage(PageParameters params) {
 		String categoryId = params.get(PARAM_CATEGORYID).toString();
 		String orderParam = params.get(PARAM_READINGORDER).toString();
+		
 		User user = CommaFeedSession.get().getUser();
 		ReadingOrder order = ReadingOrder.desc;
 		
-		if (!StringUtils.isBlank(orderParam) && orderParam.equals("asc")) {
+		if (StringUtils.equals(orderParam, "asc")) {
 			order = ReadingOrder.asc;
 		}

--- a/src/main/resources/i18n/ar.properties
+++ b/src/main/resources/i18n/ar.properties
@@ -67,7 +67,7 @@ settings.custom_css=Custom CSS

 details.feed_details=Feed details
 details.url=URL
-details.website=Website ####### Needs translation
+details.website=Website ####### Needs translation
 details.name=Name
 details.category=Category
 details.position=Position
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Chrome extension
 about.goodies.firefox_extension=Firefox extension
 about.goodies.opera_extension=Opera extension
 about.goodies.subscribe_bookmarklet=Add subscription bookmarklet (click)
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Next unread item bookmarklet (drag to bookmark bar)
 about.translation=Translation
 about.translation.message=We need your help to translate CommaFeed.
--- a/src/main/resources/i18n/cs.properties
+++ b/src/main/resources/i18n/cs.properties
@@ -67,7 +67,7 @@ settings.custom_css=Vlastní téma (CSS)

 details.feed_details=Detaily odběru
 details.url=URL odkaz
-details.website=Website ####### Needs translation
+details.website=Website ####### Needs translation
 details.name=Název
 details.category=Kategorie
 details.position=Pozice
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Rozšíření pro Chrome
 about.goodies.firefox_extension=Rozšíření pro Firefox
 about.goodies.opera_extension=Rozšíření pro Operu
 about.goodies.subscribe_bookmarklet=Přidat záložku odběru (klik)
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Záložka následující nepřečtené položky (přetáhnout k záložkám)
 about.translation=Překlad
 about.translation.message=Pomožte nám s překladem CommaFeed.
--- a/src/main/resources/i18n/cy.properties
+++ b/src/main/resources/i18n/cy.properties
@@ -67,7 +67,7 @@ settings.custom_css=CSS wedi'i addasu

 details.feed_details=Manylion ffrwd
 details.url=URL
-details.website=Website ####### Needs translation
+details.website=Website ####### Needs translation
 details.name=Enw
 details.category=Categori
 details.position=Safle
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=estyniad Chrome
 about.goodies.firefox_extension=estyniad Firefox
 about.goodies.opera_extension=estyniad Opera
 about.goodies.subscribe_bookmarklet=Ychwanegu botwm tanysgrifio (clicio)
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Botwm eitem nesaf heb ei ddarllen (llusgo i far nodau)
 about.translation=Translation
 about.translation.message=Rydym ni angen dy help i gyfieithu CommaFeed.
--- a/src/main/resources/i18n/da.properties
+++ b/src/main/resources/i18n/da.properties
@@ -67,7 +67,7 @@ settings.custom_css=Brugerdefineret CSS

 details.feed_details=Abonnementsdetaljer
 details.url=URL
-details.website=Website ####### Needs translation
+details.website=Website ####### Needs translation
 details.name=Navn
 details.category=Kategori
 details.position=Position
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Chrome udvidelse
 about.goodies.firefox_extension=Firefox udvidelse
 about.goodies.opera_extension=Opera udvidelse
 about.goodies.subscribe_bookmarklet=Tilføj abonnoment bogmærkeprogram (click)
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Næste ulæste artikel bogmærkeprogram (træk til bogmærkebaren)
 about.translation=Oversættelse
 about.translation.message=Vi har brug for din hjælp til at oversætte CommaFeed.
--- a/src/main/resources/i18n/de.properties
+++ b/src/main/resources/i18n/de.properties
@@ -67,7 +67,7 @@ settings.custom_css=Eigenes CSS

 details.feed_details=Feed details
 details.url=URL
-details.website=Website ####### Needs translation
+details.website=Website ####### Needs translation
 details.name=Name
 details.category=Kategorie
 details.position=Position
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Chrome Erweiterung
 about.goodies.firefox_extension=Firefox Add-on
 about.goodies.opera_extension=Opera Add-on
 about.goodies.subscribe_bookmarklet=Abonnieren-bookmarklet (klicken)
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Nächster ungelesener Artikel-bookmarklet (in Lesezeichenleiste ziehen)
 about.translation=Übersetzung
 about.translation.message=Wir brauchen deine Hilfe zur Übersetzung von CommaFeed.
--- a/src/main/resources/i18n/en.properties
+++ b/src/main/resources/i18n/en.properties
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Chrome extension
 about.goodies.firefox_extension=Firefox extension
 about.goodies.opera_extension=Opera extension
 about.goodies.subscribe_bookmarklet=Add subscription bookmarklet (click)
+about.goodies.subscribe_bookmarklet_asc=Oldest first
+about.goodies.subscribe_bookmarklet_desc=Newest first
 about.goodies.next_unread_bookmarklet=Next unread item bookmarklet (drag to bookmark bar)
 about.translation=Translation
 about.translation.message=We need your help to translate CommaFeed.
--- a/src/main/resources/i18n/es.properties
+++ b/src/main/resources/i18n/es.properties
@@ -67,7 +67,7 @@ settings.custom_css=CSS Personalizado

 details.feed_details=Detalles de Canales
 details.url=URL
-details.website=Website ####### Needs translation
+details.website=Website ####### Needs translation
 details.name=Nombre
 details.category=Categoría
 details.position=Position ####### Needs translation
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Extensión de Chrome
 about.goodies.firefox_extension=Extensión de Firefox
 about.goodies.opera_extension=Opera extension ####### Needs translation
 about.goodies.subscribe_bookmarklet=Add subscription bookmarklet (click) ####### Needs translation
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Next unread item bookmarklet (drag to bookmark bar) ####### Needs translation
 about.translation=Traducción
 about.translation.message=Necesitamos tu ayuda para ayudar a traducir CommaFeed.
--- a/src/main/resources/i18n/fa.properties
+++ b/src/main/resources/i18n/fa.properties
@@ -67,7 +67,7 @@ settings.custom_css=سی‌اس‌اس شخصی‌سازی‌شده

 details.feed_details=جزئیات خوراک
 details.url=نشانی
-details.website=وب‌گاه
+details.website=وب‌گاه
 details.name=نام
 details.category=دسته
 details.position=موقعیت
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=افزونهٔ کروم
 about.goodies.firefox_extension=افزونهٔ فایرفاکس
 about.goodies.opera_extension=افزونهٔ اپرا
 about.goodies.subscribe_bookmarklet=افزودن بوک‌مارک‌لت اشتراک (با کلیک)
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=بوک‌مارک‌لت مطلب خوانده نشدهٔ بعدی(با کشیدن و رهاکردن در نوار بوک‌مارک‌لت)
 about.translation=ترجمه
 about.translation.message=ما به کمک شما برای ترجمهٔ کامافید نیازمدیم.
--- a/src/main/resources/i18n/fi.properties
+++ b/src/main/resources/i18n/fi.properties
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Chrome-laajennus
 about.goodies.firefox_extension=Firefox-laajennus
 about.goodies.opera_extension=Opera-laajennus
 about.goodies.subscribe_bookmarklet=Lisää tilaus -kirjanmerkki (klikkaa) 
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Seuraava lukematon otsikko -kirjanmerkki (raahaa kirjanmerkkipalkkiin)
 about.translation=Kääntäminen
 about.translation.message=Tarvitsemme apuasi CommaFeedin kääntämiseksi.
--- a/src/main/resources/i18n/fr.properties
+++ b/src/main/resources/i18n/fr.properties
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Extension Chrome
 about.goodies.firefox_extension=Extension Firefox
 about.goodies.opera_extension=Extension Opera
 about.goodies.subscribe_bookmarklet=Bookmarklet d'ajout d'abonnement
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Bookmarklet vers le prochain article non-lu
 about.translation=Traduction
 about.translation.message=Nous avons besoin d'aide pour traduire CommaFeed.
--- a/src/main/resources/i18n/gl.properties
+++ b/src/main/resources/i18n/gl.properties
@@ -67,7 +67,7 @@ settings.custom_css=CSS Personalizado

 details.feed_details=Detalles de fontes
 details.url=URL
-details.website=Website ####### Needs translation
+details.website=Website ####### Needs translation
 details.name=Nome
 details.category=Categoría
 details.position=Position ####### Needs translation
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Engadido para Chrome
 about.goodies.firefox_extension=Engadido para Firefox
 about.goodies.opera_extension=Engadido para Opera
 about.goodies.subscribe_bookmarklet=Engadir bookmarklet para suscrición(click)
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Bookmarklet  de seguinte elemento non lido (arrastre a barra de marcadores)
 about.translation=Tradución
 about.translation.message=Precisamos a túa axuda para traducir CommaFeed.
--- a/src/main/resources/i18n/glk.properties
+++ b/src/main/resources/i18n/glk.properties
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=کرؤمˇ علاوه
 about.goodies.firefox_extension=فایرفاکسˇ علاوه
 about.goodies.opera_extension=اؤپرا علاوه
 about.goodies.subscribe_bookmarklet=افزودن بوک‌مارک‌لت اشتراک (با کلیک)
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=بوک‌مارک‌لت مطلب خوانده نشدهٔ بعدی(با کشیدن و رهاکردن در نوار بوک‌مارک‌لت)
 about.translation=واگردان
 about.translation.message=أمه شیمه ایلجاره کامافیدˇ واگردانˇ مئن خأییم.
--- a/src/main/resources/i18n/hu.properties
+++ b/src/main/resources/i18n/hu.properties
@@ -67,7 +67,7 @@ settings.custom_css=Saját CSS

 details.feed_details=Hírcsatorna részletei
 details.url=URL
-details.website=Website ####### Needs translation
+details.website=Website ####### Needs translation
 details.name=Név
 details.category=Kategória
 details.position=Position ####### Needs translation
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Chrome bővítmény
 about.goodies.firefox_extension=Firefox kiterjesztés
 about.goodies.opera_extension=Opera kiterjesztés
 about.goodies.subscribe_bookmarklet=Feliratkozás bookmarklet hozzáadása (klikkeléssel)
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Következő olvasatlan elem bookmarklet (húzza fel a könyvjelzősávba)
 about.translation=Fordítás
 about.translation.message=Segítségét kérjük a CommaFeed fordításához.
--- a/src/main/resources/i18n/it.properties
+++ b/src/main/resources/i18n/it.properties
@@ -67,7 +67,7 @@ settings.custom_css=Css modificato

 details.feed_details=Dettagli feed
 details.url=URL
-details.website=Website ####### Needs translation
+details.website=Website ####### Needs translation
 details.name=Nome
 details.category=Categoria
 details.position=Posizione 
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Estenzione per Chrome
 about.goodies.firefox_extension=Estensione per Firefox
 about.goodies.opera_extension=Estensione per Opera
 about.goodies.subscribe_bookmarklet=Add subscription bookmarklet (click) ####### Needs translation
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Next unread item bookmarklet (drag to bookmark bar) ####### Needs translation
 about.translation=Traduzioni
 about.translation.message=Abbiamo bisogno del tuo aiuto per tradurre CommaFeed.
--- a/src/main/resources/i18n/ko.properties
+++ b/src/main/resources/i18n/ko.properties
@@ -67,7 +67,7 @@ settings.custom_css=커스톰 CSS

 details.feed_details=피드 세부
 details.url=유알엘
-details.website=Website ####### Needs translation
+details.website=Website ####### Needs translation
 details.name=이름
 details.category=카테고리
 details.position=Position ####### Needs translation
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Chrome extension ####### Needs translation
 about.goodies.firefox_extension=Firefox extension ####### Needs translation
 about.goodies.opera_extension=Opera extension ####### Needs translation
 about.goodies.subscribe_bookmarklet=Add subscription bookmarklet (click) ####### Needs translation
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Next unread item bookmarklet (drag to bookmark bar) ####### Needs translation
 about.translation=번역
 about.translation.message=CommaFeed를 번역할려면 당신의 도움이 필요합니다.
--- a/src/main/resources/i18n/ms.properties
+++ b/src/main/resources/i18n/ms.properties
@@ -1,137 +1,140 @@
-global.save=Save
-global.cancel=Batal
-global.delete=Padam
-global.required=Wajib
-global.download=Muat turun
-global.link=Pautan
-global.bookmark=Bookmark
-global.close=Tutup
-
-tree.subscribe=Langgan
-tree.import=Import
-tree.new_category=Kategori Baru
-tree.all=Semua
-tree.starred=Dibintang
-
-subscribe.feed_url=URL Feed
-subscribe.feed_name=Nama Feed
-subscribe.category=Kategori
-
-import.google_reader_prefix=Import feed dari 
-import.google_reader_suffix= akaun.
-import.google_download=Sebagai alternatif, muat naik fail subscriptions.xml anda.
-import.google_download_link=Muat turun dari sini
-import.xml_file=Fail XML
-
-new_category.name=Nama
-new_category.parent=Induk
-
-toolbar.unread=Belum Dibaca
-toolbar.all=Semua
-toolbar.previous_entry=Sebelumnya
-toolbar.next_entry=Selepasnya
-toolbar.refresh=Refresh
-toolbar.sort_by_asc_desc=Aturkan mengikut tarikh (baru/lama)
-toolbar.titles_only=Tajuk sahaja
-toolbar.expanded_view=Wide view
-toolbar.mark_all_as_read=Tanda kesemuanya telah dibaca
-toolbar.mark_all_older_day=Lebih lama daripada sehari
-toolbar.mark_all_older_week=Lebih lama daripada seminggu
-toolbar.mark_all_older_two_weeks=Lebih lama daripada dua minggu
-toolbar.settings=Setting
-toolbar.profile=Profil
-toolbar.admin=Admin
-toolbar.about=About
-toolbar.logout=Logout
-toolbar.donate=Derma
-
-view.entry_author=oleh  
-view.error_while_loading_feed=Kesilapan semasa memuat turun feed ini
-view.keep_unread=Simpan tidak dibaca
-view.no_unread_items=tiada item yang belum dibaca.
-
-feedsearch.hint=Taipkan langganan...
-feedsearch.help=Guna kekunci Return untuk membuat pilihan dan kekunci arah untuk menavigasi.
-feedsearch.result_prefix=Langganan anda:
-
-settings.general=Setting am
-settings.general.language=Bahasa
-settings.general.language.contribute=Sumbang penterjemahan
-settings.general.show_unread=Tunjuk semua feed dan kategori yang telah dibaca
-settings.general.social_buttons=Tunjuk social sharing
-settings.general.scroll_marks=Dalam wide view, tanda item dibaca ketika scrolling
-settings.appearance=Rupa
-settings.theme=Tema
-settings.submit_your_theme=Muat naik tema anda
-settings.custom_css=Custom CSS
-
-details.feed_details=Butir-butir Feed
-details.url=URL
-details.website=Website ####### Needs translation
-details.name=Nama
-details.category=Kategori
-details.position=Posisi
-details.last_refresh=Refresh terakhir
-details.next_refresh=Refresh seterusnya
-details.queued_for_refresh=Diaturkan untuk refresh
-details.feed_url=URL Feed
-details.generate_api_key_first=Janakan API key dalam profil anda dahulu.
-details.unsubscribe=Hentikan langganan
-details.category_details=Butir-butir kategori
-details.parent_category=Kategori induk
-
-profile.user_name=User name
-profile.email=E-mel
-profile.change_password=Tukar kata laluan
-profile.confirm_password=Sahkan kata laluan
-profile.minimum_6_chars=Minimum 6 huruf
-profile.passwords_do_not_match=Kata laluan tidak sama
-profile.api_key=API key
-profile.api_key_not_generated=Belum dijana
-profile.generate_new_api_key=Jana API key baru
-profile.generate_new_api_key_info=Pertukaran kata laluan akan menjanakan API key yang baru
-profile.opml_export=Export OPML
-profile.delete_account=Padam akaun
-
-about.rest_api=REST API
-about.keyboard_shortcuts=Pintasan papan kekunci
-about.line1_prefix=CommaFeed adalah projek open-source. Sources are berada di  
-about.line1_suffix=.
-about.line2_prefix=Jika anda menghadapi masalah, sila laporkan di halaman isu-isu di  
-about.line2_suffix=\ projek.
-about.line3=Jika anda suka projek ini, anda boleh menbuat dermaan kepada pengaturcara untuk membantu menampung kos laman web ini.
-about.line4=Jika anda guna bitcoin, halamannya adalah 
-about.goodies=Goodies
-about.goodies.android_app=Android app
-about.goodies.subscribe_url=URL melanggan
-about.goodies.chrome_extension=Chrome extension
-about.goodies.firefox_extension=Firefox extension
-about.goodies.opera_extension=Opera extension
-about.goodies.subscribe_bookmarklet=Jana bookmarklet langganan (klik)
-about.goodies.next_unread_bookmarklet=Item bookmarklet yang belum dibaca seterusnya (seret ke bookmark bar)
-about.translation=Terjemahan
-about.translation.message=Kami perlukan bantuan anda untuk menterjemahkan CommaFeed.
-about.translation.link=Bagaimana mengyumbang penterjemahan.
-about.announcements=Pengumuman
-about.rest_api.line1=CommaFeed diaturcarakan dengan JAX-RS dan AngularJS. Oleh itu, REST API boleh didapati.
-about.rest_api.link_to_documentation=Pautan ke dokumentasi.
-
-about.shortcuts.mouse_middleclick=Klik tengah
-about.shortcuts.open_next_entry=buka item seterusya
-about.shortcuts.open_previous_entry=buka item sebelumnya
-about.shortcuts.spacebar=space/shift+space
-about.shortcuts.move_page_down_up=Gerak halaman ke bawah/atas
-about.shortcuts.focus_next_entry=fokus kepada item seterusnya tanpa membuka
-about.shortcuts.focus_previous_entry=fokus kepada item sebelumnya tanpa membuka
-about.shortcuts.open_next_feed=buka feed atau kategori seterusnya
-about.shortcuts.open_previous_feed=buka feed atau kategori sebelumnya
-about.shortcuts.open_close_current_entry=buka/tutup entry kini
-about.shortcuts.open_current_entry_in_new_window=buka entry kini di window yang baru
-about.shortcuts.open_current_entry_in_new_window_background=buka entry kini di window baru  di latar belakang
-about.shortcuts.star_unstar=bintang/nyah-bintang entry kini
-about.shortcuts.mark_current_entry=tanda entry kini telah dibaca/belum dibaca
-about.shortcuts.mark_all_as_read=tanda semua entry telah dibaca
-about.shortcuts.open_in_new_tab_mark_as_read=buka entry di tab baru dan tanda telah dibaca
-about.shortcuts.fullscreen=toggle mod skrin penuh
-about.shortcuts.font_size=kecil/besar fon entry kini
-about.shortcuts.feed_search=pergi ke langganan dengan nama langganan
+global.save=Save
+global.cancel=Batal
+global.delete=Padam
+global.required=Wajib
+global.download=Muat turun
+global.link=Pautan
+global.bookmark=Bookmark
+global.close=Tutup
+
+tree.subscribe=Langgan
+tree.import=Import
+tree.new_category=Kategori Baru
+tree.all=Semua
+tree.starred=Dibintang
+
+subscribe.feed_url=URL Feed
+subscribe.feed_name=Nama Feed
+subscribe.category=Kategori
+
+import.google_reader_prefix=Import feed dari 
+import.google_reader_suffix= akaun.
+import.google_download=Sebagai alternatif, muat naik fail subscriptions.xml anda.
+import.google_download_link=Muat turun dari sini
+import.xml_file=Fail XML
+
+new_category.name=Nama
+new_category.parent=Induk
+
+toolbar.unread=Belum Dibaca
+toolbar.all=Semua
+toolbar.previous_entry=Sebelumnya
+toolbar.next_entry=Selepasnya
+toolbar.refresh=Refresh
+toolbar.sort_by_asc_desc=Aturkan mengikut tarikh (baru/lama)
+toolbar.titles_only=Tajuk sahaja
+toolbar.expanded_view=Wide view
+toolbar.mark_all_as_read=Tanda kesemuanya telah dibaca
+toolbar.mark_all_older_day=Lebih lama daripada sehari
+toolbar.mark_all_older_week=Lebih lama daripada seminggu
+toolbar.mark_all_older_two_weeks=Lebih lama daripada dua minggu
+toolbar.settings=Setting
+toolbar.profile=Profil
+toolbar.admin=Admin
+toolbar.about=About
+toolbar.logout=Logout
+toolbar.donate=Derma
+
+view.entry_author=oleh  
+view.error_while_loading_feed=Kesilapan semasa memuat turun feed ini
+view.keep_unread=Simpan tidak dibaca
+view.no_unread_items=tiada item yang belum dibaca.
+
+feedsearch.hint=Taipkan langganan...
+feedsearch.help=Guna kekunci Return untuk membuat pilihan dan kekunci arah untuk menavigasi.
+feedsearch.result_prefix=Langganan anda:
+
+settings.general=Setting am
+settings.general.language=Bahasa
+settings.general.language.contribute=Sumbang penterjemahan
+settings.general.show_unread=Tunjuk semua feed dan kategori yang telah dibaca
+settings.general.social_buttons=Tunjuk social sharing
+settings.general.scroll_marks=Dalam wide view, tanda item dibaca ketika scrolling
+settings.appearance=Rupa
+settings.theme=Tema
+settings.submit_your_theme=Muat naik tema anda
+settings.custom_css=Custom CSS
+
+details.feed_details=Butir-butir Feed
+details.url=URL
+details.website=Website ####### Needs translation
+details.name=Nama
+details.category=Kategori
+details.position=Posisi
+details.last_refresh=Refresh terakhir
+details.next_refresh=Refresh seterusnya
+details.queued_for_refresh=Diaturkan untuk refresh
+details.feed_url=URL Feed
+details.generate_api_key_first=Janakan API key dalam profil anda dahulu.
+details.unsubscribe=Hentikan langganan
+details.category_details=Butir-butir kategori
+details.parent_category=Kategori induk
+
+profile.user_name=User name
+profile.email=E-mel
+profile.change_password=Tukar kata laluan
+profile.confirm_password=Sahkan kata laluan
+profile.minimum_6_chars=Minimum 6 huruf
+profile.passwords_do_not_match=Kata laluan tidak sama
+profile.api_key=API key
+profile.api_key_not_generated=Belum dijana
+profile.generate_new_api_key=Jana API key baru
+profile.generate_new_api_key_info=Pertukaran kata laluan akan menjanakan API key yang baru
+profile.opml_export=Export OPML
+profile.delete_account=Padam akaun
+
+about.rest_api=REST API
+about.keyboard_shortcuts=Pintasan papan kekunci
+about.line1_prefix=CommaFeed adalah projek open-source. Sources are berada di  
+about.line1_suffix=.
+about.line2_prefix=Jika anda menghadapi masalah, sila laporkan di halaman isu-isu di  
+about.line2_suffix=\ projek.
+about.line3=Jika anda suka projek ini, anda boleh menbuat dermaan kepada pengaturcara untuk membantu menampung kos laman web ini.
+about.line4=Jika anda guna bitcoin, halamannya adalah 
+about.goodies=Goodies
+about.goodies.android_app=Android app
+about.goodies.subscribe_url=URL melanggan
+about.goodies.chrome_extension=Chrome extension
+about.goodies.firefox_extension=Firefox extension
+about.goodies.opera_extension=Opera extension
+about.goodies.subscribe_bookmarklet=Jana bookmarklet langganan (klik)
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
+about.goodies.next_unread_bookmarklet=Item bookmarklet yang belum dibaca seterusnya (seret ke bookmark bar)
+about.translation=Terjemahan
+about.translation.message=Kami perlukan bantuan anda untuk menterjemahkan CommaFeed.
+about.translation.link=Bagaimana mengyumbang penterjemahan.
+about.announcements=Pengumuman
+about.rest_api.line1=CommaFeed diaturcarakan dengan JAX-RS dan AngularJS. Oleh itu, REST API boleh didapati.
+about.rest_api.link_to_documentation=Pautan ke dokumentasi.
+
+about.shortcuts.mouse_middleclick=Klik tengah
+about.shortcuts.open_next_entry=buka item seterusya
+about.shortcuts.open_previous_entry=buka item sebelumnya
+about.shortcuts.spacebar=space/shift+space
+about.shortcuts.move_page_down_up=Gerak halaman ke bawah/atas
+about.shortcuts.focus_next_entry=fokus kepada item seterusnya tanpa membuka
+about.shortcuts.focus_previous_entry=fokus kepada item sebelumnya tanpa membuka
+about.shortcuts.open_next_feed=buka feed atau kategori seterusnya
+about.shortcuts.open_previous_feed=buka feed atau kategori sebelumnya
+about.shortcuts.open_close_current_entry=buka/tutup entry kini
+about.shortcuts.open_current_entry_in_new_window=buka entry kini di window yang baru
+about.shortcuts.open_current_entry_in_new_window_background=buka entry kini di window baru  di latar belakang
+about.shortcuts.star_unstar=bintang/nyah-bintang entry kini
+about.shortcuts.mark_current_entry=tanda entry kini telah dibaca/belum dibaca
+about.shortcuts.mark_all_as_read=tanda semua entry telah dibaca
+about.shortcuts.open_in_new_tab_mark_as_read=buka entry di tab baru dan tanda telah dibaca
+about.shortcuts.fullscreen=toggle mod skrin penuh
+about.shortcuts.font_size=kecil/besar fon entry kini
+about.shortcuts.feed_search=pergi ke langganan dengan nama langganan
+
--- a/src/main/resources/i18n/nb.properties
+++ b/src/main/resources/i18n/nb.properties
@@ -67,7 +67,7 @@ settings.custom_css=Egendefinert CSS

 details.feed_details=Abonnementsdetaljer
 details.url=URL
-details.website=Website ####### Needs translation
+details.website=Website ####### Needs translation
 details.name=Navn
 details.category=Kategori
 details.position=Posisjon
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Chrome-utvidelse
 about.goodies.firefox_extension=Firefox-utvidelse
 about.goodies.opera_extension=Opera-utvidelse
 about.goodies.subscribe_bookmarklet=Nytt abonnement-bokmerkeprogram (klikk)
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Neste uleste artikkel-bokmerkeprogram (dra til bokmerkemenyen)
 about.translation=Oversettelse
 about.translation.message=Vi trenger din hjelp til å oversette CommaFeed.
--- a/src/main/resources/i18n/nl.properties
+++ b/src/main/resources/i18n/nl.properties
@@ -67,7 +67,7 @@ settings.custom_css=Op maat gemaakte CSS

 details.feed_details=Feed Details
 details.url=URL
-details.website=Website ####### Needs translation
+details.website=Website ####### Needs translation
 details.name=Naam
 details.category=Categorie
 details.position=Position ####### Needs translation
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Chrome extension ####### Needs translation
 about.goodies.firefox_extension=Firefox extension ####### Needs translation
 about.goodies.opera_extension=Opera extension ####### Needs translation
 about.goodies.subscribe_bookmarklet=Add subscription bookmarklet (click) ####### Needs translation
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Next unread item bookmarklet (drag to bookmark bar) ####### Needs translation
 about.translation=Vertalingen
 about.translation.message=We hebben jouw hulp nodig om CommaFeed te vertalen.
--- a/src/main/resources/i18n/nn.properties
+++ b/src/main/resources/i18n/nn.properties
@@ -67,7 +67,7 @@ settings.custom_css=Skreddarsydd CSS

 details.feed_details=Abonnementsdetaljar
 details.url=URL
-details.website=Website ####### Needs translation
+details.website=Website ####### Needs translation
 details.name=Namn
 details.category=Kategori
 details.position=Posisjon
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Chrome-utviding
 about.goodies.firefox_extension=Firefox-utviding
 about.goodies.opera_extension=Opera-utviding
 about.goodies.subscribe_bookmarklet=Nytt abonnement-bokmerkjeprogram (klikk)
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Neste ulesne artikkel-bokmerkeprogram (dra til bokmerkemenyen)
 about.translation=Omsetjing
 about.translation.message=Vi behøver di hjelp til å omsetje CommaFeed.
--- a/src/main/resources/i18n/pl.properties
+++ b/src/main/resources/i18n/pl.properties
@@ -67,7 +67,7 @@ settings.custom_css=Własny styl CSS

 details.feed_details=Szczegóły kanału
 details.url=URL
-details.website=Website ####### Needs translation
+details.website=Website ####### Needs translation
 details.name=Nazwa
 details.category=Kategoria
 details.position=Pozycja
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Dodatek do Chrome
 about.goodies.firefox_extension=Dodatek do Firefoxa
 about.goodies.opera_extension=Dodatek do Opery
 about.goodies.subscribe_bookmarklet=Dodaj subskrybcje jako skryptozakładkę (kliknij)
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Następny nieprzeczytany element jako skryptozakładka (przeciągnij na pasek zakładek)
 about.translation=Tłumaczenia
 about.translation.message=Potrzebujemy pomocy w tłumaczeniu CommaFeed.
--- a/src/main/resources/i18n/pt.properties
+++ b/src/main/resources/i18n/pt.properties
@@ -67,7 +67,7 @@ settings.custom_css=CSS personalizado

 details.feed_details=Detalhes do feed
 details.url=URL
-details.website=Website ####### Needs translation
+details.website=Website ####### Needs translation
 details.name=Nome
 details.category=Categoria
 details.position=Posição
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Extensão para o Chrome
 about.goodies.firefox_extension=Extensão para o Firefox
 about.goodies.opera_extension=Extensão para o Opera
 about.goodies.subscribe_bookmarklet=Bookmarklet para adicionar inscrição (clique)
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Bookmarklet para o próximo item não lido (arraste para a barra de favoritos)
 about.translation=Tradução
 about.translation.message=Precisamos de sua ajuda para traduzir CommaFeed.
--- a/src/main/resources/i18n/ru.properties
+++ b/src/main/resources/i18n/ru.properties
@@ -67,7 +67,7 @@ settings.custom_css=Собственная CSS

 details.feed_details=Информация о ленте
 details.url=URL
-details.website=Website ####### Needs translation
+details.website=Website ####### Needs translation
 details.name=Название
 details.category=Категория
 details.position=Позиция
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Расширение для Хрома
 about.goodies.firefox_extension=Расширение для Файрфокса
 about.goodies.opera_extension=Расширение для Оперы
 about.goodies.subscribe_bookmarklet=Закладка для быстрой подписки на ленты (нужно кликнуть)
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Открыть следующую непочитанную запись в новой вкладке (перетащить на панель закладок)
 about.translation=Перевод
 about.translation.message=Нам нужна ваша помощь в переводе CommaFeed на другие языки.
--- a/src/main/resources/i18n/sk.properties
+++ b/src/main/resources/i18n/sk.properties
@@ -67,7 +67,7 @@ settings.custom_css=Vlastný motív (CSS)

 details.feed_details=Detaily odoberania
 details.url=URL odkaz
-details.website=Website ####### Needs translation
+details.website=Website ####### Needs translation
 details.name=Meno
 details.category=Kategória
 details.position=Pozícia
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Rozšírenie pre Chrome
 about.goodies.firefox_extension=Rozšírenie pre Firefox
 about.goodies.opera_extension=Rozšírenie pre Opera
 about.goodies.subscribe_bookmarklet=Pridať záložku odoberania(kliknite)
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Záložka nasledujúcej neprečítanej položky(pretiahuť k záložkám)
 about.translation=Preklad
 about.translation.message=Pomôžte nám s prekladom CommaFeed.
--- a/src/main/resources/i18n/sv.properties
+++ b/src/main/resources/i18n/sv.properties
@@ -67,7 +67,7 @@ settings.custom_css=Anpassad CSS

 details.feed_details=Prenumerationsdetaljer
 details.url=URL
-details.website=Website ####### Needs translation
+details.website=Website ####### Needs translation
 details.name=Namn
 details.category=Kategori
 details.position=Position
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Chrome-tillägg
 about.goodies.firefox_extension=Firefox-tillägg
 about.goodies.opera_extension=Opera-tillägg
 about.goodies.subscribe_bookmarklet=Bokmärke för tillägg av prenumeration (klicka)
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Bokmärke för nästa olästa post (dra till bokmärkesfält)
 about.translation=Översättning
 about.translation.message=Vi behöver din hjälp med att översätta CommaFeed.
--- a/src/main/resources/i18n/tr.properties
+++ b/src/main/resources/i18n/tr.properties
@@ -67,7 +67,7 @@ settings.custom_css=Kişiselleştirilmiş CSS

 details.feed_details=Yayın detayları
 details.url=URL
-details.website=Website ####### Needs translation
+details.website=Website ####### Needs translation
 details.name=İsim
 details.category=Kategori
 details.position=Pozisyon
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Chrome eklentisi
 about.goodies.firefox_extension=Firefox eklentisi
 about.goodies.opera_extension=Opera eklentisi
 about.goodies.subscribe_bookmarklet=Bookmarklet'a abonelik ekle (tıklayın)
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Bookmarklet'daki en son okunmamış ileti (Sık kullanılan çubuğuna sürükleyin)
 about.translation=Çeviri
 about.translation.message=CommaFeed'i çevirmek için yardımınıza ihtiyacımız var.
--- a/src/main/resources/i18n/zh.properties
+++ b/src/main/resources/i18n/zh.properties
@@ -67,7 +67,7 @@ settings.custom_css=自定义 CSS 样式

 details.feed_details=订阅详情
 details.url=地址
-details.website=Website ####### Needs translation
+details.website=Website ####### Needs translation
 details.name=名称
 details.category=目录
 details.position=Position ####### Needs translation
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Chrome 扩展
 about.goodies.firefox_extension=Firefox 扩展
 about.goodies.opera_extension=Opera 扩展
 about.goodies.subscribe_bookmarklet=添加一个订阅书签 (点击这) 
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=最新未读文章书签 (拖动到书签栏上) 
 about.translation=翻译
 about.translation.message=我们需要您来帮助翻译 CommaFeed。
--- a/src/main/webapp/js/controllers.js
+++ b/src/main/webapp/js/controllers.js
@@ -1272,6 +1272,7 @@ function($scope, CategoryService, AnalyticsService) {
 	AnalyticsService.track();
 	$scope.CategoryService = CategoryService;
 	$scope.categoryId = 'all';
+	$scope.order = 'desc';

 } ]);

--- a/src/main/webapp/sass/components/_help.scss
+++ b/src/main/webapp/sass/components/_help.scss
@@ -3,7 +3,7 @@
 	line-height: 10px;
 }

-.help .category-select {
+.help .bookmarklet-select {
 	margin: 0;
 	padding: 0;
 	height: auto;
--- a/src/main/webapp/templates/feeds.help.html
+++ b/src/main/webapp/templates/feeds.help.html
@@ -57,9 +57,13 @@
 			<p>
 				${about.goodies.next_unread_bookmarklet}: ${subscribe.category} 
 				<select ng-model="categoryId" ng-options="cat.id as cat.name for cat in CategoryService.flatCategories"
-					class="category-select">
+					class="bookmarklet-select">
 				</select> 
-				<a href="next?category={{categoryId}}" target="_blank">${global.link}</a>
+				<select ng-model="order" class="bookmarklet-select">
+					<option value="desc">${about.goodies.subscribe_bookmarklet_desc}</option>
+					<option value="asc">${about.goodies.subscribe_bookmarklet_asc}</option>
+				</select> 
+				<a href="next?category={{categoryId}}&order={{order}}" target="_blank">${global.link}</a>
 			</p>
 		</div>