Attachment 244489 Details for Bug 273459 – diff to the version of 14.07.2023

[patch] diff to the version of 14.07.2023

ru.toml.diff (text/plain), 16.26 KB, created by Andrei Zakhvatov on 2023-08-30 20:36:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrei Zakhvatov

Created: 2023-08-30 20:36:24 UTC

Size: 16.26 KB

patch

obsolete

>diff --git a/documentation/themes/beastie/i18n/ru.toml b/documentation/themes/beastie/i18n/ru.toml
>index 187a9c1954..97cfd4f6e4 100644
>--- a/documentation/themes/beastie/i18n/ru.toml
>+++ b/documentation/themes/beastie/i18n/ru.toml
>@@ -1,218 +1,224 @@
>+#
>+# The FreeBSD Russian Documentation Project
>+#
>+# Original EN revision (14.07.2023): fbf328b48f749b62f2166771e94b5cd0664dd52d
>+#
>+
> # ---------------------------------------------------
>-# Global
>+# ÐÐ»Ð¾Ð±Ð°Ð»ÑÐ½ÑÐµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ
> # ---------------------------------------------------
> [freebsd]
> other = "FreeBSD"
> 
> [freebsd-project]
>-other = "The FreeBSD Project"
>+other = "ÐÑÐ¾ÐµÐºÑ FreeBSD"
> 
> [freebsd-foundation]
>-other = "The FreeBSD Foundation"
>+other = "Ð¤Ð¾Ð½Ð´ FreeBSD"
> 
> [freebsd-documentation]
>-other = "FreeBSD Documentation"
>+other = "ÐÐ¾ÐºÑÐ¼ÐµÐ½ÑÐ°ÑÐ¸Ñ FreeBSD"
> 
> [freebsd-documentation-main-desc]
>-other = "FreeBSD is an operating system used to power modern servers, desktops, and embedded platforms."
>+other = "FreeBSD - ÑÑÐ¾ Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½Ð°Ñ ÑÐ¸ÑÑÐµÐ¼Ð°, Ð¾Ð±ÐµÑÐ¿ÐµÑÐ¸Ð²Ð°ÑÑÐ°Ñ ÑÐ°Ð±Ð¾ÑÑ ÑÐ¾Ð²ÑÐµÐ¼ÐµÐ½Ð½ÑÑ ÑÐµÑÐ²ÐµÑÐ¾Ð², Ð½Ð°ÑÑÐ¾Ð»ÑÐ½ÑÑ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ¾Ð² Ð¸ Ð²ÑÑÑÐ°Ð¸Ð²Ð°ÐµÐ¼ÑÑ Ð¿Ð»Ð°ÑÑÐ¾ÑÐ¼."
> 
> [global-search-placeholder]
>-other = "Search in the articles, books and guides."
>+other = "ÐÐ¾Ð¸ÑÐº Ð² ÑÑÐ°ÑÑÑÑ, ÐºÐ½Ð¸Ð³Ð°Ñ Ð¸ ÑÑÐºÐ¾Ð²Ð¾Ð´ÑÑÐ²Ð°Ñ."
> 
> [toc]
>-other = "Table of Contents"
>+other = "Ð¡Ð¾Ð´ÐµÑÐ¶Ð°Ð½Ð¸Ðµ"
> 
> [resources]
>-other = "Resources"
>+other = "ÐÐ°ÑÐµÑÐ¸Ð°Ð»Ñ"
> 
> [download-pdf]
>-other = "Download PDF"
>+other = "Ð¡ÐºÐ°ÑÐ°ÑÑ PDF"
> 
> [edit-page]
>-other = "Edit this page"
>+other = "Ð ÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°ÑÑ ÑÑÑ ÑÑÑÐ°Ð½Ð¸ÑÑ"
> 
> [trademarks]
>-other = "trademarks"
>+other = "ÑÐ¾Ð²Ð°ÑÐ½ÑÐµ Ð·Ð½Ð°ÐºÐ¸"
> 
> [books]
>-other = "Books"
>+other = "ÐÐ½Ð¸Ð³Ð¸"
> 
> [articles]
>-other = "Articles"
>+other = "Ð¡ÑÐ°ÑÑÐ¸"
> 
> [choose-language]
>-other = "Choose language"
>+other = "ÐÑÐ±ÐµÑÐ¸ÑÐµ ÑÐ·ÑÐº"
> 
> [last-modified]
>-other = "Last modified on"
>+other = "ÐÐ·Ð¼ÐµÐ½ÐµÐ½Ð¾"
> 
> [by]
> other = "by"
> 
> [search]
>-other = "Search"
>+other = "ÐÐ¾Ð¸ÑÐº"
> 
> # ---------------------------------------------------
>-# Header
>+# ÐÐµÑÑÐ½Ð¸Ð¹ ÐºÐ¾Ð»Ð¾Ð½ÑÐ¸ÑÑÐ»
> # ---------------------------------------------------
> [documentation]
>-other = "Documentation"
>+other = "ÐÐ¾ÐºÑÐ¼ÐµÐ½ÑÐ°ÑÐ¸Ñ"
> 
> [community]
>-other = "Community"
>+other = "Ð¡Ð¾Ð¾Ð±ÑÐµÑÑÐ²Ð¾"
> 
> # ---------------------------------------------------
>-# Main page
>+# ÐÐ»Ð°Ð²Ð½Ð°Ñ ÑÑÑÐ°Ð½Ð¸ÑÐ°
> # ---------------------------------------------------
> [getting-started]
>-other = "Getting started"
>+other = "ÐÐ°ÑÐ°ÑÑ Ð·Ð½Ð°ÐºÐ¾Ð¼ÑÑÐ²Ð¾"
> 
> [learn-basics]
>-other = "Learn about FreeBSD basics"
>+other = "ÐÐ·ÑÑÐ¸ÑÑ Ð¾ÑÐ½Ð¾Ð²Ñ FreeBSD"
> 
> [download]
>-other = "Download"
>+other = "Ð¡ÐºÐ°ÑÐ°ÑÑ"
> 
> [download-freebsd]
>-other = "Download FreeBSD"
>+other = "Ð¡ÐºÐ°ÑÐ°ÑÑ FreeBSD"
> 
> [handbook]
>-other = "FreeBSD Handbook"
>+other = "Ð ÑÐºÐ¾Ð²Ð¾Ð´ÑÑÐ²Ð¾ Ð¿Ð¾ FreeBSD"
> 
> [handbook-desc]
>-other = "A constantly evolving, comprehensive resource for FreeBSD users"
>+other = "ÐÐ¾ÑÑÐ¾ÑÐ½Ð½Ð¾ ÑÐ°Ð·Ð²Ð¸Ð²Ð°ÑÑÐ¸Ð¹ÑÑ Ð¸ Ð¾Ð±ÑÐ¸ÑÐ½ÑÐ¹ Ð¸ÑÑÐ¾ÑÐ½Ð¸Ðº Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ð¸ Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹ FreeBSD"
> 
> [porters-handbook]
>-other = "FreeBSD Porter's Handbook"
>+other = "Ð ÑÐºÐ¾Ð²Ð¾Ð´ÑÑÐ²Ð¾ FreeBSD Ð¿Ð¾ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¿Ð¾ÑÑÐ¾Ð²"
> 
> [porters-handbook-desc]
>-other = "A complete reference about the FreeBSD ports system"
>+other = "ÐÐ¾Ð»Ð½Ð¾Ðµ ÑÐ¿ÑÐ°Ð²Ð¾ÑÐ½Ð¾Ðµ ÑÑÐºÐ¾Ð²Ð¾Ð´ÑÑÐ²Ð¾ Ð¿Ð¾ ÑÐ¸ÑÑÐµÐ¼Ðµ ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾ÑÑÐ°Ð¼Ð¸ FreeBSD"
> 
> [faq]
> other = "FreeBSD FAQ"
> 
> [faq-desc]
>-other = "FreeBSD frequently Asked Questions (FAQ) for 13.X and 12.X"
>+other = "Ð§Ð°ÑÑÐ¾ ÐÐ°Ð´Ð°Ð²Ð°ÐµÐ¼ÑÐµ ÐÐ¾Ð¿ÑÐ¾ÑÑ (Ð§Ð°ÐÐ) Ð¿Ð¾ FreeBSD 13.X Ð¸ 12.X"
> 
> [fdp]
>-other = "Documentation Project Primer"
>+other = "Ð£ÑÐµÐ±Ð½Ð¸Ðº ÐÑÐ¾ÐµÐºÑÐ° ÐÐ¾ÐºÑÐ¼ÐµÐ½ÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ"
> 
> [fdp-desc]
>-other = "A complete guide about how to start contributing to the documentation"
>+other = "ÐÐ¾Ð»Ð½Ð¾Ðµ ÑÑÐºÐ¾Ð²Ð¾Ð´ÑÑÐ²Ð¾, Ð¿Ð¾ÑÐ²ÑÑÑÐ½Ð½Ð¾Ðµ ÑÐ¾Ð¼Ñ, ÐºÐ°Ðº Ð¿ÑÐ¸Ð½ÑÑÑ ÑÑÐ°ÑÑÐ¸Ðµ Ð² ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ð¸ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐ°ÑÐ¸Ð¸"
> 
> [books-list]
>-other = "List of FreeBSD books"
>+other = "Ð¡Ð¿Ð¸ÑÐ¾Ðº ÐºÐ½Ð¸Ð³ Ð¿Ð¾ FreeBSD"
> 
> [articles-list]
>-other = "List of FreeBSD articles"
>+other = "Ð¡Ð¿Ð¸ÑÐ¾Ðº ÑÑÐ°ÑÐµÐ¹ Ð¾ FreeBSD"
> 
> [manual-pages]
>-other = "Manual pages"
>+other = "Ð¡ÑÑÐ°Ð½Ð¸ÑÑ Ð¡Ð¿ÑÐ°Ð²Ð¾ÑÐ½Ð¸ÐºÐ°"
> 
> [manual-pages-desc]
>-other = "FreeBSD Manual Pages"
>+other = "Ð¡ÑÑÐ°Ð½Ð¸ÑÑ Ð¡Ð¿ÑÐ°Ð²Ð¾ÑÐ½Ð¸ÐºÐ° FreeBSD"
> 
> # ---------------------------------------------------
>-# Footer
>+# ÐÐ¸Ð¶Ð½Ð¸Ð¹ ÐºÐ¾Ð»Ð¾Ð½ÑÐ¸ÑÑÐ»
> # ---------------------------------------------------
> [system]
>-other = "System"
>+other = "Ð¡Ð¸ÑÑÐµÐ¼Ð°"
> 
> [light]
>-other = "Light"
>+other = "Ð¡Ð²ÐµÑÐ»ÑÐ¹"
> 
> [dark]
>-other = "Dark"
>+other = "Ð¢ÑÐ¼Ð½ÑÐ¹"
> 
> [high-contrast]
>-other = "High contrast"
>+other = "ÐÑÑÐ¾ÐºÐ°Ñ ÐºÐ¾Ð½ÑÑÐ°ÑÑÐ½Ð¾ÑÑÑ"
> 
> [previous-versions]
>-other = "Previous versions"
>+other = "ÐÑÐµÐ´ÑÐ´ÑÑÐ¸Ðµ Ð²ÐµÑÑÐ¸Ð¸"
> 
> [4-4bsd-documents]
>-other = "4.4BSD Documents"
>+other = "ÐÐ¾ÐºÑÐ¼ÐµÐ½ÑÑ 4.4BSD"
> 
> [about]
>-other = "About"
>+other = "ÐÐ±ÑÐ°Ñ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ"
> 
> [legal]
>-other = "Legal"
>+other = "Ð®ÑÐ¸Ð´Ð¸ÑÐµÑÐºÐ°Ñ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ"
> 
> [donations]
>-other = "Donations"
>+other = "ÐÐ¾Ð¶ÐµÑÑÐ²Ð¾Ð²Ð°Ð½Ð¸Ñ"
> 
> [legal-notices]
>-other = "Legal notices"
>+other = "Ð®ÑÐ¸Ð´Ð¸ÑÐµÑÐºÐ¸Ðµ Ð¿Ð¾ÑÑÐ½ÐµÐ½Ð¸Ñ"
> 
> [made-with]
>-other = "Made with"
>+other = "Ð¡Ð´ÐµÐ»Ð°Ð½Ð¾ Ð¿ÑÐ¸ Ð¿Ð¾Ð¼Ð¾ÑÐ¸"
> 
> [by-freebsd-community]
>-other = "by the FreeBSD Community"
>+other = "Ð¡Ð¾Ð¾Ð±ÑÐµÑÑÐ²Ð¾Ð¼ FreeBSD"
> 
> [copyright]
>-other = "All rights reserved."
>+other = "ÐÑÐµ Ð¿ÑÐ°Ð²Ð° Ð·Ð°ÑÐ¸ÑÐµÐ½Ñ."
> 
> # ---------------------------------------------------
>-# Articles page
>+# Ð¡ÑÑÐ°Ð½Ð¸ÑÐ° Ð¿ÑÐ±Ð»Ð¸ÐºÐ°ÑÐ¸Ð¹
> # ---------------------------------------------------
> [list-desc-articles]
>-other = "Explore a comprehensive list of FreeBSD articles."
>+other = "ÐÐ·ÑÑÐ¸ÑÐµ Ð¾Ð±ÑÐ¸ÑÐ½ÑÐ¹ ÑÐ¿Ð¸ÑÐ¾Ðº Ð¿ÑÐ±Ð»Ð¸ÐºÐ°ÑÐ¸Ð¹ FreeBSD."
> 
> # ---------------------------------------------------
>-# Books page
>+# Ð¡ÑÑÐ°Ð½Ð¸ÑÐ° ÐºÐ½Ð¸Ð³
> # ---------------------------------------------------
> [prev]
>-other = "Prev"
>+other = "ÐÐ°Ð·Ð°Ð´"
> 
> [next]
>-other = "Next"
>+other = "ÐÐ°Ð»ÐµÐµ"
> 
> [home]
>-other = "Home"
>+other = "ÐÐ»Ð°Ð²Ð½Ð°Ñ"
> 
> [split-html]
>-other = "Split HTML"
>+other = "ÐÐ¾ÑÑÑÐ°Ð½Ð¸ÑÐ½ÑÐ¹ HTML"
> 
> [single-html]
>-other = "Single HTML"
>+other = "ÐÐ´Ð¸Ð½ÑÐ¹ HTML"
> 
> [book-chapters]
>-other = "Book chapters"
>+other = "ÐÐ»Ð°Ð²Ñ ÐºÐ½Ð¸Ð³"
> 
> [book-menu]
>-other = "Book menu"
>+other = "ÐÐµÐ½Ñ ÐºÐ½Ð¸Ð³"
> 
> [list-desc-books]
>-other = "Explore a comprehensive list of FreeBSD books."
>+other = "ÐÐ·ÑÑÐ¸ÑÐµ Ð¾Ð±ÑÐ¸ÑÐ½ÑÐ¹ ÑÐ¿Ð¸ÑÐ¾Ðº ÐºÐ½Ð¸Ð³ Ð¿Ð¾ FreeBSD."
> 
> # ---------------------------------------------------
>-# Languages page
>+# Ð¡ÑÑÐ°Ð½Ð¸ÑÐ° ÑÐ·ÑÐºÐ¾Ð²
> # ---------------------------------------------------
> [select-language]
>-other = "Select a language"
>+other = "ÐÑÐ±ÐµÑÐ¸ÑÐµ ÑÐ·ÑÐº"
> 
> [current-selection]
>-other = "Current selection:"
>+other = "Ð¢ÐµÐºÑÑÐ¸Ð¹ Ð²ÑÐ±Ð¾Ñ:"
> 
> # ---------------------------------------------------
>-# Copyright
>+# ÐÐ²ÑÐ¾ÑÑÐºÐ¸Ðµ Ð¿ÑÐ°Ð²Ð°
> # ---------------------------------------------------
> [freebsd-copyright]
>-other = "FreeBSD ÑÑÐ¾ Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½Ð°Ñ ÑÐ¾ÑÐ³Ð¾Ð²Ð°Ñ Ð¼Ð°ÑÐºÐ° FreeBSD Foundation."
>+other = "FreeBSD ÑÐ²Ð»ÑÐµÑÑÑ Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐ¼ ÑÐ¾Ð²Ð°ÑÐ½ÑÐ¼ Ð·Ð½Ð°ÐºÐ¾Ð¼ Ð¤Ð¾Ð½Ð´Ð° FreeBSD."
> 
> [pam]
>-other = "This article was written for the FreeBSD Project by ThinkSec AS and Network Associates Laboratories, the Security Research Division of Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 (âCBOSSâ), as part of the DARPA CHATS research program."
>+other = "ÐÑÐ° ÑÑÐ°ÑÑÑ Ð±ÑÐ»Ð° Ð½Ð°Ð¿Ð¸ÑÐ°Ð½Ð° Ð´Ð»Ñ ÐÑÐ¾ÐµÐºÑÐ° FreeBSD ÐºÐ¾Ð¼Ð¿Ð°Ð½Ð¸ÑÐ¼Ð¸ ThinkSec AS Ð¸ Network Associates Laboratories, Ð²ÑÐ¾Ð´ÑÑÐµÐ¹ Ð² Security Research Division of Network Associates, Inc., Ð² ÑÐ°Ð¼ÐºÐ°Ñ Ð´Ð¾Ð³Ð¾Ð²Ð¾ÑÐ° DARPA/SPAWAR N66001-01-C-8035 (âCBOSSâ), ÐºÐ°Ðº ÑÐ°ÑÑÑ Ð¸ÑÑÐ»ÐµÐ´Ð¾Ð²Ð°ÑÐµÐ»ÑÑÐºÐ¾Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ DARPA CHATS."
> 
> [coverity]
>-other = "Coverity is a registered trademark; Coverity Extend, Coverity Prevent and Coverity Prevent SQS are trademarks of Coverity, Inc."
>+other = "Coverity ÑÐ²Ð»ÑÐµÑÑÑ Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐ¼ ÑÐ¾Ð²Ð°ÑÐ½ÑÐ¼ Ð·Ð½Ð°ÐºÐ¾Ð¼; Coverity Extend, Coverity Prevent Ð¸ Coverity Prevent SQS ÑÐ²Ð»ÑÑÑÑÑ Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐ¼Ð¸ ÑÐ¾Ð²Ð°ÑÐ½ÑÐ¼Ð¸ Ð·Ð½Ð°ÐºÐ°Ð¼Ð¸ Coverity, Inc."
> 
> [ibm]
>-other = "IBM, AIX, OS/2, PowerPC, PS/2, S/390 Ð¸ ThinkPad ÑÑÐ¾ ÑÐ¾ÑÐ³Ð¾Ð²ÑÐµ Ð¼Ð°ÑÐºÐ¸ International Business Machines Corporation Ð² Ð¡Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð½ÑÑ Ð¨ÑÐ°ÑÐ°Ñ, Ð´ÑÑÐ³Ð¸Ñ ÑÑÑÐ°Ð½Ð°Ñ, Ð¸Ð»Ð¸ Ð¿Ð¾ Ð²ÑÐµÐ¼Ñ Ð¼Ð¸ÑÑ."
>+other = "IBM, AIX, OS/2, PowerPC, PS/2, S/390 Ð¸ ThinkPad ÑÐ²Ð»ÑÑÑÑÑ ÑÐ¾Ð²Ð°ÑÐ½ÑÐ¼Ð¸ Ð·Ð½Ð°ÐºÐ°Ð¼Ð¸ International Business Machines Corporation Ð² Ð¡Ð¾ÐµÐ´Ð¸Ð½ÑÐ½Ð½ÑÑ Ð¨ÑÐ°ÑÐ°Ñ, Ð´ÑÑÐ³Ð¸Ñ ÑÑÑÐ°Ð½Ð°Ñ, Ð¸Ð»Ð¸ Ð¿Ð¾ Ð²ÑÐµÐ¼Ñ Ð¼Ð¸ÑÑ."
> 
> [ieee]
>-other = "IEEE, POSIX Ð¸ 802 ÑÑÐ¾ Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐµ ÑÐ¾ÑÐ³Ð¾Ð²ÑÐµ Ð¼Ð°ÑÐºÐ¸ Institute of Electrical and Electronics Engineers, Inc. Ð² Ð¡Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð½ÑÑ Ð¨ÑÐ°ÑÐ°Ñ."
>+other = "IEEE, POSIX Ð¸ 802 ÑÐ²Ð»ÑÑÑÑÑ Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐ¼Ð¸ ÑÐ¾Ð²Ð°ÑÐ½ÑÐ¼Ð¸ Ð·Ð½Ð°ÐºÐ°Ð¼Ð¸ Institute of Electrical and Electronics Engineers, Inc. Ð² Ð¡Ð¾ÐµÐ´Ð¸Ð½ÑÐ½Ð½ÑÑ Ð¨ÑÐ°ÑÐ°Ñ."
> 
> [redhat]
> other = "Red Hat Ð¸ RPM ÑÑÐ¾ ÑÐ¾ÑÐ³Ð¾Ð²ÑÐµ Ð¼Ð°ÑÐºÐ¸ Ð¸Ð»Ð¸ Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐµ ÑÐ¾ÑÐ³Ð¾Ð²ÑÐµ Ð¼Ð°ÑÐºÐ¸ Red Hat, Inc. Ð² Ð¡Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð½ÑÑ Ð¨ÑÐ°ÑÐ°Ñ Ð¸ Ð´ÑÑÐ³Ð¸Ñ ÑÑÑÐ°Ð½Ð°Ñ."
>@@ -230,19 +236,19 @@ other = "Adobe, Acrobat, Acrobat Reader Ð¸ PostScript ÑÑÐ¾ Ð¸Ð»Ð¸ Ð·Ð°ÑÐµÐ³Ð¸
> 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."
>+other = "Git Ð¸ Ð»Ð¾Ð³Ð¾ÑÐ¸Ð¿ Git ÑÐ²Ð»ÑÑÑÑÑ Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐ¼Ð¸ ÑÐ¾ÑÐ³Ð¾Ð²ÑÐ¼Ð¸ Ð·Ð½Ð°ÐºÐ°Ð¼Ð¸ Ð¸Ð»Ð¸ ÑÐ¾ÑÐ³Ð¾Ð²ÑÐ¼Ð¸ Ð·Ð½Ð°ÐºÐ°Ð¼Ð¸ Software Freedom Conservancy, Inc., ÑÐ²Ð»ÑÑÑÐ¸Ð¼ÑÑ ÐºÐ¾ÑÐ¿Ð¾ÑÐ°ÑÐ¸Ð²Ð½ÑÐ¼ Ð¼ÐµÑÑÐ¾Ð½Ð°ÑÐ¾Ð¶Ð´ÐµÐ½Ð¸ÐµÐ¼ Git Project, Ð² Ð¡Ð¾ÐµÐ´Ð¸Ð½ÑÐ½Ð½ÑÑ Ð¨ÑÐ°ÑÐ°Ñ Ð¸/Ð¸Ð»Ð¸ Ð´ÑÑÐ³Ð¸Ñ ÑÑÑÐ°Ð½Ð°Ñ."
> 
> [github]
>-other = "GitHub is a trademark of GitHub Inc., registered in the United States and other countries."
>+other = "GitHub ÑÐ²Ð»ÑÐµÑÑÑ ÑÐ¾ÑÐ³Ð¾Ð²ÑÐ¼ Ð·Ð½Ð°ÐºÐ¾Ð¼ GitHub Inc., Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐ¼ Ð² Ð¡Ð¾ÐµÐ´Ð¸Ð½ÑÐ½Ð½ÑÑ Ð¨ÑÐ°ÑÐ°Ñ Ð¸ Ð´ÑÑÐ³Ð¸Ñ ÑÑÑÐ°Ð½Ð°Ñ."
> 
> [gitlab]
>-other = "GITLAB is a trademark of GitLab Inc. in the United States and other countries and regions."
>+other = "GITLAB ÑÐ²Ð»ÑÐµÑÑÑ ÑÐ¾ÑÐ³Ð¾Ð²ÑÐ¼ Ð·Ð½Ð°ÐºÐ¾Ð¼ GitLab Inc. Ð² Ð¡Ð¾ÐµÐ´Ð¸Ð½ÑÐ½Ð½ÑÑ Ð¨ÑÐ°ÑÐ°Ñ Ð¸ Ð´ÑÑÐ³Ð¸Ñ ÑÑÑÐ°Ð½Ð°Ñ Ð¸ ÑÐµÐ³Ð¸Ð¾Ð½Ð°Ñ."
> 
> [intel]
> other = "Intel, Celeron, EtherExpress, i386, i486, Itanium, Pentium Ð¸ Xeon ÑÑÐ¾ ÑÐ¾ÑÐ³Ð¾Ð²ÑÐµ Ð¼Ð°ÑÐºÐ¸ Ð¸Ð»Ð¸ Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐµ ÑÐ¾ÑÐ³Ð¾Ð²ÑÐµ Ð¼Ð°ÑÐºÐ¸ Intel Corporation Ð¸Ð»Ð¸ ÐµÐµ Ð´Ð¾ÑÐµÑÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð¿Ð°Ð½Ð¸Ð¹ Ð² Ð¡Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð½ÑÑ Ð¨ÑÐ°ÑÐ°Ñ Ð¸ Ð´ÑÑÐ³Ð¸Ñ ÑÑÑÐ°Ð½Ð°Ñ."
> 
> [linux]
>-other = "Linux ÑÑÐ¾ Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½Ð°Ñ ÑÐ¾ÑÐ³Ð¾Ð²Ð°Ñ Ð¼Ð°ÑÐºÐ° Linus Torvalds."
>+other = "Linux ÑÐ²Ð»ÑÐµÑÑÑ ÑÐ¾ÑÐ³Ð¾Ð²ÑÐ¼ Ð·Ð½Ð°ÐºÐ¾Ð¼ Linus Torvalds."
> 
> [microsoft]
> other = "Microsoft, FrontPage, IntelliMouse, MS-DOS, Outlook, Windows, Windows Media Ð¸ Windows NT ÑÑÐ¾ Ð¸Ð»Ð¸ Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐµ ÑÐ¾ÑÐ³Ð¾Ð²ÑÐµ Ð¼Ð°ÑÐºÐ¸ Ð¸Ð»Ð¸ ÑÐ¾ÑÐ³Ð¾Ð²ÑÐµ Ð¼Ð°ÑÐºÐ¸ Microsoft Corporation Ð² Ð¡Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð½ÑÑ Ð¨ÑÐ°ÑÐ°Ñ Ð¸/Ð¸Ð»Ð¸ Ð´ÑÑÐ³Ð¸Ñ ÑÑÑÐ°Ð½Ð°Ñ."
>@@ -281,7 +287,7 @@ other = "ARM ÑÑÐ¾ Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½Ð°Ñ ÑÐ¾ÑÐ³Ð¾Ð²Ð°Ñ Ð¼Ð°Ñ
> other = "Adaptec ÑÑÐ¾ Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½Ð°Ñ ÑÐ¾ÑÐ³Ð¾Ð²Ð°Ñ Ð¼Ð°ÑÐºÐ° Adaptec, Inc."
> 
> [google]
>-other = "Android is a trademark of Google Inc."
>+other = "Android ÑÐ²Ð»ÑÐµÑÑÑ ÑÐ¾Ð²Ð°ÑÐ½ÑÐ¼ Ð·Ð½Ð°ÐºÐ¾Ð¼ Google Inc."
> 
> [heidelberger]
> other = "Heidelberg, Helvetica, Palatino Ð¸ Times Roman ÑÑÐ¾ Ð¸Ð»Ð¸ Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐµ ÑÐ¾ÑÐ³Ð¾Ð²ÑÐµ Ð¼Ð°ÑÐºÐ¸ Ð¸Ð»Ð¸ ÑÐ¾ÑÐ³Ð¾Ð²ÑÐµ Ð¼Ð°ÑÐºÐ¸ Heidelberger Druckmaschinen AG Ð² Ð¡Ð¨Ð Ð¸ Ð´ÑÑÐ³Ð¸Ñ ÑÑÑÐ°Ð½Ð°Ñ."
>@@ -290,28 +296,28 @@ other = "Heidelberg, Helvetica, Palatino Ð¸ Times Roman ÑÑÐ¾ Ð¸Ð»Ð¸ Ð·Ð°ÑÐµÐ³
> other = "Intuit Ð¸ Quicken ÑÑÐ¾ Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐµ ÑÐ¾ÑÐ³Ð¾Ð²ÑÐµ Ð¼Ð°ÑÐºÐ¸ Ð¸/Ð¸Ð»Ð¸ Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐµ ÑÐµÑÐ²Ð¸Ñ Ð¼Ð°ÑÐºÐ¸ Intuit Inc., Ð¸Ð»Ð¸ Ð¾Ð´Ð½Ð¾Ð¹ Ð¸Ð· ÐµÐµ Ð´Ð¾ÑÐµÑÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð¿Ð°Ð½Ð¸Ð¹ Ð² Ð¡Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð½ÑÑ Ð¨ÑÐ°ÑÐ°Ñ Ð¸ Ð´ÑÑÐ³Ð¸Ñ ÑÑÑÐ°Ð½Ð°Ñ."
> 
> [lsilogic]
>-other = "LSI Logic, AcceleRAID, eXtremeRAID, MegaRAID Ð¸ Mylex ÑÑÐ¾ ÑÐ¾ÑÐ³Ð¾Ð²ÑÐµ Ð¼Ð°ÑÐºÐ¸ Ð¸Ð»Ð¸ Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐµ ÑÐ¾ÑÐ³Ð¾Ð²ÑÐµ Ð¼Ð°ÑÐºÐ¸ LSI Logic Corp."
>+other = "LSI Logic, AcceleRAID, eXtremeRAID, MegaRAID Ð¸ Mylex ÑÐ²Ð»ÑÐµÑÑÑ ÑÐ¾Ð²Ð°ÑÐ½ÑÐ¼Ð¸ Ð·Ð½Ð°ÐºÐ°Ð¼Ð¸ Ð¸Ð»Ð¸ Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐµ ÑÐ¾ÑÐ³Ð¾Ð²ÑÐ¼Ð¸ Ð¼Ð°ÑÐºÐ°Ð¼Ð¸ LSI Logic Corp."
> 
> [themathworks]
>-other = "MATLAB ÑÑÐ¾ Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½Ð°Ñ ÑÐ¾ÑÐ³Ð¾Ð²Ð°Ñ Ð¼Ð°ÑÐºÐ¸ MathWorks, Inc."
>+other = "MATLAB ÑÐ²Ð»ÑÐµÑÑÑ ÑÐ¾Ð²Ð°ÑÐ½ÑÐ¼ Ð·Ð½Ð°ÐºÐ¾Ð¼ MathWorks, Inc."
> 
> [thomson]
>-other = "SpeedTouch ÑÑÐ¾ ÑÐ¾ÑÐ³Ð¾Ð²Ð°Ñ Ð¼Ð°ÑÐºÐ° Thomson."
>+other = "SpeedTouch ÑÐ²Ð»ÑÐµÑÑÑ ÑÐ¾Ð²Ð°ÑÐ½ÑÐ¼ Ð·Ð½Ð°ÐºÐ¾Ð¼ Thomson."
> 
> [vmware]
>-other = "VMware ÑÑÐ¾ ÑÐ¾ÑÐ³Ð¾Ð²Ð°Ñ Ð¼Ð°ÑÐºÐ° VMware, Inc."
>+other = "VMware ÑÐ²Ð»ÑÐµÑÑÑ ÑÐ¾Ð²Ð°ÑÐ½ÑÐ¼ Ð·Ð½Ð°ÐºÐ¾Ð¼ VMware, Inc."
> 
> [wolframresearch]
>-other = "Mathematica ÑÑÐ¾ Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½Ð°Ñ ÑÐ¾ÑÐ³Ð¾Ð²Ð°Ñ Ð¼Ð°ÑÐºÐ¸ Wolfram Research, Inc."
>+other = "Mathematica ÑÐ²Ð»ÑÐµÑÑÑ ÑÐ¾Ð²Ð°ÑÐ½ÑÐ¼ Ð·Ð½Ð°ÐºÐ¾Ð¼ Wolfram Research, Inc."
> 
> [xiph]
>-other = "Ogg Vorbis Ð¸ Xiph.Org ÑÑÐ¾ ÑÐ¾ÑÐ³Ð¾Ð²ÑÐµ Ð¼Ð°ÑÐºÐ¸ Xiph.Org."
>+other = "Ogg Vorbis Ð¸ Xiph.Org ÑÐ²Ð»ÑÑÑÑÑ ÑÐ¾Ð²Ð°ÑÐ½ÑÐ¼Ð¸ Ð·Ð½Ð°ÐºÐ°Ð¼Ð¸ Xiph.Org."
> 
> [xfree86]
>-other = "XFree86 ÑÑÐ¾ ÑÐ¾ÑÐ³Ð¾Ð²Ð°Ñ Ð¼Ð°ÑÐºÐ° XFree86 Project, Inc."
>+other = "XFree86 ÑÐ²Ð»ÑÐµÑÑÑ ÑÐ¾Ð²Ð°ÑÐ½ÑÐ¼ Ð·Ð½Ð°ÐºÐ¾Ð¼ XFree86 Project, Inc."
> 
> [daemon-news]
>-other = "This article was originally published in the January 2000 issue of <a class=\"link\" href=\"http://www.daemonnews.org/\">DaemonNews</a>. This version of the article may include updates from Matt and other authors to reflect changes in FreeBSD's VM implementation."
>+other = "ÐÑÐ° ÑÑÐ°ÑÑÑ Ð±ÑÐ»Ð° Ð²Ð¿ÐµÑÐ²ÑÐµ Ð¾Ð¿ÑÐ±Ð»Ð¸ÐºÐ¾Ð²Ð°Ð½Ð° Ð² ÑÐ½Ð²Ð°ÑÑÐºÐ¾Ð¼ Ð½Ð¾Ð¼ÐµÑÐµ 2000 Ð³Ð¾Ð´Ð° Ð¸Ð·Ð´Ð°Ð½Ð¸Ñ <a class=\"link\" href=\"http://www.daemonnews.org/\">DaemonNews</a>. ÐÐ°Ð½Ð½Ð°Ñ Ð²ÐµÑÑÐ¸Ñ Ð¿ÑÐ±Ð»Ð¸ÐºÐ°ÑÐ¸Ð¸ Ð¼Ð¾Ð¶ÐµÑ ÑÐ¾Ð´ÐµÑÐ¶Ð°ÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¾Ñ ÐÑÑÑÐ° Ð¸ Ð´ÑÑÐ³Ð¸Ñ Ð°Ð²ÑÐ¾ÑÐ¾Ð², Ð¾ÑÑÐ°Ð¶Ð°ÑÑÐ¸Ðµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² ÑÐµÐ°Ð»Ð¸Ð·Ð°ÑÐ¸Ð¸ VM Ð²Ð¾ FreeBSD."
> 
> [general]
>-other = "ÐÐ½Ð¾Ð³Ð¸Ðµ Ð¸Ð· Ð¾Ð±Ð¾Ð·Ð½Ð°ÑÐµÐ½Ð¸Ð¹, Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÐ¼ÑÐµ Ð¿ÑÐ¾Ð¸Ð·Ð²Ð¾Ð´Ð¸ÑÐµÐ»ÑÐ¼Ð¸ Ð¸ Ð¿ÑÐ¾Ð´Ð°Ð²ÑÐ°Ð¼Ð¸ Ð´Ð»Ñ Ð¾Ð±Ð¾Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ ÑÐ²Ð¾Ð¸Ñ Ð¿ÑÐ¾Ð´ÑÐºÑÐ¾Ð², Ð·Ð°ÑÐ²Ð»ÑÑÑÑÑ Ð² ÐºÐ°ÑÐµÑÑÐ²Ðµ ÑÐ¾ÑÐ³Ð¾Ð²ÑÑ Ð¼Ð°ÑÐ¾Ðº. ÐÐ¾Ð³Ð´Ð° ÑÐ°ÐºÐ¸Ðµ Ð¾Ð±Ð¾Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ Ð¿Ð¾ÑÐ²Ð»ÑÑÑÑÑ Ð² ÑÑÐ¾Ð¼ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐµ, Ð¸ ÐÑÐ¾ÐµÐºÑÑ FreeBSD Ð¸Ð·Ð²ÐµÑÑÐ½Ð¾ Ð¾ ÑÐ¾ÑÐ³Ð¾Ð²Ð¾Ð¹ Ð¼Ð°ÑÐºÐµ, Ðº Ð¾Ð±Ð¾Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÑÐµÑÑÑ Ð·Ð½Ð°Ðº ââ¢â Ð¸Ð»Ð¸ âÂ®â."
>+other = "ÐÐ½Ð¾Ð³Ð¸Ðµ Ð¸Ð· Ð¾Ð±Ð¾Ð·Ð½Ð°ÑÐµÐ½Ð¸Ð¹, Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÐ¼ÑÐµ Ð¿ÑÐ¾Ð¸Ð·Ð²Ð¾Ð´Ð¸ÑÐµÐ»ÑÐ¼Ð¸ Ð¸ Ð¿ÑÐ¾Ð´Ð°Ð²ÑÐ°Ð¼Ð¸ Ð´Ð»Ñ Ð¾Ð±Ð¾Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ ÑÐ²Ð¾Ð¸Ñ Ð¿ÑÐ¾Ð´ÑÐºÑÐ¾Ð², Ð·Ð°ÑÐ²Ð»ÑÑÑÑÑ Ð² ÐºÐ°ÑÐµÑÑÐ²Ðµ ÑÐ¾Ð²Ð°ÑÐ½ÑÑ Ð·Ð½Ð°ÐºÐ¾Ð². ÐÐ¾Ð³Ð´Ð° ÑÐ°ÐºÐ¸Ðµ Ð¾Ð±Ð¾Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ Ð¿Ð¾ÑÐ²Ð»ÑÑÑÑÑ Ð² ÑÑÐ¾Ð¼ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐµ, Ð¸ ÐÑÐ¾ÐµÐºÑÑ FreeBSD Ð¸Ð·Ð²ÐµÑÑÐ½Ð¾ Ð¾ ÑÐ¾Ð²Ð°ÑÐ½Ð¾Ð¼ Ð·Ð½Ð°ÐºÐµ, Ðº Ð¾Ð±Ð¾Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÑÐµÑÑÑ Ð·Ð½Ð°Ðº ââ¢â Ð¸Ð»Ð¸ âÂ®â."

Actions: View | Diff

Attachments on bug 273459: 244489