diff --git a/chrome/content/zotero/bindings/itembox.xml b/chrome/content/zotero/bindings/itembox.xml
index d04ea9826..d4a50a839 100644
--- a/chrome/content/zotero/bindings/itembox.xml
+++ b/chrome/content/zotero/bindings/itembox.xml
@@ -497,9 +497,8 @@
moveDown.id = "zotero-creator-move-down";
moveUp.className = "zotero-creator-move";
moveDown.className = "zotero-creator-move";
- // TODO: localize
- moveUp.setAttribute("label", "Move Up");
- moveDown.setAttribute("label", "Move Down");
+ moveUp.setAttribute("label", Zotero.getString('pane.item.creator.moveUp'));
+ moveDown.setAttribute("label", Zotero.getString('pane.item.creator.moveDown'));
this._creatorTypeMenu.appendChild(moveSep);
this._creatorTypeMenu.appendChild(moveUp);
this._creatorTypeMenu.appendChild(moveDown);
@@ -817,8 +816,7 @@
var label = document.createElement('label');
label.id = 'more-creators-label';
- // TODO: localize
- label.setAttribute('value', num + " more…");
+ label.setAttribute('value', num + Zotero.getString('pane.item.creators.displayMore'));
label.setAttribute('onclick',
"var binding = document.getBindingParent(this); "
+ "binding._displayAllCreators = true; "
diff --git a/chrome/content/zotero/itemPane.xul b/chrome/content/zotero/itemPane.xul
index 38af4e645..9ccef4206 100644
--- a/chrome/content/zotero/itemPane.xul
+++ b/chrome/content/zotero/itemPane.xul
@@ -100,23 +100,20 @@
-
- Choose the version of the item to use as the master item:
+ &zotero.duplicatesMerge.versionSelect;
-
- Select fields to keep from other versions of the item:
-
+ &zotero.duplicatesMerge.fieldSelect;
diff --git a/chrome/content/zotero/xpcom/duplicates.js b/chrome/content/zotero/xpcom/duplicates.js
index 74020e58e..929e6e2de 100644
--- a/chrome/content/zotero/xpcom/duplicates.js
+++ b/chrome/content/zotero/xpcom/duplicates.js
@@ -36,7 +36,7 @@ Zotero.Duplicates = function (libraryID) {
}
-Zotero.Duplicates.prototype.__defineGetter__('name', function () "Duplicate Items"); // TODO: localize
+Zotero.Duplicates.prototype.__defineGetter__('name', function () Zotero.getString('pane.collections.duplicate'));
Zotero.Duplicates.prototype.__defineGetter__('libraryID', function () this._libraryID);
diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
index 4e3bfa1fa..e3f731b29 100644
--- a/chrome/content/zotero/zoteroPane.js
+++ b/chrome/content/zotero/zoteroPane.js
@@ -1232,8 +1232,7 @@ var ZoteroPane = new function()
Zotero_Duplicates_Pane.setItems(this.getSelectedItems(), displayNumItemsOnTypeError);
}
else {
- // TODO: localize
- var msg = "Select items to merge";
+ var msg = Zotero.getString('pane.item.selectToMerge');
this.setItemPaneMessage(msg);
}
}
diff --git a/chrome/content/zotero/zoteroPane.xul b/chrome/content/zotero/zoteroPane.xul
index 8d11504db..b6701de3b 100644
--- a/chrome/content/zotero/zoteroPane.xul
+++ b/chrome/content/zotero/zoteroPane.xul
@@ -164,7 +164,6 @@
-
@@ -277,8 +276,7 @@
-
-
+
diff --git a/chrome/locale/en-US/zotero/zotero.dtd b/chrome/locale/en-US/zotero/zotero.dtd
index 99540a7b3..a11307fee 100644
--- a/chrome/locale/en-US/zotero/zotero.dtd
+++ b/chrome/locale/en-US/zotero/zotero.dtd
@@ -84,6 +84,10 @@
+
+
+
+
diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties
index 93458d476..6c1206428 100644
--- a/chrome/locale/en-US/zotero/zotero.properties
+++ b/chrome/locale/en-US/zotero/zotero.properties
@@ -112,6 +112,7 @@ pane.collections.library = My Library
pane.collections.trash = Trash
pane.collections.untitled = Untitled
pane.collections.unfiled = Unfiled Items
+pane.collections.duplicate = Duplicate Items
pane.collections.menu.rename.collection = Rename Collection…
pane.collections.menu.edit.savedSearch = Edit Saved Search
@@ -173,6 +174,7 @@ pane.item.selected.multiple = %S items selected
pane.item.unselected.zero = No items in this view
pane.item.unselected.singular = %S item in this view
pane.item.unselected.plural = %S items in this view
+pane.item.selectToMerge = Select items to merge
pane.item.changeType.title = Change Item Type
pane.item.changeType.text = Are you sure you want to change the item type?\n\nThe following fields will be lost:
@@ -181,6 +183,9 @@ pane.item.defaultLastName = last
pane.item.defaultFullName = full name
pane.item.switchFieldMode.one = Switch to single field
pane.item.switchFieldMode.two = Switch to two fields
+pane.item.creator.moveUp = Move Up
+pane.item.creator.moveDown = Move Down
+pane.item.creators.displayMore = \u0020more…
pane.item.notes.untitled = Untitled Note
pane.item.notes.delete.confirm = Are you sure you want to delete this note?
pane.item.notes.count.zero = %S notes: