fix(chore): unsquash the commits

src/components/modals/main/settings/sections/About.jsx

@@ -183,7 +183,7 @@ export default class About extends PureComponent {
               rel="noopener noreferrer"
             >
               <MdContactPage />
-              Form
+              {variables.getMessage('modals.main.settings.sections.about.form_button')}
             </a>
             <Tooltip title={'Email'}>
               <a
@@ -224,6 +224,8 @@ export default class About extends PureComponent {
             <a
               className="donateButton"
               href={'https://opencollective.com/' + variables.constants.OPENCOLLECTIVE_USERNAME}
+              target="_blank"
+              rel="noopener noreferrer"
             >
               <BiDonateHeart />
               {variables.getMessage('modals.main.settings.sections.about.support_donate')}
@@ -350,9 +352,9 @@ export default class About extends PureComponent {
           {!!this.state.loading ? <p>{this.state.loading}</p> : <></> }
           <ul>
             {this.state.photographers.map(({ name, count }) => <>
-              <li>
+              <li className="subtitle-photographers">
                 {name}
-                <span style={{ color: '#ccc' }}> ({count} images)</span>
+                <span> ({count} images)</span>
               </li>
             </>)}
           </ul>

src/components/modals/main/settings/sections/Language.jsx

@@ -30,12 +30,11 @@ export default class LanguageSettings extends PureComponent {
       return;
     }
 
-    const quoteLanguages = [];
-    data.forEach((item) => {
-      quoteLanguages.push({
-        name: item,
-        value: item,
-      });
+    const quoteLanguages = data.map((language) => {
+      return {
+        name: languages.find((l) => l.value === language.name) ? languages.find((l) => l.value === language.name).name : 'English',
+        value: language,
+      };
     });
 
     this.setState({
@@ -78,7 +77,8 @@ export default class LanguageSettings extends PureComponent {
         <div className="languageSettings">
           <Radio
             name="quoteLanguage"
-            options={this.state.quoteLanguages.map((l) => l.name)}
+            options={this.state.quoteLanguages.map((language) => { return { name: language.name, value: language.value.name }; })}
+            defaultValue={this.state.quoteLanguages[0].name}
             category="quote"
           />
         </div>

src/components/modals/main/settings/sections/Search.jsx

@@ -111,6 +111,7 @@ export default class SearchSettings extends PureComponent {
           subtitle={variables.getMessage(
             'modals.main.settings.sections.search.search_engine_subtitle',
           )}
+          final={ this.state.customDisplay === 'none' ? true : false}
         >
           <Dropdown
             name="searchEngine"
@@ -128,7 +129,7 @@ export default class SearchSettings extends PureComponent {
           </Dropdown>
         </SettingsItem>
         <div style={{ display: this.state.customDisplay }}>
-          <SettingsItem title={variables.getMessage('modals.main.settings.sections.search.custom')}>
+          <SettingsItem title={variables.getMessage('modals.main.settings.sections.search.custom')} final={true}>
             <TextField
               label={variables.getMessage('modals.main.settings.sections.search.custom')}
               value={this.state.customValue}

src/components/modals/main/settings/sections/Time.jsx

@@ -93,6 +93,11 @@ export default class TimeSettings extends PureComponent {
           text={variables.getMessage('modals.main.settings.sections.time.analogue.minute_marks')}
           category="clock"
         />
+        <Checkbox
+          name="roundClock"
+          text={variables.getMessage('modals.main.settings.sections.time.analogue.round_clock')}
+          category="clock"
+        />
       </SettingsItem>
     );