www

commit 505e4a5674230519c8b66ac676b29cdbe0624ca2
parent dde9901c726c564de6f7ac3372742debba46c961
Author: Simon Kornblith <simon@simonster.com>
Date:   Wed, 19 Jun 2013 12:54:47 -0400

Merge branch '4.0'

Diffstat:
M
chrome/content/zotero/xpcom/cite.js
 | 
4
++--
M
chrome/locale/en-US/zotero/standalone.dtd
 | 
2
+-

2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/chrome/content/zotero/xpcom/cite.js b/chrome/content/zotero/xpcom/cite.js
@@ -364,8 +364,8 @@ Zotero.Cite.getAbbreviation = new function() {
 	 */
 	function normalizeKey(key) {
 		// Strip periods, normalize spacing, and convert to lowercase
-		return key.toString().toLowerCase().
-			replace(/(?:\b|^)(?:and|et|y|und|l[ae]|the|[ld]')(?:\b|$)|[\x21-\x2C.\/\x3A-\x40\x5B-\x60\\\x7B-\x7E]/g, "").
+		return key.toString().
+			replace(/(?:\b|^)(?:and|et|y|und|l[ae]|the|[ld]')(?:\b|$)|[\x21-\x2C.\/\x3A-\x40\x5B-\x60\\\x7B-\x7E]/ig, "").
 			replace(/\s+/g, " ").trim();
 	}
 
diff --git a/chrome/locale/en-US/zotero/standalone.dtd b/chrome/locale/en-US/zotero/standalone.dtd
@@ -55,7 +55,7 @@
 <!ENTITY selectAllCmd.label "Select All">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Options…">
+<!ENTITY preferencesCmd.label "Preferences">
 <!ENTITY preferencesCmd.accesskey "O">
 <!ENTITY preferencesCmdUnix.label "Preferences">
 <!ENTITY preferencesCmdUnix.accesskey "n">