diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2017-01-01 01:10:47 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-01-01 01:10:47 -0800 |
commit | bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9 (patch) | |
tree | dc5dde303bce1fbe4f04300c3691cc1ee5874f43 /etc/tutorials | |
parent | 772ca5db3eccdc0439d7bd18f98b7fdd38eb6397 (diff) | |
parent | 2e2a8068031b79a6cc5502b8d4c9d849ebb1dae0 (diff) | |
download | emacs-bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9.tar.gz |
Merge from origin/emacs-25
2e2a806 Fix copyright years by hand
5badc81 Update copyright year to 2017
Diffstat (limited to 'etc/tutorials')
-rw-r--r-- | etc/tutorials/TUTORIAL | 2 | ||||
-rw-r--r-- | etc/tutorials/TUTORIAL.bg | 2 | ||||
-rw-r--r-- | etc/tutorials/TUTORIAL.cn | 4 | ||||
-rw-r--r-- | etc/tutorials/TUTORIAL.cs | 2 | ||||
-rw-r--r-- | etc/tutorials/TUTORIAL.de | 2 | ||||
-rw-r--r-- | etc/tutorials/TUTORIAL.eo | 2 | ||||
-rw-r--r-- | etc/tutorials/TUTORIAL.es | 2 | ||||
-rw-r--r-- | etc/tutorials/TUTORIAL.fr | 2 | ||||
-rw-r--r-- | etc/tutorials/TUTORIAL.he | 2 | ||||
-rw-r--r-- | etc/tutorials/TUTORIAL.it | 2 | ||||
-rw-r--r-- | etc/tutorials/TUTORIAL.ja | 2 | ||||
-rw-r--r-- | etc/tutorials/TUTORIAL.ko | 2 | ||||
-rw-r--r-- | etc/tutorials/TUTORIAL.nl | 4 | ||||
-rw-r--r-- | etc/tutorials/TUTORIAL.pl | 2 | ||||
-rw-r--r-- | etc/tutorials/TUTORIAL.pt_BR | 2 | ||||
-rw-r--r-- | etc/tutorials/TUTORIAL.ro | 4 | ||||
-rw-r--r-- | etc/tutorials/TUTORIAL.ru | 2 | ||||
-rw-r--r-- | etc/tutorials/TUTORIAL.sk | 2 | ||||
-rw-r--r-- | etc/tutorials/TUTORIAL.sl | 2 | ||||
-rw-r--r-- | etc/tutorials/TUTORIAL.sv | 2 | ||||
-rw-r--r-- | etc/tutorials/TUTORIAL.th | 2 | ||||
-rw-r--r-- | etc/tutorials/TUTORIAL.zh | 2 |
22 files changed, 25 insertions, 25 deletions
diff --git a/etc/tutorials/TUTORIAL b/etc/tutorials/TUTORIAL index af6ab4ed763..40e1cf8480d 100644 --- a/etc/tutorials/TUTORIAL +++ b/etc/tutorials/TUTORIAL @@ -1111,7 +1111,7 @@ starting with the one written by Stuart Cracraft for the original Emacs. This version of the tutorial is a part of GNU Emacs. It is copyrighted and comes with permission to distribute copies on certain conditions: - Copyright (C) 1985, 1996, 1998, 2001-2016 Free Software Foundation, + Copyright (C) 1985, 1996, 1998, 2001-2017 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/etc/tutorials/TUTORIAL.bg b/etc/tutorials/TUTORIAL.bg index 7bc062df3e4..ed6f29c6d81 100644 --- a/etc/tutorials/TUTORIAL.bg +++ b/etc/tutorials/TUTORIAL.bg @@ -1162,7 +1162,7 @@ Dired ви позволява да гледате списъка от файло This version of the tutorial, like GNU Emacs, is copyrighted, and comes with permission to distribute copies on certain conditions: - Copyright (C) 1985, 1996, 1998, 2001-2016 Free Software Foundation, + Copyright (C) 1985, 1996, 1998, 2001-2017 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/etc/tutorials/TUTORIAL.cn b/etc/tutorials/TUTORIAL.cn index 28d71a5e514..fe8f500aafb 100644 --- a/etc/tutorials/TUTORIAL.cn +++ b/etc/tutorials/TUTORIAL.cn @@ -997,7 +997,7 @@ starting with the one written by Stuart Cracraft for the original Emacs. This version of the tutorial is a part of GNU Emacs. It is copyrighted and comes with permission to distribute copies on certain conditions: - Copyright (C) 1985, 1996, 1998, 2001-2016 Free Software Foundation, + Copyright (C) 1985, 1996, 1998, 2001-2017 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -1026,7 +1026,7 @@ using, writing, and sharing free software! 本篇指南是 GNU Emacs 的一部分,并允许在下列条件的约束下发行其拷贝: - Copyright (C) 1985, 1996, 1998, 2001-2016 Free Software Foundation, + Copyright (C) 1985, 1996, 1998, 2001-2017 Free Software Foundation, Inc. 本文件为 GNU Emacs 的一部分。 diff --git a/etc/tutorials/TUTORIAL.cs b/etc/tutorials/TUTORIAL.cs index 146e73ede0b..7792182818e 100644 --- a/etc/tutorials/TUTORIAL.cs +++ b/etc/tutorials/TUTORIAL.cs @@ -1015,7 +1015,7 @@ tutoriálem napsaným Stuartem Cracraftem pro původní Emacs. Tato verze tutoriálu je, podobně jako GNU Emacs, chráněna copyrightem a je šířena se svolením distribuovat kopie za jistých podmínek: -Copyright (C) 1985, 1996, 1998, 2001-2016 Free Software Foundation, Inc. +Copyright (C) 1985, 1996, 1998, 2001-2017 Free Software Foundation, Inc. Každému je zaručeno právo vytvářet a distribuovat přesné kopie tohoto dokumentu tak, jak jej obdržel, na jakémkoliv médiu, s tím, že bude diff --git a/etc/tutorials/TUTORIAL.de b/etc/tutorials/TUTORIAL.de index 486f174a8d5..8d017c8969a 100644 --- a/etc/tutorials/TUTORIAL.de +++ b/etc/tutorials/TUTORIAL.de @@ -1458,7 +1458,7 @@ Beachten Sie bitte, dass im Zweifelsfalle das englische Original dieser Urheberrechtsnotiz gültig ist (zu finden in der Datei TUTORIAL). - Copyright (C) 1985, 1996-1997, 2001-2016 Free Software Foundation, + Copyright (C) 1985, 1996-1997, 2001-2017 Free Software Foundation, Inc. Diese Datei ist ein Bestandteil von GNU Emacs. diff --git a/etc/tutorials/TUTORIAL.eo b/etc/tutorials/TUTORIAL.eo index 35830c6d3dd..da7ba73d684 100644 --- a/etc/tutorials/TUTORIAL.eo +++ b/etc/tutorials/TUTORIAL.eo @@ -1081,7 +1081,7 @@ la dosiero verkita de Stuart Cracraft por la originala Emakso. kopirajton, kaj venas kun permeso por disdoni kopiojn se certaj kondiĉoj estas observataj: - Copyright (C) 1985, 1999, 2001-2002, 2005, 2007-2016 Free Software + Copyright (C) 1985, 1999, 2001-2002, 2005, 2007-2017 Free Software Foundation, Inc. Ĉi tiu dosiero estas parto de "GNU Emacs". diff --git a/etc/tutorials/TUTORIAL.es b/etc/tutorials/TUTORIAL.es index 04a1ac57330..75802325ff4 100644 --- a/etc/tutorials/TUTORIAL.es +++ b/etc/tutorials/TUTORIAL.es @@ -1204,7 +1204,7 @@ Por favor, en caso de duda, solo es válido el original en inglés de la siguiente nota de derechos de reproducción (que puede encontrar en el archivo TUTORIAL). -Copyright (C) 1985, 1996, 1998, 2001-2016 Free Software Foundation, Inc. +Copyright (C) 1985, 1996, 1998, 2001-2017 Free Software Foundation, Inc. Se permite a cualquiera hacer o distribuir copias literales de este documento como se recibe, en cualquier medio, siempre que la nota diff --git a/etc/tutorials/TUTORIAL.fr b/etc/tutorials/TUTORIAL.fr index 788400f5b0e..75d7c0b9e7d 100644 --- a/etc/tutorials/TUTORIAL.fr +++ b/etc/tutorials/TUTORIAL.fr @@ -1202,7 +1202,7 @@ Cette version du didacticiel, comme GNU Emacs, est placée sous droit d'auteur, et vous pouvez en distribuer des copies sous certaines conditions : -Copyright (C) 1985, 1996, 2001-2016 Free Software Foundation, Inc. +Copyright (C) 1985, 1996, 2001-2017 Free Software Foundation, Inc. Chacun peut créer ou distribuer des copies de ce document tel qu'il l'a reçu, sur n'importe quel support, pourvu que la note de diff --git a/etc/tutorials/TUTORIAL.he b/etc/tutorials/TUTORIAL.he index 6acb7f2ab0e..fefc780d644 100644 --- a/etc/tutorials/TUTORIAL.he +++ b/etc/tutorials/TUTORIAL.he @@ -997,7 +997,7 @@ find-file. גירסה זו של השיעור הינה חלק מחבילת GNU Emacs. היא מוגנת בזכויות יוצרים וניתנת להעתקה והפצת עותקים בתנאים מסויימים כדלקמן: - Copyright (C) 2010-2016 Free Software Foundation, Inc. + Copyright (C) 2010-2017 Free Software Foundation, Inc. GNU Emacs הינו תכנה חפשית; זכותכם להפיצו ו\או לשנותו בכפוף לתנאי הרשיון GNU General Public License, כפי שהוא יוצא לאור ע״י Free diff --git a/etc/tutorials/TUTORIAL.it b/etc/tutorials/TUTORIAL.it index d27b2ee6743..4e010cb9fbe 100644 --- a/etc/tutorials/TUTORIAL.it +++ b/etc/tutorials/TUTORIAL.it @@ -1201,7 +1201,7 @@ distribuito con il permesso di farne copie a determinate condizioni: indicativo, restando comunque inteso il fatto che è quella originale a fare fede. -Copyright (C) 2003-2016 Free Software Foundation, Inc. +Copyright (C) 2003-2017 Free Software Foundation, Inc. È permesso a chiunque copiare e distribuire attraverso ogni mezzo copie fedeli di questo documento così come viene ricevuto, a diff --git a/etc/tutorials/TUTORIAL.ja b/etc/tutorials/TUTORIAL.ja index f41b2b5a064..aca28ed60c7 100644 --- a/etc/tutorials/TUTORIAL.ja +++ b/etc/tutorials/TUTORIAL.ja @@ -1062,7 +1062,7 @@ starting with the one written by Stuart Cracraft for the original Emacs. This version of the tutorial, like GNU Emacs, is copyrighted, and comes with permission to distribute copies on certain conditions: -Copyright (C) 1985, 1996, 1998, 2001-2016 Free Software Foundation, Inc. +Copyright (C) 1985, 1996, 1998, 2001-2017 Free Software Foundation, Inc. Permission is granted to anyone to make or distribute verbatim copies of this document as received, in any medium, provided that the diff --git a/etc/tutorials/TUTORIAL.ko b/etc/tutorials/TUTORIAL.ko index f2b9e1f25ac..d618638f167 100644 --- a/etc/tutorials/TUTORIAL.ko +++ b/etc/tutorials/TUTORIAL.ko @@ -981,7 +981,7 @@ C-x C-s와 (META쇠나 EDIT쇠 혹은 교체쇠가 있으면) <ESC>v와 같은 GNU 이맥스와 같이 이 지침서 판은 저작권이 있으며 특정한 조건을 만족할 때에 복사본을 배포할 수 있는 허가를 갖고 나온 것이다: -Copyright (C) 1985, 1996, 2001-2016 Free Software Foundation, Inc. +Copyright (C) 1985, 1996, 2001-2017 Free Software Foundation, Inc. 이 문서는 이 저작권 공고와 허용 공고가 그대로 유지되고, 배포자가 수취자에게 이 공고에 따라 허용되는 것처럼 또 재분배하는 것을 diff --git a/etc/tutorials/TUTORIAL.nl b/etc/tutorials/TUTORIAL.nl index a48a9c3cad2..d0453bdfd64 100644 --- a/etc/tutorials/TUTORIAL.nl +++ b/etc/tutorials/TUTORIAL.nl @@ -1209,7 +1209,7 @@ Deze versie van de inleiding is onderdeel van GNU Emacs. Het valt onder copyright. Je mag deze inleiding verspreiden onder bepaalde voorwaarden: - Copyright (C) 1985, 1996, 1998, 2001-2016 Free Software Foundation, + Copyright (C) 1985, 1996, 1998, 2001-2017 Free Software Foundation, Inc. Dit bestand is onderdeel van GNU Emacs. @@ -1239,7 +1239,7 @@ Engels origineel van de copyrightmelding en condities: This version of the tutorial is a part of GNU Emacs. It is copyrighted and comes with permission to distribute copies on certain conditions: - Copyright (C) 1985, 1996, 1998, 2001-2016 Free Software Foundation, Inc. + Copyright (C) 1985, 1996, 1998, 2001-2017 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/etc/tutorials/TUTORIAL.pl b/etc/tutorials/TUTORIAL.pl index 6d17c879a35..516d6eb1a33 100644 --- a/etc/tutorials/TUTORIAL.pl +++ b/etc/tutorials/TUTORIAL.pl @@ -1209,7 +1209,7 @@ z pomocą Ryszarda Kubiaka i Janusza S. Bienia <jsbien@mail.uw.edu.pl>. Ta wersja samouczka, podobnie jak GNU Emacs, jest chroniona prawem autorskim, ale wolno ją kopiować pod następującymi warunkami: -Copyright (C) 1985, 1994, 2001-2016 Free Software Foundation, Inc. +Copyright (C) 1985, 1994, 2001-2017 Free Software Foundation, Inc. Zezwala się na wykonywanie lub rozpowszechnianie wiernych kopii tego dokumentu w otrzymanej formie, na dowolnym diff --git a/etc/tutorials/TUTORIAL.pt_BR b/etc/tutorials/TUTORIAL.pt_BR index d95ae2b1821..d237fd5a046 100644 --- a/etc/tutorials/TUTORIAL.pt_BR +++ b/etc/tutorials/TUTORIAL.pt_BR @@ -1056,7 +1056,7 @@ Essa versão do tutorial foi originalmente traduzida por Marcelo Toledo <marcelo@gnu.org> e como o GNU Emacs, tem um copyright, e vem com uma permissão de distribuição de cópias nas seguintes condições: -Copyright (C) 2004-2016 Free Software Foundation, Inc. +Copyright (C) 2004-2017 Free Software Foundation, Inc. Permissão é garantida a qualquer um para fazer ou distribuir cópias integrais deste documento como recebido, em qualquer meio, deixando diff --git a/etc/tutorials/TUTORIAL.ro b/etc/tutorials/TUTORIAL.ro index 4bb180b32da..c5c25e3d2ca 100644 --- a/etc/tutorials/TUTORIAL.ro +++ b/etc/tutorials/TUTORIAL.ro @@ -4,7 +4,7 @@ Mulţumiri Aidei Hulubei <aida@chang.pub.ro> pentru corecturi şi sugestii. Această versiune a fost produsă plecând de la versiunea în limba engleză, care este -Copyright (c) 1985, 2013-2016 Free Software Foundation, Inc. +Copyright (c) 1985, 2013-2017 Free Software Foundation, Inc. Citiţi acum versiunea românească a tutorialului de Emacs. @@ -1082,7 +1082,7 @@ continuare noţita de copyright originală în limba engleză. This version of the tutorial, like GNU Emacs, is copyrighted, and comes with permission to distribute copies on certain conditions: -Copyright (C) 1998, 2001-2016 Free Software Foundation, Inc. +Copyright (C) 1998, 2001-2017 Free Software Foundation, Inc. Permission is granted to anyone to make or distribute verbatim copies of this document as received, in any medium, provided that the diff --git a/etc/tutorials/TUTORIAL.ru b/etc/tutorials/TUTORIAL.ru index 8a285bf5188..b7140e60a4f 100644 --- a/etc/tutorials/TUTORIAL.ru +++ b/etc/tutorials/TUTORIAL.ru @@ -1105,7 +1105,7 @@ Dired позволяет вам отображать список файлов (copyrighted) и приходит с ограничениями распространения копий со следующими соглашениями: -Copyright (C) 1985, 1996, 1998, 2001-2016 Free Software Foundation, Inc. +Copyright (C) 1985, 1996, 1998, 2001-2017 Free Software Foundation, Inc. Permission is granted to anyone to make or distribute verbatim copies of this document as received, in any medium, provided that the diff --git a/etc/tutorials/TUTORIAL.sk b/etc/tutorials/TUTORIAL.sk index 6ef9042a6f7..8c11e8b531b 100644 --- a/etc/tutorials/TUTORIAL.sk +++ b/etc/tutorials/TUTORIAL.sk @@ -1074,7 +1074,7 @@ tútorialom napísaným Stuartom Cracraftom pre pôvodný Emacs. Táto verzia tútorialu je, podobne ako GNU Emacs, chránená copyrightom a je šírená s povolením distribuovať kópie za istých podmienok: -Copyright (C) 1985, 1996, 1998, 2001-2016 Free Software Foundation, Inc. +Copyright (C) 1985, 1996, 1998, 2001-2017 Free Software Foundation, Inc. Každému je zaručené právo vytvárať a distribuovať presné kópie tohto dokumentu tak, ako ho dostal, na akomkoľvek médiu, s tým, že bude diff --git a/etc/tutorials/TUTORIAL.sl b/etc/tutorials/TUTORIAL.sl index 38b15e74bc5..4e59341f8c5 100644 --- a/etc/tutorials/TUTORIAL.sl +++ b/etc/tutorials/TUTORIAL.sl @@ -1119,7 +1119,7 @@ Emacs. V slovenščino ga je prevedel Primož Peterlin. To besedilo, kot sam GNU Emacs, je avtorsko delo, in njegovo razmnoževanje in razširjanje je dovoljeno pod naslednjimi pogoji: -Copyright © 1985, 1996, 1998, 2001-2016 Free Software Foundation, Inc. +Copyright © 1985, 1996, 1998, 2001-2017 Free Software Foundation, Inc. Ta datoteka je del paketa GNU Emacs. diff --git a/etc/tutorials/TUTORIAL.sv b/etc/tutorials/TUTORIAL.sv index 11ff9b374d1..4001748376f 100644 --- a/etc/tutorials/TUTORIAL.sv +++ b/etc/tutorials/TUTORIAL.sv @@ -1117,7 +1117,7 @@ Lidell översatte den till Svenska. This version of the tutorial, like GNU Emacs, is copyrighted, and comes with permission to distribute copies on certain conditions: -Copyright (C) 1985, 1996, 1998, 2001-2016 Free Software Foundation, Inc. +Copyright (C) 1985, 1996, 1998, 2001-2017 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/etc/tutorials/TUTORIAL.th b/etc/tutorials/TUTORIAL.th index ec00c2ab410..33db463e0e9 100644 --- a/etc/tutorials/TUTORIAL.th +++ b/etc/tutorials/TUTORIAL.th @@ -964,7 +964,7 @@ starting with the one written by Stuart Cracraft for the original Emacs. This version of the tutorial, like GNU Emacs, is copyrighted, and comes with permission to distribute copies on certain conditions: -Copyright (C) 1985, 1996, 2001-2016 Free Software Foundation, Inc. +Copyright (C) 1985, 1996, 2001-2017 Free Software Foundation, Inc. Permission is granted to anyone to make or distribute verbatim copies of this document as received, in any medium, provided that the diff --git a/etc/tutorials/TUTORIAL.zh b/etc/tutorials/TUTORIAL.zh index 8cfb8381271..c677cbd3f59 100644 --- a/etc/tutorials/TUTORIAL.zh +++ b/etc/tutorials/TUTORIAL.zh @@ -1049,7 +1049,7 @@ issue here>」。 這個版本的快速指南和 GNU Emacs 一樣都是版權化的,並且允許在某些條件下 散佈其拷貝: -Copyright (C) 1985, 1996, 1998, 2001-2016 Free Software Foundation, Inc. +Copyright (C) 1985, 1996, 1998, 2001-2017 Free Software Foundation, Inc. Permission is granted to anyone to make or distribute verbatim copies of this document as received, in any medium, provided that the |