From 85d0111da8413dc7879f6259afc0e5621c2d2634 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 21 Jan 2011 10:36:51 -0600 Subject: 3.4.3 release preparation Signed-off-by: Dan McGee --- NEWS | 3 +++ configure.ac | 4 ++-- doc/index.txt | 1 + src/pacman/pacman.c | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 89201114..4f5ce11d 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,8 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +3.4.3 - fix attempted double remove of all files issue during upgrades + - respect IgnorePkg/IgnoreGroup for group members (FS#19854) + - back out epoch changes; 3.5.X will handle them differently 3.4.2 - fix progress bar display with empty packages - make pactest testsuite Python 2.7 compatible - write epoch values in preparation for 3.5.X releases diff --git a/configure.ac b/configure.ac index da7f7692..ef98dcc9 100644 --- a/configure.ac +++ b/configure.ac @@ -42,12 +42,12 @@ AC_PREREQ(2.60) # pacman_version_micro += 1 m4_define([lib_current], [5]) -m4_define([lib_revision], [2]) +m4_define([lib_revision], [3]) m4_define([lib_age], [0]) m4_define([pacman_version_major], [3]) m4_define([pacman_version_minor], [4]) -m4_define([pacman_version_micro], [2]) +m4_define([pacman_version_micro], [3]) m4_define([pacman_version], [pacman_version_major.pacman_version_minor.pacman_version_micro]) diff --git a/doc/index.txt b/doc/index.txt index d336e773..e7d8887f 100644 --- a/doc/index.txt +++ b/doc/index.txt @@ -62,6 +62,7 @@ Releases `------------`------- Date Version --------------------- +2011-01-21 v3.4.3 2010-12-29 v3.4.2 2010-09-03 v3.4.1 2010-06-16 v3.4.0 diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 2cd99cbb..7fbffc36 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -176,7 +176,7 @@ static void version(void) { printf("\n"); printf(" .--. Pacman v%s - libalpm v%s\n", PACKAGE_VERSION, alpm_version()); - printf("/ _.-' .-. .-. .-. Copyright (C) 2006-2010 Pacman Development Team\n"); + printf("/ _.-' .-. .-. .-. Copyright (C) 2006-2011 Pacman Development Team\n"); printf("\\ '-. '-' '-' '-' Copyright (C) 2002-2006 Judd Vinet\n"); printf(" '--'\n"); printf(_(" This program may be freely redistributed under\n" -- cgit v1.1-4-g5e80 From 76735e6519c9dd7a3efee2613070588b5a1b12ac Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 21 Jan 2011 11:04:52 -0600 Subject: Copy new backend translation over from frontend translation Since it is the same string. Done with some bash looping and sed magic. for src in po/*.po; do echo $src newtrans=$(grep -A1 "msgid.*$1" $src | tail -n1) newtrans=${newtrans//\\/\\\\} echo "$newtrans" fname=${src##*/} dest=lib/libalpm/po/$fname sed -i -e "/msgid.*$1/{N; s/msgstr.*$/$newtrans/}" $dest done Signed-off-by: Dan McGee --- lib/libalpm/po/ca.po | 6 +++++- lib/libalpm/po/cs.po | 6 +++++- lib/libalpm/po/de.po | 6 +++++- lib/libalpm/po/el.po | 6 +++++- lib/libalpm/po/en_GB.po | 6 +++++- lib/libalpm/po/es.po | 6 +++++- lib/libalpm/po/fr.po | 6 +++++- lib/libalpm/po/hu.po | 6 +++++- lib/libalpm/po/it.po | 6 +++++- lib/libalpm/po/kk.po | 6 +++++- lib/libalpm/po/libalpm.pot | 6 +++++- lib/libalpm/po/nb.po | 6 +++++- lib/libalpm/po/pl.po | 6 +++++- lib/libalpm/po/pt.po | 6 +++++- lib/libalpm/po/pt_BR.po | 6 +++++- lib/libalpm/po/ro.po | 6 +++++- lib/libalpm/po/ru.po | 6 +++++- lib/libalpm/po/sk.po | 6 +++++- lib/libalpm/po/sv.po | 6 +++++- lib/libalpm/po/tr.po | 6 +++++- lib/libalpm/po/uk.po | 6 +++++- lib/libalpm/po/zh_CN.po | 6 +++++- 22 files changed, 110 insertions(+), 22 deletions(-) mode change 100755 => 100644 lib/libalpm/po/sk.po diff --git a/lib/libalpm/po/ca.po b/lib/libalpm/po/ca.po index ffd29861..540da119 100644 --- a/lib/libalpm/po/ca.po +++ b/lib/libalpm/po/ca.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2010-06-04 13:36-0500\n" +"POT-Creation-Date: 2011-01-21 10:47-0600\n" "PO-Revision-Date: 2010-06-12 19:17+0200\n" "Last-Translator: Manuel Tortosa \n" "Language-Team: Catalan \n" @@ -450,6 +450,10 @@ msgid "downgrading package %s (%s => %s)\n" msgstr "desactualitzant paquet %s (%s => %s)\n" #, c-format +msgid "skipping target: %s\n" +msgstr "s'ometrà l'objectiu: %s\n" + +#, c-format msgid "unresolvable package conflicts detected\n" msgstr "s'ha detectat un paquet amb un conflicte impossible de resoldre\n" diff --git a/lib/libalpm/po/cs.po b/lib/libalpm/po/cs.po index f66cedfa..2140022f 100644 --- a/lib/libalpm/po/cs.po +++ b/lib/libalpm/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.3.1\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2010-06-04 13:36-0500\n" +"POT-Creation-Date: 2011-01-21 10:47-0600\n" "PO-Revision-Date: 2010-06-05 12:56+0200\n" "Last-Translator: Vojtěch Gondžala \n" "Language-Team: Czech \n" @@ -446,6 +446,10 @@ msgid "downgrading package %s (%s => %s)\n" msgstr "ponížení verze balíčku %s (%s => %s)\n" #, c-format +msgid "skipping target: %s\n" +msgstr "přeskakuje se cíl: %s\n" + +#, c-format msgid "unresolvable package conflicts detected\n" msgstr "zjištěn konflikt nerozlišitelných balíčků\n" diff --git a/lib/libalpm/po/de.po b/lib/libalpm/po/de.po index c1d666e6..c1c6a0b8 100644 --- a/lib/libalpm/po/de.po +++ b/lib/libalpm/po/de.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.3.1\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2010-06-04 13:36-0500\n" +"POT-Creation-Date: 2011-01-21 10:47-0600\n" "PO-Revision-Date: 2010-06-07 20:02+0100\n" "Last-Translator: Matthias Gorissen \n" "Language-Team: German \n" @@ -457,6 +457,10 @@ msgid "downgrading package %s (%s => %s)\n" msgstr "Downgrade des Paketes %s (%s => %s)\n" #, c-format +msgid "skipping target: %s\n" +msgstr "Überspringe das Ziel: %s\n" + +#, c-format msgid "unresolvable package conflicts detected\n" msgstr "Nicht lösbare Paketkonflikte gefunden\n" diff --git a/lib/libalpm/po/el.po b/lib/libalpm/po/el.po index 8437ae58..04922fa0 100644 --- a/lib/libalpm/po/el.po +++ b/lib/libalpm/po/el.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.3.1\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2010-06-04 13:36-0500\n" +"POT-Creation-Date: 2011-01-21 10:47-0600\n" "PO-Revision-Date: 2010-06-09 23:02+0300\n" "Last-Translator: Χρήστος Νούσκας (Christos Nouskas) \n" "Language-Team: Greek <>\n" @@ -450,6 +450,10 @@ msgid "downgrading package %s (%s => %s)\n" msgstr "υποβάθμιση πακέτου %s (%s => %s)\n" #, c-format +msgid "skipping target: %s\n" +msgstr "παράλειψη στόχου: %s\n" + +#, c-format msgid "unresolvable package conflicts detected\n" msgstr "εντοπισμός ανεπίλυτων διενέξεων πακέτων\n" diff --git a/lib/libalpm/po/en_GB.po b/lib/libalpm/po/en_GB.po index 20f8b9b3..7d6c3113 100644 --- a/lib/libalpm/po/en_GB.po +++ b/lib/libalpm/po/en_GB.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.3.1\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2010-06-04 13:36-0500\n" +"POT-Creation-Date: 2011-01-21 10:47-0600\n" "PO-Revision-Date: 2009-10-04 17:08+0200\n" "Last-Translator: Dan McGee \n" "Language-Team: English \n" @@ -445,6 +445,10 @@ msgid "downgrading package %s (%s => %s)\n" msgstr "downgrading package %s (%s => %s)\n" #, c-format +msgid "skipping target: %s\n" +msgstr "skipping target: %s\n" + +#, c-format msgid "unresolvable package conflicts detected\n" msgstr "unresolvable package conflicts detected\n" diff --git a/lib/libalpm/po/es.po b/lib/libalpm/po/es.po index 95a22722..185f2a3b 100644 --- a/lib/libalpm/po/es.po +++ b/lib/libalpm/po/es.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.3.1\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2010-06-04 13:36-0500\n" +"POT-Creation-Date: 2011-01-21 10:47-0600\n" "PO-Revision-Date: 2010-06-13 10:49-0400\n" "Last-Translator: Juan Pablo Gonzalez \n" "Language-Team: Spanish \n" @@ -459,6 +459,10 @@ msgid "downgrading package %s (%s => %s)\n" msgstr "decrementando la versión del paquete %s (%s => %s)\n" #, c-format +msgid "skipping target: %s\n" +msgstr "saltando el objetivo: %s\n" + +#, c-format msgid "unresolvable package conflicts detected\n" msgstr "se han detectado paquetes con conflictos no resueltos\n" diff --git a/lib/libalpm/po/fr.po b/lib/libalpm/po/fr.po index a045d0c9..ed7ef978 100644 --- a/lib/libalpm/po/fr.po +++ b/lib/libalpm/po/fr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.3.1\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2010-06-04 13:36-0500\n" +"POT-Creation-Date: 2011-01-21 10:47-0600\n" "PO-Revision-Date: 2010-06-06 20:26+0200\n" "Last-Translator: Xavier \n" "Language-Team: solsTiCe d'Hiver \n" @@ -451,6 +451,10 @@ msgid "downgrading package %s (%s => %s)\n" msgstr "retourne à la version antérieure du paquet %s (%s => %s)\n" #, c-format +msgid "skipping target: %s\n" +msgstr "omission de la cible: %s\n" + +#, c-format msgid "unresolvable package conflicts detected\n" msgstr "un conflit de paquets impossible à résoudre a été détecté\n" diff --git a/lib/libalpm/po/hu.po b/lib/libalpm/po/hu.po index b3677b14..573b8c55 100644 --- a/lib/libalpm/po/hu.po +++ b/lib/libalpm/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.3.1\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2010-06-04 13:36-0500\n" +"POT-Creation-Date: 2011-01-21 10:47-0600\n" "PO-Revision-Date: 2009-10-04 17:08+0200\n" "Last-Translator: Nagy Gabor \n" "Language-Team: \n" @@ -447,6 +447,10 @@ msgid "downgrading package %s (%s => %s)\n" msgstr "visszatérés egy régebbi %s verzióhoz (%s => %s)\n" #, c-format +msgid "skipping target: %s\n" +msgstr "cél kihagyása: %s\n" + +#, c-format msgid "unresolvable package conflicts detected\n" msgstr "feloldhatatlan csomagütközéseket találtam\n" diff --git a/lib/libalpm/po/it.po b/lib/libalpm/po/it.po index 35f69c60..9d75f918 100644 --- a/lib/libalpm/po/it.po +++ b/lib/libalpm/po/it.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.4.0\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2010-06-04 13:36-0500\n" +"POT-Creation-Date: 2011-01-21 10:47-0600\n" "PO-Revision-Date: 2010-06-05 18:00+0200\n" "Last-Translator: Giovanni Scafora \n" "Language-Team: Arch Linux Italian Team \n" @@ -456,6 +456,10 @@ msgstr "" "%s)\n" #, c-format +msgid "skipping target: %s\n" +msgstr "sto ignorando il pacchetto: %s\n" + +#, c-format msgid "unresolvable package conflicts detected\n" msgstr "sono stati rilevati dei conflitti irrisolvibili\n" diff --git a/lib/libalpm/po/kk.po b/lib/libalpm/po/kk.po index a23111e2..d5708057 100644 --- a/lib/libalpm/po/kk.po +++ b/lib/libalpm/po/kk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.3.1\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2010-06-04 13:36-0500\n" +"POT-Creation-Date: 2011-01-21 10:47-0600\n" "PO-Revision-Date: 2010-06-07 09:22+0600\n" "Last-Translator: Baurzhan Muftakhidinov \n" "Language-Team: Kazakh\n" @@ -447,6 +447,10 @@ msgid "downgrading package %s (%s => %s)\n" msgstr "дестенің нұсқасын төмендету %s (%s => %s)\n" #, c-format +msgid "skipping target: %s\n" +msgstr "мақсатты аттап өту: %s\n" + +#, c-format msgid "unresolvable package conflicts detected\n" msgstr "дестелердің шешілмейтін ерегісі табылды\n" diff --git a/lib/libalpm/po/libalpm.pot b/lib/libalpm/po/libalpm.pot index c3c9065b..6532aee9 100644 --- a/lib/libalpm/po/libalpm.pot +++ b/lib/libalpm/po/libalpm.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2010-06-04 13:36-0500\n" +"POT-Creation-Date: 2011-01-21 10:47-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -444,6 +444,10 @@ msgid "downgrading package %s (%s => %s)\n" msgstr "" #, c-format +msgid "skipping target: %s\n" +msgstr "" + +#, c-format msgid "unresolvable package conflicts detected\n" msgstr "" diff --git a/lib/libalpm/po/nb.po b/lib/libalpm/po/nb.po index 053f1755..8c8a2549 100644 --- a/lib/libalpm/po/nb.po +++ b/lib/libalpm/po/nb.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.3.1\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2010-06-04 13:36-0500\n" +"POT-Creation-Date: 2011-01-21 10:47-0600\n" "PO-Revision-Date: 2009-10-04 17:09+0200\n" "Last-Translator: \n" "Language-Team: Language libalpm\n" @@ -445,6 +445,10 @@ msgid "downgrading package %s (%s => %s)\n" msgstr "nedgraderer pakke %s (%s => %s)\n" #, c-format +msgid "skipping target: %s\n" +msgstr "hopper over mål: %s\n" + +#, c-format msgid "unresolvable package conflicts detected\n" msgstr "uløselige pakkekonflikter oppdaget\n" diff --git a/lib/libalpm/po/pl.po b/lib/libalpm/po/pl.po index 737aa9e6..c68f28ce 100644 --- a/lib/libalpm/po/pl.po +++ b/lib/libalpm/po/pl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.3.1\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2010-06-04 13:36-0500\n" +"POT-Creation-Date: 2011-01-21 10:47-0600\n" "PO-Revision-Date: 2010-08-01 05:10+0100\n" "Last-Translator: Mateusz Herych \n" "Language-Team: Polish \n" @@ -450,6 +450,10 @@ msgid "downgrading package %s (%s => %s)\n" msgstr "dezaktualizowanie pakietu %s (%s => %s)\n" #, c-format +msgid "skipping target: %s\n" +msgstr "Pomijam cel: %s\n" + +#, c-format msgid "unresolvable package conflicts detected\n" msgstr "odkryto nierozwiązywalne konflikty pakietów\n" diff --git a/lib/libalpm/po/pt.po b/lib/libalpm/po/pt.po index 63125d91..a2ea7cb4 100644 --- a/lib/libalpm/po/pt.po +++ b/lib/libalpm/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.3.1\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2010-06-04 13:36-0500\n" +"POT-Creation-Date: 2011-01-21 10:47-0600\n" "PO-Revision-Date: 2010-08-31 18:25+0100\n" "Last-Translator: \n" "Language-Team: Gaspar Santos aka ArchGalileu \n" @@ -454,6 +454,10 @@ msgid "downgrading package %s (%s => %s)\n" msgstr "a fazer downgrade do pacote %s (%s => %s)\n" #, c-format +msgid "skipping target: %s\n" +msgstr "ignorar alvo: %s\n" + +#, c-format msgid "unresolvable package conflicts detected\n" msgstr "detectado conflito entre pacotes sem solução\n" diff --git a/lib/libalpm/po/pt_BR.po b/lib/libalpm/po/pt_BR.po index 52386dc8..8c432da0 100644 --- a/lib/libalpm/po/pt_BR.po +++ b/lib/libalpm/po/pt_BR.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.3.1\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2010-06-04 13:36-0500\n" +"POT-Creation-Date: 2011-01-21 10:47-0600\n" "PO-Revision-Date: 2010-06-07 21:09-0300\n" "Last-Translator: Rodrigo L. M. Flores \n" "Language-Team: Português do Brasil \n" @@ -456,6 +456,10 @@ msgid "downgrading package %s (%s => %s)\n" msgstr "fazendo downgrade do pacote %s (%s => %s)\n" #, c-format +msgid "skipping target: %s\n" +msgstr "pulando alvo: %s\n" + +#, c-format msgid "unresolvable package conflicts detected\n" msgstr "conflito de pacotes não solucionável detectado\n" diff --git a/lib/libalpm/po/ro.po b/lib/libalpm/po/ro.po index 35127694..fb9828df 100644 --- a/lib/libalpm/po/ro.po +++ b/lib/libalpm/po/ro.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.3.1\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2010-06-04 13:36-0500\n" +"POT-Creation-Date: 2011-01-21 10:47-0600\n" "PO-Revision-Date: 2009-10-04 17:09+0200\n" "Last-Translator: volodia macovei \n" "Language-Team: Romanian SbLUG for Arch \n" @@ -450,6 +450,10 @@ msgid "downgrading package %s (%s => %s)\n" msgstr "se declasează pachetul %s (%s => %s)\n" #, c-format +msgid "skipping target: %s\n" +msgstr "se sare peste ținta: %s\n" + +#, c-format msgid "unresolvable package conflicts detected\n" msgstr "au fost detectate conflicte nerezolvabile în pachet\n" diff --git a/lib/libalpm/po/ru.po b/lib/libalpm/po/ru.po index 8b2cfb7e..b2b6e702 100644 --- a/lib/libalpm/po/ru.po +++ b/lib/libalpm/po/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.3.1\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2010-06-04 13:36-0500\n" +"POT-Creation-Date: 2011-01-21 10:47-0600\n" "PO-Revision-Date: 2010-06-06 10:07+0300\n" "Last-Translator: Sergey Tereschenko \n" "Language-Team: Russian\n" @@ -449,6 +449,10 @@ msgid "downgrading package %s (%s => %s)\n" msgstr "откат версии пакета %s (%s => %s)\n" #, c-format +msgid "skipping target: %s\n" +msgstr "пропуск цели: %s\n" + +#, c-format msgid "unresolvable package conflicts detected\n" msgstr "обнаружен неразрешимый конфликт пакетов\n" diff --git a/lib/libalpm/po/sk.po b/lib/libalpm/po/sk.po old mode 100755 new mode 100644 index 976e5314..ad2e986c --- a/lib/libalpm/po/sk.po +++ b/lib/libalpm/po/sk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.3.1\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2010-06-04 13:36-0500\n" +"POT-Creation-Date: 2011-01-21 10:47-0600\n" "PO-Revision-Date: 2010-07-27 22:56+0200\n" "Last-Translator: Jozef Říha \n" "Language-Team: Slovak\n" @@ -446,6 +446,10 @@ msgid "downgrading package %s (%s => %s)\n" msgstr "downgradujem balíček %s (%s => %s)\n" #, c-format +msgid "skipping target: %s\n" +msgstr "preskakujem cieľ: %s\n" + +#, c-format msgid "unresolvable package conflicts detected\n" msgstr "zistený konflikt nerozlíšiteľných balíčkov\n" diff --git a/lib/libalpm/po/sv.po b/lib/libalpm/po/sv.po index ab345241..0aa140ea 100644 --- a/lib/libalpm/po/sv.po +++ b/lib/libalpm/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.3.1\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2010-06-04 13:36-0500\n" +"POT-Creation-Date: 2011-01-21 10:47-0600\n" "PO-Revision-Date: 2010-09-03 13:00+0200\n" "Last-Translator: Tobias Eriksson \n" "Language-Team: Swedish\n" @@ -445,6 +445,10 @@ msgid "downgrading package %s (%s => %s)\n" msgstr "nedgraderar paketet %s (%s => %s)\n" #, c-format +msgid "skipping target: %s\n" +msgstr "hoppar över målet: %s\n" + +#, c-format msgid "unresolvable package conflicts detected\n" msgstr "olösliga paketkonflikter upptäckta\n" diff --git a/lib/libalpm/po/tr.po b/lib/libalpm/po/tr.po index b9f58c75..2ca2dd75 100644 --- a/lib/libalpm/po/tr.po +++ b/lib/libalpm/po/tr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.3.1\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2010-06-04 13:36-0500\n" +"POT-Creation-Date: 2011-01-21 10:47-0600\n" "PO-Revision-Date: 2010-06-05 00:59+0200\n" "Last-Translator: Samed Beyribey \n" "Language-Team: Turkish Arch Linux Users \n" @@ -446,6 +446,10 @@ msgid "downgrading package %s (%s => %s)\n" msgstr "%s paketi eski sürümüne çevriliyor (%s => %s)\n" #, c-format +msgid "skipping target: %s\n" +msgstr "hedef atlanıyor: %s\n" + +#, c-format msgid "unresolvable package conflicts detected\n" msgstr "çözülemeyen paket çakışmaları bulundu\n" diff --git a/lib/libalpm/po/uk.po b/lib/libalpm/po/uk.po index a52308ea..7b2543d8 100644 --- a/lib/libalpm/po/uk.po +++ b/lib/libalpm/po/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.3.1\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2010-06-04 13:36-0500\n" +"POT-Creation-Date: 2011-01-21 10:47-0600\n" "PO-Revision-Date: 2010-06-13 20:08+0300\n" "Last-Translator: Roman Kyrylych \n" "Language-Team: Ukrainian (archlinux.org.ua) <>\n" @@ -447,6 +447,10 @@ msgid "downgrading package %s (%s => %s)\n" msgstr "пониження версії пакунку %s (%s => %s)\n" #, c-format +msgid "skipping target: %s\n" +msgstr "пропуск пакунка: %s\n" + +#, c-format msgid "unresolvable package conflicts detected\n" msgstr "виявлені нерозв'язні конфлікти пакунків\n" diff --git a/lib/libalpm/po/zh_CN.po b/lib/libalpm/po/zh_CN.po index 529297b8..e7dee7c2 100644 --- a/lib/libalpm/po/zh_CN.po +++ b/lib/libalpm/po/zh_CN.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.3.1\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2010-06-04 13:36-0500\n" +"POT-Creation-Date: 2011-01-21 10:47-0600\n" "PO-Revision-Date: 2010-06-05 10:41+0700\n" "Last-Translator: 甘露(Gan Lu) \n" "Language-Team: Chinese/Simplified \n" @@ -447,6 +447,10 @@ msgid "downgrading package %s (%s => %s)\n" msgstr "正在降级软件包 %1$s (%2$s => %3$s)\n" #, c-format +msgid "skipping target: %s\n" +msgstr "正在跳过软件包：%s\n" + +#, c-format msgid "unresolvable package conflicts detected\n" msgstr "检测到未解决的软件包冲突\n" -- cgit v1.1-4-g5e80 From a97e28205a462a7433a8d0e7061cd911ea3d8c4c Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 22 Jan 2011 10:07:46 -0600 Subject: Update 3.4.3 release date Signed-off-by: Dan McGee --- doc/index.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/index.txt b/doc/index.txt index e7d8887f..3741c81e 100644 --- a/doc/index.txt +++ b/doc/index.txt @@ -62,7 +62,7 @@ Releases `------------`------- Date Version --------------------- -2011-01-21 v3.4.3 +2011-01-22 v3.4.3 2010-12-29 v3.4.2 2010-09-03 v3.4.1 2010-06-16 v3.4.0 -- cgit v1.1-4-g5e80