From 3312e60bbf5edb284da06e7acbceabe0880972d1 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Tue, 21 Apr 2020 00:42:05 +0200 Subject: [PATCH] MUI - Restore the English version of the BSD 3-clause license + upd: version files --- Versions/build.txt | 2 +- Versions/day.txt | 2 +- language/np3_af_za/strings_af_za.rc | 3 -- language/np3_be_by/strings_be_by.rc | 3 -- language/np3_de_de/strings_de_de.rc | 47 ++++++++++++++--------------- language/np3_es_es/strings_es_es.rc | 47 ++++++++++++++--------------- language/np3_fr_fr/strings_fr_fr.rc | 47 ++++++++++++++--------------- language/np3_hu_hu/strings_hu_hu.rc | 3 -- language/np3_it_it/strings_it_it.rc | 3 -- language/np3_ja_jp/strings_ja_jp.rc | 3 -- language/np3_ko_kr/strings_ko_kr.rc | 3 -- language/np3_nl_nl/strings_nl_nl.rc | 47 ++++++++++++++--------------- language/np3_pl_pl/strings_pl_pl.rc | 3 -- language/np3_pt_br/strings_pt_br.rc | 3 -- language/np3_ru_ru/strings_ru_ru.rc | 3 -- language/np3_sk_sk/strings_sk_sk.rc | 3 -- language/np3_sv_se/strings_sv_se.rc | 3 -- language/np3_tr_tr/strings_tr_tr.rc | 3 -- language/np3_zh_cn/strings_zh_cn.rc | 3 -- res/Notepad3.exe.manifest.conf | 2 +- src/VersionEx.h | 4 +-- 21 files changed, 93 insertions(+), 144 deletions(-) diff --git a/Versions/build.txt b/Versions/build.txt index b8626c4cf..d00491fd7 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -4 +1 diff --git a/Versions/day.txt b/Versions/day.txt index 816d01be5..1bb7ac539 100644 --- a/Versions/day.txt +++ b/Versions/day.txt @@ -1 +1 @@ -420 +421 diff --git a/language/np3_af_za/strings_af_za.rc b/language/np3_af_za/strings_af_za.rc index 7a1e1583b..2c83a2961 100644 --- a/language/np3_af_za/strings_af_za.rc +++ b/language/np3_af_za/strings_af_za.rc @@ -369,9 +369,6 @@ IDS_MUI_ABOUT_RTF_6 "\ END -// -// Lines added to synchronize the number of lines of all "strings_xx_yy.rc" files. -// #endif // Afrikaans (South Africa) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/language/np3_be_by/strings_be_by.rc b/language/np3_be_by/strings_be_by.rc index 9e0fee880..e09f01c68 100644 --- a/language/np3_be_by/strings_be_by.rc +++ b/language/np3_be_by/strings_be_by.rc @@ -369,9 +369,6 @@ IDS_MUI_ABOUT_RTF_6 "\ END -// -// Lines added to synchronize the number of lines of all "strings_xx_yy.rc" files. -// #endif // Belarusian (Belarus) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/language/np3_de_de/strings_de_de.rc b/language/np3_de_de/strings_de_de.rc index 20f0c9927..71f4a9245 100644 --- a/language/np3_de_de/strings_de_de.rc +++ b/language/np3_de_de/strings_de_de.rc @@ -337,37 +337,34 @@ IDS_MUI_ABOUT_RTF_5 "\ IDS_MUI_ABOUT_RTF_6 "\ \\cf0 \\fs20\\b1\\ul1 Notepad3 Lizenz:\\ul0\\b0\\fs18\\par\ \\cf0 \\par\ -\\cf0 Notepad3 und MiniPath Urheberrecht \\u0169 2008-2020 Rizonesoft, Alle Rechte vorbehalten.\\par\ +\\cf0 Notepad3 and MiniPath Copyright \\u0169 2008-2020 Rizonesoft, All rights reserved.\\par\ \\cf0 https://www.rizonesoft.com\\par\ \\cf0 \\par\ -\\cf0 Weiterverbreitung und Verwendung in nichtkompilierter oder kompilierter Form,\\par\ -\\cf0 mit oder ohne Veränderung, sind unter den folgenden Bedingungen zulässig:\\par\ +\\cf0 Redistribution and use in source and binary forms, with or without modification,\\par\ +\\cf0 are permitted provided that the following conditions are met:\\par\ \\cf0 \\par\ -\\cf0 1. Weiterverbreitete Software-Quelltexte müssen den obigen Copyright-Vermerk,\\par\ -\\cf0 diese Liste der Bedingungen und die ihnen folgende Haftungsklausel enthalten.\\par\ +\\cf0 1. Redistributions of source code must retain the above copyright\\par\ +\\cf0 notice, this list of conditions and the following disclaimer.\\par\ \\cf0 \\par\ -\\cf0 2. Weiterverbreitete kompilierte Exemplare müssen den obigen Copyright-Vermerk,\\par\ -\\cf0 diese Liste der Bedingungen und die ihnen folgende Haftungsklausel in der Dokumentation \\par\ -\\cf0 und/oder anderen Materialien, die mit dem Exemplar verbreitet werden, enthalten.\\par\ +\\cf0 2. Redistributions in binary form must reproduce the above copyright\\par\ +\\cf0 notice, this list of conditions and the following disclaimer in the\\par\ +\\cf0 documentation and/or other materials provided with the distribution.\\par\ \\cf0 \\par\ -\\cf0 3. Weder der Name Florian Balmer noch die Namen der Mitwirkenden dürfen\\par\ -\\cf0 zum Kennzeichnen oder Bewerben von Produkten, die von dieser Software abgeleitet wurden,\\par\ -\\cf0 ohne spezielle vorherige schriftliche Genehmigung verwendet werden.\\par\ +\\cf0 3. Neither the name of Florian Balmer nor the names of its contributors\\par\ +\\cf0 may be used to endorse or promote products derived from this software\\par\ +\\cf0 without specific prior written permission.\\par\ \\cf0 \\par\ -\\cf0 DIESE SOFTWARE WIRD VOM URHEBERRECHT INHABER UND DEN MITARBEITERN OHNE\\par\ -\\cf0 JEGLICHE AUSDRÜCKLICHE ODER IMPLIZIERTE GARANTIEN ZUR VERFÜGUNG\\par\ -\\cf0 GESTELLT, DIE UNTER ANDEREM EINSCHLIESSEN: DIE IMPLIZIERTE GARANTIE DER\\par\ -\\cf0 VERWENDBARKEIT DER SOFTWARE FÜR EINEN BESTIMMTEN ZWECK. AUF KEINEN FALL\\par\ -\\cf0 SIND DIE URHEBERRECHT INHABER ODER DIE MITARBEITER FÜR IRGENDWELCHE\\par\ -\\cf0 DIREKTEN, INDIREKTEN, ZUFÄLLIGEN, SPEZIELLEN, BEISPIELHAFTEN ODER\\par\ -\\cf0 FOLGESCHÄDEN (UNTER ANDEREM VERSCHAFFEN VON ERSATZGÜTERN ODER\\par\ -\\cf0 DIENSTLEISTUNGEN; EINSCHRÄNKUNG DER NUTZUNGSFÄHIGKEIT; VERLUST VON\\par\ -\\cf0 NUTZUNGSFÄHIGKEIT, DATEN, ODER PROFIT; ODER GESCHÄFTSUNTERBRECHUNG),\\par\ -\\cf0 WIE AUCH IMMER VERURSACHT UND UNTER WELCHER VERPFLICHTUNG AUCH IMMER, OB\\par\ -\\cf0 IN VERTRAG, STRIKTER VERPFLICHTUNG ODER UNERLAUBTER HANDLUNG (INKLUSIVE\\par\ -\\cf0 FAHRLÄSSIGKEIT) VERANTWORTLICH, AUF WELCHEM WEG SIE AUCH IMMER DURCH\\par\ -\\cf0 DIE BENUTZUNG DIESER SOFTWARE ENTSTANDEN SIND, SOGAR, WENN SIE AUF DIE\\par\ -\\cf0 MÖGLICHKEIT EINES SOLCHEN SCHADENS HINGEWIESEN WORDEN SIND.\\par\ +\\cf0 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\\par\ +\\cf0 'AS IS' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED\\par\ +\\cf0 TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A\\par\ +\\cf0 PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\\par\ +\\cf0 OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\\par\ +\\cf0 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\\par\ +\\cf0 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\\par\ +\\cf0 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\\par\ +\\cf0 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\\par\ +\\cf0 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\\par\ +\\cf0 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\\par\ }" END diff --git a/language/np3_es_es/strings_es_es.rc b/language/np3_es_es/strings_es_es.rc index 837bfb927..b2a10fb2a 100644 --- a/language/np3_es_es/strings_es_es.rc +++ b/language/np3_es_es/strings_es_es.rc @@ -337,41 +337,38 @@ IDS_MUI_ABOUT_RTF_5 "\ IDS_MUI_ABOUT_RTF_6 "\ \\cf0 \\fs20\\b1\\ul1 Licencia Notepad3:\\ul0\\b0\\fs18\\par\ \\cf0 \\par\ -\\cf0 Notepad3 y MiniPath Copyright \\u0169 2008-2020 Rizonesoft, Todos derechos reservados.\\par\ +\\cf0 Notepad3 and MiniPath Copyright \\u0169 2008-2020 Rizonesoft, All rights reserved.\\par\ \\cf0 https://www.rizonesoft.com\\par\ \\cf0 \\par\ -\\cf0 La redistribución y el uso en las formas de código fuente y binario, con o sin\\par\ -\\cf0 modificaciones, están permitidos siempre que se cumplan las siguientes condiciones:\\par\ +\\cf0 Redistribution and use in source and binary forms, with or without modification,\\par\ +\\cf0 are permitted provided that the following conditions are met:\\par\ \\cf0 \\par\ -\\cf0 1. Las redistribuciones del código fuente deben conservar el aviso de copyright\\par\ -\\cf0 anterior, esta lista de condiciones y el siguiente descargo de responsabilidad.\\par\ +\\cf0 1. Redistributions of source code must retain the above copyright\\par\ +\\cf0 notice, this list of conditions and the following disclaimer.\\par\ \\cf0 \\par\ -\\cf0 2. Las redistribuciones en formato binario deben reproducir el aviso de copyright\\par\ -\\cf0 anterior, esta lista de condiciones y el siguiente descargo de responsabilidad\\par\ -\\cf0 en la documentación y/u otros materiales suministrados con la distribución.\\par\ +\\cf0 2. Redistributions in binary form must reproduce the above copyright\\par\ +\\cf0 notice, this list of conditions and the following disclaimer in the\\par\ +\\cf0 documentation and/or other materials provided with the distribution.\\par\ \\cf0 \\par\ -\\cf0 3. Ni el nombre de Florian Balmer ni los nombres de sus contribuidores pueden\\par\ -\\cf0 usarse para respaldar o promocionar productos derivados de este software sin\\par\ -\\cf0 permiso específico previo y por escrito.\\par\ +\\cf0 3. Neither the name of Florian Balmer nor the names of its contributors\\par\ +\\cf0 may be used to endorse or promote products derived from this software\\par\ +\\cf0 without specific prior written permission.\\par\ \\cf0 \\par\ -\\cf0 ESTE SOFTWARE SE SUMINISTRA POR LOS PROPIETARIOS DEL COPYRIGHT Y\\par\ -\\cf0 CONTRIBUIDORES 'TAL CUAL' Y CUALQUIER GARANTÍA EXPRESA O IMPLÍCITA,\\par\ -\\cf0 INCLUYENDO, PERO NO LIMITADO A, LAS GARANTÍAS IMPLÍCITAS DE COMERCIALIZACIÓN\\par\ -\\cf0 Y ADECUACIÓN PARA UN PROPÓSITO PARTICULAR SON RECHAZADAS. EN NINGÚN CASO\\par\ -\\cf0 LOS PROPIETARIOS DEL COPYRIGHT Y CONTRIBUIDORES SERÁN RESPONSABLES POR\\par\ -\\cf0 NINGÚN DAÑO DIRECTO, INDIRECTO, INCIDENTAL, ESPECIAL, EJEMPLAR O COSECUENCIAL\\par\ -\\cf0 (INCLUYENDO, PERO NO LIMITADO A, LA ADQUISICIÓN O SUSTITUCIÓN DE BIENES\\par\ -\\cf0 O SERVICIOS; LA PÉRDIDA DE USO, DE DATOS O DE BENEFICIOS; O INTERRUPCIÓN\\par\ -\\cf0 DE LA ACTIVIDAD EMPRESARIAL) O POR CUALQUIER TEORÍA DE RESPONSABILIDAD, YA\\par\ -\\cf0 SEA POR CONTRATO, RESPONSABILIDAD ESTRICTA O AGRAVIO (INCLUYENDO NEGLIGENCIA\\par\ -\\cf0 O CUALQUIER OTRA CAUSA) QUE SURJA DE CUALQUIER FORMA DEL USO DE ESTE\\par\ -\\cf0 SOFTWARE, INCLUSO SI SE HA ADVERTIDO DE LA POSIBILIDAD DE TALES DAÑOS.\\par\ +\\cf0 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\\par\ +\\cf0 'AS IS' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED\\par\ +\\cf0 TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A\\par\ +\\cf0 PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\\par\ +\\cf0 OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\\par\ +\\cf0 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\\par\ +\\cf0 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\\par\ +\\cf0 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\\par\ +\\cf0 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\\par\ +\\cf0 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\\par\ +\\cf0 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\\par\ }" END -// Lines added to synchronize the number of lines of all "strings_xx_yy.rc" files. -// #endif // Spanish (Spain, International Sort) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/language/np3_fr_fr/strings_fr_fr.rc b/language/np3_fr_fr/strings_fr_fr.rc index c111f7e3d..1ae4d44e0 100644 --- a/language/np3_fr_fr/strings_fr_fr.rc +++ b/language/np3_fr_fr/strings_fr_fr.rc @@ -337,37 +337,34 @@ IDS_MUI_ABOUT_RTF_5 "\ IDS_MUI_ABOUT_RTF_6 "\ \\cf0 \\fs20\\b1\\ul1 Licence Notepad3:\\ul0\\b0\\fs18\\par\ \\cf0 \\par\ -\\cf0 Notepad3 et MiniPath Copyright \\u0169 2008-2020 Rizonesoft, Tous droits réservés.\\par\ +\\cf0 Notepad3 and MiniPath Copyright \\u0169 2008-2020 Rizonesoft, All rights reserved.\\par\ \\cf0 https://www.rizonesoft.com\\par\ \\cf0 \\par\ -\\cf0 La redistribution et l'utilisation sous formes source et binaire, avec ou sans modification,\\par\ -\\cf0 sont autorisées à condition que les conditions suivantes soient remplies: \\par\ +\\cf0 Redistribution and use in source and binary forms, with or without modification,\\par\ +\\cf0 are permitted provided that the following conditions are met:\\par\ \\cf0 \\par\ -\\cf0 1. Les redistributions du code source doivent conserver l'avis de copyright ci-dessus,\\par\ -\\cf0 cette liste de conditions et la décharge de responsabilité suivante.\\par\ +\\cf0 1. Redistributions of source code must retain the above copyright\\par\ +\\cf0 notice, this list of conditions and the following disclaimer.\\par\ \\cf0 \\par\ -\\cf0 2. Les redistributions sous forme binaire doivent conserver l'avis de copyright ci-dessus,\\par\ -\\cf0 cette liste de conditions et la décharge de responsabilité suivante dans la documentation\\par\ -\\cf0 et/ou d'autres matériels fournis avec la distribution.\\par\ +\\cf0 2. Redistributions in binary form must reproduce the above copyright\\par\ +\\cf0 notice, this list of conditions and the following disclaimer in the\\par\ +\\cf0 documentation and/or other materials provided with the distribution.\\par\ \\cf0 \\par\ -\\cf0 3. Ni le nom de Florian Balmer ni les noms de ses contributeurs ne peut être utilisé\\par\ -\\cf0 pour endosser ou promouvoir des produits dérivés de ce logiciel sans autorisation\\par\ -\\cf0 écrite préalable spécifique.\\par\ +\\cf0 3. Neither the name of Florian Balmer nor the names of its contributors\\par\ +\\cf0 may be used to endorse or promote products derived from this software\\par\ +\\cf0 without specific prior written permission.\\par\ \\cf0 \\par\ -\\cf0 CE LOGICIEL EST FOURNI PAR LES PROPRIÉTAIRES DU COPYRIGHT ET LES\\par\ -\\cf0 CONTRIBUTEURS 'TEL QUEL' ET TOUTES GARANTIES, IMPLICITES OU EXPRESSES,\\par\ -\\cf0 NOTAMMENT ET SANS QUE CELA SOIT LIMITATIF, LES GARANTIES MARCHANDES ET\\par\ -\\cf0 D'ADAPTABILITÉ POUR UN USAGE PRÉCIS, SONT EXCLUES. EN AUCUN CAS LES\\par\ -\\cf0 PROPRIÉTAIRES DU COPYRIGHT ET CONTRIBUTEURS NE POURRONT ÊTRE CONSIDÉRÉS\\par\ -\\cf0 COMME RESPONSABLES EN CAS DE DOMMAGE DIRECTS, INDIRECTS, INCIDENTS,\\par\ -\\cf0 SPÉCIAUX, EXEMPLAIRES OU CONSÉCUTIFS (NOTAMMENT, ET SANS QUE CELA SOIT\\par\ -\\cf0 LIMITATIF, LA FOURNITURE DE MARCHANDISES OU DE SERVICES DE REMPLACEMENT,\\par\ -\\cf0 LA PERTE D'UTILISATION, DE DONNÉES OU DE PROFITS; OU D'INTERRUPTION\\par\ -\\cf0 D'ACTIVITÉS) CAUSÉS DE QUELQUE MANIÈRE QUE CE SOIT ET DE TOUTE THÉORIE\\par\ -\\cf0 DE RESPONSABILITÉ, QU'ELLE SOIT CONTRACTUELLE,QUASI-DÉLICTUELLE OU\\par\ -\\cf0 DÉLICTUELLE (COMPRENANT TOUT ACTE DE NÉGLIGENCE OU AUTRE) QUI POURRAIENT\\par\ -\\cf0 SURVENIR DE L'USAGE DE CE LOGICIEL, MÊME SI LA POSSIBILITÉ D'UN TEL\\par\ -\\cf0 DOMMAGE AVAIT ÉTÉ ÉNONCÉ.\\par\ +\\cf0 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\\par\ +\\cf0 'AS IS' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED\\par\ +\\cf0 TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A\\par\ +\\cf0 PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\\par\ +\\cf0 OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\\par\ +\\cf0 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\\par\ +\\cf0 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\\par\ +\\cf0 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\\par\ +\\cf0 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\\par\ +\\cf0 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\\par\ +\\cf0 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\\par\ }" END diff --git a/language/np3_hu_hu/strings_hu_hu.rc b/language/np3_hu_hu/strings_hu_hu.rc index e076ae5b9..4445f6581 100644 --- a/language/np3_hu_hu/strings_hu_hu.rc +++ b/language/np3_hu_hu/strings_hu_hu.rc @@ -369,9 +369,6 @@ IDS_MUI_ABOUT_RTF_6 "\ END -// -// Lines added to synchronize the number of lines of all "strings_xx_yy.rc" files. -// #endif // Hungarian (Hungary) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/language/np3_it_it/strings_it_it.rc b/language/np3_it_it/strings_it_it.rc index dfba6c20f..e8eee4765 100644 --- a/language/np3_it_it/strings_it_it.rc +++ b/language/np3_it_it/strings_it_it.rc @@ -369,9 +369,6 @@ IDS_MUI_ABOUT_RTF_6 "\ END -// -// Lines added to synchronize the number of lines of all "strings_xx_yy.rc" files. -// #endif // Italian (Italy) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/language/np3_ja_jp/strings_ja_jp.rc b/language/np3_ja_jp/strings_ja_jp.rc index 0d1b28a87..1c515496b 100644 --- a/language/np3_ja_jp/strings_ja_jp.rc +++ b/language/np3_ja_jp/strings_ja_jp.rc @@ -369,9 +369,6 @@ IDS_MUI_ABOUT_RTF_6 "\ END -// -// Lines added to synchronize the number of lines of all "strings_xx_yy.rc" files. -// #endif // Japanese (Japan) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/language/np3_ko_kr/strings_ko_kr.rc b/language/np3_ko_kr/strings_ko_kr.rc index c101e035f..cd85ef9ab 100644 --- a/language/np3_ko_kr/strings_ko_kr.rc +++ b/language/np3_ko_kr/strings_ko_kr.rc @@ -369,9 +369,6 @@ IDS_MUI_ABOUT_RTF_6 "\ END -// -// Lines added to synchronize the number of lines of all "strings_xx_yy.rc" files. -// #endif // Korean (Korea) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/language/np3_nl_nl/strings_nl_nl.rc b/language/np3_nl_nl/strings_nl_nl.rc index 5388b1b1c..4984dfc6c 100644 --- a/language/np3_nl_nl/strings_nl_nl.rc +++ b/language/np3_nl_nl/strings_nl_nl.rc @@ -337,37 +337,34 @@ IDS_MUI_ABOUT_RTF_5 "\ IDS_MUI_ABOUT_RTF_6 "\ \\cf0 \\fs20\\b1\\ul1 Notepad3 Licentie:\\ul0\\b0\\fs18\\par\ \\cf0 \\par\ -\\cf0 Notepad3 en MiniPath Copyright \\u0169 2008-2020 Rizonesoft, Alle rechten gereserveerd.\\par\ +\\cf0 Notepad3 and MiniPath Copyright \\u0169 2008-2020 Rizonesoft, All rights reserved.\\par\ \\cf0 https://www.rizonesoft.com\\par\ \\cf0 \\par\ -\\cf0 Herdistributie en gebruik in bron- en binaire vorm, met of zonder aanpassingen,\\par\ -\\cf0 zijn toegestaan mits voldaan is aan de volgende voorwaarden:\\par\ +\\cf0 Redistribution and use in source and binary forms, with or without modification,\\par\ +\\cf0 are permitted provided that the following conditions are met:\\par\ \\cf0 \\par\ -\\cf0 1. Herdistributies van broncode moeten de bovengenoemde copyrightmelding bevatten,\\par\ -\\cf0 evenals deze lijst met voorwaarden en de volgende ontkenning.\\par\ +\\cf0 1. Redistributions of source code must retain the above copyright\\par\ +\\cf0 notice, this list of conditions and the following disclaimer.\\par\ \\cf0 \\par\ -\\cf0 2. Herdistributies in binaire vorm moeten de bovenstaande copyrightmelding bevatten,\\par\ -\\cf0 evenals deze lijst met voorwaarden en de volgende ontkenning in de documentatie\\par\ -\\cf0 of ander materiaal dat met de distributie wordt meegeleverd.\\par\ +\\cf0 2. Redistributions in binary form must reproduce the above copyright\\par\ +\\cf0 notice, this list of conditions and the following disclaimer in the\\par\ +\\cf0 documentation and/or other materials provided with the distribution.\\par\ \\cf0 \\par\ -\\cf0 3. Noch de naam van Florian Balmer, noch de namen van zijn contribuanten mogen worden\\par\ -\\cf0 gebruikt ter ondersteuning of promotie van producten welke van deze software\\par\ -\\cf0 zijn afgeleid zonder voorafgaande schriftelijke toestemming.\\par\ +\\cf0 3. Neither the name of Florian Balmer nor the names of its contributors\\par\ +\\cf0 may be used to endorse or promote products derived from this software\\par\ +\\cf0 without specific prior written permission.\\par\ \\cf0 \\par\ -\\cf0 DEZE SOFTWARE WORDT DOOR DE COPYRIGHTHOUDERS OF CONTRIBUANTEN\\par\ -\\cf0 GELEVERD 'ZOALS DEZE IS' ENALLE UITDRUKKELIJK VERMELDE OF GEÏMPLICEERDE\\par\ -\\cf0 GARANTIES, MET INBEGRIP VAN, MAAR NIET BEPERKT TOT, GARANTIES DAT HET\\par\ -\\cf0 PRODUCT VERHANDELBAAR IS EN GESCHIKT IS VOOR EEN BEPAALD DOEL, WORDEN\\par\ -\\cf0 VERWORPEN. ONDER GEEN BEDING ZAL DE COPYRIGHTHOUDERS OF CONTRIBUANTEN\\par\ -\\cf0 AANSPRAKELIJK ZIJN VOOR ENIGE DIRECTE, INDIRECTE, INCIDENTELE OF SPECIALE\\par\ -\\cf0 SCHADE, OF SCHADE DIE VOORTVLOEIT UIT HET GEBRUIK VAN HET PRODUCT\\par\ -\\cf0 (INCLUSIEF, MAAR NIET BEPERKT TOT, AANKOOP VAN VERVANGENDE GOEDEREN OF\\par\ -\\cf0 DIENSTEN, UITVAL, EN VERLIES VAN GEGEVENS OF WINST; OF ONDERBREKING VAN\\par\ -\\cf0 DE BEDRIJFSVOERING) WAAR DAN OOK DOOR VEROORZAAKT EN VOLGENS ENIGE\\par\ -\\cf0 THEORIE VAN VERANTWOORDELIJKHEID, HETZIJCONTRACTUEEL, STRIKTE\\par\ -\\cf0 VERANTWOORDELIJKHEID OF BENADELING (INCLUSIEF NALATIGHEID OF ANDERS)\\par\ -\\cf0 DIE OP DE EEN OF ANDERE MANIER VOORTVLOEIT UIT HET GEBRUIK VAN DEZE\\par\ -\\cf0 SOFTWARE, ZELFS NA MELDING VAN DE MOGELIJKHEID VAN DERGELIJKE SCHADE.\\par\ +\\cf0 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\\par\ +\\cf0 'AS IS' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED\\par\ +\\cf0 TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A\\par\ +\\cf0 PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\\par\ +\\cf0 OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\\par\ +\\cf0 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\\par\ +\\cf0 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\\par\ +\\cf0 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\\par\ +\\cf0 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\\par\ +\\cf0 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\\par\ +\\cf0 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\\par\ }" END diff --git a/language/np3_pl_pl/strings_pl_pl.rc b/language/np3_pl_pl/strings_pl_pl.rc index 3c3b255ba..6d4440a60 100644 --- a/language/np3_pl_pl/strings_pl_pl.rc +++ b/language/np3_pl_pl/strings_pl_pl.rc @@ -369,9 +369,6 @@ IDS_MUI_ABOUT_RTF_6 "\ END -// -// Lines added to synchronize the number of lines of all "strings_xx_yy.rc" files. -// #endif // Polish (Poland) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/language/np3_pt_br/strings_pt_br.rc b/language/np3_pt_br/strings_pt_br.rc index cd347f6c5..4bee4760d 100644 --- a/language/np3_pt_br/strings_pt_br.rc +++ b/language/np3_pt_br/strings_pt_br.rc @@ -369,9 +369,6 @@ IDS_MUI_ABOUT_RTF_6 "\ END -// -// Lines added to synchronize the number of lines of all "strings_xx_yy.rc" files. -// #endif // Portuguese (Brazil) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/language/np3_ru_ru/strings_ru_ru.rc b/language/np3_ru_ru/strings_ru_ru.rc index 789adec69..17d68a998 100644 --- a/language/np3_ru_ru/strings_ru_ru.rc +++ b/language/np3_ru_ru/strings_ru_ru.rc @@ -369,9 +369,6 @@ IDS_MUI_ABOUT_RTF_6 "\ END -// -// Lines added to synchronize the number of lines of all "strings_xx_yy.rc" files. -// #endif // Russian (Russia) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/language/np3_sk_sk/strings_sk_sk.rc b/language/np3_sk_sk/strings_sk_sk.rc index 6a80a52b4..e52d90fd6 100644 --- a/language/np3_sk_sk/strings_sk_sk.rc +++ b/language/np3_sk_sk/strings_sk_sk.rc @@ -369,9 +369,6 @@ IDS_MUI_ABOUT_RTF_6 "\ END -// -// Lines added to synchronize the number of lines of all "strings_xx_yy.rc" files. -// #endif // Slovak (Slovakia) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/language/np3_sv_se/strings_sv_se.rc b/language/np3_sv_se/strings_sv_se.rc index 9fe028850..246a37700 100644 --- a/language/np3_sv_se/strings_sv_se.rc +++ b/language/np3_sv_se/strings_sv_se.rc @@ -369,9 +369,6 @@ IDS_MUI_ABOUT_RTF_6 "\ END -// -// Lines added to synchronize the number of lines of all "strings_xx_yy.rc" files. -// #endif // Swedish (Sweden) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/language/np3_tr_tr/strings_tr_tr.rc b/language/np3_tr_tr/strings_tr_tr.rc index 1f3131769..24f9e9be7 100644 --- a/language/np3_tr_tr/strings_tr_tr.rc +++ b/language/np3_tr_tr/strings_tr_tr.rc @@ -369,9 +369,6 @@ IDS_MUI_ABOUT_RTF_6 "\ END -// -// Lines added to synchronize the number of lines of all "strings_xx_yy.rc" files. -// #endif // Turkish (Turkey) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/language/np3_zh_cn/strings_zh_cn.rc b/language/np3_zh_cn/strings_zh_cn.rc index bd13478de..f517490d4 100644 --- a/language/np3_zh_cn/strings_zh_cn.rc +++ b/language/np3_zh_cn/strings_zh_cn.rc @@ -369,9 +369,6 @@ IDS_MUI_ABOUT_RTF_6 "\ END -// -// Lines added to synchronize the number of lines of all "strings_xx_yy.rc" files. -// #endif // Simplified Chinese (China) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index e0bfb5b2f..ef87bd75b 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 BETA diff --git a/src/VersionEx.h b/src/VersionEx.h index 87bbfd630..66994ae20 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -8,8 +8,8 @@ #define SAPPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 20 -#define VERSION_REV 420 -#define VERSION_BUILD 4 +#define VERSION_REV 421 +#define VERSION_BUILD 1 #define SCINTILLA_VER 432 #define ONIGURUMA_REGEX_VER 6.9.5 #define UCHARDET_VER 2018.09.27