diff options
| author | Dan McGee <dan@archlinux.org> | 2011-08-09 00:05:25 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-08-09 00:05:25 +0200 |
| commit | 8fa330335f9eb465724ed778464502f844e930ae (patch) | |
| tree | 2161500fbdc1ca52f0e1bf15c9f0ab90737d5d01 /lib/libalpm | |
| parent | ef4757afa5d31ff6a6c09e3410c889f152826f4f (diff) | |
| parent | 67445334e71eaf6138561eee8e5561733a59fc69 (diff) | |
| download | pacman-8fa330335f9eb465724ed778464502f844e930ae.tar.gz pacman-8fa330335f9eb465724ed778464502f844e930ae.tar.xz | |
Merge branch 'maint'
Conflicts:
lib/libalpm/dload.c
lib/libalpm/po/fi.po
lib/libalpm/po/libalpm.pot
po/de.po
po/fi.po
src/pacman/po/pacman.pot
src/pacman/util.c
Diffstat (limited to 'lib/libalpm')
| -rw-r--r-- | lib/libalpm/po/fi.po | 17 | ||||
| -rw-r--r-- | lib/libalpm/po/libalpm.pot | 2 |
2 files changed, 12 insertions, 7 deletions
diff --git a/lib/libalpm/po/fi.po b/lib/libalpm/po/fi.po index 01f2ea5a..8af1205a 100644 --- a/lib/libalpm/po/fi.po +++ b/lib/libalpm/po/fi.po @@ -1,16 +1,21 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org> # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # +# <larso@gmx.com>, 2011. +# Larso <larso@gmx.com>, 2011. +# Jesse Jaara <jesse.jaara@gmail.com>, 2011. +# apuasi <kaannokset.hellberg@gmail.com>, 2011. +# Dan McGee <dpmcgee@gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: Arch Linux Pacman package manager\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" -"POT-Creation-Date: 2011-06-23 21:48-0500\n" -"PO-Revision-Date: 2011-04-18 11:10+0000\n" -"Last-Translator: apuasi <kaannokset.hellberg@gmail.com>\n" -"Language-Team: Finnish <None>\n" +"POT-Creation-Date: 2011-08-08 16:37-0500\n" +"PO-Revision-Date: 2011-07-28 22:14+0000\n" +"Last-Translator: Larso <larso@gmx.com>\n" +"Language-Team: Finnish (http://www.transifex.net/projects/p/archlinux-pacman/" +"team/fi/)\n" "Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -319,7 +324,7 @@ msgstr "toimenpidettä ei ole alustettu" #, c-format msgid "duplicate target" -msgstr "" +msgstr "kohde on useampaan kertaan" #, c-format msgid "transaction not prepared" diff --git a/lib/libalpm/po/libalpm.pot b/lib/libalpm/po/libalpm.pot index 3e41eac2..1f7d25a7 100644 --- a/lib/libalpm/po/libalpm.pot +++ b/lib/libalpm/po/libalpm.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pacman 3.5.3\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" -"POT-Creation-Date: 2011-06-23 21:48-0500\n" +"POT-Creation-Date: 2011-08-08 16:37-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" |