Commit f0bc9622 authored by KatolaZ's avatar KatolaZ

merge 0.145 into unstable

parents 899cfd8c 505de31a
apt-setup (1:0.145) unstable; urgency=medium
* Team upload
[ Holger Wansing ]
* Remove trailing whitespaces from changelog file, to fix lintian tag.
[ Updated translations ]
* Persian (fa.po) by Nima Sahraneshin
* Finnish (fi.po) by Juhani Numminen
-- Holger Wansing <hwansing@mailbox.org> Thu, 10 Jan 2019 23:20:27 +0100
apt-setup (1:0.144+devuan1) unstable; urgency=medium
* merged 0.144 into unstable
......@@ -23,9 +35,9 @@ apt-setup (1:0.143) unstable; urgency=medium
* Finnish (fi.po) by Juhani Numminen
* French (fr.po) by Alban Vidal
* Galician (gl.po) by mantinan
* Hindi (hi.po) by Himanshu Awasthi
* Hindi (hi.po) by Himanshu Awasthi
[ Holger Wansing ]
[ Holger Wansing ]
* Change deprecated Priority: extra into optional.
-- Holger Wansing <hwansing@mailbox.org> Thu, 27 Sep 2018 17:36:02 +0200
......@@ -730,7 +742,7 @@ apt-setup (1:0.69) unstable; urgency=low
apt-setup (1:0.68) unstable; urgency=low
* Team upload
[ Updated translations ]
* Malayalam (ml.po) by Praveen
......@@ -1060,7 +1072,7 @@ apt-setup (1:0.49) unstable; urgency=low
* Bengali (bn.po) by Israt Jahan
* Catalan (ca.po) by Jordi Mallach
* Icelandic (is.po) by Sveinn í Felli
-- Otavio Salvador <otavio@debian.org> Fri, 12 Nov 2010 09:39:59 -0200
apt-setup (1:0.48) unstable; urgency=low
......@@ -1102,7 +1114,7 @@ apt-setup (1:0.47) unstable; urgency=low
* Panjabi (pa.po) by A S Alam
* Portuguese (Brazil) (pt_BR.po) by Felipe Augusto van de Wiel (faw)
* Telugu (te.po) by Arjuna Rao Chavala
-- Otavio Salvador <otavio@debian.org> Mon, 20 Sep 2010 01:06:01 -0300
apt-setup (1:0.46) unstable; urgency=low
......@@ -1248,7 +1260,7 @@ apt-setup (1:0.42) unstable; urgency=low
* Slovak (sk.po) by Ivan Masár
* Turkish (tr.po) by Mert Dirik
* Simplified Chinese (zh_CN.po) by Deng Xiyue
-- Otavio Salvador <otavio@ossystems.com.br> Tue, 21 Jul 2009 12:13:34 -0300
apt-setup (1:0.41) unstable; urgency=low
......
......@@ -23,11 +23,11 @@ msgid ""
msgstr ""
"Project-Id-Version: fa\n"
"Report-Msgid-Bugs-To: apt-setup@packages.devuan.org\n"
"POT-Creation-Date: 2016-04-25 13:35+1200\n"
"PO-Revision-Date: 2012-09-18 10:30+0330\n"
"Last-Translator: Hamid <hamid.r1988@gmail.com>\n"
"Language-Team: Devuan-l10n-persian <debian-l10n-persian@lists.debian.org>\n"
"Language: \n"
"POT-Creation-Date: 2017-10-23 22:02+0000\n"
"PO-Revision-Date: 2019-01-01 17:49+0000\n"
"Last-Translator: nima sahraneshin <unix.nima@gmail.com>\n"
"Language-Team: Debian-l10n-persian <debian-l10n-persian@lists.debian.org>\n"
"Language: fa\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
......@@ -189,13 +189,7 @@ msgstr "به‌روزرسانی‌های انتشار"
#. Translators: the *entire* string should be under 55 columns
#. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
#. :sl1:
<<<<<<< HEAD
#: ../apt-setup-udeb.templates:11001
=======
#: ../apt-setup-udeb.templates:10001
#, fuzzy
#| msgid "Use backported software?"
>>>>>>> suites/ascii
msgid "backported software"
msgstr "نرم‌افزار انتقال داده‌شده به نسخه قبل"
......@@ -250,17 +244,7 @@ msgstr ""
#. Type: multiselect
#. Description
#. :sl1:
<<<<<<< HEAD
#: ../apt-setup-udeb.templates:11002
=======
#: ../apt-setup-udeb.templates:10002
#, fuzzy
#| msgid ""
#| "Some software has been backported from the development tree to work with "
#| "this release. Although this software has not gone through such complete "
#| "testing as that contained in the release, it includes newer versions of "
#| "some applications which may provide useful features."
>>>>>>> suites/ascii
msgid ""
"Backported software are adapted from the development version to work with "
"this release. Although this software has not gone through such complete "
......@@ -300,7 +284,7 @@ msgstr ""
#. :sl1:
#: ../apt-cdrom-setup.templates:1001
msgid "Scanning the CD-ROM..."
msgstr "پویش CD-ROM"
msgstr "پویش CD-ROM..."
#. Type: error
#. Description
......@@ -373,14 +357,14 @@ msgstr ""
#. :sl1:
#: ../apt-cdrom-setup.templates:4001
msgid "The CD or DVD with the following label has been scanned:"
msgstr "سی دی یا دی وی دی با این برچسب معرفی شد: "
msgstr "سی دی یا دی وی دی با این برچسب معرفی شد:"
#. Type: boolean
#. Description
#. :sl1:
#: ../apt-cdrom-setup.templates:5001
msgid "The CD or DVD with the following label has already been scanned:"
msgstr "سی دی یا دی وی دی با این برچسب معرفی شد: "
msgstr "سی دی یا دی وی دی با این برچسب معرفی شد:"
#. Type: boolean
#. Description
......@@ -397,7 +381,7 @@ msgstr ""
msgid ""
"An attempt to configure apt to install additional packages from the CD/DVD "
"failed."
msgstr "تلاش برای پیکربندی apt برای نصب بسته‌های دیگر از CD/DVD شکست خورد"
msgstr "تلاش برای پیکربندی apt برای نصب بسته‌های دیگر از CD/DVD شکست خورد."
#. Type: boolean
#. Description
......
......@@ -27,7 +27,7 @@ msgstr ""
"Project-Id-Version: debian-installer\n"
"Report-Msgid-Bugs-To: apt-setup@packages.devuan.org\n"
"POT-Creation-Date: 2017-10-23 22:02+0000\n"
"PO-Revision-Date: 2018-08-14 21:36+0000\n"
"PO-Revision-Date: 2018-12-19 23:08+0000\n"
"Last-Translator: Juhani Numminen <juhaninumminen0@gmail.com>\n"
"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
"Language: fi\n"
......@@ -194,7 +194,7 @@ msgstr "julkaisupäivitykset"
#. :sl1:
#: ../apt-setup-udeb.templates:11001
msgid "backported software"
msgstr "kehiitysversiosta vakaaseen sovitetut paketit"
msgstr "seuraavasta versiosta nykyiseen tuotu ohjelma"
#. Type: multiselect
#. Description
......@@ -731,7 +731,7 @@ msgstr ""
#. :sl2:
#: ../apt-mirror-setup.templates-ubuntu:2001
msgid "Use software from the \"universe\" component?"
msgstr "Käytä ohjelmia universe-jakelusta."
msgstr "Käytetäänkö ohjelmia universe-jakelusta?"
#. Type: boolean
#. Description
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment