commit 51338513a0a06ee356abebe679c30a5252a04d8f
parent c09cbb0e4b008339d947fe7c3b203a608c8398f2
Author: Simon Kornblith <simon@simonster.com>
Date: Thu, 3 May 2012 13:55:49 -0700
Merge pull request #116 from gracile-fr/l10n
Localization of hardcoded strings
Diffstat:
7 files changed, 17 insertions(+), 16 deletions(-)
diff --git 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
@@ -100,23 +100,20 @@
</groupbox>
<!-- Duplicate merging -->
- <!-- TODO: localize -->
<vbox id="zotero-duplicates-merge-pane" flex="1">
<groupbox>
<button id="zotero-duplicates-merge-button" oncommand="Zotero_Duplicates_Pane.merge()"/>
</groupbox>
<groupbox id="zotero-duplicates-merge-version-select">
- <description>Choose the version of the item to use as the master item:</description>
+ <description>&zotero.duplicatesMerge.versionSelect;</description>
<hbox>
<listbox id="zotero-duplicates-merge-original-date" onselect="Zotero_Duplicates_Pane.setMaster(this.selectedIndex)" rows="0"/>
</hbox>
</groupbox>
<groupbox flex="1">
- <description id="zotero-duplicates-merge-field-select">
- Select fields to keep from other versions of the item:
- </description>
+ <description id="zotero-duplicates-merge-field-select">&zotero.duplicatesMerge.fieldSelect;</description>
<zoteroitembox id="zotero-duplicates-merge-item-box" flex="1"/>
</groupbox>
</vbox>
diff --git 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
@@ -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
@@ -164,7 +164,6 @@
<menuitem id="zotero-tb-snapshot-from-page" class="menuitem-iconic zotero-menuitem-attachments-snapshot" label="&zotero.items.menu.attach.snapshot;" oncommand="var itemID = ZoteroPane_Local.getSelectedItems()[0].id; ZoteroPane_Local.addAttachmentFromPage(false, itemID)"/>
<menuitem id="zotero-tb-link-from-page" class="menuitem-iconic zotero-menuitem-attachments-web-link" label="&zotero.items.menu.attach.link;" oncommand="var itemID = ZoteroPane_Local.getSelectedItems()[0].id; ZoteroPane_Local.addAttachmentFromPage(true, itemID)"/>
<menuitem class="menuitem-iconic zotero-menuitem-attachments-web-link" label="&zotero.items.menu.attach.link.uri;" oncommand="var itemID = ZoteroPane_Local.getSelectedItems()[0].id; ZoteroPane_Local.addAttachmentFromURI(true, itemID);"/>
- <!-- TODO: localize -->
<menuitem class="menuitem-iconic zotero-menuitem-attachments-file" label="&zotero.items.menu.attach.file;" oncommand="var itemID = ZoteroPane_Local.getSelectedItems()[0].id; ZoteroPane_Local.addAttachmentFromDialog(false, itemID);"/>
<menuitem class="menuitem-iconic zotero-menuitem-attachments-link" label="&zotero.items.menu.attach.fileLink;" oncommand="var itemID = ZoteroPane_Local.getSelectedItems()[0].id; ZoteroPane_Local.addAttachmentFromDialog(true, itemID);"/>
</menupopup>
@@ -277,8 +276,7 @@
<menuitem oncommand="ZoteroPane_Local.deleteSelectedItems();"/>
<menuitem oncommand="ZoteroPane_Local.deleteSelectedItems(true);"/>
<menuitem label="&zotero.items.menu.restoreToLibrary;" oncommand="ZoteroPane_Local.restoreSelectedItems();"/>
- <!-- TODO: localize -->
- <menuitem oncommand="ZoteroPane_Local.mergeSelectedItems();" label="Merge Items…"/>
+ <menuitem label="&zotero.items.menu.mergeItems;" oncommand="ZoteroPane_Local.mergeSelectedItems();"/>
<menuseparator/>
<menuitem oncommand="Zotero_File_Interface.exportItems();"/>
<menuitem oncommand="Zotero_File_Interface.bibliographyFromItems();"/>
diff --git a/chrome/locale/en-US/zotero/zotero.dtd b/chrome/locale/en-US/zotero/zotero.dtd
@@ -84,6 +84,10 @@
<!ENTITY zotero.items.menu.restoreToLibrary "Restore to Library">
<!ENTITY zotero.items.menu.duplicateItem "Duplicate Selected Item">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!ENTITY zotero.duplicatesMerge.versionSelect "Choose the version of the item to use as the master item:">
+<!ENTITY zotero.duplicatesMerge.fieldSelect "Select fields to keep from other versions of the item:">
<!ENTITY zotero.toolbar.newItem.label "New Item">
<!ENTITY zotero.toolbar.moreItemTypes.label "More">
diff --git 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:
