Browse Source

Merge branch 'master' of ssh://git.debian.org/git/tasksel/tasksel

tags/3.10
Jorge Barreiro 9 years ago
parent
commit
2a7b1c7fad
6 changed files with 38 additions and 34 deletions
  1. +5
    -1
      .gitignore
  2. +3
    -0
      debian/changelog
  3. +8
    -10
      debian/po/cy.po
  4. +9
    -14
      po/cy.po
  5. +12
    -6
      tasks/po/cy.po
  6. +1
    -3
      tasksel.pl

+ 5
- 1
.gitignore View File

@@ -1 +1,5 @@
*.mo
*.mo
debian/files
debian/tasksel*
debian/task-*
debian-tasks.desc

+ 3
- 0
debian/changelog View File

@@ -3,15 +3,18 @@ tasksel (3.10) UNRELEASED; urgency=low
[ Translations of programs ]
* Latvian (Rūdolfs Mazurs). Closes: #674691
* Lithuanian (Rimas Kudelis). Closes: #675851
* Welsh (Daffyd Tomos).

[ Translations of debconf templates ]
* Latvian (Rūdolfs Mazurs). Closes: #674691
* Lithuanian (Rimas Kudelis). Closes: #675851
* Welsh (Daffyd Tomos).

[ Translations of tasks ]
* Marathi (Sampada Nakhare)
* Latvian (Rūdolfs Mazurs). Closes: #674691
* Lithuanian (Rimas Kudelis). Closes: #675851
* Welsh (Daffyd Tomos).

[ Christian Perrier ]
* Add uyghur-desktop task


+ 8
- 10
debian/po/cy.po View File

@@ -18,9 +18,10 @@ msgstr ""
"Project-Id-Version: tasksel\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
"POT-Creation-Date: 2006-09-13 14:42-0400\n"
"PO-Revision-Date: 2004-11-24 13:30-0500\n"
"Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
"PO-Revision-Date: 2012-06-07 21:55-0000\n"
"Last-Translator: Dafydd Tomos <l10n@da.fydd.org>\n"
"Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
"Language: cy\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -31,21 +32,19 @@ msgstr ""
#. Description
#: ../templates:1001 ../templates:2001
msgid "Choose software to install:"
msgstr "Dewis meddalwedd i'w sefydlu"
msgstr "Dewis meddalwedd i'w sefydlu:"

#. Type: multiselect
#. Description
#: ../templates:1001
#, fuzzy
msgid ""
"At the moment, only the core of the system is installed. To tune the system "
"to your needs, you can choose to install one or more of the following "
"predefined collections of software."
msgstr ""
"Ar hyn o bryd, dim ond craidd Debian sydd wedi ei sefydlu. Er mwyn "
"addasu'rsefydliad i'ch anghenion, gallwch ddewis i sefydlu un neu fwy o'r "
"casgliadau canlynol o feddalwardd. Mae'n bosib hoffai ddefnyddwyr mwy "
"profiadol ddewis pecynnau â llaw."
"Ar hyn o bryd, dim ond craidd y system sydd wedi ei sefydlu. Er mwyn "
"addasu'r system i'ch anghenion, gallwch ddewis sefydlu un neu fwy o'r "
"casgliadau canlynol o feddalwedd."

#. Type: multiselect
#. Description
@@ -59,9 +58,8 @@ msgstr ""
#. Type: title
#. Description
#: ../templates:3001
#, fuzzy
msgid "Software selection"
msgstr "Dewis meddalwedd Debian"
msgstr "Dewis meddalwedd"

#~ msgid "${ORIGCHOICES}"
#~ msgstr "${CHOICES}"


+ 9
- 14
po/cy.po View File

@@ -6,16 +6,16 @@ msgid ""
msgstr ""
"Project-Id-Version: tarksel\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-05-14 17:41-0400\n"
"PO-Revision-Date: 2004-11-20 04:47-0500\n"
"Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
"POT-Creation-Date: 2012-06-09 08:27+0000\n"
"PO-Revision-Date: 2012-06-13 22:29-0000\n"
"Last-Translator: Dafydd Tomos <l10n@da.fydd.org>\n"
"Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
"Language: cy\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"

