From f88871f59d8f7e6c8266c31ed4e1cb91ef48e0d0 Mon Sep 17 00:00:00 2001 From: Warren Block Date: Thu, 31 Aug 2017 02:36:49 +0000 Subject: [PATCH] Add its:translate="no" properties to elements containing $FreeBSD$ version strings. This will prevent them from showing up in PO translations and causing difficulties. It has the unfortunate side effect that the entire element contents do not appear in PO files. Most of these are elements are , which are probably not translated often yet. At least one is a , which might be more of a problem. At this point, this is a workaround to make it possible for PO translators to continue work without the ever- changing version strings creating conflicts. --- en_US.ISO8859-1/books/handbook/book.xml | 5 ++--- en_US.ISO8859-1/books/handbook/config/chapter.xml | 8 ++++---- en_US.ISO8859-1/books/handbook/disks/chapter.xml | 2 +- en_US.ISO8859-1/books/handbook/mail/chapter.xml | 4 ++-- .../books/handbook/network-servers/chapter.xml | 2 +- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/en_US.ISO8859-1/books/handbook/book.xml b/en_US.ISO8859-1/books/handbook/book.xml index d1c6f8a535..045e4cb9fa 100644 --- a/en_US.ISO8859-1/books/handbook/book.xml +++ b/en_US.ISO8859-1/books/handbook/book.xml @@ -37,10 +37,9 @@ The FreeBSD Documentation Project - - + $FreeBSD$ - $FreeBSD$ + $FreeBSD$ 1995 diff --git a/en_US.ISO8859-1/books/handbook/config/chapter.xml b/en_US.ISO8859-1/books/handbook/config/chapter.xml index b1ccab0e80..16003846ac 100644 --- a/en_US.ISO8859-1/books/handbook/config/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/config/chapter.xml @@ -262,7 +262,7 @@ run_rc_command "$1" Here is a sample entry from the system crontab, /etc/crontab: - # /etc/crontab - root's crontab for FreeBSD + # /etc/crontab - root's crontab for FreeBSD # # $FreeBSD$ # @@ -1315,7 +1315,7 @@ ifconfig_fxp0_alias7="inet 202.0.75.20 netmask 255.255.255.255" remote log host. As an example, here is the default syslog.conf from &os;: - # $&os;$ + # $&os;$ # # Spaces ARE valid field separators in this file. However, # other *nix-like systems still insist on using tabs as field @@ -1450,7 +1450,7 @@ cron.* /var/log/cron and programs to signal when the log is rotated. Here is the default configuration in &os;: - # configuration file for newsyslog + # configuration file for newsyslog # $FreeBSD$ # # Entries which do not specify the '/pid_file' field will cause the @@ -1926,7 +1926,7 @@ nameserver 147.11.100.30 external DNS servers for commonly accessed names. - # $&os;$ + # $&os;$ # # # Host Database diff --git a/en_US.ISO8859-1/books/handbook/disks/chapter.xml b/en_US.ISO8859-1/books/handbook/disks/chapter.xml index 77518753b9..314b15484a 100644 --- a/en_US.ISO8859-1/books/handbook/disks/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/disks/chapter.xml @@ -2706,7 +2706,7 @@ Quotas for user test: UFS file system, set the sector_size to 2048: - &prompt.root; gbde init /dev/ad4s1c -i -L /etc/gbde/ad4s1c.lock + &prompt.root; gbde init /dev/ad4s1c -i -L /etc/gbde/ad4s1c.lock # $FreeBSD: src/sbin/gbde/template.txt,v 1.1.36.1 2009/08/03 08:13:06 kensmith Exp $ # # Sector size is the smallest unit of data which can be read or written. diff --git a/en_US.ISO8859-1/books/handbook/mail/chapter.xml b/en_US.ISO8859-1/books/handbook/mail/chapter.xml index d50642cf29..b3688fde06 100644 --- a/en_US.ISO8859-1/books/handbook/mail/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/mail/chapter.xml @@ -364,7 +364,7 @@ FreeBSD.org mail is handled by 10 mx1.FreeBSD.org addresses can be found in the &os; sample configuration, /etc/mail/access.sample: - # $FreeBSD$ + # $FreeBSD$ # # Mail relay access control list. Default is to reject mail unless the # destination is local, or listed in /etc/mail/local-host-names @@ -705,7 +705,7 @@ daily_submit_queuerun="NO" The default /etc/mail/mailer.conf looks like this: - $FreeBSD$ + $FreeBSD$ # # Execute the "real" sendmail program, named /usr/libexec/sendmail/sendmail # diff --git a/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml b/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml index f0be54e2a6..d7905272aa 100644 --- a/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml @@ -3335,7 +3335,7 @@ freebsd.org. (A) <filename>/etc/namedb/named.conf</filename> - // $FreeBSD$ + // $FreeBSD$ // // Refer to the named.conf(5) and named(8) man pages, and the documentation // in /usr/share/doc/bind9 for more details.