Martijn Laan преди 5 години
родител
ревизия
6a2df58873
променени са 2 файла, в които са добавени 3 реда и са изтрити 3 реда
  1. 1 1
      CONTRIBUTING.md
  2. 2 2
      whatsnew.htm

+ 1 - 1
CONTRIBUTING.md

@@ -24,7 +24,7 @@ branches and make pull requests. In detail:
 3. Add an `upstream` remote (`git remote add upstream
    https://github.com/jrsoftware/issrc.git`).
 
-4. Get the latest changes from upstream (e.g. `git pull upstream master`).
+4. Get the latest changes from upstream (e.g. `git pull upstream main`).
 
 5. Create a new topic branch to contain your feature, change, or fix (`git
    checkout -b <topic-branch-name>`).

+ 2 - 2
whatsnew.htm

@@ -135,7 +135,7 @@ For conditions of distribution and use, see <a href="https://jrsoftware.org/file
   </ul>
   </li>
   <li>Added official German translation.</li>
-  <li>Demoted the official <a href="https://raw.github.com/jrsoftware/issrc/master/Files/Languages/Unofficial/Greek.isl">Greek</a>, <a href="https://raw.github.com/jrsoftware/issrc/master/Files/Languages/Unofficial/Hungarian.isl">Hungarian</a>, and <a href="https://raw.github.com/jrsoftware/issrc/master/Files/Languages/Unofficial/ScottishGaelic.isl">Scottish Gaelic</a> translations to unofficial because of a no longer available maintainer. To send updates yourself,  use <a href="https://jrsoftware.org/files/istrans/send2.php">this form</a> to send updates (or use <a href="https://github.com/jrsoftware/issrc" target="_blank">GitHub</a>). See the <a href="https://jrsoftware.org/files/istrans/">Inno Setup Translations</a> page for more information.</li>
+  <li>Demoted the official <a href="https://raw.github.com/jrsoftware/issrc/main/Files/Languages/Unofficial/Greek.isl">Greek</a>, <a href="https://raw.github.com/jrsoftware/issrc/main/Files/Languages/Unofficial/Hungarian.isl">Hungarian</a>, and <a href="https://raw.github.com/jrsoftware/issrc/main/Files/Languages/Unofficial/ScottishGaelic.isl">Scottish Gaelic</a> translations to unofficial because of a no longer available maintainer. To send updates yourself,  use <a href="https://jrsoftware.org/files/istrans/send2.php">this form</a> to send updates (or use <a href="https://github.com/jrsoftware/issrc" target="_blank">GitHub</a>). See the <a href="https://jrsoftware.org/files/istrans/">Inno Setup Translations</a> page for more information.</li>
   <li>Other documentation improvements.</li>
 </ul>
 
@@ -282,7 +282,7 @@ For conditions of distribution and use, see <a href="https://jrsoftware.org/file
   <li><b>Removed messages:</b> EntryAbortRetryIgnore, ExistingFileReadOnly, ExistingFileReadOnlyAbortRetryIgnore, FileAbortRetryIgnore, FileAbortRetryIgnore2, MissingWOW64APIs.</li>
 </ul>
 
-<p>Note: Not all official translations have been updated for these changes at this moment. Demoted the official <a href="https://raw.github.com/jrsoftware/issrc/master/Files/Languages/Unofficial/German.isl">German</a>, <a href="https://raw.github.com/jrsoftware/issrc/master/Files/Languages/Unofficial/Nepali.islu">Nepali</a>, <a href="https://raw.github.com/jrsoftware/issrc/master/Files/Languages/Unofficial/SerbianCyrillic.isl">Serbian (Cyrillic)</a> and <a href="https://raw.github.com/jrsoftware/issrc/master/Files/Languages/Unofficial/SerbianLatin.isl">Serbian (Latin)</a> translations to unofficial because of a no longer available maintainer. To send updates yourself, use <a href="https://jrsoftware.org/files/istrans/send2.php">this form</a> to send updates (or use <a href="https://github.com/jrsoftware/issrc" target="_blank">GitHub</a>). See the <a href="https://jrsoftware.org/files/istrans/">Inno Setup Translations</a> page for more information.</li>
+<p>Note: Not all official translations have been updated for these changes at this moment. Demoted the official <a href="https://raw.github.com/jrsoftware/issrc/main/Files/Languages/Unofficial/German.isl">German</a>, <a href="https://raw.github.com/jrsoftware/issrc/main/Files/Languages/Unofficial/Nepali.islu">Nepali</a>, <a href="https://raw.github.com/jrsoftware/issrc/main/Files/Languages/Unofficial/SerbianCyrillic.isl">Serbian (Cyrillic)</a> and <a href="https://raw.github.com/jrsoftware/issrc/main/Files/Languages/Unofficial/SerbianLatin.isl">Serbian (Latin)</a> translations to unofficial because of a no longer available maintainer. To send updates yourself, use <a href="https://jrsoftware.org/files/istrans/send2.php">this form</a> to send updates (or use <a href="https://github.com/jrsoftware/issrc" target="_blank">GitHub</a>). See the <a href="https://jrsoftware.org/files/istrans/">Inno Setup Translations</a> page for more information.</li>
 
 <p><a href="https://jrsoftware.org/files/is5-whatsnew.htm">Inno Setup 5.6 Revision History</a></p>