From nobody Fri Mar 10 02:13:37 2023 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PXqNK6GYNz3wwZY for ; Fri, 10 Mar 2023 02:13:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PXqNK6398z3wVG; Fri, 10 Mar 2023 02:13:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678414417; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0YX8ir0Yryn+YZ7Y2TK1JIREMTzsbpOox4n99e/7YAw=; b=LvAjnoLSuokTCy6ZpsWovS2JzIrUn1cMaun0YSjFyW8QyVekMYgiUZhRfUcrlg2div76dD VitGlHfaUsPytxv/YfmQPrCx8+Ig+eQNw44krKhKHpzYfWJGW5RJyTtEA7F0yJ7HHzDBD1 7y/5wOWWZAf6Qxj7cfObZDhEh7UZa5cWKVn7jjKlOKLsr+LeHiM0vVjVfe+tN4tbWnkc+I fAVhA7ewj1rxbb4Ni1zUUUwL+OjpKdv561YEcHv9K/1Ee+ivUrQ9vRetZWhN4k82Bo1gYx OLKezsJzZkJ5b9fRX09fC6vDTZidnjzWYne2C4bQMKo2xVEt9/eZthxAgieaXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678414417; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0YX8ir0Yryn+YZ7Y2TK1JIREMTzsbpOox4n99e/7YAw=; b=eAT+fZE5FmzC4Kmip1XO8zq3Ix5ytlc+woax5SSoWCbc8FGEdHqrq8ZFlV2PSxGsexXbFP LnyOIH9K8V5QNyV+lt2xflEt0yR0C78+SQzDTIoPSqmDMLcY1N8A90d+1s7XiIPKvuOYWy T7NE9wKqcAtjKpCn8BRRPlC3vNceZ5KWuK6mfNvnJCm4PTvT7Hgt5nnWMfrKATeP0p/dvp I/Qt4n+PvGLMQlLrhyKvgi+bxalPSvhDpLBkFsHgZ5MiZj+RvSz30eeBzklUuqcWZfANIf T0nZSVpw/PD1DkIK4ZhEEgkRpbAOxlJN9AEAj/SaUfIlC2PVf85viijTXr73eA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678414417; a=rsa-sha256; cv=none; b=YoIgEt9a7POwc+lLmu3tD3J03FQ7Ksnrw2tboyYJce/pPM57XevjuXXikwvunB+jV/Nkll ZoqNWVV2AobUWevs0ojusqyZXtcWshow/ebAdtTa2cNfiH7Y8mSzCpbjYCTs47XHkrmPlp U/uH3eYmdSYmxcIe605HFYwkw0Nn6Hm6zTgcvMYTYsfSnXo1Z6fKQSPbFuJkfVnTxU5ua5 nKDBOFfY4p3x2DW8fX+Gg0LapuRnVEvsft+QabqaWKmxsuxUg6fcPNFbg4yfz6VFRpSUgL Vo4zev6DFJ8bgOBTO8n/lJdp6wBdqf/17W+EO2RcdBNnz8Tk5RgtRaapA8AcOw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PXqNK56cmzWlQ; Fri, 10 Mar 2023 02:13:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32A2DbJ9085734; Fri, 10 Mar 2023 02:13:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32A2DbqU085733; Fri, 10 Mar 2023 02:13:37 GMT (envelope-from git) Date: Fri, 10 Mar 2023 02:13:37 GMT Message-Id: <202303100213.32A2DbqU085733@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: "Danilo G. Baio" Subject: git: 8329344dde - main - documentation: Enable the new trademarks List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-doc-all@freebsd.org X-BeenThere: dev-commits-doc-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dbaio X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8329344dde2d0036a367ce9d0017acc94e1dd4f0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dbaio: URL: https://cgit.FreeBSD.org/doc/commit/?id=8329344dde2d0036a367ce9d0017acc94e1dd4f0 commit 8329344dde2d0036a367ce9d0017acc94e1dd4f0 Author: Danilo G. Baio AuthorDate: 2023-03-10 02:08:36 +0000 Commit: Danilo G. Baio CommitDate: 2023-03-10 02:11:08 +0000 documentation: Enable the new trademarks Introduced on 02a2c746a63591012e5a7a44f026c82c6ffc4a44. While here, replicate them to the translation files. PR: 270071 Reported by: salvadore --- documentation/themes/beastie/i18n/bn-bd.toml | 9 +++++++++ documentation/themes/beastie/i18n/da.toml | 9 +++++++++ documentation/themes/beastie/i18n/de.toml | 9 +++++++++ documentation/themes/beastie/i18n/el.toml | 9 +++++++++ documentation/themes/beastie/i18n/es.toml | 9 +++++++++ documentation/themes/beastie/i18n/fr.toml | 9 +++++++++ documentation/themes/beastie/i18n/hu.toml | 9 +++++++++ documentation/themes/beastie/i18n/it.toml | 9 +++++++++ documentation/themes/beastie/i18n/ja.toml | 9 +++++++++ documentation/themes/beastie/i18n/ko.toml | 9 +++++++++ documentation/themes/beastie/i18n/mn.toml | 9 +++++++++ documentation/themes/beastie/i18n/nl.toml | 9 +++++++++ documentation/themes/beastie/i18n/pl.toml | 9 +++++++++ documentation/themes/beastie/i18n/pt-br.toml | 9 +++++++++ documentation/themes/beastie/i18n/ru.toml | 9 +++++++++ documentation/themes/beastie/i18n/tr.toml | 9 +++++++++ documentation/themes/beastie/i18n/zh-cn.toml | 9 +++++++++ documentation/themes/beastie/i18n/zh-tw.toml | 9 +++++++++ .../themes/beastie/layouts/partials/trademarks.html | 12 ++++++++++++ 19 files changed, 174 insertions(+) diff --git a/documentation/themes/beastie/i18n/bn-bd.toml b/documentation/themes/beastie/i18n/bn-bd.toml index 1e8a387b99..426f9f42ce 100644 --- a/documentation/themes/beastie/i18n/bn-bd.toml +++ b/documentation/themes/beastie/i18n/bn-bd.toml @@ -226,6 +226,15 @@ other = "Adobe, Acrobat, Acrobat Reader, Flash and PostScript are either registe [apple] other = "Apple, AirPort, FireWire, iMac, iPhone, iPad, Mac, Macintosh, Mac OS, Quicktime, and TrueType are trademarks of Apple Inc., registered in the U.S. and other countries." +[git] +other = "Git and the Git logo are either registered trademarks or trademarks of Software Freedom Conservancy, Inc., corporate home of the Git Project, in the United States and/or other countries." + +[github] +other = "GitHub is a trademark of GitHub Inc., registered in the United States and other countries." + +[gitlab] +other = "GITLAB is a trademark of GitLab Inc. in the United States and other countries and regions." + [intel] other = "Intel, Celeron, Centrino, Core, EtherExpress, i386, i486, Itanium, Pentium, and Xeon are trademarks or registered trademarks of Intel Corporation or its subsidiaries in the United States and other countries." diff --git a/documentation/themes/beastie/i18n/da.toml b/documentation/themes/beastie/i18n/da.toml index 1e8a387b99..426f9f42ce 100644 --- a/documentation/themes/beastie/i18n/da.toml +++ b/documentation/themes/beastie/i18n/da.toml @@ -226,6 +226,15 @@ other = "Adobe, Acrobat, Acrobat Reader, Flash and PostScript are either registe [apple] other = "Apple, AirPort, FireWire, iMac, iPhone, iPad, Mac, Macintosh, Mac OS, Quicktime, and TrueType are trademarks of Apple Inc., registered in the U.S. and other countries." +[git] +other = "Git and the Git logo are either registered trademarks or trademarks of Software Freedom Conservancy, Inc., corporate home of the Git Project, in the United States and/or other countries." + +[github] +other = "GitHub is a trademark of GitHub Inc., registered in the United States and other countries." + +[gitlab] +other = "GITLAB is a trademark of GitLab Inc. in the United States and other countries and regions." + [intel] other = "Intel, Celeron, Centrino, Core, EtherExpress, i386, i486, Itanium, Pentium, and Xeon are trademarks or registered trademarks of Intel Corporation or its subsidiaries in the United States and other countries." diff --git a/documentation/themes/beastie/i18n/de.toml b/documentation/themes/beastie/i18n/de.toml index 97eacd3de7..3d5543a006 100644 --- a/documentation/themes/beastie/i18n/de.toml +++ b/documentation/themes/beastie/i18n/de.toml @@ -226,6 +226,15 @@ other = "Adobe, Acrobat, Acrobat Reader und PostScript sind entweder eingetragen [apple] other = "Apple, FireWire, Mac, Macintosh, Mac OS, Quicktime und TrueType sind eingetragene Warenzeichen von Apple Computer, Inc., in den Vereinigten Staaten und anderen Ländern." +[git] +other = "Git and the Git logo are either registered trademarks or trademarks of Software Freedom Conservancy, Inc., corporate home of the Git Project, in the United States and/or other countries." + +[github] +other = "GitHub is a trademark of GitHub Inc., registered in the United States and other countries." + +[gitlab] +other = "GITLAB is a trademark of GitLab Inc. in the United States and other countries and regions." + [intel] other = "Intel, Celeron, EtherExpress, i386, i486, Itanium, Pentium und Xeon sind Warenzeichen oder eingetragene Warenzeichen der Intel Corporation oder ihrer Gesellschaften in den Vereinigten Staaten und in anderen Ländern." diff --git a/documentation/themes/beastie/i18n/el.toml b/documentation/themes/beastie/i18n/el.toml index dfd7696be5..cd52247ffc 100644 --- a/documentation/themes/beastie/i18n/el.toml +++ b/documentation/themes/beastie/i18n/el.toml @@ -226,6 +226,15 @@ other = "Οι λέξεις ή φράσεις Adobe, Acrobat, Acrobat Reader, κ [apple] other = "Οι λέξεις ή φράσεις Apple, AirPort, FireWire, Mac, Macintosh, Mac OS, Quicktime, και TrueType είναι εμπορικά σύμβολα της Apple Computer, Inc., κατοχυρωμένα στις Ηνωμένες Πολιτείες και σε άλλες χώρες." +[git] +other = "Git and the Git logo are either registered trademarks or trademarks of Software Freedom Conservancy, Inc., corporate home of the Git Project, in the United States and/or other countries." + +[github] +other = "GitHub is a trademark of GitHub Inc., registered in the United States and other countries." + +[gitlab] +other = "GITLAB is a trademark of GitLab Inc. in the United States and other countries and regions." + [intel] other = "Οι λέξεις Intel, Celeron, EtherExpress, i386, i486, Itanium, Pentium, και Xeon είναι εμπορικά σύμβολα ή κατοχυρωμένα εμπορικά σύμβολα της Intel Corporation και των θυγατρικών της στις Ηνωμένες Πολιτείες και σε άλλες χώρες." diff --git a/documentation/themes/beastie/i18n/es.toml b/documentation/themes/beastie/i18n/es.toml index f8d681f508..82acd0af90 100644 --- a/documentation/themes/beastie/i18n/es.toml +++ b/documentation/themes/beastie/i18n/es.toml @@ -226,6 +226,15 @@ other = "Adobe, Acrobat, Acrobat Reader, Flash y PostScript son marcas registrad [apple] other = "Apple, AirPort, FireWire, iMac, iPhone, iPad, Mac, Macintosh, Mac OS, Quicktime, y TrueType son marcas comerciales de Apple Inc., registradas en los Estados Unidos de América y otros países." +[git] +other = "Git and the Git logo are either registered trademarks or trademarks of Software Freedom Conservancy, Inc., corporate home of the Git Project, in the United States and/or other countries." + +[github] +other = "GitHub is a trademark of GitHub Inc., registered in the United States and other countries." + +[gitlab] +other = "GITLAB is a trademark of GitLab Inc. in the United States and other countries and regions." + [intel] other = "Intel, Celeron, Centrino, Core, EtherExpress, i386, i486, Itanium, Pentium, y Xeon son marcas registradas de ntel Corporation o sus subsidiarias en los Estados Unidos de América y otros países." diff --git a/documentation/themes/beastie/i18n/fr.toml b/documentation/themes/beastie/i18n/fr.toml index 5678dbd984..189d785227 100644 --- a/documentation/themes/beastie/i18n/fr.toml +++ b/documentation/themes/beastie/i18n/fr.toml @@ -226,6 +226,15 @@ other = "Adobe, Acrobat, Acrobat Reader, Flash and PostScript are either registe [apple] other = "Apple, AirPort, FireWire, iMac, iPhone, iPad, Mac, Macintosh, Mac OS, Quicktime, and TrueType are trademarks of Apple Inc., registered in the U.S. and other countries." +[git] +other = "Git and the Git logo are either registered trademarks or trademarks of Software Freedom Conservancy, Inc., corporate home of the Git Project, in the United States and/or other countries." + +[github] +other = "GitHub is a trademark of GitHub Inc., registered in the United States and other countries." + +[gitlab] +other = "GITLAB is a trademark of GitLab Inc. in the United States and other countries and regions." + [intel] other = "Intel, Celeron, Centrino, Core, EtherExpress, i386, i486, Itanium, Pentium, and Xeon are trademarks or registered trademarks of Intel Corporation or its subsidiaries in the United States and other countries." diff --git a/documentation/themes/beastie/i18n/hu.toml b/documentation/themes/beastie/i18n/hu.toml index 9891f18652..1b00390645 100644 --- a/documentation/themes/beastie/i18n/hu.toml +++ b/documentation/themes/beastie/i18n/hu.toml @@ -226,6 +226,15 @@ other = "Az Adobe, Acrobat, Acrobat Reader, és PostScript az Adobe Systems Inco [apple] other = "Az Apple, AirPort, FireWire, Mac, Macintosh, Mac OS, Quicktime, és TrueType az Apple Computer, Inc., bejegyzett védjegyei az Egyesült Államokban és más országokban." +[git] +other = "Git and the Git logo are either registered trademarks or trademarks of Software Freedom Conservancy, Inc., corporate home of the Git Project, in the United States and/or other countries." + +[github] +other = "GitHub is a trademark of GitHub Inc., registered in the United States and other countries." + +[gitlab] +other = "GITLAB is a trademark of GitLab Inc. in the United States and other countries and regions." + [intel] other = "Az Intel, Celeron, EtherExpress, i386, i486, Itanium, Pentium és Xeon az Intel Corporation vagy leányvállalatainak védjegyei vagy bejegyzett védjegyei az Egyesült Államokban és más országokban." diff --git a/documentation/themes/beastie/i18n/it.toml b/documentation/themes/beastie/i18n/it.toml index 8da92694d5..3b9561407e 100644 --- a/documentation/themes/beastie/i18n/it.toml +++ b/documentation/themes/beastie/i18n/it.toml @@ -226,6 +226,15 @@ other = "Adobe, Acrobat, Acrobat Reader, e PostScript sono marchi o marchi regis [apple] other = "Apple, AirPort, FireWire, Mac, Macintosh, Mac OS, Quicktime, e TrueType sono marchi della Apple Computer, Inc., registrati negli Stati Uniti e in altri paesi." +[git] +other = "Git and the Git logo are either registered trademarks or trademarks of Software Freedom Conservancy, Inc., corporate home of the Git Project, in the United States and/or other countries." + +[github] +other = "GitHub is a trademark of GitHub Inc., registered in the United States and other countries." + +[gitlab] +other = "GITLAB is a trademark of GitLab Inc. in the United States and other countries and regions." + [intel] other = "Intel, Celeron, EtherExpress, i386, i486, Itanium, Pentium, e Xeon sono marchi o marchi registrati della Intel Corporation o delle sue sussidiarie negli Stati Uniti e in altri paesi." diff --git a/documentation/themes/beastie/i18n/ja.toml b/documentation/themes/beastie/i18n/ja.toml index 7c1fa11198..ea52c990c7 100644 --- a/documentation/themes/beastie/i18n/ja.toml +++ b/documentation/themes/beastie/i18n/ja.toml @@ -226,6 +226,15 @@ other = "Adobe, Acrobat, Acrobat Reader, Flash および PostScript は アメ [apple] other = "Apple, AirPort, FireWire, iMac, iPhone, iPad, Mac, Macintosh, Mac OS, Quicktime および TrueType は Apple Inc. の商標で、 アメリカ合衆国およびその他の国で登録されています。" +[git] +other = "Git and the Git logo are either registered trademarks or trademarks of Software Freedom Conservancy, Inc., corporate home of the Git Project, in the United States and/or other countries." + +[github] +other = "GitHub is a trademark of GitHub Inc., registered in the United States and other countries." + +[gitlab] +other = "GITLAB is a trademark of GitLab Inc. in the United States and other countries and regions." + [intel] other = "Intel, Celeron, Centrino, Core, EtherExpress, i386, i486, Itanium, Pentium および Xeon はアメリカ合衆国およびその他の国における Intel Corporation またはその関連会社の商標または登録商標です。" diff --git a/documentation/themes/beastie/i18n/ko.toml b/documentation/themes/beastie/i18n/ko.toml index 1e8a387b99..426f9f42ce 100644 --- a/documentation/themes/beastie/i18n/ko.toml +++ b/documentation/themes/beastie/i18n/ko.toml @@ -226,6 +226,15 @@ other = "Adobe, Acrobat, Acrobat Reader, Flash and PostScript are either registe [apple] other = "Apple, AirPort, FireWire, iMac, iPhone, iPad, Mac, Macintosh, Mac OS, Quicktime, and TrueType are trademarks of Apple Inc., registered in the U.S. and other countries." +[git] +other = "Git and the Git logo are either registered trademarks or trademarks of Software Freedom Conservancy, Inc., corporate home of the Git Project, in the United States and/or other countries." + +[github] +other = "GitHub is a trademark of GitHub Inc., registered in the United States and other countries." + +[gitlab] +other = "GITLAB is a trademark of GitLab Inc. in the United States and other countries and regions." + [intel] other = "Intel, Celeron, Centrino, Core, EtherExpress, i386, i486, Itanium, Pentium, and Xeon are trademarks or registered trademarks of Intel Corporation or its subsidiaries in the United States and other countries." diff --git a/documentation/themes/beastie/i18n/mn.toml b/documentation/themes/beastie/i18n/mn.toml index f46f1e08d7..4be6fcd9af 100644 --- a/documentation/themes/beastie/i18n/mn.toml +++ b/documentation/themes/beastie/i18n/mn.toml @@ -226,6 +226,15 @@ other = "Adobe, Acrobat, Acrobat Reader, болон PostScript нь бүртгэ [apple] other = "Apple, AirPort, FireWire, Mac, Macintosh, Mac OS, Quicktime, болон TrueType нь Америкийн Нэгдсэн Улс ба/эсвэл бусад улсуудад бүртгэгдсэн Apple Computer, Inc.-ийн худалдааны тэмдэгнүүд юм." +[git] +other = "Git and the Git logo are either registered trademarks or trademarks of Software Freedom Conservancy, Inc., corporate home of the Git Project, in the United States and/or other countries." + +[github] +other = "GitHub is a trademark of GitHub Inc., registered in the United States and other countries." + +[gitlab] +other = "GITLAB is a trademark of GitLab Inc. in the United States and other countries and regions." + [intel] other = "Intel, Celeron, EtherExpress, i386, i486, Itanium, Pentium, болон Xeon нь Америкийн Нэгдсэн Улс болон бусад улсууд дахь Intel корпораци эсвэл түүний салбаруудын худалдааны тэмдэгнүүд эсвэл бүртгэгдсэн худалдааны тэмдэгнүүд юм." diff --git a/documentation/themes/beastie/i18n/nl.toml b/documentation/themes/beastie/i18n/nl.toml index 4764ae21f3..a6c9cd516e 100644 --- a/documentation/themes/beastie/i18n/nl.toml +++ b/documentation/themes/beastie/i18n/nl.toml @@ -226,6 +226,15 @@ other = "Adobe, Acrobat, Acrobat Reader, en PostScript zijn òfwel geregistreerd [apple] other = "Apple, AirPort, FireWire, Mac, Macintosh, Mac OS, Quicktime, en TrueType zijn handelsmerken van Apple Computer, Inc., geregistreerd in de Verenigde Staten en andere landen." +[git] +other = "Git and the Git logo are either registered trademarks or trademarks of Software Freedom Conservancy, Inc., corporate home of the Git Project, in the United States and/or other countries." + +[github] +other = "GitHub is a trademark of GitHub Inc., registered in the United States and other countries." + +[gitlab] +other = "GITLAB is a trademark of GitLab Inc. in the United States and other countries and regions." + [intel] other = "Intel, Celeron, EtherExpress, i386, i486, Itanium, Pentium, en Xeon zijn handelsmerken of geregistreerde handelsmerken van Intel Corporation of haar dochterondernemingen in de Verenigde Staten en andere landen." diff --git a/documentation/themes/beastie/i18n/pl.toml b/documentation/themes/beastie/i18n/pl.toml index 1e8a387b99..426f9f42ce 100644 --- a/documentation/themes/beastie/i18n/pl.toml +++ b/documentation/themes/beastie/i18n/pl.toml @@ -226,6 +226,15 @@ other = "Adobe, Acrobat, Acrobat Reader, Flash and PostScript are either registe [apple] other = "Apple, AirPort, FireWire, iMac, iPhone, iPad, Mac, Macintosh, Mac OS, Quicktime, and TrueType are trademarks of Apple Inc., registered in the U.S. and other countries." +[git] +other = "Git and the Git logo are either registered trademarks or trademarks of Software Freedom Conservancy, Inc., corporate home of the Git Project, in the United States and/or other countries." + +[github] +other = "GitHub is a trademark of GitHub Inc., registered in the United States and other countries." + +[gitlab] +other = "GITLAB is a trademark of GitLab Inc. in the United States and other countries and regions." + [intel] other = "Intel, Celeron, Centrino, Core, EtherExpress, i386, i486, Itanium, Pentium, and Xeon are trademarks or registered trademarks of Intel Corporation or its subsidiaries in the United States and other countries." diff --git a/documentation/themes/beastie/i18n/pt-br.toml b/documentation/themes/beastie/i18n/pt-br.toml index ff00ae1f00..2db88d801d 100644 --- a/documentation/themes/beastie/i18n/pt-br.toml +++ b/documentation/themes/beastie/i18n/pt-br.toml @@ -226,6 +226,15 @@ other = "Adobe, Acrobat, Acrobat Reader, Flash and PostScript are either registe [apple] other = "Apple, AirPort, FireWire, iMac, iPhone, iPad, Mac, Macintosh, Mac OS, Quicktime, and TrueType are trademarks of Apple Inc., registered in the U.S. and other countries." +[git] +other = "Git and the Git logo are either registered trademarks or trademarks of Software Freedom Conservancy, Inc., corporate home of the Git Project, in the United States and/or other countries." + +[github] +other = "GitHub is a trademark of GitHub Inc., registered in the United States and other countries." + +[gitlab] +other = "GITLAB is a trademark of GitLab Inc. in the United States and other countries and regions." + [intel] other = "Intel, Celeron, Centrino, Core, EtherExpress, i386, i486, Itanium, Pentium, and Xeon are trademarks or registered trademarks of Intel Corporation or its subsidiaries in the United States and other countries." diff --git a/documentation/themes/beastie/i18n/ru.toml b/documentation/themes/beastie/i18n/ru.toml index 4aed7317ea..ad49eb685c 100644 --- a/documentation/themes/beastie/i18n/ru.toml +++ b/documentation/themes/beastie/i18n/ru.toml @@ -226,6 +226,15 @@ other = "Adobe, Acrobat, Acrobat Reader и PostScript это или зареги [apple] other = "Apple, AirPort, FireWire, Mac, Macintosh, Mac OS, Quicktime и TrueType это торговые марки Apple Computer, Inc., зарегистрированные в Соединенных Штатах и других странах." +[git] +other = "Git and the Git logo are either registered trademarks or trademarks of Software Freedom Conservancy, Inc., corporate home of the Git Project, in the United States and/or other countries." + +[github] +other = "GitHub is a trademark of GitHub Inc., registered in the United States and other countries." + +[gitlab] +other = "GITLAB is a trademark of GitLab Inc. in the United States and other countries and regions." + [intel] other = "Intel, Celeron, EtherExpress, i386, i486, Itanium, Pentium и Xeon это торговые марки или зарегистрированные торговые марки Intel Corporation или ее дочерних компаний в Соединенных Штатах и других странах." diff --git a/documentation/themes/beastie/i18n/tr.toml b/documentation/themes/beastie/i18n/tr.toml index 1e8a387b99..426f9f42ce 100644 --- a/documentation/themes/beastie/i18n/tr.toml +++ b/documentation/themes/beastie/i18n/tr.toml @@ -226,6 +226,15 @@ other = "Adobe, Acrobat, Acrobat Reader, Flash and PostScript are either registe [apple] other = "Apple, AirPort, FireWire, iMac, iPhone, iPad, Mac, Macintosh, Mac OS, Quicktime, and TrueType are trademarks of Apple Inc., registered in the U.S. and other countries." +[git] +other = "Git and the Git logo are either registered trademarks or trademarks of Software Freedom Conservancy, Inc., corporate home of the Git Project, in the United States and/or other countries." + +[github] +other = "GitHub is a trademark of GitHub Inc., registered in the United States and other countries." + +[gitlab] +other = "GITLAB is a trademark of GitLab Inc. in the United States and other countries and regions." + [intel] other = "Intel, Celeron, Centrino, Core, EtherExpress, i386, i486, Itanium, Pentium, and Xeon are trademarks or registered trademarks of Intel Corporation or its subsidiaries in the United States and other countries." diff --git a/documentation/themes/beastie/i18n/zh-cn.toml b/documentation/themes/beastie/i18n/zh-cn.toml index 25cd823f7c..1d06a3ef12 100644 --- a/documentation/themes/beastie/i18n/zh-cn.toml +++ b/documentation/themes/beastie/i18n/zh-cn.toml @@ -226,6 +226,15 @@ other = "Adobe、 Acrobat、 Acrobat Reader、 Flash， 以及 PostScript 是 Ad [apple] other = "Apple, AirPort, FireWire, iMac, iPhone, iPad, Mac, Macintosh, Mac OS, Quicktime, 以及 TrueType 是 Apple Inc. 在美国以及其他国家的注册商标。" +[git] +other = "Git and the Git logo are either registered trademarks or trademarks of Software Freedom Conservancy, Inc., corporate home of the Git Project, in the United States and/or other countries." + +[github] +other = "GitHub is a trademark of GitHub Inc., registered in the United States and other countries." + +[gitlab] +other = "GITLAB is a trademark of GitLab Inc. in the United States and other countries and regions." + [intel] other = "Intel, Celeron, Centrino, Core, EtherExpress, i386, i486, Itanium, Pentium, 和 Xeon 是 Intel Corporation 及其分支机构在美国和其他国家的商标或注册商标。" diff --git a/documentation/themes/beastie/i18n/zh-tw.toml b/documentation/themes/beastie/i18n/zh-tw.toml index d67e1ac68e..38234e8756 100644 --- a/documentation/themes/beastie/i18n/zh-tw.toml +++ b/documentation/themes/beastie/i18n/zh-tw.toml @@ -226,6 +226,15 @@ other = "Adobe, Acrobat, Acrobat Reader, Flash 以及 PostScript 是 Adobe Syste [apple] other = "Apple, AirPort, FireWire, iMac, iPhone, iPad, Mac, Macintosh, Mac OS, Quicktime 以及 TrueType 是 Apple Inc. 在美國以及其他國家的註冊商標。" +[git] +other = "Git and the Git logo are either registered trademarks or trademarks of Software Freedom Conservancy, Inc., corporate home of the Git Project, in the United States and/or other countries." + +[github] +other = "GitHub is a trademark of GitHub Inc., registered in the United States and other countries." + +[gitlab] +other = "GITLAB is a trademark of GitLab Inc. in the United States and other countries and regions." + [intel] other = "Intel, Celeron, Centrino, Core, EtherExpress, i386, i486, Itanium, Pentium 以及 Xeon 是 Intel Corporation 及其分支機構在美國和其他國家的商標或註冊商標。" diff --git a/documentation/themes/beastie/layouts/partials/trademarks.html b/documentation/themes/beastie/layouts/partials/trademarks.html index d8dab2ac54..2266c2a2db 100644 --- a/documentation/themes/beastie/layouts/partials/trademarks.html +++ b/documentation/themes/beastie/layouts/partials/trademarks.html @@ -44,6 +44,18 @@

{{ i18n "apple" }}

{{ end }} + {{ if in $trademarks "git" }} +

{{ i18n "git" }}

+ {{ end }} + + {{ if in $trademarks "github" }} +

{{ i18n "github" }}

+ {{ end }} + + {{ if in $trademarks "gitlab" }} +

{{ i18n "gitlab" }}

+ {{ end }} + {{ if in $trademarks "intel" }}

{{ i18n "intel" }}

{{ end }}