diff --git a/debian/changelog b/debian/changelog index 157559a..dfc8a3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +partman-auto (158) unstable; urgency=medium + + * Team upload + + [ Updated translations ] + * Esperanto (eo.po) by Felipe Castro + * Ukrainian (uk.po) by Taras Panchenko + * Simplified Chinese (zh_CN.po) by Wenbin Lv + + [ Samuel Thibault ] + * Make gbp produce the right tag format. + + -- Holger Wansing Sat, 28 May 2022 16:58:32 +0200 + partman-auto (157kali2) kali-dev; urgency=medium [ Sophie Brun ] @@ -16,6 +30,16 @@ bug: 929322) -- Sophie Brun Thu, 15 Apr 2021 10:40:57 +0200 + +partman-auto (157) unstable; urgency=medium + + [ John Paul Adrian Glaubitz ] + * Switch NewWorld PowerMac recipes to use a GRUB boot partition + + [ Updated translations ] + * Finnish (fi.po) by Kimmo Kujansuu + + -- Cyril Brulebois Sat, 24 Jul 2021 05:48:12 +0200 partman-auto (156) unstable; urgency=medium diff --git a/debian/po/eo.po b/debian/po/eo.po index 3eb5ad3..2012be7 100644 --- a/debian/po/eo.po +++ b/debian/po/eo.po @@ -9,26 +9,28 @@ # # Samuel Gimeno , 2005. # Serge Leblanc , 2005, 2006, 2007. -# Felipe Castro , 2008, 2009, 2010, 2011, 2012, 2013. +# Felipe Castro , 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2017, 2018, 2020, 2022. # # Translations from iso-codes: # Alastair McKInstry , 2001,2002. # Copyright (C) 2001,2002,2003,2004 Free Software Foundation, Inc. # D. Dale Gulledge (translations from drakfw), 2001. # Edmund GRIMLEY EVANS , 2004-2011 +# phlostically , 2021. # msgid "" msgstr "" "Project-Id-Version: debian-installer\n" "Report-Msgid-Bugs-To: partman-auto@packages.debian.org\n" "POT-Creation-Date: 2020-03-10 20:01+0000\n" -"PO-Revision-Date: 2013-10-02 09:37-0300\n" +"PO-Revision-Date: 2022-05-20 17:14+0000\n" "Last-Translator: Felipe Castro \n" "Language-Team: Esperanto \n" "Language: eo\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" #. Type: text #. Description @@ -97,7 +99,7 @@ "results." msgstr "" "La instalilo povas helpi vin pri diskpartigado (per pluraj normaj skemoj), " -"aŭ vi povas memsole diskpartigi. Eĉ per gvidita diskpartigado eblos al vi " +"aŭ vi povas memsole diskpartigi. Eĉ per gvidita diskpartigado eblos al vi " "revizii kaj personigi la rezultojn poste." #. Type: select diff --git a/debian/po/fi.po b/debian/po/fi.po index efef9e8..a860497 100644 --- a/debian/po/fi.po +++ b/debian/po/fi.po @@ -13,8 +13,9 @@ # Tapio Lehtonen , 2004 - 2006. # Esko Arajärvi , 2007 - 2008, 2009, 2010. # Timo Jyrinki , 2012. -# Juhani Numminen , 2018. +# Juhani Numminen , 2018, 2019. # Arto Keiski , 2018. +# Kimmo Kujansuu , 2021. # # Translations from iso-codes: # Copyright (C) 2007 Tobias Toedter . @@ -27,8 +28,8 @@ "Project-Id-Version: debian-installer\n" "Report-Msgid-Bugs-To: partman-auto@packages.debian.org\n" "POT-Creation-Date: 2020-03-10 20:01+0000\n" -"PO-Revision-Date: 2018-12-19 23:08+0000\n" -"Last-Translator: Juhani Numminen \n" +"PO-Revision-Date: 2021-07-12 20:33+0000\n" +"Last-Translator: Kimmo Kujansuu \n" "Language-Team: Finnish \n" "Language: fi\n" "MIME-Version: 1.0\n" @@ -126,7 +127,7 @@ #. :sl1: #: ../partman-auto.templates:10001 msgid "Partitioning scheme:" -msgstr "Levyn osiointimalline:" +msgstr "Levyn osiointimalli:" #. Type: select #. Description @@ -149,8 +150,8 @@ "The disk can be partitioned using one of several different schemes. If you " "are unsure, choose the first one." msgstr "" -"Levyn osiot voidaan tehdä käyttäen tarjolla olevia osiointimallineita. Jos " -"olet epävarma, valitse ensimmäinen." +"Levyn osiot voidaan tehdä käyttäen tarjolla olevia osiointimalleja. Jos olet " +"epävarma, valitse ensimmäinen." #. Type: error #. Description diff --git a/debian/po/uk.po b/debian/po/uk.po index 104c225..bf92e4c 100644 --- a/debian/po/uk.po +++ b/debian/po/uk.po @@ -16,21 +16,23 @@ # Borys Yanovych , 2010, 2011. # Maxim V. Dziumanenko , 2010. # Yuri Chornoivan , 2010, 2011, 2012, 2013. -# Anton Gladky , 2014 +# Anton Gladky , 2011-2016 +# Taras Panchenko , 2021. +# msgid "" msgstr "" "Project-Id-Version: uk\n" "Report-Msgid-Bugs-To: partman-auto@packages.debian.org\n" "POT-Creation-Date: 2020-03-10 20:01+0000\n" -"PO-Revision-Date: 2014-09-20 23:02+0100\n" -"Last-Translator: Anton Gladky \n" +"PO-Revision-Date: 2021-12-03 23:44+0000\n" +"Last-Translator: Taras Panchenko \n" "Language-Team: Ukrainian \n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #. Type: text #. Description @@ -240,7 +242,7 @@ #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters #: ../partman-auto.templates:21001 msgid "Separate /home partition" -msgstr "Окремий розділ для /home" +msgstr "Окремий розділ для /home" #. Type: text #. Description diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po index a1e030d..8ba5091 100644 --- a/debian/po/zh_CN.po +++ b/debian/po/zh_CN.po @@ -28,15 +28,19 @@ # Mai Hao Hui , 2001 (translations from galeon) # YunQiang Su , 2010, 2011, 2012, 2013. # Yangfl , 2017. +# Boyuan Yang <073plan@gmail.com>, 2018, 2019, 2020. +# 玉堂白鹤 , 2020. +# TTT DEAL , 2021. +# Wenbin Lv , 2022. # msgid "" msgstr "" "Project-Id-Version: debian-installer\n" "Report-Msgid-Bugs-To: partman-auto@packages.debian.org\n" "POT-Creation-Date: 2020-03-10 20:01+0000\n" -"PO-Revision-Date: 2017-06-11 18:20+0800\n" -"Last-Translator: Yangfl \n" -"Language-Team: \n" +"PO-Revision-Date: 2022-04-17 17:12+0000\n" +"Last-Translator: Wenbin Lv \n" +"Language-Team: \n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -65,7 +69,7 @@ #. :sl2: #: ../partman-auto.templates:3001 ../partman-auto.templates:4001 msgid "Failed to partition the selected disk" -msgstr "对所选磁盘分区失败" +msgstr "对所选磁盘进行分区失败" #. Type: error #. Description @@ -74,7 +78,7 @@ msgid "" "This probably happened because the selected disk or free space is too small " "to be automatically partitioned." -msgstr "可能是因为被选的驱动器或空闲空间太小，以至于无法进行自动分区。" +msgstr "可能是因为所选的磁盘或其空闲空间太小，以至于无法进行自动分区。" #. Type: error #. Description @@ -105,8 +109,8 @@ "partitioning you will still have a chance later to review and customise the " "results." msgstr "" -"安装程序能够指导您采用各种标准方案进行磁盘分区。如果您喜欢，也可以进行手动操" -"作。如果选择了分区向导，稍后您还是有机会检查和修改分区设置结果。" +"安装程序能够指导您采用各种标准方案进行磁盘分区。如果您喜欢，也可以手动进行分" +"区。如果您选择了分区向导，稍后您还是有机会检查和修改分区结果。" #. Type: select #. Description @@ -139,7 +143,7 @@ #. at the end of the sentence. Please keep it. #: ../partman-auto.templates:10001 msgid "Selected for partitioning:" -msgstr "选定要分区：" +msgstr "将要分区：" #. Type: select #. Description @@ -148,7 +152,8 @@ msgid "" "The disk can be partitioned using one of several different schemes. If you " "are unsure, choose the first one." -msgstr "该磁盘可以使用以下数种不同方式来进行分区。如果您不确定，请选择第一个。" +msgstr "" +"该磁盘可以使用以下几种方案中的一种来进行分区。如果您不确定，请选择第一个。" #. Type: error #. Description @@ -165,7 +170,7 @@ "Partitioning failed because the chosen free space may not be used. There are " "probably too many (primary) partitions in the partition table." msgstr "" -"分区失败的原因是无法使用所选的空闲空间。分区表中可能存在过多 (主) 分区。" +"分区失败，原因是无法使用所选的空闲空间。分区表中可能存在过多 (主) 分区。" #. Type: text #. Description @@ -206,8 +211,8 @@ "Note that all data on the disk you select will be erased, but not before you " "have confirmed that you really want to make the changes." msgstr "" -"注意，所选磁盘上的全部数据都将被删除，但是您还是有确认是否真的要这么做的机" -"会。" +"注意，所选磁盘上的全部数据都将被删除，但是稍后还会要求您确认是否真的要这么" +"做。" #. Type: text #. Description diff --git a/recipes-powerpc-powermac_newworld/atomic b/recipes-powerpc-powermac_newworld/atomic index 99956ef..1649e53 100644 --- a/recipes-powerpc-powermac_newworld/atomic +++ b/recipes-powerpc-powermac_newworld/atomic @@ -1,16 +1,11 @@ partman-auto/text/atomic_scheme :: -1 1 1 hfs - $bootable{ } - method{ newworld } . - -128 512 256 ext2 - $defaultignore{ } +128 512 256 hfs method{ format } format{ } use_filesystem{ } - filesystem{ ext2 } - mountpoint{ /boot } . + filesystem{ hfs } + mountpoint{ /boot/grub } . 800 10000 -1 $default_filesystem $lvmok{ } diff --git a/recipes-powerpc-powermac_newworld/home b/recipes-powerpc-powermac_newworld/home index 5bd5f33..bec0620 100644 --- a/recipes-powerpc-powermac_newworld/home +++ b/recipes-powerpc-powermac_newworld/home @@ -1,16 +1,11 @@ partman-auto/text/home_scheme :: -1 1 1 hfs - $bootable{ } - method{ newworld } . - -128 512 256 ext2 - $defaultignore{ } +128 512 256 hfs method{ format } format{ } use_filesystem{ } - filesystem{ ext2 } - mountpoint{ /boot } . + filesystem{ hfs } + mountpoint{ /boot/grub } . 1500 6000 20000 $default_filesystem $lvmok{ } diff --git a/recipes-powerpc-powermac_newworld/multi b/recipes-powerpc-powermac_newworld/multi index 4ab1d7f..1d3b421 100644 --- a/recipes-powerpc-powermac_newworld/multi +++ b/recipes-powerpc-powermac_newworld/multi @@ -1,16 +1,11 @@ partman-auto/text/multi_scheme :: -1 1 1 hfs - $bootable{ } - method{ newworld } . - -128 512 256 ext2 - $defaultignore{ } +128 512 256 hfs method{ format } format{ } use_filesystem{ } - filesystem{ ext2 } - mountpoint{ /boot } . + filesystem{ hfs } + mountpoint{ /boot/grub } . 2000 3500 25000 $default_filesystem $lvmok{ }