#: ../tasksel.pl:357
#, fuzzy
#: ../tasksel.pl:396
msgid ""
"Usage:\n"
"tasksel install <task>\n"
@@ -30,19 +30,14 @@ msgstr ""
"Defnydd:\n"
"tasksel install <tasg>\n"
"tasksel remove <tasg>\n"
"tasksel [opsiynnau]; lle mae'r opsiynnau yn gyfuniad o:\n"
"tasksel [dewisiadau]\n"
"\t-t, --test modd profi; peidio a gwneud dim byd go iawn\n"
"\t-r, --required sefydlu pob pecyn a'r blaenoriath angenrheidiol\n"
"\t-i, --important sedydlu pob pecyn a'r blaenoriath pwysig\n"
"\t-s, --standard sefydlu pob pecyn a'r blaenoriath safonnol\n"
"\t-n, --no-ui peidio a dangod y rhyngwyneb defnyddiwr; defnyddir\n"
"\t gyda -r neu -i fel arfer\n"
"\t --new-install sefydlu rhai tasgau'n awtomatig\n"
"\t --list-tasks rhestru tasgau a fyddau'n cael eu dangos a gorffen\n"
"\t --list-tasks rhestru tasgau a fyddai'n cael eu dangos a gorffen\n"
"\t --task-packages rhestru'r pecynnau ar gael o fewn tasg\n"
"\t --task-desc dychwelyd disgrifiad tasg\n"
"\t --task-desc dangos disgrifiad tasg\n"

#: ../tasksel.pl:608 ../tasksel.pl:620
#: ../tasksel.pl:629
msgid "apt-get failed"
msgstr "methodd apt-get"



+ 12
- 6
tasks/po/cy.po View File

@@ -7,8 +7,8 @@ msgstr ""
"Project-Id-Version: tasksel\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-06-09 08:27+0000\n"
"PO-Revision-Date: 2004-11-20 05:02-0500\n"
"Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
"PO-Revision-Date: 2012-06-07 22:00-0000\n"
"Last-Translator: Dafydd Tomos <l10n@da.fydd.org>\n"
"Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
"Language: cy\n"
"MIME-Version: 1.0\n"
@@ -17,9 +17,8 @@ msgstr ""

#. Description
#: ../po/debian-tasks.desc:12001
#, fuzzy
msgid "Standard system utilities"
msgstr "Sail Safonau Linux"
msgstr "Cyfleusterau safonol y system"

#. Description
#: ../po/debian-tasks.desc:12001
@@ -27,6 +26,15 @@ msgid ""
"This task sets up a basic user environment, providing a reasonably small "
"selection of services and tools usable on the command line."
msgstr ""
"Mae'r tasg hwn yn gosod amgylchedd defnyddiwr sylfaenol, sy'n cynnig "
"detholiad gweddol fach o gyfleusterau ac offer i'w defnyddio ar y llinell "
"orchymyn."

#~ msgid "manual package selection"
#~ msgstr "dewis pecynnau â llaw"

#~ msgid "Manually select packages to install in aptitude."
#~ msgstr "Dewis y pecynnau i osod gyda aptitude, â llaw."

#~ msgid "SQL database"
#~ msgstr "Cronfa ddata SQL"
@@ -113,12 +121,10 @@ msgstr ""
#~ msgid "This task sets up your system to be a print server."
#~ msgstr "Mae'r tasg hwn yn paratoi eich system i fod yn weinydd argraffu."

#, fuzzy
#~| msgid "DNS server"
#~ msgid "SSH server"
#~ msgstr "Gweinydd DNS"

#, fuzzy
#~| msgid "This task sets up your system to be a print server."
#~ msgid ""
#~ "This task sets up your system to be remotely accessed through SSH "


+ 1
- 3
tasksel.pl View File

@@ -225,10 +225,8 @@ sub task_packages {
if (($priority eq 'required' ||
$priority eq 'important' ||
$priority eq 'standard') &&
# Exclude non-main and lib packages
# Exclude packages in non-main and library sections
$section !~ /^lib|\// &&
# Exclude packages starting with lib
$package !~ /^lib/ &&
# Exclude already installed packages
!package_installed($package)) {
$list{$package} = 1;


Loading…
Cancel
Save