Adapt security license headers to MPL2
authorAlexander Slovesnik <unghost@mozilla-russia.org>
Fri, 01 Jun 2012 00:45:03 +0400
changeset 2264 e63296d260e50342426c30f4478166b09df1fda5
parent 2263 a2198ed9544b544404960794cc13563cf190fb47
child 2265 9434a925ba8ec1435535171639b4eaff73833583
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 22:07:11 +0000
Adapt security license headers to MPL2
security/manager/chrome/pipnss/nsserrors.properties
security/manager/chrome/pipnss/pipnss.properties
security/manager/chrome/pipnss/security.properties
security/manager/chrome/pippki/certManager.dtd
security/manager/chrome/pippki/deviceManager.dtd
security/manager/chrome/pippki/pippki.dtd
security/manager/chrome/pippki/pippki.properties
security/manager/chrome/pippki/validation.dtd
--- a/security/manager/chrome/pipnss/nsserrors.properties
+++ b/security/manager/chrome/pipnss/nsserrors.properties
@@ -1,44 +1,12 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Alexander L. Slovesnik <unghost@mozilla-russia.org> (Russian translation)
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 SSL_ERROR_EXPORT_ONLY_SERVER = Не удалось установить защищённое соединение. Узел не поддерживает шифрование высокой стойкости.
 SSL_ERROR_US_ONLY_SERVER = Не удалось установить защищённое соединение. Узел требует использования неподдерживаемого шифрования высокой стойкости.
 SSL_ERROR_NO_CYPHER_OVERLAP = Установка защищённого соединения с этим узлом не удалась: отсутствуют общие алгоритм(ы) шифрования.
 SSL_ERROR_NO_CERTIFICATE = Не удалось найти сертификат или ключ, необходимый для аутентификации.
 SSL_ERROR_BAD_CERTIFICATE = Не удалось установить защищённое соединение с этим узлом: сертификат другой стороны был отклонён.
 SSL_ERROR_UNUSED_5 = Нераспознанный код ошибки SSL.
 SSL_ERROR_BAD_CLIENT = К серверу со стороны клиента поступили некорректные данные.
 SSL_ERROR_BAD_SERVER = К клиенту со стороны сервера поступили некорректные данные.
@@ -55,17 +23,17 @@ SSL_ERROR_BAD_CERT_ALERT = SSL-узел не может верифицировать ваш сертификат.
 SSL_ERROR_REVOKED_CERT_ALERT = SSL-узел отклонил ваш сертификат, как отозванный.
 SSL_ERROR_EXPIRED_CERT_ALERT = SSL-узел отклонил ваш сертификат, как истёкший.
 SSL_ERROR_SSL_DISABLED = Соединение не удалось: SSL отключён.
 SSL_ERROR_FORTEZZA_PQG = Соединение не удалось: узел SSL находится в другом домене FORTEZZA.
 SSL_ERROR_UNKNOWN_CIPHER_SUITE = Был запрошен неизвестный набор шифров SSL.
 SSL_ERROR_NO_CIPHERS_SUPPORTED = В данной программе не имеется и не включено ни одного набора шифров.
 SSL_ERROR_BAD_BLOCK_PADDING = SSL получило запись с плохим выравниванием блоков.
 SSL_ERROR_RX_RECORD_TOO_LONG = SSL получило запись, длина которой превышает максимально допустимую.
-SSL_ERROR_TX_RECORD_TOO_LONG = SSL попыталось отправить запись, длина которой превышает максимально допустимую. 
+SSL_ERROR_TX_RECORD_TOO_LONG = SSL попыталось отправить запись, длина которой превышает максимально допустимую.
 SSL_ERROR_RX_MALFORMED_HELLO_REQUEST = SSL получило искажённое сообщение рукопожатия «Запрос приветствия».
 SSL_ERROR_RX_MALFORMED_CLIENT_HELLO = SSL получило искажённое сообщение рукопожатия «Приветствие клиента».
 SSL_ERROR_RX_MALFORMED_SERVER_HELLO = SSL получило искажённое сообщение рукопожатия «Приветствие сервера».
 SSL_ERROR_RX_MALFORMED_CERTIFICATE = SSL получило искажённое сообщение рукопожатия «Сертификат».
 SSL_ERROR_RX_MALFORMED_SERVER_KEY_EXCH = SSL получило искажённое сообщение рукопожатия «Обмен ключами сервера».
 SSL_ERROR_RX_MALFORMED_CERT_REQUEST = SSL получило искажённое сообщение рукопожатия «Запрос на сертификат».
 SSL_ERROR_RX_MALFORMED_HELLO_DONE = SSL получило искажённое сообщение рукопожатия «Приветствие сервера завершено».
 SSL_ERROR_RX_MALFORMED_CERT_VERIFY = SSL получило искажённое сообщение рукопожатия «Проверка сертификата».
