diff options
| author | Paul Eggert | 2021-01-01 01:28:16 -0800 |
|---|---|---|
| committer | Paul Eggert | 2021-01-01 01:28:16 -0800 |
| commit | 50f3949119cd5bb2f058b90d14b2940a3a8a7a0e (patch) | |
| tree | 30c689b699955bd45e493e6be9d755889a8aa146 /etc/tutorials | |
| parent | c63ce13206de9a6d4018e97b98b1f6966ee666d8 (diff) | |
| parent | 33d159c36f42cadccb02d95099bafac26458d3e8 (diff) | |
| download | emacs-50f3949119cd5bb2f058b90d14b2940a3a8a7a0e.tar.gz emacs-50f3949119cd5bb2f058b90d14b2940a3a8a7a0e.zip | |
Merge from origin/emacs-27
33d159c36f Fix copyright years by hand
Diffstat (limited to 'etc/tutorials')
| -rw-r--r-- | etc/tutorials/TUTORIAL.cn | 2 | ||||
| -rw-r--r-- | etc/tutorials/TUTORIAL.he | 2 | ||||
| -rw-r--r-- | etc/tutorials/TUTORIAL.nl | 2 | ||||
| -rw-r--r-- | etc/tutorials/TUTORIAL.ro | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/etc/tutorials/TUTORIAL.cn b/etc/tutorials/TUTORIAL.cn index 2bf19546188..742de090da8 100644 --- a/etc/tutorials/TUTORIAL.cn +++ b/etc/tutorials/TUTORIAL.cn | |||
| @@ -1026,7 +1026,7 @@ using, writing, and sharing free software! | |||
| 1026 | 1026 | ||
| 1027 | 本篇指南是 GNU Emacs 的一部分,并允许在下列条件的约束下发行其拷贝: | 1027 | 本篇指南是 GNU Emacs 的一部分,并允许在下列条件的约束下发行其拷贝: |
| 1028 | 1028 | ||
| 1029 | Copyright (C) 1985, 1996, 1998, 2001-2020 Free Software Foundation, | 1029 | Copyright (C) 1985, 1996, 1998, 2001-2021 Free Software Foundation, |
| 1030 | Inc. | 1030 | Inc. |
| 1031 | 1031 | ||
| 1032 | 本文件为 GNU Emacs 的一部分。 | 1032 | 本文件为 GNU Emacs 的一部分。 |
diff --git a/etc/tutorials/TUTORIAL.he b/etc/tutorials/TUTORIAL.he index 1478fdea735..5cd1cac8fd1 100644 --- a/etc/tutorials/TUTORIAL.he +++ b/etc/tutorials/TUTORIAL.he | |||
| @@ -1004,7 +1004,7 @@ find-file. | |||
| 1004 | גירסה זו של השיעור הינה חלק מחבילת GNU Emacs. היא מוגנת בזכויות יוצרים | 1004 | גירסה זו של השיעור הינה חלק מחבילת GNU Emacs. היא מוגנת בזכויות יוצרים |
| 1005 | וניתנת להעתקה והפצת עותקים בתנאים מסויימים כדלקמן: | 1005 | וניתנת להעתקה והפצת עותקים בתנאים מסויימים כדלקמן: |
| 1006 | 1006 | ||
| 1007 | Copyright (C) 2010-2020 Free Software Foundation, Inc. | 1007 | Copyright (C) 2010-2021 Free Software Foundation, Inc. |
| 1008 | 1008 | ||
| 1009 | GNU Emacs הינו תכנה חפשית; זכותכם להפיצו ו\או לשנותו בכפוף לתנאי | 1009 | GNU Emacs הינו תכנה חפשית; זכותכם להפיצו ו\או לשנותו בכפוף לתנאי |
| 1010 | הרשיון GNU General Public License, כפי שהוא יוצא לאור ע״י Free | 1010 | הרשיון GNU General Public License, כפי שהוא יוצא לאור ע״י Free |
diff --git a/etc/tutorials/TUTORIAL.nl b/etc/tutorials/TUTORIAL.nl index 1b7f19a3b5a..0853e5ffbb7 100644 --- a/etc/tutorials/TUTORIAL.nl +++ b/etc/tutorials/TUTORIAL.nl | |||
| @@ -1239,7 +1239,7 @@ Engels origineel van de copyrightmelding en condities: | |||
| 1239 | This version of the tutorial is a part of GNU Emacs. It is copyrighted | 1239 | This version of the tutorial is a part of GNU Emacs. It is copyrighted |
| 1240 | and comes with permission to distribute copies on certain conditions: | 1240 | and comes with permission to distribute copies on certain conditions: |
| 1241 | 1241 | ||
| 1242 | Copyright (C) 1985, 1996, 1998, 2001-2020 Free Software Foundation, Inc. | 1242 | Copyright (C) 1985, 1996, 1998, 2001-2021 Free Software Foundation, Inc. |
| 1243 | 1243 | ||
| 1244 | This file is part of GNU Emacs. | 1244 | This file is part of GNU Emacs. |
| 1245 | 1245 | ||
diff --git a/etc/tutorials/TUTORIAL.ro b/etc/tutorials/TUTORIAL.ro index ab0902dc00f..f9e67caa1ea 100644 --- a/etc/tutorials/TUTORIAL.ro +++ b/etc/tutorials/TUTORIAL.ro | |||
| @@ -1082,7 +1082,7 @@ continuare noţita de copyright originală în limba engleză. | |||
| 1082 | This version of the tutorial, like GNU Emacs, is copyrighted, and | 1082 | This version of the tutorial, like GNU Emacs, is copyrighted, and |
| 1083 | comes with permission to distribute copies on certain conditions: | 1083 | comes with permission to distribute copies on certain conditions: |
| 1084 | 1084 | ||
| 1085 | Copyright (C) 1998, 2001-2020 Free Software Foundation, Inc. | 1085 | Copyright (C) 1998, 2001-2021 Free Software Foundation, Inc. |
| 1086 | 1086 | ||
| 1087 | Permission is granted to anyone to make or distribute verbatim copies | 1087 | Permission is granted to anyone to make or distribute verbatim copies |
| 1088 | of this document as received, in any medium, provided that the | 1088 | of this document as received, in any medium, provided that the |