From 455a1e65f1dc97917f19a1a66282edbc75b52e99 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Wed, 28 Oct 2009 18:45:49 +0000 Subject: [PATCH] - Fix item deletion behavior to be consistent between Windows (where it was prompting to erase child items) and OS X (where it wasn't for some reason) -- child items are now always removed, since unlinking them didn't make sense in the context of moving items to the trash and could cause problematic data states that would break syncing and trash emptying - Show appropriate message when moving items to trash - Unbind delete action from Backspace on Windows, where it's non-standard - Fixed some inconsistencies in Cmd/Ctrl-Delete behavior -- Cmd-Delete will move item to trash without prompt in Library and move items to trash with a prompt in collection or search API changes: - Zotero.Items.erase(), Zotero.Item.erase(), and Zotero.ItemTreeView.deleteSelection() no longer takes eraseChildren parameter --- chrome/content/zotero/overlay.js | 127 ++++++++++--------- chrome/content/zotero/xpcom/data/item.js | 37 +----- chrome/content/zotero/xpcom/data/items.js | 7 +- chrome/content/zotero/xpcom/itemTreeView.js | 19 +-- chrome/locale/af-ZA/zotero/zotero.properties | 1 - chrome/locale/ar/zotero/zotero.properties | 1 - chrome/locale/bg-BG/zotero/zotero.properties | 1 - chrome/locale/ca-AD/zotero/zotero.properties | 1 - chrome/locale/cs-CZ/zotero/zotero.properties | 1 - chrome/locale/da-DK/zotero/zotero.properties | 1 - chrome/locale/de-AT/zotero/zotero.properties | 1 - chrome/locale/de-CH/zotero/zotero.properties | 1 - chrome/locale/de-DE/zotero/zotero.properties | 1 - chrome/locale/el-GR/zotero/zotero.properties | 1 - chrome/locale/en-US/zotero/zotero.properties | 1 - chrome/locale/es-ES/zotero/zotero.properties | 1 - chrome/locale/et-EE/zotero/zotero.properties | 1 - chrome/locale/fi-FI/zotero/zotero.properties | 1 - chrome/locale/fr-FR/zotero/zotero.properties | 1 - chrome/locale/gl-ES/zotero/zotero.properties | 1 - chrome/locale/he-IL/zotero/zotero.properties | 1 - chrome/locale/hr-HR/zotero/zotero.properties | 1 - chrome/locale/hu-HU/zotero/zotero.properties | 1 - chrome/locale/is-IS/zotero/zotero.properties | 1 - chrome/locale/it-IT/zotero/zotero.properties | 1 - chrome/locale/ja-JP/zotero/zotero.properties | 1 - chrome/locale/ko-KR/zotero/zotero.properties | 1 - chrome/locale/mn-MN/zotero/zotero.properties | 1 - chrome/locale/nb-NO/zotero/zotero.properties | 1 - chrome/locale/nl-NL/zotero/zotero.properties | 1 - chrome/locale/pl-PL/zotero/zotero.properties | 1 - chrome/locale/pt-BR/zotero/zotero.properties | 1 - chrome/locale/pt-PT/zotero/zotero.properties | 1 - chrome/locale/ro-RO/zotero/zotero.properties | 1 - chrome/locale/ru-RU/zotero/zotero.properties | 1 - chrome/locale/sk-SK/zotero/zotero.properties | 1 - chrome/locale/sl-SI/zotero/zotero.properties | 1 - chrome/locale/sr-RS/zotero/zotero.properties | 1 - chrome/locale/sv-SE/zotero/zotero.properties | 1 - chrome/locale/th-TH/zotero/zotero.properties | 1 - chrome/locale/tr-TR/zotero/zotero.properties | 1 - chrome/locale/vi-VN/zotero/zotero.properties | 1 - chrome/locale/zh-CN/zotero/zotero.properties | 1 - chrome/locale/zh-TW/zotero/zotero.properties | 1 - 44 files changed, 84 insertions(+), 146 deletions(-) diff --git a/chrome/content/zotero/overlay.js b/chrome/content/zotero/overlay.js index 7721316716..e6f9cc9443 100644 --- a/chrome/content/zotero/overlay.js +++ b/chrome/content/zotero/overlay.js @@ -631,11 +631,12 @@ var ZoteroPane = new function() } } else if (from == 'zotero-items-tree') { - if (event.keyCode == event.DOM_VK_BACK_SPACE || + if ((event.keyCode == event.DOM_VK_BACK_SPACE && Zotero.isMac) || event.keyCode == event.DOM_VK_DELETE) { - // If Cmd or Ctrl delete, delete from Library (with prompt) - var fromDB = event.metaKey || (!Zotero.isMac && event.ctrlKey); - ZoteroPane.deleteSelectedItems(fromDB); + // If Cmd/Ctrl delete, use forced mode, which does different + // things depending on the context + var force = event.metaKey || (!Zotero.isMac && event.ctrlKey); + ZoteroPane.deleteSelectedItems(force); event.preventDefault(); return; } @@ -1215,68 +1216,76 @@ var ZoteroPane = new function() } /* - * _force_ deletes item from DB even if removing from a collection or search + * Remove, trash, or delete item(s), depending on context + * + * @param {Boolean} [force=false] Trash or delete even if in a collection or search, + * or trash without prompt in library */ this.deleteSelectedItems = function (force) { - if (this.itemsView && this.itemsView.selection.count > 0) { - var itemGroup = this.itemsView._itemGroup; - - if (!itemGroup.isTrash() && !this.canEdit()) { - this.displayCannotEditLibraryMessage(); + if (!this.itemsView || !this.itemsView.selection.count) { + return; + } + var itemGroup = this.itemsView._itemGroup; + + if (!itemGroup.isTrash() && !this.canEdit()) { + this.displayCannotEditLibraryMessage(); + return; + } + + // TODO: localize + var toTrash = { + title: "Move to Trash", + text: "Are you sure you want to move the selected item" + + (this.itemsView.selection.count>1 ? 's' : '') + " to the Trash?" + }; + var toDelete = { + title: Zotero.getString('pane.items.delete.title'), + text: Zotero.getString( + 'pane.items.delete' + (this.itemsView.selection.count > 1 ? '.multiple' : '') + ) + }; + + if (itemGroup.isLibrary()) { + // In library, don't prompt if meta key was pressed + var prompt = force ? false : toTrash; + } + else if (itemGroup.isCollection()) { + // In collection, only prompt if trashing + var prompt = force ? toTrash : false; + } + // This should be changed if/when groups get trash + else if (itemGroup.isGroup()) { + var prompt = toDelete; + } + else if (itemGroup.isSearch()) { + if (!force) { return; } - - if (!force){ - if (itemGroup.isCollection()) { - var noPrompt = true; - } - // Do nothing in search and share views - else if (itemGroup.isSearch() || itemGroup.isShare()) { - return; - } - // Do nothing in trash view if any non-deleted items are selected - else if (itemGroup.isTrash()) { - var start = {}; - var end = {}; - for (var i=0, len=this.itemsView.selection.getRangeCount(); i1 ? '.multiple' : '')), - hasChildren ? Zotero.getString('pane.items.delete.attached') : '', - eraseChildren)) - { - this.itemsView.deleteSelection(eraseChildren.value, force); - } + var prompt = toDelete; + } + + var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"] + .getService(Components.interfaces.nsIPromptService); + if (!prompt || promptService.confirm(window, prompt.title, prompt.text)) { + this.itemsView.deleteSelection(force); } } diff --git a/chrome/content/zotero/xpcom/data/item.js b/chrome/content/zotero/xpcom/data/item.js index e68fbdf4b4..e2ef4239c7 100644 --- a/chrome/content/zotero/xpcom/data/item.js +++ b/chrome/content/zotero/xpcom/data/item.js @@ -3750,10 +3750,8 @@ Zotero.Item.prototype.clone = function(includePrimary, newItem, unsaved) { * Delete item from database and clear from Zotero.Items internal array * * Items.erase() should be used instead of this - * - * @param {Boolean} eraseChildren Erase child items as well */ -Zotero.Item.prototype.erase = function(deleteChildren) { +Zotero.Item.prototype.erase = function() { if (!this.id) { return false; } @@ -3832,7 +3830,7 @@ Zotero.Item.prototype.erase = function(deleteChildren) { // Regular item // If flag given, delete child notes and files - else if (deleteChildren) { + else { var sql = "SELECT itemID FROM itemNotes WHERE sourceItemID=?1 UNION " + "SELECT itemID FROM itemAttachments WHERE sourceItemID=?1"; var toDelete = Zotero.DB.columnQuery(sql, [this.id]); @@ -3845,37 +3843,6 @@ Zotero.Item.prototype.erase = function(deleteChildren) { } } - // Otherwise just unlink any child notes or files without deleting - else { - // Notes - var sql = "SELECT itemID FROM itemNotes WHERE sourceItemID=" + this.id; - var childNotes = Zotero.DB.columnQuery(sql); - if (childNotes) { - for each(var id in childNotes) { - var i = Zotero.Items.get(id); - changedItemsNotifierData[i.id] = { old: i.serialize() }; - } - changedItems.push(childNotes); - } - var sql = "UPDATE itemNotes SET sourceItemID=NULL WHERE sourceItemID=" - + this.id; - Zotero.DB.query(sql); - - // Attachments - var sql = "SELECT itemID FROM itemAttachments WHERE sourceItemID=" + this.id; - var childAttachments = Zotero.DB.columnQuery(sql); - if (childAttachments) { - for each(var id in childAttachments) { - var i = Zotero.Items.get(id); - changedItemsNotifierData[i.id] = { old: i.serialize() }; - } - changedItems.push(childAttachments); - } - var sql = "UPDATE itemAttachments SET sourceItemID=NULL WHERE sourceItemID=" - + this.id; - Zotero.DB.query(sql); - } - // Flag related items for notification var relateds = this._getRelatedItemsBidirectional(); if (relateds) { diff --git a/chrome/content/zotero/xpcom/data/items.js b/chrome/content/zotero/xpcom/data/items.js index 6fb0604723..a59e1d372e 100644 --- a/chrome/content/zotero/xpcom/data/items.js +++ b/chrome/content/zotero/xpcom/data/items.js @@ -398,7 +398,7 @@ Zotero.Items = new function() { Zotero.DB.beginTransaction(); var deletedIDs = this.getDeleted(true); if (deletedIDs) { - this.erase(deletedIDs, true); + this.erase(deletedIDs); } Zotero.Notifier.trigger('refresh', 'collection', 0); Zotero.DB.commitTransaction(); @@ -409,9 +409,8 @@ Zotero.Items = new function() { * Delete item(s) from database and clear from internal array * * @param {Integer|Integer[]} ids Item ids - * @param {Boolean} eraseChildren Erase child items as well */ - function erase(ids, eraseChildren) { + function erase(ids) { ids = Zotero.flattenArguments(ids); var usiDisabled = Zotero.UnresponsiveScriptIndicator.disable(); @@ -423,7 +422,7 @@ Zotero.Items = new function() { Zotero.debug('Item ' + id + ' does not exist in Items.erase()!', 1); continue; } - item.erase(eraseChildren); // calls unload() + item.erase(); // calls unload() item = undefined; } Zotero.DB.commitTransaction(); diff --git a/chrome/content/zotero/xpcom/itemTreeView.js b/chrome/content/zotero/xpcom/itemTreeView.js index 47d3edfbab..5992bc7253 100644 --- a/chrome/content/zotero/xpcom/itemTreeView.js +++ b/chrome/content/zotero/xpcom/itemTreeView.js @@ -1229,11 +1229,14 @@ Zotero.ItemTreeView.prototype.getSelectedItems = function(asIDs) /** * Delete the selection * - * @param {Boolean} eraseChildren - * @param {Boolean} force Delete item even if removing from a collection + * @param {Boolean} [force=false] Delete item even if removing from a collection */ -Zotero.ItemTreeView.prototype.deleteSelection = function(eraseChildren, force) +Zotero.ItemTreeView.prototype.deleteSelection = function (force) { + if (arguments.length > 1) { + throw ("deleteSelection() no longer takes two parameters"); + } + if (this.selection.count == 0) { return; } @@ -1261,8 +1264,11 @@ Zotero.ItemTreeView.prototype.deleteSelection = function(eraseChildren, force) var itemGroup = this._itemGroup; - if (itemGroup.isGroup() || (force && itemGroup.isWithinGroup())) { - Zotero.Items.erase(ids, eraseChildren); + if (itemGroup.isTrash()) { + Zotero.Items.erase(ids); + } + else if (itemGroup.isGroup() || (force && itemGroup.isWithinGroup())) { + Zotero.Items.erase(ids); } else if (itemGroup.isLibrary() || force) { Zotero.Items.trash(ids); @@ -1270,9 +1276,6 @@ Zotero.ItemTreeView.prototype.deleteSelection = function(eraseChildren, force) else if (itemGroup.isCollection()) { itemGroup.ref.removeItems(ids); } - else if (itemGroup.isTrash()) { - Zotero.Items.erase(ids, eraseChildren); - } this._treebox.endUpdateBatch(); } diff --git a/chrome/locale/af-ZA/zotero/zotero.properties b/chrome/locale/af-ZA/zotero/zotero.properties index f0f201f024..3883a5eadf 100644 --- a/chrome/locale/af-ZA/zotero/zotero.properties +++ b/chrome/locale/af-ZA/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=Loading items list... pane.items.delete=Are you sure you want to delete the selected item? pane.items.delete.multiple=Are you sure you want to delete the selected items? pane.items.delete.title=Delete -pane.items.delete.attached=Erase attached notes and files pane.items.menu.remove=Remove Selected Item pane.items.menu.remove.multiple=Remove Selected Items pane.items.menu.erase=Delete Selected Item from Library... diff --git a/chrome/locale/ar/zotero/zotero.properties b/chrome/locale/ar/zotero/zotero.properties index eef2715127..2f52d34669 100644 --- a/chrome/locale/ar/zotero/zotero.properties +++ b/chrome/locale/ar/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=تحميل قائمة البنود... pane.items.delete=هل ترغب في حذف الموضوع المختار؟ pane.items.delete.multiple=هل ترغب في حذف المواضيع المختارة؟ pane.items.delete.title=حذف -pane.items.delete.attached=مسح الملاحظات والملفات المرفقة pane.items.menu.remove=حذف الموضوع المختار pane.items.menu.remove.multiple=حذف المواضيع المختارة pane.items.menu.erase=احذف الموضوع المختار من المكتبة... diff --git a/chrome/locale/bg-BG/zotero/zotero.properties b/chrome/locale/bg-BG/zotero/zotero.properties index 8bbd4a666e..199167a9a5 100644 --- a/chrome/locale/bg-BG/zotero/zotero.properties +++ b/chrome/locale/bg-BG/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=Зареждане на списъка на обектите. pane.items.delete=Сигурни ли сте, че искате да изтриете избрания обект? pane.items.delete.multiple=Сигурни ли сте, че искате да изтриете избраните обекти? pane.items.delete.title=Изтриване -pane.items.delete.attached=Изтриване на закачените бележки и файлове pane.items.menu.remove=Изтриване на избрания обект pane.items.menu.remove.multiple=Изтриване на избраните обекти pane.items.menu.erase=Изтриване на избрания обект от библиотеката... diff --git a/chrome/locale/ca-AD/zotero/zotero.properties b/chrome/locale/ca-AD/zotero/zotero.properties index c21d28e7b9..a3d9bd74ef 100644 --- a/chrome/locale/ca-AD/zotero/zotero.properties +++ b/chrome/locale/ca-AD/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=Carregant la llista d'elements... pane.items.delete=Estàs segur que vols eliminar l'element seleccionat? pane.items.delete.multiple=Estàs segur que vols eliminar els elements seleccionats? pane.items.delete.title=Elimina -pane.items.delete.attached=Esborra notes i arxius adjunts pane.items.menu.remove=Elimina l'element seleccionat pane.items.menu.remove.multiple=Elimina els elements seleccionats pane.items.menu.erase=Elimina l'element seleccionat de la Llibreria... diff --git a/chrome/locale/cs-CZ/zotero/zotero.properties b/chrome/locale/cs-CZ/zotero/zotero.properties index 5729e2d8f7..cc647677a4 100644 --- a/chrome/locale/cs-CZ/zotero/zotero.properties +++ b/chrome/locale/cs-CZ/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=Nahrávám seznam položek... pane.items.delete=Jste si jisti, že chcete smazat zvolenou položku? pane.items.delete.multiple=Jste si jisti, že chcete smazat zvolene položky? pane.items.delete.title=Smazat -pane.items.delete.attached=Smazat přiřazené poznámky a soubory pane.items.menu.remove=Smazat vybranou položku pane.items.menu.remove.multiple=Smazat vybrané položky pane.items.menu.erase=Smazat vybranou položku z knihovny... diff --git a/chrome/locale/da-DK/zotero/zotero.properties b/chrome/locale/da-DK/zotero/zotero.properties index 9271478bda..6d50a99e3d 100644 --- a/chrome/locale/da-DK/zotero/zotero.properties +++ b/chrome/locale/da-DK/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=Loading items list... pane.items.delete=Er du sikker på at du vil slette de valgte elementet? pane.items.delete.multiple=Er du sikker på at du vil slette de valgte elementer? pane.items.delete.title=Slet -pane.items.delete.attached=Slet tilhørende noter og filer. pane.items.menu.remove=Fjern det valgte Element pane.items.menu.remove.multiple=Fjern valgte Elementer pane.items.menu.erase=Slet det valgte element fra Biblioteket... diff --git a/chrome/locale/de-AT/zotero/zotero.properties b/chrome/locale/de-AT/zotero/zotero.properties index b32d4cc666..d0c9adfaf0 100644 --- a/chrome/locale/de-AT/zotero/zotero.properties +++ b/chrome/locale/de-AT/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=Loading items list... pane.items.delete=Sind Sie sicher, dass Sie den ausgewählten Eintrag löschen möchten? pane.items.delete.multiple=Sind Sie sicher, dass Sie die ausgewählten Einträge löschen möchten? pane.items.delete.title=Löschen -pane.items.delete.attached=Angehängte Notizen und Dateien löschen pane.items.menu.remove=Ausgewählten Eintrag entfernen pane.items.menu.remove.multiple=Ausgewählte Einträge entfernen pane.items.menu.erase=Ausgewählten Eintrag aus der Bibliothek löschen... diff --git a/chrome/locale/de-CH/zotero/zotero.properties b/chrome/locale/de-CH/zotero/zotero.properties index 6ff75fe1bf..cf063202d7 100644 --- a/chrome/locale/de-CH/zotero/zotero.properties +++ b/chrome/locale/de-CH/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=Loading items list... pane.items.delete=Sind Sie sicher, dass Sie den ausgewählten Eintrag löschen möchten? pane.items.delete.multiple=Sind Sie sicher, dass Sie die ausgewählten Einträge löschen möchten? pane.items.delete.title=Löschen -pane.items.delete.attached=Angehängte Notizen und Dateien löschen pane.items.menu.remove=Ausgewählten Eintrag entfernen pane.items.menu.remove.multiple=Ausgewählte Einträge entfernen pane.items.menu.erase=Ausgewählten Eintrag aus der Bibliothek löschen... diff --git a/chrome/locale/de-DE/zotero/zotero.properties b/chrome/locale/de-DE/zotero/zotero.properties index a1230d29d5..799a128d23 100644 --- a/chrome/locale/de-DE/zotero/zotero.properties +++ b/chrome/locale/de-DE/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=Lade die Liste der Einträge... pane.items.delete=Sind Sie sicher, dass Sie den ausgewählten Eintrag löschen möchten? pane.items.delete.multiple=Sind Sie sicher, dass Sie die ausgewählten Einträge löschen möchten? pane.items.delete.title=Löschen -pane.items.delete.attached=Angehängte Notizen und Dateien löschen pane.items.menu.remove=Ausgewählten Eintrag entfernen pane.items.menu.remove.multiple=Ausgewählte Einträge entfernen pane.items.menu.erase=Ausgewählten Eintrag aus der Bibliothek löschen... diff --git a/chrome/locale/el-GR/zotero/zotero.properties b/chrome/locale/el-GR/zotero/zotero.properties index f0f201f024..3883a5eadf 100644 --- a/chrome/locale/el-GR/zotero/zotero.properties +++ b/chrome/locale/el-GR/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=Loading items list... pane.items.delete=Are you sure you want to delete the selected item? pane.items.delete.multiple=Are you sure you want to delete the selected items? pane.items.delete.title=Delete -pane.items.delete.attached=Erase attached notes and files pane.items.menu.remove=Remove Selected Item pane.items.menu.remove.multiple=Remove Selected Items pane.items.menu.erase=Delete Selected Item from Library... diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties index 7407e5a9cd..77d97701f5 100644 --- a/chrome/locale/en-US/zotero/zotero.properties +++ b/chrome/locale/en-US/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading = Loading items list... pane.items.delete = Are you sure you want to delete the selected item? pane.items.delete.multiple = Are you sure you want to delete the selected items? pane.items.delete.title = Delete -pane.items.delete.attached = Erase attached notes and files pane.items.menu.remove = Remove Selected Item pane.items.menu.remove.multiple = Remove Selected Items pane.items.menu.erase = Delete Selected Item from Library... diff --git a/chrome/locale/es-ES/zotero/zotero.properties b/chrome/locale/es-ES/zotero/zotero.properties index 67dd8cec06..11a87a3c6f 100644 --- a/chrome/locale/es-ES/zotero/zotero.properties +++ b/chrome/locale/es-ES/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=Cargando la lista de ítems... pane.items.delete=¿Seguro que quieres borrar el ítem asociado? pane.items.delete.multiple=¿Seguro que quieres borrar los ítems seleccionados? pane.items.delete.title=Borrar -pane.items.delete.attached=Borrar las notas y archivos adjuntos pane.items.menu.remove=Eliminar el ítem seleccionado pane.items.menu.remove.multiple=Eliminar los ítems seleccionados pane.items.menu.erase=Borrar de la biblioteca el ítem seleccionado diff --git a/chrome/locale/et-EE/zotero/zotero.properties b/chrome/locale/et-EE/zotero/zotero.properties index f0f201f024..3883a5eadf 100644 --- a/chrome/locale/et-EE/zotero/zotero.properties +++ b/chrome/locale/et-EE/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=Loading items list... pane.items.delete=Are you sure you want to delete the selected item? pane.items.delete.multiple=Are you sure you want to delete the selected items? pane.items.delete.title=Delete -pane.items.delete.attached=Erase attached notes and files pane.items.menu.remove=Remove Selected Item pane.items.menu.remove.multiple=Remove Selected Items pane.items.menu.erase=Delete Selected Item from Library... diff --git a/chrome/locale/fi-FI/zotero/zotero.properties b/chrome/locale/fi-FI/zotero/zotero.properties index 546aabe309..898e2b4600 100644 --- a/chrome/locale/fi-FI/zotero/zotero.properties +++ b/chrome/locale/fi-FI/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=Ladataan kohdeluettelo... pane.items.delete=Haluatko varmasti poistaa valitun kohteen? pane.items.delete.multiple=Haluatko varmasti poistaa valitut kohteet? pane.items.delete.title=Poista -pane.items.delete.attached=Tyhjennä liitetyt muistiot ja tiedostot pane.items.menu.remove=Poista valittu kohde pane.items.menu.remove.multiple=Poista valitut kohteet pane.items.menu.erase=Poista valittu kohde kirjastosta... diff --git a/chrome/locale/fr-FR/zotero/zotero.properties b/chrome/locale/fr-FR/zotero/zotero.properties index 48a6b03911..8075e1457d 100644 --- a/chrome/locale/fr-FR/zotero/zotero.properties +++ b/chrome/locale/fr-FR/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=Chargement de la liste des objets… pane.items.delete=Voulez-vous vraiment supprimer l'élément sélectionné ? pane.items.delete.multiple=Voulez-vous vraiment supprimer les éléments sélectionnés ? pane.items.delete.title=Supprimer -pane.items.delete.attached=Supprimer les notes et fichiers joints pane.items.menu.remove=Retirer l'élément sélectionné de la collection pane.items.menu.remove.multiple=Retirer les éléments sélectionnés de la collection pane.items.menu.erase=Supprimer l'élément sélectionné de la bibliothèque… diff --git a/chrome/locale/gl-ES/zotero/zotero.properties b/chrome/locale/gl-ES/zotero/zotero.properties index 42199c4f22..55ae69cf3b 100644 --- a/chrome/locale/gl-ES/zotero/zotero.properties +++ b/chrome/locale/gl-ES/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=Cargando a lista de elementos ... pane.items.delete=Está seguro de que quere eliminar o elemento seleccionado? pane.items.delete.multiple=Está seguro de que quere eliminar os elementos seleccionados? pane.items.delete.title=Eliminar -pane.items.delete.attached=Borrar notas e arquivos adxuntos pane.items.menu.remove=Eliminar o Elemento Seleccionado pane.items.menu.remove.multiple=Eliminar os Elementos Seleccionados pane.items.menu.erase=Eliminar da Biblioteca o Elemento Seleccionado... diff --git a/chrome/locale/he-IL/zotero/zotero.properties b/chrome/locale/he-IL/zotero/zotero.properties index 5347825f48..f0150d5c78 100644 --- a/chrome/locale/he-IL/zotero/zotero.properties +++ b/chrome/locale/he-IL/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=טוען רשימת פריטים... pane.items.delete=Are you sure you want to delete the selected item? pane.items.delete.multiple=האם אתה רוצה למחוק את הפריטים הנבחרים? pane.items.delete.title=מחק -pane.items.delete.attached=מחק הערות וקבצים מצורפים pane.items.menu.remove=הסר פריטים נבחרים pane.items.menu.remove.multiple=הסר פריטים נבחרים pane.items.menu.erase=מחק פריטים נבחרים מספריה... diff --git a/chrome/locale/hr-HR/zotero/zotero.properties b/chrome/locale/hr-HR/zotero/zotero.properties index f0f201f024..3883a5eadf 100644 --- a/chrome/locale/hr-HR/zotero/zotero.properties +++ b/chrome/locale/hr-HR/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=Loading items list... pane.items.delete=Are you sure you want to delete the selected item? pane.items.delete.multiple=Are you sure you want to delete the selected items? pane.items.delete.title=Delete -pane.items.delete.attached=Erase attached notes and files pane.items.menu.remove=Remove Selected Item pane.items.menu.remove.multiple=Remove Selected Items pane.items.menu.erase=Delete Selected Item from Library... diff --git a/chrome/locale/hu-HU/zotero/zotero.properties b/chrome/locale/hu-HU/zotero/zotero.properties index be19fefd50..df2f384cbc 100644 --- a/chrome/locale/hu-HU/zotero/zotero.properties +++ b/chrome/locale/hu-HU/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=Elemek listájának betöltése... pane.items.delete=A kijelölt elem törlésének megerősítése? pane.items.delete.multiple=A kijelölt elemek törlésének megerősítése? pane.items.delete.title=Törlés -pane.items.delete.attached=Kapcsolódó jegyzetek és fájlok törlése pane.items.menu.remove=Kijelölt elem törlése pane.items.menu.remove.multiple=Kijelölt elemek törlése pane.items.menu.erase=Kiválasztott elem törlése a könyvtárból... diff --git a/chrome/locale/is-IS/zotero/zotero.properties b/chrome/locale/is-IS/zotero/zotero.properties index 154751f40d..5e46cb5b22 100644 --- a/chrome/locale/is-IS/zotero/zotero.properties +++ b/chrome/locale/is-IS/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=Loading items list... pane.items.delete=Viltu örugglega eyða valdri færslu? pane.items.delete.multiple=Viltu örugglega eyða völdum færslum? pane.items.delete.title=Eyða -pane.items.delete.attached=Erase attached notes and files pane.items.menu.remove=Eyða valdri færslu pane.items.menu.remove.multiple=Eyða völdum færslum pane.items.menu.erase=Delete Selected Item from Library... diff --git a/chrome/locale/it-IT/zotero/zotero.properties b/chrome/locale/it-IT/zotero/zotero.properties index 87c8a9f5d7..eddb350d1e 100644 --- a/chrome/locale/it-IT/zotero/zotero.properties +++ b/chrome/locale/it-IT/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=Caricamento lista elementi in corso... pane.items.delete=Eliminare l'elemento selezionato? pane.items.delete.multiple=Eliminare gli elementi selezionati? pane.items.delete.title=Eliminazione elemento -pane.items.delete.attached=Rimuovi le note e i file allegati pane.items.menu.remove=Rimuovi l'elemento selezionato pane.items.menu.remove.multiple=Rimuovi gli elementi selezionati pane.items.menu.erase=Elimina l'elemento selezionato dalla libreria... diff --git a/chrome/locale/ja-JP/zotero/zotero.properties b/chrome/locale/ja-JP/zotero/zotero.properties index 2c6b4d47f0..ed3b308758 100644 --- a/chrome/locale/ja-JP/zotero/zotero.properties +++ b/chrome/locale/ja-JP/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=アイテムリストを読み込んでいます... pane.items.delete=選択されたアイテムを削除してよろしいですか？ pane.items.delete.multiple=選択されたアイテムを削除してよろしいですか？ pane.items.delete.title=削除 -pane.items.delete.attached=添付されたメモやファイルの削除 pane.items.menu.remove=アイテムの削除 pane.items.menu.remove.multiple=選択されたアイテムの削除 pane.items.menu.erase=アイテムをライブラリーから削除... diff --git a/chrome/locale/ko-KR/zotero/zotero.properties b/chrome/locale/ko-KR/zotero/zotero.properties index e07390769f..767086aa17 100644 --- a/chrome/locale/ko-KR/zotero/zotero.properties +++ b/chrome/locale/ko-KR/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=항목 목록 불러오기... pane.items.delete=선택된 항목을 삭제하길 원하는게 맞습니까? pane.items.delete.multiple=선택된 수집품들을 삭제하길 원하는게 맞습니까? pane.items.delete.title=삭제 -pane.items.delete.attached=첨부된 노트와 파일 지우기 pane.items.menu.remove=선택된 항목 삭제 pane.items.menu.remove.multiple=선택된 항목 삭제 pane.items.menu.erase=라이브러리로부터 선택된 항목 삭제... diff --git a/chrome/locale/mn-MN/zotero/zotero.properties b/chrome/locale/mn-MN/zotero/zotero.properties index 26cc560b96..701d8403da 100644 --- a/chrome/locale/mn-MN/zotero/zotero.properties +++ b/chrome/locale/mn-MN/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=Loading items list... pane.items.delete=Are you sure you want to delete the selected item? pane.items.delete.multiple=Are you sure you want to delete the selected items? pane.items.delete.title=Устгах -pane.items.delete.attached=Erase attached notes and files pane.items.menu.remove=Remove Selected Item pane.items.menu.remove.multiple=Remove Selected Items pane.items.menu.erase=Delete Selected Item from Library... diff --git a/chrome/locale/nb-NO/zotero/zotero.properties b/chrome/locale/nb-NO/zotero/zotero.properties index 1d05a3e839..ed3f6641a2 100644 --- a/chrome/locale/nb-NO/zotero/zotero.properties +++ b/chrome/locale/nb-NO/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=Laster elementliste... pane.items.delete=Er du sikker på at du vil slette det valgte elementet? pane.items.delete.multiple=Er du sikker på at du vil slette de valgte elementene? pane.items.delete.title=Slett -pane.items.delete.attached=Slett vedlagte notater og filer pane.items.menu.remove=Slett valgt element pane.items.menu.remove.multiple=Slett valgte elementer pane.items.menu.erase=Slett valgt element fra bibliotek... diff --git a/chrome/locale/nl-NL/zotero/zotero.properties b/chrome/locale/nl-NL/zotero/zotero.properties index 08f7fd6002..919ab8c16b 100644 --- a/chrome/locale/nl-NL/zotero/zotero.properties +++ b/chrome/locale/nl-NL/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=Objecten-lijst wordt geladen... pane.items.delete=Wilt u het geselecteerde object verwijderen? pane.items.delete.multiple=Wilt u de geselecteerde objecten verwijderen? pane.items.delete.title=Verwijderen -pane.items.delete.attached=Bijgevoegde aantekeningen en bestanden wissen pane.items.menu.remove=Geselecteerd object verwijderen pane.items.menu.remove.multiple=Geselecteerde objecten verwijderen pane.items.menu.erase=Object verwijderen uit bibliotheek... diff --git a/chrome/locale/pl-PL/zotero/zotero.properties b/chrome/locale/pl-PL/zotero/zotero.properties index 642dd77fbe..61ef3f73fe 100644 --- a/chrome/locale/pl-PL/zotero/zotero.properties +++ b/chrome/locale/pl-PL/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=Wczytywanie listy elementów... pane.items.delete=Czy na pewno chcesz usunąć zaznaczony element? pane.items.delete.multiple=Czy na pewno chcesz usunąć zaznaczone elementy? pane.items.delete.title=Usuń -pane.items.delete.attached=Usuń dołączone notatki i pliki pane.items.menu.remove=Usuń zaznaczony element pane.items.menu.remove.multiple=Usuń zaznaczone elementy pane.items.menu.erase=Usuń zaznaczony element z biblioteki diff --git a/chrome/locale/pt-BR/zotero/zotero.properties b/chrome/locale/pt-BR/zotero/zotero.properties index 3153955e92..76c3662966 100644 --- a/chrome/locale/pt-BR/zotero/zotero.properties +++ b/chrome/locale/pt-BR/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=Loading items list... pane.items.delete=Você deseja apagar o item selecionado? pane.items.delete.multiple=Você deseja apagar os itens selecionados? pane.items.delete.title=Apagar -pane.items.delete.attached=Apagar os anexos das notas e arquivos pane.items.menu.remove=Remover item selecionado pane.items.menu.remove.multiple=Remover itens selecionados pane.items.menu.erase=Apagar item selecionado da biblioteca... diff --git a/chrome/locale/pt-PT/zotero/zotero.properties b/chrome/locale/pt-PT/zotero/zotero.properties index d0f6be8257..4afd3c6d4f 100644 --- a/chrome/locale/pt-PT/zotero/zotero.properties +++ b/chrome/locale/pt-PT/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=Carregando lista de itens... pane.items.delete=Quer mesmo remover o item seleccionado? pane.items.delete.multiple=Quer mesmo remover os itens seleccionados? pane.items.delete.title=Remover -pane.items.delete.attached=Eliminar notas e arquivos anexos pane.items.menu.remove=Remover Item Seleccionado pane.items.menu.remove.multiple=Remover Itens Seleccionados pane.items.menu.erase=Remover Item Seleccionado da Biblioteca... diff --git a/chrome/locale/ro-RO/zotero/zotero.properties b/chrome/locale/ro-RO/zotero/zotero.properties index a53a19d9e4..80357e7262 100644 --- a/chrome/locale/ro-RO/zotero/zotero.properties +++ b/chrome/locale/ro-RO/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=Încarcă lista înregistrărilor... pane.items.delete=Eşti sigur că vrei să ştergi înregistrarea selectată? pane.items.delete.multiple=Eşti sigur că vrei să ştergi înregistrările selectate? pane.items.delete.title=Şterge -pane.items.delete.attached=Şterge notele şi fişierele ataşate pane.items.menu.remove=Şterge înregistrarea selectată pane.items.menu.remove.multiple=Şterge înregistrările selectate pane.items.menu.erase=Şterge din bibliotecă înregistrarea selectată... diff --git a/chrome/locale/ru-RU/zotero/zotero.properties b/chrome/locale/ru-RU/zotero/zotero.properties index 3f1b1d20c7..eade61d9ac 100644 --- a/chrome/locale/ru-RU/zotero/zotero.properties +++ b/chrome/locale/ru-RU/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=Загружается список документов: pane.items.delete=Вы уверены, что хотите удалить выбранный документ? pane.items.delete.multiple=Вы уверены, что хотите удалить выбранные документы? pane.items.delete.title=Удалить -pane.items.delete.attached=Стереть прикрепленные записи и файлы pane.items.menu.remove=Удалить выбранный документ pane.items.menu.remove.multiple=Удалить выбранные документы pane.items.menu.erase=Удалить выбранный документ из библиотеки... diff --git a/chrome/locale/sk-SK/zotero/zotero.properties b/chrome/locale/sk-SK/zotero/zotero.properties index 302ad1657e..e3d17b266e 100644 --- a/chrome/locale/sk-SK/zotero/zotero.properties +++ b/chrome/locale/sk-SK/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=Nahrávam zoznam položiek... pane.items.delete=Naozaj chcete vymazať zvolenú položku? pane.items.delete.multiple=Naozaj že chcete vymazať zvolené položky? pane.items.delete.title=Vymaž -pane.items.delete.attached=Vymaž priložené poznámky a súbory pane.items.menu.remove=Odstráň vybranú položku pane.items.menu.remove.multiple=Odstráň vybrané položky pane.items.menu.erase=Vymaž vybranú položku z knižnice... diff --git a/chrome/locale/sl-SI/zotero/zotero.properties b/chrome/locale/sl-SI/zotero/zotero.properties index b865600ac1..e88d7e58d9 100644 --- a/chrome/locale/sl-SI/zotero/zotero.properties +++ b/chrome/locale/sl-SI/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=Nalaganje seznama vnosov ... pane.items.delete=Ste prepričani, da želite izbrisati izbrani vnos? pane.items.delete.multiple=Ste prepričani, da želite izbrisati izbrane vnose? pane.items.delete.title=Izbriši -pane.items.delete.attached=Izbriši pripete opombe in datoteke pane.items.menu.remove=Odstrani izbrani vnos pane.items.menu.remove.multiple=Odstrani izbrane vnose pane.items.menu.erase=Izbriši izbrani vnos iz knjižnice ... diff --git a/chrome/locale/sr-RS/zotero/zotero.properties b/chrome/locale/sr-RS/zotero/zotero.properties index f801d511fa..5dd4c9d95e 100644 --- a/chrome/locale/sr-RS/zotero/zotero.properties +++ b/chrome/locale/sr-RS/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=Учитавам списак ставки... pane.items.delete=Да ли сте сигурни да желите избрисати изабрану ставку? pane.items.delete.multiple=Да ли сте сигурни да желите избрисати изабране ставке? pane.items.delete.title=Избриши -pane.items.delete.attached=Избриши приложене белешке и датотеке pane.items.menu.remove=Избаци изабрану ставку pane.items.menu.remove.multiple=Избаци изабране ставке pane.items.menu.erase=Избриши изабрану ставку из библиотеке... diff --git a/chrome/locale/sv-SE/zotero/zotero.properties b/chrome/locale/sv-SE/zotero/zotero.properties index 7f482b6983..f397c5d64d 100644 --- a/chrome/locale/sv-SE/zotero/zotero.properties +++ b/chrome/locale/sv-SE/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=Laddar lista med poster... pane.items.delete=Är du säker på att du vill ta bort den valda posten? pane.items.delete.multiple=Är du säker på att du vill ta bort de valda posterna? pane.items.delete.title=Ta bort -pane.items.delete.attached=Radera bifogade anteckningar och filer pane.items.menu.remove=Ta bort vald post pane.items.menu.remove.multiple=Ta bort valda poster pane.items.menu.erase=Ta bort vald post från biblioteket diff --git a/chrome/locale/th-TH/zotero/zotero.properties b/chrome/locale/th-TH/zotero/zotero.properties index 4ec10435b2..2b5e6995d7 100644 --- a/chrome/locale/th-TH/zotero/zotero.properties +++ b/chrome/locale/th-TH/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=กำลังโหลดรายการไอเทม. pane.items.delete=ท่านแน่ใจหรือว่าต้องการลบไอเทมที่เลือกอยู่? pane.items.delete.multiple=ท่านแน่ใจหรือว่าต้องการลบไอเทมที่เลือกอยู่? pane.items.delete.title=ลบ -pane.items.delete.attached=ลบโน๊ตและไฟล์ที่แนบอยู่ pane.items.menu.remove=ลบไอเทมที่เลือกอยู่ pane.items.menu.remove.multiple=ลบไอเทมที่เลือกอยู่ pane.items.menu.erase=ลบไอเทมที่เลือกจากไลบรารี่... diff --git a/chrome/locale/tr-TR/zotero/zotero.properties b/chrome/locale/tr-TR/zotero/zotero.properties index fad7eb02bd..801f6e0bb3 100644 --- a/chrome/locale/tr-TR/zotero/zotero.properties +++ b/chrome/locale/tr-TR/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=Eserlerin listesi yükleniyor... pane.items.delete=Seçili olan bu eseri silmek istediğinize emin misiniz? pane.items.delete.multiple=Seçili olan bu eserleri silmek istediğinize emin misiniz? pane.items.delete.title=Sil -pane.items.delete.attached=Ek dosya ve notları Sil pane.items.menu.remove=Seçili Eseri Sil pane.items.menu.remove.multiple=Seçili Eserleri Sil pane.items.menu.erase=Seçili Eseri Kitaplıktan Sil... diff --git a/chrome/locale/vi-VN/zotero/zotero.properties b/chrome/locale/vi-VN/zotero/zotero.properties index 8d05a0d3b9..0fbd7e3980 100644 --- a/chrome/locale/vi-VN/zotero/zotero.properties +++ b/chrome/locale/vi-VN/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=Tải danh sách các biểu ghi... pane.items.delete=Bạn có chắc bạn muốn xóa biểu ghi vừa chọn? pane.items.delete.multiple=Bạn có chắc bạn muốn xóa những biểu ghi vừa chọn? pane.items.delete.title=Xóa -pane.items.delete.attached=Xóa các ghi chép và các tập tin đính kèm pane.items.menu.remove=Xóa Biểu ghi vừa chọn pane.items.menu.remove.multiple=Xóa các Biểu ghi vừa chọn pane.items.menu.erase=Xóa Biểu ghi vừa chọn khỏi Thư viện... diff --git a/chrome/locale/zh-CN/zotero/zotero.properties b/chrome/locale/zh-CN/zotero/zotero.properties index ac3b90047d..bddee3d078 100644 --- a/chrome/locale/zh-CN/zotero/zotero.properties +++ b/chrome/locale/zh-CN/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=加载条目列表... pane.items.delete=您确信要删除所选条目吗? pane.items.delete.multiple=您确信要删除所选条目吗? pane.items.delete.title=删除 -pane.items.delete.attached=清除附加的便笺和文件 pane.items.menu.remove=移除所选条目 pane.items.menu.remove.multiple=移除所选条目 pane.items.menu.erase=从库中删除所选条目... diff --git a/chrome/locale/zh-TW/zotero/zotero.properties b/chrome/locale/zh-TW/zotero/zotero.properties index c3da7c0e2a..d406bcd639 100644 --- a/chrome/locale/zh-TW/zotero/zotero.properties +++ b/chrome/locale/zh-TW/zotero/zotero.properties @@ -89,7 +89,6 @@ pane.items.loading=正在載入項目清單… pane.items.delete=你確定要刪除所選取的項目嗎？ pane.items.delete.multiple=你確定要刪除所選取的項目嗎？ pane.items.delete.title=刪除 -pane.items.delete.attached=清除附加的筆記和檔案 pane.items.menu.remove=移除選取的項目 pane.items.menu.remove.multiple=移除選取的項目 pane.items.menu.erase=從圖書館中刪除選取的項目…