--- a/security/manager/chrome/pipnss/pipnss.properties
+++ b/security/manager/chrome/pipnss/pipnss.properties
@@ -1,48 +1,12 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Javier Delgadillo <javi@netscape.com>
-#   Brian Ryner <bryner@brianryner.com>
-#   Terry Hayes <thayes@netscape.com>
-#   John Gardiner Myers <jgmyers@speakeasy.net>
-#   Alexander L. Slovesnik <unghost@mozilla-russia.org> (Russian translation)
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 SignedBy = Подписано %S
 CertPassPrompt = Введите мастер-пароль для доступа в %S
 RootCertModuleName = Модуль встроенных корневых серт.
 ManufacturerID = Mozilla.org
 LibraryDescription = Внутрен. крипто PSM
 TokenDescription = Общ. криптослужбы
 PrivateTokenDescription = Модуль защиты
 SlotDescription = Внутренние криптослужбы PSM
@@ -337,17 +301,17 @@ CertInfoStoredIn = Место хранения:
 P12DefaultNickname = Импортированный сертификат
 CrlImportFailure1x = Приложение не может импортировать список отозванных сертификатов (CRL).
 CrlImportFailureExpired = Доступна обновлённая версия этого CRL.
 CrlImportFailureBadSignature = Подпись CRL некорректна.
 CrlImportFailureInvalid = Формат нового CRL некорректен.
 CrlImportFailureOld = Новый CRL старше текущего.
 CrlImportFailureNotYetValid = CRL ещё не действителен. Возможно, следует проверить настройки системных часов.
 CrlImportFailureNetworkProblem = Загрузка CRL не удалась из-за проблем в сети.
-CrlImportFailureReasonUnknown = Ошибка импорта CRL в локальную базу данных. Код ошибки: 
+CrlImportFailureReasonUnknown = Ошибка импорта CRL в локальную базу данных. Код ошибки:\u0020
 CrlImportFailure2 = Обратитесь за помощью к вашему системному администратору.
 NSSInitProblemX = Не удалось инициализировать компонент защиты приложения. Самая вероятная причина — проблемы с файлами в каталоге профилей вашего приложения. Убедитесь, что этот каталог не имеет ограничений чтения/записи и на вашем жестком диске достаточно свободного места. Рекомендуется закрыть программу и решить проблему. Если вы продолжите этот сеанс работы с приложением, вы можете столкнуться с некорректным поведением последнего во время обращения к функциям системы защиты.
 ProfileSwitchSocketsStillActive = Операция не может быть завершена из-за внутренней ошибки. Работа через защищённое соединение была завершена некорректно.
 ProfileSwitchCryptoUIActive = Выполнение операции в данный момент невозможно. Пожалуйста, выполните сначала операцию, требующую вашего внимания в одном из других открытых окон.
 VerifyExpired = <Срок действия истёк>
 VerifyRevoked = <Отозван>
 VerifyNotTrusted = <Ненадежный>
 VerifyIssuerNotTrusted = <Ненадежный центр выдачи>
--- a/security/manager/chrome/pipnss/security.properties
+++ b/security/manager/chrome/pipnss/security.properties
@@ -1,45 +1,12 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Sean Cotter <cotter@netscape.com>
-#   Alexander L. Slovesnik <unghost@mozilla-russia.org> (Russian translation)
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 Title = Предупреждение системы защиты
 MixedContentMessage = Вы собираетесь загрузить зашифрованную страницу, некоторая информация на которой незашифрована. Идентификация прошла успешно, но информация, которую вы видите или вводите на этой странице, может быть легко прочитана третьей стороной.
 LeaveSecureMessage = Вы собираетесь покинуть зашифрованную страницу. Теперь информация, которую вы отправляете или получаете, может быть легко доступна третьей стороне.
 EnterSecureMessage = Вы собираетесь загрузить зашифрованную страницу. Идентификация веб-сайта прошла успешно, и информация, которую вы видите или вводите на этой странице, не может быть легко доступна третьей стороне.
 WeakSecureMessage = Вы собираетесь загрузить страницу, использующую слабое шифрование. Идентификация веб-сайта произведена успешно, но информация, которую вы видите или вводите на этой странице, может быть прочитана третьей стороной.
 PostToInsecureFromSecureMessage = Хотя эта страница и зашифрована, отправленная вами информация будет передана по незашифрованному соединению и может быть легко доступна третьей стороне.##Вы действительно хотите отправить эту информацию?##
 PostToInsecureFromInsecureMessage = Введённая вами информация будет передана по незашифрованному соединению и может быть легко доступна третьей стороне.##Вы действительно хотите отправить эту информацию?##
 MixedContentShowAgain = Предупреждать меня, когда я собираюсь загрузить зашифрованную страницу, некоторая информация на которой незашифрована.
