mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
zotero/chrome/locale
History
Dan Stillman 0aecaad761 Update conflict resolution for API syncing 
This will appear much less frequently, since non-conflicting field changes on
both sides can be resolved automatically, but genuine field conflicts still
require manual conflict resolution.

The merge pane is no longer editable, since the itembox code to do that is
async and can't run in a modal window, but it's not really necessary,
particularly with conflicts happening less frequently.

TODO:

- Remote item deletions
- File conflicts
- Maybe handle some edge cases where the conflicted items fail to save
2015-08-06 04:14:49 -04:00
..
af-ZA/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
ar/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
bg-BG/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
ca-AD/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
cs-CZ/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
da-DK/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
de/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
el-GR/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
en-US/zotero Update conflict resolution for API syncing 2015-08-06 04:14:49 -04:00
es-ES/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
et-EE/zotero Update locales from Transifex 2015-07-03 02:06:59 -04:00
eu-ES/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
fa/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
fi-FI/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
fr-FR/zotero Update locales from Transifex 2015-07-03 02:06:59 -04:00
gl-ES/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
he-IL/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
hr-HR/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
hu-HU/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
id-ID/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
is-IS/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
it-IT/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
ja-JP/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
km/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
ko-KR/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
lt-LT/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
mn-MN/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
nb-NO/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
nl-NL/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
nn-NO/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
pl-PL/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
pt-BR/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
pt-PT/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
ro-RO/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
ru-RU/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
sk-SK/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
sl-SI/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
sr-RS/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
sv-SE/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
th-TH/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
tr-TR/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
uk-UA/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
vi-VN/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
zh-CN/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00
zh-TW/zotero Merge locales from Transifex 2015-06-30 23:41:48 -04:00