Update entities on git migration (including translations, as far as possible)

2 files changed, 26 insertions, 16 deletions

diff --git a/po/ru/administrivia.po b/po/ru/administrivia.po
index 2b20c95d1..a51671c4f 100644
--- a/po/ru/administrivia.po
+++ b/po/ru/administrivia.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: administrivia\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-29 05:56+0000\n"
+"POT-Creation-Date: 2018-06-03 06:59+0000\n"
 "PO-Revision-Date: 2010-10-24 13:29+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -124,26 +124,36 @@ msgstr ""
 
 #. Tag: para
 #: administrivia.xml:68
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Better yet, get a copy of the DocBook source for this document, and "
+#| "produce patches against it. The DocBook source can be found at the <ulink "
+#| "url=\"&url-d-i-websvn;\">debian-installer WebSVN</ulink>. If you're not "
+#| "familiar with DocBook, don't worry: there is a simple cheatsheet in the "
+#| "manuals directory that will get you started. It's like html, but oriented "
+#| "towards the meaning of the text rather than the presentation. Patches "
+#| "submitted to the debian-boot mailing list (see below) are welcomed. For "
+#| "instructions on how to check out the sources via SVN, see <ulink url="
+#| "\"&url-d-i-readme;\">README</ulink> from the source root directory."
 msgid ""
 "Better yet, get a copy of the DocBook source for this document, and produce "
 "patches against it. The DocBook source can be found at the <ulink url=\"&url-"
-"d-i-websvn;\">debian-installer WebSVN</ulink>. If you're not familiar with "
-"DocBook, don't worry: there is a simple cheatsheet in the manuals directory "
-"that will get you started. It's like html, but oriented towards the meaning "
-"of the text rather than the presentation. Patches submitted to the debian-"
-"boot mailing list (see below) are welcomed. For instructions on how to check "
-"out the sources via SVN, see <ulink url=\"&url-d-i-readme;\">README</ulink> "
-"from the source root directory."
+"d-i-project-salsa;\">installation-guide project on salsa</ulink>. If you're "
+"not familiar with DocBook, don't worry: there is a simple cheatsheet in the "
+"manuals directory that will get you started. It's like html, but oriented "
+"towards the meaning of the text rather than the presentation. Patches "
+"submitted to the debian-boot mailing list (see below) are welcomed. For "
+"instructions on how to check out the sources via git, see <ulink url=\"&url-"
+"manual-readme;\">README</ulink> from the source root directory."
 msgstr ""
 "Ещё лучше взять копию исходных текстов этого документа в формате DocBook XML "
 "и сделать заплатку к ним. Исходные тексты можно найти в <ulink url=\"&url-d-"
-"i-websvn;\">SVN-репозитории программы установки</ulink>. Если вы не сильны в "
+"i-project-salsa;\">installation-guide project on salsa</ulink>. Если вы не сильны в "
 "DocBook, не беспокойтесь: в каталоге с руководствами есть простая шпаргалка, "
 "которая поможет вам приступить к работе. DocBook похож на HTML, но "
 "ориентирован на содержание текста, а не на его внешний вид. Заплаткам в "
 "списке рассылки debian-boot (смотрите ниже) всегда рады. О том, как получить "
-"исходные тексты через SVN, можно прочитать в файле <ulink url=\"&url-d-i-"
+"исходные тексты через SVN, можно прочитать в файле <ulink url=\"&url-manual-"
 "readme;\">README</ulink>, который находится в корне каталога с исходными "
 "текстами."
 
diff --git a/po/ru/preseed.po b/po/ru/preseed.po
index ee7628a7a..94517989f 100644
--- a/po/ru/preseed.po
+++ b/po/ru/preseed.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preseed\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2017-04-17 21:48+0000\n"
+"POT-Creation-Date: 2018-06-03 06:59+0000\n"
 "PO-Revision-Date: 2015-03-14 08:24+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -145,8 +145,8 @@ msgstr "CD/DVD"
 
 #. Tag: entry
 #: preseed.xml:77 preseed.xml:78 preseed.xml:79 preseed.xml:89 preseed.xml:91
-#: preseed.xml:94 preseed.xml:95 preseed.xml:99 preseed.xml:100
-#: preseed.xml:104 preseed.xml:106 preseed.xml:109 preseed.xml:111
+#: preseed.xml:94 preseed.xml:95 preseed.xml:99 preseed.xml:100 preseed.xml:104
+#: preseed.xml:106 preseed.xml:109 preseed.xml:111
 #, no-c-format
 msgid "<entry>yes</entry>"
 msgstr "<entry>да</entry>"
@@ -2170,7 +2170,7 @@ msgid ""
 "detailed information see the files <filename>partman-auto-recipe.txt</"
 "filename> and <filename>partman-auto-raid-recipe.txt</filename> included in "
 "the <classname>debian-installer</classname> package. Both files are also "
-"available from the <ulink url=\"&url-d-i-gitweb-doc-devel;\">&d-i; source "
+"available from the <ulink url=\"&url-d-i-doc-devel;\">&d-i; source "
 "repository</ulink>. Note that the supported functionality may change between "
 "releases."
 msgstr ""
@@ -2178,7 +2178,7 @@ msgstr ""
 "наборов. Подробности смотрите в файлах <filename>partman-auto-recipe.txt</"
 "filename> и <filename>partman-auto-raid-recipe.txt</filename> из пакета "
 "<classname>debian-installer</classname>. Также эти файлы доступны в <ulink "
-"url=\"&url-d-i-gitweb-doc-devel;\">репозитории &d-i;</ulink>. Заметим, что "
+"url=\"&url-d-i-doc-devel;\">репозитории &d-i;</ulink>. Заметим, что "
 "список поддерживаемых возможностей может поменяться между выпусками."
 
 #. Tag: para