suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Localization of strings previously hardcoded. All these strings are related to duplicate detection.

Browse Source 
(cherry picked from commit d6ae1c544d)
This commit is contained in:
gracile-fr 2012-05-03 22:38:14 +02:00 committed by Dan Stillman
parent 12fc2eadc0
commit 4ba9b6a4c0
6 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
chrome/content/zotero/itemPane.xul
View File

@ -100,23 +100,20 @@
</groupbox> </groupbox>
<!-- Duplicate merging --> <!-- Duplicate merging -->
<!-- TODO: localize -->
<vbox id="zotero-duplicates-merge-pane" flex="1"> <vbox id="zotero-duplicates-merge-pane" flex="1">
<groupbox> <groupbox>
<button id="zotero-duplicates-merge-button" oncommand="Zotero_Duplicates_Pane.merge()"/> <button id="zotero-duplicates-merge-button" oncommand="Zotero_Duplicates_Pane.merge()"/>
</groupbox> </groupbox>
<groupbox id="zotero-duplicates-merge-version-select"> <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> <hbox>
<listbox id="zotero-duplicates-merge-original-date" onselect="Zotero_Duplicates_Pane.setMaster(this.selectedIndex)" rows="0"/> <listbox id="zotero-duplicates-merge-original-date" onselect="Zotero_Duplicates_Pane.setMaster(this.selectedIndex)" rows="0"/>
</hbox> </hbox>
</groupbox> </groupbox>
<groupbox flex="1"> <groupbox flex="1">
<description id="zotero-duplicates-merge-field-select"> <description id="zotero-duplicates-merge-field-select">&zotero.duplicatesMerge.fieldSelect;</description>
Select fields to keep from other versions of the item:
</description>
<zoteroitembox id="zotero-duplicates-merge-item-box" flex="1"/> <zoteroitembox id="zotero-duplicates-merge-item-box" flex="1"/>
</groupbox> </groupbox>
</vbox> </vbox>

2
chrome/content/zotero/xpcom/duplicates.js
View File

@ -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); Zotero.Duplicates.prototype.__defineGetter__('libraryID', function () this._libraryID);

3
chrome/content/zotero/zoteroPane.js
View File

@ -1255,8 +1255,7 @@ var ZoteroPane = new function()
Zotero_Duplicates_Pane.setItems(this.getSelectedItems(), displayNumItemsOnTypeError); Zotero_Duplicates_Pane.setItems(this.getSelectedItems(), displayNumItemsOnTypeError);
} }
else { else {
// TODO: localize var msg = Zotero.getString('pane.item.selectToMerge');
var msg = "Select items to merge";
this.setItemPaneMessage(msg); this.setItemPaneMessage(msg);
} }
} }

8
chrome/content/zotero/zoteroPane.xul
View File

@ -164,9 +164,8 @@
<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-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 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);"/> <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-file" label="Attach Stored Copy of 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);"/>
<menuitem class="menuitem-iconic zotero-menuitem-attachments-link" label="Attach Link to File…" oncommand="var itemID = ZoteroPane_Local.getSelectedItems()[0].id; ZoteroPane_Local.addAttachmentFromDialog(true, itemID);"/>
</menupopup> </menupopup>
</toolbarbutton> </toolbarbutton>
<toolbarseparator/> <toolbarseparator/>
@ -277,8 +276,7 @@
<menuitem oncommand="ZoteroPane_Local.deleteSelectedItems();"/> <menuitem oncommand="ZoteroPane_Local.deleteSelectedItems();"/>
<menuitem oncommand="ZoteroPane_Local.deleteSelectedItems(true);"/> <menuitem oncommand="ZoteroPane_Local.deleteSelectedItems(true);"/>
<menuitem label="&zotero.items.menu.restoreToLibrary;" oncommand="ZoteroPane_Local.restoreSelectedItems();"/> <menuitem label="&zotero.items.menu.restoreToLibrary;" oncommand="ZoteroPane_Local.restoreSelectedItems();"/>
<!-- TODO: localize --> <menuitem label="&zotero.items.menu.mergeItems;" oncommand="ZoteroPane_Local.mergeSelectedItems();"/>
<menuitem oncommand="ZoteroPane_Local.mergeSelectedItems();" label="Merge Items…"/>
<menuseparator/> <menuseparator/>
<menuitem oncommand="Zotero_File_Interface.exportItems();"/> <menuitem oncommand="Zotero_File_Interface.exportItems();"/>
<menuitem oncommand="Zotero_File_Interface.bibliographyFromItems();"/> <menuitem oncommand="Zotero_File_Interface.bibliographyFromItems();"/>

4
chrome/locale/en-US/zotero/zotero.dtd
View File

@ -69,6 +69,10 @@
<!ENTITY zotero.items.menu.restoreToLibrary "Restore to Library"> <!ENTITY zotero.items.menu.restoreToLibrary "Restore to Library">
<!ENTITY zotero.items.menu.duplicateItem "Duplicate Selected Item"> <!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.newItem.label "New Item">
<!ENTITY zotero.toolbar.moreItemTypes.label "More"> <!ENTITY zotero.toolbar.moreItemTypes.label "More">

5
chrome/locale/en-US/zotero/zotero.properties
View File

@ -112,6 +112,7 @@ pane.collections.library = My Library
pane.collections.trash = Trash pane.collections.trash = Trash
pane.collections.untitled = Untitled pane.collections.untitled = Untitled
pane.collections.unfiled = Unfiled Items pane.collections.unfiled = Unfiled Items
pane.collections.duplicate = Duplicate Items
pane.collections.menu.rename.collection = Rename Collection… pane.collections.menu.rename.collection = Rename Collection…
pane.collections.menu.edit.savedSearch = Edit Saved Search pane.collections.menu.edit.savedSearch = Edit Saved Search
@ -170,6 +171,10 @@ pane.items.interview.manyParticipants = Interview by %S et al.
pane.item.selected.zero = No items selected pane.item.selected.zero = No items selected
pane.item.selected.multiple = %S items selected 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.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: pane.item.changeType.text = Are you sure you want to change the item type?\n\nThe following fields will be lost: