From 723e8a4e3063819ab268c43176b8b08a7fb14afa Mon Sep 17 00:00:00 2001
From: gracile-fr <gracile@gmx.com>
Date: Thu, 15 Aug 2013 22:53:56 +0200
Subject: [PATCH] Localize Ctrl/Cmd-Shift in Prefs

---
 chrome/content/zotero/preferences/preferences_export.js | 2 +-
 chrome/content/zotero/preferences/preferences_keys.js   | 2 +-
 chrome/locale/en-US/zotero/zotero.properties            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/chrome/content/zotero/preferences/preferences_export.js b/chrome/content/zotero/preferences/preferences_export.js
index 7622673ed1..ce1a302c77 100644
--- a/chrome/content/zotero/preferences/preferences_export.js
+++ b/chrome/content/zotero/preferences/preferences_export.js
@@ -225,7 +225,7 @@ Zotero_Preferences.Export = {
 	
 	
 	updateQuickCopyInstructions: function () {
-		var prefix = Zotero.isMac ? (Zotero.getString('general.keys.cmdShift')) : (Zotero.getString('general.keys.ctrlShift'));
+		var prefix = Zotero.isMac ? Zotero.getString('general.keys.cmdShift') : Zotero.getString('general.keys.ctrlShift');
 		
 		var key = Zotero.Prefs.get('keys.copySelectedItemsToClipboard');
 		var str = Zotero.getString('zotero.preferences.export.quickCopy.instructions', prefix + key);
diff --git a/chrome/content/zotero/preferences/preferences_keys.js b/chrome/content/zotero/preferences/preferences_keys.js
index 87361fc164..20f7ecd19a 100644
--- a/chrome/content/zotero/preferences/preferences_keys.js
+++ b/chrome/content/zotero/preferences/preferences_keys.js
@@ -30,7 +30,7 @@ Zotero_Preferences.Keys = {
 		var rows = document.getElementById('zotero-prefpane-keys').getElementsByTagName('row');
 		for (var i=0; i<rows.length; i++) {
 			// Display the appropriate modifier keys for the platform
-			rows[i].firstChild.nextSibling.value = Zotero.isMac ? (Zotero.getString('general.keys.cmdShift')) : (Zotero.getString('general.keys.ctrlShift'));
+			rows[i].firstChild.nextSibling.value = Zotero.isMac ? Zotero.getString('general.keys.cmdShift') : Zotero.getString('general.keys.ctrlShift');
 		}
 	}
 };
diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties
index 66d348238e..621c906793 100644
--- a/chrome/locale/en-US/zotero/zotero.properties
+++ b/chrome/locale/en-US/zotero/zotero.properties
@@ -48,8 +48,8 @@ general.useDefault					= Use Default
 general.openDocumentation			= Open Documentation
 general.numMore                    = %S more…
 general.openPreferences				= Open Preferences
-general.keys.ctrlShift				= Ctrl+Shift
-general.keys.cmdShift				= Cmd+Shift
+general.keys.ctrlShift				= Ctrl+Shift+
+general.keys.cmdShift				= Cmd+Shift+
 
 general.operationInProgress = A Zotero operation is currently in progress.
 general.operationInProgress.waitUntilFinished = Please wait until it has finished.