Merge branch 'master' into gh-1389

retorquere · Feb 1, 2020 · 79398b6 · 79398b6
2 parents 71a3035 + 10c6f4c
commit 79398b6
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/locale/de-DE/zotero-better-bibtex.dtd b/locale/de-DE/zotero-better-bibtex.dtd
@@ -123,7 +123,7 @@ If you turn this off, the markup is omitted during import. When you select 'yes'
 <!ENTITY better-bibtex.Preferences.advanced.tab.export "Export">
 <!ENTITY better-bibtex.Preferences.advanced.export.titleCase "Apply title-casing to titles">
 <!ENTITY better-bibtex.Preferences.advanced.export.titleCase.warning "If you're dead-set on ignoring both BibTeX/BibLaTeX best practice (see the BBT FAQ) and the Zotero recommendations on title/sentence casing, you can turn this off to suppress title casing for English references">
-<!ENTITY better-bibtex.Preferences.advanced.export.braceProtection "Apply brace-protection to capitalized words">
+<!ENTITY better-bibtex.Preferences.advanced.export.braceProtection "Apply case-protection to capitalized words by enclosing them in braces">
 <!ENTITY better-bibtex.Preferences.advanced.export.braceProtection.warning "If you're dead-set on ignoring both BibTeX/BibLaTeX best practice (see the BBT FAQ) and the Zotero recommendations on title/sentence casing, you can turn this off to suppress automatic brace-protection for words with uppercase letters.">
 
 <!ENTITY better-bibtex.Preferences.advanced.export.retainCache "Retain export cache across upgrades">

diff --git a/locale/en-US/zotero-better-bibtex.dtd b/locale/en-US/zotero-better-bibtex.dtd
@@ -129,7 +129,7 @@ If you turn this off, the markup is omitted during import. When you select 'yes'
 <!ENTITY better-bibtex.Preferences.advanced.export.retainCache "Retain export cache across upgrades">
 <!ENTITY better-bibtex.Preferences.advanced.export.retainCache.warning "By default, BBT clears all caches whenever BBT or Zotero is upgraded. I can't realistically predict whether a change in Zotero or BBT is going to affect the output generated for any given item, so to be sure you always have the latest export-affecting fixes, the caches are discarded when a new version of either is detected. If you have a very large library however, of which you regularly export significant portions, you might want to retain the cached items even if that does come with the risk that you get wrong output on export that has been fixed in the interim.
 
-If you turn this on, the *only* problem with export you are allowed to report is that the cache is getting dropped on upgrade. Before you report absolutely *anything* else, you *must* clear the cache and reproduce the problem. When you change this setting, as with any setting change, the cache will be dropped.">
+If you have this on, and you experience any problem that is not the cache getting dropped on upgrade, you *must* clear the cache and reproduce the problem. When you change this setting, as with any setting change, the cache will be dropped.">
 <!ENTITY better-bibtex.Preferences.advanced.export.workers "Parallel background exports:">
 
 <!ENTITY better-bibtex.Preferences.advanced.tab.citekeys "Citation keys">

diff --git a/locale/fr-FR/zotero-better-bibtex.dtd b/locale/fr-FR/zotero-better-bibtex.dtd
@@ -124,7 +124,7 @@ En mode « minimal », le nombre d'éléments `span` est minimisé.">
 <!ENTITY better-bibtex.Preferences.advanced.tab.export "Exportation">
 <!ENTITY better-bibtex.Preferences.advanced.export.titleCase "Appliquer la capitalisation aux titres">
 <!ENTITY better-bibtex.Preferences.advanced.export.titleCase.warning "Si vous n'êtes pas prêt à ignorer à la fois les meilleures pratiques BibTeX/BibLaTeX (voir la FAQ BBT) et les recommandations de Zotero sur la casse des titres/phrases, vous pouvez désactiver cette option pour supprimer la capitalisation des références en anglais">
-<!ENTITY better-bibtex.Preferences.advanced.export.braceProtection "Appliquer la protection des accolades aux mots capitalisés">
+<!ENTITY better-bibtex.Preferences.advanced.export.braceProtection "Appliquer la protection de la casse aux mots en capitales en les insérant entre paires d'accolades">
 <!ENTITY better-bibtex.Preferences.advanced.export.braceProtection.warning "Si vous n'êtes pas prêt à ignorer à la fois les meilleures pratiques BibTeX/BibLaTeX (voir la FAQ BBT) et les recommandations de Zotero sur le tire/phrase, vous pouvez désactiver cette option pour supprimer la protection automatique des accolades pour les mots avec des lettres capitales.">
 
 <!ENTITY better-bibtex.Preferences.advanced.export.retainCache "Conserver le cache d'exportation entre les mises à jour">

diff --git a/locale/pt-BR/zotero-better-bibtex.dtd b/locale/pt-BR/zotero-better-bibtex.dtd
@@ -123,7 +123,7 @@ If you turn this off, the markup is omitted during import. When you select 'yes'
 <!ENTITY better-bibtex.Preferences.advanced.tab.export "Export">
 <!ENTITY better-bibtex.Preferences.advanced.export.titleCase "Apply title-casing to titles">
 <!ENTITY better-bibtex.Preferences.advanced.export.titleCase.warning "If you're dead-set on ignoring both BibTeX/BibLaTeX best practice (see the BBT FAQ) and the Zotero recommendations on title/sentence casing, you can turn this off to suppress title casing for English references">
-<!ENTITY better-bibtex.Preferences.advanced.export.braceProtection "Apply brace-protection to capitalized words">
+<!ENTITY better-bibtex.Preferences.advanced.export.braceProtection "Apply case-protection to capitalized words by enclosing them in braces">
 <!ENTITY better-bibtex.Preferences.advanced.export.braceProtection.warning "If you're dead-set on ignoring both BibTeX/BibLaTeX best practice (see the BBT FAQ) and the Zotero recommendations on title/sentence casing, you can turn this off to suppress automatic brace-protection for words with uppercase letters.">
 
 <!ENTITY better-bibtex.Preferences.advanced.export.retainCache "Retain export cache across upgrades">

diff --git a/site/layouts/shortcodes/preferences/advanced.md b/site/layouts/shortcodes/preferences/advanced.md
@@ -31,7 +31,7 @@ default: `no`
 
 By default, BBT clears all caches whenever BBT or Zotero is upgraded. I can't realistically predict whether a change in Zotero or BBT is going to affect the output generated for any given item, so to be sure you always have the latest export-affecting fixes, the caches are discarded when a new version of either is detected. If you have a very large library however, of which you regularly export significant portions, you might want to retain the cached items even if that does come with the risk that you get wrong output on export that has been fixed in the interim.
 
-If you turn this on, the *only* problem with export you are allowed to report is that the cache is getting dropped on upgrade. Before you report absolutely *anything* else, you *must* clear the cache and reproduce the problem. When you change this setting, as with any setting change, the cache will be dropped.
+If you have this on, and you experience any problem that is not the cache getting dropped on upgrade, you *must* clear the cache and reproduce the problem. When you change this setting, as with any setting change, the cache will be dropped.
 
 #### Parallel background exports: