www

commit 5a863d97c8e394c86f9334b7f970d92f8bce7421
parent 3c6728e30f2e2214a7a8c17d61791a0354797639
Author: Dan Stillman <dstillman@zotero.org>
Date:   Sun, 17 Mar 2013 01:18:19 -0400

Context-menu string cleanup

- Remove all "Selected" from "Selected Item", because that's how a context menu works
- Change "Remove Selected Item" to "Remove Item from Collection" (fixes #122)
- Change "Delete Selected Item from Library" to "Move Item to Trash")
- Change "Remove" on Duplicate/Unfiled Items to "Hide" (fixes #122)
- Change "Create Parent Item from Selected Item" to "Create Parent Item"

Diffstat:
M
chrome/content/zotero/zoteroPane.js
 | 
4
++--
M
chrome/locale/en-US/zotero/zotero.dtd
 | 
2
+-
M
chrome/locale/en-US/zotero/zotero.properties
 | 
25
+++++++++++++------------

3 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
@@ -2087,7 +2087,7 @@ var ZoteroPane = new function()
 				m.deleteCollection
 			];
 			
-			menu.childNodes[m.deleteCollection].setAttribute('label', Zotero.getString('general.remove'));
+			menu.childNodes[m.deleteCollection].setAttribute('label', Zotero.getString('general.hide'));
 		}
 		else if (itemGroup.isHeader()) {
 			if (itemGroup.ref.id == 'commons-header') {
@@ -2375,7 +2375,7 @@ var ZoteroPane = new function()
 		}
 		
 		// Plural if necessary
-		menu.childNodes[m.deleteFromLibrary].setAttribute('label', Zotero.getString('pane.items.menu.erase' + multiple));
+		menu.childNodes[m.deleteFromLibrary].setAttribute('label', Zotero.getString('pane.items.menu.moveToTrash' + multiple));
 		menu.childNodes[m.exportItems].setAttribute('label', Zotero.getString('pane.items.menu.export' + multiple));
 		menu.childNodes[m.createBib].setAttribute('label', Zotero.getString('pane.items.menu.createBib' + multiple));
 		menu.childNodes[m.loadReport].setAttribute('label', Zotero.getString('pane.items.menu.generateReport' + multiple));
diff --git a/chrome/locale/en-US/zotero/zotero.dtd b/chrome/locale/en-US/zotero/zotero.dtd
@@ -85,7 +85,7 @@
 <!ENTITY zotero.items.menu.attach.fileLink				"Attach Link to File…">
 
 <!ENTITY zotero.items.menu.restoreToLibrary				"Restore to Library">
-<!ENTITY zotero.items.menu.duplicateItem					"Duplicate Selected Item">
+<!ENTITY zotero.items.menu.duplicateItem					"Duplicate Item">
 <!ENTITY zotero.items.menu.mergeItems					"Merge Items…">
 
 <!ENTITY zotero.duplicatesMerge.versionSelect			"Choose the version of the item to use as the master item:">
diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties
@@ -40,6 +40,7 @@ general.enable						= Enable
 general.disable						= Disable
 general.remove						= Remove
 general.reset						= Reset
+general.hide                          = Hide
 general.quit						= Quit
 general.useDefault					= Use Default
 general.openDocumentation			= Open Documentation
@@ -188,22 +189,22 @@ pane.items.trash.multiple		= Are you sure you want to move the selected items to
 pane.items.delete.title			= Delete
 pane.items.delete				= Are you sure you want to delete the selected item?
 pane.items.delete.multiple		= Are you sure you want to delete the selected items?
-pane.items.menu.remove			= Remove Selected Item
-pane.items.menu.remove.multiple	= Remove Selected Items
-pane.items.menu.erase			= Delete Selected Item from Library…
-pane.items.menu.erase.multiple	= Delete Selected Items from Library…
-pane.items.menu.export			= Export Selected Item…
-pane.items.menu.export.multiple = Export Selected Items…
-pane.items.menu.createBib		= Create Bibliography from Selected Item…
-pane.items.menu.createBib.multiple		= Create Bibliography from Selected Items…
-pane.items.menu.generateReport	= Generate Report from Selected Item…
-pane.items.menu.generateReport.multiple	= Generate Report from Selected Items…
+pane.items.menu.remove                    = Remove Item from Collection
+pane.items.menu.remove.multiple           = Remove Items from Collection
+pane.items.menu.moveToTrash               = Move Item to Trash…
+pane.items.menu.moveToTrash.multiple      = Move Items to Trash…
+pane.items.menu.export                    = Export Item…
+pane.items.menu.export.multiple           = Export Items…
+pane.items.menu.createBib                 = Create Bibliography from Item…
+pane.items.menu.createBib.multiple        = Create Bibliography from Items…
+pane.items.menu.generateReport            = Generate Report from Item…
+pane.items.menu.generateReport.multiple   = Generate Report from Items…
 pane.items.menu.reindexItem					= Reindex Item
 pane.items.menu.reindexItem.multiple		= Reindex Items
 pane.items.menu.recognizePDF				= Retrieve Metadata for PDF
 pane.items.menu.recognizePDF.multiple		= Retrieve Metadata for PDFs
-pane.items.menu.createParent = Create Parent Item from Selected Item
-pane.items.menu.createParent.multiple = Create Parent Items from Selected Items
+pane.items.menu.createParent              = Create Parent Item
+pane.items.menu.createParent.multiple     = Create Parent Items
 pane.items.menu.renameAttachments = Rename File from Parent Metadata
 pane.items.menu.renameAttachments.multiple = Rename Files from Parent Metadata