Merge branch 'fix-for-issue-8055' into fix-#10

CHANGELOG.md

@@ -33,6 +33,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We fixed an issue where the command line export using `--exportMatches` flag does not create an output bib file [#9581](https://github.com/JabRef/jabref/issues/9581)
 - We fixed an issue where custom field in the custom entry types could not be set to mulitline [#9609](https://github.com/JabRef/jabref/issues/9609)
 - We fixed an issue where the Office XML exporter did not resolve BibTeX-Strings when exporting entries [forum#3741](https://discourse.jabref.org/t/exporting-bibtex-constant-strings-to-ms-office-2007-xml/3741)
+- we fixed an issue where the password is saved locally if user wants to use proxy with authentication [#8055](https://github.com/JabRef/jabref/issues/8055)
 
 
 ### Removed

buildres/csl/csl-locales/locales-es-ES.xml

@@ -31,7 +31,7 @@
     <term name="no-publisher" form="short">n.p.</term>
     <term name="on">on</term>
     <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="original-work-published">original work published</term>
+    <term name="original-work-published">obra original publicada en</term>
     <term name="personal-communication">comunicación personal</term>
     <term name="podcast">podcast</term>
     <term name="podcast-episode">podcast episode</term>

buildres/csl/csl-locales/locales-es-MX.xml

@@ -32,7 +32,7 @@
     <term name="no-publisher" form="short">n.p.</term>
     <term name="on">on</term>
     <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="original-work-published">original work published</term>
+    <term name="original-work-published">obra original publicada en</term>
     <term name="personal-communication">comunicación personal</term>
     <term name="podcast">podcast</term>
     <term name="podcast-episode">podcast episode</term>

buildres/csl/csl-styles/american-sociological-association.csl

@@ -16,7 +16,7 @@
     <category citation-format="author-date"/>
     <category field="sociology"/>
     <summary>The ASA style following the 6th edition of the Style Guide</summary>
-    <updated>2020-09-18T10:38:12+00:00</updated>
+    <updated>2022-05-08T21:48:56+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="en">
@@ -240,6 +240,17 @@
             <text variable="page"/>
           </group>
         </if>
+        <else-if type="manuscript">
+          <group delimiter=". ">
+            <text macro="title" quotes="true" prefix=" "/>
+            <group prefix=" " delimiter=", ">
+              <text macro="edition"/>
+              <text macro="editor" suffix="."/>
+              <text macro="publisher"/>
+            </group>
+            <text variable="genre"/>
+          </group>
+        </else-if>
         <else-if type="thesis">
           <text macro="title" prefix=" " suffix="." quotes="true"/>
           <group prefix=" " delimiter=", ">