--- a/security/manager/chrome/pippki/certManager.dtd
+++ b/security/manager/chrome/pippki/certManager.dtd
@@ -1,45 +1,12 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org code.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Ian McGreer <mcgreer@netscape.com>
-   -   Alexander L. Slovesnik <unghost@mozilla-russia.org> (Russian translation)
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY certmgr.title "Управление сертификатами">
 <!ENTITY certmgr.tab.mine "Ваши сертификаты">
 <!ENTITY certmgr.tab.others2 "Люди">
 <!ENTITY certmgr.tab.websites3 "Серверы">
 <!ENTITY certmgr.tab.ca "Центры сертификации">
 <!ENTITY certmgr.tab.orphan2 "Другие">
 <!ENTITY certmgr.ca.builtins "Встроенные центры сертификации">
 <!ENTITY certmgr.ca.mycas "Управляемые вами центры">
--- a/security/manager/chrome/pippki/deviceManager.dtd
+++ b/security/manager/chrome/pippki/deviceManager.dtd
@@ -1,45 +1,12 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org code.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Ian McGreer <mcgreer@netscape.com>
-   -   Alexander L. Slovesnik <unghost@mozilla-russia.org> (Russian translation)
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY devmgr.title "Управление устройствами">
 <!ENTITY devmgr.devlist.label "Модули и устройства защиты">
 <!ENTITY devmgr.details.title "Подробности">
 <!ENTITY devmgr.details.title2 "Значение">
 <!ENTITY devmgr.status.label "Состояние">
 <!ENTITY devmgr.version.label "Версия">
 <!ENTITY devmgr.button.changeslotname.label "Сменить имя разъема">
 <!ENTITY devmgr.button.changeslotname.accesskey "з">
--- a/security/manager/chrome/pippki/pippki.dtd
+++ b/security/manager/chrome/pippki/pippki.dtd
@@ -1,45 +1,12 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org code.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Terry Hayes <thayes@netscape.com>
-   -   Alexander L. Slovesnik <unghost@mozilla-russia.org> (Russian translation)
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY setPassword.title "Смена мастер-пароля">
 <!ENTITY setPassword.tokenName.label "Устройство защиты">
 <!ENTITY setPassword.oldPassword.label "Текущий пароль:">
 <!ENTITY setPassword.newPassword.label "Новый пароль:">
 <!ENTITY setPassword.reenterPassword.label "Новый пароль (повторно):">
 <!ENTITY setPassword.meter.label "Качество пароля">
 <!ENTITY setPassword.meter.loading "Загрузка">
 <!ENTITY resetPasswordButtonLabel "Сбросить">
--- a/security/manager/chrome/pippki/pippki.properties
+++ b/security/manager/chrome/pippki/pippki.properties
@@ -1,44 +1,12 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Alexander L. Slovesnik <unghost@mozilla-russia.org> (Russian translation)
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 SignedBy = Подписано %S
 CertPassPrompt = Введите личный пароль для устройства защиты PSM Private Keys.
 newCAMessage1 = Вы хотите доверять «%S» для следующих назначений?
 unnamedCA = Центр сертификации (безымянный)
 editTrustWindowTitle = Изменение степени доверия сертификатам
 editTrustCA = Сертификат «%S» представляет центр сертификации.
 editTrustSSL = Сертификат «%S» был выдан:
 editTrustEmail = Сертификат «%S» был выдан:
--- a/security/manager/chrome/pippki/validation.dtd
+++ b/security/manager/chrome/pippki/validation.dtd
@@ -1,45 +1,12 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org code.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   David P. Drinan (ddrinan@netscape.com)
-   -   Alexander L. Slovesnik <unghost@mozilla-russia.org> (Russian translation)
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY validation.crlmanager.label "Управление CRL">
 <!ENTITY validation.crlmanager.description "В вашей базе данных сертификатов хранятся следующие списки отозванных сертификатов (CRL):">
 <!ENTITY validation.crlname.label "Имя">
 <!ENTITY validation.crllastupdate.label "Последнее обновление">
 <!ENTITY validation.crlnextupdate.label "Следующее обновление">
 <!ENTITY validation.crlautoupdateenabled.label "Автообновление">
 <!ENTITY validation.crlautoupdatestatus.label "Статус автообновления">
 <!ENTITY validation.deletecrl.label "Удалить">