From cf2a673e2b0bbaf7b804440efa77632cbaaef1a1 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Mon, 6 Jun 2016 17:58:51 -0400
Subject: [PATCH] Don't split out "Items First" in feed prefs

---
 chrome/content/zotero/preferences/preferences_advanced.xul | 3 +--
 chrome/locale/en-US/zotero/preferences.dtd                 | 7 +++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/chrome/content/zotero/preferences/preferences_advanced.xul b/chrome/content/zotero/preferences/preferences_advanced.xul
index aa04324f6..2309bc344 100644
--- a/chrome/content/zotero/preferences/preferences_advanced.xul
+++ b/chrome/content/zotero/preferences/preferences_advanced.xul
@@ -295,14 +295,13 @@
 					<groupbox>
 						<hbox>
 							<hbox align="center">
-								<label value="&zotero.preferences.feeds.sorting.label1;"/>
+								<label value="&zotero.preferences.feeds.sorting.label;"/>
 								<menulist id="feed-sort" preference="pref-feeds-sortAscending">
 									<menupopup>
 										<menuitem label="&zotero.preferences.feeds.sorting.newest;" value="false"/>
 										<menuitem label="&zotero.preferences.feeds.sorting.oldest;" value="true"/>
 									</menupopup>
 								</menulist>
-								<label value="&zotero.preferences.feeds.sorting.label2;"/>
 							</hbox>
 						</hbox>
 					</groupbox>
diff --git a/chrome/locale/en-US/zotero/preferences.dtd b/chrome/locale/en-US/zotero/preferences.dtd
index 621b71a7b..f23c5bafc 100644
--- a/chrome/locale/en-US/zotero/preferences.dtd
+++ b/chrome/locale/en-US/zotero/preferences.dtd
@@ -43,10 +43,9 @@
 <!ENTITY zotero.preferences.groups.tags				"tags">
 
 <!ENTITY zotero.preferences.feeds						"Feeds">
-<!ENTITY zotero.preferences.feeds.sorting.label1		"Sorting:">
-<!ENTITY zotero.preferences.feeds.sorting.label2		"Item First">
-<!ENTITY zotero.preferences.feeds.sorting.newest		"Newest">
-<!ENTITY zotero.preferences.feeds.sorting.oldest		"Oldest">
+<!ENTITY zotero.preferences.feeds.sorting.label		"Sorting:">
+<!ENTITY zotero.preferences.feeds.sorting.newest		"Newest items first">
+<!ENTITY zotero.preferences.feeds.sorting.oldest		"Oldest items first">
 <!ENTITY zotero.preferences.feeds.feedDefaults			"Feed Defaults">
 
 <!ENTITY zotero.preferences.openurl.caption				"OpenURL">