From d7a8b2bb87073f2f83bd1db7f35886ebd76ed5ae Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Wed, 22 Feb 2023 22:08:23 -0500 Subject: [PATCH 01/86] Update version --- install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.rdf b/install.rdf index 895b55add5b..a1922c9b2ef 100644 --- a/install.rdf +++ b/install.rdf @@ -6,7 +6,7 @@ zotero@chnm.gmu.edu Zotero - 6.0.22.SOURCE + 6.0.23.SOURCE false 2 From c3cde7784d6b2362319bbca544d630496e4855db Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Wed, 22 Feb 2023 22:15:53 -0500 Subject: [PATCH 02/86] Update CSL locales --- chrome/content/zotero/locale/csl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/content/zotero/locale/csl b/chrome/content/zotero/locale/csl index cb98d366912..9b9366b71b8 160000 --- a/chrome/content/zotero/locale/csl +++ b/chrome/content/zotero/locale/csl @@ -1 +1 @@ -Subproject commit cb98d366912a0c0be361880e12fbc43cef6d383e +Subproject commit 9b9366b71b8fe220f5c416ea4b0c72c80a6984ae From bdadd363d377725409715314c2f1a2dcb811b6d7 Mon Sep 17 00:00:00 2001 From: Abe Jellinek Date: Thu, 23 Feb 2023 16:36:59 -0500 Subject: [PATCH 03/86] Scaffold web template: Serialize multiples Fixes #2980 --- chrome/content/scaffold/templates/newWeb.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/chrome/content/scaffold/templates/newWeb.js b/chrome/content/scaffold/templates/newWeb.js index e7dd48bad26..ec68b64c156 100644 --- a/chrome/content/scaffold/templates/newWeb.js +++ b/chrome/content/scaffold/templates/newWeb.js @@ -54,11 +54,9 @@ function getSearchResults(doc, checkOnly) { async function doWeb(doc, url) { if (detectWeb(doc, url) == 'multiple') { let items = await Zotero.selectItems(getSearchResults(doc, false)); - if (items) { - await Promise.all( - Object.keys(items) - .map(url => requestDocument(url).then(scrape)) - ); + if (!items) return; + for (let url of Object.keys(items)) { + await scrape(await requestDocument(url)); } } else { From adf6f9f2fb238db5226c5f99aabcdc456cf03b5f Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sat, 25 Feb 2023 01:36:45 -0500 Subject: [PATCH 04/86] Use clearer variable in item box https://groups.google.com/g/zotero-dev/c/TvOfXVxwwkA/m/SdpU1QD7AAAJ --- chrome/content/zotero/bindings/itembox.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/content/zotero/bindings/itembox.xml b/chrome/content/zotero/bindings/itembox.xml index 22c050d6e4a..9857b2a1cd8 100644 --- a/chrome/content/zotero/bindings/itembox.xml +++ b/chrome/content/zotero/bindings/itembox.xml @@ -392,7 +392,7 @@ && Zotero.ItemFields.isDate(fieldName) // TEMP - NSF && fieldName != 'dateSent') { - this.addDateRow(fieldNames[i], this.item.getField(fieldName, true), tabindex); + this.addDateRow(fieldName, this.item.getField(fieldName, true), tabindex); continue; } } From 935c67bc01017e3bd6c67003a90c0b7acca239a5 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Tue, 28 Feb 2023 00:34:22 -0500 Subject: [PATCH 05/86] Match duplicates with same last name but different field modes https://forums.zotero.org/discussion/103307/duplicates-not-being-recognised-as-duplicates --- chrome/content/zotero/xpcom/duplicates.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chrome/content/zotero/xpcom/duplicates.js b/chrome/content/zotero/xpcom/duplicates.js index 0d89c0bb48f..41b2798143c 100644 --- a/chrome/content/zotero/xpcom/duplicates.js +++ b/chrome/content/zotero/xpcom/duplicates.js @@ -384,12 +384,12 @@ Zotero.Duplicates.prototype._findDuplicates = Zotero.Promise.coroutine(function* for (let i = 0; i < aCreatorRows.length; i++) { let aCreatorRow = aCreatorRows[i]; let aLastName = aCreatorRow.lastName; - let aFirstInitial = aCreatorRow.firstInitial; + let aFirstInitial = aCreatorRow.firstInitial || ""; for (let j = 0; j < bCreatorRows.length; j++) { let bCreatorRow = bCreatorRows[j]; let bLastName = bCreatorRow.lastName; - let bFirstInitial = bCreatorRow.firstInitial; + let bFirstInitial = bCreatorRow.firstInitial || ""; if (aLastName === bLastName && aFirstInitial === bFirstInitial) { return 1; From 59ba212cf8a38da3286f019e0d1442e928a52b59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adomas=20Ven=C4=8Dkauskas?= Date: Tue, 28 Feb 2023 13:37:33 +0200 Subject: [PATCH 06/86] Use referrer from connector when saving snapshots Closes #3006 --- chrome/content/zotero/xpcom/connector/server_connector.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/chrome/content/zotero/xpcom/connector/server_connector.js b/chrome/content/zotero/xpcom/connector/server_connector.js index 7e8d364e9cd..30e22616128 100644 --- a/chrome/content/zotero/xpcom/connector/server_connector.js +++ b/chrome/content/zotero/xpcom/connector/server_connector.js @@ -1175,6 +1175,7 @@ Zotero.Server.Connector.SaveSnapshot.prototype = { let item = await Zotero.Attachments.importFromURL({ libraryID, url: data.url, + referrer: data.referrer, collections: collection ? [collection.id] : undefined, contentType: "application/pdf", cookieSandbox @@ -1234,6 +1235,7 @@ Zotero.Server.Connector.SaveSnapshot.prototype = { await Zotero.Attachments.importFromURL({ libraryID, url: data.url, + referrer: data.referrer, title, parentItemID: itemID, contentType: "text/html", From 8ac77bf9f076a4aa94fd395d143029bd074dc592 Mon Sep 17 00:00:00 2001 From: Andreas Grapentin Date: Sun, 5 Mar 2023 04:16:05 +0100 Subject: [PATCH 07/86] modified standalone keyset to include the quitApplication keybinding (#3010) modified unix keyset to include the quitApplication keybinding, modified windows keyset to use the correct keybinding --- .../zotero-platform/unix/standalone/menuOverlay.xul | 8 ++++++++ .../zotero-platform/win/standalone/menuOverlay.xul | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/chrome/content/zotero-platform/unix/standalone/menuOverlay.xul b/chrome/content/zotero-platform/unix/standalone/menuOverlay.xul index 0e4b1ed6709..234a986b996 100644 --- a/chrome/content/zotero-platform/unix/standalone/menuOverlay.xul +++ b/chrome/content/zotero-platform/unix/standalone/menuOverlay.xul @@ -40,6 +40,14 @@ + + + + + From 1f45c44b86a0c222f773a25eb8aca749e658b20d Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sat, 4 Mar 2023 21:58:43 -0500 Subject: [PATCH 08/86] Fix `no such column: IA.authorName` error from early 6.0 beta upgrade Fixes #3013 --- chrome/content/zotero/xpcom/data/items.js | 103 ++++++++++++---------- chrome/content/zotero/xpcom/schema.js | 3 + 2 files changed, 61 insertions(+), 45 deletions(-) diff --git a/chrome/content/zotero/xpcom/data/items.js b/chrome/content/zotero/xpcom/data/items.js index bf3dc0783bb..dcc244f6855 100644 --- a/chrome/content/zotero/xpcom/data/items.js +++ b/chrome/content/zotero/xpcom/data/items.js @@ -500,55 +500,68 @@ Zotero.Items = function() { + "FROM items JOIN itemAnnotations IA USING (itemID) " + "WHERE libraryID=?" + idSQL; var params = [libraryID]; - await Zotero.DB.queryAsync( - sql, - params, - { - noCache: true, - onRow: function (row) { - let itemID = row.getResultByIndex(0); - - let item = this._objectCache[itemID]; - if (!item) { - throw new Error("Item " + itemID + " not found"); - } - - item._parentItemID = row.getResultByIndex(1); - var typeID = row.getResultByIndex(2); - var type; - switch (typeID) { - case Zotero.Annotations.ANNOTATION_TYPE_HIGHLIGHT: - type = 'highlight'; - break; - - case Zotero.Annotations.ANNOTATION_TYPE_NOTE: - type = 'note'; - break; + + // TEMP: Fix faulty upgrade from early 6.0 beta + // https://github.com/zotero/zotero/issues/3013 + try { + await Zotero.DB.queryAsync( + sql, + params, + { + noCache: true, + onRow: function (row) { + let itemID = row.getResultByIndex(0); - case Zotero.Annotations.ANNOTATION_TYPE_IMAGE: - type = 'image'; - break; + let item = this._objectCache[itemID]; + if (!item) { + throw new Error("Item " + itemID + " not found"); + } - case Zotero.Annotations.ANNOTATION_TYPE_INK: - type = 'ink'; - break; + item._parentItemID = row.getResultByIndex(1); + var typeID = row.getResultByIndex(2); + var type; + switch (typeID) { + case Zotero.Annotations.ANNOTATION_TYPE_HIGHLIGHT: + type = 'highlight'; + break; + + case Zotero.Annotations.ANNOTATION_TYPE_NOTE: + type = 'note'; + break; + + case Zotero.Annotations.ANNOTATION_TYPE_IMAGE: + type = 'image'; + break; + + case Zotero.Annotations.ANNOTATION_TYPE_INK: + type = 'ink'; + break; + + default: + throw new Error(`Unknown annotation type id ${typeID}`); + } + item._annotationType = type; + item._annotationAuthorName = row.getResultByIndex(3); + item._annotationText = row.getResultByIndex(4); + item._annotationComment = row.getResultByIndex(5); + item._annotationColor = row.getResultByIndex(6); + item._annotationSortIndex = row.getResultByIndex(7); + item._annotationIsExternal = !!row.getResultByIndex(8); - default: - throw new Error(`Unknown annotation type id ${typeID}`); - } - item._annotationType = type; - item._annotationAuthorName = row.getResultByIndex(3); - item._annotationText = row.getResultByIndex(4); - item._annotationComment = row.getResultByIndex(5); - item._annotationColor = row.getResultByIndex(6); - item._annotationSortIndex = row.getResultByIndex(7); - item._annotationIsExternal = !!row.getResultByIndex(8); - - item._loaded.annotation = true; - item._clearChanged('annotation'); - }.bind(this) + item._loaded.annotation = true; + item._clearChanged('annotation'); + }.bind(this) + } + ); + } + catch (e) { + if (e.message.includes('no such column: IA.authorName') + && await Zotero.DB.valueQueryAsync("SELECT COUNT(*) FROM version WHERE schema='userdata' AND version=120")) { + await Zotero.DB.queryAsync("UPDATE version SET version=119 WHERE schema='userdata'"); + Zotero.crash(); } - ); + throw e; + } }; diff --git a/chrome/content/zotero/xpcom/schema.js b/chrome/content/zotero/xpcom/schema.js index 3978bae4898..8f2c14784c8 100644 --- a/chrome/content/zotero/xpcom/schema.js +++ b/chrome/content/zotero/xpcom/schema.js @@ -3466,6 +3466,9 @@ Zotero.Schema = new function(){ } } + // TEMP: When adding 121, check whether IA.authorName fix in items.js::_loadAnnotations() + // should be updated + // If breaking compatibility or doing anything dangerous, clear minorUpdateFrom } From a1d06066b264d74d5a36f4d25cda853882e96157 Mon Sep 17 00:00:00 2001 From: Tom Najdek Date: Wed, 8 Mar 2023 01:40:42 +0100 Subject: [PATCH 09/86] Mendeley importer: Fix issue with empty creators (#3016) It does not appear to be possible to create a creator with no values in Mendeley, however we got reports of these causing the imports to fail. This tweak makes the importer more resilient by discarding empty/invalid creators. --- .../zotero/import/mendeley/mendeleyImport.js | 7 +- .../mendeleyMock/items-empty-creators.json | 69 +++++++++++++++++++ test/tests/mendeleyImportTest.js | 34 +++++++++ 3 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 test/tests/data/mendeleyMock/items-empty-creators.json diff --git a/chrome/content/zotero/import/mendeley/mendeleyImport.js b/chrome/content/zotero/import/mendeley/mendeleyImport.js index 855a812db3d..10a8e12c6db 100644 --- a/chrome/content/zotero/import/mendeley/mendeleyImport.js +++ b/chrome/content/zotero/import/mendeley/mendeleyImport.js @@ -636,7 +636,12 @@ Zotero_Import_Mendeley.prototype._getDocumentCreatorsAPI = async function (docum const authors = (doc.authors || []).map(c => this._makeCreator('author', c.first_name, c.last_name)); const editors = (doc.editors || []).map(c => this._makeCreator('editor', c.first_name, c.last_name)); const translators = (doc.translators || []).map(c => this._makeCreator('translator', c.first_name, c.last_name)); - map.set(doc.id, [...authors, ...editors, ...translators]); + const creators = [...authors, ...editors, ...translators]; + const validCreators = creators.filter(c => c.name || c.firstName || c.lastName); + if (creators.length !== validCreators.length) { + Zotero.debug(`Discarding ${creators.length - validCreators.length} invalid creators for document ${doc.id}`); + } + map.set(doc.id, validCreators); } return map; }; diff --git a/test/tests/data/mendeleyMock/items-empty-creators.json b/test/tests/data/mendeleyMock/items-empty-creators.json new file mode 100644 index 00000000000..c93c0d99ebc --- /dev/null +++ b/test/tests/data/mendeleyMock/items-empty-creators.json @@ -0,0 +1,69 @@ +[ + { + "authored": false, + "confirmed": true, + "created": "2023-03-07T13:30:46.353Z", + "file_attached": false, + "hidden": false, + "id": "b7b1023f-5072-4608-8fd5-87b045b77887", + "client_data": "{\"desktop_id\":\"9c03fca4-ee5b-435e-abdd-fb6d7d11cd02\"}", + "last_modified": "2023-03-07T13:30:46.025Z", + "private_publication": false, + "profile_id": "8dbf0832-8723-4c48-b532-20c0b7f6e01a", + "read": false, + "source": "something wrong", + "identifiers": { + "doi": "10.1111", + "pmid": "PMID: 11111111", + "arxiv": "1111.2222" + }, + "starred": false, + "title": "This one has no authors", + "type": "journal", + "folder_uuids": [ + "8d2f262d-49b3-4dfc-8968-0bb71bcd92ea" + ], + "year": 1987 + }, + { + "authored": false, + "confirmed": true, + "created": "2023-03-07T13:30:46.353Z", + "file_attached": false, + "hidden": false, + "id": "a15698a9-6214-4fac-81c5-5ac62b2d06b5", + "client_data": "{\"desktop_id\":\"fd86e48e-1931-4282-b72d-78c535b0398c\"}", + "last_modified": "2023-03-07T13:30:46.025Z", + "private_publication": false, + "profile_id": "8dbf0832-8723-4c48-b532-20c0b7f6e01a", + "read": false, + "source": "something wrong", + "identifiers": + { + "doi": "10.1111", + "pmid": "PMID: 11111111", + "arxiv": "1111.2222" + }, + "starred": false, + "title": "This one has empty authors", + "authors": + [ + { + "first_name": "", + "last_name": "" + }, + { + "first_name": "", + "last_name": "" + }, + { + + } + ], + "type": "journal", + "folder_uuids": [ + "8d2f262d-49b3-4dfc-8968-0bb71bcd92ea" + ], + "year": 1987 + } +] \ No newline at end of file diff --git a/test/tests/mendeleyImportTest.js b/test/tests/mendeleyImportTest.js index 8c257cf9af7..d160c2dcb47 100644 --- a/test/tests/mendeleyImportTest.js +++ b/test/tests/mendeleyImportTest.js @@ -451,7 +451,41 @@ describe('Zotero_Import_Mendeley', function () { const noNewItemHere = await Zotero.Relations.getByPredicateAndObject('item', 'mendeleyDB:documentUUID', '86e56a00-5ae5-4fe8-a977-9298a03b16d6'); assert.lengthOf(noNewItemHere, 0); + }); + + it("should handle empty creators", async () => { + setHTTPResponse(server, 'https://api.mendeley.com/', { + method: 'GET', + url: `documents?view=all&limit=500`, + status: 200, + headers: {}, + json: JSON.parse( + await Zotero.File.getContentsFromURLAsync('resource://zotero-unit-tests/data/mendeleyMock/items-empty-creators.json') + ) + }); + + const importer = getImporter(); + await importer.translate({ + libraryID: Zotero.Libraries.userLibraryID, + collections: null, + linkFiles: false, + }); + + const journalNoAuthors = (await Zotero.Relations + .getByPredicateAndObject('item', 'mendeleyDB:documentUUID', '9c03fca4-ee5b-435e-abdd-fb6d7d11cd02')) + .filter(item => item.libraryID == Zotero.Libraries.userLibraryID && !item.deleted) + .shift(); + + assert.equal(journalNoAuthors.getField('title'), 'This one has no authors'); + assert.equal(journalNoAuthors.getCreators().length, 0); + + const journalEmptyAuthors = (await Zotero.Relations + .getByPredicateAndObject('item', 'mendeleyDB:documentUUID', 'fd86e48e-1931-4282-b72d-78c535b0398c')) + .filter(item => item.libraryID == Zotero.Libraries.userLibraryID && !item.deleted) + .shift(); + assert.equal(journalEmptyAuthors.getField('title'), 'This one has empty authors'); + assert.equal(journalEmptyAuthors.getCreators().length, 0); }); }); }); From c57c3c470e067beea7841a756b26123eb94dfe1f Mon Sep 17 00:00:00 2001 From: Tom Najdek Date: Thu, 9 Mar 2023 22:13:19 +0100 Subject: [PATCH 10/86] Mendeley importer: Fix issue with empty tags (#3018) Also adds a test for this particular case and for importing tags in general. --- .../zotero/import/mendeley/mendeleyImport.js | 5 +++- ...mpty-creators.json => items-bad-data.json} | 28 +++++++++++++++++++ .../tests/data/mendeleyMock/items-simple.json | 25 +++++++++++++++++ test/tests/mendeleyImportTest.js | 28 +++++++++++++++++-- 4 files changed, 83 insertions(+), 3 deletions(-) rename test/tests/data/mendeleyMock/{items-empty-creators.json => items-bad-data.json} (68%) diff --git a/chrome/content/zotero/import/mendeley/mendeleyImport.js b/chrome/content/zotero/import/mendeley/mendeleyImport.js index 10a8e12c6db..81e9a79cd78 100644 --- a/chrome/content/zotero/import/mendeley/mendeleyImport.js +++ b/chrome/content/zotero/import/mendeley/mendeleyImport.js @@ -680,7 +680,10 @@ Zotero_Import_Mendeley.prototype._getDocumentTagsDB = async function (groupID) { Zotero_Import_Mendeley.prototype._getDocumentTagsAPI = async function (documents) { var map = new Map(); for (let doc of documents) { - const tags = [...(doc.tags || []).map(tag => ({ tag, type: 0 })), ...(doc.keywords || []).map(tag => ({ tag, type: 1 }))]; + const tags = [ + ...(doc.tags || []).map(tag => ({ tag, type: 0 })), + ...(doc.keywords || []).map(tag => ({ tag, type: 1 })) + ].filter(t => t.tag && t.tag.trim()); map.set(doc.id, tags); } return map; diff --git a/test/tests/data/mendeleyMock/items-empty-creators.json b/test/tests/data/mendeleyMock/items-bad-data.json similarity index 68% rename from test/tests/data/mendeleyMock/items-empty-creators.json rename to test/tests/data/mendeleyMock/items-bad-data.json index c93c0d99ebc..9e9cc06dd7e 100644 --- a/test/tests/data/mendeleyMock/items-empty-creators.json +++ b/test/tests/data/mendeleyMock/items-bad-data.json @@ -65,5 +65,33 @@ "8d2f262d-49b3-4dfc-8968-0bb71bcd92ea" ], "year": 1987 + }, + { + "authored": false, + "confirmed": true, + "created": "2023-03-07T13:30:46.353Z", + "file_attached": false, + "hidden": false, + "id": "49426b47-d9ff-4ab6-ba2c-54e3608f56b8", + "client_data": "{\"desktop_id\":\"c7ec2737-044a-493b-9d94-d7f67be68765\"}", + "last_modified": "2023-03-07T13:30:46.025Z", + "private_publication": false, + "profile_id": "8dbf0832-8723-4c48-b532-20c0b7f6e01a", + "read": false, + "source": "something wrong", + "identifiers": { + "doi": "10.1111", + "pmid": "PMID: 11111111", + "arxiv": "1111.2222" + }, + "starred": false, + "tags": ["", ""], + "keywords": [], + "title": "This one has empty tags and keywords", + "type": "journal", + "folder_uuids": [ + "8d2f262d-49b3-4dfc-8968-0bb71bcd92ea" + ], + "year": 1987 } ] \ No newline at end of file diff --git a/test/tests/data/mendeleyMock/items-simple.json b/test/tests/data/mendeleyMock/items-simple.json index 4e0da03e3fd..085b17db106 100644 --- a/test/tests/data/mendeleyMock/items-simple.json +++ b/test/tests/data/mendeleyMock/items-simple.json @@ -87,5 +87,30 @@ "filehash": "cc22c6611277df346ff8dc7386ba3880b2bafa15" } ] + }, + { + "authored": false, + "confirmed": true, + "created": "2021-11-04T11:53:10.353Z", + "file_attached": false, + "hidden": false, + "id": "cda0c150-bc85-4312-af2c-61a29b179595", + "client_data": "{\"desktop_id\":\"4308d8ec-e8ea-43fb-9d38-4e6628f7c10a\"}", + "last_modified": "2021-11-04T11:53:10.353Z", + "private_publication": false, + "profile_id": "8dbf0832-8723-4c48-b532-20c0b7f6e01a", + "read": false, + "starred": false, + "tags": [ + "tag1", + "tag2" + ], + "keywords": [ + "keyword1", + "keyword2" + ], + "title": "Has tags", + "type": "report", + "year": 2002 } ] \ No newline at end of file diff --git a/test/tests/mendeleyImportTest.js b/test/tests/mendeleyImportTest.js index d160c2dcb47..caf66f5f73c 100644 --- a/test/tests/mendeleyImportTest.js +++ b/test/tests/mendeleyImportTest.js @@ -176,6 +176,11 @@ describe('Zotero_Import_Mendeley', function () { .filter(item => item.libraryID == Zotero.Libraries.userLibraryID && !item.deleted) .shift(); + const withTags = (await Zotero.Relations + .getByPredicateAndObject('item', 'mendeleyDB:documentUUID', '4308d8ec-e8ea-43fb-9d38-4e6628f7c10a')) + .filter(item => item.libraryID == Zotero.Libraries.userLibraryID && !item.deleted) + .shift(); + assert.equal(journal.getRelations()['mendeleyDB:remoteDocumentUUID'], '7fea3cb3-f97d-3f16-8fad-f59caaa71688'); assert.equal(journal.getField('title'), 'Foo Bar'); @@ -197,6 +202,17 @@ describe('Zotero_Import_Mendeley', function () { assert.equal(journal.getField('DOI'), '10.1111'); assert.sameMembers(journal.getField('extra').split('\n'), ['PMID: 11111111', 'arXiv: 1111.2222']); + // tags + assert.equal(withTags.getTags().length, 4); + assert.sameMembers( + withTags.getTags().filter(t => t.type === 1).map(t => t.tag), + ['keyword1', 'keyword2'] + ); + assert.sameMembers( + withTags.getTags().filter(t => !t.type).map(t => t.tag), + ['tag1', 'tag2'] + ); + // attachment & annotations assert.lengthOf(withpdf.getAttachments(), 1); assert.equal(pdf.parentID, withpdf.id); @@ -453,14 +469,14 @@ describe('Zotero_Import_Mendeley', function () { assert.lengthOf(noNewItemHere, 0); }); - it("should handle empty creators", async () => { + it("should handle empty creators and tags", async () => { setHTTPResponse(server, 'https://api.mendeley.com/', { method: 'GET', url: `documents?view=all&limit=500`, status: 200, headers: {}, json: JSON.parse( - await Zotero.File.getContentsFromURLAsync('resource://zotero-unit-tests/data/mendeleyMock/items-empty-creators.json') + await Zotero.File.getContentsFromURLAsync('resource://zotero-unit-tests/data/mendeleyMock/items-bad-data.json') ) }); @@ -486,6 +502,14 @@ describe('Zotero_Import_Mendeley', function () { assert.equal(journalEmptyAuthors.getField('title'), 'This one has empty authors'); assert.equal(journalEmptyAuthors.getCreators().length, 0); + + const journalEmptyTags = (await Zotero.Relations + .getByPredicateAndObject('item', 'mendeleyDB:documentUUID', 'c7ec2737-044a-493b-9d94-d7f67be68765')) + .filter(item => item.libraryID == Zotero.Libraries.userLibraryID && !item.deleted) + .shift(); + + assert.equal(journalEmptyTags.getField('title'), 'This one has empty tags and keywords'); + assert.equal(journalEmptyTags.getTags().length, 0); }); }); }); From 367dfdf9694a8f6f9fabeece7a63fd6910a3caac Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sun, 12 Mar 2023 16:15:16 -0400 Subject: [PATCH 11/86] Update translators --- resource/schema/repotime.txt | 2 +- translators | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resource/schema/repotime.txt b/resource/schema/repotime.txt index 4806287e8ea..ce3c0af8269 100644 --- a/resource/schema/repotime.txt +++ b/resource/schema/repotime.txt @@ -1 +1 @@ -2023-02-22 21:36:32 +2023-03-12 20:14:44 diff --git a/translators b/translators index 8238cd53ec1..5dcd1bc6fac 160000 --- a/translators +++ b/translators @@ -1 +1 @@ -Subproject commit 8238cd53ec1d81fcb27861268abb275c7642ace4 +Subproject commit 5dcd1bc6fac814b7d9ad00a646ee8a9fc564fcd7 From bc07bf803cf7c7c2484282893936a3327e39752f Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sun, 12 Mar 2023 16:44:56 -0400 Subject: [PATCH 12/86] Update locales from Transifex --- chrome/locale/cs-CZ/zotero/about.dtd | 2 +- chrome/locale/cs-CZ/zotero/connector.json | 6 + chrome/locale/cs-CZ/zotero/preferences.dtd | 8 +- chrome/locale/cs-CZ/zotero/zotero.dtd | 20 +-- chrome/locale/cs-CZ/zotero/zotero.properties | 140 +++++++++---------- chrome/locale/gl-ES/zotero/connector.json | 18 +++ chrome/locale/gl-ES/zotero/preferences.dtd | 8 +- chrome/locale/gl-ES/zotero/zotero.dtd | 14 +- chrome/locale/gl-ES/zotero/zotero.properties | 62 ++++---- chrome/locale/hu-HU/zotero/zotero.properties | 8 +- chrome/locale/ja-JP/zotero/zotero.properties | 4 +- chrome/locale/sv-SE/zotero/zotero.dtd | 2 +- chrome/locale/vi-VN/zotero/connector.json | 18 +++ 13 files changed, 176 insertions(+), 134 deletions(-) diff --git a/chrome/locale/cs-CZ/zotero/about.dtd b/chrome/locale/cs-CZ/zotero/about.dtd index e183876069a..0a5318d6739 100644 --- a/chrome/locale/cs-CZ/zotero/about.dtd +++ b/chrome/locale/cs-CZ/zotero/about.dtd @@ -6,7 +6,7 @@ - + diff --git a/chrome/locale/cs-CZ/zotero/connector.json b/chrome/locale/cs-CZ/zotero/connector.json index 3eaabe7c71e..9969a2878a2 100644 --- a/chrome/locale/cs-CZ/zotero/connector.json +++ b/chrome/locale/cs-CZ/zotero/connector.json @@ -2,6 +2,9 @@ "general_more": { "message": "Více..." }, + "general_moreInfo": { + "message": "Více informací..." + }, "general_done": { "message": "Hotovo" }, @@ -50,6 +53,9 @@ "upgradeApp": { "message": "Aktualizovat $1" }, + "firstRun_acceptButton": { + "message": "Hotovo" + }, "error_connection_isAppRunning": { "message": "Je $1 spuštěný?" }, diff --git a/chrome/locale/cs-CZ/zotero/preferences.dtd b/chrome/locale/cs-CZ/zotero/preferences.dtd index 99e421e84d7..07783648df6 100644 --- a/chrome/locale/cs-CZ/zotero/preferences.dtd +++ b/chrome/locale/cs-CZ/zotero/preferences.dtd @@ -26,10 +26,10 @@ - - - - + + + + diff --git a/chrome/locale/cs-CZ/zotero/zotero.dtd b/chrome/locale/cs-CZ/zotero/zotero.dtd index 5815acd9b10..8d8deff288d 100644 --- a/chrome/locale/cs-CZ/zotero/zotero.dtd +++ b/chrome/locale/cs-CZ/zotero/zotero.dtd @@ -199,7 +199,7 @@ - + @@ -312,7 +312,7 @@ - + @@ -321,14 +321,14 @@ - - + + - - - - - - + + + + + + diff --git a/chrome/locale/cs-CZ/zotero/zotero.properties b/chrome/locale/cs-CZ/zotero/zotero.properties index 05e03ee113e..b184fe24148 100644 --- a/chrome/locale/cs-CZ/zotero/zotero.properties +++ b/chrome/locale/cs-CZ/zotero/zotero.properties @@ -4,7 +4,7 @@ general.success=Operace proběhla úspěšně general.error=Chyba general.warning=Varování general.dontShowWarningAgain=Toto upozornění již nezobrazovat. -general.dontShowAgainFor=Don’t show again today;Don’t show again for %1$S days +general.dontShowAgainFor=Dnes již nezobrazovat; Neukazovat %1$S dní general.browserIsOffline=%S je momentálně v režimu offline. general.locate=Najít... general.restartRequired=Je vyžadován restart @@ -26,8 +26,8 @@ general.checkForUpdates=Zkontrolovat aktualizace general.actionCannotBeUndone=Tato akce je nevratná. general.install=Instalovat general.updateAvailable=Je k dispozici aktualizace -general.downloading=Downloading %S… -general.downloading.quoted=Downloading “%S”… +general.downloading=Stahování %S… +general.downloading.quoted=Stahování "%S"… general.noUpdatesFound=Aktualizace nebyly nalezeny general.isUpToDate=%S je aktuální. general.upgrade=Aktualizace @@ -46,10 +46,10 @@ general.create=Vytvořit general.delete=Smazat general.remove=Odstranit general.import=Importovat -general.export=Exportovat\n -general.update=Update +general.export=Exportovat +general.update=Aktualizovat general.moreInformation=Více informací -general.learnMore=Learn More +general.learnMore=Zjistit více general.seeForMoreInformation=Pro více informací se podívejte na %S general.open=Otevřít %S general.close=Zavřít @@ -65,15 +65,15 @@ general.openPreferences=Otevřít předvolby general.keys.ctrlShift=Ctrl+Shift+ general.keys.cmdShift=Cmd+Shift+ general.dontShowAgain=Již nezobrazovat -general.dontAskAgain=Don’t Ask Again -general.remindMeLater=Remind Me Later +general.dontAskAgain=Znovu se již neptat +general.remindMeLater=Připomenout později general.fix=Fix... general.tryAgain=Zkusit znovu general.tryLater=Zkusit později general.showDirectory=Zobrazit adresář general.showInLibrary=Ukázat v knihovně general.continue=Pokračovat -general.skip=Skip +general.skip=Přeskočit general.copy=Kopírovat general.copyToClipboard=Kopírovat do schránky general.cancel=Zrušit @@ -86,25 +86,25 @@ general.describeProblem=Stručně popište problém: general.nMegabytes=%S MB general.item=Položka general.pdf=PDF -general.back=Back -general.languages=Languages -general.default=Default -general.custom=Custom +general.back=Zpátky +general.languages=Jazyky +general.default=Výchozí +general.custom=Vlastní general.loading=Nahrává se... -general.richText=Rich Text +general.richText=Rich text formát general.clearSelection=Clear Selection -general.insert=Insert -general.username=Username -general.password=Password - -general.yellow=Yellow -general.red=Red -general.green=Green -general.blue=Blue -general.purple=Purple +general.insert=Vložit +general.username=Uživatelské jméno +general.password=Heslo + +general.yellow=Žlutá +general.red=Červená +general.green=Zelená +general.blue=Modrá +general.purple=Fialová general.magenta=Magenta -general.orange=Orange -general.gray=Gray +general.orange=Oranžová +general.gray=Šedá general.operationInProgress=Právě probíhá operace se Zoterem. general.operationInProgress.waitUntilFinished=Počkejte prosím, dokud neskončí. @@ -118,8 +118,8 @@ about.createdBy=%1$S is a project of %2$S and is developed by a [global communit about.openSource=%S is [open-source software] and depends on many [exceptional open-source projects]. about.getInvolved=Chcete pomoci? [Zapojte se] ještě dnes! -punctuation.openingQMark=“ -punctuation.closingQMark=” +punctuation.openingQMark=" +punctuation.closingQMark=" punctuation.colon=: punctuation.colon.withString=%S: punctuation.ellipsis=... @@ -186,7 +186,7 @@ dataDir.chooseNewDataDirectory=Zvolit nový datový adresář ... dataDir.cannotBeSetWithAlternative=The data directory cannot be set to a “%S” directory. Did you mean %S? dataDir.cannotBeLinkedAttachmentBaseDirectory=The data directory cannot be set to the same location as the Linked Attachment Base Directory. dataDir.unsafeLocation.selected.cloud=Storing the data directory in a cloud storage folder is very likely to corrupt your database. -dataDir.unsafeLocation.selected.areYouSure=Are you sure you want to use this location? +dataDir.unsafeLocation.selected.areYouSure=Jste si jistí, že chce použít toto umístění? dataDir.unsafeLocation.existing.cloud=Your %S data directory appears to be within a cloud storage folder, which is very likely to corrupt your database. dataDir.unsafeLocation.existing.chooseDifferent=Chcete zvolit jiné umístění? dataDir.selectedDirNonEmpty.title=Adresář není prázdný @@ -219,7 +219,7 @@ dataDir.migration.failure.full.showCurrentDirectoryAndQuit=Zobrazit současný a app.standalone=Samostatné Zotero app.firefox=Zotero pro Firefox -startupError=There was an error starting %S. +startupError=Při spouštění %S nastala chyba. startupError.databaseInUse=Vaše databáze Zotera je právě používána. V jednom okamžiku je možné mít otevřenu pouze jednu instanci Zotera používající stejnou databázi. startupError.closeStandalone=Pokud je otevřené Samostatné Zotero, zavřete ho prosím a restartujte Firefox. startupError.closeFirefox=Pokud je otevřen Firefox s přídavkem Zotero, zavřete ho prosím a restartujte Firefox. @@ -244,7 +244,7 @@ date.relative.daysAgo.multiple=před %S dny date.relative.yearsAgo.one=před 1 rokem date.relative.yearsAgo.multiple=před %S roky -pane.collections.title=Collections +pane.collections.title=Sbírky pane.collections.delete.title=Smazat kolekci pane.collections.delete=Chcete opravdu smazat zvolenou kolekci? pane.collections.delete.keepItems=Položky v této kolekci nebudou vymazány. @@ -316,9 +316,9 @@ pane.items.intro.text1=Vítejte v %S! pane.items.intro.text2=Podívejte se do [Rychlého průvodce], abyste se dozvěděli, jak začít vytvářet svou knihovnu a zkontrolujte, zda jste [instalovali %S], abyste při procházení webu mohli přidávat položky. pane.items.intro.text3=Používáte už %S na jiném počítači? [Nastavte si synchronizaci] , abyste mohli pokaždé začít právě tam, kde jste přestali. -pane.items.title=Items +pane.items.title=Položky pane.items.loading=Nahrávám položky... -pane.items.loadError=Error loading items list +pane.items.loadError=Při nahrávání seznamu položek se vyskytla chyba pane.items.columnChooser.moreColumns=Více sloupců pane.items.columnChooser.secondarySort=Sekundární řazení (%S) pane.items.attach.link.uri.unrecognized=Zotero nerozeznalo URI, kterou jste zadali. Prosím zkontrolujte adresu a zkuste to znovu. @@ -335,14 +335,14 @@ pane.items.remove.multiple=Opravdu chcete odstranit vybrané položky z této ko pane.items.removeFromPublications.title=Odstranit z Mých publikací pane.items.removeFromPublications=Opravdu chcete odstranit vybranou položku z Mých publikací? pane.items.removeFromPublications.multiple=Opravdu chcete odstranit vybrané položky z Mých publikací? -pane.items.removeRecursive.title=Remove from Collection and Subcollections -pane.items.removeRecursive=Are you sure you want to remove the selected item from this collection and all subcollections? -pane.items.removeRecursive.multiple=Are you sure you want to remove the selected items from this collection and all subcollections? +pane.items.removeRecursive.title=Odebrat ze sbírky a podsbírek +pane.items.removeRecursive=Opravdu chce odebrat vybranou položku z této sbírky a všech podsbírek? +pane.items.removeRecursive.multiple=Opravdu chcete odebrat vybrané položky z této sbírky a všech podkolekcí? pane.items.menu.addNoteFromAnnotations=Přidat poznámku z anotací -pane.items.menu.createNoteFromAnnotations=Create Note from Annotations +pane.items.menu.createNoteFromAnnotations=Vytvořit poznámku z anotací pane.items.menu.findAvailablePDF=Najít dostupné PDF pane.items.menu.findAvailablePDF.multiple=Najít dostupná PDF -pane.items.menu.addToCollection=Add to Collection +pane.items.menu.addToCollection=Přidat do sbírky pane.items.menu.remove=Odebrat položku z kolekce... pane.items.menu.remove.multiple=Odebrat položky z kolekce... pane.items.menu.removeFromPublications=Odstranit položku z Mých publikací @@ -352,10 +352,10 @@ pane.items.menu.moveToTrash.multiple=Přesunout položky do Koše... pane.items.menu.delete=Definitivně smazat... pane.items.menu.export=Exportovat vybranou položku... pane.items.menu.export.multiple=Exportovat vybrané položky... -pane.items.menu.exportNote=Export Note… -pane.items.menu.exportNote.multiple=Export Notes… -pane.items.menu.exportPDF=Export PDF… -pane.items.menu.exportPDF.multiple=Export PDFs… +pane.items.menu.exportNote=Exportovat poznámku... +pane.items.menu.exportNote.multiple=Exportovat poznámky... +pane.items.menu.exportPDF=Exportovat PDF... +pane.items.menu.exportPDF.multiple=Exportovat PDF... pane.items.menu.createBib=Vytvořit bibliografii z vybrané položky... pane.items.menu.createBib.multiple=Vytvořit bibliografii z vybraných položek... pane.items.menu.generateReport=Vygenerovat zprávu z vybrané položky... @@ -368,8 +368,8 @@ pane.items.menu.createParent=Create Parent Item… pane.items.menu.createParent.multiple=Create Parent Items pane.items.menu.renameAttachments=Přejmenovat soubor z rodičovských metadat pane.items.menu.renameAttachments.multiple=Přejmenovat soubory z rodičovských metadat -pane.items.menu.duplicateAndConvert.toBookSection=Create Book Section -pane.items.menu.duplicateAndConvert.toBook=Create Book from Book Section +pane.items.menu.duplicateAndConvert.toBookSection=Vytvořit kapitolu knihy +pane.items.menu.duplicateAndConvert.toBook=Vytvořit knihu z kapitoly pane.items.showItemInLibrary=Zobrazit položku v Knihovně. pane.items.letter.oneParticipant=Dopis pro %S @@ -411,8 +411,8 @@ pane.item.creator.moveDown=Posunout dolů pane.item.notes.allNotes=Všechny poznámky pane.item.notes.untitled=Nepojmenovaná poznámka pane.item.notes.delete.confirm=Jste si jistý, že chcete smazat tuto poznámku? -pane.item.notes.count=%1$S note;%1$S notes -pane.item.notes.ignoreMissingImage=Some note images are missing and cannot be copied. +pane.item.notes.count=%1$S poznámka;%1$S poznámky +pane.item.notes.ignoreMissingImage=Některé obrázky chybí a nemohou být zkopírovány. pane.item.attachments.rename.title=Nový název: pane.item.attachments.rename.renameAssociatedFile=Přejmenovat asociovaný soubor pane.item.attachments.rename.error=Během přejmenování souboru nastala chyba. @@ -423,23 +423,23 @@ pane.item.attachments.fileNotFound.text2.stored=Je možné, že byl přesunut ne pane.item.attachments.fileNotFound.text2.stored.notOnServer=Je možné, že byl přesunut nebo smazán mimo %1$S, nebo, pokud byl tento soubor přidán na jiném počítači, je možné, že ještě nebyla provedena synchronizace do %2$S. pane.item.attachments.fileNotFound.text2.linked=Je možné, že byl přesunut nebo smazán mimo %1$S nebo na vašem počítači není správně nastaven základní adresář pro připojené přílohy. pane.item.attachments.delete.confirm=Jste si jisti, že chcete smazat tuto přílohu? -pane.item.attachments.autoRelink.title=File Located Automatically -pane.item.attachments.autoRelink.text1=The file could not be found at the specified location, but a file with the same name was found within your Linked Attachment Base Directory: -pane.item.attachments.autoRelink.text2=Old Location: %S -pane.item.attachments.autoRelink.text3=New Location: %S -pane.item.attachments.autoRelink.text4=%1$S can automatically relink this attachment. -pane.item.attachments.autoRelink.relink=Relink +pane.item.attachments.autoRelink.title=Soubor automaticky nalezen +pane.item.attachments.autoRelink.text1=Soubor nebyl v daném adresáři nalezen, ale soubor se shodným jménem se nachází v adresáři propojených příloh: +pane.item.attachments.autoRelink.text2=Staré umístění: %S +pane.item.attachments.autoRelink.text3=Nové umístění: %S +pane.item.attachments.autoRelink.text4=%1$S nemůže automaticky propojit tuto přílohu. +pane.item.attachments.autoRelink.relink=Znovu propojit pane.item.attachments.autoRelinkOthers.title=Additional Files Located pane.item.attachments.autoRelinkOthers.text=One other unlinked attachment in this library was found within the same directory. Relink this attachment as well?;%S other unlinked attachments in this library were found within the same directory. Relink all located attachments? pane.item.attachments.autoRelink.locateManually=Locate Manually… -pane.item.attachments.autoRelink.relinkAll=Relink All +pane.item.attachments.autoRelink.relinkAll=Propojit vše pane.item.attachments.count.zero=%S příloh: pane.item.attachments.count.singular=%S příloha: pane.item.attachments.count.plural=%S příloh: -pane.item.attachments.has=Has attachment -pane.item.attachments.hasPDF=Has PDF attachment +pane.item.attachments.has=Obsahuje přílohu +pane.item.attachments.hasPDF=Obsahuje PDF přílohu pane.item.attachments.hasSnapshot=Has snapshot -pane.item.attachments.hasLink=Has link +pane.item.attachments.hasLink=Obsahuje propojení pane.item.attachments.select=Vyberte soubor pane.item.attachments.PDF.installTools.title=Nástroje pro PDF nejsou nainstalovány pane.item.attachments.PDF.installTools.text=Pokud chcete používat této funkce, musíte nejdříve nainstalovat PDF nástroje v panelu Vyhledávání v Nastavení Zotera. @@ -958,7 +958,7 @@ integration.error.misconfiguredWordStartupFolder.fix=The plugin may not appear i integration.error.macWordSBPermissionsMissing.title=Chybějící oprávnění integration.error.macWordSBPermissionsMissing=Zotero does not have permission to control Word. To grant this permission:\n\n1) Open System Settings\n2) Select “Privacy & Security” in the left column\n3) Select “Automation”\n4) Find “Zotero” and click the arrow to expand it\n5) Make sure “Microsoft Word” is enabled under “Zotero”\n6) Restart Word integration.error.macWordSBPermissionsMissing.pre2016=Pokud se pod "Automatizace" neobjeví “Microsoft Word”, zkontrolujte, zda máte Word 2011 ve verzi 14.7.7 nebo vyšší. -integration.error.m1UpgradeOS.title=macOS Upgrade Required +integration.error.m1UpgradeOS.title=Je třeba aktualizace macOS integration.error.m1UpgradeOS=Citing in Word on an Apple Silicon Mac with macOS 11.3 or earlier is not supported and may cause %S to freeze. Please upgrade to macOS 11.4 or later. integration.error.viewTroubleshootingInfo=Chcete zobrazit pokyny pro řešení problémů? integration.error.tabUnavailable=The operation cannot be completed because the %S tab is no longer available. @@ -994,9 +994,9 @@ integration.exportDocument.description1=Zotero převede citace v dokumentu do fo integration.exportDocument.description2=Než budete pokračovat, je vhodné vytvořit zálohu dokumentu. integration.importInstructions=Zotero citace v tomto dokumentu byly převedeny do formátu, v němž mohou být bezpečně přeneseny mezi textovými editory. Abyste mohli pokračovat v práci s citacemi, otevřete tento dokument v podporovaném textovém procesoru a v doplňku Zotero stiskněte Obnovit. integration.upgradeTemplate=The %S plugin for %S is outdated. Reinstall the plugin from Preferences → Cite → Word Processors. -integration.mendeleyImport.title=Unlinked Mendeley Citations +integration.mendeleyImport.title=Neslinkovaná Mendeley citace integration.mendeleyImport.description=This document contains Mendeley citations that aren’t linked to items in your %1$S library. If you import your Mendeley library, %1$S can automatically relink citations you created with Mendeley. -integration.mendeleyImport.openImporter=Open Mendeley Importer… +integration.mendeleyImport.openImporter=Otevřít Mendeley Importer styles.install.title=instalovat Styl styles.install.unexpectedError=Při instalaci "%1$S" došlo k neočekávané chybě @@ -1229,8 +1229,8 @@ lookup.failureTooMany.description=Too many identifiers. Please enter one identif createParent.prompt=Enter a DOI, ISBN, PMID, arXiv ID, or ADS Bibcode to identify this file locate.online.label=Zobrazit online -locate.pdf.label=Open PDF -locate.pdfNewWindow.label=Open PDF in New Window +locate.pdf.label=Otevřít PDF +locate.pdfNewWindow.label=Otevřít PDF v novém okně locate.snapshot.label=Zobrazit snímek locate.file.label=Zobrazit soubor locate.externalViewer.label=Otevřít v externí aplikaci @@ -1317,13 +1317,13 @@ noteEditor.annotationsDateLine=(%S) noteEditor.cut=Vyjmout noteEditor.copy=Kopírovat noteEditor.paste=Vložit -noteEditor.rightToLeft=Right to Left -noteEditor.leftToRight=Left to Right +noteEditor.rightToLeft=Zprava doleva +noteEditor.leftToRight=Zleva doprava noteEditor.updateNotice=This note was edited with a newer version of %1$S.\nPlease update %1$S to make changes. -noteEditor.enterLink=Enter Link -noteEditor.heading1=Heading 1 -noteEditor.heading2=Heading 2 -noteEditor.heading3=Heading 3 +noteEditor.enterLink=Vložit odkaz +noteEditor.heading1=Nadpis 1 +noteEditor.heading2=Nadpis 2 +noteEditor.heading3=Nadpis 3 noteEditor.paragraph=Odstavec noteEditor.monospaced=Monospaced noteEditor.bulletList=Bulleted List @@ -1395,13 +1395,13 @@ pdfReader.addNote=Přidat poznámku pdfReader.selectArea=Select Area pdfReader.pickColor=Pick a Color pdfReader.addToNote=Přidat do poznámky -pdfReader.zoomIn=Zoom In -pdfReader.zoomOut=Zoom Out +pdfReader.zoomIn=Přiblížit +pdfReader.zoomOut=Oddálit pdfReader.zoomAuto=Automatically Resize pdfReader.zoomPageWidth=Zoom to Page Width pdfReader.zoomPageHeight=Zoom to Page Height -pdfReader.splitVertically=Split Vertically -pdfReader.splitHorizontally=Split Horizontally +pdfReader.splitVertically=Rozdělit vertikálně +pdfReader.splitHorizontally=Rozdělit horizontálně pdfReader.nextPage=Next Page pdfReader.previousPage=Previous Page pdfReader.page=Stránka diff --git a/chrome/locale/gl-ES/zotero/connector.json b/chrome/locale/gl-ES/zotero/connector.json index ca1ccea908e..45748e8db1c 100644 --- a/chrome/locale/gl-ES/zotero/connector.json +++ b/chrome/locale/gl-ES/zotero/connector.json @@ -59,6 +59,12 @@ "progressWindow_error_upgradeClient_latestVersion": { "message": "última versión" }, + "extensionIsDisabled": { + "message": "$1 está desactivado" + }, + "extensionIsDisabled_extensionPage": { + "message": "$1 está desactivado para páxinas de extensión" + }, "appConnector": { "message": "Conector $1" }, @@ -140,6 +146,18 @@ "integration_googleDocs_orphanedCitations_disclaimer": { "message": "Estas citas quedaron desligadas de $1. Precisas volver a ligalas antes de seren actualizadas ou de apareceren na libraría." }, + "copyUnproxiedLink": { + "message": "Copiar ligazóns sen proxy" + }, + "copyUnproxiedPageURL": { + "message": "Copiar URL de páxinas sen proxy" + }, + "reloadViaProxy": { + "message": "Volver a cargar con proxy" + }, + "reloadVia": { + "message": "Volver a cargar a través de $1" + }, "general_saveTo": { "message": "Gardar en $1" } diff --git a/chrome/locale/gl-ES/zotero/preferences.dtd b/chrome/locale/gl-ES/zotero/preferences.dtd index f60e0256411..f71abd2e2c5 100644 --- a/chrome/locale/gl-ES/zotero/preferences.dtd +++ b/chrome/locale/gl-ES/zotero/preferences.dtd @@ -26,10 +26,10 @@ - - - - + + + + diff --git a/chrome/locale/gl-ES/zotero/zotero.dtd b/chrome/locale/gl-ES/zotero/zotero.dtd index d7a34744712..74825523cd6 100644 --- a/chrome/locale/gl-ES/zotero/zotero.dtd +++ b/chrome/locale/gl-ES/zotero/zotero.dtd @@ -187,8 +187,8 @@ - - + + @@ -326,9 +326,9 @@ - - + + - - - + + + diff --git a/chrome/locale/gl-ES/zotero/zotero.properties b/chrome/locale/gl-ES/zotero/zotero.properties index dc407f58f95..3dcb82b4cdb 100644 --- a/chrome/locale/gl-ES/zotero/zotero.properties +++ b/chrome/locale/gl-ES/zotero/zotero.properties @@ -73,7 +73,7 @@ general.tryLater=Vólveo a intentar máis tarde general.showDirectory=Mostrar o cartafol general.showInLibrary=Amosar na biblioteca general.continue=Continuar -general.skip=Skip +general.skip=Saltar general.copy=Copiar general.copyToClipboard=Copiar no portaretallos general.cancel=Cancelar @@ -94,17 +94,17 @@ general.loading=Cargando... general.richText=Texto enriquecido general.clearSelection=Limpar a selección general.insert=Inserir -general.username=Username -general.password=Password +general.username=Nome de usuario +general.password=Contrasinal general.yellow=Amarelo general.red=Vermello general.green=Verde general.blue=Azul general.purple=Morado -general.magenta=Magenta -general.orange=Orange -general.gray=Gray +general.magenta=Maxenta +general.orange=Laranxa +general.gray=Gris general.operationInProgress=Está en marcha unha operación Zotero general.operationInProgress.waitUntilFinished=Agarde ata que teña acabado. @@ -423,16 +423,16 @@ pane.item.attachments.fileNotFound.text2.stored=Poida que se movese ou borrade f pane.item.attachments.fileNotFound.text2.stored.notOnServer=Poida que se movese ou borrade fóra de %1$S, ou no caso de que se tivese engadido noutro computador, que non se sincronizase desde ou ata %2$S. pane.item.attachments.fileNotFound.text2.linked=Poida que se movese ou eliminase fóra de %1$S, ou que o cartafol principal para as ligazóns a anexos estea mal definido nalgún dos seus computadores. pane.item.attachments.delete.confirm=Seguro que queres eliminar este ficheiro adxunto? -pane.item.attachments.autoRelink.title=File Located Automatically -pane.item.attachments.autoRelink.text1=The file could not be found at the specified location, but a file with the same name was found within your Linked Attachment Base Directory: -pane.item.attachments.autoRelink.text2=Old Location: %S -pane.item.attachments.autoRelink.text3=New Location: %S -pane.item.attachments.autoRelink.text4=%1$S can automatically relink this attachment. -pane.item.attachments.autoRelink.relink=Relink -pane.item.attachments.autoRelinkOthers.title=Additional Files Located -pane.item.attachments.autoRelinkOthers.text=One other unlinked attachment in this library was found within the same directory. Relink this attachment as well?;%S other unlinked attachments in this library were found within the same directory. Relink all located attachments? -pane.item.attachments.autoRelink.locateManually=Locate Manually… -pane.item.attachments.autoRelink.relinkAll=Relink All +pane.item.attachments.autoRelink.title=Ficheiro atopado automaticamente +pane.item.attachments.autoRelink.text1=Este ficheiro non se atopou na posición indicada, inda que si que se atopou un ficheiro co mesmo nome dentro da base de cartafoles ligados automaticamente: +pane.item.attachments.autoRelink.text2=Antiga dirección: %S +pane.item.attachments.autoRelink.text3=Nova dirección: %S +pane.item.attachments.autoRelink.text4=%1$S pode ligar de novo de xeito automático este anexo. +pane.item.attachments.autoRelink.relink=Ligar de novo +pane.item.attachments.autoRelinkOthers.title=Ficheiros adicionais localizados +pane.item.attachments.autoRelinkOthers.text=Atopouse outro anexo máis sen anexar desta biblioteca e do mesmo cartafol. Queres volver a ligar ese anexo?; Atopouse outros %S anexos máis sen anexar desta biblioteca e do mesmo cartafol. Queres volver a ligar eses anexos? +pane.item.attachments.autoRelink.locateManually=Localizar a man... +pane.item.attachments.autoRelink.relinkAll=Ligar de novo todo pane.item.attachments.count.zero=%S adxuntos: pane.item.attachments.count.singular=%S adxunto: pane.item.attachments.count.plural=%S adxuntos: @@ -744,7 +744,7 @@ zotero.preferences.export.quickCopy.citationStyles=Estilo de cita zotero.preferences.export.quickCopy.exportFormats=Formatos de exportación zotero.preferences.export.quickCopy.instructions=A Copia Rápida permíteche exportar facilmente elementos nun formato concreto. Podes gardar os elementos seleccionados no portarretallos premendo %S ou arrastrándoos directamente á caixa de texto da outra aplicación. zotero.preferences.export.quickCopy.citationInstructions=Para os estilos de cita, podes copiar as citas ou as notas de rodapé premento %S ou premento Shift antes de arrastrar os elementos. -zotero.preferences.export.quickCopy.note.htmlOptions.label=Rich Text/HTML +zotero.preferences.export.quickCopy.note.htmlOptions.label=Texo enriquecido/HTML zotero.preferences.wordProcessors.installationSuccess=A instalación levouse a cabo correctamente. zotero.preferences.wordProcessors.installationError=Aconteceu un erro e a instalación non se completou. Asegúrate de que %1$S está pechado e reinicia %2$S. @@ -786,7 +786,7 @@ dragAndDrop.filesNotFound=Os seguintes ficheiros non se atoparon e non se puider fileInterface.importing=Importando... fileInterface.importComplete=Completouse a importación fileInterface.itemsWereImported=Importouse %1$S, importáronse %1$S elementos -fileInterface.itemsWereRelinked=%1$S item was relinked;%1$S items were relinked +fileInterface.itemsWereRelinked=Volveuse a ligar %1$S elemento;Volvéronse a ligar %1$S elementos fileInterface.itemsExported=Exportación de elementos ... fileInterface.import=Importar fileInterface.chooseAppDatabaseToImport=Escolle a base de datos %S para importar @@ -813,11 +813,11 @@ import.localImport=importación local import.fileHandling.store=Copiar os ficheiros no cartafol de almacenamento %S import.fileHandling.link=Ligar os ficheiros coa posición orixinal import.fileHandling.description=%S non puido sincronizar os ficheiros ligados. -import.online.formIntro=Please enter your credentials to log in to %2$S. This is necessary to import your %3$S library into %1$S. +import.online.formIntro=Introduce as túas credenciais para acceder a %2$S. Precísase para importar a libraría %3$S a %1$S. import.online.intro=No próximo paso pediráseche que accedas a %2$S e lle concedas aceso a %1$S. Precísase diso para importar a túa libraría %3$S en %1$S. import.online.intro2=%1$S nunca verá nin almacenará os teus contrasinais de %2$S. -import.online.wrongCredentials=Login to %1$S failed. Please re-enter credentials and try again. -import.online.blockedByPlugin=The import cannot continue with "%1$S" enabled. Please disable this plugin and try again. +import.online.wrongCredentials=Fallou o acceso a %1$S. Volve introducir as credenciais e proba de novo. +import.online.blockedByPlugin=A importación non pode continuar tendo activado "%1$S" . Desactiva este engadido e proba de novo. quickCopy.copyAs=Copiar como %S @@ -866,7 +866,7 @@ searchConditions.programmingLanguage=Linguaxe de programación searchConditions.fileTypeID=Tipo de ficheiro adxunto searchConditions.annotationText=Texto da nota searchConditions.annotationComment=Comentario da nota -searchConditions.anyField=Any Field +searchConditions.anyField=Calquera campo fulltext.indexState.indexed=Indexado fulltext.indexState.unavailable=Descoñecido @@ -956,7 +956,7 @@ integration.error.misconfiguredWordStartupFolder.some=%S non deu instalado o eng integration.error.misconfiguredWordStartupFolder.all=%S non puido instalar o engadido de Word por mor de que o a posición indicada en Word Startup non está ben configurada. integration.error.misconfiguredWordStartupFolder.fix=Poida que o engadido non apareza en Word ata que se reinicie o cartafol de inicio ao predefinido. integration.error.macWordSBPermissionsMissing.title=Falta de permisos -integration.error.macWordSBPermissionsMissing=Zotero does not have permission to control Word. To grant this permission:\n\n1) Open System Settings\n2) Select “Privacy & Security” in the left column\n3) Select “Automation”\n4) Find “Zotero” and click the arrow to expand it\n5) Make sure “Microsoft Word” is enabled under “Zotero”\n6) Restart Word +integration.error.macWordSBPermissionsMissing=Zotero non ten permisos para controlar Word. Para outorgarlle eses permisos:\n\n1) Abre a configuración de sistemas\n2) Escolle "Privacidade e Seguridade” nan columna esquerda\n3) Selecciona “Automatizar”\n4) Busca “Zotero” e preme na frecha para expandir\n5) COmprobar que “Microsoft Word” estea activado debaixo de “Zotero”\n6) Reinicia o Word integration.error.macWordSBPermissionsMissing.pre2016=Se o “Microsoft Word” non aparece en "Automatización" comproba que está usando o Word 2011 da versión 14.7.7 ou posterior. integration.error.m1UpgradeOS.title=Precísase anovovar macOS integration.error.m1UpgradeOS=Non ten soporte citar en Word empregando un Apple Silicon Mac macOS 11.3 ou anterior e pode derivar en conxelacións de %S. Suxírese anovar a macOS 11.4 ou posterior. @@ -994,9 +994,9 @@ integration.exportDocument.description1=Zotero converterá as citas deste docume integration.exportDocument.description2=Deberías facer unha copia de seguridade do documento antes de seguir. integration.importInstructions=Zotero converteu as citas deste documento a un formato que permite transferilas de xeito seguro a un editor de texto. Abre o documento nun editor de texto que os acepte e dálle a refrescar no engadido de Zotero para continuar a traballar coas citas. integration.upgradeTemplate=O engadido %S para %S está desactualizado. Reinstala o engadido indo a Configuracións → Cita → Procesadores Word. -integration.mendeleyImport.title=Unlinked Mendeley Citations -integration.mendeleyImport.description=This document contains Mendeley citations that aren’t linked to items in your %1$S library. If you import your Mendeley library, %1$S can automatically relink citations you created with Mendeley. -integration.mendeleyImport.openImporter=Open Mendeley Importer… +integration.mendeleyImport.title=Desligar as citas de Mendeley +integration.mendeleyImport.description=Este documento contén citas de Mendeley que non está ligadas a elementos a túa biblioteca %1$S. Se importas a biblioteca Mendeley, %1$S pode volver a enlazar de modo e de xeito automático as citacións que se crearan con Mendeley. +integration.mendeleyImport.openImporter=Abrir o importador de Mendeley... styles.install.title=Instalar estilo styles.install.unexpectedError=Aconteceu un erro que non se agardaba instalando "%1$S" @@ -1237,8 +1237,8 @@ locate.externalViewer.label=Abrir nun visor externo locate.internalViewer.label=Abrir nun visor interno locate.showFile.label=Mostrar o ficheiro locate.libraryLookup.label=Buscar na biblioteca -locate.libraryLookup.noResolver.title=No OpenURL Resolver -locate.libraryLookup.noResolver.text=You must choose an OpenURL resolver from the Advanced pane of the %S preferences. +locate.libraryLookup.noResolver.title=Sen solucionador de OpenURL +locate.libraryLookup.noResolver.text=Tes que escoller un solucionador de OpenURL do panel avanzado das preferencias de %S. locate.manageLocateEngines=Xestionar as ferramentas de busca... locate.locateEngineDescription=As ferramentas de busca permiten atopar recursos nas túas bibliotecas %S pola web. As ferramentas activadas na lista aparecen na barra despregable de Localizar. @@ -1332,7 +1332,7 @@ noteEditor.blockquote=Cita noteEditor.mathBlock=Bloque de matemáticas noteEditor.formatText=Texto formatado noteEditor.highlightText=Texto destacado -noteEditor.textColor=Text Color +noteEditor.textColor=Cor de texto noteEditor.removeColor=Eliminar a cor noteEditor.bold=Grosa noteEditor.italic=Cursiva @@ -1400,8 +1400,8 @@ pdfReader.zoomOut=Alonxar pdfReader.zoomAuto=Axuste automático pdfReader.zoomPageWidth=Ampliar ao ancho de páxina pdfReader.zoomPageHeight=Ampliar a ancho de páxina -pdfReader.splitVertically=Split Vertically -pdfReader.splitHorizontally=Split Horizontally +pdfReader.splitVertically=Partir en vertical +pdfReader.splitHorizontally=Partir en horizontal pdfReader.nextPage=Páxina seguinte pdfReader.previousPage=Páxina anterior pdfReader.page=Páxina diff --git a/chrome/locale/hu-HU/zotero/zotero.properties b/chrome/locale/hu-HU/zotero/zotero.properties index f4ccb25077e..7d8f1ad8428 100644 --- a/chrome/locale/hu-HU/zotero/zotero.properties +++ b/chrome/locale/hu-HU/zotero/zotero.properties @@ -102,9 +102,9 @@ general.red=Piros general.green=Zöld general.blue=Kék general.purple=Lila -general.magenta=Magenta -general.orange=Orange -general.gray=Gray +general.magenta=Bíborvörös +general.orange=Narancssárga +general.gray=Szürke general.operationInProgress=A Zotero dolgozik. general.operationInProgress.waitUntilFinished=Kérjük várjon, amíg a művelet befejeződik. @@ -1332,7 +1332,7 @@ noteEditor.blockquote=Block Quote noteEditor.mathBlock=Matematikai blokk noteEditor.formatText=Szöveg formázása noteEditor.highlightText=Szöveg kiemelése -noteEditor.textColor=Text Color +noteEditor.textColor=Szöveg színe noteEditor.removeColor=Szín eltávolítása noteEditor.bold=Félkövér noteEditor.italic=Dőlt diff --git a/chrome/locale/ja-JP/zotero/zotero.properties b/chrome/locale/ja-JP/zotero/zotero.properties index 0784bddd943..4365c98a4ca 100644 --- a/chrome/locale/ja-JP/zotero/zotero.properties +++ b/chrome/locale/ja-JP/zotero/zotero.properties @@ -1049,7 +1049,7 @@ sync.error.checkConnection=サーバーへの接続エラー。インターネ sync.error.emptyResponseServer=サーバーからの応答を空にする。 sync.error.invalidCharsFilename=ファイル名 '%S' は不正な文字を含んでいます。\n\nファイル名を変更してもう一度お試しください。OS を通じてファイル名を変更する場合、もう一度 Zotero 内でリンクを作り直す必要があります。 sync.error.apiKeyInvalid=%S はあなたのアカウントの認証ができませんでした。アカウント情報を再度入力して下さい。 -sync.error.collectionTooLong=The collection name “%S” is too long to sync. Shorten the name and sync again. +sync.error.collectionTooLong=“%S” というコレクション名は長すぎて同期できません。名前を短くしてからもう一度同期してください。 sync.error.fieldTooLong=The %1$S value “%2$S” in one of your items is too long to sync. Shorten the field and sync again. sync.error.creatorTooLong=“%S” という編著者名は長すぎて同期できません。アイテム内の編著者名フィールドを編集して短い名前にしてからもう一度同期してください。 sync.error.noteEmbeddedImage=Notes with embedded images cannot currently be synced. Syncing of embedded images may be supported in a future version. @@ -1386,7 +1386,7 @@ noteEditor.deleteTable=表を削除する pdfReader.annotations=注釈 pdfReader.showAnnotations=注釈を表示する pdfReader.searchAnnotations=注釈を検索する -pdfReader.noAnnotations=Create an annotation to see it in the sidebar +pdfReader.noAnnotations=注釈はこのサイドバーに表示されます pdfReader.noExtractedText=抽出された文字がありません pdfReader.addComment=コメントを追加する pdfReader.addTags=タグを追加する… diff --git a/chrome/locale/sv-SE/zotero/zotero.dtd b/chrome/locale/sv-SE/zotero/zotero.dtd index 4b7b4eb9088..6a2fb29909b 100644 --- a/chrome/locale/sv-SE/zotero/zotero.dtd +++ b/chrome/locale/sv-SE/zotero/zotero.dtd @@ -103,7 +103,7 @@ - + diff --git a/chrome/locale/vi-VN/zotero/connector.json b/chrome/locale/vi-VN/zotero/connector.json index a3d8d53f3eb..63ff297131a 100644 --- a/chrome/locale/vi-VN/zotero/connector.json +++ b/chrome/locale/vi-VN/zotero/connector.json @@ -5,6 +5,9 @@ "general_moreInfo": { "message": "Chi tiết hơn..." }, + "general_needHelp": { + "message": "Cần hỗ trợ?" + }, "general_done": { "message": "Hoàn thành" }, @@ -38,9 +41,15 @@ "progressWindow_error_translation": { "message": "Có lỗi xảy ra khi lưu mục này. Xem $1 để có thêm thông tin." }, + "progressWindow_error_siteAccessLimitsError": { + "message": "Có lỗi xảy ra khi lưu mục này.. $1 có thể giới hạn số mục bạn có thể lưu cùng lúc.. Xem $2 để biết chi tiết." + }, "progressWindow_error_troubleshootingTranslatorIssues": { "message": "Sửa lỗi Translator" }, + "progressWindow_error_siteAccessLimits": { + "message": "Đến ngưỡng giới hạn truy cập." + }, "progressWindow_error_fallback": { "message": "Có lỗi xảy ra khi lưu bằng $1. Thử lưu bằng $2." }, @@ -50,12 +59,21 @@ "progressWindow_error_upgradeClient_latestVersion": { "message": "Phiên bản mới nhất" }, + "extensionIsDisabled": { + "message": "$1 đã bị vô hiệu." + }, + "extensionIsDisabled_extensionPage": { + "message": "$1 đã bị vô hiệu trên trang các mở rộng." + }, "appConnector": { "message": "$1 kết nối" }, "upgradeApp": { "message": "Nâng cấp$1" }, + "firstRun_title": { + "message": "Bạn đã cài đặt bột kết nối $1!" + }, "error_connection_isAppRunning": { "message": "$1 có đang chạy?" }, From 14bb46f43421816493b10bc30d1745c5cde86484 Mon Sep 17 00:00:00 2001 From: Abe Jellinek Date: Mon, 13 Mar 2023 17:50:41 -0400 Subject: [PATCH 13/86] Scaffold: Support the `detectedItemType` test field (#3023) --- chrome/content/scaffold/scaffold.js | 72 +++++++++++++++------------ chrome/content/zotero/xpcom/translate | 2 +- 2 files changed, 41 insertions(+), 33 deletions(-) diff --git a/chrome/content/scaffold/scaffold.js b/chrome/content/scaffold/scaffold.js index 8224f8f05da..8241d759e4e 100644 --- a/chrome/content/scaffold/scaffold.js +++ b/chrome/content/scaffold/scaffold.js @@ -1299,6 +1299,12 @@ var Scaffold = new function () { function _writeTestsToPane(tests) { _writeToEditor(_editors.tests, _stringifyTests(tests)); } + + function _confirmCreateExpectedFailTest() { + return Services.prompt.confirm(null, + 'Detection Failed', + 'Add test ensuring that detection always fails on this page?'); + } /** * Mimics most of the behavior of Zotero.Item#fromJSON. Most importantly, @@ -1516,7 +1522,7 @@ var Scaffold = new function () { if (level < 2 && value.items) { // Test object. Arrange properties in set order - let order = ['type', 'url', 'input', 'defer', 'items']; + let order = ['type', 'url', 'input', 'defer', 'detectedItemType', 'items']; for (let i = 0; i < order.length; i++) { let val = processRow(order[i], value[order[i]]); if (val === undefined) continue; @@ -1623,14 +1629,16 @@ var Scaffold = new function () { _translatorProvider ); return new Promise( - (resolve, reject) => tester.newTest(input, function (obj, newTest) { // "done" handler for do - if (newTest) { - resolve(_sanitizeItemsInTest(newTest)); - } - else { - reject(new Error('Creation failed')); - } - }) + (resolve, reject) => tester.newTest(input, + (obj, newTest) => { // "done" handler for do + if (newTest) { + resolve(_sanitizeItemsInTest(newTest)); + } + else { + reject(new Error('Creation failed')); + } + }, + _confirmCreateExpectedFailTest) ); } else if (type == "import" || type == "search") { @@ -1947,13 +1955,11 @@ var Scaffold = new function () { var test = this.testsToUpdate.shift(); _logOutput("Updating test " + (this.numTestsTotal - this.testsToUpdate.length)); - var me = this; - if (test.type == 'web') { _logOutput("Loading web page from " + test.url); var hiddenBrowser = Zotero.HTTP.loadDocuments( test.url, - function (doc) { + (doc) => { _logOutput("Page loaded"); if (test.defer) { _logOutput("Waiting " + (Zotero_TranslatorTester.DEFER_DELAY / 1000) @@ -1961,32 +1967,34 @@ var Scaffold = new function () { ); } Zotero.setTimeout( - function () { + () => { doc = hiddenBrowser.contentDocument; if (doc.location.href != test.url) { _logOutput("Page URL differs from test. Will be updated. " + doc.location.href); } - me.tester.newTest(doc, function (obj, newTest) { - Zotero.Browser.deleteHiddenBrowser(hiddenBrowser); - if (test.defer) { - newTest.defer = true; - } - newTest = _sanitizeItemsInTest(newTest); - me.newTests.push(newTest); - me.testDoneCallback(newTest); - me._updateTests(); - }); + this.tester.newTest(doc, + (obj, newTest) => { + Zotero.Browser.deleteHiddenBrowser(hiddenBrowser); + if (test.defer) { + newTest.defer = true; + } + newTest = _sanitizeItemsInTest(newTest); + this.newTests.push(newTest); + this.testDoneCallback(newTest); + this._updateTests(); + }, + _confirmCreateExpectedFailTest); }, test.defer ? Zotero_TranslatorTester.DEFER_DELAY : 0, true ); }, null, - function (e) { + (e) => { Zotero.logError(e); - me.newTests.push(false); - me.testDoneCallback(false); - me._updateTests(); + this.newTests.push(false); + this.testDoneCallback(false); + this._updateTests(); }, true ); @@ -2004,15 +2012,15 @@ var Scaffold = new function () { // Re-runs the test. // TranslatorTester doesn't handle these correctly, so we do it manually - _run(methods[test.type], test.input, null, function (obj, item) { + _run(methods[test.type], test.input, null, (obj, item) => { if (item) { test.items.push(Zotero_TranslatorTester._sanitizeItem(item)); } - }, null, function () { + }, null, () => { if (!test.items.length) test = false; - me.newTests.push(test); - me.testDoneCallback(test); - me._updateTests(); + this.newTests.push(test); + this.testDoneCallback(test); + this._updateTests(); }); } }; diff --git a/chrome/content/zotero/xpcom/translate b/chrome/content/zotero/xpcom/translate index 6a9270c992e..fcb7b8ae950 160000 --- a/chrome/content/zotero/xpcom/translate +++ b/chrome/content/zotero/xpcom/translate @@ -1 +1 @@ -Subproject commit 6a9270c992e39998389267810ec21b8cd735730e +Subproject commit fcb7b8ae9500be2c7c29e4306400f82fe21c5656 From e024449732f0aec01a2e92f1c71f1fe20e42607b Mon Sep 17 00:00:00 2001 From: Adomas Ven Date: Sun, 19 Mar 2023 02:52:54 +0200 Subject: [PATCH 14/86] Sorts first-author last name matches first when year present. (#3025) Closes #3024 --- .../content/zotero/integration/quickFormat.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/chrome/content/zotero/integration/quickFormat.js b/chrome/content/zotero/integration/quickFormat.js index 4e8300b6660..fc78cd630ac 100644 --- a/chrome/content/zotero/integration/quickFormat.js +++ b/chrome/content/zotero/integration/quickFormat.js @@ -499,6 +499,7 @@ var Zotero_QuickFormat = new function () { await Zotero.Items.loadDataTypes(items); searchString = searchString.toLowerCase(); + let searchParts = Zotero.SearchConditions.parseSearchString(searchString); var collation = Zotero.getLocaleCollation(); function _itemSort(a, b) { @@ -507,13 +508,15 @@ var Zotero_QuickFormat = new function () { // Favor left-bound name matches (e.g., "Baum" < "Appelbaum"), // using last name of first author if (firstCreatorA && firstCreatorB) { - let caStartsWith = firstCreatorA.toLowerCase().indexOf(searchString) == 0; - let cbStartsWith = firstCreatorB.toLowerCase().indexOf(searchString) == 0; - if (caStartsWith && !cbStartsWith) { - return -1; - } - else if (!caStartsWith && cbStartsWith) { - return 1; + for (let part of searchParts) { + let caStartsWith = firstCreatorA.toLowerCase().startsWith(part.text); + let cbStartsWith = firstCreatorB.toLowerCase().startsWith(part.text); + if (caStartsWith && !cbStartsWith) { + return -1; + } + else if (!caStartsWith && cbStartsWith) { + return 1; + } } } From 8a1dd3637ccd1d8a45670a02a966b35efe045255 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Tue, 21 Mar 2023 05:49:16 -0400 Subject: [PATCH 15/86] Temporarily disable extracting `Issued` from `Extra` Until we can parse ranges in the Date field. See #3030. citeproc-js will still use it (which is the point). --- .../content/zotero/xpcom/utilities_internal.js | 6 ++++++ test/tests/utilities_internalTest.js | 17 ++++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/chrome/content/zotero/xpcom/utilities_internal.js b/chrome/content/zotero/xpcom/utilities_internal.js index 7831afa0252..24d3f263988 100644 --- a/chrome/content/zotero/xpcom/utilities_internal.js +++ b/chrome/content/zotero/xpcom/utilities_internal.js @@ -1277,6 +1277,12 @@ Zotero.Utilities.Internal = { return true; } + // Skip for now, since we don't support date ranges + // https://github.com/zotero/zotero/issues/3030 + if (key == 'issued') { + return true; + } + // Fields let possibleFields = fieldNames.get(key); // No valid fields diff --git a/test/tests/utilities_internalTest.js b/test/tests/utilities_internalTest.js index 32dc432d48e..ea2633ffdbb 100644 --- a/test/tests/utilities_internalTest.js +++ b/test/tests/utilities_internalTest.js @@ -248,7 +248,7 @@ describe("Zotero.Utilities.Internal", function () { assert.equal(creators[0].name, 'Bar'); }); - it("should extract a CSL date field", function () { + it.skip("should extract a CSL date field", function () { var str = 'issued: 2000'; var { fields, extra } = Zotero.Utilities.Internal.extractExtraFields(str); assert.equal(fields.size, 1); @@ -286,11 +286,13 @@ describe("Zotero.Utilities.Internal", function () { }); it("should extract the citeproc-js cheater syntax", function () { - var issued = '{:number-of-pages:11}\n{:issued:2014}'; + //var issued = '{:number-of-pages:11}\n{:issued:2014}'; + var issued = '{:number-of-pages:11}\n{:archive_location:Location}'; var { fields, extra } = Zotero.Utilities.Internal.extractExtraFields(issued); assert.equal(fields.size, 2); assert.equal(fields.get('numPages'), 11); - assert.equal(fields.get('date'), 2014); + assert.equal(fields.get('archiveLocation'), 'Location'); + //assert.equal(fields.get('date'), 2014); assert.strictEqual(extra, ''); }); @@ -308,6 +310,15 @@ describe("Zotero.Utilities.Internal", function () { assert.equal(fields.size, 0); assert.equal(extra, "Event Place: Foo\nPublisher Place: Bar"); }); + + // Re-enable "should extract a CSL date field" and cheater-syntax lines above when removed + it("should ignore Issued (temporary)", function () { + var str = "Issued: 1994/1998"; + var { fields, extra } = Zotero.Utilities.Internal.extractExtraFields(str); + Zotero.debug([...fields.entries()]); + assert.equal(fields.size, 0); + assert.equal(extra, "Issued: 1994/1998"); + }); }); describe("#combineExtraFields", function () { From b298a48cda64cc9f1b71b609b4b5d39de14d5114 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Tue, 21 Mar 2023 06:23:16 -0400 Subject: [PATCH 16/86] Better way of skipping migration of Place and Date from Extra Or at least a way that we already have built-in and that only applies to the call in `Zotero.Item::migrateExtraFields()`. This doesn't distinguish between CSL fields (`publisher-place`, `event-place`, `issued`) and actual Zotero field, and we really only need to skip the former, but it's fine. Follow-up to 8a1dd3637, related to #3030 --- chrome/content/zotero/xpcom/data/item.js | 11 +++++++- .../zotero/xpcom/utilities_internal.js | 13 +--------- test/tests/schemaTest.js | 14 +++++++++++ test/tests/utilities_internalTest.js | 25 +++---------------- 4 files changed, 28 insertions(+), 35 deletions(-) diff --git a/chrome/content/zotero/xpcom/data/item.js b/chrome/content/zotero/xpcom/data/item.js index efa6d51c0e4..3c64543a409 100644 --- a/chrome/content/zotero/xpcom/data/item.js +++ b/chrome/content/zotero/xpcom/data/item.js @@ -5446,7 +5446,16 @@ Zotero.Item.prototype.migrateExtraFields = function () { try { var { itemType, fields, creators, extra } = Zotero.Utilities.Internal.extractExtraFields( - originalExtra, this + originalExtra, + this, + [ + // Skip 'publisher-place' and 'event-place' for now, since the mappings will be changed + // https://github.com/citation-style-language/zotero-bits/issues/6 + 'place', + // Skip 'issued' for now, since we don't support date ranges in Date + // https://github.com/zotero/zotero/issues/3030 + 'date' + ] ); if (itemType) { let originalType = this.itemTypeID; diff --git a/chrome/content/zotero/xpcom/utilities_internal.js b/chrome/content/zotero/xpcom/utilities_internal.js index 24d3f263988..ef5873723e8 100644 --- a/chrome/content/zotero/xpcom/utilities_internal.js +++ b/chrome/content/zotero/xpcom/utilities_internal.js @@ -1271,20 +1271,9 @@ Zotero.Utilities.Internal = { return true; } - // Skip for now, since the mappings to Place will be changed - // https://github.com/citation-style-language/zotero-bits/issues/6 - if (key == 'event-place' || key == 'publisher-place') { - return true; - } - - // Skip for now, since we don't support date ranges - // https://github.com/zotero/zotero/issues/3030 - if (key == 'issued') { - return true; - } - // Fields let possibleFields = fieldNames.get(key); + // No valid fields if (possibleFields) { let added = false; diff --git a/test/tests/schemaTest.js b/test/tests/schemaTest.js index c370473577b..4469add17db 100644 --- a/test/tests/schemaTest.js +++ b/test/tests/schemaTest.js @@ -236,6 +236,20 @@ describe("Zotero.Schema", function() { assert.equal(item.getField('extra'), 'type: invalid'); assert.isTrue(item.synced); }); + + it("shouldn't migrate certain fields temporarily", async function () { + var item = await createDataObject('item', { itemType: 'book' }); + var extra = 'event-place: Event Place\npublisher-place: Publisher Place\nIssued: 2020/2023'; + item.setField('extra', extra); + item.synced = true; + await item.saveTx(); + + await migrate(); + + assert.equal(item.getField('place'), ''); + assert.equal(item.getField('date'), ''); + assert.equal(item.getField('extra'), extra); + }); }); }); diff --git a/test/tests/utilities_internalTest.js b/test/tests/utilities_internalTest.js index ea2633ffdbb..22243440523 100644 --- a/test/tests/utilities_internalTest.js +++ b/test/tests/utilities_internalTest.js @@ -248,7 +248,7 @@ describe("Zotero.Utilities.Internal", function () { assert.equal(creators[0].name, 'Bar'); }); - it.skip("should extract a CSL date field", function () { + it("should extract a CSL date field", function () { var str = 'issued: 2000'; var { fields, extra } = Zotero.Utilities.Internal.extractExtraFields(str); assert.equal(fields.size, 1); @@ -286,13 +286,11 @@ describe("Zotero.Utilities.Internal", function () { }); it("should extract the citeproc-js cheater syntax", function () { - //var issued = '{:number-of-pages:11}\n{:issued:2014}'; - var issued = '{:number-of-pages:11}\n{:archive_location:Location}'; + var issued = '{:number-of-pages:11}\n{:issued:2014}'; var { fields, extra } = Zotero.Utilities.Internal.extractExtraFields(issued); assert.equal(fields.size, 2); assert.equal(fields.get('numPages'), 11); - assert.equal(fields.get('archiveLocation'), 'Location'); - //assert.equal(fields.get('date'), 2014); + assert.equal(fields.get('date'), 2014); assert.strictEqual(extra, ''); }); @@ -302,23 +300,6 @@ describe("Zotero.Utilities.Internal", function () { assert.equal(fields.size, 0); assert.strictEqual(extra, str); }); - - it("should ignore both Event Place and Publisher Place (temporary)", function () { - var str = "Event Place: Foo\nPublisher Place: Bar"; - var { fields, extra } = Zotero.Utilities.Internal.extractExtraFields(str); - Zotero.debug([...fields.entries()]); - assert.equal(fields.size, 0); - assert.equal(extra, "Event Place: Foo\nPublisher Place: Bar"); - }); - - // Re-enable "should extract a CSL date field" and cheater-syntax lines above when removed - it("should ignore Issued (temporary)", function () { - var str = "Issued: 1994/1998"; - var { fields, extra } = Zotero.Utilities.Internal.extractExtraFields(str); - Zotero.debug([...fields.entries()]); - assert.equal(fields.size, 0); - assert.equal(extra, "Issued: 1994/1998"); - }); }); describe("#combineExtraFields", function () { From bba09658e1a6a8e9ae9ce2483147915a069d1b86 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Tue, 21 Mar 2023 15:56:47 -0400 Subject: [PATCH 17/86] Update CSL locales --- chrome/content/zotero/locale/csl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/content/zotero/locale/csl b/chrome/content/zotero/locale/csl index 9b9366b71b8..2919a84bffb 160000 --- a/chrome/content/zotero/locale/csl +++ b/chrome/content/zotero/locale/csl @@ -1 +1 @@ -Subproject commit 9b9366b71b8fe220f5c416ea4b0c72c80a6984ae +Subproject commit 2919a84bffbae974a2702be0f5fa2ff7a6a51859 From 778fba60cb95198c59a70a0eae7db294d09690de Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Tue, 21 Mar 2023 16:01:29 -0400 Subject: [PATCH 18/86] Limit Everything full-text-word subsearch to current library This fixes an error using Everything if another library hasn't yet been loaded and should speed up Everything searches for people with multiple libraries. This is sort of an awkward fix, because it doesn't fix the underlying problem of `addCondition('libraryID', ...)` not working the same as `.libraryID =` for some search conditions that perform subsearches. But supporting `addCondition('libraryID', ...)` for those would get complicated, because there could technically be multiple such conditions, and applying those to a subsearch that used `AND` would get messy. So let's just fix the problem at hand. Fixes #3032 --- chrome/content/zotero/xpcom/collectionTreeRow.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chrome/content/zotero/xpcom/collectionTreeRow.js b/chrome/content/zotero/xpcom/collectionTreeRow.js index 5747a0e0a97..e976852c195 100644 --- a/chrome/content/zotero/xpcom/collectionTreeRow.js +++ b/chrome/content/zotero/xpcom/collectionTreeRow.js @@ -350,7 +350,7 @@ Zotero.CollectionTreeRow.prototype.getSearchObject = Zotero.Promise.coroutine(fu } else { var s = new Zotero.Search(); - s.addCondition('libraryID', 'is', this.ref.libraryID); + s.libraryID = this.ref.libraryID; // Library root if (this.isLibrary(true)) { s.addCondition('noChildren', 'true'); @@ -379,7 +379,7 @@ Zotero.CollectionTreeRow.prototype.getSearchObject = Zotero.Promise.coroutine(fu // Create the outer (filter) search var s2 = new Zotero.Search(); - s2.addCondition('libraryID', 'is', this.ref.libraryID); + s2.libraryID = this.ref.libraryID; if (this.isTrash()) { s2.addCondition('deleted', 'true'); From 42a46494200d980437214e9535a1db53ce234446 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Thu, 23 Mar 2023 01:02:01 -0400 Subject: [PATCH 19/86] Add Dataset and Standard item types zotero/zotero-bits#22 zotero/zotero-bits#52 --- chrome/content/zotero/components/icons.jsx | 2 + .../content/zotero/xpcom/data/cachedTypes.js | 2 + chrome/locale/af-ZA/zotero/zotero.properties | 9 + chrome/locale/ar/zotero/zotero.properties | 9 + chrome/locale/bg-BG/zotero/zotero.properties | 9 + chrome/locale/br/zotero/zotero.properties | 9 + chrome/locale/ca-AD/zotero/zotero.properties | 9 + chrome/locale/cs-CZ/zotero/zotero.properties | 9 + chrome/locale/da-DK/zotero/zotero.properties | 9 + chrome/locale/de/zotero/zotero.properties | 9 + chrome/locale/el-GR/zotero/zotero.properties | 9 + chrome/locale/en-GB/zotero/zotero.properties | 9 + chrome/locale/en-US/zotero/zotero.properties | 11 +- chrome/locale/es-ES/zotero/zotero.properties | 9 + chrome/locale/et-EE/zotero/zotero.properties | 9 + chrome/locale/eu-ES/zotero/zotero.properties | 9 + chrome/locale/fa/zotero/zotero.properties | 9 + chrome/locale/fi-FI/zotero/zotero.properties | 9 + chrome/locale/fr-FR/zotero/zotero.properties | 9 + chrome/locale/gl-ES/zotero/zotero.properties | 9 + chrome/locale/he-IL/zotero/zotero.properties | 9 + chrome/locale/hr-HR/zotero/zotero.properties | 9 + chrome/locale/hu-HU/zotero/zotero.properties | 9 + chrome/locale/id-ID/zotero/zotero.properties | 9 + chrome/locale/is-IS/zotero/zotero.properties | 9 + chrome/locale/it-IT/zotero/zotero.properties | 9 + chrome/locale/ja-JP/zotero/zotero.properties | 9 + chrome/locale/km/zotero/zotero.properties | 9 + chrome/locale/ko-KR/zotero/zotero.properties | 9 + chrome/locale/lt-LT/zotero/zotero.properties | 9 + chrome/locale/mn-MN/zotero/zotero.properties | 9 + chrome/locale/nb-NO/zotero/zotero.properties | 9 + chrome/locale/nl-NL/zotero/zotero.properties | 9 + chrome/locale/nn-NO/zotero/zotero.properties | 9 + chrome/locale/pl-PL/zotero/zotero.properties | 9 + chrome/locale/pt-BR/zotero/zotero.properties | 9 + chrome/locale/pt-PT/zotero/zotero.properties | 9 + chrome/locale/ro-RO/zotero/zotero.properties | 9 + chrome/locale/ru-RU/zotero/zotero.properties | 9 + chrome/locale/sk-SK/zotero/zotero.properties | 9 + chrome/locale/sl-SI/zotero/zotero.properties | 9 + chrome/locale/sr-RS/zotero/zotero.properties | 9 + chrome/locale/sv-SE/zotero/zotero.properties | 9 + chrome/locale/th-TH/zotero/zotero.properties | 9 + chrome/locale/tr-TR/zotero/zotero.properties | 9 + chrome/locale/uk-UA/zotero/zotero.properties | 9 + chrome/locale/vi-VN/zotero/zotero.properties | 9 + chrome/locale/zh-CN/zotero/zotero.properties | 9 + chrome/locale/zh-TW/zotero/zotero.properties | 9 + .../skin/default/zotero/treeitem-dataset.png | Bin 0 -> 500 bytes .../default/zotero/treeitem-dataset@2x.png | Bin 0 -> 797 bytes .../skin/default/zotero/treeitem-standard.png | Bin 0 -> 3141 bytes .../default/zotero/treeitem-standard@2x.png | Bin 0 -> 2691 bytes resource/schema/global | 2 +- test/tests/data/allTypesAndFields.js | 93 ++++++++- test/tests/data/itemJSON.js | 104 +++++++++- test/tests/data/translatorExport.js | 108 ++++++++++- test/tests/data/translatorExportLegacy.js | 180 +++++++++++++++++- 58 files changed, 894 insertions(+), 22 deletions(-) create mode 100644 chrome/skin/default/zotero/treeitem-dataset.png create mode 100644 chrome/skin/default/zotero/treeitem-dataset@2x.png create mode 100644 chrome/skin/default/zotero/treeitem-standard.png create mode 100644 chrome/skin/default/zotero/treeitem-standard@2x.png diff --git a/chrome/content/zotero/components/icons.jsx b/chrome/content/zotero/components/icons.jsx index 8e2db2f1994..98a4df25c13 100644 --- a/chrome/content/zotero/components/icons.jsx +++ b/chrome/content/zotero/components/icons.jsx @@ -124,6 +124,7 @@ i('TreeitemBookSection', 'chrome://zotero/skin/treeitem-bookSection.png'); i('TreeitemCase', 'chrome://zotero/skin/treeitem-case.png'); i('TreeitemComputerProgram', 'chrome://zotero/skin/treeitem-computerProgram.png'); i('TreeitemConferencePaper', 'chrome://zotero/skin/treeitem-conferencePaper.png'); +i('TreeitemDataset', 'chrome://zotero/skin/treeitem-dataset.png'); i('TreeitemDictionaryEntry', 'chrome://zotero/skin/treeitem-dictionaryEntry.png'); i('TreeitemEmail', 'chrome://zotero/skin/treeitem-email.png'); i('TreeitemEncyclopediaArticle', 'chrome://zotero/skin/treeitem-encyclopediaArticle.png'); @@ -147,6 +148,7 @@ i('TreeitemPreprint', 'chrome://zotero/skin/treeitem-preprint.png'); i('TreeitemPresentation', 'chrome://zotero/skin/treeitem-presentation.png'); i('TreeitemRadioBroadcast', 'chrome://zotero/skin/treeitem-radioBroadcast.png', false); i('TreeitemReport', 'chrome://zotero/skin/treeitem-report.png'); +i('TreeitemStandard', 'chrome://zotero/skin/treeitem-standard.png'); i('TreeitemStatute', 'chrome://zotero/skin/treeitem-statute.png'); i('TreeitemThesis', 'chrome://zotero/skin/treeitem-thesis.png'); i('TreeitemTvBroadcast', 'chrome://zotero/skin/treeitem-tvBroadcast.png', false); diff --git a/chrome/content/zotero/xpcom/data/cachedTypes.js b/chrome/content/zotero/xpcom/data/cachedTypes.js index 908ffa81531..50e3064eba6 100644 --- a/chrome/content/zotero/xpcom/data/cachedTypes.js +++ b/chrome/content/zotero/xpcom/data/cachedTypes.js @@ -470,6 +470,7 @@ Zotero.ItemTypes = new function() { case 'case': case 'computerProgram': case 'conferencePaper': + case 'dataset': case 'dictionaryEntry': case 'email': case 'encyclopediaArticle': @@ -488,6 +489,7 @@ Zotero.ItemTypes = new function() { case 'preprint': case 'presentation': case 'report': + case 'standard': case 'statute': case 'thesis': case 'webpage': diff --git a/chrome/locale/af-ZA/zotero/zotero.properties b/chrome/locale/af-ZA/zotero/zotero.properties index 35e58f3f5c8..207c3e910a3 100644 --- a/chrome/locale/af-ZA/zotero/zotero.properties +++ b/chrome/locale/af-ZA/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=Document itemTypes.encyclopediaArticle=Encyclopedia Article itemTypes.dictionaryEntry=Dictionary Entry itemTypes.preprint=Preprint +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=Type itemFields.title=Title @@ -614,8 +616,15 @@ itemFields.genre=Genre itemFields.archive=Archive itemFields.attachmentPDF=PDF Attachment itemFields.repository=Repository +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=Author creatorTypes.contributor=Contributor diff --git a/chrome/locale/ar/zotero/zotero.properties b/chrome/locale/ar/zotero/zotero.properties index 48bf51838c4..472d3df88b2 100644 --- a/chrome/locale/ar/zotero/zotero.properties +++ b/chrome/locale/ar/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=مستند itemTypes.encyclopediaArticle=مقالة في موسوعة itemTypes.dictionaryEntry=كلمة في المعجم itemTypes.preprint=Preprint +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=نوع العنصر itemFields.title=العنوان @@ -614,8 +616,15 @@ itemFields.genre=النوع الأدبي itemFields.archive=الارشيف itemFields.attachmentPDF=PDF Attachment itemFields.repository=Repository +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=المؤلف creatorTypes.contributor=اسم المشارك diff --git a/chrome/locale/bg-BG/zotero/zotero.properties b/chrome/locale/bg-BG/zotero/zotero.properties index 31b8fd16149..28a6d2c9d52 100644 --- a/chrome/locale/bg-BG/zotero/zotero.properties +++ b/chrome/locale/bg-BG/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=Документ itemTypes.encyclopediaArticle=Статия в енциклопедия itemTypes.dictionaryEntry=Определение в речник itemTypes.preprint=Preprint +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=Тип itemFields.title=Заглавие @@ -614,8 +616,15 @@ itemFields.genre=Жанр itemFields.archive=Archive itemFields.attachmentPDF=PDF Attachment itemFields.repository=Repository +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=Автор creatorTypes.contributor=Сътрудник diff --git a/chrome/locale/br/zotero/zotero.properties b/chrome/locale/br/zotero/zotero.properties index 6b84eef1fb3..17f0878f38e 100644 --- a/chrome/locale/br/zotero/zotero.properties +++ b/chrome/locale/br/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=Teuliad itemTypes.encyclopediaArticle=Pennad hollouiziegezh itemTypes.dictionaryEntry=Pennger geriadur itemTypes.preprint=Preprint +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=Doare itemFields.title=Titl @@ -614,8 +616,15 @@ itemFields.genre=Doare itemFields.archive=Diell itemFields.attachmentPDF=PDF Attachment itemFields.repository=Repository +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=Aozer creatorTypes.contributor=Kendaoler diff --git a/chrome/locale/ca-AD/zotero/zotero.properties b/chrome/locale/ca-AD/zotero/zotero.properties index 56102bea50c..1b10d7fd719 100644 --- a/chrome/locale/ca-AD/zotero/zotero.properties +++ b/chrome/locale/ca-AD/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=Document itemTypes.encyclopediaArticle=Article enciclopèdic itemTypes.dictionaryEntry=Entrada de diccionari itemTypes.preprint=Prepublicació +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=Tipus itemFields.title=Títol @@ -614,8 +616,15 @@ itemFields.genre=Gènere itemFields.archive=Arxiu itemFields.attachmentPDF=Adjunció PDF itemFields.repository=Repositori +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=ID d'arxiu itemFields.citationKey=Clau de cita +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=Autor creatorTypes.contributor=Col·laborador diff --git a/chrome/locale/cs-CZ/zotero/zotero.properties b/chrome/locale/cs-CZ/zotero/zotero.properties index b184fe24148..3aa7ee7bdba 100644 --- a/chrome/locale/cs-CZ/zotero/zotero.properties +++ b/chrome/locale/cs-CZ/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=Dokument itemTypes.encyclopediaArticle=Článek v encyklopedii itemTypes.dictionaryEntry=Záznam ve slovníku itemTypes.preprint=Preprint +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=Typ itemFields.title=Název @@ -614,8 +616,15 @@ itemFields.genre=Žánr itemFields.archive=Archiv itemFields.attachmentPDF=PDF Attachment itemFields.repository=Repository +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=Autor creatorTypes.contributor=Přispěvatel diff --git a/chrome/locale/da-DK/zotero/zotero.properties b/chrome/locale/da-DK/zotero/zotero.properties index bf775c3e71f..d0ad141c580 100644 --- a/chrome/locale/da-DK/zotero/zotero.properties +++ b/chrome/locale/da-DK/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=Dokument itemTypes.encyclopediaArticle=Leksikonartikel itemTypes.dictionaryEntry=Ordbogsopslag itemTypes.preprint=Preprint +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=Type itemFields.title=Titel @@ -614,8 +616,15 @@ itemFields.genre=Genre itemFields.archive=Samling itemFields.attachmentPDF=PDF Attachment itemFields.repository=Repository +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=Forfatter/Ophav creatorTypes.contributor=Anden bidragyder diff --git a/chrome/locale/de/zotero/zotero.properties b/chrome/locale/de/zotero/zotero.properties index f46f492dbc5..b50dbf965c8 100644 --- a/chrome/locale/de/zotero/zotero.properties +++ b/chrome/locale/de/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=Dokument itemTypes.encyclopediaArticle=Enzyklopädieartikel itemTypes.dictionaryEntry=Wörterbucheintrag itemTypes.preprint=Preprint +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=Typ itemFields.title=Titel @@ -614,8 +616,15 @@ itemFields.genre=Genre itemFields.archive=Archiv itemFields.attachmentPDF=PDF-Anhang itemFields.repository=Repositorium +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archiv-ID itemFields.citationKey=Zitierschlüssel +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=Autor creatorTypes.contributor=Mitarbeiter diff --git a/chrome/locale/el-GR/zotero/zotero.properties b/chrome/locale/el-GR/zotero/zotero.properties index 05e1af3d450..f764cd2c518 100644 --- a/chrome/locale/el-GR/zotero/zotero.properties +++ b/chrome/locale/el-GR/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=Έγγραφο itemTypes.encyclopediaArticle=Άρθρο εγκυκλοπαίδειας itemTypes.dictionaryEntry=Εισαγωγή λεξικού itemTypes.preprint=Preprint +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=Τύπος itemFields.title=Τίτλος @@ -614,8 +616,15 @@ itemFields.genre=Είδος itemFields.archive=Αρχείο itemFields.attachmentPDF=PDF Attachment itemFields.repository=Repository +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=Συγγραφέας creatorTypes.contributor=Contributor diff --git a/chrome/locale/en-GB/zotero/zotero.properties b/chrome/locale/en-GB/zotero/zotero.properties index f92cb11f6d6..0d9c27ce4cb 100644 --- a/chrome/locale/en-GB/zotero/zotero.properties +++ b/chrome/locale/en-GB/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=Document itemTypes.encyclopediaArticle=Encyclopedia Article itemTypes.dictionaryEntry=Dictionary Entry itemTypes.preprint=Preprint +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=Type itemFields.title=Title @@ -614,8 +616,15 @@ itemFields.genre=Genre itemFields.archive=Archive itemFields.attachmentPDF=PDF Attachment itemFields.repository=Repository +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=Author creatorTypes.contributor=Contributor diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties index 321c629eb56..f6cfa369ef3 100644 --- a/chrome/locale/en-US/zotero/zotero.properties +++ b/chrome/locale/en-US/zotero/zotero.properties @@ -501,8 +501,10 @@ itemTypes.document = Document itemTypes.encyclopediaArticle = Encyclopedia Article itemTypes.dictionaryEntry = Dictionary Entry itemTypes.preprint = Preprint +itemTypes.dataset = Dataset +itemTypes.standard = Standard -itemFields.itemType = Type +itemFields.itemType = Item Type itemFields.title = Title itemFields.dateAdded = Date Added itemFields.dateModified = Modified @@ -615,8 +617,15 @@ itemFields.genre = Genre itemFields.archive = Archive itemFields.attachmentPDF = PDF Attachment itemFields.repository = Repository +itemFields.repositoryLocation = Repo. Location itemFields.archiveID = Archive ID itemFields.citationKey = Citation Key +itemFields.identifier = Identifier +itemFields.type = Type +itemFields.format = Format +itemFields.status = Status +itemFields.organization = Organization +itemFields.authority = Authority creatorTypes.author = Author creatorTypes.contributor = Contributor diff --git a/chrome/locale/es-ES/zotero/zotero.properties b/chrome/locale/es-ES/zotero/zotero.properties index aec3707bdd5..2effc16d251 100644 --- a/chrome/locale/es-ES/zotero/zotero.properties +++ b/chrome/locale/es-ES/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=Documento itemTypes.encyclopediaArticle=Artículo de enciclopedia itemTypes.dictionaryEntry=Entrada de diccionario itemTypes.preprint=Preimpresión +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=Tipo itemFields.title=Título @@ -614,8 +616,15 @@ itemFields.genre=Género itemFields.archive=Archivo itemFields.attachmentPDF=Adjunto PDF itemFields.repository=Repositorio +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=ID de archivo itemFields.citationKey=Clave de cita +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=Autor creatorTypes.contributor=Contribuidor diff --git a/chrome/locale/et-EE/zotero/zotero.properties b/chrome/locale/et-EE/zotero/zotero.properties index 50adf1238e1..ece21e0f3e2 100644 --- a/chrome/locale/et-EE/zotero/zotero.properties +++ b/chrome/locale/et-EE/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=Dokument itemTypes.encyclopediaArticle=Entsüklopeediaartikkel itemTypes.dictionaryEntry=Kirje sõnaraamatus itemTypes.preprint=Preprint +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=Tüüp itemFields.title=Pealkiri @@ -614,8 +616,15 @@ itemFields.genre=Žanr itemFields.archive=Arhiiv itemFields.attachmentPDF=PDF Attachment itemFields.repository=Repository +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=Autor creatorTypes.contributor=Kaastööline diff --git a/chrome/locale/eu-ES/zotero/zotero.properties b/chrome/locale/eu-ES/zotero/zotero.properties index 5678be2a6b2..78c5d16ceb7 100644 --- a/chrome/locale/eu-ES/zotero/zotero.properties +++ b/chrome/locale/eu-ES/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=Dokumentua itemTypes.encyclopediaArticle=Entziklopedia artikulua itemTypes.dictionaryEntry=Hiztegi-sarrera itemTypes.preprint=Imprimatu aurrekoa +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=Mota itemFields.title=Izenburua @@ -614,8 +616,15 @@ itemFields.genre=Generoa itemFields.archive=Artxiboa itemFields.attachmentPDF=PDF eranskina itemFields.repository=Biltegia +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Artxibo IDa itemFields.citationKey=Aipu-gakoa +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=Autorea creatorTypes.contributor=Kolaboratzaile diff --git a/chrome/locale/fa/zotero/zotero.properties b/chrome/locale/fa/zotero/zotero.properties index b6b5f934cca..9a97d607b3b 100644 --- a/chrome/locale/fa/zotero/zotero.properties +++ b/chrome/locale/fa/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=سند itemTypes.encyclopediaArticle=مقاله دانشنامه itemTypes.dictionaryEntry=مدخل لغتنامه itemTypes.preprint=Preprint +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=نوع itemFields.title=عنوان @@ -614,8 +616,15 @@ itemFields.genre=ژانر itemFields.archive=آرشیو itemFields.attachmentPDF=PDF Attachment itemFields.repository=Repository +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=نویسنده creatorTypes.contributor=پدیدآور diff --git a/chrome/locale/fi-FI/zotero/zotero.properties b/chrome/locale/fi-FI/zotero/zotero.properties index 8f307c3dc87..504f0443f0e 100644 --- a/chrome/locale/fi-FI/zotero/zotero.properties +++ b/chrome/locale/fi-FI/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=Asiakirja itemTypes.encyclopediaArticle=Tietosanakirja-artikkeli itemTypes.dictionaryEntry=Sanakirjan hakusana itemTypes.preprint=Käsikirjoitusversio +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=Tyyppi itemFields.title=Otsake @@ -614,8 +616,15 @@ itemFields.genre=Genre itemFields.archive=Arkisto itemFields.attachmentPDF=PDF-liite itemFields.repository=Säilö +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Arkistotunniste (Archive ID) itemFields.citationKey=Viitteen tunniste +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=Tekijä creatorTypes.contributor=Muu tekijä diff --git a/chrome/locale/fr-FR/zotero/zotero.properties b/chrome/locale/fr-FR/zotero/zotero.properties index 1811c45dfa0..526f9a66b29 100644 --- a/chrome/locale/fr-FR/zotero/zotero.properties +++ b/chrome/locale/fr-FR/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=Document itemTypes.encyclopediaArticle=Article d'encyclopédie itemTypes.dictionaryEntry=Entrée de dictionnaire itemTypes.preprint=Prépublication +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=Type itemFields.title=Titre @@ -614,8 +616,15 @@ itemFields.genre=Genre itemFields.archive=Archive itemFields.attachmentPDF=Pièce jointe PDF itemFields.repository=Dépôt +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Identifiant dans l'archive itemFields.citationKey=Clé de citation +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=Auteur creatorTypes.contributor=Collaborateur diff --git a/chrome/locale/gl-ES/zotero/zotero.properties b/chrome/locale/gl-ES/zotero/zotero.properties index 3dcb82b4cdb..7f0020f5da1 100644 --- a/chrome/locale/gl-ES/zotero/zotero.properties +++ b/chrome/locale/gl-ES/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=Documento itemTypes.encyclopediaArticle=Artigo enciclopédico itemTypes.dictionaryEntry=Entrada de dicionario itemTypes.preprint=Pre-impresión +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=Tipo itemFields.title=Título @@ -614,8 +616,15 @@ itemFields.genre=Xénero itemFields.archive=Arquivo itemFields.attachmentPDF=Anexo en PDF itemFields.repository=Repositorio +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Arquivo ID itemFields.citationKey=Clave de citación +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=Autor creatorTypes.contributor=Colaborador diff --git a/chrome/locale/he-IL/zotero/zotero.properties b/chrome/locale/he-IL/zotero/zotero.properties index 04d6a3c33fa..444dd7606e7 100644 --- a/chrome/locale/he-IL/zotero/zotero.properties +++ b/chrome/locale/he-IL/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=מסמך itemTypes.encyclopediaArticle=ערך באנציקלופדיה itemTypes.dictionaryEntry=ערך במילון itemTypes.preprint=Preprint +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=סוג itemFields.title=כותרת @@ -614,8 +616,15 @@ itemFields.genre=סוגה itemFields.archive=ארכיון itemFields.attachmentPDF=צרופת PDF itemFields.repository=מאגר +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=מזהה ארכיון itemFields.citationKey=מפתח ציטוט +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=מחבר creatorTypes.contributor=Contributor diff --git a/chrome/locale/hr-HR/zotero/zotero.properties b/chrome/locale/hr-HR/zotero/zotero.properties index 99af0508cf4..861288a1749 100644 --- a/chrome/locale/hr-HR/zotero/zotero.properties +++ b/chrome/locale/hr-HR/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=Document itemTypes.encyclopediaArticle=Encyclopedia Article itemTypes.dictionaryEntry=Dictionary Entry itemTypes.preprint=Preprint +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=Type itemFields.title=Title @@ -614,8 +616,15 @@ itemFields.genre=Genre itemFields.archive=Archive itemFields.attachmentPDF=PDF Attachment itemFields.repository=Repository +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=Author creatorTypes.contributor=Contributor diff --git a/chrome/locale/hu-HU/zotero/zotero.properties b/chrome/locale/hu-HU/zotero/zotero.properties index 7d8f1ad8428..1ce9166ba3a 100644 --- a/chrome/locale/hu-HU/zotero/zotero.properties +++ b/chrome/locale/hu-HU/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=Dokumentum itemTypes.encyclopediaArticle=Lexikon szócikk itemTypes.dictionaryEntry=Szótár szócikk itemTypes.preprint=Preprint +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=Típus itemFields.title=Cím @@ -614,8 +616,15 @@ itemFields.genre=Típus itemFields.archive=Archívum itemFields.attachmentPDF=PDF csatolmány itemFields.repository=Repozitórium +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=Szerző creatorTypes.contributor=Közreműködő diff --git a/chrome/locale/id-ID/zotero/zotero.properties b/chrome/locale/id-ID/zotero/zotero.properties index 667c5a1f66f..420a29e3aa3 100644 --- a/chrome/locale/id-ID/zotero/zotero.properties +++ b/chrome/locale/id-ID/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=Dokumen itemTypes.encyclopediaArticle=Artikel Ensiklopedia itemTypes.dictionaryEntry=Entri Kamus itemTypes.preprint=Preprint +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=Jenis itemFields.title=Judul @@ -614,8 +616,15 @@ itemFields.genre=Genre itemFields.archive=Arsip itemFields.attachmentPDF=PDF Attachment itemFields.repository=Repository +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=Penulis creatorTypes.contributor=Kontributor diff --git a/chrome/locale/is-IS/zotero/zotero.properties b/chrome/locale/is-IS/zotero/zotero.properties index 8a8a639fb7e..b7269595c44 100644 --- a/chrome/locale/is-IS/zotero/zotero.properties +++ b/chrome/locale/is-IS/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=Skjal itemTypes.encyclopediaArticle=Færsla í alfræðiriti itemTypes.dictionaryEntry=Færsla í orðabók itemTypes.preprint=Preprint +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=Tegund itemFields.title=Titill @@ -614,8 +616,15 @@ itemFields.genre=Tegund itemFields.archive=Safnvista itemFields.attachmentPDF=PDF Attachment itemFields.repository=Repository +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=Höfundur creatorTypes.contributor=Aðili að verki diff --git a/chrome/locale/it-IT/zotero/zotero.properties b/chrome/locale/it-IT/zotero/zotero.properties index 7cddda1c458..eb1d4c3ff4b 100644 --- a/chrome/locale/it-IT/zotero/zotero.properties +++ b/chrome/locale/it-IT/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=Documento itemTypes.encyclopediaArticle=Voce di enciclopedia itemTypes.dictionaryEntry=Voce di dizionario itemTypes.preprint=Preprint +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=Tipo itemFields.title=Titolo @@ -614,8 +616,15 @@ itemFields.genre=Genere itemFields.archive=Archivio itemFields.attachmentPDF=Allegato PDF itemFields.repository=Repository +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=ID dell'archivio itemFields.citationKey=Chiave di citazione +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=Autore creatorTypes.contributor=Collaboratore diff --git a/chrome/locale/ja-JP/zotero/zotero.properties b/chrome/locale/ja-JP/zotero/zotero.properties index 4365c98a4ca..86a6ef3aa95 100644 --- a/chrome/locale/ja-JP/zotero/zotero.properties +++ b/chrome/locale/ja-JP/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=文書 itemTypes.encyclopediaArticle=百科事典項目 itemTypes.dictionaryEntry=辞書項目 itemTypes.preprint=プレプリント +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=種類 itemFields.title=題名 @@ -614,8 +616,15 @@ itemFields.genre=ジャンル itemFields.archive=アーカイブ itemFields.attachmentPDF=PDF 添付ファイル itemFields.repository=リポジトリ +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=アーカイブ ID itemFields.citationKey=出典表記キー +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=著者名 creatorTypes.contributor=寄稿者名 diff --git a/chrome/locale/km/zotero/zotero.properties b/chrome/locale/km/zotero/zotero.properties index 0ae2ce0547b..63e9b676ad6 100644 --- a/chrome/locale/km/zotero/zotero.properties +++ b/chrome/locale/km/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=ឯកសារ itemTypes.encyclopediaArticle=សព្វវចនាធិប្បាយ itemTypes.dictionaryEntry=វចនានុក្រម itemTypes.preprint=Preprint +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=ប្រភេទ itemFields.title=ចំណងជើង @@ -614,8 +616,15 @@ itemFields.genre=អត្តសញ្ញាណពិសេស itemFields.archive=បណ្ណាសារ itemFields.attachmentPDF=PDF Attachment itemFields.repository=Repository +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=អ្នកនិពន្ធ creatorTypes.contributor=អ្នកចូលរួម diff --git a/chrome/locale/ko-KR/zotero/zotero.properties b/chrome/locale/ko-KR/zotero/zotero.properties index 5770c415bbf..7e758661f36 100644 --- a/chrome/locale/ko-KR/zotero/zotero.properties +++ b/chrome/locale/ko-KR/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=문서 itemTypes.encyclopediaArticle=백과사전 항목 itemTypes.dictionaryEntry=사전 항목 itemTypes.preprint=Preprint +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=형식 itemFields.title=제목 @@ -614,8 +616,15 @@ itemFields.genre=장르 itemFields.archive=아카이브 itemFields.attachmentPDF=PDF Attachment itemFields.repository=Repository +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=저자 creatorTypes.contributor=공헌자 diff --git a/chrome/locale/lt-LT/zotero/zotero.properties b/chrome/locale/lt-LT/zotero/zotero.properties index 128bf69fb35..df6e333cc3f 100644 --- a/chrome/locale/lt-LT/zotero/zotero.properties +++ b/chrome/locale/lt-LT/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=Dokumentas itemTypes.encyclopediaArticle=Straipsnelis enciklopedijoje itemTypes.dictionaryEntry=Žodyno įrašas itemTypes.preprint=Preprint +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=Tipas itemFields.title=Pavadinimas @@ -614,8 +616,15 @@ itemFields.genre=Žanras itemFields.archive=Archyvas itemFields.attachmentPDF=PDF Attachment itemFields.repository=Repository +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=Autorius creatorTypes.contributor=Bendradarbis diff --git a/chrome/locale/mn-MN/zotero/zotero.properties b/chrome/locale/mn-MN/zotero/zotero.properties index e44c1252cdb..ba67bce58c8 100644 --- a/chrome/locale/mn-MN/zotero/zotero.properties +++ b/chrome/locale/mn-MN/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=Document itemTypes.encyclopediaArticle=Encyclopedia Article itemTypes.dictionaryEntry=Dictionary Entry itemTypes.preprint=Preprint +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=Type itemFields.title=Title @@ -614,8 +616,15 @@ itemFields.genre=Genre itemFields.archive=Archive itemFields.attachmentPDF=PDF Attachment itemFields.repository=Repository +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=Author creatorTypes.contributor=Contributor diff --git a/chrome/locale/nb-NO/zotero/zotero.properties b/chrome/locale/nb-NO/zotero/zotero.properties index f1010ee91d6..3f52ff6f8d2 100644 --- a/chrome/locale/nb-NO/zotero/zotero.properties +++ b/chrome/locale/nb-NO/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=Dokument itemTypes.encyclopediaArticle=Artikkel i oppslagsverk itemTypes.dictionaryEntry=Oppslag i ordbok itemTypes.preprint=Forhåndstrykk +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=Type itemFields.title=Tittel @@ -614,8 +616,15 @@ itemFields.genre=Sjanger itemFields.archive=Arkiv itemFields.attachmentPDF=PDF-vedlegg itemFields.repository=Magasin +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Arkiv ID itemFields.citationKey=Henvisningsnøkkel +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=Forfatter creatorTypes.contributor=Medforfatter diff --git a/chrome/locale/nl-NL/zotero/zotero.properties b/chrome/locale/nl-NL/zotero/zotero.properties index 5662c68fe7a..901682d8351 100644 --- a/chrome/locale/nl-NL/zotero/zotero.properties +++ b/chrome/locale/nl-NL/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=Document itemTypes.encyclopediaArticle=Encyclopedie-artikel itemTypes.dictionaryEntry=Lemma itemTypes.preprint=Preprint +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=Type itemFields.title=Titel @@ -614,8 +616,15 @@ itemFields.genre=Genre itemFields.archive=Archief itemFields.attachmentPDF=PDF Attachment itemFields.repository=Repository +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=Auteur creatorTypes.contributor=Coauteur diff --git a/chrome/locale/nn-NO/zotero/zotero.properties b/chrome/locale/nn-NO/zotero/zotero.properties index bca74b4dd8e..cdc3f685f52 100644 --- a/chrome/locale/nn-NO/zotero/zotero.properties +++ b/chrome/locale/nn-NO/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=Dokument itemTypes.encyclopediaArticle=Artikkel i oppslagsverk itemTypes.dictionaryEntry=Ordbokoppslag itemTypes.preprint=Preprint +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=Type itemFields.title=Tittel @@ -614,8 +616,15 @@ itemFields.genre=Sjanger itemFields.archive=Arkiv\n itemFields.attachmentPDF=PDF Attachment itemFields.repository=Repository +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=Forfattar creatorTypes.contributor=Medforfatter diff --git a/chrome/locale/pl-PL/zotero/zotero.properties b/chrome/locale/pl-PL/zotero/zotero.properties index 22008f0d142..d57ada6dbd9 100644 --- a/chrome/locale/pl-PL/zotero/zotero.properties +++ b/chrome/locale/pl-PL/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=Dokument itemTypes.encyclopediaArticle=Artykuł w encyklopedii itemTypes.dictionaryEntry=Hasło słownikowe itemTypes.preprint=Preprint +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=Typ itemFields.title=Tytuł @@ -614,8 +616,15 @@ itemFields.genre=Rodzaj itemFields.archive=Archiwum itemFields.attachmentPDF=Załącznik PDF itemFields.repository=Repozytorium +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Identyfikator archiwum itemFields.citationKey=Klucz cytowania +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=Autor creatorTypes.contributor=Współautor diff --git a/chrome/locale/pt-BR/zotero/zotero.properties b/chrome/locale/pt-BR/zotero/zotero.properties index 7543fd560c4..aaa89486c32 100644 --- a/chrome/locale/pt-BR/zotero/zotero.properties +++ b/chrome/locale/pt-BR/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=Documento itemTypes.encyclopediaArticle=Verbete de enciclopédia itemTypes.dictionaryEntry=Verbete de dicionário itemTypes.preprint=Pré-impressão +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=Tipo itemFields.title=Título @@ -614,8 +616,15 @@ itemFields.genre=Gênero itemFields.archive=Arquivo itemFields.attachmentPDF=Anexo em PDF itemFields.repository=Repositório +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=ID do Arquivo itemFields.citationKey=Chave de Citação +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=Autor creatorTypes.contributor=Contribuidor diff --git a/chrome/locale/pt-PT/zotero/zotero.properties b/chrome/locale/pt-PT/zotero/zotero.properties index 8f2a91d342d..1d94d264709 100644 --- a/chrome/locale/pt-PT/zotero/zotero.properties +++ b/chrome/locale/pt-PT/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=Documento itemTypes.encyclopediaArticle=Artigo de Enciclopédia itemTypes.dictionaryEntry=Verbete de Dicionário itemTypes.preprint=Pré-impressão +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=Tipo itemFields.title=Título @@ -614,8 +616,15 @@ itemFields.genre=Género itemFields.archive=Arquivo itemFields.attachmentPDF=Anexo PDF itemFields.repository=Repositório +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=ID do Arquivo itemFields.citationKey=Chave de Citação +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=Autor creatorTypes.contributor=Colaborador diff --git a/chrome/locale/ro-RO/zotero/zotero.properties b/chrome/locale/ro-RO/zotero/zotero.properties index c80665b62d7..265e71f79f1 100644 --- a/chrome/locale/ro-RO/zotero/zotero.properties +++ b/chrome/locale/ro-RO/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=Document itemTypes.encyclopediaArticle=Articol de enciclopedie itemTypes.dictionaryEntry=Articol de dicționar itemTypes.preprint=Preprint +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=Tip itemFields.title=Titlu @@ -614,8 +616,15 @@ itemFields.genre=Gen itemFields.archive=Arhivă itemFields.attachmentPDF=PDF Attachment itemFields.repository=Repository +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=Autor creatorTypes.contributor=Colaborator diff --git a/chrome/locale/ru-RU/zotero/zotero.properties b/chrome/locale/ru-RU/zotero/zotero.properties index f480c29ae73..b526e409ab7 100644 --- a/chrome/locale/ru-RU/zotero/zotero.properties +++ b/chrome/locale/ru-RU/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=Документ itemTypes.encyclopediaArticle=Статья из энциклопедии itemTypes.dictionaryEntry=Словарная статья itemTypes.preprint=Препринт +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=Тип itemFields.title=Название @@ -614,8 +616,15 @@ itemFields.genre=Жанр itemFields.archive=Архив itemFields.attachmentPDF=Приложение PDF itemFields.repository=Репозиторий +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=ID на archive.org itemFields.citationKey=Ключ цитирования +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=Автор creatorTypes.contributor=Соавтор diff --git a/chrome/locale/sk-SK/zotero/zotero.properties b/chrome/locale/sk-SK/zotero/zotero.properties index f330bd08f33..1ff1f4ac76c 100644 --- a/chrome/locale/sk-SK/zotero/zotero.properties +++ b/chrome/locale/sk-SK/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=Dokument itemTypes.encyclopediaArticle=Článok v encyklopédii itemTypes.dictionaryEntry=Heslo v slovníku itemTypes.preprint=Preprint +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=Typ itemFields.title=Názov @@ -614,8 +616,15 @@ itemFields.genre=Žáner itemFields.archive=Archív itemFields.attachmentPDF=PDF Attachment itemFields.repository=Repository +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=Autor creatorTypes.contributor=Prispievateľ diff --git a/chrome/locale/sl-SI/zotero/zotero.properties b/chrome/locale/sl-SI/zotero/zotero.properties index 7d3efbab446..ab2463e5578 100644 --- a/chrome/locale/sl-SI/zotero/zotero.properties +++ b/chrome/locale/sl-SI/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=Dokument itemTypes.encyclopediaArticle=Enciklopedični članek itemTypes.dictionaryEntry=Slovarski vnos itemTypes.preprint=Predobjava +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=Vrsta itemFields.title=Naslov @@ -614,8 +616,15 @@ itemFields.genre=Žanr itemFields.archive=Arhiv itemFields.attachmentPDF=Priponka PDF itemFields.repository=Skladišče +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=ID arhiva itemFields.citationKey=Ključ citata +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=Avtor creatorTypes.contributor=Avtor prispevka diff --git a/chrome/locale/sr-RS/zotero/zotero.properties b/chrome/locale/sr-RS/zotero/zotero.properties index fa3c71ca798..fca256915fc 100644 --- a/chrome/locale/sr-RS/zotero/zotero.properties +++ b/chrome/locale/sr-RS/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=Документ itemTypes.encyclopediaArticle=Чланак из енциклопедије itemTypes.dictionaryEntry=Унос из речника itemTypes.preprint=Preprint +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=Врста itemFields.title=Наслов @@ -614,8 +616,15 @@ itemFields.genre=Жанр itemFields.archive=Архива itemFields.attachmentPDF=PDF Attachment itemFields.repository=Repository +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=Аутор creatorTypes.contributor=Сарадник diff --git a/chrome/locale/sv-SE/zotero/zotero.properties b/chrome/locale/sv-SE/zotero/zotero.properties index f74d85433e8..6f5f1a90264 100644 --- a/chrome/locale/sv-SE/zotero/zotero.properties +++ b/chrome/locale/sv-SE/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=Dokument itemTypes.encyclopediaArticle=Artikel i uppslagsverk itemTypes.dictionaryEntry=Uppslag i ordbok itemTypes.preprint=Preprint +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=Typ itemFields.title=Titel @@ -614,8 +616,15 @@ itemFields.genre=Genre itemFields.archive=Arkiv itemFields.attachmentPDF=PDF Attachment itemFields.repository=Repository +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=Författare creatorTypes.contributor=Medarbetare diff --git a/chrome/locale/th-TH/zotero/zotero.properties b/chrome/locale/th-TH/zotero/zotero.properties index 003b9fed1b8..2cc9ebc258c 100644 --- a/chrome/locale/th-TH/zotero/zotero.properties +++ b/chrome/locale/th-TH/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=เอกสาร itemTypes.encyclopediaArticle=บทความสารานุกรม itemTypes.dictionaryEntry=พจนานุกรม itemTypes.preprint=Preprint +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=ประเภท itemFields.title=ชื่อเรื่อง @@ -614,8 +616,15 @@ itemFields.genre=ประเภท itemFields.archive=เอกสารสำคัญ itemFields.attachmentPDF=PDF Attachment itemFields.repository=Repository +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=ผู้แต่ง creatorTypes.contributor=ผู้ช่วยเหลือ diff --git a/chrome/locale/tr-TR/zotero/zotero.properties b/chrome/locale/tr-TR/zotero/zotero.properties index 290ef4baf4e..9a475240b43 100644 --- a/chrome/locale/tr-TR/zotero/zotero.properties +++ b/chrome/locale/tr-TR/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=Doküman itemTypes.encyclopediaArticle=Ansiklopedi Makalesi itemTypes.dictionaryEntry=Sözlük Girdisi itemTypes.preprint=Ön Baskı +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=Tür itemFields.title=Başlık @@ -614,8 +616,15 @@ itemFields.genre=Çeşit itemFields.archive=Arşiv itemFields.attachmentPDF=PDF Eki itemFields.repository=Depo +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Arşiv Kimlik Numarası itemFields.citationKey=Alıntı Anahtarı +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=Yazar creatorTypes.contributor=Katkıda Bulunan diff --git a/chrome/locale/uk-UA/zotero/zotero.properties b/chrome/locale/uk-UA/zotero/zotero.properties index 1cf3621ed68..4f4fd78f45d 100644 --- a/chrome/locale/uk-UA/zotero/zotero.properties +++ b/chrome/locale/uk-UA/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=Документ itemTypes.encyclopediaArticle=Стаття з екциклопедії itemTypes.dictionaryEntry=Стаття зі словника itemTypes.preprint=Preprint +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=Тип itemFields.title=Назва @@ -614,8 +616,15 @@ itemFields.genre=Жанр itemFields.archive=Архів itemFields.attachmentPDF=PDF Attachment itemFields.repository=Repository +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=Автор creatorTypes.contributor=Співавтор diff --git a/chrome/locale/vi-VN/zotero/zotero.properties b/chrome/locale/vi-VN/zotero/zotero.properties index 209e8800c23..f2dccb4ff2b 100644 --- a/chrome/locale/vi-VN/zotero/zotero.properties +++ b/chrome/locale/vi-VN/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=Tài liệu itemTypes.encyclopediaArticle=Bài viết trong Bách khoa toàn thư itemTypes.dictionaryEntry=Mục từ trong Từ điển itemTypes.preprint=Preprint +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=Kiểu itemFields.title=Nhan đề @@ -614,8 +616,15 @@ itemFields.genre=Thể loại itemFields.archive=Lưu itemFields.attachmentPDF=PDF Attachment itemFields.repository=Repository +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=Tác giả creatorTypes.contributor=Cộng tác viên diff --git a/chrome/locale/zh-CN/zotero/zotero.properties b/chrome/locale/zh-CN/zotero/zotero.properties index d036da4626a..88c8424abb7 100644 --- a/chrome/locale/zh-CN/zotero/zotero.properties +++ b/chrome/locale/zh-CN/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=文档 itemTypes.encyclopediaArticle=百科条目 itemTypes.dictionaryEntry=词条 itemTypes.preprint=预印本 +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=类型 itemFields.title=标题 @@ -614,8 +616,15 @@ itemFields.genre=流派 itemFields.archive=档案 itemFields.attachmentPDF=PDF附件 itemFields.repository=仓库 +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=存档ID itemFields.citationKey=引用关键词 +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=作者 creatorTypes.contributor=贡献者 diff --git a/chrome/locale/zh-TW/zotero/zotero.properties b/chrome/locale/zh-TW/zotero/zotero.properties index 9c8b8e82da5..eb4cd28f609 100644 --- a/chrome/locale/zh-TW/zotero/zotero.properties +++ b/chrome/locale/zh-TW/zotero/zotero.properties @@ -500,6 +500,8 @@ itemTypes.document=文件 itemTypes.encyclopediaArticle=百科全書文章 itemTypes.dictionaryEntry=字典條目 itemTypes.preprint=預印本 +itemTypes.dataset=Dataset +itemTypes.standard=Standard itemFields.itemType=類型 itemFields.title=標題 @@ -614,8 +616,15 @@ itemFields.genre=流派 itemFields.archive=檔案空間 itemFields.attachmentPDF=PDF 附件 itemFields.repository=資料存放處 +itemFields.repositoryLocation=Repo. Location itemFields.archiveID=存檔 ID itemFields.citationKey=引用關鍵詞 +itemFields.identifier=Identifier +itemFields.type=Type +itemFields.format=Format +itemFields.status=Status +itemFields.organization=Organization +itemFields.authority=Authority creatorTypes.author=作者 creatorTypes.contributor=貢獻者 diff --git a/chrome/skin/default/zotero/treeitem-dataset.png b/chrome/skin/default/zotero/treeitem-dataset.png new file mode 100644 index 0000000000000000000000000000000000000000..8bff5728b132f18bf83c2f24340624e263c53467 GIT binary patch literal 500 zcmV${b7ltq@i>4F zE8kaw%7lm##1K`2C?ZPG6h#rWoEO#Qcdu?d8~_L^6VqeoF*DS_%rH_+IOh!vm}&1m z02lxeQOt~wpWmaVsA`O+h*kH~{L5=^5mE97K_bKJ+i(7=?(X3Uq4xvPq+rcQQ(QF1 zrPz-hqgRFywO$2^B}b?470j-CUW^x+vAyY;YF2pPAJ-Hl51fP9b&qq<+K7?FJl`oZ zzH{kp%>z};qJrn+1+5Lwv$2YCzEkqFaUtWc-+mJG4+>hFk$JA;ajAIcU~#+5e%u-! ztam|Ciw~!o1#=zGWTR5BxLxviv{JBla8&PtVHRCIWnS1SbNvoj+NtpMi)Rq6DX^qq zvQehaX{im; q>P&n0{_mEif0@#<#r!A!$N2>f+(xToxB-9w0000~dw?!QC^MX4kH0+`Vd8@|Y#Dv~Un0K=%Uz{yNwI=&niGfH>o4C{F(jfXB5aEO}hx zdIWUE;|$ISr7{8ny9QtT^vqx9{!{l#K9ug=J@qgbr?dd&TzAm<+Zk%&VHc@rC<+M; z$m#^I`xhSJe~#Aoj>O4R5Huhv^%@w%h_gXQoCN_g059HUFj6Iau`rPh?7(j@JG~$D zal$is4MY@FO>QE`V81hbh6vSV1acIFiIy%;0svmV&j0{-7ABDzYjx+pHJ|oxXMY?5 z1q$+YfQkTfP)3`q994eF10P36UIUiC$S9<`bERZ;GxO0>e6Me{lm7E3CVYuziUO_Y zTH!|FJLUHku__CS3N-+33+KA?#Y<_9b>}zc4ki7czx@tPs-FfF8jnDMR5L&XResU; z5ES@4bn#a=GiS@>YxOLb-(vWC8;y1{h0h(GaQYfVf!4uM_$~%F0)ZmXe*sY;(w7${ zuWNOO#Lc<123|GVfB~+}rZv#~`U_yW7Zlntd?70FIZ6>gn75)GBTB>YKy6FvfJ9ht zv@83;>kn!F>BIYcYp$k1oFnm_@asXRk^)^BBNZy=y7TK7(;Vy0ug;|XA6q}8UJ&l* z>p-axnaHjlLr6dnKtBxxXb52bP754VF(M9C8^ z8BJ0S9-ow}f`jFD9E-3;@`#+1^@s6$I7^K00009a7bBm001r{ z001r{0eGc9b^rhi_en%SRCt{2TzhOB#TozY-qYvvfJ)U$w5n+TXeCr3AXR8VAfQl?TG|v!(xQ}Cg0T}jjq|dT0LHKQ z{kl8fYj>ua+1tClyY<;QpVM=dFWT(vYj)YEN z?6~vPsZ%qW%Sp(uc3=l#Ea2r zjBEy0HW>JxZOrWgu(R#pfdhJOw|ddRNY?lmU_>zjN(2xUlq7X%B?gQz5DXBui3S4) zLg7_75OvsGh=?SP;GfcI7mD6fqpt48Iq!*2-k?K}+JFpk(J3JWZnsG7K%oP@1`e5Cnd6U^h&pT+z7IB@@ zX1H3>YKm%1DghFtCRYelBbQAxV!mWzJ`_D*!I+xVA?|Z)ZcETGAsWM``h`;lqtRT24nA$XSH37>o9OzbrTw^n{=N|*4X$j zu64T+KoVc6JR7ZKK3zzVG;l^D5KC1S$Qeq{Yga^*z?1!5d_U0NkE2tqX$!}hYen2x zN7M~dY}v9^xksxZmnaJWBePUM&3G3gi|9>+NEn`ua6B62MkV5C)C&tta2E^)Yq)9} znzQ`8`lZqtj_U>d@x*u8y$NO|OXXy7NeSw!8!oB7_<5Iv`IlJ+mRXcaD2W1=qBlty zjATHhUZ;@Ikpy5=ZKIk1ooOKz7EEI)gYlcjr<0nf(XjMznLQkzugnQbf)`qtZ%tDQ|Njw^ zr@>70ffyYbK_@xONtTD;;p^J@Q`J32!e~u+jd_OSL?DoiK9pWv3_tPnN130oOS!O{ zbK$TSz$DH&dY%q2X3tH6!Jslsw@A4OF-T|)9Ke^f0|6?7^b^RuPG&L`GF2i|laPh& zSM9)t+t(I0|D$zuk-(VS78WBMhe<-K?;v_Yr{RYm6e99Xg~%~GU^QlQtzaN~LLN-` z$1&m`$2(nrMb<9*=7w#x@8_N@`qMvOdA}#kV9X6fy2J5lI*NbIyaYe>^0TE`Rj6II z5jIn<=FPDrIvtq6r-L8i{Af>(xzKvg%*M%WrGv%00kkHxIn^ZzkM4g&)8K?^aa(oc zg1reeJaT6A7=GLGI3yB+%XT%caWueTE#jRI%0bM8JP48iC}k!oz${u|GudG_m^qMx z-T@rzZ^MPLuRvr3>s&W|ckf;M-qgNp(Q=b?3Gaxf2T!;D1QH3NBDW58%Qq`|3JAWO zJcsGvgfe>02sJ{!iYDfn^HJeggCbioZeMi=J}@4_@xD%TTVMN&8=hU)*8E6IWc)H^ zFscfxk^-SO{+Wt+f>Zd_;Rg|v{iw*j0X2o|IS@nMehkkHK%!EFbd_v{Mu?bg6M-=t zA36e8b{UH8<=9ld8H7+A@9D~xDVksW^o32|-*`V~{fu7+`f|rp_@Mi3xNIx2vE&Zk zQKk)3!EtrHpsq$RIwp~8iU%vOE=NWFbzGzW((w*14D~`L*w_A}mWPn(^Co_22CeXZkr16w&1iB%%>So%dIU1T{cd4OWc$F5;r6n-lc9@*9;wAws|T{3kEC zu&~kbXX4Jpa>d&6by!=rF4gL}yngB#xI=D~*;d18E#fi6kar+r0-&*r;}nU4qXMzB z>RznKUy0wf{t^T3FW|~9M`_*)tS)llY~Mxa^M_w}a`)!@A6&q^$py_(Via0cxGL4E zxdi0^4)+}dg#oq8Hu27VHFbVYjvzD^h^ESK;O3RL@j7=mJb|}PK9BPg9a!b8!>!e~ zqO0#UNHV^&@1sBbG-JbYzrh2a9E8KXoCi}39F-^Ls}YSW@4>c;J0fkXEVveTulXKc zYJUnr*@s+94hrr07#yFl5sKQ34aWmE4>t?DNm=sf4Y{Mst3hEgSg@{iD~|Smf*Hx3 zpb?D~_h5VF&Y0GEgKm8C)xmIi8kQ_83bG5(KQh4{U74}rI5EhOC`FbjTLD-0ae`#E zFxJ z0Ws_uhyg+oMay`LlpN5wXj28LjE-xiYy2cgANzvJj{yvVk#`^<`_M6X6b+@DAPC`{ zMlj&pwLgGAG?M^C=ST-$Ke0Cs2v(o+gDYRq4<#X{?u-q`twtM9$-P0o>X~x{`;sj7 z_*>Vjkg0_AW!ob67w42E)G^{6!XHmOhk%s0(9dF2mV{1wry&zQ2y!uF!*ON~?2C=~ zhq!^*OgY?)WX2nm;NXQnbKPEBb_+xy(b~@p|A(7~9uQ2EvQ4?X-oCLRW!{CLGi5Ly z-t~i$FKj+-xlV|XD*DJidp?rHxl}saM1A<9O zZWWB85ucBBV`AFJfEY7dh0_@ujx%Dr@A^Gpw(?=$A%sW>McJjW8SM(4QiW3AJO37% zdk%3ojIc&L)BLkpfnZ}FuIv@?OF_Kb`~gensX*}KhqgW-XLN3|qw+44WS3#oGl_HK zXE;PFaw;M~fOCi!Z=ZPyExjMksS!-d@>X+gI`PE`42*eLuygKhE?B}xrVK!!=!chaeIS-S*DSUkTG}u7t z*Qy%!srO_&7+cD>VU?pAt(WAKKi5s-YGJD7K|7_&G(SeJ7X>mBdMyDf*&GdRo?>hPYX z-FH3K_~7`G0)t8Irt2M9yR5H35Qu%+rItSeuyS+9|}0$CNtFdv^ef&)j7bJL&_ z9enKe-L-p~c8_T9TT*{AVpZL$9NSLY!^S+zPD-ihwAoQrxDqRzMJTW@L#{Ok20=uK zNO1ey7@izK_s9@BdoEyb!pndl(u9A1abMmOt%p848(;rie@tXqCQeQleZ91@=oZ(n z1yQ_;htfn@%f!lr&mJkcAd4)+0TmFCyC>U*AD{eekWCTvQJsm|WMD8LSpK{?YY!GE z_3P`iH}2ZJ_TT*<))R|R15qra0-ThS@=((4b&r|&M?eysKHN1EGP+L)`E fWN}#n7y$kYoEOXQBI`6m00000NkvXXu0mjf;;Z2n literal 0 HcmV?d00001 diff --git a/chrome/skin/default/zotero/treeitem-standard@2x.png b/chrome/skin/default/zotero/treeitem-standard@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..89f344855960efc6105160895b710538adbd336d GIT binary patch literal 2691 zcmZ`*30xEB65j+Om#7?yB4Q*$70qoGLK2mPBM&(Q;?#UQb9ppKtu&W zkwZicB0`J7p9+eg6ufFZi}1k47!}gh9g?G63HJb9jL$idMIT_0&BgK>rgrAC}1F2`|{|xbzb# z1Y!wSE(Nhvf-`|k1}G#7l}4h{C{!$ogeWVP1AtyJ>PtMu=n0?LV!baq;yfpdp@4;v z%rg`M022#jp@4!TvjITgUKAK25Aj|@<4Gk1E?*icASfg)t#$vH_kT0b9v)w<@;U|XOX1QEO zBN7u66A6h_f)tD*lAWEMi6jbjNW`zv;AAJ_`#+X~EBhu%E)ss@EM(`K zG(KR}qLxhV*V}SysX#=HFG4mfiOeao;Ok#UW`66Kw zn=2PEk#@(EsCWuB@N>J5({(U9Y^2gOe*q*F$0O~rE>)7o_)j#Qhzyd>V2w|$)(Vd;(-1;&}T5`jrlWr5R5eW>+$Y_=@FZvV-?l(t^t|1q0<* z+<83ZdY<@4|L+}4WA4rR*ZRjbH8V;^#`d(pMjznlX!lzDlfOBpXf4Wqjgy1Yf> zJg9N1_Sy96kbhgKm85=!>nw-f${P-UpkA%ybc-*f7x>^?c8LRhEnWrqrn`H1MA2<; zbL%*gZueW|O3MugU2L)>T{86c|~2hTrNSm?DsQhdh9s#*#3p-VaY4`@sdA2zvE-3!(?DqnQ^Es_iH z<~C^_c3hL4%EL#~FUuTSgalyGUi4khh6U-@(GdxoF}X&7UMp}l|7W8}ufD#%mJgX! zA)(-gLBIOcsn+W65~O5JSXjC_j9VI%_>eUvUT7w-2SZpo;9z% zb`v`$mrCghl+^|-u%MTr%%9kl$U` zX8Rx1HR%hNz2Mkh^oPucGgVUu_io7fH8pxbf(mIAo&mB}B`!_3)nEJKX%@Xa-TYC? zK9kiw;#P{w@?;Ux#@CeTfyJ!zpH*$=t zE1OFymJK~M=3ls@*?fHX&Ew3E-5#A8b!_Fr4sfO+J1nc5}GQ0BGylx`n18+w;ee0PTphA{of>+@ZEif(rWz3a(4t9R;n z(~!eCCE!90UhU?F$sA=h>6z(QY;P*+0H?O^j+4BxTBdQ?9bizXtiMtc9@o>EF-#ZP)W z!Z)U**_$>zyI9@^c49USU(=+ht*`$U-jK!`MjH;DCJhu@1$f~Cvk2-i%p)(C?B@6* zF~hdFqfJp|!5+_Q(I*$AWTuVfb)>~QpUb~v{4veNtI%tus`6w+@F~VD!?%r2M}4H*%ew8uBd(vjT5)mR z9eYvSf;uO&qS$+`nR&t2^OAcClV>98$bTu0n-9CnHR6Z=0ftHL AeE Date: Thu, 23 Mar 2023 01:35:10 -0400 Subject: [PATCH 20/86] Write out path when generating item type/field data for tests It writes to the build folder, so it's easy to think it's not working. --- test/content/runtests.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/content/runtests.js b/test/content/runtests.js index a419d93d1bb..f761373c9cf 100644 --- a/test/content/runtests.js +++ b/test/content/runtests.js @@ -82,8 +82,9 @@ if (ZoteroUnit.makeTestData) { let str = stableStringify(newData); yield OS.File.writeAtomic(OS.Path.join(dataPath, params.name + '.js'), str); - dump("done."); + dump('\nWritten to ' + OS.Path.join(dataPath, params.name + '.js\n')); } + dump("\n"); })() .catch(function(e) { dump('\n'); dump(Zotero.Utilities.varDump(e)) }) .finally(function() { quit(false) }); From cd88d1f66174f46f687cb722c984efff025db379 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Thu, 23 Mar 2023 01:03:18 -0400 Subject: [PATCH 21/86] Update CSL locales --- chrome/content/zotero/locale/csl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/content/zotero/locale/csl b/chrome/content/zotero/locale/csl index 2919a84bffb..d704bf80afe 160000 --- a/chrome/content/zotero/locale/csl +++ b/chrome/content/zotero/locale/csl @@ -1 +1 @@ -Subproject commit 2919a84bffbae974a2702be0f5fa2ff7a6a51859 +Subproject commit d704bf80afe8a692373e11f670b08553b9f74a31 From 1497524bab2639cc1e2ab53e9345c2c6da4d87fd Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Thu, 23 Mar 2023 04:18:28 -0400 Subject: [PATCH 22/86] Remove localized string for "Authority" This is only a base field and doesn't need to be localized. Added by mistake in 42a4649420 --- 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/br/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/zotero/zotero.properties | 1 - chrome/locale/el-GR/zotero/zotero.properties | 1 - chrome/locale/en-GB/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/eu-ES/zotero/zotero.properties | 1 - chrome/locale/fa/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/id-ID/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/km/zotero/zotero.properties | 1 - chrome/locale/ko-KR/zotero/zotero.properties | 1 - chrome/locale/lt-LT/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/nn-NO/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/uk-UA/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 - resource/schema/global | 2 +- 48 files changed, 1 insertion(+), 48 deletions(-) diff --git a/chrome/locale/af-ZA/zotero/zotero.properties b/chrome/locale/af-ZA/zotero/zotero.properties index 207c3e910a3..e4d8bcd894e 100644 --- a/chrome/locale/af-ZA/zotero/zotero.properties +++ b/chrome/locale/af-ZA/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=Author creatorTypes.contributor=Contributor diff --git a/chrome/locale/ar/zotero/zotero.properties b/chrome/locale/ar/zotero/zotero.properties index 472d3df88b2..01d8b1b27b8 100644 --- a/chrome/locale/ar/zotero/zotero.properties +++ b/chrome/locale/ar/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=المؤلف creatorTypes.contributor=اسم المشارك diff --git a/chrome/locale/bg-BG/zotero/zotero.properties b/chrome/locale/bg-BG/zotero/zotero.properties index 28a6d2c9d52..543bea3cb39 100644 --- a/chrome/locale/bg-BG/zotero/zotero.properties +++ b/chrome/locale/bg-BG/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=Автор creatorTypes.contributor=Сътрудник diff --git a/chrome/locale/br/zotero/zotero.properties b/chrome/locale/br/zotero/zotero.properties index 17f0878f38e..d04251c2971 100644 --- a/chrome/locale/br/zotero/zotero.properties +++ b/chrome/locale/br/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=Aozer creatorTypes.contributor=Kendaoler diff --git a/chrome/locale/ca-AD/zotero/zotero.properties b/chrome/locale/ca-AD/zotero/zotero.properties index 1b10d7fd719..445c7c20385 100644 --- a/chrome/locale/ca-AD/zotero/zotero.properties +++ b/chrome/locale/ca-AD/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=Autor creatorTypes.contributor=Col·laborador diff --git a/chrome/locale/cs-CZ/zotero/zotero.properties b/chrome/locale/cs-CZ/zotero/zotero.properties index 3aa7ee7bdba..e1802088bb5 100644 --- a/chrome/locale/cs-CZ/zotero/zotero.properties +++ b/chrome/locale/cs-CZ/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=Autor creatorTypes.contributor=Přispěvatel diff --git a/chrome/locale/da-DK/zotero/zotero.properties b/chrome/locale/da-DK/zotero/zotero.properties index d0ad141c580..44e87b89bb1 100644 --- a/chrome/locale/da-DK/zotero/zotero.properties +++ b/chrome/locale/da-DK/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=Forfatter/Ophav creatorTypes.contributor=Anden bidragyder diff --git a/chrome/locale/de/zotero/zotero.properties b/chrome/locale/de/zotero/zotero.properties index b50dbf965c8..5567a51012c 100644 --- a/chrome/locale/de/zotero/zotero.properties +++ b/chrome/locale/de/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=Autor creatorTypes.contributor=Mitarbeiter diff --git a/chrome/locale/el-GR/zotero/zotero.properties b/chrome/locale/el-GR/zotero/zotero.properties index f764cd2c518..d7387894f18 100644 --- a/chrome/locale/el-GR/zotero/zotero.properties +++ b/chrome/locale/el-GR/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=Συγγραφέας creatorTypes.contributor=Contributor diff --git a/chrome/locale/en-GB/zotero/zotero.properties b/chrome/locale/en-GB/zotero/zotero.properties index 0d9c27ce4cb..19495088836 100644 --- a/chrome/locale/en-GB/zotero/zotero.properties +++ b/chrome/locale/en-GB/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=Author creatorTypes.contributor=Contributor diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties index f6cfa369ef3..3ea4eb2f2b3 100644 --- a/chrome/locale/en-US/zotero/zotero.properties +++ b/chrome/locale/en-US/zotero/zotero.properties @@ -625,7 +625,6 @@ itemFields.type = Type itemFields.format = Format itemFields.status = Status itemFields.organization = Organization -itemFields.authority = Authority creatorTypes.author = Author creatorTypes.contributor = Contributor diff --git a/chrome/locale/es-ES/zotero/zotero.properties b/chrome/locale/es-ES/zotero/zotero.properties index 2effc16d251..18f13d35807 100644 --- a/chrome/locale/es-ES/zotero/zotero.properties +++ b/chrome/locale/es-ES/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=Autor creatorTypes.contributor=Contribuidor diff --git a/chrome/locale/et-EE/zotero/zotero.properties b/chrome/locale/et-EE/zotero/zotero.properties index ece21e0f3e2..9de858f48e5 100644 --- a/chrome/locale/et-EE/zotero/zotero.properties +++ b/chrome/locale/et-EE/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=Autor creatorTypes.contributor=Kaastööline diff --git a/chrome/locale/eu-ES/zotero/zotero.properties b/chrome/locale/eu-ES/zotero/zotero.properties index 78c5d16ceb7..325f44427a7 100644 --- a/chrome/locale/eu-ES/zotero/zotero.properties +++ b/chrome/locale/eu-ES/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=Autorea creatorTypes.contributor=Kolaboratzaile diff --git a/chrome/locale/fa/zotero/zotero.properties b/chrome/locale/fa/zotero/zotero.properties index 9a97d607b3b..27a49932181 100644 --- a/chrome/locale/fa/zotero/zotero.properties +++ b/chrome/locale/fa/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=نویسنده creatorTypes.contributor=پدیدآور diff --git a/chrome/locale/fi-FI/zotero/zotero.properties b/chrome/locale/fi-FI/zotero/zotero.properties index 504f0443f0e..b3bcd14c943 100644 --- a/chrome/locale/fi-FI/zotero/zotero.properties +++ b/chrome/locale/fi-FI/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=Tekijä creatorTypes.contributor=Muu tekijä diff --git a/chrome/locale/fr-FR/zotero/zotero.properties b/chrome/locale/fr-FR/zotero/zotero.properties index 526f9a66b29..2f9675e537c 100644 --- a/chrome/locale/fr-FR/zotero/zotero.properties +++ b/chrome/locale/fr-FR/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=Auteur creatorTypes.contributor=Collaborateur diff --git a/chrome/locale/gl-ES/zotero/zotero.properties b/chrome/locale/gl-ES/zotero/zotero.properties index 7f0020f5da1..f6fec43b233 100644 --- a/chrome/locale/gl-ES/zotero/zotero.properties +++ b/chrome/locale/gl-ES/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=Autor creatorTypes.contributor=Colaborador diff --git a/chrome/locale/he-IL/zotero/zotero.properties b/chrome/locale/he-IL/zotero/zotero.properties index 444dd7606e7..d9e40135060 100644 --- a/chrome/locale/he-IL/zotero/zotero.properties +++ b/chrome/locale/he-IL/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=מחבר creatorTypes.contributor=Contributor diff --git a/chrome/locale/hr-HR/zotero/zotero.properties b/chrome/locale/hr-HR/zotero/zotero.properties index 861288a1749..b5c4feaff9d 100644 --- a/chrome/locale/hr-HR/zotero/zotero.properties +++ b/chrome/locale/hr-HR/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=Author creatorTypes.contributor=Contributor diff --git a/chrome/locale/hu-HU/zotero/zotero.properties b/chrome/locale/hu-HU/zotero/zotero.properties index 1ce9166ba3a..1a1ee7fb3d0 100644 --- a/chrome/locale/hu-HU/zotero/zotero.properties +++ b/chrome/locale/hu-HU/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=Szerző creatorTypes.contributor=Közreműködő diff --git a/chrome/locale/id-ID/zotero/zotero.properties b/chrome/locale/id-ID/zotero/zotero.properties index 420a29e3aa3..b83d19aeb19 100644 --- a/chrome/locale/id-ID/zotero/zotero.properties +++ b/chrome/locale/id-ID/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=Penulis creatorTypes.contributor=Kontributor diff --git a/chrome/locale/is-IS/zotero/zotero.properties b/chrome/locale/is-IS/zotero/zotero.properties index b7269595c44..f4d17b84d4d 100644 --- a/chrome/locale/is-IS/zotero/zotero.properties +++ b/chrome/locale/is-IS/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=Höfundur creatorTypes.contributor=Aðili að verki diff --git a/chrome/locale/it-IT/zotero/zotero.properties b/chrome/locale/it-IT/zotero/zotero.properties index eb1d4c3ff4b..ab1e222a2b8 100644 --- a/chrome/locale/it-IT/zotero/zotero.properties +++ b/chrome/locale/it-IT/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=Autore creatorTypes.contributor=Collaboratore diff --git a/chrome/locale/ja-JP/zotero/zotero.properties b/chrome/locale/ja-JP/zotero/zotero.properties index 86a6ef3aa95..6f7f60199f8 100644 --- a/chrome/locale/ja-JP/zotero/zotero.properties +++ b/chrome/locale/ja-JP/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=著者名 creatorTypes.contributor=寄稿者名 diff --git a/chrome/locale/km/zotero/zotero.properties b/chrome/locale/km/zotero/zotero.properties index 63e9b676ad6..1c555708f35 100644 --- a/chrome/locale/km/zotero/zotero.properties +++ b/chrome/locale/km/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=អ្នកនិពន្ធ creatorTypes.contributor=អ្នកចូលរួម diff --git a/chrome/locale/ko-KR/zotero/zotero.properties b/chrome/locale/ko-KR/zotero/zotero.properties index 7e758661f36..75f4ceb3445 100644 --- a/chrome/locale/ko-KR/zotero/zotero.properties +++ b/chrome/locale/ko-KR/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=저자 creatorTypes.contributor=공헌자 diff --git a/chrome/locale/lt-LT/zotero/zotero.properties b/chrome/locale/lt-LT/zotero/zotero.properties index df6e333cc3f..669c7c1987d 100644 --- a/chrome/locale/lt-LT/zotero/zotero.properties +++ b/chrome/locale/lt-LT/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=Autorius creatorTypes.contributor=Bendradarbis diff --git a/chrome/locale/mn-MN/zotero/zotero.properties b/chrome/locale/mn-MN/zotero/zotero.properties index ba67bce58c8..a6056ad234f 100644 --- a/chrome/locale/mn-MN/zotero/zotero.properties +++ b/chrome/locale/mn-MN/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=Author creatorTypes.contributor=Contributor diff --git a/chrome/locale/nb-NO/zotero/zotero.properties b/chrome/locale/nb-NO/zotero/zotero.properties index 3f52ff6f8d2..9520c23e4fc 100644 --- a/chrome/locale/nb-NO/zotero/zotero.properties +++ b/chrome/locale/nb-NO/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=Forfatter creatorTypes.contributor=Medforfatter diff --git a/chrome/locale/nl-NL/zotero/zotero.properties b/chrome/locale/nl-NL/zotero/zotero.properties index 901682d8351..57958b561c8 100644 --- a/chrome/locale/nl-NL/zotero/zotero.properties +++ b/chrome/locale/nl-NL/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=Auteur creatorTypes.contributor=Coauteur diff --git a/chrome/locale/nn-NO/zotero/zotero.properties b/chrome/locale/nn-NO/zotero/zotero.properties index cdc3f685f52..9dad0da6178 100644 --- a/chrome/locale/nn-NO/zotero/zotero.properties +++ b/chrome/locale/nn-NO/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=Forfattar creatorTypes.contributor=Medforfatter diff --git a/chrome/locale/pl-PL/zotero/zotero.properties b/chrome/locale/pl-PL/zotero/zotero.properties index d57ada6dbd9..8cd9bb4f8b1 100644 --- a/chrome/locale/pl-PL/zotero/zotero.properties +++ b/chrome/locale/pl-PL/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=Autor creatorTypes.contributor=Współautor diff --git a/chrome/locale/pt-BR/zotero/zotero.properties b/chrome/locale/pt-BR/zotero/zotero.properties index aaa89486c32..07f352ac0f9 100644 --- a/chrome/locale/pt-BR/zotero/zotero.properties +++ b/chrome/locale/pt-BR/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=Autor creatorTypes.contributor=Contribuidor diff --git a/chrome/locale/pt-PT/zotero/zotero.properties b/chrome/locale/pt-PT/zotero/zotero.properties index 1d94d264709..1feb80b3b5e 100644 --- a/chrome/locale/pt-PT/zotero/zotero.properties +++ b/chrome/locale/pt-PT/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=Autor creatorTypes.contributor=Colaborador diff --git a/chrome/locale/ro-RO/zotero/zotero.properties b/chrome/locale/ro-RO/zotero/zotero.properties index 265e71f79f1..64a0cc0e753 100644 --- a/chrome/locale/ro-RO/zotero/zotero.properties +++ b/chrome/locale/ro-RO/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=Autor creatorTypes.contributor=Colaborator diff --git a/chrome/locale/ru-RU/zotero/zotero.properties b/chrome/locale/ru-RU/zotero/zotero.properties index b526e409ab7..ed3acc2162a 100644 --- a/chrome/locale/ru-RU/zotero/zotero.properties +++ b/chrome/locale/ru-RU/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=Автор creatorTypes.contributor=Соавтор diff --git a/chrome/locale/sk-SK/zotero/zotero.properties b/chrome/locale/sk-SK/zotero/zotero.properties index 1ff1f4ac76c..945035cd712 100644 --- a/chrome/locale/sk-SK/zotero/zotero.properties +++ b/chrome/locale/sk-SK/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=Autor creatorTypes.contributor=Prispievateľ diff --git a/chrome/locale/sl-SI/zotero/zotero.properties b/chrome/locale/sl-SI/zotero/zotero.properties index ab2463e5578..ef1e0ada141 100644 --- a/chrome/locale/sl-SI/zotero/zotero.properties +++ b/chrome/locale/sl-SI/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=Avtor creatorTypes.contributor=Avtor prispevka diff --git a/chrome/locale/sr-RS/zotero/zotero.properties b/chrome/locale/sr-RS/zotero/zotero.properties index fca256915fc..8f0ec82dde1 100644 --- a/chrome/locale/sr-RS/zotero/zotero.properties +++ b/chrome/locale/sr-RS/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=Аутор creatorTypes.contributor=Сарадник diff --git a/chrome/locale/sv-SE/zotero/zotero.properties b/chrome/locale/sv-SE/zotero/zotero.properties index 6f5f1a90264..fd72b763d92 100644 --- a/chrome/locale/sv-SE/zotero/zotero.properties +++ b/chrome/locale/sv-SE/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=Författare creatorTypes.contributor=Medarbetare diff --git a/chrome/locale/th-TH/zotero/zotero.properties b/chrome/locale/th-TH/zotero/zotero.properties index 2cc9ebc258c..d29bfd4b3bf 100644 --- a/chrome/locale/th-TH/zotero/zotero.properties +++ b/chrome/locale/th-TH/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=ผู้แต่ง creatorTypes.contributor=ผู้ช่วยเหลือ diff --git a/chrome/locale/tr-TR/zotero/zotero.properties b/chrome/locale/tr-TR/zotero/zotero.properties index 9a475240b43..a0268741530 100644 --- a/chrome/locale/tr-TR/zotero/zotero.properties +++ b/chrome/locale/tr-TR/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=Yazar creatorTypes.contributor=Katkıda Bulunan diff --git a/chrome/locale/uk-UA/zotero/zotero.properties b/chrome/locale/uk-UA/zotero/zotero.properties index 4f4fd78f45d..6d46cc02a1e 100644 --- a/chrome/locale/uk-UA/zotero/zotero.properties +++ b/chrome/locale/uk-UA/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=Автор creatorTypes.contributor=Співавтор diff --git a/chrome/locale/vi-VN/zotero/zotero.properties b/chrome/locale/vi-VN/zotero/zotero.properties index f2dccb4ff2b..eed3e267862 100644 --- a/chrome/locale/vi-VN/zotero/zotero.properties +++ b/chrome/locale/vi-VN/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=Tác giả creatorTypes.contributor=Cộng tác viên diff --git a/chrome/locale/zh-CN/zotero/zotero.properties b/chrome/locale/zh-CN/zotero/zotero.properties index 88c8424abb7..75221a52fb5 100644 --- a/chrome/locale/zh-CN/zotero/zotero.properties +++ b/chrome/locale/zh-CN/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=作者 creatorTypes.contributor=贡献者 diff --git a/chrome/locale/zh-TW/zotero/zotero.properties b/chrome/locale/zh-TW/zotero/zotero.properties index eb4cd28f609..bf1d2917471 100644 --- a/chrome/locale/zh-TW/zotero/zotero.properties +++ b/chrome/locale/zh-TW/zotero/zotero.properties @@ -624,7 +624,6 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.organization=Organization -itemFields.authority=Authority creatorTypes.author=作者 creatorTypes.contributor=貢獻者 diff --git a/resource/schema/global b/resource/schema/global index fc12d3b1e6d..045659ea755 160000 --- a/resource/schema/global +++ b/resource/schema/global @@ -1 +1 @@ -Subproject commit fc12d3b1e6d71131c8d2adfdee0e3c98773547cf +Subproject commit 045659ea75581e915dd9a0d4c0a1ec48b312a3d5 From c8109fef182370c8349f79fc085d232082dd7c4c Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sat, 1 Apr 2023 17:04:39 -0400 Subject: [PATCH 23/86] Restore "Authority" as localized string We still use base-only fields as search conditions, and schema.json consumers might want to do so as well, so it makes sense to include them. Also remove base-only localized strings from `searchConditions` that are already included in `itemFields.` --- chrome/content/zotero/xpcom/data/itemFields.js | 6 ++---- chrome/locale/en-US/zotero/zotero.properties | 3 +-- resource/schema/global | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/chrome/content/zotero/xpcom/data/itemFields.js b/chrome/content/zotero/xpcom/data/itemFields.js index e5cfb1d955c..653095d97b1 100644 --- a/chrome/content/zotero/xpcom/data/itemFields.js +++ b/chrome/content/zotero/xpcom/data/itemFields.js @@ -76,11 +76,9 @@ Zotero.ItemFields = new function() { var baseFields = yield Zotero.DB.columnQueryAsync(sql); for (let field of fields) { - let isBaseField = baseFields.includes(field.fieldID); let label = field.label || Zotero.Schema.globalSchemaLocale.fields[field.fieldName]; - // If string not available, use the field name, except for some base fields that aren't - // used in the UI and therefore aren't localized - if (!label && !['number', 'type', 'medium'].includes(field.fieldName)) { + // If string not available, use the field name + if (!label) { Zotero.logError(`Localized string not available for field '${field.fieldName}'`); label = Zotero.Utilities.Internal.camelToTitleCase(field.fieldName); } diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties index 3ea4eb2f2b3..5b22a9930ba 100644 --- a/chrome/locale/en-US/zotero/zotero.properties +++ b/chrome/locale/en-US/zotero/zotero.properties @@ -624,6 +624,7 @@ itemFields.identifier = Identifier itemFields.type = Type itemFields.format = Format itemFields.status = Status +itemFields.authority = Authority itemFields.organization = Organization creatorTypes.author = Author @@ -856,7 +857,6 @@ searchConditions.tag = Tag searchConditions.note = Note searchConditions.childNote = Child Note searchConditions.creator = Creator -searchConditions.type = Type searchConditions.thesisType = Thesis Type searchConditions.reportType = Report Type searchConditions.videoRecordingFormat = Video Recording Format @@ -867,7 +867,6 @@ searchConditions.interviewMedium = Interview Medium searchConditions.manuscriptType = Manuscript Type searchConditions.presentationType = Presentation Type searchConditions.mapType = Map Type -searchConditions.medium = Medium searchConditions.artworkMedium = Artwork Medium searchConditions.dateModified = Date Modified searchConditions.fulltextContent = Attachment Content diff --git a/resource/schema/global b/resource/schema/global index 045659ea755..d04a141cc7f 160000 --- a/resource/schema/global +++ b/resource/schema/global @@ -1 +1 @@ -Subproject commit 045659ea75581e915dd9a0d4c0a1ec48b312a3d5 +Subproject commit d04a141cc7f394909fa3d7ded29c2906c43b10b9 From 7b614962c6b0f1720ac2dbbcf64c42cdf5674fc2 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sun, 2 Apr 2023 03:52:13 -0400 Subject: [PATCH 24/86] Update locales from Transifex and merge new English strings --- chrome/locale/af-ZA/zotero/zotero.properties | 5 +- chrome/locale/ar/zotero/zotero.properties | 9 +- chrome/locale/bg-BG/zotero/zotero.properties | 11 +-- chrome/locale/br/zotero/connector.json | 33 +++++++ chrome/locale/br/zotero/preferences.dtd | 16 ++-- chrome/locale/br/zotero/standalone.dtd | 2 +- chrome/locale/br/zotero/zotero.dtd | 18 ++-- chrome/locale/br/zotero/zotero.properties | 97 ++++++++++---------- chrome/locale/ca-AD/zotero/zotero.properties | 7 +- chrome/locale/cs-CZ/zotero/zotero.dtd | 2 +- chrome/locale/cs-CZ/zotero/zotero.properties | 11 +-- chrome/locale/da-DK/zotero/zotero.properties | 5 +- chrome/locale/de/zotero/zotero.properties | 5 +- chrome/locale/el-GR/zotero/zotero.properties | 11 +-- chrome/locale/en-GB/zotero/zotero.properties | 5 +- chrome/locale/es-ES/zotero/zotero.properties | 21 ++--- chrome/locale/et-EE/zotero/zotero.properties | 9 +- chrome/locale/eu-ES/zotero/zotero.properties | 9 +- chrome/locale/fa/zotero/zotero.properties | 11 +-- chrome/locale/fi-FI/zotero/zotero.properties | 21 ++--- chrome/locale/fr-FR/zotero/zotero.properties | 5 +- chrome/locale/gl-ES/zotero/zotero.properties | 11 +-- chrome/locale/he-IL/zotero/zotero.properties | 9 +- chrome/locale/hr-HR/zotero/zotero.properties | 5 +- chrome/locale/hu-HU/zotero/zotero.properties | 11 +-- chrome/locale/id-ID/zotero/zotero.properties | 7 +- chrome/locale/is-IS/zotero/zotero.properties | 11 +-- chrome/locale/it-IT/zotero/zotero.properties | 21 ++--- chrome/locale/ja-JP/zotero/zotero.properties | 11 +-- chrome/locale/km/zotero/zotero.properties | 9 +- chrome/locale/ko-KR/zotero/zotero.properties | 11 +-- chrome/locale/lt-LT/zotero/zotero.properties | 11 +-- chrome/locale/mn-MN/zotero/zotero.properties | 5 +- chrome/locale/nb-NO/zotero/zotero.properties | 15 ++- chrome/locale/nl-NL/zotero/zotero.properties | 9 +- chrome/locale/nn-NO/zotero/zotero.properties | 3 +- chrome/locale/pl-PL/zotero/zotero.properties | 21 ++--- chrome/locale/pt-BR/zotero/zotero.properties | 11 +-- chrome/locale/pt-PT/zotero/zotero.properties | 11 +-- chrome/locale/ro-RO/zotero/zotero.properties | 7 +- chrome/locale/ru-RU/zotero/zotero.properties | 21 ++--- chrome/locale/sk-SK/zotero/zotero.properties | 11 +-- chrome/locale/sl-SI/zotero/zotero.properties | 11 +-- chrome/locale/sr-RS/zotero/zotero.properties | 11 +-- chrome/locale/sv-SE/zotero/zotero.properties | 7 +- chrome/locale/th-TH/zotero/zotero.properties | 9 +- chrome/locale/tr-TR/zotero/zotero.properties | 21 ++--- chrome/locale/uk-UA/zotero/zotero.properties | 11 +-- chrome/locale/vi-VN/zotero/zotero.properties | 11 +-- chrome/locale/zh-CN/zotero/connector.json | 12 +-- chrome/locale/zh-CN/zotero/preferences.dtd | 8 +- chrome/locale/zh-CN/zotero/zotero.properties | 11 +-- chrome/locale/zh-TW/zotero/zotero.properties | 13 ++- resource/schema/global | 2 +- 54 files changed, 329 insertions(+), 342 deletions(-) diff --git a/chrome/locale/af-ZA/zotero/zotero.properties b/chrome/locale/af-ZA/zotero/zotero.properties index e4d8bcd894e..43fa2fca2ed 100644 --- a/chrome/locale/af-ZA/zotero/zotero.properties +++ b/chrome/locale/af-ZA/zotero/zotero.properties @@ -503,7 +503,7 @@ itemTypes.preprint=Preprint itemTypes.dataset=Dataset itemTypes.standard=Standard -itemFields.itemType=Type +itemFields.itemType=Tipe item itemFields.title=Title itemFields.dateAdded=Datum bygevoeg itemFields.dateModified=Modified @@ -623,6 +623,7 @@ itemFields.identifier=Identifier itemFields.type=Type itemFields.format=Format itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=Author @@ -855,7 +856,6 @@ searchConditions.tag=Tag searchConditions.note=Note searchConditions.childNote=Child Note searchConditions.creator=Skepper -searchConditions.type=Type searchConditions.thesisType=Thesis Type searchConditions.reportType=Report Type searchConditions.videoRecordingFormat=Video Recording Format @@ -866,7 +866,6 @@ searchConditions.interviewMedium=Interview Medium searchConditions.manuscriptType=Manuscript Type searchConditions.presentationType=Presentation Type searchConditions.mapType=Map Type -searchConditions.medium=Medium searchConditions.artworkMedium=Artwork Medium searchConditions.dateModified=Datum gewysig searchConditions.fulltextContent=Attachment Content diff --git a/chrome/locale/ar/zotero/zotero.properties b/chrome/locale/ar/zotero/zotero.properties index 01d8b1b27b8..24e326b097e 100644 --- a/chrome/locale/ar/zotero/zotero.properties +++ b/chrome/locale/ar/zotero/zotero.properties @@ -501,7 +501,7 @@ itemTypes.encyclopediaArticle=مقالة في موسوعة itemTypes.dictionaryEntry=كلمة في المعجم itemTypes.preprint=Preprint itemTypes.dataset=Dataset -itemTypes.standard=Standard +itemTypes.standard=قياسي itemFields.itemType=نوع العنصر itemFields.title=العنوان @@ -620,9 +620,10 @@ itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key itemFields.identifier=Identifier -itemFields.type=Type -itemFields.format=Format +itemFields.type=النوع +itemFields.format=الصيغة itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=المؤلف @@ -855,7 +856,6 @@ searchConditions.tag=وسم searchConditions.note=ملحوظة searchConditions.childNote=ملحوظة فرعية searchConditions.creator=مُنشئ -searchConditions.type=النوع searchConditions.thesisType=نوع الأطروحة searchConditions.reportType=نوع التقرير searchConditions.videoRecordingFormat=صيغة التسجيل المرئي @@ -866,7 +866,6 @@ searchConditions.interviewMedium=وسيط المقابلة searchConditions.manuscriptType=نوع المخطوطة searchConditions.presentationType=نوع العرض التقديمي searchConditions.mapType=نوع الخريطة -searchConditions.medium=الوسيط searchConditions.artworkMedium=وسيط العمل الفني searchConditions.dateModified=تاريخ التعديل searchConditions.fulltextContent=محتويات المرفق diff --git a/chrome/locale/bg-BG/zotero/zotero.properties b/chrome/locale/bg-BG/zotero/zotero.properties index 543bea3cb39..45dcbb479a8 100644 --- a/chrome/locale/bg-BG/zotero/zotero.properties +++ b/chrome/locale/bg-BG/zotero/zotero.properties @@ -501,9 +501,9 @@ itemTypes.encyclopediaArticle=Статия в енциклопедия itemTypes.dictionaryEntry=Определение в речник itemTypes.preprint=Preprint itemTypes.dataset=Dataset -itemTypes.standard=Standard +itemTypes.standard=Стандартно -itemFields.itemType=Тип +itemFields.itemType=Вид запис itemFields.title=Заглавие itemFields.dateAdded=Добавен на: itemFields.dateModified=Променен на: @@ -620,9 +620,10 @@ itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key itemFields.identifier=Identifier -itemFields.type=Type -itemFields.format=Format +itemFields.type=Вид +itemFields.format=Формат itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=Автор @@ -855,7 +856,6 @@ searchConditions.tag=Отметка searchConditions.note=Бележка searchConditions.childNote=Дъщерна бележка searchConditions.creator=Създател -searchConditions.type=Вид searchConditions.thesisType=Вид дисертация searchConditions.reportType=Вид отчет searchConditions.videoRecordingFormat=Формат на видео запис @@ -866,7 +866,6 @@ searchConditions.interviewMedium=Носител на интервюто. searchConditions.manuscriptType=Вид ръкопис searchConditions.presentationType=Вид презентация searchConditions.mapType=Вид карта -searchConditions.medium=Медия searchConditions.artworkMedium=Носител произведението searchConditions.dateModified=Променен на searchConditions.fulltextContent=Съдържание на приложението diff --git a/chrome/locale/br/zotero/connector.json b/chrome/locale/br/zotero/connector.json index c39d0de5906..beda53aacb5 100644 --- a/chrome/locale/br/zotero/connector.json +++ b/chrome/locale/br/zotero/connector.json @@ -47,6 +47,9 @@ "progressWindow_error_troubleshootingTranslatorIssues": { "message": "Distankañ ar c'hudennoù troidigezh" }, + "progressWindow_error_siteAccessLimits": { + "message": "Bevennoù haeziñ ouzh al lec'hienn" + }, "progressWindow_error_fallback": { "message": "Fazi c'hoarvezet en ur enrollañ gant $1. O klask enrollañ en ur implijout $2 e plas." }, @@ -56,12 +59,24 @@ "progressWindow_error_upgradeClient_latestVersion": { "message": "stumm diwezhañ" }, + "extensionIsDisabled": { + "message": "$1 a zo lazhet" + }, + "extensionIsDisabled_extensionPage": { + "message": "$1 a zo lazhet war ar pajennoù astenn" + }, "appConnector": { "message": "Kevreer $1" }, "upgradeApp": { "message": "Hizivaat $1" }, + "firstRun_title": { + "message": "Staliet ho peus ar c'hevreer $1!" + }, + "firstRun_acceptButton": { + "message": "Komprenet" + }, "error_connection_isAppRunning": { "message": "Ha digoret eo $1?" }, @@ -95,6 +110,24 @@ "integration_googleDocs_docxAlert": { "message": "Neket hegerz enkorfadur $1 pa vez aozet restroù .docx Microsoft Word war-eeun e-barzh Google Docs. Dibabit Restroù → Enrollañ evel Google Docs evit enaouiñ an arc'hweladur-mañ.

M'ho peus c'hoant da dreuzkas ur restr Word gant arroudennoù $1 e-barzh Google Docs, kit da welet Fiñval teuliadoù etre treterioù gerioù." }, + "integration_googleDocs_orphanedCitations_buttonTooltip": { + "message": "Diskouez an $1 arroudenn diliammet" + }, + "integration_googleDocs_orphanedCitations_alertButton": { + "message": "Adliammañ an arroudenn" + }, + "copyUnproxiedLink": { + "message": "Eilañ al liamm ambroskiet" + }, + "copyUnproxiedPageURL": { + "message": "Eilan URL ar bajenn ambroskiet" + }, + "reloadViaProxy": { + "message": "Adkargañ dre bProksi" + }, + "reloadVia": { + "message": "Adkargañ dre $1" + }, "general_saveTo": { "message": "Enrollañ e-barzh $1" } diff --git a/chrome/locale/br/zotero/preferences.dtd b/chrome/locale/br/zotero/preferences.dtd index 37bb9c5ef9e..c2d5c7082f5 100644 --- a/chrome/locale/br/zotero/preferences.dtd +++ b/chrome/locale/br/zotero/preferences.dtd @@ -26,17 +26,17 @@ - - - - + + + + - + @@ -46,7 +46,7 @@ - + @@ -111,8 +111,8 @@ - - + + diff --git a/chrome/locale/br/zotero/standalone.dtd b/chrome/locale/br/zotero/standalone.dtd index 65488078582..6ed8212ecf6 100644 --- a/chrome/locale/br/zotero/standalone.dtd +++ b/chrome/locale/br/zotero/standalone.dtd @@ -36,7 +36,7 @@ - + diff --git a/chrome/locale/br/zotero/zotero.dtd b/chrome/locale/br/zotero/zotero.dtd index dc31ee20710..b7c5b8a0544 100644 --- a/chrome/locale/br/zotero/zotero.dtd +++ b/chrome/locale/br/zotero/zotero.dtd @@ -311,23 +311,23 @@ - + - - - - - + + + + + - + - - + + diff --git a/chrome/locale/br/zotero/zotero.properties b/chrome/locale/br/zotero/zotero.properties index d04251c2971..bb9fc0fadaa 100644 --- a/chrome/locale/br/zotero/zotero.properties +++ b/chrome/locale/br/zotero/zotero.properties @@ -93,7 +93,7 @@ general.custom=Personelaet general.loading=O kargañ... general.richText=Rich Text general.clearSelection=Clear Selection -general.insert=Insert +general.insert=Enlakaat general.username=Username general.password=Password @@ -458,7 +458,7 @@ pane.item.parentItem=Elfenn kar: pane.item.viewOnline.tooltip=Mont d'an elfenn-mañ enlinenn pane.context.noParent=Elfenn kar ebet -pane.context.itemNotes=Item Notes +pane.context.itemNotes=Notennoù elfenn pane.context.allNotes=An holl notennoù pane.context.noNotes=Notenn ebet @@ -503,7 +503,7 @@ itemTypes.preprint=Preprint itemTypes.dataset=Dataset itemTypes.standard=Standard -itemFields.itemType=Doare +itemFields.itemType=Doare elfenn itemFields.title=Titl itemFields.dateAdded=Deiziad ouzhpennañ itemFields.dateModified=Deiziad kemmañ @@ -620,9 +620,10 @@ itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key itemFields.identifier=Identifier -itemFields.type=Type -itemFields.format=Format +itemFields.type=Doare +itemFields.format=Stumm itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=Aozer @@ -816,8 +817,8 @@ fileInterface.exportError=Ur fazi a zo c'hoarvezet en ur glask ezporzhiañ ar re fileInterface.importOPML=Emporzhiañ froudoù diwar ur restr OPML fileInterface.OPMLFeedFilter=Listenn froudoù OPML -import.onlineImport=online import -import.localImport=local import +import.onlineImport=emporzhiañ enlinenn +import.localImport=emporzhiañ lec'hel import.fileHandling.store=Eilañ ar restroù d'an teuliad stokañ %S import.fileHandling.link=Liammañ d'ar restroù el lec'hiadur orin import.fileHandling.description=Ar restroù liammet n'hallont ket bezañ sinkroet gant %S. @@ -855,7 +856,6 @@ searchConditions.tag=Baliz searchConditions.note=Notenn searchConditions.childNote=Notenn bugel searchConditions.creator=Krouer -searchConditions.type=Doare searchConditions.thesisType=Doare tezenn searchConditions.reportType=Doare danevell searchConditions.videoRecordingFormat=Stumm enrollañ video @@ -866,13 +866,12 @@ searchConditions.interviewMedium=Atersadenn etre searchConditions.manuscriptType=Doare dornskrid searchConditions.presentationType=Doare kinnigadenn searchConditions.mapType=Doare kartenn -searchConditions.medium=Etre searchConditions.artworkMedium=Skeudennadur etre searchConditions.dateModified=Deiziad kemmañ searchConditions.fulltextContent=Endalc'had ar pezh-stag searchConditions.programmingLanguage=Langaj programiñ searchConditions.fileTypeID=Doare restr-stag -searchConditions.annotationText=Annotation Text +searchConditions.annotationText=Testenn ennotadur searchConditions.annotationComment=Annotation Comment searchConditions.anyField=Any Field @@ -883,8 +882,8 @@ fulltext.indexState.queued=War-c'hortoz exportOptions.exportNotes=Ezporzhiañ notennoù exportOptions.exportFileData=Ezporzhiañ restroù -exportOptions.includeAnnotations=Include Annotations -exportOptions.includeAppLinks=Include %S Links +exportOptions.includeAnnotations=Enklozañ ennotadurioù +exportOptions.includeAppLinks=Enklozañ %S liamm exportOptions.useJournalAbbreviation=Implijout berradurioù ar c'helaouennoù charset.UTF8withoutBOM=Unikod (UTF-8 hep BOM) charset.autoDetect=(em-ziguzhiñ) @@ -1324,21 +1323,21 @@ retraction.citationWarning.dontWarn=Na lavar ken netra diwar-benn an elfenn-mañ noteEditor.annotationsDateLine=(%S) noteEditor.cut=Cut noteEditor.copy=Eilañ -noteEditor.paste=Paste +noteEditor.paste=Pegañ noteEditor.rightToLeft=Right to Left -noteEditor.leftToRight=Left to Right +noteEditor.leftToRight=Kleiz da zehoù noteEditor.updateNotice=This note was edited with a newer version of %1$S.\nPlease update %1$S to make changes. -noteEditor.enterLink=Enter Link -noteEditor.heading1=Heading 1 +noteEditor.enterLink=Ebarzhiñ ul liamm +noteEditor.heading1=Titl 1 noteEditor.heading2=Heading 2 -noteEditor.heading3=Heading 3 +noteEditor.heading3=Titl 3 noteEditor.paragraph=Rannbennad -noteEditor.monospaced=Monospaced -noteEditor.bulletList=Bulleted List -noteEditor.orderedList=Numbered List +noteEditor.monospaced=Monospaset +noteEditor.bulletList=Listenn gant merkigoù +noteEditor.orderedList=Listenn niverennet noteEditor.blockquote=Block Quote -noteEditor.mathBlock=Math Block -noteEditor.formatText=Format Text +noteEditor.mathBlock=Matematik bloc'had +noteEditor.formatText=Stumm an destenn noteEditor.highlightText=Usskediñ an destenn noteEditor.textColor=Text Color noteEditor.removeColor=Dilemel al liv @@ -1348,14 +1347,14 @@ noteEditor.underline=Islinennet noteEditor.strikethrough=Strikethrough noteEditor.subscript=Isskrid noteEditor.superscript=Usskrid -noteEditor.returnToNotesList=Return to Notes List -noteEditor.insertLink=Insert Link +noteEditor.returnToNotesList=Distreiñ d'al listenn Notennoù +noteEditor.insertLink=Enlakaat liamm noteEditor.clearFormatting=Clear Formatting -noteEditor.align=Align -noteEditor.alignLeft=Align Left -noteEditor.alignCenter=Align Center +noteEditor.align=Linennañ +noteEditor.alignLeft=Linennañ a-gleiz +noteEditor.alignCenter=Kreizañ noteEditor.alignRight=Align Right -noteEditor.insertCitation=Insert Citation +noteEditor.insertCitation=Enlakaat an arroudenn noteEditor.more=Muioc'h noteEditor.find=Find noteEditor.replace=Erlec'hiañ @@ -1363,14 +1362,14 @@ noteEditor.previous=Previous noteEditor.next=Da-heul noteEditor.replaceNext=Erlec'hiañ noteEditor.replaceAll=Replace All -noteEditor.goToPage=Go to Page +noteEditor.goToPage=Mont d'ar bajenn noteEditor.showItem=Show Item noteEditor.editCitation=Edit Citation -noteEditor.showOnPage=Show on Page +noteEditor.showOnPage=Diskouez war ar bajenn noteEditor.unlink=Diliammañ noteEditor.set=Set noteEditor.edit=Aozañ -noteEditor.addCitation=Add Citation +noteEditor.addCitation=Ouzhpennañ un arroudenn noteEditor.removeCitation=Hide Citation noteEditor.findAndReplace=Find and Replace noteEditor.editInWindow=Edit in a Separate Window @@ -1379,39 +1378,39 @@ noteEditor.removeAnnotationColors=Hide Annotation Colors noteEditor.addCitations=Show Annotation Citations noteEditor.removeCitations=Hide Annotation Citations noteEditor.image=Skeudenn -noteEditor.math=Math -noteEditor.table=Table -noteEditor.copyImage=Copy Image -noteEditor.saveImageAs=Save Image As… -noteEditor.insertRowBefore=Insert Row Above -noteEditor.insertRowAfter=Insert Row Below -noteEditor.insertColumnBefore=Insert Column Left -noteEditor.insertColumnAfter=Insert Column Right +noteEditor.math=Matematik +noteEditor.table=Taolenn +noteEditor.copyImage=Eilañ ar skeudenn +noteEditor.saveImageAs=Enrollañ ar skeudenn evel... +noteEditor.insertRowBefore=Enlakaat ul linenn a-us +noteEditor.insertRowAfter=Enlakaat ul liamm dindan +noteEditor.insertColumnBefore=Enlakaat ur golonenn a gleiz +noteEditor.insertColumnAfter=Enlakaat ur golonenn a zehoù noteEditor.deleteRow=Delete Row noteEditor.deleteColumn=Delete Column noteEditor.deleteTable=Delete Table pdfReader.annotations=Ennotadurioù -pdfReader.showAnnotations=Show Annotations +pdfReader.showAnnotations=Diskouez an ennotadurioù pdfReader.searchAnnotations=Search Annotations pdfReader.noAnnotations=Create an annotation to see it in the sidebar pdfReader.noExtractedText=No extracted text -pdfReader.addComment=Add comment -pdfReader.addTags=Add tags… +pdfReader.addComment=Ouzhpennañ un evezhiadenn +pdfReader.addTags=Ouzhpennañ tikedennoù... pdfReader.highlightText=Usskediñ an destenn pdfReader.addNote=Ouzhpennañ un notenn pdfReader.selectArea=Select Area -pdfReader.pickColor=Pick a Color +pdfReader.pickColor=Diuzin ul liv pdfReader.addToNote=Add to Note pdfReader.zoomIn=Zoumañ pdfReader.zoomOut=Dizoumañ -pdfReader.zoomAuto=Automatically Resize +pdfReader.zoomAuto=Em-adventañ pdfReader.zoomPageWidth=Zoom to Page Width pdfReader.zoomPageHeight=Zoom to Page Height -pdfReader.splitVertically=Split Vertically -pdfReader.splitHorizontally=Split Horizontally +pdfReader.splitVertically=Rannañ a-blom +pdfReader.splitHorizontally=Rannañ a-blaen pdfReader.nextPage=Pajenn da-heul -pdfReader.previousPage=Previous Page +pdfReader.previousPage=Pajenn gent pdfReader.page=Pajenn pdfReader.readOnly=Read-only pdfReader.promptTransferFromPDF.title=Import Annotations @@ -1426,8 +1425,8 @@ pdfReader.rotateRight=Rotate Right pdfReader.rotate180=Rotate 180° pdfReader.editPageNumber=Edit Page Number… pdfReader.editHighlightedText=Edit Highlighted Text -pdfReader.copyImage=Copy Image -pdfReader.saveImageAs=Save Image As… +pdfReader.copyImage=Eilañ ar skeudenn +pdfReader.saveImageAs=Enrollañ ar skeudenn evel... pdfReader.pageNumberPopupHeader=Change page number for: pdfReader.thisAnnotation=This annotation pdfReader.selectedAnnotations=Selected annotations diff --git a/chrome/locale/ca-AD/zotero/zotero.properties b/chrome/locale/ca-AD/zotero/zotero.properties index 445c7c20385..5e1d7dc8ca3 100644 --- a/chrome/locale/ca-AD/zotero/zotero.properties +++ b/chrome/locale/ca-AD/zotero/zotero.properties @@ -503,7 +503,7 @@ itemTypes.preprint=Prepublicació itemTypes.dataset=Dataset itemTypes.standard=Standard -itemFields.itemType=Tipus +itemFields.itemType=Tipus d'element itemFields.title=Títol itemFields.dateAdded=Afegit itemFields.dateModified=Modificat @@ -620,9 +620,10 @@ itemFields.repositoryLocation=Repo. Location itemFields.archiveID=ID d'arxiu itemFields.citationKey=Clau de cita itemFields.identifier=Identifier -itemFields.type=Type +itemFields.type=Tipus itemFields.format=Format itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=Autor @@ -855,7 +856,6 @@ searchConditions.tag=Etiqueta searchConditions.note=Nota searchConditions.childNote=Nota filla searchConditions.creator=Creador -searchConditions.type=Tipus searchConditions.thesisType=Tipus de tesi searchConditions.reportType=Tipus d'informe searchConditions.videoRecordingFormat=Format de gravació de vídeo @@ -866,7 +866,6 @@ searchConditions.interviewMedium=Mitjà de l'entrevista searchConditions.manuscriptType=Tipus de manuscrit searchConditions.presentationType=Tipus de presentació searchConditions.mapType=Tipus de mapa -searchConditions.medium=Mitjà searchConditions.artworkMedium=Mitjà artístic searchConditions.dateModified=Data de modificació searchConditions.fulltextContent=Contingut de l'adjunció diff --git a/chrome/locale/cs-CZ/zotero/zotero.dtd b/chrome/locale/cs-CZ/zotero/zotero.dtd index 8d8deff288d..4003d309914 100644 --- a/chrome/locale/cs-CZ/zotero/zotero.dtd +++ b/chrome/locale/cs-CZ/zotero/zotero.dtd @@ -311,7 +311,7 @@ - + diff --git a/chrome/locale/cs-CZ/zotero/zotero.properties b/chrome/locale/cs-CZ/zotero/zotero.properties index e1802088bb5..869b5ea94a0 100644 --- a/chrome/locale/cs-CZ/zotero/zotero.properties +++ b/chrome/locale/cs-CZ/zotero/zotero.properties @@ -501,9 +501,9 @@ itemTypes.encyclopediaArticle=Článek v encyklopedii itemTypes.dictionaryEntry=Záznam ve slovníku itemTypes.preprint=Preprint itemTypes.dataset=Dataset -itemTypes.standard=Standard +itemTypes.standard=Standardní -itemFields.itemType=Typ +itemFields.itemType=Typ položky itemFields.title=Název itemFields.dateAdded=Datum přidání itemFields.dateModified=Upraveno @@ -620,9 +620,10 @@ itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key itemFields.identifier=Identifier -itemFields.type=Type -itemFields.format=Format +itemFields.type=Typ +itemFields.format=Formát itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=Autor @@ -855,7 +856,6 @@ searchConditions.tag=Štítek searchConditions.note=Poznámka searchConditions.childNote=Dceřiná poznámka searchConditions.creator=Tvůrce -searchConditions.type=Typ searchConditions.thesisType=Typ práce searchConditions.reportType=Typ reportu searchConditions.videoRecordingFormat=Formát záznamu videa @@ -866,7 +866,6 @@ searchConditions.interviewMedium=Medium interview searchConditions.manuscriptType=Typ manuskriptu searchConditions.presentationType=Typ prezentace searchConditions.mapType=Typ mapy -searchConditions.medium=Médium searchConditions.artworkMedium=Medium uměleckého díla searchConditions.dateModified=Datum změny searchConditions.fulltextContent=Obsah přílohy diff --git a/chrome/locale/da-DK/zotero/zotero.properties b/chrome/locale/da-DK/zotero/zotero.properties index 44e87b89bb1..24cac3d7ba5 100644 --- a/chrome/locale/da-DK/zotero/zotero.properties +++ b/chrome/locale/da-DK/zotero/zotero.properties @@ -503,7 +503,7 @@ itemTypes.preprint=Preprint itemTypes.dataset=Dataset itemTypes.standard=Standard -itemFields.itemType=Type +itemFields.itemType=Item Type itemFields.title=Titel itemFields.dateAdded=Tilføjet d. itemFields.dateModified=Ændret d. @@ -623,6 +623,7 @@ itemFields.identifier=Identifier itemFields.type=Type itemFields.format=Format itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=Forfatter/Ophav @@ -855,7 +856,6 @@ searchConditions.tag=Mærke searchConditions.note=Note searchConditions.childNote=Underordnet note searchConditions.creator=Ophav -searchConditions.type=Type searchConditions.thesisType=Type (afhandl.) searchConditions.reportType=Type (rapport) searchConditions.videoRecordingFormat=Videoformat @@ -866,7 +866,6 @@ searchConditions.interviewMedium=Interview-medium searchConditions.manuscriptType=Type (manus) searchConditions.presentationType=Type (præsent.) searchConditions.mapType=Type (kort) -searchConditions.medium=Medium searchConditions.artworkMedium=Værkets medium searchConditions.dateModified=Ændringsdato searchConditions.fulltextContent=Indhold i Vedhæftning diff --git a/chrome/locale/de/zotero/zotero.properties b/chrome/locale/de/zotero/zotero.properties index 5567a51012c..feb6a3578a5 100644 --- a/chrome/locale/de/zotero/zotero.properties +++ b/chrome/locale/de/zotero/zotero.properties @@ -503,7 +503,7 @@ itemTypes.preprint=Preprint itemTypes.dataset=Dataset itemTypes.standard=Standard -itemFields.itemType=Typ +itemFields.itemType=Eintragsart itemFields.title=Titel itemFields.dateAdded=Hinzugefügt am itemFields.dateModified=Geändert am @@ -623,6 +623,7 @@ itemFields.identifier=Identifier itemFields.type=Type itemFields.format=Format itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=Autor @@ -855,7 +856,6 @@ searchConditions.tag=Tag searchConditions.note=Notiz searchConditions.childNote=Unter-Notiz searchConditions.creator=Ersteller -searchConditions.type=Art searchConditions.thesisType=Art der Dissertation searchConditions.reportType=Art des Berichts searchConditions.videoRecordingFormat=Videoformat @@ -866,7 +866,6 @@ searchConditions.interviewMedium=Medium des Interviews searchConditions.manuscriptType=Art des Manuskripts searchConditions.presentationType=Art des Vortrags searchConditions.mapType=Art der Karte -searchConditions.medium=Medium searchConditions.artworkMedium=Medium des Kunstwerks searchConditions.dateModified=verändert am searchConditions.fulltextContent=Inhalt des Anhangs diff --git a/chrome/locale/el-GR/zotero/zotero.properties b/chrome/locale/el-GR/zotero/zotero.properties index d7387894f18..0fa82b1c8e6 100644 --- a/chrome/locale/el-GR/zotero/zotero.properties +++ b/chrome/locale/el-GR/zotero/zotero.properties @@ -501,9 +501,9 @@ itemTypes.encyclopediaArticle=Άρθρο εγκυκλοπαίδειας itemTypes.dictionaryEntry=Εισαγωγή λεξικού itemTypes.preprint=Preprint itemTypes.dataset=Dataset -itemTypes.standard=Standard +itemTypes.standard=Βασική τυποποίηση -itemFields.itemType=Τύπος +itemFields.itemType=Τύπος Στοιχείου itemFields.title=Τίτλος itemFields.dateAdded=Ημερομηνία προσθήκης itemFields.dateModified=Τροποποιήθηκε @@ -620,9 +620,10 @@ itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key itemFields.identifier=Identifier -itemFields.type=Type -itemFields.format=Format +itemFields.type=Τύπος +itemFields.format=Μορφή itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=Συγγραφέας @@ -855,7 +856,6 @@ searchConditions.tag=Ετικέτα searchConditions.note=Σημείωση searchConditions.childNote=Θυγατρική Σημείωση searchConditions.creator=Δημιουργός -searchConditions.type=Τύπος searchConditions.thesisType=Τύπος Διατριβής searchConditions.reportType=Τύπος Αναφοράς searchConditions.videoRecordingFormat=Μορφή Εγγραφής Βίντεο @@ -866,7 +866,6 @@ searchConditions.interviewMedium=Interview Medium searchConditions.manuscriptType=Manuscript Type searchConditions.presentationType=Presentation Type searchConditions.mapType=Map Type -searchConditions.medium=Μέσο searchConditions.artworkMedium=Artwork Medium searchConditions.dateModified=Ημερομηνία Τροποποίησης searchConditions.fulltextContent=Attachment Content diff --git a/chrome/locale/en-GB/zotero/zotero.properties b/chrome/locale/en-GB/zotero/zotero.properties index 19495088836..b706e24f135 100644 --- a/chrome/locale/en-GB/zotero/zotero.properties +++ b/chrome/locale/en-GB/zotero/zotero.properties @@ -503,7 +503,7 @@ itemTypes.preprint=Preprint itemTypes.dataset=Dataset itemTypes.standard=Standard -itemFields.itemType=Type +itemFields.itemType=Item Type itemFields.title=Title itemFields.dateAdded=Date Added itemFields.dateModified=Modified @@ -623,6 +623,7 @@ itemFields.identifier=Identifier itemFields.type=Type itemFields.format=Format itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=Author @@ -855,7 +856,6 @@ searchConditions.tag=Tag searchConditions.note=Note searchConditions.childNote=Child Note searchConditions.creator=Creator -searchConditions.type=Type searchConditions.thesisType=Thesis Type searchConditions.reportType=Report Type searchConditions.videoRecordingFormat=Video Recording Format @@ -866,7 +866,6 @@ searchConditions.interviewMedium=Interview Medium searchConditions.manuscriptType=Manuscript Type searchConditions.presentationType=Presentation Type searchConditions.mapType=Map Type -searchConditions.medium=Medium searchConditions.artworkMedium=Artwork Medium searchConditions.dateModified=Date Modified searchConditions.fulltextContent=Attachment Content diff --git a/chrome/locale/es-ES/zotero/zotero.properties b/chrome/locale/es-ES/zotero/zotero.properties index 18f13d35807..96beebb3307 100644 --- a/chrome/locale/es-ES/zotero/zotero.properties +++ b/chrome/locale/es-ES/zotero/zotero.properties @@ -500,10 +500,10 @@ itemTypes.document=Documento itemTypes.encyclopediaArticle=Artículo de enciclopedia itemTypes.dictionaryEntry=Entrada de diccionario itemTypes.preprint=Preimpresión -itemTypes.dataset=Dataset -itemTypes.standard=Standard +itemTypes.dataset=Conjunto de datos +itemTypes.standard=Estándar -itemFields.itemType=Tipo +itemFields.itemType=Tipo de elemento itemFields.title=Título itemFields.dateAdded=Fecha de adición itemFields.dateModified=Modificado @@ -616,14 +616,15 @@ itemFields.genre=Género itemFields.archive=Archivo itemFields.attachmentPDF=Adjunto PDF itemFields.repository=Repositorio -itemFields.repositoryLocation=Repo. Location +itemFields.repositoryLocation=Ubicación del repositorio itemFields.archiveID=ID de archivo itemFields.citationKey=Clave de cita -itemFields.identifier=Identifier -itemFields.type=Type -itemFields.format=Format -itemFields.status=Status -itemFields.organization=Organization +itemFields.identifier=Identificador +itemFields.type=Tipo +itemFields.format=Formato +itemFields.status=Estado +itemFields.authority=Authority +itemFields.organization=Organización creatorTypes.author=Autor creatorTypes.contributor=Contribuidor @@ -855,7 +856,6 @@ searchConditions.tag=Etiqueta searchConditions.note=Nota searchConditions.childNote=Nota subordinada searchConditions.creator=Creador -searchConditions.type=Tipo searchConditions.thesisType=Tipo de tesis searchConditions.reportType=Tipo de informe searchConditions.videoRecordingFormat=Formato de grabación de vídeo @@ -866,7 +866,6 @@ searchConditions.interviewMedium=Medio de la entrevista searchConditions.manuscriptType=Tipo de manuscrito searchConditions.presentationType=Tipo de presentación searchConditions.mapType=Tipo de mapa -searchConditions.medium=Medio searchConditions.artworkMedium=Medio artístico searchConditions.dateModified=Fecha de modificación searchConditions.fulltextContent=Contenido del adjunto diff --git a/chrome/locale/et-EE/zotero/zotero.properties b/chrome/locale/et-EE/zotero/zotero.properties index 9de858f48e5..a42bc0c0fb5 100644 --- a/chrome/locale/et-EE/zotero/zotero.properties +++ b/chrome/locale/et-EE/zotero/zotero.properties @@ -503,7 +503,7 @@ itemTypes.preprint=Preprint itemTypes.dataset=Dataset itemTypes.standard=Standard -itemFields.itemType=Tüüp +itemFields.itemType=Kirje tüüp itemFields.title=Pealkiri itemFields.dateAdded=Lisamise aeg itemFields.dateModified=Muudetud @@ -620,9 +620,10 @@ itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key itemFields.identifier=Identifier -itemFields.type=Type -itemFields.format=Format +itemFields.type=Tüüp +itemFields.format=Formaat itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=Autor @@ -855,7 +856,6 @@ searchConditions.tag=Lipik searchConditions.note=Märkus searchConditions.childNote=Alammärkus searchConditions.creator=Autor -searchConditions.type=Tüüp searchConditions.thesisType=Väitekirja tüüp searchConditions.reportType=Raporti tüüp searchConditions.videoRecordingFormat=Video salvestusformaat @@ -866,7 +866,6 @@ searchConditions.interviewMedium=Intervjuu kandja searchConditions.manuscriptType=Käsikirja tüüp searchConditions.presentationType=Esitluse tüüp searchConditions.mapType=kaardi tüüp -searchConditions.medium=Kandja searchConditions.artworkMedium=Kunstiteose kandja searchConditions.dateModified=Muutmise kuupäev searchConditions.fulltextContent=Manuse sisu diff --git a/chrome/locale/eu-ES/zotero/zotero.properties b/chrome/locale/eu-ES/zotero/zotero.properties index 325f44427a7..f00ef6b738c 100644 --- a/chrome/locale/eu-ES/zotero/zotero.properties +++ b/chrome/locale/eu-ES/zotero/zotero.properties @@ -503,7 +503,7 @@ itemTypes.preprint=Imprimatu aurrekoa itemTypes.dataset=Dataset itemTypes.standard=Standard -itemFields.itemType=Mota +itemFields.itemType=Elementu mota itemFields.title=Izenburua itemFields.dateAdded=Noiz gehitua itemFields.dateModified=Noiz aldatua @@ -620,9 +620,10 @@ itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Artxibo IDa itemFields.citationKey=Aipu-gakoa itemFields.identifier=Identifier -itemFields.type=Type -itemFields.format=Format +itemFields.type=Mota +itemFields.format=Formatua itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=Autorea @@ -855,7 +856,6 @@ searchConditions.tag=Etiketa searchConditions.note=Oharra searchConditions.childNote=Ohar umea searchConditions.creator=Sortzailea -searchConditions.type=Mota searchConditions.thesisType=Tesi Mota searchConditions.reportType=Txosten mota searchConditions.videoRecordingFormat=Bideo grabaketaren formatua @@ -866,7 +866,6 @@ searchConditions.interviewMedium=Elkarrizketa komunikabidea searchConditions.manuscriptType=Eskuizkribu mota searchConditions.presentationType=Aurkezpen mota searchConditions.mapType=Mapa mota -searchConditions.medium=Komunikabidea searchConditions.artworkMedium=Arte-lan Medio searchConditions.dateModified=Noiz Aldatua searchConditions.fulltextContent=Eranskinen edukia diff --git a/chrome/locale/fa/zotero/zotero.properties b/chrome/locale/fa/zotero/zotero.properties index 27a49932181..8818772602d 100644 --- a/chrome/locale/fa/zotero/zotero.properties +++ b/chrome/locale/fa/zotero/zotero.properties @@ -501,9 +501,9 @@ itemTypes.encyclopediaArticle=مقاله دانشنامه itemTypes.dictionaryEntry=مدخل لغتنامه itemTypes.preprint=Preprint itemTypes.dataset=Dataset -itemTypes.standard=Standard +itemTypes.standard=استاندارد -itemFields.itemType=نوع +itemFields.itemType=نوع آیتم itemFields.title=عنوان itemFields.dateAdded=تاریخ افزودن itemFields.dateModified=تاریخ اصلاح @@ -620,9 +620,10 @@ itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key itemFields.identifier=Identifier -itemFields.type=Type -itemFields.format=Format +itemFields.type=نوع +itemFields.format=فرمت itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=نویسنده @@ -855,7 +856,6 @@ searchConditions.tag=برچسب searchConditions.note=یادداشت searchConditions.childNote=یادداشت پیوست searchConditions.creator=پدیدآور -searchConditions.type=نوع searchConditions.thesisType=نوع پایان‌نامه searchConditions.reportType=نوع گزارش searchConditions.videoRecordingFormat=قالب ویدئو @@ -866,7 +866,6 @@ searchConditions.interviewMedium=رسانه مصاحبه searchConditions.manuscriptType=نوع دست‌نوشته searchConditions.presentationType=نوع ارائه searchConditions.mapType=نوع نقشه -searchConditions.medium=رسانه searchConditions.artworkMedium=رسانه اثر هنری searchConditions.dateModified=تاریخ تغییر searchConditions.fulltextContent=محتوای پیوست diff --git a/chrome/locale/fi-FI/zotero/zotero.properties b/chrome/locale/fi-FI/zotero/zotero.properties index b3bcd14c943..8e84b1f9468 100644 --- a/chrome/locale/fi-FI/zotero/zotero.properties +++ b/chrome/locale/fi-FI/zotero/zotero.properties @@ -500,10 +500,10 @@ itemTypes.document=Asiakirja itemTypes.encyclopediaArticle=Tietosanakirja-artikkeli itemTypes.dictionaryEntry=Sanakirjan hakusana itemTypes.preprint=Käsikirjoitusversio -itemTypes.dataset=Dataset -itemTypes.standard=Standard +itemTypes.dataset=Tietoaineisto +itemTypes.standard=Vakio -itemFields.itemType=Tyyppi +itemFields.itemType=Nimikkeen tyyppi itemFields.title=Otsake itemFields.dateAdded=Lisäyspäivä itemFields.dateModified=Muokattu @@ -616,14 +616,15 @@ itemFields.genre=Genre itemFields.archive=Arkisto itemFields.attachmentPDF=PDF-liite itemFields.repository=Säilö -itemFields.repositoryLocation=Repo. Location +itemFields.repositoryLocation=Säilön sijainti itemFields.archiveID=Arkistotunniste (Archive ID) itemFields.citationKey=Viitteen tunniste -itemFields.identifier=Identifier -itemFields.type=Type -itemFields.format=Format -itemFields.status=Status -itemFields.organization=Organization +itemFields.identifier=Tunniste +itemFields.type=Tyyppi +itemFields.format=Muoto +itemFields.status=Tila +itemFields.authority=Authority +itemFields.organization=Organisaatio creatorTypes.author=Tekijä creatorTypes.contributor=Muu tekijä @@ -855,7 +856,6 @@ searchConditions.tag=Merkki searchConditions.note=Muistiinpano searchConditions.childNote=Alimuistiinpano searchConditions.creator=Tekijä -searchConditions.type=Tyyppi searchConditions.thesisType=Opinnäytteen tyyppi searchConditions.reportType=Raportin tyyppi searchConditions.videoRecordingFormat=Videon nauhoitusmuoto @@ -866,7 +866,6 @@ searchConditions.interviewMedium=Haastatteluväline searchConditions.manuscriptType=Käsikirjoituksen tyyppi searchConditions.presentationType=Esitelmän tyyppi searchConditions.mapType=Kartan tyyppi -searchConditions.medium=Väline searchConditions.artworkMedium=Taideteoksen medium searchConditions.dateModified=Muokattu searchConditions.fulltextContent=Liitteen sisältö diff --git a/chrome/locale/fr-FR/zotero/zotero.properties b/chrome/locale/fr-FR/zotero/zotero.properties index 2f9675e537c..4247314ec7a 100644 --- a/chrome/locale/fr-FR/zotero/zotero.properties +++ b/chrome/locale/fr-FR/zotero/zotero.properties @@ -503,7 +503,7 @@ itemTypes.preprint=Prépublication itemTypes.dataset=Dataset itemTypes.standard=Standard -itemFields.itemType=Type +itemFields.itemType=Type de document itemFields.title=Titre itemFields.dateAdded=Date d'ajout itemFields.dateModified=Modifié le @@ -623,6 +623,7 @@ itemFields.identifier=Identifier itemFields.type=Type itemFields.format=Format itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=Auteur @@ -855,7 +856,6 @@ searchConditions.tag=Marqueur searchConditions.note=Note searchConditions.childNote=Note fille searchConditions.creator=Créateur -searchConditions.type=Type searchConditions.thesisType=Type de thèse searchConditions.reportType=Type de rapport searchConditions.videoRecordingFormat=Format d'enregistrement vidéo @@ -866,7 +866,6 @@ searchConditions.interviewMedium=Média de l'interview searchConditions.manuscriptType=Type de manuscrit searchConditions.presentationType=Type de présentation searchConditions.mapType=Type de carte -searchConditions.medium=Média searchConditions.artworkMedium=Support de l'illustration searchConditions.dateModified=Date de modification searchConditions.fulltextContent=Contenu de la pièce jointe diff --git a/chrome/locale/gl-ES/zotero/zotero.properties b/chrome/locale/gl-ES/zotero/zotero.properties index f6fec43b233..41f7cf1be2e 100644 --- a/chrome/locale/gl-ES/zotero/zotero.properties +++ b/chrome/locale/gl-ES/zotero/zotero.properties @@ -501,9 +501,9 @@ itemTypes.encyclopediaArticle=Artigo enciclopédico itemTypes.dictionaryEntry=Entrada de dicionario itemTypes.preprint=Pre-impresión itemTypes.dataset=Dataset -itemTypes.standard=Standard +itemTypes.standard=Estándar -itemFields.itemType=Tipo +itemFields.itemType=Tipo de elemento itemFields.title=Título itemFields.dateAdded=Data de alta itemFields.dateModified=Modificado @@ -620,9 +620,10 @@ itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Arquivo ID itemFields.citationKey=Clave de citación itemFields.identifier=Identifier -itemFields.type=Type -itemFields.format=Format +itemFields.type=Tipo +itemFields.format=Formato itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=Autor @@ -855,7 +856,6 @@ searchConditions.tag=Etiqueta searchConditions.note=Nota searchConditions.childNote=Nota filla searchConditions.creator=Creador -searchConditions.type=Tipo searchConditions.thesisType=Tipo de tese searchConditions.reportType=Tipo de informe searchConditions.videoRecordingFormat=Formato de gravación de vídeo @@ -866,7 +866,6 @@ searchConditions.interviewMedium=Medio da entrevista searchConditions.manuscriptType=Tipo de manuscrito searchConditions.presentationType=Tipo de presentación searchConditions.mapType=Tipo de mapa -searchConditions.medium=Medio searchConditions.artworkMedium=Medio de ilustracións searchConditions.dateModified=Data na que se modificou searchConditions.fulltextContent=Contido do adxunto diff --git a/chrome/locale/he-IL/zotero/zotero.properties b/chrome/locale/he-IL/zotero/zotero.properties index d9e40135060..4cf23d8833a 100644 --- a/chrome/locale/he-IL/zotero/zotero.properties +++ b/chrome/locale/he-IL/zotero/zotero.properties @@ -503,7 +503,7 @@ itemTypes.preprint=Preprint itemTypes.dataset=Dataset itemTypes.standard=Standard -itemFields.itemType=סוג +itemFields.itemType=סוג פריט itemFields.title=כותרת itemFields.dateAdded=תאריך הוספה itemFields.dateModified=שונה @@ -620,9 +620,10 @@ itemFields.repositoryLocation=Repo. Location itemFields.archiveID=מזהה ארכיון itemFields.citationKey=מפתח ציטוט itemFields.identifier=Identifier -itemFields.type=Type -itemFields.format=Format +itemFields.type=סוג +itemFields.format=עיצוב itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=מחבר @@ -855,7 +856,6 @@ searchConditions.tag=תגית searchConditions.note=הערה searchConditions.childNote=הערת צאצא searchConditions.creator=יוצר -searchConditions.type=סוג searchConditions.thesisType=סוג תזה searchConditions.reportType=סוג דוח searchConditions.videoRecordingFormat=תצורת הקלטת וידאו @@ -866,7 +866,6 @@ searchConditions.interviewMedium=אמצעי ריאיונות searchConditions.manuscriptType=סוג כתב יד searchConditions.presentationType=סוג מצגת searchConditions.mapType=סוג מפה -searchConditions.medium=אמצעי searchConditions.artworkMedium=אמצעי אומנותי searchConditions.dateModified=תאריך שינוי searchConditions.fulltextContent=תוכן מצורף diff --git a/chrome/locale/hr-HR/zotero/zotero.properties b/chrome/locale/hr-HR/zotero/zotero.properties index b5c4feaff9d..2fb085cf2df 100644 --- a/chrome/locale/hr-HR/zotero/zotero.properties +++ b/chrome/locale/hr-HR/zotero/zotero.properties @@ -503,7 +503,7 @@ itemTypes.preprint=Preprint itemTypes.dataset=Dataset itemTypes.standard=Standard -itemFields.itemType=Type +itemFields.itemType=Item Type itemFields.title=Title itemFields.dateAdded=Date Added itemFields.dateModified=Modified @@ -623,6 +623,7 @@ itemFields.identifier=Identifier itemFields.type=Type itemFields.format=Format itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=Author @@ -855,7 +856,6 @@ searchConditions.tag=Tag searchConditions.note=Note searchConditions.childNote=Child Note searchConditions.creator=Creator -searchConditions.type=Type searchConditions.thesisType=Thesis Type searchConditions.reportType=Report Type searchConditions.videoRecordingFormat=Video Recording Format @@ -866,7 +866,6 @@ searchConditions.interviewMedium=Interview Medium searchConditions.manuscriptType=Manuscript Type searchConditions.presentationType=Presentation Type searchConditions.mapType=Map Type -searchConditions.medium=Medium searchConditions.artworkMedium=Artwork Medium searchConditions.dateModified=Datum izmjene searchConditions.fulltextContent=Attachment Content diff --git a/chrome/locale/hu-HU/zotero/zotero.properties b/chrome/locale/hu-HU/zotero/zotero.properties index 1a1ee7fb3d0..d2253f452a0 100644 --- a/chrome/locale/hu-HU/zotero/zotero.properties +++ b/chrome/locale/hu-HU/zotero/zotero.properties @@ -501,9 +501,9 @@ itemTypes.encyclopediaArticle=Lexikon szócikk itemTypes.dictionaryEntry=Szótár szócikk itemTypes.preprint=Preprint itemTypes.dataset=Dataset -itemTypes.standard=Standard +itemTypes.standard=Alapértelmezett -itemFields.itemType=Típus +itemFields.itemType=Forrás típusa itemFields.title=Cím itemFields.dateAdded=Hozzáadás dátuma itemFields.dateModified=Módosítás dátuma @@ -620,9 +620,10 @@ itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key itemFields.identifier=Identifier -itemFields.type=Type -itemFields.format=Format +itemFields.type=Típus +itemFields.format=Formátum itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=Szerző @@ -855,7 +856,6 @@ searchConditions.tag=Címke searchConditions.note=Jegyzet searchConditions.childNote=Ez alá tartozó jegyzet searchConditions.creator=Létrehozó -searchConditions.type=Típus searchConditions.thesisType=Szakdolgozat típusa searchConditions.reportType=Jelentés típusa searchConditions.videoRecordingFormat=Video felvételi formátum @@ -866,7 +866,6 @@ searchConditions.interviewMedium=Interjú médiuma searchConditions.manuscriptType=Kézirat típusa searchConditions.presentationType=Jelentés típusa searchConditions.mapType=Térkép típusa -searchConditions.medium=Médium searchConditions.artworkMedium=Műalkotás médiuma searchConditions.dateModified=Módosítás dátuma searchConditions.fulltextContent=Csatolmány tartalma diff --git a/chrome/locale/id-ID/zotero/zotero.properties b/chrome/locale/id-ID/zotero/zotero.properties index b83d19aeb19..e319ae6f52d 100644 --- a/chrome/locale/id-ID/zotero/zotero.properties +++ b/chrome/locale/id-ID/zotero/zotero.properties @@ -503,7 +503,7 @@ itemTypes.preprint=Preprint itemTypes.dataset=Dataset itemTypes.standard=Standard -itemFields.itemType=Jenis +itemFields.itemType=Jenis Item itemFields.title=Judul itemFields.dateAdded=Tanggal Ditambahkan itemFields.dateModified=Dimodifikasi @@ -620,9 +620,10 @@ itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key itemFields.identifier=Identifier -itemFields.type=Type +itemFields.type=Jenis itemFields.format=Format itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=Penulis @@ -855,7 +856,6 @@ searchConditions.tag=Tag searchConditions.note=Catatan searchConditions.childNote=Catatan Anak searchConditions.creator=Penyusun -searchConditions.type=Jenis searchConditions.thesisType=Jenis Tesis searchConditions.reportType=Jenis Laporan searchConditions.videoRecordingFormat=Format Perekaman Video @@ -866,7 +866,6 @@ searchConditions.interviewMedium=Media Wawancara searchConditions.manuscriptType=Jenis Manuskrip searchConditions.presentationType=Jenis Presentasi searchConditions.mapType=Jenis Peta -searchConditions.medium=Media searchConditions.artworkMedium=Media Karya Seni searchConditions.dateModified=Tanggal Dimodifikasi searchConditions.fulltextContent=Konten Lampiran diff --git a/chrome/locale/is-IS/zotero/zotero.properties b/chrome/locale/is-IS/zotero/zotero.properties index f4d17b84d4d..54df9ea7d60 100644 --- a/chrome/locale/is-IS/zotero/zotero.properties +++ b/chrome/locale/is-IS/zotero/zotero.properties @@ -501,9 +501,9 @@ itemTypes.encyclopediaArticle=Færsla í alfræðiriti itemTypes.dictionaryEntry=Færsla í orðabók itemTypes.preprint=Preprint itemTypes.dataset=Dataset -itemTypes.standard=Standard +itemTypes.standard=Stöðluð -itemFields.itemType=Tegund +itemFields.itemType=Tegund færslu itemFields.title=Titill itemFields.dateAdded=Dagsetning viðbótar itemFields.dateModified=Breytt @@ -620,9 +620,10 @@ itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key itemFields.identifier=Identifier -itemFields.type=Type -itemFields.format=Format +itemFields.type=Tegund korts +itemFields.format=Hljóðupptökusnið itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=Höfundur @@ -855,7 +856,6 @@ searchConditions.tag=Merki searchConditions.note=Athugasemd searchConditions.childNote=Undirathugasemd searchConditions.creator=Höfundur -searchConditions.type=Tegund searchConditions.thesisType=Tegund ritgerðar searchConditions.reportType=Tegund skýrslu searchConditions.videoRecordingFormat=Snið kvikmyndar @@ -866,7 +866,6 @@ searchConditions.interviewMedium=Viðtalsmiðill searchConditions.manuscriptType=Tegund handrits searchConditions.presentationType=Tegund kynningar searchConditions.mapType=Tegund korts -searchConditions.medium=Miðill searchConditions.artworkMedium=Miðill listaverks searchConditions.dateModified=Dagsetning breytingar searchConditions.fulltextContent=Innihald viðhengis diff --git a/chrome/locale/it-IT/zotero/zotero.properties b/chrome/locale/it-IT/zotero/zotero.properties index ab1e222a2b8..7167d264242 100644 --- a/chrome/locale/it-IT/zotero/zotero.properties +++ b/chrome/locale/it-IT/zotero/zotero.properties @@ -175,7 +175,7 @@ dataDir.moveToDefaultLocation=Puoi correggere questo problema spostando la carte dataDir.location=Cartella dati: %S dataDir.notFound=La cartella dati di %S non è stata trovata. dataDir.notFound.defaultFound=Impossibile trovare la cartella dati %S all'interno di %S. La cartella dati è stata trovata in %S. Desideri utilizzare questa cartella? -dataDir.useNewLocation=Utilizza un nuovo percorso +dataDir.useNewLocation=Usa un nuovo percorso dataDir.previousDir=Cartella precedente: dataDir.default=Predefinito (%S) dataDir.useDefaultLocation=Utilizza il percorso predefinito @@ -501,9 +501,9 @@ itemTypes.encyclopediaArticle=Voce di enciclopedia itemTypes.dictionaryEntry=Voce di dizionario itemTypes.preprint=Preprint itemTypes.dataset=Dataset -itemTypes.standard=Standard +itemTypes.standard=Norma -itemFields.itemType=Tipo +itemFields.itemType=Tipo di elemento itemFields.title=Titolo itemFields.dateAdded=Data inserimento itemFields.dateModified=Data ultima modifica @@ -616,14 +616,15 @@ itemFields.genre=Genere itemFields.archive=Archivio itemFields.attachmentPDF=Allegato PDF itemFields.repository=Repository -itemFields.repositoryLocation=Repo. Location +itemFields.repositoryLocation=Indirizzo del repository itemFields.archiveID=ID dell'archivio itemFields.citationKey=Chiave di citazione -itemFields.identifier=Identifier -itemFields.type=Type -itemFields.format=Format -itemFields.status=Status -itemFields.organization=Organization +itemFields.identifier=Identificatore +itemFields.type=Tipo +itemFields.format=Formato +itemFields.status=Stato della pubblicazione +itemFields.authority=Authority +itemFields.organization=Organizzazione creatorTypes.author=Autore creatorTypes.contributor=Collaboratore @@ -855,7 +856,6 @@ searchConditions.tag=Tag searchConditions.note=Nota searchConditions.childNote=Nota figlia searchConditions.creator=Autore -searchConditions.type=Tipo searchConditions.thesisType=Tipo di tesi searchConditions.reportType=Tipo di report searchConditions.videoRecordingFormat=Formato della registrazione video @@ -866,7 +866,6 @@ searchConditions.interviewMedium=Formato dell'intervista searchConditions.manuscriptType=Tipo di manoscritto searchConditions.presentationType=Tipo di presentazione searchConditions.mapType=Tipo di mappa -searchConditions.medium=Formato searchConditions.artworkMedium=Formato dell'opera d'arte searchConditions.dateModified=Data ultima modifica searchConditions.fulltextContent=Contenuto dell'allegato diff --git a/chrome/locale/ja-JP/zotero/zotero.properties b/chrome/locale/ja-JP/zotero/zotero.properties index 6f7f60199f8..2e695d197d5 100644 --- a/chrome/locale/ja-JP/zotero/zotero.properties +++ b/chrome/locale/ja-JP/zotero/zotero.properties @@ -501,9 +501,9 @@ itemTypes.encyclopediaArticle=百科事典項目 itemTypes.dictionaryEntry=辞書項目 itemTypes.preprint=プレプリント itemTypes.dataset=Dataset -itemTypes.standard=Standard +itemTypes.standard=標準 -itemFields.itemType=種類 +itemFields.itemType=アイテムの種類 itemFields.title=題名 itemFields.dateAdded=追加日時 itemFields.dateModified=更新日時 @@ -620,9 +620,10 @@ itemFields.repositoryLocation=Repo. Location itemFields.archiveID=アーカイブ ID itemFields.citationKey=出典表記キー itemFields.identifier=Identifier -itemFields.type=Type -itemFields.format=Format +itemFields.type=種類 +itemFields.format=フォーマット itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=著者名 @@ -855,7 +856,6 @@ searchConditions.tag=タグ searchConditions.note=メモ searchConditions.childNote=子ノート searchConditions.creator=編著者等 -searchConditions.type=種類 searchConditions.thesisType=学位論文の種類 searchConditions.reportType=レポートの種類 searchConditions.videoRecordingFormat=ビデオフォーマット @@ -866,7 +866,6 @@ searchConditions.interviewMedium=インタビューの記録方法 searchConditions.manuscriptType=原稿の種類 searchConditions.presentationType=プレゼンテーションの種類 searchConditions.mapType=地図の種類 -searchConditions.medium=素材・技法 searchConditions.artworkMedium=芸術品の素材・技法 searchConditions.dateModified=更新日時 searchConditions.fulltextContent=添付ファイルの内容 diff --git a/chrome/locale/km/zotero/zotero.properties b/chrome/locale/km/zotero/zotero.properties index 1c555708f35..49b9717ba0b 100644 --- a/chrome/locale/km/zotero/zotero.properties +++ b/chrome/locale/km/zotero/zotero.properties @@ -503,7 +503,7 @@ itemTypes.preprint=Preprint itemTypes.dataset=Dataset itemTypes.standard=Standard -itemFields.itemType=ប្រភេទ +itemFields.itemType=ប្រភេទឯកសារ itemFields.title=ចំណងជើង itemFields.dateAdded=កាលបរិច្ឆេទបញ្ចូល itemFields.dateModified=កែតម្រូវ @@ -620,9 +620,10 @@ itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key itemFields.identifier=Identifier -itemFields.type=Type -itemFields.format=Format +itemFields.type=ប្រភេទ +itemFields.format=ទម្រង់ itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=អ្នកនិពន្ធ @@ -855,7 +856,6 @@ searchConditions.tag=ស្លាក searchConditions.note=កំណត់ចំណាំ searchConditions.childNote=កំណត់ត្រារណប searchConditions.creator=អ្នកនិពន្ធ -searchConditions.type=ប្រភេទ searchConditions.thesisType=ប្រភេទនិក្ខេបបទ searchConditions.reportType=ប្រភេទរបាយការណ៍ searchConditions.videoRecordingFormat=ប្រភេទខ្សែអាត់វីដេអូ @@ -866,7 +866,6 @@ searchConditions.interviewMedium=បទសម្ភាសន៍ searchConditions.manuscriptType=ហត្ថាអត្ថបទ searchConditions.presentationType=ឧទ្ទេសបទ searchConditions.mapType=ប្រភេទផែនទី -searchConditions.medium=ការផ្សព្វផ្សាយ searchConditions.artworkMedium=ការផ្សព្វផ្សាយសិល្បៈ searchConditions.dateModified=កាលបរិច្ឆទកែតម្រូវ searchConditions.fulltextContent=ខ្លឹមសារឯកសារភ្ជាប់ diff --git a/chrome/locale/ko-KR/zotero/zotero.properties b/chrome/locale/ko-KR/zotero/zotero.properties index 75f4ceb3445..4c972e9cb1f 100644 --- a/chrome/locale/ko-KR/zotero/zotero.properties +++ b/chrome/locale/ko-KR/zotero/zotero.properties @@ -501,9 +501,9 @@ itemTypes.encyclopediaArticle=백과사전 항목 itemTypes.dictionaryEntry=사전 항목 itemTypes.preprint=Preprint itemTypes.dataset=Dataset -itemTypes.standard=Standard +itemTypes.standard=표준 -itemFields.itemType=형식 +itemFields.itemType=항목 형식 itemFields.title=제목 itemFields.dateAdded=입력일 itemFields.dateModified=변경일 @@ -620,9 +620,10 @@ itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key itemFields.identifier=Identifier -itemFields.type=Type -itemFields.format=Format +itemFields.type=형식 +itemFields.format=형식 itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=저자 @@ -855,7 +856,6 @@ searchConditions.tag=태그 searchConditions.note=노트 searchConditions.childNote=하위 노트 searchConditions.creator=창작가 -searchConditions.type=형식 searchConditions.thesisType=논문 형식 searchConditions.reportType=보고서 형식 searchConditions.videoRecordingFormat=동영상 녹화 형식 @@ -866,7 +866,6 @@ searchConditions.interviewMedium=회견 매체 searchConditions.manuscriptType=원고 형식 searchConditions.presentationType=발표 형식 searchConditions.mapType=지도 형식 -searchConditions.medium=매체 searchConditions.artworkMedium=삽화 매체 searchConditions.dateModified=변경일 searchConditions.fulltextContent=목차 첨부 diff --git a/chrome/locale/lt-LT/zotero/zotero.properties b/chrome/locale/lt-LT/zotero/zotero.properties index 669c7c1987d..38136a3c9bf 100644 --- a/chrome/locale/lt-LT/zotero/zotero.properties +++ b/chrome/locale/lt-LT/zotero/zotero.properties @@ -501,9 +501,9 @@ itemTypes.encyclopediaArticle=Straipsnelis enciklopedijoje itemTypes.dictionaryEntry=Žodyno įrašas itemTypes.preprint=Preprint itemTypes.dataset=Dataset -itemTypes.standard=Standard +itemTypes.standard=Įprastas -itemFields.itemType=Tipas +itemFields.itemType=Įrašo tipas itemFields.title=Pavadinimas itemFields.dateAdded=Pridėta itemFields.dateModified=Pakeista @@ -620,9 +620,10 @@ itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key itemFields.identifier=Identifier -itemFields.type=Type -itemFields.format=Format +itemFields.type=Tipas +itemFields.format=Formatas itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=Autorius @@ -855,7 +856,6 @@ searchConditions.tag=Gairė searchConditions.note=Pastaba searchConditions.childNote=Įrašo pastaba searchConditions.creator=Autoriai -searchConditions.type=Tipas searchConditions.thesisType=Disertacijos tipas searchConditions.reportType=Pranešimo tipas searchConditions.videoRecordingFormat=Vaizdo įrašo formatas @@ -866,7 +866,6 @@ searchConditions.interviewMedium=Pokalbio laikmena searchConditions.manuscriptType=Rankraščio tipas searchConditions.presentationType=Pateikties tipas searchConditions.mapType=Žemėlapio tipas -searchConditions.medium=Laikmena searchConditions.artworkMedium=Paveikslo laikmena searchConditions.dateModified=Keitimo laikas searchConditions.fulltextContent=Prisegto failo turinys diff --git a/chrome/locale/mn-MN/zotero/zotero.properties b/chrome/locale/mn-MN/zotero/zotero.properties index a6056ad234f..bd938af0077 100644 --- a/chrome/locale/mn-MN/zotero/zotero.properties +++ b/chrome/locale/mn-MN/zotero/zotero.properties @@ -503,7 +503,7 @@ itemTypes.preprint=Preprint itemTypes.dataset=Dataset itemTypes.standard=Standard -itemFields.itemType=Type +itemFields.itemType=Item Type itemFields.title=Title itemFields.dateAdded=Date Added itemFields.dateModified=Modified @@ -623,6 +623,7 @@ itemFields.identifier=Identifier itemFields.type=Type itemFields.format=Format itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=Author @@ -855,7 +856,6 @@ searchConditions.tag=Tag searchConditions.note=Note searchConditions.childNote=Child Note searchConditions.creator=Creator -searchConditions.type=Type searchConditions.thesisType=Thesis Type searchConditions.reportType=Report Type searchConditions.videoRecordingFormat=Video Recording Format @@ -866,7 +866,6 @@ searchConditions.interviewMedium=Interview Medium searchConditions.manuscriptType=Manuscript Type searchConditions.presentationType=Presentation Type searchConditions.mapType=Map Type -searchConditions.medium=Medium searchConditions.artworkMedium=Artwork Medium searchConditions.dateModified=Date Modified searchConditions.fulltextContent=Attachment Content diff --git a/chrome/locale/nb-NO/zotero/zotero.properties b/chrome/locale/nb-NO/zotero/zotero.properties index 9520c23e4fc..1a143afc19e 100644 --- a/chrome/locale/nb-NO/zotero/zotero.properties +++ b/chrome/locale/nb-NO/zotero/zotero.properties @@ -500,10 +500,10 @@ itemTypes.document=Dokument itemTypes.encyclopediaArticle=Artikkel i oppslagsverk itemTypes.dictionaryEntry=Oppslag i ordbok itemTypes.preprint=Forhåndstrykk -itemTypes.dataset=Dataset +itemTypes.dataset=Datasett itemTypes.standard=Standard -itemFields.itemType=Type +itemFields.itemType=Elementtype itemFields.title=Tittel itemFields.dateAdded=Dato lagt til itemFields.dateModified=Endret @@ -615,15 +615,16 @@ itemFields.filingDate=Innleveringsdato itemFields.genre=Sjanger itemFields.archive=Arkiv itemFields.attachmentPDF=PDF-vedlegg -itemFields.repository=Magasin -itemFields.repositoryLocation=Repo. Location +itemFields.repository=Oppbevaringssted +itemFields.repositoryLocation=Oppbevaringssted itemFields.archiveID=Arkiv ID itemFields.citationKey=Henvisningsnøkkel -itemFields.identifier=Identifier +itemFields.identifier=Identifikator itemFields.type=Type itemFields.format=Format itemFields.status=Status -itemFields.organization=Organization +itemFields.authority=Myndighet +itemFields.organization=Organisasjon creatorTypes.author=Forfatter creatorTypes.contributor=Medforfatter @@ -855,7 +856,6 @@ searchConditions.tag=Emneord searchConditions.note=Notat searchConditions.childNote=Underordnet notat searchConditions.creator=Opphaver -searchConditions.type=Type searchConditions.thesisType=Avhandlingstype searchConditions.reportType=Rapporttype searchConditions.videoRecordingFormat=Video-opptak format @@ -866,7 +866,6 @@ searchConditions.interviewMedium=Intervjumedium searchConditions.manuscriptType=Manuskripttype searchConditions.presentationType=Presentasjonstype searchConditions.mapType=Karttype -searchConditions.medium=Medium searchConditions.artworkMedium=Kunstmedium searchConditions.dateModified=Sist endret searchConditions.fulltextContent=Vedleggsinnhold diff --git a/chrome/locale/nl-NL/zotero/zotero.properties b/chrome/locale/nl-NL/zotero/zotero.properties index 57958b561c8..7d3e19e560b 100644 --- a/chrome/locale/nl-NL/zotero/zotero.properties +++ b/chrome/locale/nl-NL/zotero/zotero.properties @@ -501,9 +501,9 @@ itemTypes.encyclopediaArticle=Encyclopedie-artikel itemTypes.dictionaryEntry=Lemma itemTypes.preprint=Preprint itemTypes.dataset=Dataset -itemTypes.standard=Standard +itemTypes.standard=Standaard -itemFields.itemType=Type +itemFields.itemType=Item Type itemFields.title=Titel itemFields.dateAdded=Datum toegevoegd itemFields.dateModified=Bewerkt @@ -621,8 +621,9 @@ itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key itemFields.identifier=Identifier itemFields.type=Type -itemFields.format=Format +itemFields.format=Formaat itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=Auteur @@ -855,7 +856,6 @@ searchConditions.tag=Label searchConditions.note=Aantekening searchConditions.childNote=Begeleidende aantekening searchConditions.creator=Auteur -searchConditions.type=Type searchConditions.thesisType=Type proefschrift searchConditions.reportType=Type rapport searchConditions.videoRecordingFormat=Video-opnameformaat @@ -866,7 +866,6 @@ searchConditions.interviewMedium=Interviewmedium searchConditions.manuscriptType=Type manuscript searchConditions.presentationType=Type presentatie searchConditions.mapType=Type kaart -searchConditions.medium=Medium searchConditions.artworkMedium=Medium kunstwerk searchConditions.dateModified=Bewerkingsdatum searchConditions.fulltextContent=Bijlage-inhoud diff --git a/chrome/locale/nn-NO/zotero/zotero.properties b/chrome/locale/nn-NO/zotero/zotero.properties index 9dad0da6178..f2e0659ee80 100644 --- a/chrome/locale/nn-NO/zotero/zotero.properties +++ b/chrome/locale/nn-NO/zotero/zotero.properties @@ -623,6 +623,7 @@ itemFields.identifier=Identifier itemFields.type=Type itemFields.format=Format itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=Forfattar @@ -855,7 +856,6 @@ searchConditions.tag=Tagg searchConditions.note=Notat searchConditions.childNote=Underordna notat searchConditions.creator=Namn -searchConditions.type=Type searchConditions.thesisType=Avhandlingstype searchConditions.reportType=Rapporttype searchConditions.videoRecordingFormat=Videoopptaksformat @@ -866,7 +866,6 @@ searchConditions.interviewMedium=Intervjumedium searchConditions.manuscriptType=Manuskripttype searchConditions.presentationType=Presentasjonstype searchConditions.mapType=Karttype -searchConditions.medium=Middels searchConditions.artworkMedium=Kunstmedium searchConditions.dateModified=Sist endra searchConditions.fulltextContent=Vedlegginnhald diff --git a/chrome/locale/pl-PL/zotero/zotero.properties b/chrome/locale/pl-PL/zotero/zotero.properties index 8cd9bb4f8b1..14a417b32a9 100644 --- a/chrome/locale/pl-PL/zotero/zotero.properties +++ b/chrome/locale/pl-PL/zotero/zotero.properties @@ -500,10 +500,10 @@ itemTypes.document=Dokument itemTypes.encyclopediaArticle=Artykuł w encyklopedii itemTypes.dictionaryEntry=Hasło słownikowe itemTypes.preprint=Preprint -itemTypes.dataset=Dataset -itemTypes.standard=Standard +itemTypes.dataset=Zestaw danych +itemTypes.standard=Standardowy -itemFields.itemType=Typ +itemFields.itemType=Typ elementu itemFields.title=Tytuł itemFields.dateAdded=Data dodania itemFields.dateModified=Zmodyfikowany @@ -616,14 +616,15 @@ itemFields.genre=Rodzaj itemFields.archive=Archiwum itemFields.attachmentPDF=Załącznik PDF itemFields.repository=Repozytorium -itemFields.repositoryLocation=Repo. Location +itemFields.repositoryLocation=Lokalizacja repozytorium itemFields.archiveID=Identyfikator archiwum itemFields.citationKey=Klucz cytowania -itemFields.identifier=Identifier -itemFields.type=Type +itemFields.identifier=Identyfikator +itemFields.type=Typ itemFields.format=Format -itemFields.status=Status -itemFields.organization=Organization +itemFields.status=Stan +itemFields.authority=Authority +itemFields.organization=Organizacja creatorTypes.author=Autor creatorTypes.contributor=Współautor @@ -825,7 +826,7 @@ import.online.formIntro=Proszę wprowadź swoje dane logowania do %2$S. To jest import.online.intro=W następnym kroku będziesz poproszony(a), żeby zalogować się do %2$S i uzyskać dostęp do %1$S. Jest to wymagane, aby zaimportować twoją bibliotekę %3$S do %1$S. import.online.intro2=%1$S nigdy nie pozna i nie zachowa twojego hasła %2$S. import.online.wrongCredentials=Logowanie do %1$S nie powiodło się. Proszę wprowadź jeszcze raz dane i spróbuj ponownie. -import.online.blockedByPlugin=The import cannot continue with "%1$S" enabled. Please disable this plugin and try again. +import.online.blockedByPlugin=Nie można przeprowadzić importu z włączonym "%1$S". Proszę, wyłącz tę wtyczkę i spróbuj ponownie. quickCopy.copyAs=Kopiuj jako %S @@ -855,7 +856,6 @@ searchConditions.tag=Etykieta searchConditions.note=Notatka searchConditions.childNote=Notatka podrzędna searchConditions.creator=Twórca -searchConditions.type=Typ searchConditions.thesisType=Typ pracy dyplomowej searchConditions.reportType=Typ raportu searchConditions.videoRecordingFormat=Format nagrania wideo @@ -866,7 +866,6 @@ searchConditions.interviewMedium=Nośnik wywiadu searchConditions.manuscriptType=Typ rękopisu searchConditions.presentationType=Typ prezentacji searchConditions.mapType=Typ mapy -searchConditions.medium=Nośnik searchConditions.artworkMedium=Technika wykonania searchConditions.dateModified=Data modyfikacji searchConditions.fulltextContent=Zawartość załącznika diff --git a/chrome/locale/pt-BR/zotero/zotero.properties b/chrome/locale/pt-BR/zotero/zotero.properties index 07f352ac0f9..6a143650996 100644 --- a/chrome/locale/pt-BR/zotero/zotero.properties +++ b/chrome/locale/pt-BR/zotero/zotero.properties @@ -501,9 +501,9 @@ itemTypes.encyclopediaArticle=Verbete de enciclopédia itemTypes.dictionaryEntry=Verbete de dicionário itemTypes.preprint=Pré-impressão itemTypes.dataset=Dataset -itemTypes.standard=Standard +itemTypes.standard=Padrão -itemFields.itemType=Tipo +itemFields.itemType=Tipo do item itemFields.title=Título itemFields.dateAdded=Data de adição itemFields.dateModified=Data de modificação @@ -620,9 +620,10 @@ itemFields.repositoryLocation=Repo. Location itemFields.archiveID=ID do Arquivo itemFields.citationKey=Chave de Citação itemFields.identifier=Identifier -itemFields.type=Type -itemFields.format=Format +itemFields.type=Tipo +itemFields.format=Formato itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=Autor @@ -855,7 +856,6 @@ searchConditions.tag=Etiqueta searchConditions.note=Nota searchConditions.childNote=Nota associada searchConditions.creator=Autor -searchConditions.type=Tipo searchConditions.thesisType=Tipo de tese searchConditions.reportType=Tipo de relatório searchConditions.videoRecordingFormat=Formato de gravação de video @@ -866,7 +866,6 @@ searchConditions.interviewMedium=Suporte da entrevista searchConditions.manuscriptType=Tipo de manuscrito searchConditions.presentationType=Tipo de apresentação searchConditions.mapType=Tipo de mapa -searchConditions.medium=Suporte searchConditions.artworkMedium=Suporte da obra de arte searchConditions.dateModified=Data de modificação searchConditions.fulltextContent=Conteúdo do anexo diff --git a/chrome/locale/pt-PT/zotero/zotero.properties b/chrome/locale/pt-PT/zotero/zotero.properties index 1feb80b3b5e..2bc856912db 100644 --- a/chrome/locale/pt-PT/zotero/zotero.properties +++ b/chrome/locale/pt-PT/zotero/zotero.properties @@ -501,9 +501,9 @@ itemTypes.encyclopediaArticle=Artigo de Enciclopédia itemTypes.dictionaryEntry=Verbete de Dicionário itemTypes.preprint=Pré-impressão itemTypes.dataset=Dataset -itemTypes.standard=Standard +itemTypes.standard=Norma -itemFields.itemType=Tipo +itemFields.itemType=Tipo de Item itemFields.title=Título itemFields.dateAdded=Data de Adição itemFields.dateModified=Modificado @@ -620,9 +620,10 @@ itemFields.repositoryLocation=Repo. Location itemFields.archiveID=ID do Arquivo itemFields.citationKey=Chave de Citação itemFields.identifier=Identifier -itemFields.type=Type -itemFields.format=Format +itemFields.type=Tipo +itemFields.format=Formato itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=Autor @@ -855,7 +856,6 @@ searchConditions.tag=Etiqueta searchConditions.note=Nota searchConditions.childNote=Nota Descendente searchConditions.creator=Criador -searchConditions.type=Tipo searchConditions.thesisType=Tipo de Tese searchConditions.reportType=Tipo de Relatório searchConditions.videoRecordingFormat=Formato da Gravação Vídeo @@ -866,7 +866,6 @@ searchConditions.interviewMedium=Suporte da Entrevista searchConditions.manuscriptType=Tipo de Manuscrito searchConditions.presentationType=Tipo de Apresentação searchConditions.mapType=Tipo de Mapa -searchConditions.medium=Suporte searchConditions.artworkMedium=Suporte da Obra de Arte searchConditions.dateModified=Data de Modificação searchConditions.fulltextContent=Conteúdo de Anexo diff --git a/chrome/locale/ro-RO/zotero/zotero.properties b/chrome/locale/ro-RO/zotero/zotero.properties index 64a0cc0e753..5e37bd86b80 100644 --- a/chrome/locale/ro-RO/zotero/zotero.properties +++ b/chrome/locale/ro-RO/zotero/zotero.properties @@ -503,7 +503,7 @@ itemTypes.preprint=Preprint itemTypes.dataset=Dataset itemTypes.standard=Standard -itemFields.itemType=Tip +itemFields.itemType=Tip de înregistrare itemFields.title=Titlu itemFields.dateAdded=Adăugat la data itemFields.dateModified=Modificat @@ -620,9 +620,10 @@ itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key itemFields.identifier=Identifier -itemFields.type=Type +itemFields.type=Tip itemFields.format=Format itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=Autor @@ -855,7 +856,6 @@ searchConditions.tag=Etichetă searchConditions.note=Notă searchConditions.childNote=Subnotă searchConditions.creator=Creator -searchConditions.type=Tip searchConditions.thesisType=Tip teză searchConditions.reportType=Tip reportaj searchConditions.videoRecordingFormat=Format înregistrare video @@ -866,7 +866,6 @@ searchConditions.interviewMedium=Tip interviu searchConditions.manuscriptType=Tip manuscris searchConditions.presentationType=Tip prezentare searchConditions.mapType=Tip hartă -searchConditions.medium=Mediu searchConditions.artworkMedium=Tip lucrare de artă searchConditions.dateModified=Data modificării searchConditions.fulltextContent=Conținut anexă diff --git a/chrome/locale/ru-RU/zotero/zotero.properties b/chrome/locale/ru-RU/zotero/zotero.properties index ed3acc2162a..ef92071bc22 100644 --- a/chrome/locale/ru-RU/zotero/zotero.properties +++ b/chrome/locale/ru-RU/zotero/zotero.properties @@ -500,10 +500,10 @@ itemTypes.document=Документ itemTypes.encyclopediaArticle=Статья из энциклопедии itemTypes.dictionaryEntry=Словарная статья itemTypes.preprint=Препринт -itemTypes.dataset=Dataset -itemTypes.standard=Standard +itemTypes.dataset=Набор данных +itemTypes.standard=Стандартный -itemFields.itemType=Тип +itemFields.itemType=Тип записи itemFields.title=Название itemFields.dateAdded=Добавлен itemFields.dateModified=Изменён @@ -616,14 +616,15 @@ itemFields.genre=Жанр itemFields.archive=Архив itemFields.attachmentPDF=Приложение PDF itemFields.repository=Репозиторий -itemFields.repositoryLocation=Repo. Location +itemFields.repositoryLocation=Репозиторий. Расположение itemFields.archiveID=ID на archive.org itemFields.citationKey=Ключ цитирования -itemFields.identifier=Identifier -itemFields.type=Type -itemFields.format=Format -itemFields.status=Status -itemFields.organization=Organization +itemFields.identifier=Идентификатор +itemFields.type=Тип +itemFields.format=Формат +itemFields.status=Статус +itemFields.authority=Authority +itemFields.organization=Организация creatorTypes.author=Автор creatorTypes.contributor=Соавтор @@ -855,7 +856,6 @@ searchConditions.tag=Тег searchConditions.note=Заметка searchConditions.childNote=Дочерняя заметка searchConditions.creator=Автор -searchConditions.type=Тип searchConditions.thesisType=Тип диссертации searchConditions.reportType=Тип отчета searchConditions.videoRecordingFormat=Формат видео @@ -866,7 +866,6 @@ searchConditions.interviewMedium=Средство интервью searchConditions.manuscriptType=Тип рукописи searchConditions.presentationType=Тип презентации searchConditions.mapType=Тип карты -searchConditions.medium=Средство searchConditions.artworkMedium=Художественное средство searchConditions.dateModified=Дата изменения searchConditions.fulltextContent=Содержание приложения diff --git a/chrome/locale/sk-SK/zotero/zotero.properties b/chrome/locale/sk-SK/zotero/zotero.properties index 945035cd712..0c0171e39af 100644 --- a/chrome/locale/sk-SK/zotero/zotero.properties +++ b/chrome/locale/sk-SK/zotero/zotero.properties @@ -501,9 +501,9 @@ itemTypes.encyclopediaArticle=Článok v encyklopédii itemTypes.dictionaryEntry=Heslo v slovníku itemTypes.preprint=Preprint itemTypes.dataset=Dataset -itemTypes.standard=Standard +itemTypes.standard=Štandard -itemFields.itemType=Typ +itemFields.itemType=Typ záznamu itemFields.title=Názov itemFields.dateAdded=Pridané itemFields.dateModified=Zmenené @@ -620,9 +620,10 @@ itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key itemFields.identifier=Identifier -itemFields.type=Type -itemFields.format=Format +itemFields.type=Druh rukopisu +itemFields.format=Formát itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=Autor @@ -855,7 +856,6 @@ searchConditions.tag=Značka searchConditions.note=Poznámka searchConditions.childNote=Vnorená poznámka searchConditions.creator=Autor -searchConditions.type=Typ searchConditions.thesisType=Druh záverečnej práce searchConditions.reportType=Druh výkazu searchConditions.videoRecordingFormat=Formát videonahrávky @@ -866,7 +866,6 @@ searchConditions.interviewMedium=Komunikačné médium searchConditions.manuscriptType=Druh rukopisu searchConditions.presentationType=Typ prezentácie searchConditions.mapType=Druh mapy -searchConditions.medium=Médium searchConditions.artworkMedium=Médium umeleckého diela searchConditions.dateModified=Dátum zmeny searchConditions.fulltextContent=Obsah prílohy diff --git a/chrome/locale/sl-SI/zotero/zotero.properties b/chrome/locale/sl-SI/zotero/zotero.properties index ef1e0ada141..3aa871ce635 100644 --- a/chrome/locale/sl-SI/zotero/zotero.properties +++ b/chrome/locale/sl-SI/zotero/zotero.properties @@ -501,9 +501,9 @@ itemTypes.encyclopediaArticle=Enciklopedični članek itemTypes.dictionaryEntry=Slovarski vnos itemTypes.preprint=Predobjava itemTypes.dataset=Dataset -itemTypes.standard=Standard +itemTypes.standard=Standardno -itemFields.itemType=Vrsta +itemFields.itemType=Vrsta vnosa itemFields.title=Naslov itemFields.dateAdded=Dodano dne itemFields.dateModified=Spremenjeno @@ -620,9 +620,10 @@ itemFields.repositoryLocation=Repo. Location itemFields.archiveID=ID arhiva itemFields.citationKey=Ključ citata itemFields.identifier=Identifier -itemFields.type=Type -itemFields.format=Format +itemFields.type=Vrsta +itemFields.format=Oblika itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=Avtor @@ -855,7 +856,6 @@ searchConditions.tag=Značka searchConditions.note=Opomba searchConditions.childNote=Podrejena opomba searchConditions.creator=Ustvaril -searchConditions.type=Vrsta searchConditions.thesisType=Vrsta teze searchConditions.reportType=Vrsta poročila searchConditions.videoRecordingFormat=Slikovni zapis posnetka @@ -866,7 +866,6 @@ searchConditions.interviewMedium=Medij intervjuja searchConditions.manuscriptType=Vrsta rokopisa searchConditions.presentationType=Vrsta predstavitve searchConditions.mapType=Vrsta zemljevida -searchConditions.medium=Medij searchConditions.artworkMedium=Medij umetnine searchConditions.dateModified=Datum spremembe searchConditions.fulltextContent=Vsebina priponke diff --git a/chrome/locale/sr-RS/zotero/zotero.properties b/chrome/locale/sr-RS/zotero/zotero.properties index 8f0ec82dde1..793e7a93b48 100644 --- a/chrome/locale/sr-RS/zotero/zotero.properties +++ b/chrome/locale/sr-RS/zotero/zotero.properties @@ -501,9 +501,9 @@ itemTypes.encyclopediaArticle=Чланак из енциклопедије itemTypes.dictionaryEntry=Унос из речника itemTypes.preprint=Preprint itemTypes.dataset=Dataset -itemTypes.standard=Standard +itemTypes.standard=Уобичајени -itemFields.itemType=Врста +itemFields.itemType=Врста ставке itemFields.title=Наслов itemFields.dateAdded=Датум додавања itemFields.dateModified=Датум измене @@ -620,9 +620,10 @@ itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key itemFields.identifier=Identifier -itemFields.type=Type -itemFields.format=Format +itemFields.type=Врста +itemFields.format=Формат itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=Аутор @@ -855,7 +856,6 @@ searchConditions.tag=Ознака searchConditions.note=Белешка searchConditions.childNote=Подбелешка searchConditions.creator=Стваралац -searchConditions.type=Врста searchConditions.thesisType=Врста тезе searchConditions.reportType=Врста извештаја searchConditions.videoRecordingFormat=Video Recording Format @@ -866,7 +866,6 @@ searchConditions.interviewMedium=Медијум разговора searchConditions.manuscriptType=Врста рукописа searchConditions.presentationType=Врста презентације searchConditions.mapType=Врста мапе -searchConditions.medium=Медијум searchConditions.artworkMedium=Медијум уметничког дела searchConditions.dateModified=Датум измене searchConditions.fulltextContent=Садржај прилога diff --git a/chrome/locale/sv-SE/zotero/zotero.properties b/chrome/locale/sv-SE/zotero/zotero.properties index fd72b763d92..889282e4c9a 100644 --- a/chrome/locale/sv-SE/zotero/zotero.properties +++ b/chrome/locale/sv-SE/zotero/zotero.properties @@ -503,7 +503,7 @@ itemTypes.preprint=Preprint itemTypes.dataset=Dataset itemTypes.standard=Standard -itemFields.itemType=Typ +itemFields.itemType=Källtyp itemFields.title=Titel itemFields.dateAdded=Tillagd den itemFields.dateModified=Ändrad den @@ -620,9 +620,10 @@ itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key itemFields.identifier=Identifier -itemFields.type=Type +itemFields.type=Typ itemFields.format=Format itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=Författare @@ -855,7 +856,6 @@ searchConditions.tag=Etikett searchConditions.note=Anteckning searchConditions.childNote=Underordnad anteckning searchConditions.creator=Skapare -searchConditions.type=Typ searchConditions.thesisType=Uppsatstyp searchConditions.reportType=Typ av rapport searchConditions.videoRecordingFormat=Videoformat @@ -866,7 +866,6 @@ searchConditions.interviewMedium=Intervjumedium searchConditions.manuscriptType=Typ av manuskript searchConditions.presentationType=Typ av presentation searchConditions.mapType=Typ av karta -searchConditions.medium=Media searchConditions.artworkMedium=Verkets medium searchConditions.dateModified=Ändrat datum searchConditions.fulltextContent=Bilagans innehåll diff --git a/chrome/locale/th-TH/zotero/zotero.properties b/chrome/locale/th-TH/zotero/zotero.properties index d29bfd4b3bf..4f15b467823 100644 --- a/chrome/locale/th-TH/zotero/zotero.properties +++ b/chrome/locale/th-TH/zotero/zotero.properties @@ -503,7 +503,7 @@ itemTypes.preprint=Preprint itemTypes.dataset=Dataset itemTypes.standard=Standard -itemFields.itemType=ประเภท +itemFields.itemType=ประเภทรายการ itemFields.title=ชื่อเรื่อง itemFields.dateAdded=วันที่เพิ่ม itemFields.dateModified=แก้ไข @@ -620,9 +620,10 @@ itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key itemFields.identifier=Identifier -itemFields.type=Type -itemFields.format=Format +itemFields.type=ประเภท +itemFields.format=รูปแบบ itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=ผู้แต่ง @@ -855,7 +856,6 @@ searchConditions.tag=แท็ก searchConditions.note=บันทึก searchConditions.childNote=บันทึกย่อย searchConditions.creator=ผู้สร้างสรรค์ -searchConditions.type=ประเภท searchConditions.thesisType=ระดับวิทยานิพนธ์ searchConditions.reportType=ประเภทรายงาน searchConditions.videoRecordingFormat=รูปแบบการบันทึกวีดิทัศน์ @@ -866,7 +866,6 @@ searchConditions.interviewMedium=สื่อสัมภาษณ์ searchConditions.manuscriptType=ประเภทต้นฉบับ searchConditions.presentationType=ประเภทการนำเสนอ searchConditions.mapType=ประเภทแผนที่ -searchConditions.medium=สื่อ searchConditions.artworkMedium=สื่ออาร์ตเวิร์ก searchConditions.dateModified=วันที่แก้ไข searchConditions.fulltextContent=เนื้อหาที่แนบ diff --git a/chrome/locale/tr-TR/zotero/zotero.properties b/chrome/locale/tr-TR/zotero/zotero.properties index a0268741530..d0f71f0e75c 100644 --- a/chrome/locale/tr-TR/zotero/zotero.properties +++ b/chrome/locale/tr-TR/zotero/zotero.properties @@ -500,10 +500,10 @@ itemTypes.document=Doküman itemTypes.encyclopediaArticle=Ansiklopedi Makalesi itemTypes.dictionaryEntry=Sözlük Girdisi itemTypes.preprint=Ön Baskı -itemTypes.dataset=Dataset -itemTypes.standard=Standard +itemTypes.dataset=Veri kümesi +itemTypes.standard=Standart -itemFields.itemType=Tür +itemFields.itemType=Eser Türü itemFields.title=Başlık itemFields.dateAdded=Eklendiği Tarih itemFields.dateModified=Değiştirme @@ -616,14 +616,15 @@ itemFields.genre=Çeşit itemFields.archive=Arşiv itemFields.attachmentPDF=PDF Eki itemFields.repository=Depo -itemFields.repositoryLocation=Repo. Location +itemFields.repositoryLocation=Arşiv/Depo Yeri itemFields.archiveID=Arşiv Kimlik Numarası itemFields.citationKey=Alıntı Anahtarı -itemFields.identifier=Identifier -itemFields.type=Type -itemFields.format=Format -itemFields.status=Status -itemFields.organization=Organization +itemFields.identifier=Tanımlayıcı +itemFields.type=Tür +itemFields.format=Biçim +itemFields.status=Durum +itemFields.authority=Authority +itemFields.organization=Kurum creatorTypes.author=Yazar creatorTypes.contributor=Katkıda Bulunan @@ -855,7 +856,6 @@ searchConditions.tag=Etiket searchConditions.note=Not searchConditions.childNote=Alt Not searchConditions.creator=Yaratan -searchConditions.type=Tür searchConditions.thesisType=Tez Türü searchConditions.reportType=Rapor Türü searchConditions.videoRecordingFormat=Video Kaydının Biçimi @@ -866,7 +866,6 @@ searchConditions.interviewMedium=Görüşme Ortamı searchConditions.manuscriptType=El yazması Türü searchConditions.presentationType=Sunum Türü searchConditions.mapType=Harita Türü -searchConditions.medium=Ortam searchConditions.artworkMedium=Sanat eseri Ortamı searchConditions.dateModified=Değiştirildiği Tarih searchConditions.fulltextContent=Ekin İçeriği diff --git a/chrome/locale/uk-UA/zotero/zotero.properties b/chrome/locale/uk-UA/zotero/zotero.properties index 6d46cc02a1e..48c7ac5c81b 100644 --- a/chrome/locale/uk-UA/zotero/zotero.properties +++ b/chrome/locale/uk-UA/zotero/zotero.properties @@ -501,9 +501,9 @@ itemTypes.encyclopediaArticle=Стаття з екциклопедії itemTypes.dictionaryEntry=Стаття зі словника itemTypes.preprint=Preprint itemTypes.dataset=Dataset -itemTypes.standard=Standard +itemTypes.standard=Стандарт -itemFields.itemType=Тип +itemFields.itemType=Тип документа itemFields.title=Назва itemFields.dateAdded=Дата додавання itemFields.dateModified=Дата зміни @@ -620,9 +620,10 @@ itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key itemFields.identifier=Identifier -itemFields.type=Type -itemFields.format=Format +itemFields.type=Тип +itemFields.format=Формат itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=Автор @@ -855,7 +856,6 @@ searchConditions.tag=Тег searchConditions.note=Примітка searchConditions.childNote=Дочірня примітка searchConditions.creator=Автор -searchConditions.type=Тип searchConditions.thesisType=Тип дисертації searchConditions.reportType=Тип звіту searchConditions.videoRecordingFormat=Формат відео @@ -866,7 +866,6 @@ searchConditions.interviewMedium=Засіб інтерв'ю searchConditions.manuscriptType=Тип рукопису searchConditions.presentationType=Тип презентації searchConditions.mapType=Тип карти -searchConditions.medium=Засіб searchConditions.artworkMedium=Художній засіб searchConditions.dateModified=Дата зміни searchConditions.fulltextContent=Зміст вкладення diff --git a/chrome/locale/vi-VN/zotero/zotero.properties b/chrome/locale/vi-VN/zotero/zotero.properties index eed3e267862..d69ba168c05 100644 --- a/chrome/locale/vi-VN/zotero/zotero.properties +++ b/chrome/locale/vi-VN/zotero/zotero.properties @@ -501,9 +501,9 @@ itemTypes.encyclopediaArticle=Bài viết trong Bách khoa toàn thư itemTypes.dictionaryEntry=Mục từ trong Từ điển itemTypes.preprint=Preprint itemTypes.dataset=Dataset -itemTypes.standard=Standard +itemTypes.standard=Chuẩn -itemFields.itemType=Kiểu +itemFields.itemType=Loại tham khảo itemFields.title=Nhan đề itemFields.dateAdded=Ngày Tạo lập itemFields.dateModified=Ngày Thay đổi @@ -620,9 +620,10 @@ itemFields.repositoryLocation=Repo. Location itemFields.archiveID=Archive ID itemFields.citationKey=Citation Key itemFields.identifier=Identifier -itemFields.type=Type -itemFields.format=Format +itemFields.type=Kiểu +itemFields.format=Định dạng itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=Tác giả @@ -855,7 +856,6 @@ searchConditions.tag=Thẻ searchConditions.note=Ghi chép searchConditions.childNote=Ghi chép con searchConditions.creator=Người tạo lập -searchConditions.type=Kiểu searchConditions.thesisType=Kiểu Luận văn searchConditions.reportType=Kiểu Phóng sự/Báo cáo searchConditions.videoRecordingFormat=Video Recording Format @@ -866,7 +866,6 @@ searchConditions.interviewMedium=Phương tiện Phỏng vấn searchConditions.manuscriptType=Kiểu Bản thảo searchConditions.presentationType=Kiểu Trình bày searchConditions.mapType=Kiểu Bản đồ -searchConditions.medium=Phương tiện searchConditions.artworkMedium=Chất liệu searchConditions.dateModified=Ngày Thay đổi searchConditions.fulltextContent=Nội dung Phần đính kèm diff --git a/chrome/locale/zh-CN/zotero/connector.json b/chrome/locale/zh-CN/zotero/connector.json index 1c977510b22..199364080cb 100644 --- a/chrome/locale/zh-CN/zotero/connector.json +++ b/chrome/locale/zh-CN/zotero/connector.json @@ -60,10 +60,10 @@ "message": "最新版本" }, "extensionIsDisabled": { - "message": "$1 處於停用狀態" + "message": "$1 已停用" }, "extensionIsDisabled_extensionPage": { - "message": "$1 在擴充套件頁面中處於停用狀態" + "message": "$1已于扩展页面中停用 " }, "appConnector": { "message": "$1 连接器" @@ -147,16 +147,16 @@ "message": "该引注已与 $1断开。您需要重新链接，否则参考文献表中的该引注不会更新或出现。" }, "copyUnproxiedLink": { - "message": "複製未經代理的連結" + "message": "复制未经代理的链接" }, "copyUnproxiedPageURL": { - "message": "複製未經代理的頁面URL" + "message": "复制未经代理的页面URL" }, "reloadViaProxy": { - "message": "利用代理重新載入" + "message": "通过代理重新加载" }, "reloadVia": { - "message": "利用 $1 重新載入" + "message": "通过$1 重新加载" }, "general_saveTo": { "message": "保存到 $1" diff --git a/chrome/locale/zh-CN/zotero/preferences.dtd b/chrome/locale/zh-CN/zotero/preferences.dtd index 92b00be359c..fa6ad9fa5b9 100644 --- a/chrome/locale/zh-CN/zotero/preferences.dtd +++ b/chrome/locale/zh-CN/zotero/preferences.dtd @@ -26,10 +26,10 @@ - - - - + + + + diff --git a/chrome/locale/zh-CN/zotero/zotero.properties b/chrome/locale/zh-CN/zotero/zotero.properties index 75221a52fb5..4fec22d9eea 100644 --- a/chrome/locale/zh-CN/zotero/zotero.properties +++ b/chrome/locale/zh-CN/zotero/zotero.properties @@ -501,9 +501,9 @@ itemTypes.encyclopediaArticle=百科条目 itemTypes.dictionaryEntry=词条 itemTypes.preprint=预印本 itemTypes.dataset=Dataset -itemTypes.standard=Standard +itemTypes.standard=标准 -itemFields.itemType=类型 +itemFields.itemType=条目类型 itemFields.title=标题 itemFields.dateAdded=添加日期 itemFields.dateModified=修改日期 @@ -620,9 +620,10 @@ itemFields.repositoryLocation=Repo. Location itemFields.archiveID=存档ID itemFields.citationKey=引用关键词 itemFields.identifier=Identifier -itemFields.type=Type -itemFields.format=Format +itemFields.type=演稿类型 +itemFields.format=音频格式 itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=作者 @@ -855,7 +856,6 @@ searchConditions.tag=标签 searchConditions.note=笔记 searchConditions.childNote=子笔记 searchConditions.creator=创建者 -searchConditions.type=类型 searchConditions.thesisType=论文类型 searchConditions.reportType=报告类型 searchConditions.videoRecordingFormat=视频格式 @@ -866,7 +866,6 @@ searchConditions.interviewMedium=采访媒体 searchConditions.manuscriptType=手稿类型 searchConditions.presentationType=演稿类型 searchConditions.mapType=地图类型 -searchConditions.medium=媒体 searchConditions.artworkMedium=艺术品媒介 searchConditions.dateModified=修改日期 searchConditions.fulltextContent=附件内容 diff --git a/chrome/locale/zh-TW/zotero/zotero.properties b/chrome/locale/zh-TW/zotero/zotero.properties index bf1d2917471..06b07a083c3 100644 --- a/chrome/locale/zh-TW/zotero/zotero.properties +++ b/chrome/locale/zh-TW/zotero/zotero.properties @@ -501,9 +501,9 @@ itemTypes.encyclopediaArticle=百科全書文章 itemTypes.dictionaryEntry=字典條目 itemTypes.preprint=預印本 itemTypes.dataset=Dataset -itemTypes.standard=Standard +itemTypes.standard=標準 -itemFields.itemType=類型 +itemFields.itemType=項目類型 itemFields.title=標題 itemFields.dateAdded=加入日期 itemFields.dateModified=修改日期 @@ -620,9 +620,10 @@ itemFields.repositoryLocation=Repo. Location itemFields.archiveID=存檔 ID itemFields.citationKey=引用關鍵詞 itemFields.identifier=Identifier -itemFields.type=Type -itemFields.format=Format +itemFields.type=類型 +itemFields.format=格式 itemFields.status=Status +itemFields.authority=Authority itemFields.organization=Organization creatorTypes.author=作者 @@ -855,7 +856,6 @@ searchConditions.tag=標籤 searchConditions.note=筆記 searchConditions.childNote=子筆記 searchConditions.creator=作者 -searchConditions.type=類型 searchConditions.thesisType=學位論文類 searchConditions.reportType=報告類 searchConditions.videoRecordingFormat=影音格式 @@ -866,7 +866,6 @@ searchConditions.interviewMedium=訪談媒介類 searchConditions.manuscriptType=手稿類 searchConditions.presentationType=簡報類 searchConditions.mapType=地圖類 -searchConditions.medium=媒介 searchConditions.artworkMedium=藝術作品媒介類 searchConditions.dateModified=修改日期 searchConditions.fulltextContent=附件內容 @@ -965,7 +964,7 @@ integration.error.misconfiguredWordStartupFolder.all=%S 無法安裝Word外掛 integration.error.misconfiguredWordStartupFolder.fix=在將"啟動"資料夾重置為預設位置之前，該外掛可能不會顯示在Word中。 integration.error.macWordSBPermissionsMissing.title=缺少權限 integration.error.macWordSBPermissionsMissing=Zotero沒有權限控制Word。授予此權限需要：\n\n1) 打開系統設定\n2) 選擇左側欄位中的 “安全與隱私”\n3) 選擇“自動化”\n4) 找到"Zotero"並點選箭頭來展開它\n5) 確保“Zotero”下的“Microsoft Word”是啟用狀態\n6) 重新啟動Word -integration.error.macWordSBPermissionsMissing.pre2016=如果 “Microsoft Word” 未在 “自動化" 下出現，確保您在執行 Word 2011 14.7.7 或更高版本。 +integration.error.macWordSBPermissionsMissing.pre2016=如果 “Microsoft Word” 未在 “自動化” 下出現，確保您在執行 Word 2011 14.7.7 或更高版本。 integration.error.m1UpgradeOS.title=需要升級 macOS 系統 integration.error.m1UpgradeOS=不支援在安裝 macOS 11.3 或更早版本的 Apple Silicon Mac 上的 Word 中作引用，這可能會導致 %S 凍結。 請升級到 macOS 11.4 或更新的版本。 integration.error.viewTroubleshootingInfo=您要查看故障排除說明嗎？ diff --git a/resource/schema/global b/resource/schema/global index d04a141cc7f..7c2739b6652 160000 --- a/resource/schema/global +++ b/resource/schema/global @@ -1 +1 @@ -Subproject commit d04a141cc7f394909fa3d7ded29c2906c43b10b9 +Subproject commit 7c2739b6652057bbd4481ed2871962a0be695ace From 3cb5837bc6fa74411dfcf9253f6a450d5dba9525 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sun, 2 Apr 2023 03:56:16 -0400 Subject: [PATCH 25/86] Update styles and translators --- styles | 2 +- translators | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/styles b/styles index b9bfcf01849..1a293a84285 160000 --- a/styles +++ b/styles @@ -1 +1 @@ -Subproject commit b9bfcf01849735ba643fd645d9c8e801aca78475 +Subproject commit 1a293a84285ffae2e85476d8a4e90118fc15602d diff --git a/translators b/translators index 5dcd1bc6fac..a55c0fecbd2 160000 --- a/translators +++ b/translators @@ -1 +1 @@ -Subproject commit 5dcd1bc6fac814b7d9ad00a646ee8a9fc564fcd7 +Subproject commit a55c0fecbd2259956c7fff34f347116479e52b0a From 85c35a2270f42966b20590aed048278dd1119357 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sun, 2 Apr 2023 18:41:30 -0400 Subject: [PATCH 26/86] Update global schema --- resource/schema/global | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resource/schema/global b/resource/schema/global index 7c2739b6652..880f432314a 160000 --- a/resource/schema/global +++ b/resource/schema/global @@ -1 +1 @@ -Subproject commit 7c2739b6652057bbd4481ed2871962a0be695ace +Subproject commit 880f432314a60952c4454975dbc7549a4e58e559 From db99d4cfe1073a9c5cdaf3f017325eb3023a99df Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sun, 2 Apr 2023 19:04:15 -0400 Subject: [PATCH 27/86] Update utilities submodule --- chrome/content/zotero/xpcom/utilities | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/content/zotero/xpcom/utilities b/chrome/content/zotero/xpcom/utilities index 4d8d7d3e92c..dfaa41f1b43 160000 --- a/chrome/content/zotero/xpcom/utilities +++ b/chrome/content/zotero/xpcom/utilities @@ -1 +1 @@ -Subproject commit 4d8d7d3e92cbc3b4d62b82478e212a6f63b9a35f +Subproject commit dfaa41f1b433b1a741427d4b69905e0c71558596 From 2e4fed4000ae0deab709d307542826621dc4ac7d Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sun, 2 Apr 2023 19:12:17 -0400 Subject: [PATCH 28/86] Update global schema and utilities --- chrome/content/zotero/xpcom/utilities | 2 +- resource/schema/global | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chrome/content/zotero/xpcom/utilities b/chrome/content/zotero/xpcom/utilities index dfaa41f1b43..b93f16dba48 160000 --- a/chrome/content/zotero/xpcom/utilities +++ b/chrome/content/zotero/xpcom/utilities @@ -1 +1 @@ -Subproject commit dfaa41f1b433b1a741427d4b69905e0c71558596 +Subproject commit b93f16dba483891c0ab4627cbaa303de5c7fa0c0 diff --git a/resource/schema/global b/resource/schema/global index 880f432314a..46feab5ce7e 160000 --- a/resource/schema/global +++ b/resource/schema/global @@ -1 +1 @@ -Subproject commit 880f432314a60952c4454975dbc7549a4e58e559 +Subproject commit 46feab5ce7eed164fe56127428f5ffb25a02cf0f From 49b08df0dd4375202238eb51b3e70a7cfe691916 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Mon, 3 Apr 2023 00:40:37 -0400 Subject: [PATCH 29/86] Update test sample data for `authority`/`legislativeBody` base mapping --- test/tests/data/allTypesAndFields.js | 2 +- test/tests/data/itemJSON.js | 2 +- test/tests/data/translatorExport.js | 2 +- test/tests/data/translatorExportLegacy.js | 5 +++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/test/tests/data/allTypesAndFields.js b/test/tests/data/allTypesAndFields.js index 5b206655bc0..1029c88fe16 100644 --- a/test/tests/data/allTypesAndFields.js +++ b/test/tests/data/allTypesAndFields.js @@ -88,6 +88,7 @@ "bill": { "abstractNote": "Abstract note", "accessDate": "1997-06-13T23:59:58Z", + "authority": "Authority", "code": "Code", "creators": [ { @@ -116,7 +117,6 @@ "history": "History", "itemType": "bill", "language": "en-US", - "legislativeBody": "Legislative body", "number": 3, "pages": "1-10", "rights": "Rights", diff --git a/test/tests/data/itemJSON.js b/test/tests/data/itemJSON.js index e8c766d2317..16637f8fd10 100644 --- a/test/tests/data/itemJSON.js +++ b/test/tests/data/itemJSON.js @@ -134,7 +134,7 @@ "itemType": "bill", "key": "6V75C9MH", "language": "en-US", - "legislativeBody": "Legislative body", + "legislativeBody": "Authority", "relations": {}, "rights": "Rights", "section": "Section", diff --git a/test/tests/data/translatorExport.js b/test/tests/data/translatorExport.js index 1f44ee81426..781cdbf3870 100644 --- a/test/tests/data/translatorExport.js +++ b/test/tests/data/translatorExport.js @@ -138,7 +138,7 @@ "history": "History", "itemType": "bill", "language": "en-US", - "legislativeBody": "Legislative body", + "legislativeBody": "Authority", "notes": [], "relations": {}, "rights": "Rights", diff --git a/test/tests/data/translatorExportLegacy.js b/test/tests/data/translatorExportLegacy.js index 4843eb763d9..d830a0ac653 100644 --- a/test/tests/data/translatorExportLegacy.js +++ b/test/tests/data/translatorExportLegacy.js @@ -156,6 +156,7 @@ "abstractNote": "Abstract note", "accessDate": "1997-06-13 23:59:58", "attachments": [], + "authority": "Authority", "billNumber": "3", "code": "Code", "codePages": "1-10", @@ -192,7 +193,7 @@ "itemType": "bill", "key": "XHEAETDQ", "language": "en-US", - "legislativeBody": "Legislative body", + "legislativeBody": "Authority", "libraryID": null, "notes": [], "number": "3", @@ -208,12 +209,12 @@ "uniqueFields": { "abstractNote": "Abstract note", "accessDate": "1997-06-13 23:59:58", + "authority": "Authority", "code": "Code", "date": "1999-12-31", "extra": "Extra", "history": "History", "language": "en-US", - "legislativeBody": "Legislative body", "number": "3", "pages": "1-10", "rights": "Rights", From a66db9b52b86536db9ffddd675ff9fdfb2faaea6 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Mon, 3 Apr 2023 01:10:03 -0400 Subject: [PATCH 30/86] Update connectorTypeSchemaData.js for Dataset and Standard --- resource/schema/connectorTypeSchemaData.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resource/schema/connectorTypeSchemaData.js b/resource/schema/connectorTypeSchemaData.js index 9d03335993c..709d4930df0 100644 --- a/resource/schema/connectorTypeSchemaData.js +++ b/resource/schema/connectorTypeSchemaData.js @@ -1 +1 @@ -Zotero.Connector_Types.schema = {"itemTypes":{"1":["annotation","Annotation",[false],[],{},"treeitem@2x.png"],"2":["artwork","Artwork",[1,2],[1,2,3,5,6,7,8,9,10,11,12,13,14,15,16],{"3":4},"treeitem-artwork@2x.png"],"3":["attachment","Attachment",[false],[1,14,13],{},"treeitem@2x.png"],"4":["audioRecording","Audio Recording",[3,4,2,5],[1,2,17,18,19,20,21,22,6,24,7,25,8,9,10,11,12,13,14,15,16],{"17":4,"22":23},"treeitem-audioRecording@2x.png"],"5":["bill","Bill",[6,2,7],[1,2,26,28,29,30,31,33,34,35,6,7,13,14,8,15,16],{"26":27,"29":19,"31":32},"treeitem-bill@2x.png"],"6":["blogPost","Blog Post",[8,9,2],[1,2,36,38,6,13,14,7,8,15,16],{"36":37,"38":39},"treeitem-blogPost@2x.png"],"7":["book","Book",[8,2,10,12,11],[1,2,40,41,19,20,42,21,23,6,43,7,25,8,13,14,9,10,11,12,15,16],{},"treeitem-book@2x.png"],"8":["bookSection","Book Section",[8,13,2,10,12,11],[1,2,44,40,41,19,20,42,21,23,6,32,7,25,8,13,14,9,10,11,12,15,16],{"44":37},"treeitem-bookSection@2x.png"],"9":["case","Case",[8,2,14],[45,2,46,47,48,49,50,51,35,7,8,13,14,15,16],{"45":1,"47":6,"48":27,"50":19,"51":32},"treeitem-case@2x.png"],"10":["computerProgram","Software",[15,2],[1,2,18,52,6,53,21,54,55,25,8,13,15,9,10,11,12,14,16],{"54":23},"treeitem-computerProgram@2x.png"],"11":["conferencePaper","Conference Paper",[8,2,10,12,11],[1,2,6,56,57,21,23,19,32,40,7,58,25,8,13,14,9,10,11,12,15,16],{"56":37},"treeitem-conferencePaper@2x.png"],"12":["dictionaryEntry","Dictionary Entry",[8,2,10,12,11],[1,2,59,40,41,19,20,42,21,23,6,32,7,25,8,13,14,9,10,11,12,15,16],{"59":37},"treeitem-dictionaryEntry@2x.png"],"13":["document","Document",[8,2,10,16,11],[1,2,23,6,7,8,13,14,9,10,11,12,15,16],{},"treeitem@2x.png"],"14":["email","E-mail",[8,2,17],[60,2,6,8,13,14,7,15,16],{"60":1},"treeitem-email@2x.png"],"15":["encyclopediaArticle","Encyclopedia Article",[8,2,10,12,11],[1,2,61,40,41,19,20,42,21,23,6,32,25,8,13,14,7,9,10,11,12,15,16],{"61":37},"treeitem-encyclopediaArticle@2x.png"],"16":["film","Film",[18,2,20,19],[1,2,62,6,63,64,24,7,8,13,14,9,10,11,12,15,16],{"62":23,"63":39,"64":4},"treeitem-film@2x.png"],"17":["forumPost","Forum Post",[8,2],[1,2,65,66,6,7,8,13,14,15,16],{"65":37,"66":39},"treeitem-forumPost@2x.png"],"18":["hearing","Hearing",[2],[1,2,67,21,23,20,68,32,33,34,35,6,7,8,13,14,15,16],{"68":27},"treeitem-hearing@2x.png"],"19":["instantMessage","Instant Message",[8,2,17],[1,2,6,7,8,13,14,15,16],{},"treeitem-instantMessage@2x.png"],"20":["interview","Interview",[21,2,22,11],[1,2,6,69,7,8,13,14,9,10,11,12,15,16],{"69":4},"treeitem-interview@2x.png"],"21":["journalArticle","Journal Article",[8,2,10,16,11],[1,2,37,19,70,32,6,40,18,71,72,7,58,73,8,13,14,9,10,11,12,15,16],{},"treeitem-journalArticle@2x.png"],"22":["letter","Letter",[8,2,17],[1,2,74,6,7,8,13,14,9,10,11,12,15,16],{"74":39},"treeitem-letter@2x.png"],"23":["magazineArticle","Magazine Article",[8,2,16,11],[1,2,37,19,70,6,32,7,73,8,13,14,9,10,11,12,15,16],{},"treeitem-magazineArticle@2x.png"],"24":["manuscript","Manuscript",[8,2,11],[1,2,75,21,6,43,7,8,13,14,9,10,11,12,15,16],{"75":39},"treeitem-manuscript@2x.png"],"25":["map","Map",[23,2,12],[1,2,76,77,18,42,21,23,6,7,25,8,13,14,9,10,11,12,15,16],{"76":39},"treeitem-map.png"],"26":["newspaperArticle","Newspaper Article",[8,2,16,11],[1,2,37,21,42,6,30,32,7,8,73,13,14,9,10,11,12,15,16],{},"treeitem-newspaperArticle@2x.png"],"27":["note","Note",[false],[],{},"treeitem-note@2x.png"],"28":["patent","Patent",[24,25,2],[1,2,21,78,79,80,81,82,32,83,84,85,86,87,7,8,13,14,15,16],{"81":27,"85":6},"treeitem-patent@2x.png"],"29":["podcast","Podcast",[26,2,27],[1,2,18,88,89,24,13,14,7,8,15,16],{"88":27,"89":4},"treeitem-podcast.png"],"30":["preprint","Preprint",[8,2,10,16,11],[1,2,63,90,91,21,6,40,41,58,92,13,14,9,10,8,7,11,12,15,16],{"63":39,"90":23},"treeitem-preprint@2x.png"],"31":["presentation","Presentation",[28,2],[1,2,93,6,21,94,13,14,7,8,15,16],{"93":39},"treeitem-presentation@2x.png"],"32":["radioBroadcast","Radio Broadcast",[18,29,2,27,20,19],[1,2,95,88,17,21,96,6,24,7,8,13,14,9,10,11,12,15,16],{"17":4,"88":27,"95":37,"96":23},"treeitem-radioBroadcast.png"],"33":["report","Report",[8,2,12,11],[1,2,97,98,18,21,99,6,32,7,8,13,14,9,10,11,12,15,16],{"97":27,"98":39,"99":23},"treeitem-report@2x.png"],"34":["statute","Statute",[8,2],[100,2,28,101,102,103,32,30,34,35,7,8,13,14,15,16],{"100":1,"102":27,"103":6},"treeitem-statute@2x.png"],"35":["thesis","Thesis",[8,2],[1,2,104,105,21,6,43,7,8,13,14,9,10,11,12,15,16],{"104":39,"105":23},"treeitem-thesis@2x.png"],"36":["tvBroadcast","TV Broadcast",[18,29,2,27,20,19],[1,2,95,88,64,21,96,6,24,7,8,13,14,9,10,11,12,15,16],{"64":4,"88":27,"95":37,"96":23},"treeitem-tvBroadcast.png"],"37":["videoRecording","Video Recording",[18,29,2,20,19],[1,2,64,18,19,20,21,106,6,24,7,25,8,13,14,9,10,11,12,15,16],{"64":4,"106":23},"treeitem-videoRecording.png"],"38":["webpage","Web Page",[8,2,11],[1,2,107,38,6,8,13,14,7,15,16],{"38":39,"107":37},"treeitem-webpage@2x.png"]},"creatorTypes":{"1":["artist","Artist"],"2":["contributor","Contributor"],"3":["performer","Performer"],"4":["composer","Composer"],"5":["wordsBy","Words By"],"6":["sponsor","Sponsor"],"7":["cosponsor","Cosponsor"],"8":["author","Author"],"9":["commenter","Commenter"],"10":["editor","Editor"],"11":["translator","Translator"],"12":["seriesEditor","Series Editor"],"13":["bookAuthor","Book Author"],"14":["counsel","Counsel"],"15":["programmer","Programmer"],"16":["reviewedAuthor","Reviewed Author"],"17":["recipient","Recipient"],"18":["director","Director"],"19":["scriptwriter","Scriptwriter"],"20":["producer","Producer"],"21":["interviewee","Interview With"],"22":["interviewer","Interviewer"],"23":["cartographer","Cartographer"],"24":["inventor","Inventor"],"25":["attorneyAgent","Attorney/Agent"],"26":["podcaster","Podcaster"],"27":["guest","Guest"],"28":["presenter","Presenter"],"29":["castMember","Cast Member"]},"fields":{"1":["title","title",true],"2":["abstractNote","abstractNote",true],"3":["artworkMedium","artworkMedium",false],"4":["medium","medium",true],"5":["artworkSize","artworkSize",true],"6":["date","date",true],"7":["language","language",true],"8":["shortTitle","shortTitle",true],"9":["archive","archive",true],"10":["archiveLocation","archiveLocation",true],"11":["libraryCatalog","libraryCatalog",true],"12":["callNumber","callNumber",true],"13":["url","url",true],"14":["accessDate","accessDate",true],"15":["rights","rights",true],"16":["extra","extra",true],"17":["audioRecordingFormat","audioRecordingFormat",false],"18":["seriesTitle","seriesTitle",true],"19":["volume","volume",true],"20":["numberOfVolumes","numberOfVolumes",true],"21":["place","place",true],"22":["label","label",false],"23":["publisher","publisher",true],"24":["runningTime","runningTime",true],"25":["ISBN","ISBN",true],"26":["billNumber","billNumber",false],"27":["number","number",true],"28":["code","code",true],"29":["codeVolume","codeVolume",false],"30":["section","section",true],"31":["codePages","codePages",false],"32":["pages","pages",true],"33":["legislativeBody","legislativeBody",true],"34":["session","session",true],"35":["history","history",true],"36":["blogTitle","blogTitle",false],"37":["publicationTitle","publicationTitle",true],"38":["websiteType","websiteType",false],"39":["type","type",true],"40":["series","series",true],"41":["seriesNumber","seriesNumber",true],"42":["edition","edition",true],"43":["numPages","numPages",true],"44":["bookTitle","bookTitle",false],"45":["caseName","caseName",false],"46":["court","court",true],"47":["dateDecided","dateDecided",false],"48":["docketNumber","docketNumber",false],"49":["reporter","reporter",true],"50":["reporterVolume","reporterVolume",false],"51":["firstPage","firstPage",false],"52":["versionNumber","versionNumber",true],"53":["system","system",true],"54":["company","company",false],"55":["programmingLanguage","programmingLanguage",true],"56":["proceedingsTitle","proceedingsTitle",false],"57":["conferenceName","conferenceName",true],"58":["DOI","DOI",true],"59":["dictionaryTitle","dictionaryTitle",false],"60":["subject","subject",false],"61":["encyclopediaTitle","encyclopediaTitle",false],"62":["distributor","distributor",false],"63":["genre","genre",false],"64":["videoRecordingFormat","videoRecordingFormat",false],"65":["forumTitle","forumTitle",false],"66":["postType","postType",false],"67":["committee","committee",true],"68":["documentNumber","documentNumber",false],"69":["interviewMedium","interviewMedium",false],"70":["issue","issue",true],"71":["seriesText","seriesText",true],"72":["journalAbbreviation","journalAbbreviation",true],"73":["ISSN","ISSN",true],"74":["letterType","letterType",false],"75":["manuscriptType","manuscriptType",false],"76":["mapType","mapType",false],"77":["scale","scale",true],"78":["country","country",true],"79":["assignee","assignee",true],"80":["issuingAuthority","issuingAuthority",true],"81":["patentNumber","patentNumber",false],"82":["filingDate","filingDate",true],"83":["applicationNumber","applicationNumber",true],"84":["priorityNumbers","priorityNumbers",true],"85":["issueDate","issueDate",false],"86":["references","references",true],"87":["legalStatus","legalStatus",true],"88":["episodeNumber","episodeNumber",false],"89":["audioFileType","audioFileType",false],"90":["repository","repository",false],"91":["archiveID","archiveID",true],"92":["citationKey","citationKey",true],"93":["presentationType","presentationType",false],"94":["meetingName","meetingName",true],"95":["programTitle","programTitle",false],"96":["network","network",false],"97":["reportNumber","reportNumber",false],"98":["reportType","reportType",false],"99":["institution","institution",false],"100":["nameOfAct","nameOfAct",false],"101":["codeNumber","codeNumber",true],"102":["publicLawNumber","publicLawNumber",false],"103":["dateEnacted","dateEnacted",false],"104":["thesisType","thesisType",false],"105":["university","university",false],"106":["studio","studio",false],"107":["websiteTitle","websiteTitle",false]}} \ No newline at end of file +Zotero.Connector_Types.schema = {"itemTypes":{"1":["note","Note",[false],[],{},"treeitem-note.png"],"2":["book","Book",[1,2,3,5,4],[110,90,3,30,4,45,6,7,8,14,118,87,11,116,1,27,123,19,62,18,2,22],{},"treeitem-book.png"],"3":["bookSection","Book Section",[1,29,2,3,5,4],[110,90,115,3,30,4,45,6,7,8,14,10,87,11,116,1,27,123,19,62,18,2,22],{"115":12},"treeitem-bookSection.png"],"4":["journalArticle","Journal Article",[1,2,3,27,4],[110,90,12,4,5,10,14,3,28,29,25,87,26,13,116,1,27,123,19,62,18,2,22],{},"treeitem-journalArticle.png"],"5":["magazineArticle","Magazine Article",[1,2,27,4],[110,90,12,4,5,14,10,87,13,116,1,27,123,19,62,18,2,22],{},"treeitem-magazineArticle.png"],"6":["newspaperArticle","Newspaper Article",[1,2,27,4],[110,90,12,7,6,14,15,10,87,116,13,1,27,123,19,62,18,2,22],{},"treeitem-newspaperArticle.png"],"7":["thesis","Thesis",[1,2],[110,90,69,89,7,14,118,87,116,1,27,123,19,62,18,2,22],{"69":108,"89":8},"treeitem-thesis.png"],"8":["letter","Letter",[1,2,16],[110,90,65,14,87,116,1,27,123,19,62,18,2,22],{"65":108},"treeitem-letter.png"],"9":["manuscript","Manuscript",[1,2,4],[110,90,66,7,14,118,87,116,1,27,123,19,62,18,2,22],{"66":108},"treeitem-manuscript.png"],"10":["interview","Interview",[6,2,7,4],[110,90,14,64,87,116,1,27,123,19,62,18,2,22],{"64":109},"treeitem-interview.png"],"11":["film","Film",[8,2,10,9],[110,90,21,14,122,63,77,87,116,1,27,123,19,62,18,2,22],{"21":8,"63":109,"122":108},"treeitem-film.png"],"12":["artwork","Artwork",[22,2],[110,90,59,61,14,87,116,123,19,62,18,1,27,2,22],{"59":109},"treeitem-artwork.png"],"13":["webpage","Web Page",[1,2,4],[110,90,91,70,14,116,1,27,87,2,22],{"70":108,"91":12},"treeitem-webpage.png"],"14":["attachment","Attachment",[false],[110,27,1],{},"treeitem.png"],"15":["report","Report",[1,2,5,4],[110,90,92,32,28,7,31,14,10,87,116,1,27,123,19,62,18,2,22],{"31":8,"32":108,"92":60},"treeitem-report.png"],"16":["bill","Bill",[12,2,28],[110,90,93,36,94,15,95,41,40,42,14,87,1,27,116,2,22],{"41":127,"93":60,"94":4,"95":10},"treeitem-bill.png"],"17":["case","Case",[1,2,13],[111,90,44,96,117,43,97,98,42,87,116,1,27,2,22],{"44":127,"96":14,"97":4,"98":10,"111":110,"117":60},"treeitem-case.png"],"18":["hearing","Hearing",[2],[110,90,46,7,8,45,99,10,41,40,42,14,87,116,1,27,2,22],{"41":127,"99":60},"treeitem-hearing.png"],"19":["patent","Patent",[14,15,2],[110,90,7,102,48,120,50,121,10,103,51,52,53,54,87,116,1,27,2,22],{"50":60,"52":14,"54":131,"120":127},"treeitem-patent.png"],"20":["statute","Statute",[1,2],[112,90,36,55,101,100,10,15,40,42,87,116,1,27,2,22],{"100":14,"101":60,"112":110},"treeitem-statute.png"],"21":["email","E-mail",[1,2,16],[113,90,14,116,1,27,87,2,22],{"113":110},"treeitem-email.png"],"22":["map","Map",[20,2,5],[110,90,67,68,28,6,7,8,14,87,11,116,1,27,123,19,62,18,2,22],{"67":108},"treeitem-map.png"],"23":["blogPost","Blog Post",[1,23,2],[110,90,107,70,14,1,27,87,116,2,22],{"70":108,"107":12},"treeitem-blogPost.png"],"24":["instantMessage","Instant Message",[1,2,16],[110,90,14,87,116,1,27,2,22],{},"treeitem-instantMessage.png"],"25":["forumPost","Forum Post",[1,2],[110,90,104,79,14,87,116,1,27,2,22],{"79":108,"104":12},"treeitem-forumPost.png"],"26":["audioRecording","Audio Recording",[17,18,2,19],[110,90,71,28,4,45,7,72,14,77,87,11,116,123,19,62,18,1,27,2,22],{"71":109,"72":8},"treeitem-audioRecording.png"],"27":["presentation","Presentation",[24,2],[110,90,74,14,7,75,1,27,87,116,2,22],{"74":108},"treeitem-presentation.png"],"28":["videoRecording","Video Recording",[8,11,2,10,9],[110,90,63,28,4,45,7,76,14,77,87,11,116,1,27,123,19,62,18,2,22],{"63":109,"76":8},"treeitem-videoRecording.png"],"29":["tvBroadcast","TV Broadcast",[8,11,2,25,10,9],[110,90,119,105,63,7,78,14,77,87,116,1,27,123,19,62,18,2,22],{"63":109,"78":8,"105":60,"119":12},"treeitem-tvBroadcast.png"],"30":["radioBroadcast","Radio Broadcast",[8,11,2,25,10,9],[110,90,119,105,71,7,78,14,77,87,116,1,27,123,19,62,18,2,22],{"71":109,"78":8,"105":60,"119":12},"treeitem-radioBroadcast.png"],"31":["podcast","Podcast",[26,2,25],[110,90,28,105,80,77,1,27,87,116,2,22],{"80":109,"105":60},"treeitem-podcast.png"],"32":["computerProgram","Software",[21,2],[110,90,28,81,14,82,7,83,88,11,116,1,2,123,19,62,18,27,22],{"83":8},"treeitem-computerProgram.png"],"33":["conferencePaper","Conference Paper",[1,2,3,5,4],[110,90,14,114,84,7,8,4,10,3,87,26,11,116,1,27,123,19,62,18,2,22],{"114":12},"treeitem-conferencePaper.png"],"34":["document","Document",[1,2,3,27,4],[110,90,8,14,87,116,1,27,123,19,62,18,2,22],{},"treeitem.png"],"35":["encyclopediaArticle","Encyclopedia Article",[1,2,3,5,4],[110,90,85,3,30,4,45,6,7,8,14,10,11,116,1,27,87,123,19,62,18,2,22],{"85":12},"treeitem-encyclopediaArticle.png"],"36":["dictionaryEntry","Dictionary Entry",[1,2,3,5,4],[110,90,86,3,30,4,45,6,7,8,14,10,87,11,116,1,27,123,19,62,18,2,22],{"86":12},"treeitem-dictionaryEntry.png"],"37":["annotation","Annotation",[false],[],{},"treeitem.png"],"38":["preprint","Preprint",[1,2,3,27,4],[110,90,122,124,125,7,14,3,30,26,126,1,27,123,19,116,87,62,18,2,22],{"122":108,"124":8,"125":60},"treeitem-preprint.png"],"39":["dataset","Dataset",[1,2],[110,90,128,108,60,81,14,124,129,130,26,126,1,27,123,19,116,87,62,18,2,22],{"124":8,"128":60,"129":7,"130":109},"treeitem-dataset.png"],"40":["standard","Standard",[1,2],[110,90,132,46,108,60,81,131,14,8,7,26,126,1,27,123,19,116,118,87,62,18,2,22],{"132":127},"treeitem-standard.png"],"10001":["nsfReviewer","NSF Reviewer",[false],[10001,31,10002,10003,10004,10005,10006,10007,10008,10009,10010,10011],{"31":false,"10001":110,"10005":1,"10008":14},"report_user.png"]},"creatorTypes":{"1":["author","Author"],"2":["contributor","Contributor"],"3":["editor","Editor"],"4":["translator","Translator"],"5":["seriesEditor","Series Editor"],"6":["interviewee","Interview With"],"7":["interviewer","Interviewer"],"8":["director","Director"],"9":["scriptwriter","Scriptwriter"],"10":["producer","Producer"],"11":["castMember","Cast Member"],"12":["sponsor","Sponsor"],"13":["counsel","Counsel"],"14":["inventor","Inventor"],"15":["attorneyAgent","Attorney/Agent"],"16":["recipient","Recipient"],"17":["performer","Performer"],"18":["composer","Composer"],"19":["wordsBy","Words By"],"20":["cartographer","Cartographer"],"21":["programmer","Programmer"],"22":["artist","Artist"],"23":["commenter","Commenter"],"24":["presenter","Presenter"],"25":["guest","Guest"],"26":["podcaster","Podcaster"],"27":["reviewedAuthor","Reviewed Author"],"28":["cosponsor","Cosponsor"],"29":["bookAuthor","Book Author"]},"fields":{"1":["url","url",true],"2":["rights","rights",true],"3":["series","series",true],"4":["volume","volume",true],"5":["issue","issue",true],"6":["edition","edition",true],"7":["place","place",true],"8":["publisher","publisher",true],"10":["pages","pages",true],"11":["ISBN","ISBN",true],"12":["publicationTitle","publicationTitle",true],"13":["ISSN","ISSN",true],"14":["date","date",true],"15":["section","section",true],"18":["callNumber","callNumber",true],"19":["archiveLocation","archiveLocation",true],"21":["distributor","distributor",false],"22":["extra","extra",true],"25":["journalAbbreviation","journalAbbreviation",true],"26":["DOI","DOI",true],"27":["accessDate","accessDate",true],"28":["seriesTitle","seriesTitle",true],"29":["seriesText","seriesText",true],"30":["seriesNumber","seriesNumber",true],"31":["institution","institution",false],"32":["reportType","reportType",false],"36":["code","code",true],"40":["session","session",true],"41":["legislativeBody","legislativeBody",false],"42":["history","history",true],"43":["reporter","reporter",true],"44":["court","court",false],"45":["numberOfVolumes","numberOfVolumes",true],"46":["committee","committee",true],"48":["assignee","assignee",true],"50":["patentNumber","patentNumber",false],"51":["priorityNumbers","priorityNumbers",true],"52":["issueDate","issueDate",false],"53":["references","references",true],"54":["legalStatus","legalStatus",false],"55":["codeNumber","codeNumber",true],"59":["artworkMedium","artworkMedium",false],"60":["number","number",true],"61":["artworkSize","artworkSize",true],"62":["libraryCatalog","libraryCatalog",true],"63":["videoRecordingFormat","videoRecordingFormat",false],"64":["interviewMedium","interviewMedium",false],"65":["letterType","letterType",false],"66":["manuscriptType","manuscriptType",false],"67":["mapType","mapType",false],"68":["scale","scale",true],"69":["thesisType","thesisType",false],"70":["websiteType","websiteType",false],"71":["audioRecordingFormat","audioRecordingFormat",false],"72":["label","label",false],"74":["presentationType","presentationType",false],"75":["meetingName","meetingName",true],"76":["studio","studio",false],"77":["runningTime","runningTime",true],"78":["network","network",false],"79":["postType","postType",false],"80":["audioFileType","audioFileType",false],"81":["versionNumber","versionNumber",true],"82":["system","system",true],"83":["company","company",false],"84":["conferenceName","conferenceName",true],"85":["encyclopediaTitle","encyclopediaTitle",false],"86":["dictionaryTitle","dictionaryTitle",false],"87":["language","language",true],"88":["programmingLanguage","programmingLanguage",true],"89":["university","university",false],"90":["abstractNote","abstractNote",true],"91":["websiteTitle","websiteTitle",false],"92":["reportNumber","reportNumber",false],"93":["billNumber","billNumber",false],"94":["codeVolume","codeVolume",false],"95":["codePages","codePages",false],"96":["dateDecided","dateDecided",false],"97":["reporterVolume","reporterVolume",false],"98":["firstPage","firstPage",false],"99":["documentNumber","documentNumber",false],"100":["dateEnacted","dateEnacted",false],"101":["publicLawNumber","publicLawNumber",false],"102":["country","country",true],"103":["applicationNumber","applicationNumber",true],"104":["forumTitle","forumTitle",false],"105":["episodeNumber","episodeNumber",false],"107":["blogTitle","blogTitle",false],"108":["type","type",true],"109":["medium","medium",true],"110":["title","title",true],"111":["caseName","caseName",false],"112":["nameOfAct","nameOfAct",false],"113":["subject","subject",false],"114":["proceedingsTitle","proceedingsTitle",false],"115":["bookTitle","bookTitle",false],"116":["shortTitle","shortTitle",true],"117":["docketNumber","docketNumber",false],"118":["numPages","numPages",true],"119":["programTitle","programTitle",false],"120":["issuingAuthority","issuingAuthority",false],"121":["filingDate","filingDate",true],"122":["genre","genre",false],"123":["archive","archive",true],"124":["repository","repository",false],"125":["archiveID","archiveID",false],"126":["citationKey","citationKey",true],"127":["authority","authority",true],"128":["identifier","identifier",false],"129":["repositoryLocation","repositoryLocation",false],"130":["format","format",false],"131":["status","status",true],"132":["organization","organization",false],"10001":["name","name",false],"10002":["address","address",true],"10003":["telephone","telephone",true],"10004":["email","email",true],"10005":["homepage","homepage",false],"10006":["discipline","discipline",true],"10007":["nsfID","nsfID",true],"10008":["dateSent","dateSent",false],"10009":["dateDue","dateDue",true],"10010":["accepted","accepted",true],"10011":["programDirector","programDirector",true]}} \ No newline at end of file From 5ad5598089b3ed8b3ef77c1fa6eafd78c1fe5a87 Mon Sep 17 00:00:00 2001 From: Martynas Bagdonas Date: Wed, 5 Apr 2023 09:08:45 +0200 Subject: [PATCH 31/86] Don't show HTML and Markdown options for collection export Fixes #3033 --- chrome/content/zotero/fileInterface.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/chrome/content/zotero/fileInterface.js b/chrome/content/zotero/fileInterface.js index c5d2b583e36..9a4ef758c9b 100644 --- a/chrome/content/zotero/fileInterface.js +++ b/chrome/content/zotero/fileInterface.js @@ -93,10 +93,11 @@ Zotero_File_Exporter.prototype.save = async function () { } } } - // Otherwise exclude note export translators - else { - translators = translators.filter(t => !t.configOptions || !t.configOptions.noteTranslator); - } + } + + // Exclude note translators if not exporting notes + if (!exportingNotes) { + translators = translators.filter(t => !t.configOptions || !t.configOptions.noteTranslator); } // present options dialog From dcfce382d90083060cae0b9f4e9f97815d8b0267 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Fri, 7 Apr 2023 01:41:28 -0400 Subject: [PATCH 32/86] Update GitHub Actions action versions and Node version --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9b6a5dfcdbc..66a903150c8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,14 +5,14 @@ jobs: name: Build, Upload, Test runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: recursive - name: Install Node - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: - node-version: 14 + node-version: 18 #cache: npm # On GitHub @@ -42,7 +42,7 @@ jobs: - name: Cache Node modules id: node-cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: node_modules key: node-modules-${{ hashFiles('package-lock.json') }} @@ -76,7 +76,7 @@ jobs: - name: Cache utilities Node modules id: utilities-node-cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: chrome/content/zotero/xpcom/utilities/node_modules key: utilities-node-modules-${{ hashFiles('chrome/content/zotero/xpcom/utilities/package-lock.json') }} From 543bfdabd3880af9d292460b85a53eeb8a33368f Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Fri, 7 Apr 2023 03:18:05 -0400 Subject: [PATCH 33/86] CI: Use `npm i --legacy-peer-deps` for react-virtualized --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 66a903150c8..27fd18892db 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,7 +49,9 @@ jobs: - name: Install Node modules if: steps.node-cache.outputs.cache-hit != 'true' - run: npm install + # --legacy-peer-deps is necessary for current React versions until react-virtualized is + # updated or we replace it: https://github.com/bvaughn/react-virtualized/issues/1775 + run: npm install --legacy-peer-deps - name: Build Zotero run: npm run build From 41c0d9346e69c37bba7c48810b766648a9adf286 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sat, 1 Apr 2023 04:14:51 -0400 Subject: [PATCH 34/86] CI: Add `--openssl-legacy-provider` for Webpack --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 27fd18892db..d4d2ab4d8ac 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,6 +55,9 @@ jobs: - name: Build Zotero run: npm run build + # Currently necessary for pdf-worker Webpack: https://stackoverflow.com/a/69746937 + env: + NODE_OPTIONS: --openssl-legacy-provider - name: Upload deployment ZIP if: | From 400396be25ffb71ac1a28c169e23d0a913404673 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Fri, 7 Apr 2023 04:27:46 -0400 Subject: [PATCH 35/86] CI: Update actions/cache version --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d4d2ab4d8ac..2778ab81633 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,7 @@ jobs: - name: Cache Firefox id: firefox-cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: firefox-x86_64 key: firefox-60.9.0esr From ce16a28f4aa3cae4749e40c06934b752baf1b983 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sun, 9 Apr 2023 16:58:51 -0400 Subject: [PATCH 36/86] Set a default annotation color if not assigned https://forums.zotero.org/discussion/104249/sync-issue-on-ipados --- chrome/content/zotero/xpcom/annotations.js | 2 ++ chrome/content/zotero/xpcom/data/item.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/chrome/content/zotero/xpcom/annotations.js b/chrome/content/zotero/xpcom/annotations.js index db83e4a0282..5799fb70c4a 100644 --- a/chrome/content/zotero/xpcom/annotations.js +++ b/chrome/content/zotero/xpcom/annotations.js @@ -33,6 +33,8 @@ Zotero.Annotations = new function () { Zotero.defineProperty(this, 'ANNOTATION_TYPE_IMAGE', { value: 3 }); Zotero.defineProperty(this, 'ANNOTATION_TYPE_INK', { value: 4 }); + Zotero.defineProperty(this, 'DEFAULT_COLOR', { value: 'ffd400' }); + Zotero.defineProperty(this, 'PROPS', { value: ['type', 'authorName', 'text', 'comment', 'color', 'pageLabel', 'sortIndex', 'position'], writable: false diff --git a/chrome/content/zotero/xpcom/data/item.js b/chrome/content/zotero/xpcom/data/item.js index 3c64543a409..780d9773a27 100644 --- a/chrome/content/zotero/xpcom/data/item.js +++ b/chrome/content/zotero/xpcom/data/item.js @@ -1935,7 +1935,7 @@ Zotero.Item.prototype._saveData = Zotero.Promise.coroutine(function* (env) { authorName || null, text || null, comment || null, - color || null, + color || Zotero.Annotations.DEFAULT_COLOR, pageLabel || null, sortIndex, position, From 1d6cae08d28af4a4a3667917ae07d9c045b25d1b Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sun, 9 Apr 2023 17:03:50 -0400 Subject: [PATCH 37/86] Add '#' to default annotation color And add test --- chrome/content/zotero/xpcom/annotations.js | 2 +- test/tests/itemTest.js | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/chrome/content/zotero/xpcom/annotations.js b/chrome/content/zotero/xpcom/annotations.js index 5799fb70c4a..cbe5621e35b 100644 --- a/chrome/content/zotero/xpcom/annotations.js +++ b/chrome/content/zotero/xpcom/annotations.js @@ -33,7 +33,7 @@ Zotero.Annotations = new function () { Zotero.defineProperty(this, 'ANNOTATION_TYPE_IMAGE', { value: 3 }); Zotero.defineProperty(this, 'ANNOTATION_TYPE_INK', { value: 4 }); - Zotero.defineProperty(this, 'DEFAULT_COLOR', { value: 'ffd400' }); + Zotero.defineProperty(this, 'DEFAULT_COLOR', { value: '#ffd400' }); Zotero.defineProperty(this, 'PROPS', { value: ['type', 'authorName', 'text', 'comment', 'color', 'pageLabel', 'sortIndex', 'position'], diff --git a/test/tests/itemTest.js b/test/tests/itemTest.js index de0edd3d2b9..2f35e5ef50f 100644 --- a/test/tests/itemTest.js +++ b/test/tests/itemTest.js @@ -1400,6 +1400,22 @@ describe("Zotero.Item", function () { assert.isFalse(annotation.hasChanged()); }); + it("should assign a default color", async function () { + var annotation = new Zotero.Item('annotation'); + annotation.parentID = attachment.id; + annotation.annotationType = 'highlight'; + annotation.annotationText = "This is highlighted text."; + annotation.annotationSortIndex = '00015|002431|00000'; + annotation.annotationPosition = JSON.stringify({ + pageIndex: 123, + rects: [ + [314.4, 412.8, 556.2, 609.6] + ] + }); + await annotation.saveTx(); + assert.equal(annotation.annotationColor, '#ffd400'); + }); + it("should save a note annotation", async function () { var annotation = new Zotero.Item('annotation'); annotation.parentID = attachment.id; From 9a7486e53c74cc075f69d8239d503408dde3b76d Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Tue, 11 Apr 2023 23:48:07 -0400 Subject: [PATCH 38/86] Prevent setting search `.name` to empty value Prevents bug in zotero-citation plugin (at least on macOS) from creating a search that breaks syncing We were already checking for a missing name in `saveTx()`, but the plugin is saving the same search twice in rapid succession, the second time without a name, and the second attempt clears the search object's name value after the first save's `_initSave()` check and before its SQL write. The second save fails, but the first save goes through without a name, resulting in a sync error. https://forums.zotero.org/discussion/104274/id-1702002152-cannot-sync https://github.com/MuiseDestiny/zotero-citation/issues/31 --- chrome/content/zotero/xpcom/data/search.js | 7 ++++++- test/tests/searchTest.js | 7 +++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/chrome/content/zotero/xpcom/data/search.js b/chrome/content/zotero/xpcom/data/search.js index 5419602d672..90aa4ebf536 100644 --- a/chrome/content/zotero/xpcom/data/search.js +++ b/chrome/content/zotero/xpcom/data/search.js @@ -75,7 +75,12 @@ Zotero.defineProperty(Zotero.Search.prototype, 'key', { }); Zotero.defineProperty(Zotero.Search.prototype, 'name', { get: function() { return this._get('name'); }, - set: function(val) { return this._set('name', val); } + set: function (val) { + if (!val) { + throw new Error("Saved search name cannot be empty"); + } + return this._set('name', val); + } }); Zotero.defineProperty(Zotero.Search.prototype, 'version', { get: function() { return this._get('version'); }, diff --git a/test/tests/searchTest.js b/test/tests/searchTest.js index da791f1e2b3..e6f38912392 100644 --- a/test/tests/searchTest.js +++ b/test/tests/searchTest.js @@ -1,4 +1,11 @@ describe("Zotero.Search", function() { + describe("#name", function () { + it("should fail if empty", async function () { + var s = new Zotero.Search(); + assert.throws(() => s.name = ''); + }); + }); + describe("#addCondition()", function () { it("should convert old-style 'collection' condition value", function* () { var col = yield createDataObject('collection'); From 53276163767d98e2a87e22b81f5f46d469820aa4 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Thu, 13 Apr 2023 00:53:05 -0400 Subject: [PATCH 39/86] Update react-virtualized to 9.22.4 Fixes #3055 for now --- package-lock.json | 18 +++++++++--------- package.json | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0097c43d044..180d3eb43a7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -46,7 +46,7 @@ "jspath": "^0.4.0", "mocha": "^3.5.3", "multimatch": "^2.1.0", - "react-virtualized": "^9.22.3", + "react-virtualized": "^9.22.4", "sass": "^1.28.0", "sinon": "^7.3.2", "universalify": "^0.1.1" @@ -5896,9 +5896,9 @@ } }, "node_modules/react-virtualized": { - "version": "9.22.3", - "resolved": "https://registry.npmjs.org/react-virtualized/-/react-virtualized-9.22.3.tgz", - "integrity": "sha512-MKovKMxWTcwPSxE1kK1HcheQTWfuCxAuBoSTf2gwyMM21NdX/PXUhnoP8Uc5dRKd+nKm8v41R36OellhdCpkrw==", + "version": "9.22.4", + "resolved": "https://registry.npmjs.org/react-virtualized/-/react-virtualized-9.22.4.tgz", + "integrity": "sha512-HYOQEK1OWWYKt8C3KnjbEOST224kv5D8USPSdo/huAamDttWzQLTtoi/IvWfqwFOr9cCnwUYzqOTStwPrdkqqQ==", "dev": true, "dependencies": { "@babel/runtime": "^7.7.2", @@ -5909,8 +5909,8 @@ "react-lifecycles-compat": "^3.0.4" }, "peerDependencies": { - "react": "^15.3.0 || ^16.0.0-alpha", - "react-dom": "^15.3.0 || ^16.0.0-alpha" + "react": "^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0", + "react-dom": "^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0" } }, "node_modules/read-only-stream": { @@ -11950,9 +11950,9 @@ } }, "react-virtualized": { - "version": "9.22.3", - "resolved": "https://registry.npmjs.org/react-virtualized/-/react-virtualized-9.22.3.tgz", - "integrity": "sha512-MKovKMxWTcwPSxE1kK1HcheQTWfuCxAuBoSTf2gwyMM21NdX/PXUhnoP8Uc5dRKd+nKm8v41R36OellhdCpkrw==", + "version": "9.22.4", + "resolved": "https://registry.npmjs.org/react-virtualized/-/react-virtualized-9.22.4.tgz", + "integrity": "sha512-HYOQEK1OWWYKt8C3KnjbEOST224kv5D8USPSdo/huAamDttWzQLTtoi/IvWfqwFOr9cCnwUYzqOTStwPrdkqqQ==", "dev": true, "requires": { "@babel/runtime": "^7.7.2", diff --git a/package.json b/package.json index e61b86e96ac..1cef6134d15 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "jspath": "^0.4.0", "mocha": "^3.5.3", "multimatch": "^2.1.0", - "react-virtualized": "^9.22.3", + "react-virtualized": "^9.22.4", "sass": "^1.28.0", "sinon": "^7.3.2", "universalify": "^0.1.1" From 7e6f7ac4b381c02fd5c21932adbcdd0740e61edc Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Thu, 13 Apr 2023 00:55:38 -0400 Subject: [PATCH 40/86] CI: Stop using --legacy-peer-deps No longer necessary after react-virtualized update (#3055) --- .github/workflows/ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2778ab81633..9c627a463f7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,9 +49,7 @@ jobs: - name: Install Node modules if: steps.node-cache.outputs.cache-hit != 'true' - # --legacy-peer-deps is necessary for current React versions until react-virtualized is - # updated or we replace it: https://github.com/bvaughn/react-virtualized/issues/1775 - run: npm install --legacy-peer-deps + run: npm install - name: Build Zotero run: npm run build From b213b8f15dd1f42a46a1a826d9506d3aea3f4935 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adomas=20Ven=C4=8Dkauskas?= Date: Fri, 14 Apr 2023 15:21:52 +0300 Subject: [PATCH 41/86] Fix feed update refreshing, scrolling item and collection trees Closes #2950 --- chrome/content/zotero/collectionTree.jsx | 10 ++++++++-- chrome/content/zotero/selectItemsDialog.js | 4 ++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/chrome/content/zotero/collectionTree.jsx b/chrome/content/zotero/collectionTree.jsx index 84cee70c0a6..6d697e79545 100644 --- a/chrome/content/zotero/collectionTree.jsx +++ b/chrome/content/zotero/collectionTree.jsx @@ -642,7 +642,10 @@ var CollectionTree = class CollectionTree extends LibraryTree { return; } if (type == 'feed' && (action == 'unreadCountUpdated' || action == 'statusChanged')) { - this.tree.invalidate(); + let feedRow = this.getRowIndexByID("L" + ids[0]); + if (feedRow !== false) { + this.tree.invalidateRow(feedRow); + } return; } @@ -747,7 +750,7 @@ var CollectionTree = class CollectionTree extends LibraryTree { // Invalidate parent in case it's become non-empty let parentRow = this.getRowIndexByID("C" + collection.parentID); if (parentRow !== false) { - this._treebox.invalidateRow(parentRow); + this.tree.invalidateRow(parentRow); } } break; @@ -771,6 +774,9 @@ var CollectionTree = class CollectionTree extends LibraryTree { } } break; + + case 'feed': + break; default: await this.reload(); diff --git a/chrome/content/zotero/selectItemsDialog.js b/chrome/content/zotero/selectItemsDialog.js index 0df60fe803d..806f92a03d1 100644 --- a/chrome/content/zotero/selectItemsDialog.js +++ b/chrome/content/zotero/selectItemsDialog.js @@ -92,6 +92,10 @@ function doUnload() var onCollectionSelected = async function () { if (!collectionsView.selection.count) return; + // Collection not changed + if (itemsView && itemsView.collectionTreeRow && itemsView.collectionTreeRow.id == collectionTreeRow.id) { + return; + } var collectionTreeRow = collectionsView.getRow(collectionsView.selection.focused); collectionTreeRow.setSearch(''); Zotero.Prefs.set('lastViewedFolder', collectionTreeRow.id); From 31fc418a975b2b29b672361327351a91dbc2a29b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adomas=20Ven=C4=8Dkauskas?= Date: Mon, 17 Apr 2023 12:29:41 +0300 Subject: [PATCH 42/86] Add a test for feed update scroll issues. See b213b8f1 --- test/tests/collectionTreeTest.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/test/tests/collectionTreeTest.js b/test/tests/collectionTreeTest.js index c0a72d5ea66..ae52b762f4f 100644 --- a/test/tests/collectionTreeTest.js +++ b/test/tests/collectionTreeTest.js @@ -487,6 +487,23 @@ describe("Zotero.CollectionTree", function() { yield promise; assert.isFalse(cv.getRowIndexByID(id)) }) + + it("should not reload tree upon feed update", async function () { + var feed = await createFeed(); + await cv.selectLibrary(Zotero.Libraries.userLibraryID); + try { + var reloadSpy = sinon.spy(cv, 'reload'); + // A set of notifier calls when a feed update is running + Zotero.debug(feed.id, 2); + await Zotero.Notifier.trigger('statusChanged', 'feed', feed.id); + await Zotero.Notifier.trigger('modify', 'feed', feed.id); + await Zotero.Notifier.trigger('unreadCountUpdated', 'feed', feed.id); + await Zotero.Notifier.trigger('statusChanged', 'feed', feed.id); + assert.isFalse(reloadSpy.called); + } finally { + reloadSpy.restore(); + } + }); }); describe("#selectItem()", function () { From c641b28a9f453a541457c9cf4747233ea349a9a6 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Tue, 18 Apr 2023 16:45:12 -0400 Subject: [PATCH 43/86] Update translators --- resource/schema/repotime.txt | 2 +- translators | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resource/schema/repotime.txt b/resource/schema/repotime.txt index ce3c0af8269..2db85cf7118 100644 --- a/resource/schema/repotime.txt +++ b/resource/schema/repotime.txt @@ -1 +1 @@ -2023-03-12 20:14:44 +2023-04-18 20:44:59 diff --git a/translators b/translators index a55c0fecbd2..b4829b4bfa2 160000 --- a/translators +++ b/translators @@ -1 +1 @@ -Subproject commit a55c0fecbd2259956c7fff34f347116479e52b0a +Subproject commit b4829b4bfa2c6225a362ffb2930d8716a0ede312 From ac2c001291c622e9dde6e9522775b53443c1773f Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Tue, 18 Apr 2023 17:43:38 -0400 Subject: [PATCH 44/86] Update locales from Transifex --- chrome/locale/de/zotero/connector.json | 18 +++++++++++ chrome/locale/de/zotero/preferences.dtd | 8 ++--- chrome/locale/de/zotero/zotero.properties | 8 ++--- chrome/locale/es-ES/zotero/zotero.properties | 2 +- chrome/locale/fi-FI/zotero/zotero.properties | 2 +- chrome/locale/hu-HU/zotero/preferences.dtd | 6 ++-- chrome/locale/hu-HU/zotero/zotero.properties | 8 ++--- chrome/locale/it-IT/zotero/zotero.properties | 2 +- chrome/locale/pl-PL/zotero/zotero.properties | 4 +-- chrome/locale/ru-RU/zotero/zotero.properties | 2 +- chrome/locale/sl-SI/zotero/connector.json | 18 +++++++++++ chrome/locale/sl-SI/zotero/preferences.dtd | 8 ++--- chrome/locale/sl-SI/zotero/zotero.dtd | 2 +- chrome/locale/sl-SI/zotero/zotero.properties | 32 ++++++++++---------- chrome/locale/tr-TR/zotero/zotero.properties | 2 +- chrome/locale/zh-CN/zotero/connector.json | 6 ++-- chrome/locale/zh-CN/zotero/preferences.dtd | 8 ++--- chrome/locale/zh-CN/zotero/zotero.properties | 24 +++++++-------- chrome/locale/zh-TW/zotero/zotero.properties | 14 ++++----- resource/schema/global | 2 +- 20 files changed, 106 insertions(+), 70 deletions(-) diff --git a/chrome/locale/de/zotero/connector.json b/chrome/locale/de/zotero/connector.json index b1cf5fd89a2..0b54e72eb93 100644 --- a/chrome/locale/de/zotero/connector.json +++ b/chrome/locale/de/zotero/connector.json @@ -59,6 +59,12 @@ "progressWindow_error_upgradeClient_latestVersion": { "message": "neueste Version" }, + "extensionIsDisabled": { + "message": "$1 ist deaktiviert" + }, + "extensionIsDisabled_extensionPage": { + "message": "$1 ist auf Erweiterungsseiten deaktiviert." + }, "appConnector": { "message": "$1 Erweiterung" }, @@ -140,6 +146,18 @@ "integration_googleDocs_orphanedCitations_disclaimer": { "message": "Diese Zitationen wurden von $1 getrennt. Sie müssen sie erneut verknüpfen, damit sie aktualisiert werden oder in Ihrem Literaturverzeichnis erscheinen können." }, + "copyUnproxiedLink": { + "message": "Link ohne Proxy kopieren" + }, + "copyUnproxiedPageURL": { + "message": "Seiten-URL ohne Proxy kopieren" + }, + "reloadViaProxy": { + "message": "Über Proxy neu laden" + }, + "reloadVia": { + "message": "Über $1 neu laden" + }, "general_saveTo": { "message": "Speichern nach $1" } diff --git a/chrome/locale/de/zotero/preferences.dtd b/chrome/locale/de/zotero/preferences.dtd index 7f0492a406a..2ba454f9e26 100644 --- a/chrome/locale/de/zotero/preferences.dtd +++ b/chrome/locale/de/zotero/preferences.dtd @@ -26,10 +26,10 @@ - - - - + + + + diff --git a/chrome/locale/de/zotero/zotero.properties b/chrome/locale/de/zotero/zotero.properties index feb6a3578a5..98a9132a986 100644 --- a/chrome/locale/de/zotero/zotero.properties +++ b/chrome/locale/de/zotero/zotero.properties @@ -104,7 +104,7 @@ general.blue=Blau general.purple=Lila general.magenta=Magenta general.orange=Orange -general.gray=Gray +general.gray=Grau general.operationInProgress=Zotero ist beschäftigt. general.operationInProgress.waitUntilFinished=Bitte warten Sie, bis der Vorgang abgeschlossen ist. @@ -500,7 +500,7 @@ itemTypes.document=Dokument itemTypes.encyclopediaArticle=Enzyklopädieartikel itemTypes.dictionaryEntry=Wörterbucheintrag itemTypes.preprint=Preprint -itemTypes.dataset=Dataset +itemTypes.dataset=Datensatz itemTypes.standard=Standard itemFields.itemType=Eintragsart @@ -624,7 +624,7 @@ itemFields.type=Type itemFields.format=Format itemFields.status=Status itemFields.authority=Authority -itemFields.organization=Organization +itemFields.organization=Organisation creatorTypes.author=Autor creatorTypes.contributor=Mitarbeiter @@ -1339,7 +1339,7 @@ noteEditor.blockquote=Blockzitat noteEditor.mathBlock=Mathematik-Block noteEditor.formatText=Text formatieren noteEditor.highlightText=Text hervorheben -noteEditor.textColor=Text Color +noteEditor.textColor=Textfarbe noteEditor.removeColor=Farbe entfernen noteEditor.bold=Fett noteEditor.italic=Kursiv diff --git a/chrome/locale/es-ES/zotero/zotero.properties b/chrome/locale/es-ES/zotero/zotero.properties index 96beebb3307..f5dc16b18e8 100644 --- a/chrome/locale/es-ES/zotero/zotero.properties +++ b/chrome/locale/es-ES/zotero/zotero.properties @@ -623,7 +623,7 @@ itemFields.identifier=Identificador itemFields.type=Tipo itemFields.format=Formato itemFields.status=Estado -itemFields.authority=Authority +itemFields.authority=Autoridad itemFields.organization=Organización creatorTypes.author=Autor diff --git a/chrome/locale/fi-FI/zotero/zotero.properties b/chrome/locale/fi-FI/zotero/zotero.properties index 8e84b1f9468..19cf147add6 100644 --- a/chrome/locale/fi-FI/zotero/zotero.properties +++ b/chrome/locale/fi-FI/zotero/zotero.properties @@ -623,7 +623,7 @@ itemFields.identifier=Tunniste itemFields.type=Tyyppi itemFields.format=Muoto itemFields.status=Tila -itemFields.authority=Authority +itemFields.authority=Organisaatio itemFields.organization=Organisaatio creatorTypes.author=Tekijä diff --git a/chrome/locale/hu-HU/zotero/preferences.dtd b/chrome/locale/hu-HU/zotero/preferences.dtd index 9a4406e024f..127f76a2106 100644 --- a/chrome/locale/hu-HU/zotero/preferences.dtd +++ b/chrome/locale/hu-HU/zotero/preferences.dtd @@ -26,10 +26,10 @@ - + - - + + diff --git a/chrome/locale/hu-HU/zotero/zotero.properties b/chrome/locale/hu-HU/zotero/zotero.properties index d2253f452a0..deaf289a37a 100644 --- a/chrome/locale/hu-HU/zotero/zotero.properties +++ b/chrome/locale/hu-HU/zotero/zotero.properties @@ -73,7 +73,7 @@ general.tryLater=Próbálja később general.showDirectory=Könyvtár megjelenítése. general.showInLibrary=Megjelenítés a könyvtárban general.continue=Folytatás -general.skip=Skip +general.skip=Ugrás general.copy=Másolás general.copyToClipboard=Másolás a vágólapra general.cancel=Mégsem @@ -164,7 +164,7 @@ attachmentBasePath.chooseNewPath.button=A Base Directory beállításának megv attachmentBasePath.clearBasePath.title=Visszavonás attachmentBasePath.clearBasePath.message=Az új fájlmellékletekre mutató hivatkozások a közvetlen elérési utak használatával kerülnek mentésre. attachmentBasePath.clearBasePath.existingAttachments.singular=A régi alapkönyvtáron belül egy meglévő csatolmányt közvetlen elérési útvonal használatára alakítunk át. -attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths. +attachmentBasePath.clearBasePath.existingAttachments.plural=%S a régi alapkönyvtárban meglévő csatolmányok közvetlen elérési utak használatára lesznek átalakítva. attachmentBasePath.clearBasePath.button=Base Directory beállításának törlése dataDir.dirCannotBeCreated=A %S adatkönyvtár (%S) létrehozása nem sikerült. @@ -624,7 +624,7 @@ itemFields.type=Típus itemFields.format=Formátum itemFields.status=Status itemFields.authority=Authority -itemFields.organization=Organization +itemFields.organization=Szervezet creatorTypes.author=Szerző creatorTypes.contributor=Közreműködő @@ -738,7 +738,7 @@ zotero.preferences.sync.reset.userInfoMissing=A visszaállítási lehetőségek zotero.preferences.sync.reset.restoreFromServer=A Zotero ezen példányában lévő összes adat törlődik, és helyébe a Zotero szerveren a "%S" felhasználóhoz tartozó adatok lépnek. zotero.preferences.sync.reset.replaceLocalData=A Local Data cseréje zotero.preferences.sync.reset.restartToComplete=A helyreállítási művelet befejezéséhez újra kell indítani a Firefoxot. -zotero.preferences.sync.reset.restoreToServer=%1$S will replace data in “%2$S” on %3$S with data from this computer. +zotero.preferences.sync.reset.restoreToServer=%1$S a %3$S-en lévő "%2$S" adatai helyébe ezen a számítógépen lévő adatok lépnek. zotero.preferences.sync.reset.restoreToServer.button=Replace Data in Online Library zotero.preferences.sync.reset.fileSyncHistory=On the next sync, %1$S will check all attachment files in “%2$S” against the storage service. Any remote attachment files that are missing locally will be downloaded, and local attachment files missing remotely will be uploaded.\n\nThis option is not necessary during normal usage. zotero.preferences.sync.reset.fileSyncHistory.cleared=A(z) „%S” fájlszinkronizálási előzményei törölve lettek. diff --git a/chrome/locale/it-IT/zotero/zotero.properties b/chrome/locale/it-IT/zotero/zotero.properties index 7167d264242..0004d41c59e 100644 --- a/chrome/locale/it-IT/zotero/zotero.properties +++ b/chrome/locale/it-IT/zotero/zotero.properties @@ -623,7 +623,7 @@ itemFields.identifier=Identificatore itemFields.type=Tipo itemFields.format=Formato itemFields.status=Stato della pubblicazione -itemFields.authority=Authority +itemFields.authority=Autorità itemFields.organization=Organizzazione creatorTypes.author=Autore diff --git a/chrome/locale/pl-PL/zotero/zotero.properties b/chrome/locale/pl-PL/zotero/zotero.properties index 14a417b32a9..13107f84192 100644 --- a/chrome/locale/pl-PL/zotero/zotero.properties +++ b/chrome/locale/pl-PL/zotero/zotero.properties @@ -1244,8 +1244,8 @@ locate.externalViewer.label=Otwórz w zewnętrznej przeglądarce locate.internalViewer.label=Otwórz w wewnętrznej przeglądarce locate.showFile.label=Pokaż katalog z plikiem locate.libraryLookup.label=Wyszukiwanie -locate.libraryLookup.noResolver.title=No OpenURL Resolver -locate.libraryLookup.noResolver.text=You must choose an OpenURL resolver from the Advanced pane of the %S preferences. +locate.libraryLookup.noResolver.title=Brak resolwera OpenURL +locate.libraryLookup.noResolver.text=Musisz wybrać resolwer OpenURL w zakładce Zaawansowane w ustawieniach %S. locate.manageLocateEngines=Zarządzanie silnikami wyszukiwania... locate.locateEngineDescription=Silniki wyszukiwania pomagają ci odnaleźć w internecie zasoby do twojej biblioteki %S. Włączone na tej liście silniki pojawią się w rozwijającym się menu na pasku narzędzi diff --git a/chrome/locale/ru-RU/zotero/zotero.properties b/chrome/locale/ru-RU/zotero/zotero.properties index ef92071bc22..9e8c8cf76f4 100644 --- a/chrome/locale/ru-RU/zotero/zotero.properties +++ b/chrome/locale/ru-RU/zotero/zotero.properties @@ -623,7 +623,7 @@ itemFields.identifier=Идентификатор itemFields.type=Тип itemFields.format=Формат itemFields.status=Статус -itemFields.authority=Authority +itemFields.authority=Организация\Гос. орган itemFields.organization=Организация creatorTypes.author=Автор diff --git a/chrome/locale/sl-SI/zotero/connector.json b/chrome/locale/sl-SI/zotero/connector.json index d979381f70c..ec110156e58 100644 --- a/chrome/locale/sl-SI/zotero/connector.json +++ b/chrome/locale/sl-SI/zotero/connector.json @@ -59,6 +59,12 @@ "progressWindow_error_upgradeClient_latestVersion": { "message": "najnovejša različica" }, + "extensionIsDisabled": { + "message": "$1 je onemogočen" + }, + "extensionIsDisabled_extensionPage": { + "message": "$1 je onemogočen na straneh razširitev" + }, "appConnector": { "message": "Konektor $1" }, @@ -140,6 +146,18 @@ "integration_googleDocs_orphanedCitations_disclaimer": { "message": "Ti citati so postali nepovezani z $1. Morali jih boste morali znova povezati, preden se posodobijo ali pojavijo v vaši bibliografiji." }, + "copyUnproxiedLink": { + "message": "Kopiraj povezavo brez posr. strežnika" + }, + "copyUnproxiedPageURL": { + "message": "Kopiraj URL strani brez posr. strežnika" + }, + "reloadViaProxy": { + "message": "Ponovno naloži prek posr. strežnika" + }, + "reloadVia": { + "message": "Ponovno naloži prek $1" + }, "general_saveTo": { "message": "Shrani v $1" } diff --git a/chrome/locale/sl-SI/zotero/preferences.dtd b/chrome/locale/sl-SI/zotero/preferences.dtd index 533cc9a6686..e745aa52848 100644 --- a/chrome/locale/sl-SI/zotero/preferences.dtd +++ b/chrome/locale/sl-SI/zotero/preferences.dtd @@ -26,10 +26,10 @@ - - - - + + + + diff --git a/chrome/locale/sl-SI/zotero/zotero.dtd b/chrome/locale/sl-SI/zotero/zotero.dtd index 3787b12548b..d37e5298d7d 100644 --- a/chrome/locale/sl-SI/zotero/zotero.dtd +++ b/chrome/locale/sl-SI/zotero/zotero.dtd @@ -188,7 +188,7 @@ - + diff --git a/chrome/locale/sl-SI/zotero/zotero.properties b/chrome/locale/sl-SI/zotero/zotero.properties index 3aa871ce635..f258530efff 100644 --- a/chrome/locale/sl-SI/zotero/zotero.properties +++ b/chrome/locale/sl-SI/zotero/zotero.properties @@ -73,7 +73,7 @@ general.tryLater=Poskusi kasneje general.showDirectory=Pokaži mapo general.showInLibrary=Pokaži v knjižnici general.continue=Nadaljuj -general.skip=Skip +general.skip=Preskoči general.copy=Kopiraj general.copyToClipboard=Kopiraj na odložišče general.cancel=Prekliči @@ -102,9 +102,9 @@ general.red=Rdeča general.green=Zelena general.blue=Modra general.purple=Škrlatna -general.magenta=Magenta -general.orange=Orange -general.gray=Gray +general.magenta=Škrlatna +general.orange=Oranžna +general.gray=Siva general.operationInProgress=Trenutno je v teku opravilo Zotero. general.operationInProgress.waitUntilFinished=Počakajte, da se dokonča. @@ -500,7 +500,7 @@ itemTypes.document=Dokument itemTypes.encyclopediaArticle=Enciklopedični članek itemTypes.dictionaryEntry=Slovarski vnos itemTypes.preprint=Predobjava -itemTypes.dataset=Dataset +itemTypes.dataset=Nabor podatkov itemTypes.standard=Standardno itemFields.itemType=Vrsta vnosa @@ -616,15 +616,15 @@ itemFields.genre=Žanr itemFields.archive=Arhiv itemFields.attachmentPDF=Priponka PDF itemFields.repository=Skladišče -itemFields.repositoryLocation=Repo. Location +itemFields.repositoryLocation=Mesto hrambe itemFields.archiveID=ID arhiva itemFields.citationKey=Ključ citata -itemFields.identifier=Identifier +itemFields.identifier=Identifikator itemFields.type=Vrsta itemFields.format=Oblika -itemFields.status=Status -itemFields.authority=Authority -itemFields.organization=Organization +itemFields.status=Stanje +itemFields.authority=Avtoriteta +itemFields.organization=Organizacija creatorTypes.author=Avtor creatorTypes.contributor=Avtor prispevka @@ -795,7 +795,7 @@ dragAndDrop.filesNotFound=Naslednjih datotek ni mogoče najti, zato niso bile sk fileInterface.importing=Uvažanje ... fileInterface.importComplete=Uvoz dokončan fileInterface.itemsWereImported=%1$S uvožen element;%1$S uvoženih elementov -fileInterface.itemsWereRelinked=%1$S item was relinked;%1$S items were relinked +fileInterface.itemsWereRelinked=%1$S ponovno povezan element;%1$S ponovno povezanih elementov fileInterface.itemsExported=Izvažanje vnosov ... fileInterface.import=Uvozi fileInterface.chooseAppDatabaseToImport=Izberite zbirko podatkov %S za uvoz @@ -826,7 +826,7 @@ import.online.formIntro=Vnesite svoje prijavne podatke, da se prijavite v %2$S. import.online.intro=V naslednjem koraku boste zaprošeni, da se prijavite v %2$S in dovolite dostop %1$S. To je potrebno za uvoz vaše knjižnice %3$S v %1$S. import.online.intro2=%1$S nikoli ne vidi ali shrani vašega gesla %2$S. import.online.wrongCredentials=Prijava v %1$S je spodletela. Ponovno vnesite prijavne podatke in poskusite znova. -import.online.blockedByPlugin=The import cannot continue with "%1$S" enabled. Please disable this plugin and try again. +import.online.blockedByPlugin=Ob omogočenem %1$S se uvoz ne more nadaljevati. Onemogočite ta vstavek in poskusite znova. quickCopy.copyAs=Kopiraj kot %S @@ -1001,9 +1001,9 @@ integration.exportDocument.description1=Zotero bo pretvoril citate v dokumentu v integration.exportDocument.description2=Pred nadaljevanjem je priporočljivo, da naredite kopijo dokumenta. integration.importInstructions=Citati Zotero tega dokumenta so pretvorjeni v zapis, ki ga je moč varno prenesti v drug urejevalnik besedil. Odprite ta dokument v podprtem urejevalniku besedil in pritisnite Osveži v vstavku Zotero, da lahko nadaljujete z delom s citati. integration.upgradeTemplate=Vstavek %S za %S je zastarel. Ponovno namestite vstavek iz Nastavitve → Citiraj → Urejevalniki besedil. -integration.mendeleyImport.title=Unlinked Mendeley Citations -integration.mendeleyImport.description=This document contains Mendeley citations that aren’t linked to items in your %1$S library. If you import your Mendeley library, %1$S can automatically relink citations you created with Mendeley. -integration.mendeleyImport.openImporter=Open Mendeley Importer… +integration.mendeleyImport.title=Prekini povezave citatov Mendeley +integration.mendeleyImport.description=Ta dokument vsebuje citate Mendeley, ki niso povezani z elementi v vaši knjižnici %1$S. Če uvozite svojo knjižnico Mendeley, lahko %1$S samodejno ponovno poveže citate, ki ste jih ustvarili z orodjem Mendeley. +integration.mendeleyImport.openImporter=Odpri uvoznika Mendeley ... styles.install.title=Namesti slog styles.install.unexpectedError=Pri nameščanju "%1$S" je prišlo do napake @@ -1339,7 +1339,7 @@ noteEditor.blockquote=Citat v kosu noteEditor.mathBlock=Matematični blok noteEditor.formatText=Oblikuj besedilo noteEditor.highlightText=Osvetli besedilo -noteEditor.textColor=Text Color +noteEditor.textColor=Barva besedila noteEditor.removeColor=Odstrani barvo noteEditor.bold=Krepko noteEditor.italic=Ležeče diff --git a/chrome/locale/tr-TR/zotero/zotero.properties b/chrome/locale/tr-TR/zotero/zotero.properties index d0f71f0e75c..62f2884308d 100644 --- a/chrome/locale/tr-TR/zotero/zotero.properties +++ b/chrome/locale/tr-TR/zotero/zotero.properties @@ -623,7 +623,7 @@ itemFields.identifier=Tanımlayıcı itemFields.type=Tür itemFields.format=Biçim itemFields.status=Durum -itemFields.authority=Authority +itemFields.authority=Otorite itemFields.organization=Kurum creatorTypes.author=Yazar diff --git a/chrome/locale/zh-CN/zotero/connector.json b/chrome/locale/zh-CN/zotero/connector.json index 199364080cb..14858d3593d 100644 --- a/chrome/locale/zh-CN/zotero/connector.json +++ b/chrome/locale/zh-CN/zotero/connector.json @@ -63,7 +63,7 @@ "message": "$1 已停用" }, "extensionIsDisabled_extensionPage": { - "message": "$1已于扩展页面中停用 " + "message": "$1 已于扩展页面中停用" }, "appConnector": { "message": "$1 连接器" @@ -150,13 +150,13 @@ "message": "复制未经代理的链接" }, "copyUnproxiedPageURL": { - "message": "复制未经代理的页面URL" + "message": "复制未经代理的页面网址" }, "reloadViaProxy": { "message": "通过代理重新加载" }, "reloadVia": { - "message": "通过$1 重新加载" + "message": "通过 $1 重新加载" }, "general_saveTo": { "message": "保存到 $1" diff --git a/chrome/locale/zh-CN/zotero/preferences.dtd b/chrome/locale/zh-CN/zotero/preferences.dtd index fa6ad9fa5b9..962cd90800f 100644 --- a/chrome/locale/zh-CN/zotero/preferences.dtd +++ b/chrome/locale/zh-CN/zotero/preferences.dtd @@ -26,10 +26,10 @@ - - - - + + + + diff --git a/chrome/locale/zh-CN/zotero/zotero.properties b/chrome/locale/zh-CN/zotero/zotero.properties index 4fec22d9eea..81e1547dccc 100644 --- a/chrome/locale/zh-CN/zotero/zotero.properties +++ b/chrome/locale/zh-CN/zotero/zotero.properties @@ -4,7 +4,7 @@ general.success=成功 general.error=错误 general.warning=警告 general.dontShowWarningAgain=不再显示此警告。 -general.dontShowAgainFor=今天不再显示；%1$S 不再显示 +general.dontShowAgainFor=%1$S 内不再显示 general.browserIsOffline=%S 现处于离线模式。 general.locate=检索… general.restartRequired=需要重新启动 @@ -102,7 +102,7 @@ general.red=红色 general.green=绿色 general.blue=蓝色 general.purple=紫色 -general.magenta=洋紅色 +general.magenta=洋红色 general.orange=橘色 general.gray=灰色 @@ -500,7 +500,7 @@ itemTypes.document=文档 itemTypes.encyclopediaArticle=百科条目 itemTypes.dictionaryEntry=词条 itemTypes.preprint=预印本 -itemTypes.dataset=Dataset +itemTypes.dataset=数据集 itemTypes.standard=标准 itemFields.itemType=条目类型 @@ -616,15 +616,15 @@ itemFields.genre=流派 itemFields.archive=档案 itemFields.attachmentPDF=PDF附件 itemFields.repository=仓库 -itemFields.repositoryLocation=Repo. Location +itemFields.repositoryLocation=仓库位置 itemFields.archiveID=存档ID itemFields.citationKey=引用关键词 -itemFields.identifier=Identifier -itemFields.type=演稿类型 -itemFields.format=音频格式 -itemFields.status=Status -itemFields.authority=Authority -itemFields.organization=Organization +itemFields.identifier=识别符 +itemFields.type=类型 +itemFields.format=格式 +itemFields.status=状态 +itemFields.authority=主管机构 +itemFields.organization=组织 creatorTypes.author=作者 creatorTypes.contributor=贡献者 @@ -795,7 +795,7 @@ dragAndDrop.filesNotFound=无法找到下列文件，它们无法被复制： fileInterface.importing=导入… fileInterface.importComplete=导入完成 fileInterface.itemsWereImported=导入了 %1$S 项 -fileInterface.itemsWereRelinked=%1$S個項目已經被重新連結;%1$S個項目已經被重新連結 +fileInterface.itemsWereRelinked=已重新链接 %1$S 个项目 fileInterface.itemsExported=导出条目… fileInterface.import=导入 fileInterface.chooseAppDatabaseToImport=选择 %S 数据库导入 @@ -1339,7 +1339,7 @@ noteEditor.blockquote=引用 noteEditor.mathBlock=数学公式块 noteEditor.formatText=格式化文本 noteEditor.highlightText=高亮文本 -noteEditor.textColor=文字顏色 +noteEditor.textColor=文字颜色 noteEditor.removeColor=删除颜色 noteEditor.bold=加粗 noteEditor.italic=斜体 diff --git a/chrome/locale/zh-TW/zotero/zotero.properties b/chrome/locale/zh-TW/zotero/zotero.properties index 06b07a083c3..945a4b7cf10 100644 --- a/chrome/locale/zh-TW/zotero/zotero.properties +++ b/chrome/locale/zh-TW/zotero/zotero.properties @@ -500,10 +500,10 @@ itemTypes.document=文件 itemTypes.encyclopediaArticle=百科全書文章 itemTypes.dictionaryEntry=字典條目 itemTypes.preprint=預印本 -itemTypes.dataset=Dataset +itemTypes.dataset=資料集 itemTypes.standard=標準 -itemFields.itemType=項目類型 +itemFields.itemType=Item Type itemFields.title=標題 itemFields.dateAdded=加入日期 itemFields.dateModified=修改日期 @@ -616,15 +616,15 @@ itemFields.genre=流派 itemFields.archive=檔案空間 itemFields.attachmentPDF=PDF 附件 itemFields.repository=資料存放處 -itemFields.repositoryLocation=Repo. Location +itemFields.repositoryLocation=倉儲位置 itemFields.archiveID=存檔 ID itemFields.citationKey=引用關鍵詞 -itemFields.identifier=Identifier +itemFields.identifier=辨識符號 itemFields.type=類型 itemFields.format=格式 -itemFields.status=Status -itemFields.authority=Authority -itemFields.organization=Organization +itemFields.status=狀態 +itemFields.authority=授權 +itemFields.organization=組織 creatorTypes.author=作者 creatorTypes.contributor=貢獻者 diff --git a/resource/schema/global b/resource/schema/global index 46feab5ce7e..b0918becbad 160000 --- a/resource/schema/global +++ b/resource/schema/global @@ -1 +1 @@ -Subproject commit 46feab5ce7eed164fe56127428f5ffb25a02cf0f +Subproject commit b0918becbad9e371e21affde32850c649c6bde8e From 77e0c71c74aaa2ec4707849f58b9e38e4db9d363 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Tue, 18 Apr 2023 16:45:33 -0400 Subject: [PATCH 45/86] Update version --- install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.rdf b/install.rdf index a1922c9b2ef..efffe7332b0 100644 --- a/install.rdf +++ b/install.rdf @@ -6,7 +6,7 @@ zotero@chnm.gmu.edu Zotero - 6.0.23.SOURCE + 6.0.24.SOURCE false 2 From 90589606c2f6f3935c09d3ad65edf94121478e99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adomas=20Ven=C4=8Dkauskas?= Date: Wed, 19 Apr 2023 11:25:29 +0300 Subject: [PATCH 46/86] Fix classic citation dialog collection tree not working (regression b213b8f1) Report https://forums.zotero.org/discussion/104460/zotero-6-0-24-classic-add-citation-dialog-doesnt-show-collections-content --- chrome/content/zotero/selectItemsDialog.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/content/zotero/selectItemsDialog.js b/chrome/content/zotero/selectItemsDialog.js index 806f92a03d1..f8b32153675 100644 --- a/chrome/content/zotero/selectItemsDialog.js +++ b/chrome/content/zotero/selectItemsDialog.js @@ -91,12 +91,12 @@ function doUnload() } var onCollectionSelected = async function () { + var collectionTreeRow = collectionsView.getRow(collectionsView.selection.focused); if (!collectionsView.selection.count) return; // Collection not changed if (itemsView && itemsView.collectionTreeRow && itemsView.collectionTreeRow.id == collectionTreeRow.id) { return; } - var collectionTreeRow = collectionsView.getRow(collectionsView.selection.focused); collectionTreeRow.setSearch(''); Zotero.Prefs.set('lastViewedFolder', collectionTreeRow.id); From fe8308c9dd380b24c823e8ae75db33c825f1cb37 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Wed, 19 Apr 2023 04:27:33 -0400 Subject: [PATCH 47/86] Update version --- install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.rdf b/install.rdf index efffe7332b0..f14c9210fa5 100644 --- a/install.rdf +++ b/install.rdf @@ -6,7 +6,7 @@ zotero@chnm.gmu.edu Zotero - 6.0.24.SOURCE + 6.0.25.SOURCE false 2 From ecbee6ee260beed8906bf074e26ca2d790d10dcc Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Wed, 19 Apr 2023 16:53:26 -0400 Subject: [PATCH 48/86] Update version --- install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.rdf b/install.rdf index f14c9210fa5..8125c75fa6a 100644 --- a/install.rdf +++ b/install.rdf @@ -6,7 +6,7 @@ zotero@chnm.gmu.edu Zotero - 6.0.25.SOURCE + 6.0.26.SOURCE false 2 From 9ce8855fa4d2363d1cb68cd330186e7327c63bbe Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Wed, 19 Apr 2023 17:25:57 -0400 Subject: [PATCH 49/86] Update citeproc-js to 1.4.63 https://github.com/Juris-M/citeproc-js/commit/73bc1b44bc7d54d0bfec4e070fd27f5efe024ff9 --- chrome/content/zotero/xpcom/citeproc.js | 292 ++++++++++++++++-------- 1 file changed, 191 insertions(+), 101 deletions(-) diff --git a/chrome/content/zotero/xpcom/citeproc.js b/chrome/content/zotero/xpcom/citeproc.js index 878bf0a390c..7e302fff5e0 100644 --- a/chrome/content/zotero/xpcom/citeproc.js +++ b/chrome/content/zotero/xpcom/citeproc.js @@ -120,7 +120,6 @@ var CSL = { "cmt.": "comment", "dec.": "decision", "dept.": "department", - "div.": "division", "ex.": "example", "fig.": "figure", "fld.": "field", @@ -170,7 +169,6 @@ var CSL = { "comment": "cmt.", "decision": "dec.", "department": "dept.", - "division": "div.", "example": "ex.", "figure": "fig.", "field": "fld.", @@ -219,7 +217,6 @@ var CSL = { "cmt": "comment", "dec": "decision", "dept": "department", - "div": "division", "ex": "example", "fig": "figure", "fld": "field", @@ -725,33 +722,61 @@ var CSL = { NAME_VARIABLES: [ "author", + "chair", "collection-editor", + "compiler", "composer", "container-author", + "contributor", + "curator", "director", "editor", + "editor-translator", "editorial-director", + "executive-producer", + "guest", + "host", "illustrator", "interviewer", + "narrator", + "organizer", "original-author", + "performer", + "producer", "recipient", "reviewed-author", + "script-writer", + "series-creator", "translator", "commenter" ], CREATORS: [ "author", + "chair", "collection-editor", + "compiler", "composer", "container-author", + "contributor", + "curator", "director", "editor", + "editor-translator", "editorial-director", + "executive-producer", + "guest", + "host", "illustrator", "interviewer", + "narrator", + "organizer", "original-author", + "performer", + "producer", "recipient", "reviewed-author", + "script-writer", + "series-creator", "translator", "commenter" ], @@ -768,10 +793,13 @@ var CSL = { "number", "number-of-pages", "number-of-volumes", + "part-number", + "printing-number", + "section", + "supplement-number", "version", "volume", - // "section", ??? add this? - "supplement", + "supplement", // maybe deprecated this? supplement-number should serve this purpose in standard CSL. "citation-number" ], //var x = new Array(); @@ -1476,6 +1504,9 @@ var CSL = { }, INIT_JURISDICTION_MACROS: function (state, Item, item, macroName) { + if (Item["best-jurisdiction"]) { + return true; + } if (!state.sys.retrieveStyleModule || !CSL.MODULE_MACROS[macroName] || !Item.jurisdiction) { return false; } @@ -1495,6 +1526,7 @@ var CSL = { } } } + var jurisdictionList = state.getJurisdictionList(Item.jurisdiction); if (state.opt.parallel.enable) { if (!state.parallel) { state.parallel = new CSL.Parallel(state); @@ -1505,7 +1537,7 @@ var CSL = { var jurisdiction = jurisdictionList[i]; if (item) { if (state.juris[jurisdiction] && !item["best-jurisdiction"] && state.juris[jurisdiction].types.locator) { - item["best-jurisdiction"] = jurisdiction; + Item["best-jurisdiction"] = jurisdiction; } } if(state.juris[jurisdiction] && state.juris[jurisdiction].types[Item.type]) { @@ -10032,7 +10064,7 @@ CSL.Node.date = { CSL.Node["date-part"] = { build: function (state, target) { - var func, pos, len, first_date, value, value_end, real, have_collapsed, invoked, precondition, known_year, bc, ad, bc_end, ad_end, ready, curr, dcurr, number, num, formatter, item; + var func, pos, len, first_date, value, value_end, real, have_collapsed, invoked, precondition, known_year, bc, ad, bc_end, ad_end, ready, curr, dcurr, number, num, formatter, item, blob; if (!this.strings.form) { this.strings.form = "long"; } @@ -10175,7 +10207,7 @@ CSL.Node["date-part"] = { // and we reach this block, then we can combine the dates // to a string, run minimial-two, and output the trailing // year right here. No impact on other functionality. - + if (state.opt["year-range-format"] && state.opt["year-range-format"] !== "expanded" && !state.tmp.date_object.day @@ -10183,7 +10215,7 @@ CSL.Node["date-part"] = { && !state.tmp.date_object.season && this.strings.name === "year" && value && value_end) { - + // second argument adjusts collapse as required for years // See OSCOLA section 1.3.2 value_end = state.fun.year_mangler(value + "-" + value_end, true); @@ -10193,13 +10225,21 @@ CSL.Node["date-part"] = { last_string_output = value_end; state.dateput.append(value_end, this); if (first_date) { - state.dateput.current.value().blobs[0].strings.prefix = ""; + blob = state.dateput.current.value().blobs[0]; + if (blob) { + blob.strings.prefix = ""; + } + } } last_string_output = value; state.output.append(value, this); curr = state.output.current.value(); - curr.blobs[(curr.blobs.length - 1)].strings.suffix = ""; + blob = curr.blobs[(curr.blobs.length - 1)]; + if (blob) { + blob.strings.suffix = ""; + } + if (this.strings["range-delimiter"]) { state.output.append(this.strings["range-delimiter"]); } else { @@ -10234,7 +10274,10 @@ CSL.Node["date-part"] = { last_string_output = value_end; state.dateput.append(value_end, this); if (first_date) { - state.dateput.current.value().blobs[0].strings.prefix = ""; + blob = state.dateput.current.value().blobs[0]; + if (blob) { + blob.strings.prefix = ""; + } } if (bc) { last_string_output = bc; @@ -10326,8 +10369,6 @@ CSL.Node["date-part"] = { } }; - - /*global CSL: true */ CSL.Node["else-if"] = { @@ -11752,12 +11793,12 @@ CSL.Node["alternative-text"] = { CSL.NameOutput = function(state, Item, item) { this.debug = false; + this.state = state; //SNIP-START if (this.debug) { - print("(1)"); + this.state.sys.print("(1)"); } //SNIP-END - this.state = state; this.Item = Item; this.item = item; this.nameset_base = 0; @@ -11911,21 +11952,21 @@ CSL.NameOutput.prototype.outputNames = function () { //SNIP-START if (this.debug) { - print("(2)"); + this.state.sys.print("(2)"); } //SNIP-END // util_names_etalconfig.js this.getEtAlConfig(); //SNIP-START if (this.debug) { - print("(3)"); + this.state.sys.print("(3)"); } //SNIP-END // util_names_divide.js this.divideAndTransliterateNames(); //SNIP-START if (this.debug) { - print("(4)"); + this.state.sys.print("(4)"); } //SNIP-END // util_names_truncate.js @@ -11933,13 +11974,13 @@ CSL.NameOutput.prototype.outputNames = function () { this.truncatePersonalNameLists(); //SNIP-START if (this.debug) { - print("(5)"); + this.state.sys.print("(5)"); } //SNIP-END //SNIP-START if (this.debug) { - print("(6)"); + this.state.sys.print("(6)"); } //SNIP-END // util_names_disambig.js @@ -11949,7 +11990,7 @@ CSL.NameOutput.prototype.outputNames = function () { this.constrainNames(); //SNIP-START if (this.debug) { - print("(7)"); + this.state.sys.print("(7)"); } //SNIP-END // form="count" @@ -11963,25 +12004,25 @@ CSL.NameOutput.prototype.outputNames = function () { //SNIP-START if (this.debug) { - print("(8)"); + this.state.sys.print("(8)"); } //SNIP-END this.setEtAlParameters(); //SNIP-START if (this.debug) { - print("(9)"); + this.state.sys.print("(9)"); } //SNIP-END this.setCommonTerm(this.requireMatch); //SNIP-START if (this.debug) { - print("(10)"); + this.state.sys.print("(10)"); } //SNIP-END this.renderAllNames(); //SNIP-START if (this.debug) { - print("(11)"); + this.state.sys.print("(11)"); } //SNIP-END var blob_list = []; @@ -11995,7 +12036,7 @@ CSL.NameOutput.prototype.outputNames = function () { } else { //SNIP-START if (this.debug) { - print("(11a)"); + this.state.sys.print("(11a)"); } //SNIP-END for (var j = 0, jlen = this.institutions[v].length; j < jlen; j += 1) { @@ -12003,7 +12044,7 @@ CSL.NameOutput.prototype.outputNames = function () { } //SNIP-START if (this.debug) { - print("(11b)"); + this.state.sys.print("(11b)"); } //SNIP-END if (this.institutions[v].length) { @@ -12015,13 +12056,13 @@ CSL.NameOutput.prototype.outputNames = function () { } //SNIP-START if (this.debug) { - print("(11c)"); + this.state.sys.print("(11c)"); } //SNIP-END var varblob = this.joinFreetersAndInstitutionSets([this.freeters[v], institutions]); //SNIP-START if (this.debug) { - print("(11d)"); + this.state.sys.print("(11d)"); } //SNIP-END } @@ -12034,7 +12075,7 @@ CSL.NameOutput.prototype.outputNames = function () { } //SNIP-START if (this.debug) { - print("(11e)"); + this.state.sys.print("(11e)"); } //SNIP-END if (this.common_term) { @@ -12043,14 +12084,14 @@ CSL.NameOutput.prototype.outputNames = function () { } //SNIP-START if (this.debug) { - print("(12)"); + this.state.sys.print("(12)"); } //SNIP-END this.state.output.openLevel("empty"); this.state.output.current.value().strings.delimiter = this.state.inheritOpt(this.names, "delimiter", "names-delimiter"); //SNIP-START if (this.debug) { - print("(13)"); + this.state.sys.print("(13)"); } //SNIP-END for (i = 0, ilen = blob_list.length; i < ilen; i += 1) { @@ -12062,20 +12103,20 @@ CSL.NameOutput.prototype.outputNames = function () { } //SNIP-START if (this.debug) { - print("(14)"); + this.state.sys.print("(14)"); } //SNIP-END this.state.output.closeLevel("empty"); //SNIP-START if (this.debug) { - print("(15)"); + this.state.sys.print("(15)"); } //SNIP-END var blob = this.state.output.pop(); this.state.tmp.name_node.top = blob; //SNIP-START if (this.debug) { - print("(16)"); + this.state.sys.print("(16)"); } //SNIP-END @@ -12092,14 +12133,14 @@ CSL.NameOutput.prototype.outputNames = function () { } //SNIP-START if (this.debug) { - print("(17)"); + this.state.sys.print("(17)"); } //SNIP-END // Also used in CSL.Util.substituteEnd (which could do with // some cleanup at this writing). //SNIP-START if (this.debug) { - print("(18)"); + this.state.sys.print("(18)"); } //SNIP-END if (variables[0] !== "authority") { @@ -12164,7 +12205,7 @@ CSL.NameOutput.prototype.outputNames = function () { //SNIP-START if (this.debug) { - print("(19)"); + this.state.sys.print("(19)"); } //SNIP-END }; @@ -12256,7 +12297,7 @@ CSL.NameOutput.prototype._collapseAuthor = function () { this.state.registry.authorstrings[this.Item.id] = mystr; } else if (!this.state.tmp.just_looking && !this.state.tmp.suppress_decorations && ((this.state[this.state.tmp.area].opt.collapse && this.state[this.state.tmp.area].opt.collapse.length) || this.state[this.state.tmp.area].opt.cite_group_delimiter && this.state[this.state.tmp.area].opt.cite_group_delimiter)) { - // XX1 print("RENDER: "+this.Item.id); + // XX1 this.state.sys.print("RENDER: "+this.Item.id); mystr = ""; myqueue = this.state.tmp.name_node.top.blobs.slice(-1)[0].blobs; oldchars = this.state.tmp.offset_characters; @@ -12265,7 +12306,7 @@ CSL.NameOutput.prototype._collapseAuthor = function () { } if (mystr === this.state.tmp.last_primary_names_string) { if (this.item["suppress-author"] || (this.state[this.state.tmp.area].opt.collapse && this.state[this.state.tmp.area].opt.collapse.length)) { - // XX1 print(" CUT!"); + // XX1 this.state.sys.print(" CUT!"); this.state.tmp.name_node.top.blobs.pop(); this.state.tmp.name_node.children = []; // If popped, avoid side-effects on character counting: we're only interested @@ -12277,7 +12318,7 @@ CSL.NameOutput.prototype._collapseAuthor = function () { this.state.tmp.use_cite_group_delimiter = true; } } else { - // XX1 print("remembering: "+mystr); + // XX1 this.state.sys.print("remembering: "+mystr); this.state.tmp.last_primary_names_string = mystr; // XXXXX A little more precision would be nice. // This will clobber variable="author editor" as well as variable="author". @@ -20879,7 +20920,7 @@ CSL.Util.outputNumericField = function(state, varname, itemID) { CSL.UPDATE_GROUP_CONTEXT_CONDITION(state, masterStyling.strings.prefix, null, masterStyling, `${num.particle}${num.value}`); if (num.collapsible) { var blob; - if (num.value.match(/^[1-9][0-9]*$/)) { + if (num.value.match(/^[1-9][0-9]*$/) && Number.isSafeInteger(parseInt(num.value, 10))) { blob = new CSL.NumericBlob(state, num.particle, parseInt(num.value, 10), numStyling, itemID); } else { blob = new CSL.NumericBlob(state, num.particle, num.value, numStyling, itemID); @@ -20913,7 +20954,7 @@ CSL.Util.outputNumericField = function(state, varname, itemID) { CSL.Util.PageRangeMangler = {}; CSL.Util.PageRangeMangler.getFunction = function (state, rangeType) { - var rangerex, pos, len, stringify, listify, expand, minimize, minimize_internal, chicago, lst, m, b, e, ret, begin, end, ret_func; + var rangerex, pos, len, stringify, listify, expand, minimize, minimize_internal, chicago15, chicago16, lst, m, b, e, ret, begin, end, ret_func; var range_delimiter = state.getTerm(rangeType + "-range-delimiter"); @@ -21021,7 +21062,7 @@ CSL.Util.PageRangeMangler.getFunction = function (state, rangeType) { return ret.join(""); }; - chicago = function (lst) { + chicago15 = function (lst) { len = lst.length; for (pos = 1; pos < len; pos += 2) { if ("object" === typeof lst[pos]) { @@ -21041,6 +21082,31 @@ CSL.Util.PageRangeMangler.getFunction = function (state, rangeType) { return stringify(lst); }; + chicago16 = function (lst) { + len = lst.length; + for (pos = 1; pos < len; pos += 2) { + if ("object" === typeof lst[pos]) { + m = lst[pos]; + begin = parseInt(m[1], 10); + end = parseInt(m[3], 10); + e = "" + end; + if (begin > 100 && begin % 100) { + for (var i = 2; i < e.length; i++) { + var divisor = Math.pow(10, i); + if (Math.floor(begin / divisor) === Math.floor(end / divisor)) { + m[3] = "" + (end % divisor); + break; + } + } + } + } + if (m[2].slice(1) === m[0]) { + m[2] = range_delimiter; + } + } + return stringify(lst); + }; + // // The top-level option handlers. // @@ -21070,7 +21136,15 @@ CSL.Util.PageRangeMangler.getFunction = function (state, rangeType) { }; } else if (state.opt[rangeType + "-range-format"] === "chicago") { ret_func = function (str) { - return sniff(str, chicago); + return sniff(str, chicago15); + }; + } else if (state.opt[rangeType + "-range-format"] === "chicago-15") { + ret_func = function (str) { + return sniff(str, chicago15); + }; + } else if (state.opt[rangeType + "-range-format"] === "chicago-16") { + ret_func = function (str) { + return sniff(str, chicago16); }; } @@ -21668,7 +21742,7 @@ CSL.Output.Formatters = (function () { var rexNameStr = "(?:[-\\s]*<\\/*(?:span\s+class=\"no(?:case|decor)\"|i|sc|b|sub|sup)>[-\\s]*|[-\\s]+)"; var nameDoppel = new CSL.Doppeler(rexNameStr); - var wordDoppel = new CSL.Doppeler("(?:[\u0020\u00A0\u2000-\u200B\u205F\u3000]+)"); + var wordDoppel = new CSL.Doppeler("(?:[\u00A0\u0020\u00A0\u2000-\u200B\u205F\u3000]+)"); /** * INTERNAL @@ -21941,7 +22015,6 @@ CSL.Output.Formatters = (function () { quoteState: [], capitaliseWords: function(str, i, followingTag) { if (str.trim()) { - var words = str.split(/[ \u00A0]+/); var wordle = wordDoppel.split(str); var words = wordle.strings; for (var j=0,jlen=words.length;j 1 && !CSL.toLocaleLowerCase.call(state, word).match(config.skipWordsRex)) { + let lcase = CSL.toLocaleLowerCase.call(state, word); + let capitalize = false; + if (word.length > 1 && !lcase.match(config.skipWordsRex)) { // Capitalize every word that is not a stop-word - words[j] = _capitalise.call(state, words[j]); + capitalize = true; } else if (j === (words.length - 1) && followingTag === "-") { - words[j] = _capitalise.call(state, words[j]); + capitalize = true; } else if (config.isFirst) { // Capitalize first word, even if a stop-word - words[j] = _capitalise.call(state, words[j]); + capitalize = true; } else if (config.afterPunct) { // Capitalize after punctuation - words[j] = _capitalise.call(state, words[j]); + capitalize = true; + } + // Don't capitalize if word already contains capitalization + if (capitalize && word === lcase) { + words[j] = _capitalise.call(state, word); } config.afterPunct = false; config.isFirst = false; @@ -21989,18 +22068,22 @@ CSL.Output.Formatters = (function () { var config = { quoteState: [], capitaliseWords: function(str) { - var words = str.split(" "); + var wordle = wordDoppel.split(str); + var words = wordle.strings; for (var i=0,ilen=words.length;i 1) { - print(" -----------"); + this.state.sys.print(" -----------"); } } //SNIP-END if (this.ItemCite === otherItemCite) { //SNIP-START if (this.debug) { - print(" [CLASH]--> "+this.Item.id+": "+this.ItemCite); - print(" "+otherItem.id+": "+otherItemCite); + this.state.sys.print(" [CLASH]--> "+this.Item.id+": "+this.ItemCite); + this.state.sys.print(" "+otherItem.id+": "+otherItemCite); } //SNIP-END clashes += 1; @@ -23931,8 +24021,8 @@ CSL.Disambiguation.prototype.scanItems = function (list) { } else { //SNIP-START if (this.debug) { - print(" [clear]--> "+this.Item.id+": "+this.ItemCite); - print(" "+otherItem.id+": "+otherItemCite); + this.state.sys.print(" [clear]--> "+this.Item.id+": "+this.ItemCite); + this.state.sys.print(" "+otherItem.id+": "+otherItemCite); } //SNIP-END this.nonpartners.push(otherItem); @@ -23958,9 +24048,9 @@ CSL.Disambiguation.prototype.disNames = function (ismax) { //SNIP-START if (this.debug) { - print("[3] == disNames() =="); - //print(" partners: "+[this.partners[i].id for (i in this.partners)].join(", ")); - //print(" nonpartners: "+[this.nonpartners[i].id for (i in this.nonpartners)].join(", ")); + this.state.sys.print("[3] == disNames() =="); + //this.state.sys.print(" partners: "+[this.partners[i].id for (i in this.partners)].join(", ")); + //this.state.sys.print(" nonpartners: "+[this.nonpartners[i].id for (i in this.nonpartners)].join(", ")); } //SNIP-END @@ -23988,8 +24078,8 @@ CSL.Disambiguation.prototype.disNames = function (ismax) { this.captureStepToBase(); //SNIP-START if (this.debug) { - print(" ** RESOLUTION [a]: lone partner, one nonpartner"); - print(" registering "+this.partners[0].id+" and "+this.nonpartners[0].id); + this.state.sys.print(" ** RESOLUTION [a]: lone partner, one nonpartner"); + this.state.sys.print(" registering "+this.partners[0].id+" and "+this.nonpartners[0].id); } //SNIP-END this.state.registry.registerAmbigToken(this.akey, "" + this.nonpartners[0].id, this.betterbase); @@ -23999,8 +24089,8 @@ CSL.Disambiguation.prototype.disNames = function (ismax) { this.captureStepToBase(); //SNIP-START if (this.debug) { - print(" ** RESOLUTION [b]: lone partner, unknown number of remaining nonpartners"); - print(" registering "+this.partners[0].id); + this.state.sys.print(" ** RESOLUTION [b]: lone partner, unknown number of remaining nonpartners"); + this.state.sys.print(" registering "+this.partners[0].id); } //SNIP-END this.state.registry.registerAmbigToken(this.akey, "" + this.partners[0].id, this.betterbase); @@ -24012,8 +24102,8 @@ CSL.Disambiguation.prototype.disNames = function (ismax) { this.captureStepToBase(); //SNIP-START if (this.debug) { - print(" ** RESOLUTION [c]: lone nonpartner, unknown number of partners remaining"); - print(" registering "+this.nonpartners[0].id); + this.state.sys.print(" ** RESOLUTION [c]: lone nonpartner, unknown number of partners remaining"); + this.state.sys.print(" registering "+this.nonpartners[0].id); } //SNIP-END this.state.registry.registerAmbigToken(this.akey, "" + this.nonpartners[0].id, this.betterbase); @@ -24023,7 +24113,7 @@ CSL.Disambiguation.prototype.disNames = function (ismax) { this.captureStepToBase(); //SNIP-START if (this.debug) { - print(" ** RESOLUTION [d]: better result, but no entries safe to register"); + this.state.sys.print(" ** RESOLUTION [d]: better result, but no entries safe to register"); } //SNIP-END this.lists[this.listpos] = [this.betterbase, this.partners]; @@ -24031,7 +24121,7 @@ CSL.Disambiguation.prototype.disNames = function (ismax) { } else { //SNIP-START if (this.debug) { - print(" ** RESOLUTION [e]: no improvement, and clashes remain"); + this.state.sys.print(" ** RESOLUTION [e]: no improvement, and clashes remain"); } //SNIP-END if (ismax) { @@ -24040,7 +24130,7 @@ CSL.Disambiguation.prototype.disNames = function (ismax) { if (this.modeindex === this.modes.length - 1) { //SNIP-START if (this.debug) { - print(" (registering clashing entries because we've run out of options)"); + this.state.sys.print(" (registering clashing entries because we've run out of options)"); } //SNIP-END for (var i = 0, ilen = this.partners.length; i < ilen; i += 1) { @@ -24055,7 +24145,7 @@ CSL.Disambiguation.prototype.disNames = function (ismax) { CSL.Disambiguation.prototype.disExtraText = function () { //SNIP-START if (this.debug) { - print("[3] === disExtraText =="); + this.state.sys.print("[3] === disExtraText =="); } //SNIP-END @@ -24117,7 +24207,7 @@ CSL.Disambiguation.prototype.disYears = function () { var pos, len, tokens, token; //SNIP-START if (this.debug) { - print("[3] === disYears =="); + this.state.sys.print("[3] === disYears =="); } //SNIP-END tokens = []; @@ -24153,7 +24243,7 @@ CSL.Disambiguation.prototype.disYears = function () { CSL.Disambiguation.prototype.incrementDisambig = function () { //SNIP-START if (this.debug) { - print("\n[1] === incrementDisambig() ==="); + this.state.sys.print("\n[1] === incrementDisambig() ==="); } //SNIP-END if (this.initGivens) { @@ -24217,20 +24307,20 @@ CSL.Disambiguation.prototype.incrementDisambig = function () { } //SNIP-START if (this.debug) { - print(" ------------------"); - print(" incremented values"); - print(" ------------------"); - print(" | gnameset: "+this.gnameset); - print(" | gname: "+this.gname); - print(" | names value: "+this.base.names[this.gnameset]); + this.state.sys.print(" ------------------"); + this.state.sys.print(" incremented values"); + this.state.sys.print(" ------------------"); + this.state.sys.print(" | gnameset: "+this.gnameset); + this.state.sys.print(" | gname: "+this.gname); + this.state.sys.print(" | names value: "+this.base.names[this.gnameset]); if (this.base.givens.length) { - print(" | givens value: "+this.base.givens[this.gnameset][this.gname]); + this.state.sys.print(" | givens value: "+this.base.givens[this.gnameset][this.gname]); } else { - print(" | givens value: nil"); + this.state.sys.print(" | givens value: nil"); } - print(" | namesetsMax: "+this.namesetsMax); - print(" | namesMax: "+this.namesMax); - print(" | givensMax: "+this.givensMax); + this.state.sys.print(" | namesetsMax: "+this.namesetsMax); + this.state.sys.print(" | namesMax: "+this.namesMax); + this.state.sys.print(" | givensMax: "+this.givensMax); } //SNIP-END if (("number" !== typeof this.namesetsMax || this.namesetsMax === -1 || this.gnameset === this.namesetsMax) @@ -24241,7 +24331,7 @@ CSL.Disambiguation.prototype.incrementDisambig = function () { maxed = true; //SNIP-START if (this.debug) { - print(" MAXED"); + this.state.sys.print(" MAXED"); } //SNIP-END } @@ -24256,7 +24346,7 @@ CSL.Disambiguation.prototype.initVars = function (akey) { var i, ilen, myIds, myItemBundles, myItems; //SNIP-START if (this.debug) { - print("[B] === initVars() ==="); + this.state.sys.print("[B] === initVars() ==="); } //SNIP-END this.lists = []; From 860e9012401883fd5e43dd412a1497c2086c56e1 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Thu, 20 Apr 2023 03:21:33 -0400 Subject: [PATCH 50/86] Fix redundant Number on Dataset item type --- chrome/content/zotero/xpcom/data/items.js | 2 +- chrome/content/zotero/xpcom/schema.js | 13 +++++++++++-- resource/schema/global | 2 +- resource/schema/userdata.sql | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/chrome/content/zotero/xpcom/data/items.js b/chrome/content/zotero/xpcom/data/items.js index dcc244f6855..8fc1e134170 100644 --- a/chrome/content/zotero/xpcom/data/items.js +++ b/chrome/content/zotero/xpcom/data/items.js @@ -556,7 +556,7 @@ Zotero.Items = function() { } catch (e) { if (e.message.includes('no such column: IA.authorName') - && await Zotero.DB.valueQueryAsync("SELECT COUNT(*) FROM version WHERE schema='userdata' AND version=120")) { + && await Zotero.DB.valueQueryAsync("SELECT COUNT(*) FROM version WHERE schema='userdata' AND version IN (120, 121)")) { await Zotero.DB.queryAsync("UPDATE version SET version=119 WHERE schema='userdata'"); Zotero.crash(); } diff --git a/chrome/content/zotero/xpcom/schema.js b/chrome/content/zotero/xpcom/schema.js index 8f2c14784c8..af8bd6b0d33 100644 --- a/chrome/content/zotero/xpcom/schema.js +++ b/chrome/content/zotero/xpcom/schema.js @@ -3466,8 +3466,17 @@ Zotero.Schema = new function(){ } } - // TEMP: When adding 121, check whether IA.authorName fix in items.js::_loadAnnotations() - // should be updated + else if (i == 121) { + let datasetItemTypeID = await Zotero.DB.valueQueryAsync("SELECT itemTypeID FROM itemTypes WHERE typeName='dataset'"); + let numberFieldID = await Zotero.DB.valueQueryAsync("SELECT fieldID FROM fields WHERE fieldName='number'"); + if (datasetItemTypeID && numberFieldID) { + await Zotero.DB.queryAsync("DELETE FROM itemData WHERE fieldID=? AND itemID IN (SELECT itemID FROM items WHERE itemTypeID=?)", [numberFieldID, datasetItemTypeID]); + await Zotero.DB.queryAsync("DELETE FROM itemTypeFields WHERE itemTypeID=? AND fieldID=?", [datasetItemTypeID, numberFieldID]); + } + } + + // TEMP: When adding 122, check whether IA.authorName fix in items.js::_loadAnnotations() + // can be updated due to update steps being indempodent // If breaking compatibility or doing anything dangerous, clear minorUpdateFrom } diff --git a/resource/schema/global b/resource/schema/global index b0918becbad..1b12272d441 160000 --- a/resource/schema/global +++ b/resource/schema/global @@ -1 +1 @@ -Subproject commit b0918becbad9e371e21affde32850c649c6bde8e +Subproject commit 1b12272d44134a652519e9192e5a936ac9fcd707 diff --git a/resource/schema/userdata.sql b/resource/schema/userdata.sql index dda3aa69531..da748e36f1e 100644 --- a/resource/schema/userdata.sql +++ b/resource/schema/userdata.sql @@ -1,4 +1,4 @@ --- 120 +-- 121 -- Copyright (c) 2009 Center for History and New Media -- George Mason University, Fairfax, Virginia, USA From bed256318a19758edd18e19252f6505d133e18b5 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Thu, 20 Apr 2023 03:34:30 -0400 Subject: [PATCH 51/86] Update connectorTypeSchemaData and test data for Dataset Number removal --- resource/schema/connectorTypeSchemaData.js | 2 +- test/tests/data/itemJSON.js | 1 + test/tests/data/translatorExport.js | 1 + test/tests/data/translatorExportLegacy.js | 3 +++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/resource/schema/connectorTypeSchemaData.js b/resource/schema/connectorTypeSchemaData.js index 709d4930df0..fe2bfbc239a 100644 --- a/resource/schema/connectorTypeSchemaData.js +++ b/resource/schema/connectorTypeSchemaData.js @@ -1 +1 @@ -Zotero.Connector_Types.schema = {"itemTypes":{"1":["note","Note",[false],[],{},"treeitem-note.png"],"2":["book","Book",[1,2,3,5,4],[110,90,3,30,4,45,6,7,8,14,118,87,11,116,1,27,123,19,62,18,2,22],{},"treeitem-book.png"],"3":["bookSection","Book Section",[1,29,2,3,5,4],[110,90,115,3,30,4,45,6,7,8,14,10,87,11,116,1,27,123,19,62,18,2,22],{"115":12},"treeitem-bookSection.png"],"4":["journalArticle","Journal Article",[1,2,3,27,4],[110,90,12,4,5,10,14,3,28,29,25,87,26,13,116,1,27,123,19,62,18,2,22],{},"treeitem-journalArticle.png"],"5":["magazineArticle","Magazine Article",[1,2,27,4],[110,90,12,4,5,14,10,87,13,116,1,27,123,19,62,18,2,22],{},"treeitem-magazineArticle.png"],"6":["newspaperArticle","Newspaper Article",[1,2,27,4],[110,90,12,7,6,14,15,10,87,116,13,1,27,123,19,62,18,2,22],{},"treeitem-newspaperArticle.png"],"7":["thesis","Thesis",[1,2],[110,90,69,89,7,14,118,87,116,1,27,123,19,62,18,2,22],{"69":108,"89":8},"treeitem-thesis.png"],"8":["letter","Letter",[1,2,16],[110,90,65,14,87,116,1,27,123,19,62,18,2,22],{"65":108},"treeitem-letter.png"],"9":["manuscript","Manuscript",[1,2,4],[110,90,66,7,14,118,87,116,1,27,123,19,62,18,2,22],{"66":108},"treeitem-manuscript.png"],"10":["interview","Interview",[6,2,7,4],[110,90,14,64,87,116,1,27,123,19,62,18,2,22],{"64":109},"treeitem-interview.png"],"11":["film","Film",[8,2,10,9],[110,90,21,14,122,63,77,87,116,1,27,123,19,62,18,2,22],{"21":8,"63":109,"122":108},"treeitem-film.png"],"12":["artwork","Artwork",[22,2],[110,90,59,61,14,87,116,123,19,62,18,1,27,2,22],{"59":109},"treeitem-artwork.png"],"13":["webpage","Web Page",[1,2,4],[110,90,91,70,14,116,1,27,87,2,22],{"70":108,"91":12},"treeitem-webpage.png"],"14":["attachment","Attachment",[false],[110,27,1],{},"treeitem.png"],"15":["report","Report",[1,2,5,4],[110,90,92,32,28,7,31,14,10,87,116,1,27,123,19,62,18,2,22],{"31":8,"32":108,"92":60},"treeitem-report.png"],"16":["bill","Bill",[12,2,28],[110,90,93,36,94,15,95,41,40,42,14,87,1,27,116,2,22],{"41":127,"93":60,"94":4,"95":10},"treeitem-bill.png"],"17":["case","Case",[1,2,13],[111,90,44,96,117,43,97,98,42,87,116,1,27,2,22],{"44":127,"96":14,"97":4,"98":10,"111":110,"117":60},"treeitem-case.png"],"18":["hearing","Hearing",[2],[110,90,46,7,8,45,99,10,41,40,42,14,87,116,1,27,2,22],{"41":127,"99":60},"treeitem-hearing.png"],"19":["patent","Patent",[14,15,2],[110,90,7,102,48,120,50,121,10,103,51,52,53,54,87,116,1,27,2,22],{"50":60,"52":14,"54":131,"120":127},"treeitem-patent.png"],"20":["statute","Statute",[1,2],[112,90,36,55,101,100,10,15,40,42,87,116,1,27,2,22],{"100":14,"101":60,"112":110},"treeitem-statute.png"],"21":["email","E-mail",[1,2,16],[113,90,14,116,1,27,87,2,22],{"113":110},"treeitem-email.png"],"22":["map","Map",[20,2,5],[110,90,67,68,28,6,7,8,14,87,11,116,1,27,123,19,62,18,2,22],{"67":108},"treeitem-map.png"],"23":["blogPost","Blog Post",[1,23,2],[110,90,107,70,14,1,27,87,116,2,22],{"70":108,"107":12},"treeitem-blogPost.png"],"24":["instantMessage","Instant Message",[1,2,16],[110,90,14,87,116,1,27,2,22],{},"treeitem-instantMessage.png"],"25":["forumPost","Forum Post",[1,2],[110,90,104,79,14,87,116,1,27,2,22],{"79":108,"104":12},"treeitem-forumPost.png"],"26":["audioRecording","Audio Recording",[17,18,2,19],[110,90,71,28,4,45,7,72,14,77,87,11,116,123,19,62,18,1,27,2,22],{"71":109,"72":8},"treeitem-audioRecording.png"],"27":["presentation","Presentation",[24,2],[110,90,74,14,7,75,1,27,87,116,2,22],{"74":108},"treeitem-presentation.png"],"28":["videoRecording","Video Recording",[8,11,2,10,9],[110,90,63,28,4,45,7,76,14,77,87,11,116,1,27,123,19,62,18,2,22],{"63":109,"76":8},"treeitem-videoRecording.png"],"29":["tvBroadcast","TV Broadcast",[8,11,2,25,10,9],[110,90,119,105,63,7,78,14,77,87,116,1,27,123,19,62,18,2,22],{"63":109,"78":8,"105":60,"119":12},"treeitem-tvBroadcast.png"],"30":["radioBroadcast","Radio Broadcast",[8,11,2,25,10,9],[110,90,119,105,71,7,78,14,77,87,116,1,27,123,19,62,18,2,22],{"71":109,"78":8,"105":60,"119":12},"treeitem-radioBroadcast.png"],"31":["podcast","Podcast",[26,2,25],[110,90,28,105,80,77,1,27,87,116,2,22],{"80":109,"105":60},"treeitem-podcast.png"],"32":["computerProgram","Software",[21,2],[110,90,28,81,14,82,7,83,88,11,116,1,2,123,19,62,18,27,22],{"83":8},"treeitem-computerProgram.png"],"33":["conferencePaper","Conference Paper",[1,2,3,5,4],[110,90,14,114,84,7,8,4,10,3,87,26,11,116,1,27,123,19,62,18,2,22],{"114":12},"treeitem-conferencePaper.png"],"34":["document","Document",[1,2,3,27,4],[110,90,8,14,87,116,1,27,123,19,62,18,2,22],{},"treeitem.png"],"35":["encyclopediaArticle","Encyclopedia Article",[1,2,3,5,4],[110,90,85,3,30,4,45,6,7,8,14,10,11,116,1,27,87,123,19,62,18,2,22],{"85":12},"treeitem-encyclopediaArticle.png"],"36":["dictionaryEntry","Dictionary Entry",[1,2,3,5,4],[110,90,86,3,30,4,45,6,7,8,14,10,87,11,116,1,27,123,19,62,18,2,22],{"86":12},"treeitem-dictionaryEntry.png"],"37":["annotation","Annotation",[false],[],{},"treeitem.png"],"38":["preprint","Preprint",[1,2,3,27,4],[110,90,122,124,125,7,14,3,30,26,126,1,27,123,19,116,87,62,18,2,22],{"122":108,"124":8,"125":60},"treeitem-preprint.png"],"39":["dataset","Dataset",[1,2],[110,90,128,108,60,81,14,124,129,130,26,126,1,27,123,19,116,87,62,18,2,22],{"124":8,"128":60,"129":7,"130":109},"treeitem-dataset.png"],"40":["standard","Standard",[1,2],[110,90,132,46,108,60,81,131,14,8,7,26,126,1,27,123,19,116,118,87,62,18,2,22],{"132":127},"treeitem-standard.png"],"10001":["nsfReviewer","NSF Reviewer",[false],[10001,31,10002,10003,10004,10005,10006,10007,10008,10009,10010,10011],{"31":false,"10001":110,"10005":1,"10008":14},"report_user.png"]},"creatorTypes":{"1":["author","Author"],"2":["contributor","Contributor"],"3":["editor","Editor"],"4":["translator","Translator"],"5":["seriesEditor","Series Editor"],"6":["interviewee","Interview With"],"7":["interviewer","Interviewer"],"8":["director","Director"],"9":["scriptwriter","Scriptwriter"],"10":["producer","Producer"],"11":["castMember","Cast Member"],"12":["sponsor","Sponsor"],"13":["counsel","Counsel"],"14":["inventor","Inventor"],"15":["attorneyAgent","Attorney/Agent"],"16":["recipient","Recipient"],"17":["performer","Performer"],"18":["composer","Composer"],"19":["wordsBy","Words By"],"20":["cartographer","Cartographer"],"21":["programmer","Programmer"],"22":["artist","Artist"],"23":["commenter","Commenter"],"24":["presenter","Presenter"],"25":["guest","Guest"],"26":["podcaster","Podcaster"],"27":["reviewedAuthor","Reviewed Author"],"28":["cosponsor","Cosponsor"],"29":["bookAuthor","Book Author"]},"fields":{"1":["url","url",true],"2":["rights","rights",true],"3":["series","series",true],"4":["volume","volume",true],"5":["issue","issue",true],"6":["edition","edition",true],"7":["place","place",true],"8":["publisher","publisher",true],"10":["pages","pages",true],"11":["ISBN","ISBN",true],"12":["publicationTitle","publicationTitle",true],"13":["ISSN","ISSN",true],"14":["date","date",true],"15":["section","section",true],"18":["callNumber","callNumber",true],"19":["archiveLocation","archiveLocation",true],"21":["distributor","distributor",false],"22":["extra","extra",true],"25":["journalAbbreviation","journalAbbreviation",true],"26":["DOI","DOI",true],"27":["accessDate","accessDate",true],"28":["seriesTitle","seriesTitle",true],"29":["seriesText","seriesText",true],"30":["seriesNumber","seriesNumber",true],"31":["institution","institution",false],"32":["reportType","reportType",false],"36":["code","code",true],"40":["session","session",true],"41":["legislativeBody","legislativeBody",false],"42":["history","history",true],"43":["reporter","reporter",true],"44":["court","court",false],"45":["numberOfVolumes","numberOfVolumes",true],"46":["committee","committee",true],"48":["assignee","assignee",true],"50":["patentNumber","patentNumber",false],"51":["priorityNumbers","priorityNumbers",true],"52":["issueDate","issueDate",false],"53":["references","references",true],"54":["legalStatus","legalStatus",false],"55":["codeNumber","codeNumber",true],"59":["artworkMedium","artworkMedium",false],"60":["number","number",true],"61":["artworkSize","artworkSize",true],"62":["libraryCatalog","libraryCatalog",true],"63":["videoRecordingFormat","videoRecordingFormat",false],"64":["interviewMedium","interviewMedium",false],"65":["letterType","letterType",false],"66":["manuscriptType","manuscriptType",false],"67":["mapType","mapType",false],"68":["scale","scale",true],"69":["thesisType","thesisType",false],"70":["websiteType","websiteType",false],"71":["audioRecordingFormat","audioRecordingFormat",false],"72":["label","label",false],"74":["presentationType","presentationType",false],"75":["meetingName","meetingName",true],"76":["studio","studio",false],"77":["runningTime","runningTime",true],"78":["network","network",false],"79":["postType","postType",false],"80":["audioFileType","audioFileType",false],"81":["versionNumber","versionNumber",true],"82":["system","system",true],"83":["company","company",false],"84":["conferenceName","conferenceName",true],"85":["encyclopediaTitle","encyclopediaTitle",false],"86":["dictionaryTitle","dictionaryTitle",false],"87":["language","language",true],"88":["programmingLanguage","programmingLanguage",true],"89":["university","university",false],"90":["abstractNote","abstractNote",true],"91":["websiteTitle","websiteTitle",false],"92":["reportNumber","reportNumber",false],"93":["billNumber","billNumber",false],"94":["codeVolume","codeVolume",false],"95":["codePages","codePages",false],"96":["dateDecided","dateDecided",false],"97":["reporterVolume","reporterVolume",false],"98":["firstPage","firstPage",false],"99":["documentNumber","documentNumber",false],"100":["dateEnacted","dateEnacted",false],"101":["publicLawNumber","publicLawNumber",false],"102":["country","country",true],"103":["applicationNumber","applicationNumber",true],"104":["forumTitle","forumTitle",false],"105":["episodeNumber","episodeNumber",false],"107":["blogTitle","blogTitle",false],"108":["type","type",true],"109":["medium","medium",true],"110":["title","title",true],"111":["caseName","caseName",false],"112":["nameOfAct","nameOfAct",false],"113":["subject","subject",false],"114":["proceedingsTitle","proceedingsTitle",false],"115":["bookTitle","bookTitle",false],"116":["shortTitle","shortTitle",true],"117":["docketNumber","docketNumber",false],"118":["numPages","numPages",true],"119":["programTitle","programTitle",false],"120":["issuingAuthority","issuingAuthority",false],"121":["filingDate","filingDate",true],"122":["genre","genre",false],"123":["archive","archive",true],"124":["repository","repository",false],"125":["archiveID","archiveID",false],"126":["citationKey","citationKey",true],"127":["authority","authority",true],"128":["identifier","identifier",false],"129":["repositoryLocation","repositoryLocation",false],"130":["format","format",false],"131":["status","status",true],"132":["organization","organization",false],"10001":["name","name",false],"10002":["address","address",true],"10003":["telephone","telephone",true],"10004":["email","email",true],"10005":["homepage","homepage",false],"10006":["discipline","discipline",true],"10007":["nsfID","nsfID",true],"10008":["dateSent","dateSent",false],"10009":["dateDue","dateDue",true],"10010":["accepted","accepted",true],"10011":["programDirector","programDirector",true]}} \ No newline at end of file +Zotero.Connector_Types.schema = {"itemTypes":{"1":["note","Note",[false],[],{},"treeitem-note@2x.png"],"2":["book","Book",[1,2,3,5,4],[110,90,3,30,4,45,6,7,8,14,118,87,11,116,1,27,123,19,62,18,2,22],{},"treeitem-book@2x.png"],"3":["bookSection","Book Section",[1,29,2,3,5,4],[110,90,115,3,30,4,45,6,7,8,14,10,87,11,116,1,27,123,19,62,18,2,22],{"115":12},"treeitem-bookSection@2x.png"],"4":["journalArticle","Journal Article",[1,2,3,27,4],[110,90,12,4,5,10,14,3,28,29,25,87,26,13,116,1,27,123,19,62,18,2,22],{},"treeitem-journalArticle@2x.png"],"5":["magazineArticle","Magazine Article",[1,2,27,4],[110,90,12,4,5,14,10,87,13,116,1,27,123,19,62,18,2,22],{},"treeitem-magazineArticle@2x.png"],"6":["newspaperArticle","Newspaper Article",[1,2,27,4],[110,90,12,7,6,14,15,10,87,116,13,1,27,123,19,62,18,2,22],{},"treeitem-newspaperArticle@2x.png"],"7":["thesis","Thesis",[1,2],[110,90,69,89,7,14,118,87,116,1,27,123,19,62,18,2,22],{"69":108,"89":8},"treeitem-thesis@2x.png"],"8":["letter","Letter",[1,2,16],[110,90,65,14,87,116,1,27,123,19,62,18,2,22],{"65":108},"treeitem-letter@2x.png"],"9":["manuscript","Manuscript",[1,2,4],[110,90,66,7,14,118,87,116,1,27,123,19,62,18,2,22],{"66":108},"treeitem-manuscript@2x.png"],"10":["interview","Interview",[6,2,7,4],[110,90,14,64,87,116,1,27,123,19,62,18,2,22],{"64":109},"treeitem-interview@2x.png"],"11":["film","Film",[8,2,10,9],[110,90,21,14,122,63,77,87,116,1,27,123,19,62,18,2,22],{"21":8,"63":109,"122":108},"treeitem-film@2x.png"],"12":["artwork","Artwork",[22,2],[110,90,59,61,14,87,116,123,19,62,18,1,27,2,22],{"59":109},"treeitem-artwork@2x.png"],"13":["webpage","Web Page",[1,2,4],[110,90,91,70,14,116,1,27,87,2,22],{"70":108,"91":12},"treeitem-webpage@2x.png"],"14":["attachment","Attachment",[false],[110,27,1],{},"treeitem@2x.png"],"15":["report","Report",[1,2,5,4],[110,90,92,32,28,7,31,14,10,87,116,1,27,123,19,62,18,2,22],{"31":8,"32":108,"92":60},"treeitem-report@2x.png"],"16":["bill","Bill",[12,2,28],[110,90,93,36,94,15,95,41,40,42,14,87,1,27,116,2,22],{"41":127,"93":60,"94":4,"95":10},"treeitem-bill@2x.png"],"17":["case","Case",[1,2,13],[111,90,44,96,117,43,97,98,42,87,116,1,27,2,22],{"44":127,"96":14,"97":4,"98":10,"111":110,"117":60},"treeitem-case@2x.png"],"18":["hearing","Hearing",[2],[110,90,46,7,8,45,99,10,41,40,42,14,87,116,1,27,2,22],{"41":127,"99":60},"treeitem-hearing@2x.png"],"19":["patent","Patent",[14,15,2],[110,90,7,102,48,120,50,121,10,103,51,52,53,54,87,116,1,27,2,22],{"50":60,"52":14,"54":131,"120":127},"treeitem-patent@2x.png"],"20":["statute","Statute",[1,2],[112,90,36,55,101,100,10,15,40,42,87,116,1,27,2,22],{"100":14,"101":60,"112":110},"treeitem-statute@2x.png"],"21":["email","E-mail",[1,2,16],[113,90,14,116,1,27,87,2,22],{"113":110},"treeitem-email@2x.png"],"22":["map","Map",[20,2,5],[110,90,67,68,28,6,7,8,14,87,11,116,1,27,123,19,62,18,2,22],{"67":108},"treeitem-map.png"],"23":["blogPost","Blog Post",[1,23,2],[110,90,107,70,14,1,27,87,116,2,22],{"70":108,"107":12},"treeitem-blogPost@2x.png"],"24":["instantMessage","Instant Message",[1,2,16],[110,90,14,87,116,1,27,2,22],{},"treeitem-instantMessage@2x.png"],"25":["forumPost","Forum Post",[1,2],[110,90,104,79,14,87,116,1,27,2,22],{"79":108,"104":12},"treeitem-forumPost@2x.png"],"26":["audioRecording","Audio Recording",[17,18,2,19],[110,90,71,28,4,45,7,72,14,77,87,11,116,123,19,62,18,1,27,2,22],{"71":109,"72":8},"treeitem-audioRecording@2x.png"],"27":["presentation","Presentation",[24,2],[110,90,74,14,7,75,1,27,87,116,2,22],{"74":108},"treeitem-presentation@2x.png"],"28":["videoRecording","Video Recording",[8,11,2,10,9],[110,90,63,28,4,45,7,76,14,77,87,11,116,1,27,123,19,62,18,2,22],{"63":109,"76":8},"treeitem-videoRecording.png"],"29":["tvBroadcast","TV Broadcast",[8,11,2,25,10,9],[110,90,119,105,63,7,78,14,77,87,116,1,27,123,19,62,18,2,22],{"63":109,"78":8,"105":60,"119":12},"treeitem-tvBroadcast.png"],"30":["radioBroadcast","Radio Broadcast",[8,11,2,25,10,9],[110,90,119,105,71,7,78,14,77,87,116,1,27,123,19,62,18,2,22],{"71":109,"78":8,"105":60,"119":12},"treeitem-radioBroadcast.png"],"31":["podcast","Podcast",[26,2,25],[110,90,28,105,80,77,1,27,87,116,2,22],{"80":109,"105":60},"treeitem-podcast.png"],"32":["computerProgram","Software",[21,2],[110,90,28,81,14,82,7,83,88,11,116,1,2,123,19,62,18,27,22],{"83":8},"treeitem-computerProgram@2x.png"],"33":["conferencePaper","Conference Paper",[1,2,3,5,4],[110,90,14,114,84,7,8,4,10,3,87,26,11,116,1,27,123,19,62,18,2,22],{"114":12},"treeitem-conferencePaper@2x.png"],"34":["document","Document",[1,2,3,27,4],[110,90,8,14,87,116,1,27,123,19,62,18,2,22],{},"treeitem@2x.png"],"35":["encyclopediaArticle","Encyclopedia Article",[1,2,3,5,4],[110,90,85,3,30,4,45,6,7,8,14,10,11,116,1,27,87,123,19,62,18,2,22],{"85":12},"treeitem-encyclopediaArticle@2x.png"],"36":["dictionaryEntry","Dictionary Entry",[1,2,3,5,4],[110,90,86,3,30,4,45,6,7,8,14,10,87,11,116,1,27,123,19,62,18,2,22],{"86":12},"treeitem-dictionaryEntry@2x.png"],"37":["annotation","Annotation",[false],[],{},"treeitem@2x.png"],"38":["preprint","Preprint",[1,2,3,27,4],[110,90,122,124,125,7,14,3,30,26,126,1,27,123,19,116,87,62,18,2,22],{"122":108,"124":8,"125":60},"treeitem-preprint@2x.png"],"39":["dataset","Dataset",[1,2],[110,90,128,108,81,14,124,129,130,26,126,1,27,123,19,116,87,62,18,2,22],{"124":8,"128":60,"129":7,"130":109},"treeitem-dataset@2x.png"],"40":["standard","Standard",[1,2],[110,90,132,46,108,60,81,131,14,8,7,26,126,1,27,123,19,116,118,87,62,18,2,22],{"132":127},"treeitem-standard@2x.png"],"10001":["nsfReviewer","NSF Reviewer",[false],[10001,31,10002,10003,10004,10005,10006,10007,10008,10009,10010,10011],{"31":false,"10001":110,"10005":1,"10008":14},"report_user.png"]},"creatorTypes":{"1":["author","Author"],"2":["contributor","Contributor"],"3":["editor","Editor"],"4":["translator","Translator"],"5":["seriesEditor","Series Editor"],"6":["interviewee","Interview With"],"7":["interviewer","Interviewer"],"8":["director","Director"],"9":["scriptwriter","Scriptwriter"],"10":["producer","Producer"],"11":["castMember","Cast Member"],"12":["sponsor","Sponsor"],"13":["counsel","Counsel"],"14":["inventor","Inventor"],"15":["attorneyAgent","Attorney/Agent"],"16":["recipient","Recipient"],"17":["performer","Performer"],"18":["composer","Composer"],"19":["wordsBy","Words By"],"20":["cartographer","Cartographer"],"21":["programmer","Programmer"],"22":["artist","Artist"],"23":["commenter","Commenter"],"24":["presenter","Presenter"],"25":["guest","Guest"],"26":["podcaster","Podcaster"],"27":["reviewedAuthor","Reviewed Author"],"28":["cosponsor","Cosponsor"],"29":["bookAuthor","Book Author"]},"fields":{"1":["url","url",true],"2":["rights","rights",true],"3":["series","series",true],"4":["volume","volume",true],"5":["issue","issue",true],"6":["edition","edition",true],"7":["place","place",true],"8":["publisher","publisher",true],"10":["pages","pages",true],"11":["ISBN","ISBN",true],"12":["publicationTitle","publicationTitle",true],"13":["ISSN","ISSN",true],"14":["date","date",true],"15":["section","section",true],"18":["callNumber","callNumber",true],"19":["archiveLocation","archiveLocation",true],"21":["distributor","distributor",false],"22":["extra","extra",true],"25":["journalAbbreviation","journalAbbreviation",true],"26":["DOI","DOI",true],"27":["accessDate","accessDate",true],"28":["seriesTitle","seriesTitle",true],"29":["seriesText","seriesText",true],"30":["seriesNumber","seriesNumber",true],"31":["institution","institution",false],"32":["reportType","reportType",false],"36":["code","code",true],"40":["session","session",true],"41":["legislativeBody","legislativeBody",false],"42":["history","history",true],"43":["reporter","reporter",true],"44":["court","court",false],"45":["numberOfVolumes","numberOfVolumes",true],"46":["committee","committee",true],"48":["assignee","assignee",true],"50":["patentNumber","patentNumber",false],"51":["priorityNumbers","priorityNumbers",true],"52":["issueDate","issueDate",false],"53":["references","references",true],"54":["legalStatus","legalStatus",false],"55":["codeNumber","codeNumber",true],"59":["artworkMedium","artworkMedium",false],"60":["number","number",true],"61":["artworkSize","artworkSize",true],"62":["libraryCatalog","libraryCatalog",true],"63":["videoRecordingFormat","videoRecordingFormat",false],"64":["interviewMedium","interviewMedium",false],"65":["letterType","letterType",false],"66":["manuscriptType","manuscriptType",false],"67":["mapType","mapType",false],"68":["scale","scale",true],"69":["thesisType","thesisType",false],"70":["websiteType","websiteType",false],"71":["audioRecordingFormat","audioRecordingFormat",false],"72":["label","label",false],"74":["presentationType","presentationType",false],"75":["meetingName","meetingName",true],"76":["studio","studio",false],"77":["runningTime","runningTime",true],"78":["network","network",false],"79":["postType","postType",false],"80":["audioFileType","audioFileType",false],"81":["versionNumber","versionNumber",true],"82":["system","system",true],"83":["company","company",false],"84":["conferenceName","conferenceName",true],"85":["encyclopediaTitle","encyclopediaTitle",false],"86":["dictionaryTitle","dictionaryTitle",false],"87":["language","language",true],"88":["programmingLanguage","programmingLanguage",true],"89":["university","university",false],"90":["abstractNote","abstractNote",true],"91":["websiteTitle","websiteTitle",false],"92":["reportNumber","reportNumber",false],"93":["billNumber","billNumber",false],"94":["codeVolume","codeVolume",false],"95":["codePages","codePages",false],"96":["dateDecided","dateDecided",false],"97":["reporterVolume","reporterVolume",false],"98":["firstPage","firstPage",false],"99":["documentNumber","documentNumber",false],"100":["dateEnacted","dateEnacted",false],"101":["publicLawNumber","publicLawNumber",false],"102":["country","country",true],"103":["applicationNumber","applicationNumber",true],"104":["forumTitle","forumTitle",false],"105":["episodeNumber","episodeNumber",false],"107":["blogTitle","blogTitle",false],"108":["type","type",true],"109":["medium","medium",true],"110":["title","title",true],"111":["caseName","caseName",false],"112":["nameOfAct","nameOfAct",false],"113":["subject","subject",false],"114":["proceedingsTitle","proceedingsTitle",false],"115":["bookTitle","bookTitle",false],"116":["shortTitle","shortTitle",true],"117":["docketNumber","docketNumber",false],"118":["numPages","numPages",true],"119":["programTitle","programTitle",false],"120":["issuingAuthority","issuingAuthority",false],"121":["filingDate","filingDate",true],"122":["genre","genre",false],"123":["archive","archive",true],"124":["repository","repository",false],"125":["archiveID","archiveID",false],"126":["citationKey","citationKey",true],"127":["authority","authority",true],"128":["identifier","identifier",false],"129":["repositoryLocation","repositoryLocation",false],"130":["format","format",false],"131":["status","status",true],"132":["organization","organization",false],"10001":["name","name",false],"10002":["address","address",true],"10003":["telephone","telephone",true],"10004":["email","email",true],"10005":["homepage","homepage",false],"10006":["discipline","discipline",true],"10007":["nsfID","nsfID",true],"10008":["dateSent","dateSent",false],"10009":["dateDue","dateDue",true],"10010":["accepted","accepted",true],"10011":["programDirector","programDirector",true]}} \ No newline at end of file diff --git a/test/tests/data/itemJSON.js b/test/tests/data/itemJSON.js index 16637f8fd10..334afbfe00a 100644 --- a/test/tests/data/itemJSON.js +++ b/test/tests/data/itemJSON.js @@ -503,6 +503,7 @@ "dateModified": "2023-03-23T05:19:49Z", "extra": "Extra", "format": "Medium", + "identifier": "3", "itemType": "dataset", "key": "F8CLJGM7", "language": "en-US", diff --git a/test/tests/data/translatorExport.js b/test/tests/data/translatorExport.js index 781cdbf3870..e526858c91e 100644 --- a/test/tests/data/translatorExport.js +++ b/test/tests/data/translatorExport.js @@ -522,6 +522,7 @@ "dateModified": "2023-03-23T05:19:51Z", "extra": "Extra", "format": "Medium", + "identifier": "3", "itemType": "dataset", "language": "en-US", "libraryCatalog": "Library catalog", diff --git a/test/tests/data/translatorExportLegacy.js b/test/tests/data/translatorExportLegacy.js index d830a0ac653..309ad34876e 100644 --- a/test/tests/data/translatorExportLegacy.js +++ b/test/tests/data/translatorExportLegacy.js @@ -760,6 +760,7 @@ "dateModified": "2023-03-23 05:19:50", "extra": "Extra", "format": "Medium", + "identifier": "3", "itemID": 47, "itemType": "dataset", "key": "UAXQE9DR", @@ -768,6 +769,7 @@ "libraryID": null, "medium": "Medium", "notes": [], + "number": "3", "place": "Place", "publisher": "Publisher", "relations": {}, @@ -792,6 +794,7 @@ "language": "en-US", "libraryCatalog": "Library catalog", "medium": "Medium", + "number": "3", "place": "Place", "publisher": "Publisher", "rights": "Rights", From 01ebeb183439bbd79797bbcd4a41e99aad099ab8 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Thu, 20 Apr 2023 04:37:38 -0400 Subject: [PATCH 52/86] Update utilities and translate submodules --- chrome/content/zotero/xpcom/translate | 2 +- chrome/content/zotero/xpcom/utilities | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chrome/content/zotero/xpcom/translate b/chrome/content/zotero/xpcom/translate index fcb7b8ae950..05755f5051a 160000 --- a/chrome/content/zotero/xpcom/translate +++ b/chrome/content/zotero/xpcom/translate @@ -1 +1 @@ -Subproject commit fcb7b8ae9500be2c7c29e4306400f82fe21c5656 +Subproject commit 05755f5051a77737c56458440c79964c7a8874cf diff --git a/chrome/content/zotero/xpcom/utilities b/chrome/content/zotero/xpcom/utilities index b93f16dba48..cccf1235a31 160000 --- a/chrome/content/zotero/xpcom/utilities +++ b/chrome/content/zotero/xpcom/utilities @@ -1 +1 @@ -Subproject commit b93f16dba483891c0ab4627cbaa303de5c7fa0c0 +Subproject commit cccf1235a318c259345fc623d5e9d6770ba19df7 From 8992efc869e14014420ffaaf9c642fdcc47390bf Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Fri, 21 Apr 2023 06:29:39 -0400 Subject: [PATCH 53/86] Fix potential sync error after Replace Online Library in group https://forums.zotero.org/discussion/104431/syncing-problem Replace Online Library can upload annotations created by others in a group library, so if the upload resulted in a local write, "Cannot edit item in library" was thrown, since annotations by others aren't writable. This should've only been a problem if the uploaded data was actually modified by the server, but we were also checking whether objects were editable before checking if they had actually changed, so it would happen for any upload of another person's annotation. This fixes the order of checks when saving objects and makes an edit-check exception for saving uploaded data for group annotations. --- .../content/zotero/xpcom/data/dataObject.js | 10 ++-- .../content/zotero/xpcom/sync/syncEngine.js | 10 +++- test/tests/syncEngineTest.js | 49 +++++++++++++++++++ 3 files changed, 63 insertions(+), 6 deletions(-) diff --git a/chrome/content/zotero/xpcom/data/dataObject.js b/chrome/content/zotero/xpcom/data/dataObject.js index 54ec57a4406..1832e6583a6 100644 --- a/chrome/content/zotero/xpcom/data/dataObject.js +++ b/chrome/content/zotero/xpcom/data/dataObject.js @@ -987,6 +987,11 @@ Zotero.DataObject.prototype._initSave = Zotero.Promise.coroutine(function* (env) env.isNew = !this.id; + if (!this.hasChanged()) { + Zotero.debug(this._ObjectType + ' ' + this.id + ' has not changed', 4); + return false; + } + if (!env.options.skipEditCheck) { if (!this.isEditable()) { throw new Error("Cannot edit " + this._objectType + " in library " @@ -999,11 +1004,6 @@ Zotero.DataObject.prototype._initSave = Zotero.Promise.coroutine(function* (env) throw new Error("Cannot add " + this._objectType + " to a " + targetLib.libraryType + " library"); } - if (!this.hasChanged()) { - Zotero.debug(this._ObjectType + ' ' + this.id + ' has not changed', 4); - return false; - } - // Undo registerObject() on failure if (env.isNew) { var func = function () { diff --git a/chrome/content/zotero/xpcom/sync/syncEngine.js b/chrome/content/zotero/xpcom/sync/syncEngine.js index e0806a5e287..f1244f13de5 100644 --- a/chrome/content/zotero/xpcom/sync/syncEngine.js +++ b/chrome/content/zotero/xpcom/sync/syncEngine.js @@ -1331,7 +1331,15 @@ Zotero.Sync.Data.Engine.prototype._uploadObjects = Zotero.Promise.coroutine(func skipSyncedUpdate: true, // We want to minimize the times when server writes actually result in local // updates, but when they do, don't update the user-visible timestamp - skipDateModifiedUpdate: true + skipDateModifiedUpdate: true, + // Replace Online Library can reupload annotations created by others in a + // group library, and the server could theoretically override a value, so + // allow updating local annotations even if they were created by someone + // else. There might be other cases where this is necessary, but let's start + // with this. + skipEditCheck: objectType == 'item' + && this.library.isGroup + && toSave[i].isAnnotation() }); } if (this.library.libraryVersion == this.library.storageVersion) { diff --git a/test/tests/syncEngineTest.js b/test/tests/syncEngineTest.js index d867b370754..25658733382 100644 --- a/test/tests/syncEngineTest.js +++ b/test/tests/syncEngineTest.js @@ -3049,6 +3049,55 @@ describe("Zotero.Sync.Data.Engine", function () { }); + it("should allow applying remotely saved version to local annotation in group library", async function () { + var group = await createGroup({ + libraryVersion: 5 + }); + var libraryID = group.libraryID; + ({ engine, client, caller } = await setup({ libraryID })); + + var createdByUserID = 2352512; + await Zotero.Users.setName(createdByUserID, 'user'); + + var attachment = await importFileAttachment('test.pdf', { libraryID }); + attachment.synced = true; + await attachment.saveTx(); + var annotation = await createAnnotation('highlight', attachment); + annotation.createdByUserID = createdByUserID; + await annotation.saveTx({ + skipEditCheck: true + }); + var responseJSON = annotation.toResponseJSON(); + responseJSON.version = 10; + responseJSON.data.version = 10; + var newComment = 'new comment'; + responseJSON.data.annotationComment = newComment; + + let response = { + successful: { + "0": responseJSON + }, + unchanged: {}, + failed: {} + }; + setResponse({ + method: "POST", + url: `groups/${group.id}/items`, + status: 200, + headers: { + "Last-Modified-Version": 10 + }, + json: response + }) + + var result = await engine._startUpload(); + + assert.equal(result, engine.UPLOAD_RESULT_SUCCESS); + assert.equal(annotation.version, 10); + assert.equal(annotation.annotationComment, newComment); + }); + + it("should prompt to reset library on 403 write response and reset on accept", function* () { var group = yield createGroup({ libraryVersion: 5 From fcc6cc17a97994dc5fa49de15e85603aada1c65d Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Fri, 21 Apr 2023 06:48:01 -0400 Subject: [PATCH 54/86] Better logging for changes to `deleted` property --- chrome/content/zotero/xpcom/data/dataObject.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chrome/content/zotero/xpcom/data/dataObject.js b/chrome/content/zotero/xpcom/data/dataObject.js index 1832e6583a6..1526c763f8b 100644 --- a/chrome/content/zotero/xpcom/data/dataObject.js +++ b/chrome/content/zotero/xpcom/data/dataObject.js @@ -117,10 +117,10 @@ for (let name of ['deleted']) { val = !!val; var oldVal = this._getLatestField(name); if (oldVal == val) { - Zotero.debug(Zotero.Utilities.capitalize(name) - + ` state hasn't changed for ${this._objectType} ${this.id}`); + Zotero.debug(`Field '${name}' hasn't changed`); return; } + Zotero.debug(`Field '${name}' has changed from '${oldVal}' to '${val}'`, 4); this._markFieldChange(name, val); } }); From e59e6cdcd85c912d0203139c101bc42940af9c3c Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Fri, 21 Apr 2023 07:18:50 -0400 Subject: [PATCH 55/86] Update version --- install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.rdf b/install.rdf index 8125c75fa6a..b265c691cf9 100644 --- a/install.rdf +++ b/install.rdf @@ -6,7 +6,7 @@ zotero@chnm.gmu.edu Zotero - 6.0.26.SOURCE + 6.0.27.SOURCE false 2 From 8096e22f404b402842830f3f965ca9627795c5bd Mon Sep 17 00:00:00 2001 From: Abe Jellinek Date: Fri, 21 Apr 2023 13:38:04 -0400 Subject: [PATCH 56/86] Scaffold: Improve perceived translation speed When translators do a lot of logging. https://github.com/zotero/translators/pull/3022#issuecomment-1517291971 --- chrome/content/scaffold/scaffold.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/chrome/content/scaffold/scaffold.js b/chrome/content/scaffold/scaffold.js index 8241d759e4e..e43bc969859 100644 --- a/chrome/content/scaffold/scaffold.js +++ b/chrome/content/scaffold/scaffold.js @@ -1138,13 +1138,19 @@ var Scaffold = new function () { string = fix2028(Zotero.Utilities.varDump(string)); } - if (output.value) output.value += "\n"; - output.value += Zotero.Utilities.lpad(date.getHours(), '0', 2) + // Put off actually building the log message and appending it to the console until the next animation frame + // so as not to slow down translation with repeated layout recalculations triggered by appending text + // and accessing scrollHeight + // requestAnimationFrame() callbacks are guaranteed to be called in the order they were set + requestAnimationFrame(() => { + if (output.value) output.value += "\n"; + output.value += Zotero.Utilities.lpad(date.getHours(), '0', 2) + ":" + Zotero.Utilities.lpad(date.getMinutes(), '0', 2) + ":" + Zotero.Utilities.lpad(date.getSeconds(), '0', 2) + " " + string.replace(/\n/g, "\n "); - // move to end - output.inputField.scrollTop = output.inputField.scrollHeight; + // move to end + output.inputField.scrollTop = output.inputField.scrollHeight; + }); } /* From 00e63f0f8a3a81ed881e65764c3541b75fc5254f Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Fri, 21 Apr 2023 05:44:17 -0400 Subject: [PATCH 57/86] Lint: Fix some missing spaces that make eslint behave annoyingly --- chrome/content/zotero/xpcom/attachments.js | 2 +- chrome/content/zotero/xpcom/data/searchConditions.js | 2 +- chrome/content/zotero/xpcom/file.js | 2 +- chrome/content/zotero/xpcom/fulltext.js | 2 +- chrome/content/zotero/xpcom/mime.js | 2 +- chrome/content/zotero/xpcom/notifier.js | 2 +- chrome/content/zotero/xpcom/prefs.js | 2 +- chrome/content/zotero/xpcom/schema.js | 2 +- chrome/content/zotero/xpcom/zotero.js | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/chrome/content/zotero/xpcom/attachments.js b/chrome/content/zotero/xpcom/attachments.js index 9460cd27593..39830e0dd7e 100644 --- a/chrome/content/zotero/xpcom/attachments.js +++ b/chrome/content/zotero/xpcom/attachments.js @@ -23,7 +23,7 @@ ***** END LICENSE BLOCK ***** */ -Zotero.Attachments = new function(){ +Zotero.Attachments = new function () { // Keep in sync with Zotero.Schema.integrityCheck() and this.linkModeToName() this.LINK_MODE_IMPORTED_FILE = 0; this.LINK_MODE_IMPORTED_URL = 1; diff --git a/chrome/content/zotero/xpcom/data/searchConditions.js b/chrome/content/zotero/xpcom/data/searchConditions.js index b9456e2bb35..c62f856dad9 100644 --- a/chrome/content/zotero/xpcom/data/searchConditions.js +++ b/chrome/content/zotero/xpcom/data/searchConditions.js @@ -23,7 +23,7 @@ ***** END LICENSE BLOCK ***** */ -Zotero.SearchConditions = new function(){ +Zotero.SearchConditions = new function () { this.get = get; this.getStandardConditions = getStandardConditions; this.hasOperator = hasOperator; diff --git a/chrome/content/zotero/xpcom/file.js b/chrome/content/zotero/xpcom/file.js index 7aa90be8cbb..b6229727c33 100644 --- a/chrome/content/zotero/xpcom/file.js +++ b/chrome/content/zotero/xpcom/file.js @@ -27,7 +27,7 @@ * Functions for reading files * @namespace */ -Zotero.File = new function(){ +Zotero.File = new function () { Components.utils.import("resource://gre/modules/NetUtil.jsm"); Components.utils.import("resource://gre/modules/FileUtils.jsm"); diff --git a/chrome/content/zotero/xpcom/fulltext.js b/chrome/content/zotero/xpcom/fulltext.js index e55ccf9e5bc..28611fdd9b8 100644 --- a/chrome/content/zotero/xpcom/fulltext.js +++ b/chrome/content/zotero/xpcom/fulltext.js @@ -23,7 +23,7 @@ ***** END LICENSE BLOCK ***** */ -Zotero.Fulltext = Zotero.FullText = new function(){ +Zotero.Fulltext = Zotero.FullText = new function () { this.isCachedMIMEType = isCachedMIMEType; this.__defineGetter__("pdfConverterCacheFile", function () { return '.zotero-ft-cache'; }); diff --git a/chrome/content/zotero/xpcom/mime.js b/chrome/content/zotero/xpcom/mime.js index 155d1edb51e..36aa86c6d08 100644 --- a/chrome/content/zotero/xpcom/mime.js +++ b/chrome/content/zotero/xpcom/mime.js @@ -23,7 +23,7 @@ ***** END LICENSE BLOCK ***** */ -Zotero.MIME = new function(){ +Zotero.MIME = new function () { this.isTextType = isTextType; this.getPrimaryExtension = getPrimaryExtension; this.sniffForBinary = sniffForBinary; diff --git a/chrome/content/zotero/xpcom/notifier.js b/chrome/content/zotero/xpcom/notifier.js index 387c16a13d5..2a082a2c45d 100644 --- a/chrome/content/zotero/xpcom/notifier.js +++ b/chrome/content/zotero/xpcom/notifier.js @@ -25,7 +25,7 @@ "use strict"; -Zotero.Notifier = new function(){ +Zotero.Notifier = new function () { // Options that apply to an entire event, not a specific object this.EVENT_LEVEL_OPTIONS = ['autoSyncDelay', 'skipAutoSync']; diff --git a/chrome/content/zotero/xpcom/prefs.js b/chrome/content/zotero/xpcom/prefs.js index 92804467d0d..3d1086e6353 100644 --- a/chrome/content/zotero/xpcom/prefs.js +++ b/chrome/content/zotero/xpcom/prefs.js @@ -22,7 +22,7 @@ ***** END LICENSE BLOCK ***** */ -Zotero.Prefs = new function(){ +Zotero.Prefs = new function () { // Privileged methods this.get = get; this.set = set; diff --git a/chrome/content/zotero/xpcom/schema.js b/chrome/content/zotero/xpcom/schema.js index af8bd6b0d33..26f7cd1fc37 100644 --- a/chrome/content/zotero/xpcom/schema.js +++ b/chrome/content/zotero/xpcom/schema.js @@ -23,7 +23,7 @@ ***** END LICENSE BLOCK ***** */ -Zotero.Schema = new function(){ +Zotero.Schema = new function () { this.dbInitialized = false; this.goToChangeLog = false; diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js index 45388532a56..2abf5878ac1 100644 --- a/chrome/content/zotero/xpcom/zotero.js +++ b/chrome/content/zotero/xpcom/zotero.js @@ -38,7 +38,7 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js"); /* * Core functions */ - (function(){ + (function () { // Privileged (public) methods this.getStorageDirectory = getStorageDirectory; this.debug = debug; From 2f0d41c0cb9ea47cce03ea51bf8ac718dbe44b15 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sun, 23 Apr 2023 17:06:44 -0400 Subject: [PATCH 58/86] Ignore numeric values for `Type:` lines in Extra https://forums.zotero.org/discussion/comment/433334/#Comment_433334 --- .../zotero/xpcom/utilities_internal.js | 6 ++++-- test/tests/utilities_internalTest.js | 21 ++++++++++++++----- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/chrome/content/zotero/xpcom/utilities_internal.js b/chrome/content/zotero/xpcom/utilities_internal.js index ef5873723e8..144e6a4557b 100644 --- a/chrome/content/zotero/xpcom/utilities_internal.js +++ b/chrome/content/zotero/xpcom/utilities_internal.js @@ -1231,10 +1231,12 @@ Zotero.Utilities.Internal = { if (!key || key != 'type' || skipKeys.has(key) - // 1) Ignore 'type: note' and 'type: attachment' + // 1) Ignore 'type: note', 'type: attachment', 'type: annotation' // 2) Ignore 'article' until we have a Preprint item type // (https://github.com/zotero/translators/pull/2248#discussion_r546428184) - || ['note', 'attachment', 'article'].includes(value)) { + || ['note', 'attachment', 'annotation', 'article'].includes(value) + // Ignore numeric values + || parseInt(value) == value) { return true; } diff --git a/test/tests/utilities_internalTest.js b/test/tests/utilities_internalTest.js index 22243440523..3364e6224c9 100644 --- a/test/tests/utilities_internalTest.js +++ b/test/tests/utilities_internalTest.js @@ -142,11 +142,22 @@ describe("Zotero.Utilities.Internal", function () { describe("#extractExtraFields()", function () { - it("should ignore 'type: note' and 'type: attachment'", function () { - var str = 'type: note'; - var { itemType, extra } = Zotero.Utilities.Internal.extractExtraFields(str); - assert.isNull(itemType); - assert.equal(extra, 'type: note'); + it("should ignore 'Type: note', 'Type: attachment', and 'Type: annotation'", function () { + for (let type of ['note', 'attachment', 'annotation']) { + let str = `Type: ${type}`; + let { itemType, extra } = Zotero.Utilities.Internal.extractExtraFields(str); + assert.isNull(itemType, type); + assert.equal(extra, `Type: ${type}`, type); + } + }); + + it("should ignore numeric values for Type", function () { + for (let type of ['3']) { + let str = `Type: ${type}`; + let { itemType, extra } = Zotero.Utilities.Internal.extractExtraFields(str); + assert.isNull(itemType, type); + assert.equal(extra, `Type: ${type}`, type); + } }); it("should use the first mapped Zotero type for a CSL type", function () { From 3e12f3f20b097d56006c040ea466fb422ba78308 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Mon, 1 May 2023 02:06:31 -0400 Subject: [PATCH 59/86] Revert to earlier translate submodule before Z7 HiddenBrowser changes --- chrome/content/zotero/xpcom/translate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/content/zotero/xpcom/translate b/chrome/content/zotero/xpcom/translate index 05755f5051a..464dcb107b4 160000 --- a/chrome/content/zotero/xpcom/translate +++ b/chrome/content/zotero/xpcom/translate @@ -1 +1 @@ -Subproject commit 05755f5051a77737c56458440c79964c7a8874cf +Subproject commit 464dcb107b4e3cfc549cf757aeeacaaa08c05d4b From c9c7805cdf9794e4ff217a028b6229754160488c Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sat, 6 May 2023 01:56:19 -0400 Subject: [PATCH 60/86] Remove connectorTypeSchemaData.js and update build_typeSchemaData.js We now use zoteroTypeSchemaData.js in the connector, so update the build script to generate that. --- chrome/content/zotero/tools/build_typeSchemaData.js | 9 +++++---- resource/schema/connectorTypeSchemaData.js | 1 - 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 resource/schema/connectorTypeSchemaData.js diff --git a/chrome/content/zotero/tools/build_typeSchemaData.js b/chrome/content/zotero/tools/build_typeSchemaData.js index 38832567455..218a5fbcd85 100644 --- a/chrome/content/zotero/tools/build_typeSchemaData.js +++ b/chrome/content/zotero/tools/build_typeSchemaData.js @@ -1,5 +1,5 @@ import FilePicker from 'zotero/modules/filePicker'; - + (async function () { // Create schema var schema = {"itemTypes":{}, "creatorTypes":{}, "fields":{}}; @@ -77,11 +77,12 @@ import FilePicker from 'zotero/modules/filePicker'; resultElem.innerHTML = '

Failed.

'; } else { let schemaFile = Zotero.File.pathToFile(fp.file); - schemaFile.append("connectorTypeSchemaData.js"); + schemaFile.append("zoteroTypeSchemaData.js"); await Zotero.File.putContentsAsync( schemaFile, - `Zotero.Connector_Types.schema = ${JSON.stringify(schema)}` + `var ZOTERO_TYPE_SCHEMA = ${JSON.stringify(schema)};\n\n` + + "if (typeof module !== 'undefined') {\n\tmodule.exports = ZOTERO_TYPE_SCHEMA;\n}\n" ); - resultElem.innerHTML = `

Wrote ${schemaFile} successfully.

`; + resultElem.innerHTML = `

Wrote ${schemaFile.path} successfully.

`; } })(); \ No newline at end of file diff --git a/resource/schema/connectorTypeSchemaData.js b/resource/schema/connectorTypeSchemaData.js deleted file mode 100644 index fe2bfbc239a..00000000000 --- a/resource/schema/connectorTypeSchemaData.js +++ /dev/null @@ -1 +0,0 @@ -Zotero.Connector_Types.schema = {"itemTypes":{"1":["note","Note",[false],[],{},"treeitem-note@2x.png"],"2":["book","Book",[1,2,3,5,4],[110,90,3,30,4,45,6,7,8,14,118,87,11,116,1,27,123,19,62,18,2,22],{},"treeitem-book@2x.png"],"3":["bookSection","Book Section",[1,29,2,3,5,4],[110,90,115,3,30,4,45,6,7,8,14,10,87,11,116,1,27,123,19,62,18,2,22],{"115":12},"treeitem-bookSection@2x.png"],"4":["journalArticle","Journal Article",[1,2,3,27,4],[110,90,12,4,5,10,14,3,28,29,25,87,26,13,116,1,27,123,19,62,18,2,22],{},"treeitem-journalArticle@2x.png"],"5":["magazineArticle","Magazine Article",[1,2,27,4],[110,90,12,4,5,14,10,87,13,116,1,27,123,19,62,18,2,22],{},"treeitem-magazineArticle@2x.png"],"6":["newspaperArticle","Newspaper Article",[1,2,27,4],[110,90,12,7,6,14,15,10,87,116,13,1,27,123,19,62,18,2,22],{},"treeitem-newspaperArticle@2x.png"],"7":["thesis","Thesis",[1,2],[110,90,69,89,7,14,118,87,116,1,27,123,19,62,18,2,22],{"69":108,"89":8},"treeitem-thesis@2x.png"],"8":["letter","Letter",[1,2,16],[110,90,65,14,87,116,1,27,123,19,62,18,2,22],{"65":108},"treeitem-letter@2x.png"],"9":["manuscript","Manuscript",[1,2,4],[110,90,66,7,14,118,87,116,1,27,123,19,62,18,2,22],{"66":108},"treeitem-manuscript@2x.png"],"10":["interview","Interview",[6,2,7,4],[110,90,14,64,87,116,1,27,123,19,62,18,2,22],{"64":109},"treeitem-interview@2x.png"],"11":["film","Film",[8,2,10,9],[110,90,21,14,122,63,77,87,116,1,27,123,19,62,18,2,22],{"21":8,"63":109,"122":108},"treeitem-film@2x.png"],"12":["artwork","Artwork",[22,2],[110,90,59,61,14,87,116,123,19,62,18,1,27,2,22],{"59":109},"treeitem-artwork@2x.png"],"13":["webpage","Web Page",[1,2,4],[110,90,91,70,14,116,1,27,87,2,22],{"70":108,"91":12},"treeitem-webpage@2x.png"],"14":["attachment","Attachment",[false],[110,27,1],{},"treeitem@2x.png"],"15":["report","Report",[1,2,5,4],[110,90,92,32,28,7,31,14,10,87,116,1,27,123,19,62,18,2,22],{"31":8,"32":108,"92":60},"treeitem-report@2x.png"],"16":["bill","Bill",[12,2,28],[110,90,93,36,94,15,95,41,40,42,14,87,1,27,116,2,22],{"41":127,"93":60,"94":4,"95":10},"treeitem-bill@2x.png"],"17":["case","Case",[1,2,13],[111,90,44,96,117,43,97,98,42,87,116,1,27,2,22],{"44":127,"96":14,"97":4,"98":10,"111":110,"117":60},"treeitem-case@2x.png"],"18":["hearing","Hearing",[2],[110,90,46,7,8,45,99,10,41,40,42,14,87,116,1,27,2,22],{"41":127,"99":60},"treeitem-hearing@2x.png"],"19":["patent","Patent",[14,15,2],[110,90,7,102,48,120,50,121,10,103,51,52,53,54,87,116,1,27,2,22],{"50":60,"52":14,"54":131,"120":127},"treeitem-patent@2x.png"],"20":["statute","Statute",[1,2],[112,90,36,55,101,100,10,15,40,42,87,116,1,27,2,22],{"100":14,"101":60,"112":110},"treeitem-statute@2x.png"],"21":["email","E-mail",[1,2,16],[113,90,14,116,1,27,87,2,22],{"113":110},"treeitem-email@2x.png"],"22":["map","Map",[20,2,5],[110,90,67,68,28,6,7,8,14,87,11,116,1,27,123,19,62,18,2,22],{"67":108},"treeitem-map.png"],"23":["blogPost","Blog Post",[1,23,2],[110,90,107,70,14,1,27,87,116,2,22],{"70":108,"107":12},"treeitem-blogPost@2x.png"],"24":["instantMessage","Instant Message",[1,2,16],[110,90,14,87,116,1,27,2,22],{},"treeitem-instantMessage@2x.png"],"25":["forumPost","Forum Post",[1,2],[110,90,104,79,14,87,116,1,27,2,22],{"79":108,"104":12},"treeitem-forumPost@2x.png"],"26":["audioRecording","Audio Recording",[17,18,2,19],[110,90,71,28,4,45,7,72,14,77,87,11,116,123,19,62,18,1,27,2,22],{"71":109,"72":8},"treeitem-audioRecording@2x.png"],"27":["presentation","Presentation",[24,2],[110,90,74,14,7,75,1,27,87,116,2,22],{"74":108},"treeitem-presentation@2x.png"],"28":["videoRecording","Video Recording",[8,11,2,10,9],[110,90,63,28,4,45,7,76,14,77,87,11,116,1,27,123,19,62,18,2,22],{"63":109,"76":8},"treeitem-videoRecording.png"],"29":["tvBroadcast","TV Broadcast",[8,11,2,25,10,9],[110,90,119,105,63,7,78,14,77,87,116,1,27,123,19,62,18,2,22],{"63":109,"78":8,"105":60,"119":12},"treeitem-tvBroadcast.png"],"30":["radioBroadcast","Radio Broadcast",[8,11,2,25,10,9],[110,90,119,105,71,7,78,14,77,87,116,1,27,123,19,62,18,2,22],{"71":109,"78":8,"105":60,"119":12},"treeitem-radioBroadcast.png"],"31":["podcast","Podcast",[26,2,25],[110,90,28,105,80,77,1,27,87,116,2,22],{"80":109,"105":60},"treeitem-podcast.png"],"32":["computerProgram","Software",[21,2],[110,90,28,81,14,82,7,83,88,11,116,1,2,123,19,62,18,27,22],{"83":8},"treeitem-computerProgram@2x.png"],"33":["conferencePaper","Conference Paper",[1,2,3,5,4],[110,90,14,114,84,7,8,4,10,3,87,26,11,116,1,27,123,19,62,18,2,22],{"114":12},"treeitem-conferencePaper@2x.png"],"34":["document","Document",[1,2,3,27,4],[110,90,8,14,87,116,1,27,123,19,62,18,2,22],{},"treeitem@2x.png"],"35":["encyclopediaArticle","Encyclopedia Article",[1,2,3,5,4],[110,90,85,3,30,4,45,6,7,8,14,10,11,116,1,27,87,123,19,62,18,2,22],{"85":12},"treeitem-encyclopediaArticle@2x.png"],"36":["dictionaryEntry","Dictionary Entry",[1,2,3,5,4],[110,90,86,3,30,4,45,6,7,8,14,10,87,11,116,1,27,123,19,62,18,2,22],{"86":12},"treeitem-dictionaryEntry@2x.png"],"37":["annotation","Annotation",[false],[],{},"treeitem@2x.png"],"38":["preprint","Preprint",[1,2,3,27,4],[110,90,122,124,125,7,14,3,30,26,126,1,27,123,19,116,87,62,18,2,22],{"122":108,"124":8,"125":60},"treeitem-preprint@2x.png"],"39":["dataset","Dataset",[1,2],[110,90,128,108,81,14,124,129,130,26,126,1,27,123,19,116,87,62,18,2,22],{"124":8,"128":60,"129":7,"130":109},"treeitem-dataset@2x.png"],"40":["standard","Standard",[1,2],[110,90,132,46,108,60,81,131,14,8,7,26,126,1,27,123,19,116,118,87,62,18,2,22],{"132":127},"treeitem-standard@2x.png"],"10001":["nsfReviewer","NSF Reviewer",[false],[10001,31,10002,10003,10004,10005,10006,10007,10008,10009,10010,10011],{"31":false,"10001":110,"10005":1,"10008":14},"report_user.png"]},"creatorTypes":{"1":["author","Author"],"2":["contributor","Contributor"],"3":["editor","Editor"],"4":["translator","Translator"],"5":["seriesEditor","Series Editor"],"6":["interviewee","Interview With"],"7":["interviewer","Interviewer"],"8":["director","Director"],"9":["scriptwriter","Scriptwriter"],"10":["producer","Producer"],"11":["castMember","Cast Member"],"12":["sponsor","Sponsor"],"13":["counsel","Counsel"],"14":["inventor","Inventor"],"15":["attorneyAgent","Attorney/Agent"],"16":["recipient","Recipient"],"17":["performer","Performer"],"18":["composer","Composer"],"19":["wordsBy","Words By"],"20":["cartographer","Cartographer"],"21":["programmer","Programmer"],"22":["artist","Artist"],"23":["commenter","Commenter"],"24":["presenter","Presenter"],"25":["guest","Guest"],"26":["podcaster","Podcaster"],"27":["reviewedAuthor","Reviewed Author"],"28":["cosponsor","Cosponsor"],"29":["bookAuthor","Book Author"]},"fields":{"1":["url","url",true],"2":["rights","rights",true],"3":["series","series",true],"4":["volume","volume",true],"5":["issue","issue",true],"6":["edition","edition",true],"7":["place","place",true],"8":["publisher","publisher",true],"10":["pages","pages",true],"11":["ISBN","ISBN",true],"12":["publicationTitle","publicationTitle",true],"13":["ISSN","ISSN",true],"14":["date","date",true],"15":["section","section",true],"18":["callNumber","callNumber",true],"19":["archiveLocation","archiveLocation",true],"21":["distributor","distributor",false],"22":["extra","extra",true],"25":["journalAbbreviation","journalAbbreviation",true],"26":["DOI","DOI",true],"27":["accessDate","accessDate",true],"28":["seriesTitle","seriesTitle",true],"29":["seriesText","seriesText",true],"30":["seriesNumber","seriesNumber",true],"31":["institution","institution",false],"32":["reportType","reportType",false],"36":["code","code",true],"40":["session","session",true],"41":["legislativeBody","legislativeBody",false],"42":["history","history",true],"43":["reporter","reporter",true],"44":["court","court",false],"45":["numberOfVolumes","numberOfVolumes",true],"46":["committee","committee",true],"48":["assignee","assignee",true],"50":["patentNumber","patentNumber",false],"51":["priorityNumbers","priorityNumbers",true],"52":["issueDate","issueDate",false],"53":["references","references",true],"54":["legalStatus","legalStatus",false],"55":["codeNumber","codeNumber",true],"59":["artworkMedium","artworkMedium",false],"60":["number","number",true],"61":["artworkSize","artworkSize",true],"62":["libraryCatalog","libraryCatalog",true],"63":["videoRecordingFormat","videoRecordingFormat",false],"64":["interviewMedium","interviewMedium",false],"65":["letterType","letterType",false],"66":["manuscriptType","manuscriptType",false],"67":["mapType","mapType",false],"68":["scale","scale",true],"69":["thesisType","thesisType",false],"70":["websiteType","websiteType",false],"71":["audioRecordingFormat","audioRecordingFormat",false],"72":["label","label",false],"74":["presentationType","presentationType",false],"75":["meetingName","meetingName",true],"76":["studio","studio",false],"77":["runningTime","runningTime",true],"78":["network","network",false],"79":["postType","postType",false],"80":["audioFileType","audioFileType",false],"81":["versionNumber","versionNumber",true],"82":["system","system",true],"83":["company","company",false],"84":["conferenceName","conferenceName",true],"85":["encyclopediaTitle","encyclopediaTitle",false],"86":["dictionaryTitle","dictionaryTitle",false],"87":["language","language",true],"88":["programmingLanguage","programmingLanguage",true],"89":["university","university",false],"90":["abstractNote","abstractNote",true],"91":["websiteTitle","websiteTitle",false],"92":["reportNumber","reportNumber",false],"93":["billNumber","billNumber",false],"94":["codeVolume","codeVolume",false],"95":["codePages","codePages",false],"96":["dateDecided","dateDecided",false],"97":["reporterVolume","reporterVolume",false],"98":["firstPage","firstPage",false],"99":["documentNumber","documentNumber",false],"100":["dateEnacted","dateEnacted",false],"101":["publicLawNumber","publicLawNumber",false],"102":["country","country",true],"103":["applicationNumber","applicationNumber",true],"104":["forumTitle","forumTitle",false],"105":["episodeNumber","episodeNumber",false],"107":["blogTitle","blogTitle",false],"108":["type","type",true],"109":["medium","medium",true],"110":["title","title",true],"111":["caseName","caseName",false],"112":["nameOfAct","nameOfAct",false],"113":["subject","subject",false],"114":["proceedingsTitle","proceedingsTitle",false],"115":["bookTitle","bookTitle",false],"116":["shortTitle","shortTitle",true],"117":["docketNumber","docketNumber",false],"118":["numPages","numPages",true],"119":["programTitle","programTitle",false],"120":["issuingAuthority","issuingAuthority",false],"121":["filingDate","filingDate",true],"122":["genre","genre",false],"123":["archive","archive",true],"124":["repository","repository",false],"125":["archiveID","archiveID",false],"126":["citationKey","citationKey",true],"127":["authority","authority",true],"128":["identifier","identifier",false],"129":["repositoryLocation","repositoryLocation",false],"130":["format","format",false],"131":["status","status",true],"132":["organization","organization",false],"10001":["name","name",false],"10002":["address","address",true],"10003":["telephone","telephone",true],"10004":["email","email",true],"10005":["homepage","homepage",false],"10006":["discipline","discipline",true],"10007":["nsfID","nsfID",true],"10008":["dateSent","dateSent",false],"10009":["dateDue","dateDue",true],"10010":["accepted","accepted",true],"10011":["programDirector","programDirector",true]}} \ No newline at end of file From c9381f307c3e4c30d4c673db05a2b2717d24381f Mon Sep 17 00:00:00 2001 From: Abe Jellinek Date: Fri, 12 May 2023 22:30:01 +0300 Subject: [PATCH 61/86] Accept non-integer attachmentLastPageIndex --- chrome/content/zotero/xpcom/data/item.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chrome/content/zotero/xpcom/data/item.js b/chrome/content/zotero/xpcom/data/item.js index 780d9773a27..56ce4c0751b 100644 --- a/chrome/content/zotero/xpcom/data/item.js +++ b/chrome/content/zotero/xpcom/data/item.js @@ -3409,7 +3409,7 @@ Zotero.Item.prototype.getAttachmentLastPageIndex = function () { var id = this._getLastPageIndexSettingKey(); var val = Zotero.SyncedSettings.get(Zotero.Libraries.userLibraryID, id); - if (val !== null && (typeof val != 'number' || val != parseInt(val))) { + if (this.isPDFAttachment() && val !== null && (typeof val != 'number' || val != parseInt(val))) { Zotero.logError(`Setting contains an invalid attachment page index ('${val}') -- discarding`); return null; } @@ -3421,7 +3421,7 @@ Zotero.Item.prototype.setAttachmentLastPageIndex = async function (val) { throw new Error("setAttachmentLastPageIndex() can only be called on file attachments"); } - if (typeof val != 'number' || val != parseInt(val)) { + if (this.isPDFAttachment() && (typeof val != 'number' || val != parseInt(val))) { Zotero.debug(val, 2); throw new Error(`setAttachmentLastPageIndex() must be passed an integer`); } From 1b3caadd2085facbb02dae4141544052eec7883d Mon Sep 17 00:00:00 2001 From: Abe Jellinek Date: Tue, 16 May 2023 16:21:48 +0300 Subject: [PATCH 62/86] Allow window dragging from PDF reader toolbar Fixes #2713 --- chrome/content/zotero/xpcom/reader.js | 2 ++ pdf-reader | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/chrome/content/zotero/xpcom/reader.js b/chrome/content/zotero/xpcom/reader.js index 9448a1c4cdf..a19e0306349 100644 --- a/chrome/content/zotero/xpcom/reader.js +++ b/chrome/content/zotero/xpcom/reader.js @@ -1303,6 +1303,7 @@ class ReaderTab extends ReaderInstance { this._iframe.setAttribute('type', 'content'); this._iframe.setAttribute('src', 'resource://zotero/pdf-reader/viewer.html'); this._tabContainer.appendChild(this._iframe); + this._iframe.docShell.windowDraggingAllowed = true; this._popupset = this._window.document.createElement('popupset'); this._tabContainer.appendChild(this._popupset); @@ -1401,6 +1402,7 @@ class ReaderWindow extends ReaderInstance { this._window.onGoMenuOpen = this._onGoMenuOpen.bind(this); this._window.onViewMenuOpen = this._onViewMenuOpen.bind(this); this._iframe = this._window.document.getElementById('reader'); + this._iframe.docShell.windowDraggingAllowed = true; } if (this._iframe.contentWindow && this._iframe.contentWindow.document === event.target) { diff --git a/pdf-reader b/pdf-reader index 590af780053..5c21f0a43b3 160000 --- a/pdf-reader +++ b/pdf-reader @@ -1 +1 @@ -Subproject commit 590af780053f198838c0f3b4afa3f197ef45453e +Subproject commit 5c21f0a43b328bb53e290954e67fe59a54401bf1 From 2b9455670fb6260fd6d8d4a1292409d23b995817 Mon Sep 17 00:00:00 2001 From: Abe Jellinek Date: Tue, 16 May 2023 16:32:14 +0300 Subject: [PATCH 63/86] Update pdf-reader Switch to fx63-compatible branch with draggable toolbar. --- pdf-reader | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pdf-reader b/pdf-reader index 5c21f0a43b3..3540d9184ea 160000 --- a/pdf-reader +++ b/pdf-reader @@ -1 +1 @@ -Subproject commit 5c21f0a43b328bb53e290954e67fe59a54401bf1 +Subproject commit 3540d9184ea9e0a37be92e9757c216987482d8bf From 0d6678a7359160c2a09d4e1599abed445db26ea3 Mon Sep 17 00:00:00 2001 From: Abe Jellinek Date: Wed, 17 May 2023 16:45:53 +0300 Subject: [PATCH 64/86] Disable window dragging inside toolbar controls And enable in the context pane toolbar extension. --- chrome/skin/default/zotero/contextPane.css | 5 +++++ pdf-reader | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/chrome/skin/default/zotero/contextPane.css b/chrome/skin/default/zotero/contextPane.css index 13b7cf5b0ba..051364afbe9 100644 --- a/chrome/skin/default/zotero/contextPane.css +++ b/chrome/skin/default/zotero/contextPane.css @@ -51,6 +51,10 @@ background: linear-gradient(to top, #a9a9a9 0, #a9a9a9 1px, #f6f6f6 1px, #f6f6f6 100%); } +#zotero-tab-toolbar .toolbarButton { + -moz-window-dragging: no-drag; +} + #zotero-item-toolbar { height: 32px; } @@ -62,6 +66,7 @@ width: 100%; margin-inline-start: -5px; background: linear-gradient(to top, #a9a9a9 0, #a9a9a9 1px, #f6f6f6 1px, #f6f6f6 100%); + -moz-window-dragging: drag; } .zotero-context-notes-list { diff --git a/pdf-reader b/pdf-reader index 3540d9184ea..1bf671a4b64 160000 --- a/pdf-reader +++ b/pdf-reader @@ -1 +1 @@ -Subproject commit 3540d9184ea9e0a37be92e9757c216987482d8bf +Subproject commit 1bf671a4b645754b21e6c1868dd6fb5b2f225554 From 4b61954e526d9655ff26ea09d56af1e31aa203c2 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sun, 21 May 2023 18:49:26 -0400 Subject: [PATCH 65/86] Upload deployment ZIP from 6.0 branch --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9c627a463f7..ba58d5c0978 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,7 +62,7 @@ jobs: env.ACT != 'true' && github.repository == 'zotero/zotero' && github.event_name == 'push' - && (github.ref == 'refs/heads/master' || endsWith(github.ref, '-hotfix') || github.ref == 'refs/heads/gh-actions-ci-test') + && (github.ref == 'refs/heads/6.0' || endsWith(github.ref, '-hotfix') || github.ref == 'refs/heads/gh-actions-ci-test') env: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} From 078626be82313faff601edcf0f51ed6c9f784dd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adomas=20Ven=C4=8Dkauskas?= Date: Thu, 15 Jun 2023 12:03:47 +0300 Subject: [PATCH 66/86] Add support for macWord transaction initialization via HTTP --- .../zotero/xpcom/server_integration.js | 35 +++++++++++++++++++ components/zotero-service.js | 1 + 2 files changed, 36 insertions(+) create mode 100644 chrome/content/zotero/xpcom/server_integration.js diff --git a/chrome/content/zotero/xpcom/server_integration.js b/chrome/content/zotero/xpcom/server_integration.js new file mode 100644 index 00000000000..bb9c21ad127 --- /dev/null +++ b/chrome/content/zotero/xpcom/server_integration.js @@ -0,0 +1,35 @@ +/* + ***** BEGIN LICENSE BLOCK ***** + + Copyright © 2023 Corporation for Digital Scholarship + Vienna, Virginia, USA + https://digitalscholar.org + + This file is part of Zotero. + + Zotero is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Zotero is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with Zotero. If not, see . + + ***** END LICENSE BLOCK ***** +*/ + +Zotero.Server.Endpoints['/integration/macWordCommand'] = function () {}; +Zotero.Server.Endpoints['/integration/macWordCommand'].prototype = { + supportedMethods: ["GET"], + supportedDataTypes: ["application/json"], + permitBookmarklet: true, + init: function (data) { + Zotero.Integration.execCommand(data.query.agent, data.query.command, data.query.document, data.query.templateVersion); + return 200; + }, +}; diff --git a/components/zotero-service.js b/components/zotero-service.js index 363056e6bcf..dfdef4f67da 100644 --- a/components/zotero-service.js +++ b/components/zotero-service.js @@ -121,6 +121,7 @@ const xpcomFilesLocal = [ 'router', 'schema', 'server', + 'server_integration', 'session', 'streamer', 'style', From 9515912830ee83897d0d46fa232435015afc2be5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adomas=20Ven=C4=8Dkauskas?= Date: Thu, 15 Jun 2023 12:04:53 +0300 Subject: [PATCH 67/86] Update template version check --- chrome/content/zotero/xpcom/integration.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/chrome/content/zotero/xpcom/integration.js b/chrome/content/zotero/xpcom/integration.js index 68405460c05..aca55b541fa 100644 --- a/chrome/content/zotero/xpcom/integration.js +++ b/chrome/content/zotero/xpcom/integration.js @@ -63,7 +63,11 @@ const EXPORTED_DOCUMENT_MARKER = "ZOTERO_TRANSFER_DOCUMENT"; const NOTE_CITATION_PLACEHOLDER_LINK = 'https://www.zotero.org/?'; -const TEMPLATE_VERSION = 1; +const TEMPLATE_VERSIONS = { + MacWord16: 2, + WinWord: 1, + OpenOffice: 1 +}; const MENDELEY_URI_RE = /^http:\/\/www\.mendeley\.com\/documents\/\?uuid=(.*)/; @@ -141,8 +145,8 @@ Zotero.Integration = new function() { * @returns {Boolean} true if integration operation should be cancelled */ this.warnOutdatedTemplate = function (agent, templateVersion) { - const validAgents = new Set(['OpenOffice', 'MacWord2016', 'MacWord16', 'WinWord']); - if (!validAgents.has(agent) || templateVersion >= TEMPLATE_VERSION) return false; + const expectedTemplateVersion = TEMPLATE_VERSIONS[agent]; + if (typeof expectedTemplateVersion != 'undefined' && templateVersion >= expectedTemplateVersion) return false; const daysToIgnore = 30; const now = Math.floor(Date.now() / 1000); const updateTemplateDelayedOn = Zotero.Prefs.get('integration.updateTemplateDelayedOn'); From 48c7c60bf1ef4c0355f6b27cd2247db0accaf9b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adomas=20Ven=C4=8Dkauskas?= Date: Tue, 11 Jul 2023 15:45:51 +0300 Subject: [PATCH 68/86] Include information about saved snapshots in /saveSnapshot --- .../content/zotero/xpcom/connector/server_connector.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/chrome/content/zotero/xpcom/connector/server_connector.js b/chrome/content/zotero/xpcom/connector/server_connector.js index 30e22616128..8e50e6708f0 100644 --- a/chrome/content/zotero/xpcom/connector/server_connector.js +++ b/chrome/content/zotero/xpcom/connector/server_connector.js @@ -1135,7 +1135,7 @@ Zotero.Server.Connector.SaveSnapshot.prototype = { } try { - let item = await this.saveSnapshot(targetID, requestData); + var item = await this.saveSnapshot(targetID, requestData); await session.addItem(item); } catch (e) { @@ -1143,9 +1143,15 @@ Zotero.Server.Connector.SaveSnapshot.prototype = { return 500; } + let attachments = []; + let hasAttachments = !item.isAttachment() && item.getAttachments().length; + if (hasAttachments) { + attachments = [{mimeType: "text/html", title: data.title, url: data.url}]; + } + return [201, "application/json", - JSON.stringify({ saveSingleFile: !data.skipSnapshot && !data.pdf })]; + JSON.stringify({ saveSingleFile: !data.skipSnapshot && !data.pdf && data.singleFile, attachments })]; }, /* From 4f7583e1c04cb241998f662e19d9ac0b3ccb4974 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Thu, 6 Jul 2023 20:00:04 -0400 Subject: [PATCH 69/86] Disable attachmentContentType check to prevent sync errors (cherry picked from commit 81ec8287f8ba127ca39d1dcf2f0dfd9562fbe679) --- chrome/content/zotero/xpcom/data/item.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/content/zotero/xpcom/data/item.js b/chrome/content/zotero/xpcom/data/item.js index 56ce4c0751b..de3235d6358 100644 --- a/chrome/content/zotero/xpcom/data/item.js +++ b/chrome/content/zotero/xpcom/data/item.js @@ -1906,7 +1906,7 @@ Zotero.Item.prototype._saveData = Zotero.Promise.coroutine(function* (env) { throw new Error("Annotation parent must be a file attachment"); } if (parentItem.attachmentContentType != 'application/pdf') { - throw new Error("Annotation parent must be a PDF"); + //throw new Error("Annotation parent must be a PDF"); } let type = this._getLatestField('annotationType'); let typeID = Zotero.Annotations[`ANNOTATION_TYPE_${type.toUpperCase()}`]; From 0ad55a6a7082a3dcba5fe646cc3627b90d73d0dd Mon Sep 17 00:00:00 2001 From: Martynas Bagdonas Date: Tue, 20 Jun 2023 13:55:50 +0300 Subject: [PATCH 70/86] Add support for underline annotations (cherry picked from commit cb14034c4693f58e4364c447d5960fb4835c1047) --- chrome/content/zotero/xpcom/annotations.js | 7 ++++--- chrome/content/zotero/xpcom/data/item.js | 9 ++++----- chrome/content/zotero/xpcom/data/items.js | 4 ++++ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/chrome/content/zotero/xpcom/annotations.js b/chrome/content/zotero/xpcom/annotations.js index cbe5621e35b..e5b0137f852 100644 --- a/chrome/content/zotero/xpcom/annotations.js +++ b/chrome/content/zotero/xpcom/annotations.js @@ -32,7 +32,8 @@ Zotero.Annotations = new function () { Zotero.defineProperty(this, 'ANNOTATION_TYPE_NOTE', { value: 2 }); Zotero.defineProperty(this, 'ANNOTATION_TYPE_IMAGE', { value: 3 }); Zotero.defineProperty(this, 'ANNOTATION_TYPE_INK', { value: 4 }); - + Zotero.defineProperty(this, 'ANNOTATION_TYPE_UNDERLINE', { value: 5 }); + Zotero.defineProperty(this, 'DEFAULT_COLOR', { value: '#ffd400' }); Zotero.defineProperty(this, 'PROPS', { @@ -137,7 +138,7 @@ Zotero.Annotations = new function () { } } o.readOnly = o.isExternal || !isAuthor; - if (o.type == 'highlight') { + if (['highlight', 'underline'].includes(o.type)) { o.text = item.annotationText; } else if (['image', 'ink'].includes(o.type)) { @@ -213,7 +214,7 @@ Zotero.Annotations = new function () { item._requireData('annotationDeferred'); item.annotationType = json.type; item.annotationAuthorName = json.authorName || ''; - if (json.type == 'highlight') { + if (['highlight', 'underline'].includes(json.type)) { item.annotationText = json.text; } item.annotationIsExternal = !!json.isExternal; diff --git a/chrome/content/zotero/xpcom/data/item.js b/chrome/content/zotero/xpcom/data/item.js index de3235d6358..8f6deecbbfd 100644 --- a/chrome/content/zotero/xpcom/data/item.js +++ b/chrome/content/zotero/xpcom/data/item.js @@ -3815,7 +3815,7 @@ for (let name of ['type', 'authorName', 'text', 'comment', 'color', 'pageLabel', if (currentType && currentType != value) { throw new Error("Cannot change annotation type"); } - if (!['highlight', 'note', 'image', 'ink'].includes(value)) { + if (!['highlight', 'underline', 'note', 'image', 'ink'].includes(value)) { let e = new Error(`Unknown annotation type '${value}'`); e.name = "ZoteroInvalidDataError"; throw e; @@ -3823,8 +3823,8 @@ for (let name of ['type', 'authorName', 'text', 'comment', 'color', 'pageLabel', break; } case 'text': - if (this._getLatestField('annotationType') != 'highlight') { - throw new Error("'annotationText' can only be set for highlight annotations"); + if (!['highlight', 'underline'].includes(this._getLatestField('annotationType'))) { + throw new Error("'annotationText' can only be set for highlight and underline annotations"); } break; @@ -5047,7 +5047,6 @@ Zotero.Item.prototype.fromJSON = function (json, options = {}) { // Annotation fields // case 'annotationType': - case 'annotationType': case 'annotationAuthorName': case 'annotationText': case 'annotationComment': @@ -5326,7 +5325,7 @@ Zotero.Item.prototype.toJSON = function (options = {}) { let type = this.annotationType; obj.annotationType = type; obj.annotationAuthorName = this.annotationAuthorName || ''; - if (type == 'highlight') { + if (['highlight', 'underline'].includes(type)) { obj.annotationText = this.annotationText || ''; } obj.annotationComment = this.annotationComment || ''; diff --git a/chrome/content/zotero/xpcom/data/items.js b/chrome/content/zotero/xpcom/data/items.js index 8fc1e134170..a8513bc2dfd 100644 --- a/chrome/content/zotero/xpcom/data/items.js +++ b/chrome/content/zotero/xpcom/data/items.js @@ -524,6 +524,10 @@ Zotero.Items = function() { case Zotero.Annotations.ANNOTATION_TYPE_HIGHLIGHT: type = 'highlight'; break; + + case Zotero.Annotations.ANNOTATION_TYPE_UNDERLINE: + type = 'underline'; + break; case Zotero.Annotations.ANNOTATION_TYPE_NOTE: type = 'note'; From 78865ed2ef391fabc050d2ac3f4bfcd3691dd6d9 Mon Sep 17 00:00:00 2001 From: Martynas Bagdonas Date: Tue, 20 Jun 2023 13:57:49 +0300 Subject: [PATCH 71/86] Add support for text annotations (cherry picked from commit 89adf56eed8031a1f58745b3ae959767413330c2) --- chrome/content/zotero/xpcom/annotations.js | 1 + chrome/content/zotero/xpcom/data/item.js | 2 +- chrome/content/zotero/xpcom/data/items.js | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/chrome/content/zotero/xpcom/annotations.js b/chrome/content/zotero/xpcom/annotations.js index e5b0137f852..92ec4bd0b67 100644 --- a/chrome/content/zotero/xpcom/annotations.js +++ b/chrome/content/zotero/xpcom/annotations.js @@ -33,6 +33,7 @@ Zotero.Annotations = new function () { Zotero.defineProperty(this, 'ANNOTATION_TYPE_IMAGE', { value: 3 }); Zotero.defineProperty(this, 'ANNOTATION_TYPE_INK', { value: 4 }); Zotero.defineProperty(this, 'ANNOTATION_TYPE_UNDERLINE', { value: 5 }); + Zotero.defineProperty(this, 'ANNOTATION_TYPE_TEXT', { value: 6 }); Zotero.defineProperty(this, 'DEFAULT_COLOR', { value: '#ffd400' }); diff --git a/chrome/content/zotero/xpcom/data/item.js b/chrome/content/zotero/xpcom/data/item.js index 8f6deecbbfd..56178cb38d3 100644 --- a/chrome/content/zotero/xpcom/data/item.js +++ b/chrome/content/zotero/xpcom/data/item.js @@ -3815,7 +3815,7 @@ for (let name of ['type', 'authorName', 'text', 'comment', 'color', 'pageLabel', if (currentType && currentType != value) { throw new Error("Cannot change annotation type"); } - if (!['highlight', 'underline', 'note', 'image', 'ink'].includes(value)) { + if (!['highlight', 'underline', 'note', 'text', 'image', 'ink'].includes(value)) { let e = new Error(`Unknown annotation type '${value}'`); e.name = "ZoteroInvalidDataError"; throw e; diff --git a/chrome/content/zotero/xpcom/data/items.js b/chrome/content/zotero/xpcom/data/items.js index a8513bc2dfd..db2b5febbcc 100644 --- a/chrome/content/zotero/xpcom/data/items.js +++ b/chrome/content/zotero/xpcom/data/items.js @@ -532,6 +532,10 @@ Zotero.Items = function() { case Zotero.Annotations.ANNOTATION_TYPE_NOTE: type = 'note'; break; + + case Zotero.Annotations.ANNOTATION_TYPE_TEXT: + type = 'text'; + break; case Zotero.Annotations.ANNOTATION_TYPE_IMAGE: type = 'image'; From 6f506bbc3de86d217df8986242e5fbed7db2aa81 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Thu, 6 Jul 2023 19:54:56 -0400 Subject: [PATCH 72/86] Make annotation sortIndex more flexible (cherry picked from commit af892e5cbd75b3e769d2702258210c1e70b88e1f) --- chrome/content/zotero/xpcom/data/item.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/content/zotero/xpcom/data/item.js b/chrome/content/zotero/xpcom/data/item.js index 56178cb38d3..640b14d7034 100644 --- a/chrome/content/zotero/xpcom/data/item.js +++ b/chrome/content/zotero/xpcom/data/item.js @@ -3838,7 +3838,7 @@ for (let name of ['type', 'authorName', 'text', 'comment', 'color', 'pageLabel', break; case 'sortIndex': - if (!/^\d{5}\|\d{6}\|\d{5}$/.test(value)) { + if (!/^(\d{5}\|\d{6}\|\d{5}|\d{5}\|\d{8}|\d{8})$/.test(value)) { throw new Error(`Invalid sortIndex '${value}'`); } break; From fb148497ba8abc338e0916f33297330ce8657270 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Thu, 3 Aug 2023 05:11:26 -0400 Subject: [PATCH 73/86] Add Zotero.getMainWindows() (cherry picked from commit 07309d7c25efa4a9e6aa5353dfaf8ca8727c415c) --- chrome/content/zotero/xpcom/zotero.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js index 2abf5878ac1..0d165a525fb 100644 --- a/chrome/content/zotero/xpcom/zotero.js +++ b/chrome/content/zotero/xpcom/zotero.js @@ -66,6 +66,18 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js"); this.getMainWindow = function () { return Services.wm.getMostRecentWindow("navigator:browser"); }; + + /** + * @return {ChromeWindow[]} - An array of open windows + */ + this.getMainWindows = function () { + var enumerator = Services.wm.getEnumerator("navigator:browser"); + var windows = []; + while (enumerator.hasMoreElements()) { + windows.push(enumerator.getNext()); + } + return windows; + }; this.getActiveZoteroPane = function() { var win = Services.wm.getMostRecentWindow("navigator:browser"); From 4db311eb46df70402f8ef9f1fa4af29667871f69 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Fri, 4 Aug 2023 20:21:15 -0400 Subject: [PATCH 74/86] Serialize lookup requests These were switched to parallel in 86b77cc45, resulting in blocks: https://forums.zotero.org/discussion/106658/limited-amount-of-articles-that-can-be-added-through-pmid (cherry picked from commit fcc68d6d80d00097f1f34fc2bcf5d911d501a827) --- chrome/content/zotero/createParentDialog.js | 2 +- chrome/content/zotero/lookup.js | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/chrome/content/zotero/createParentDialog.js b/chrome/content/zotero/createParentDialog.js index 2253f7da058..47f6e47f938 100644 --- a/chrome/content/zotero/createParentDialog.js +++ b/chrome/content/zotero/createParentDialog.js @@ -68,7 +68,7 @@ async function doAccept() { ); // If we successfully created a parent, return it - if (newItems) { + if (newItems.length) { io.dataOut = { parent: newItems[0] }; window.close(); } diff --git a/chrome/content/zotero/lookup.js b/chrome/content/zotero/lookup.js index 60a563a1f19..02fb8289351 100644 --- a/chrome/content/zotero/lookup.js +++ b/chrome/content/zotero/lookup.js @@ -40,7 +40,7 @@ var Zotero_Lookup = new function () { * @param textBox {HTMLElement} - Textbox containing identifiers * @param childItem {Zotero.Item|false} - Child item (optional) * @param toggleProgress {function} - Callback to toggle progress on/off - * @returns {Promise} + * @returns {Promise} */ this.addItemsFromIdentifier = async function (textBox, childItem, toggleProgress) { var identifiers = Zotero.Utilities.extractIdentifiers(textBox.value); @@ -79,11 +79,11 @@ var Zotero_Lookup = new function () { } } - let newItems = false; toggleProgress(true); - await Zotero.Promise.all(identifiers.map(async (identifier) => { - var translate = new Zotero.Translate.Search(); + let newItems = []; + for (let identifier of identifiers) { + let translate = new Zotero.Translate.Search(); translate.setIdentifier(identifier); // be lenient about translators @@ -91,20 +91,20 @@ var Zotero_Lookup = new function () { translate.setTranslator(translators); try { - newItems = await translate.translate({ + newItems.push(...await translate.translate({ libraryID, collections, saveAttachments: !childItem - }); + })); } // Continue with other ids on failure catch (e) { Zotero.logError(e); } - })); + } toggleProgress(false); - if (!newItems) { + if (!newItems.length) { Zotero.alert( window, Zotero.getString("lookup.failure.title"), @@ -126,7 +126,7 @@ var Zotero_Lookup = new function () { on => Zotero_Lookup.toggleProgress(on) ); - if (newItems) { + if (newItems.length) { document.getElementById("zotero-lookup-panel").hidePopup(); } return false; From 117bc45ed4a8880e6332f28a759abfa3fa323a90 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sat, 5 Aug 2023 00:01:39 -0400 Subject: [PATCH 75/86] Look up PubMed IDs in batches of 200 https://forums.zotero.org/discussion/comment/440245/#Comment_440245 (cherry picked from commit af91173734889f7a28870516d9ddaf4d15dc559d) --- chrome/content/zotero/lookup.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/chrome/content/zotero/lookup.js b/chrome/content/zotero/lookup.js index 02fb8289351..6a1d1b90b47 100644 --- a/chrome/content/zotero/lookup.js +++ b/chrome/content/zotero/lookup.js @@ -81,6 +81,23 @@ var Zotero_Lookup = new function () { toggleProgress(true); + // Group PubMed IDs into batches of 200 + // + // Up to 10,000 ids can apparently be passed in a single request, but 200 is the recommended + // limit for GET, which we currently use, and passing batches of 200 seems...fine. + // + // https://www.ncbi.nlm.nih.gov/books/NBK25499/#chapter4.id + if (identifiers.length && identifiers[0].PMID) { + let chunkSize = 200; + let newIdentifiers = []; + for (let i = 0; i < identifiers.length; i += chunkSize) { + newIdentifiers.push({ + PMID: identifiers.slice(i, i + chunkSize).map(x => x.PMID) + }); + } + identifiers = newIdentifiers; + } + let newItems = []; for (let identifier of identifiers) { let translate = new Zotero.Translate.Search(); From 8f3f3c9b8646cd6708ac3f18803d60c5ca7e9209 Mon Sep 17 00:00:00 2001 From: Abe Jellinek Date: Thu, 25 May 2023 17:57:32 +0300 Subject: [PATCH 76/86] Fix ScienceDirect PDF downloads ScienceDirect sometimes puts the `name` directive at the end of the Content-Type header instead of in Content-Disposition. That isn't strictly spec-approved, but there are other directives (`charset` and `boundary`) that can also be appended to Content-Type per the spec. We want to strip them before looking for handlers. https://forums.zotero.org/discussion/105194/sciencedirect-pdf-downloads-not-working-zotero-7 (cherry picked from commit a4c3f5267b873df578ef7608a23d1816dc883cc5) --- chrome/content/zotero/xpcom/mimeTypeHandler.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/chrome/content/zotero/xpcom/mimeTypeHandler.js b/chrome/content/zotero/xpcom/mimeTypeHandler.js index fd1eca8c7f6..61146a96d68 100644 --- a/chrome/content/zotero/xpcom/mimeTypeHandler.js +++ b/chrome/content/zotero/xpcom/mimeTypeHandler.js @@ -142,8 +142,10 @@ Zotero.MIMETypeHandler = new function () { if(channel.loadFlags & Components.interfaces.nsIHttpChannel.LOAD_DOCUMENT_URI) { channel.QueryInterface(Components.interfaces.nsIHttpChannel); try { + // Get the main directive of the Content-Type header + // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Type#syntax + var contentType = channel.getResponseHeader("Content-Type").split(';')[0].toLowerCase(); // remove content-disposition headers for EndNote, etc. - var contentType = channel.getResponseHeader("Content-Type").toLowerCase(); for (let handledType of _ignoreContentDispositionTypes) { if (contentType.startsWith(handledType)) { channel.setResponseHeader("Content-Disposition", "inline", false); From e19ab9b30b502d8a1610e2b85fd0dd0a1bf7fe98 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sun, 3 Sep 2023 18:43:44 -0400 Subject: [PATCH 77/86] Don't require unused date field in retractions list (cherry picked from commit b4c3c0c7f9794b0223354a5955e99c0e258c1e58) --- chrome/content/zotero/xpcom/retractions.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chrome/content/zotero/xpcom/retractions.js b/chrome/content/zotero/xpcom/retractions.js index 4df2a2ffed5..b0c2eba0c3a 100644 --- a/chrome/content/zotero/xpcom/retractions.js +++ b/chrome/content/zotero/xpcom/retractions.js @@ -541,10 +541,10 @@ Zotero.Retractions = { ]); var prefixesToSend = new Set(); for (let row of list) { - let [prefixStr, date] = row.split(' '); + let [prefixStr, _date] = row.split(' '); let type = prefixStr[0]; let prefix = prefixStr.substr(1); - if (!type || !prefix || !date) { + if (!type || !prefix) { Zotero.warn("Bad line in retractions data: " + row); continue; } From a8a691fddba8deecf09f1f66e52321164605bf3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adomas=20Ven=C4=8Dkauskas?= Date: Fri, 16 Jun 2023 12:40:13 +0300 Subject: [PATCH 78/86] Fix the integration template check for unknown agents (cherry picked from commit 9668270017d7c60d1ef6e3eaa38efa9bb73904d0) --- chrome/content/zotero/xpcom/integration.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/content/zotero/xpcom/integration.js b/chrome/content/zotero/xpcom/integration.js index aca55b541fa..c619724439c 100644 --- a/chrome/content/zotero/xpcom/integration.js +++ b/chrome/content/zotero/xpcom/integration.js @@ -146,7 +146,7 @@ Zotero.Integration = new function() { */ this.warnOutdatedTemplate = function (agent, templateVersion) { const expectedTemplateVersion = TEMPLATE_VERSIONS[agent]; - if (typeof expectedTemplateVersion != 'undefined' && templateVersion >= expectedTemplateVersion) return false; + if (typeof expectedTemplateVersion == 'undefined' || templateVersion >= expectedTemplateVersion) return false; const daysToIgnore = 30; const now = Math.floor(Date.now() / 1000); const updateTemplateDelayedOn = Zotero.Prefs.get('integration.updateTemplateDelayedOn'); From 9e4986abf5d3d99602200fc4241577b3fe71ac25 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Mon, 4 Sep 2023 21:57:19 -0400 Subject: [PATCH 79/86] Update pdf-worker submodule --- pdf-worker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pdf-worker b/pdf-worker index ab37454b0fc..038a79357fc 160000 --- a/pdf-worker +++ b/pdf-worker @@ -1 +1 @@ -Subproject commit ab37454b0fc064a572b0e16126f0caa991647406 +Subproject commit 038a79357fcc47429f5a314697af735df904dfe8 From 16ea4da9b28263a1d608cf057313ee75e699363b Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Tue, 5 Sep 2023 00:00:18 -0400 Subject: [PATCH 80/86] Don't show underline or text annotations in Zotero 6 --- chrome/content/zotero/xpcom/data/item.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/chrome/content/zotero/xpcom/data/item.js b/chrome/content/zotero/xpcom/data/item.js index 640b14d7034..45cd1f6a0f0 100644 --- a/chrome/content/zotero/xpcom/data/item.js +++ b/chrome/content/zotero/xpcom/data/item.js @@ -3964,7 +3964,9 @@ Zotero.Item.prototype.getAnnotations = function (includeTrashed) { } var ids = rows.map(row => row.itemID); this._annotations[cacheKey] = ids; - return Zotero.Items.get(ids); + return Zotero.Items.get(ids) + // Filter out underline and text annotations in Zotero 6 + .filter(x => !['underline', 'text'].includes(x.annotationType)); }; From 9c9936a88a4067a4fc61ee49cf9ff07a96a93bd4 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Wed, 6 Sep 2023 15:54:38 -0400 Subject: [PATCH 81/86] Update version --- install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.rdf b/install.rdf index b265c691cf9..dae33761d59 100644 --- a/install.rdf +++ b/install.rdf @@ -6,7 +6,7 @@ zotero@chnm.gmu.edu Zotero - 6.0.27.SOURCE + 6.0.28.SOURCE false 2 From 32e50d89be22a6b3d74715cc6bf0e875e8f7b6f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adomas=20Ven=C4=8Dkauskas?= Date: Wed, 27 Sep 2023 12:19:31 +0300 Subject: [PATCH 82/86] Fix http word integration word path unicode issues. --- chrome/content/zotero/xpcom/server_integration.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/chrome/content/zotero/xpcom/server_integration.js b/chrome/content/zotero/xpcom/server_integration.js index bb9c21ad127..2c0d17df249 100644 --- a/chrome/content/zotero/xpcom/server_integration.js +++ b/chrome/content/zotero/xpcom/server_integration.js @@ -29,7 +29,10 @@ Zotero.Server.Endpoints['/integration/macWordCommand'].prototype = { supportedDataTypes: ["application/json"], permitBookmarklet: true, init: function (data) { - Zotero.Integration.execCommand(data.query.agent, data.query.command, data.query.document, data.query.templateVersion); + // Some dark magic to fix incorrectly encoded unicode characters here + // from https://stackoverflow.com/questions/5396560/how-do-i-convert-special-utf-8-chars-to-their-iso-8859-1-equivalent-using-javasc + const document = decodeURIComponent(escape(data.query.document)); + Zotero.Integration.execCommand(data.query.agent, data.query.command, document, data.query.templateVersion); return 200; }, }; From 72850b49dcd2d5898702aa6e3cf673258a892aa9 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Mon, 23 Oct 2023 03:23:23 -0400 Subject: [PATCH 83/86] Update version --- install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.rdf b/install.rdf index dae33761d59..3fe66989338 100644 --- a/install.rdf +++ b/install.rdf @@ -6,7 +6,7 @@ zotero@chnm.gmu.edu Zotero - 6.0.28.SOURCE + 6.0.29.SOURCE false 2 From 0633f0191b91e33e04ff9748e4fb15d76a8dd484 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Thu, 2 Nov 2023 17:38:28 -0400 Subject: [PATCH 84/86] Update version --- install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.rdf b/install.rdf index 3fe66989338..597003a4116 100644 --- a/install.rdf +++ b/install.rdf @@ -6,7 +6,7 @@ zotero@chnm.gmu.edu Zotero - 6.0.29.SOURCE + 6.0.30.SOURCE false 2 From d05fd69fc2d58b38575c068e6bd383bdfa3e53ca Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Thu, 2 Nov 2023 06:25:53 -0400 Subject: [PATCH 85/86] Block JS and media loading in reports --- chrome/content/zotero/xpcom/report.js | 1 + 1 file changed, 1 insertion(+) diff --git a/chrome/content/zotero/xpcom/report.js b/chrome/content/zotero/xpcom/report.js index e5ee06157ab..5c6cce562f8 100644 --- a/chrome/content/zotero/xpcom/report.js +++ b/chrome/content/zotero/xpcom/report.js @@ -35,6 +35,7 @@ Zotero.Report.HTML = new function () { + '\n' + ' \n' + ' \n' + + ' \n' + ' ' + Zotero.getString('report.title.default') + '\n' + ' \n' + ' \n' From dd98c5b2b118de605924a6679c2b7cac8df6ba72 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Thu, 2 Nov 2023 17:39:44 -0400 Subject: [PATCH 86/86] Update translators and styles --- resource/schema/repotime.txt | 2 +- styles | 2 +- translators | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resource/schema/repotime.txt b/resource/schema/repotime.txt index 2db85cf7118..5d139a1153a 100644 --- a/resource/schema/repotime.txt +++ b/resource/schema/repotime.txt @@ -1 +1 @@ -2023-04-18 20:44:59 +2023-11-02 21:38:45 diff --git a/styles b/styles index 1a293a84285..1c0a5011594 160000 --- a/styles +++ b/styles @@ -1 +1 @@ -Subproject commit 1a293a84285ffae2e85476d8a4e90118fc15602d +Subproject commit 1c0a5011594eea73089dcf8a335cd22f3dc09a27 diff --git a/translators b/translators index b4829b4bfa2..fd45efc081b 160000 --- a/translators +++ b/translators @@ -1 +1 @@ -Subproject commit b4829b4bfa2c6225a362ffb2930d8716a0ede312 +Subproject commit fd45efc081bf03bf33af726b46cd83a81770909a