diff options
| author | Dan McGee <dan@archlinux.org> | 2011-08-08 17:05:25 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-08-08 17:05:25 -0500 |
| commit | 8fa330335f9eb465724ed778464502f844e930ae (patch) | |
| tree | 2161500fbdc1ca52f0e1bf15c9f0ab90737d5d01 /src/pacman/po | |
| parent | ef4757afa5d31ff6a6c09e3410c889f152826f4f (diff) | |
| parent | 67445334e71eaf6138561eee8e5561733a59fc69 (diff) | |
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 'src/pacman/po')
| -rw-r--r-- | src/pacman/po/de.po | 2 | ||||
| -rw-r--r-- | src/pacman/po/fi.po | 2 | ||||
| -rw-r--r-- | src/pacman/po/pacman.pot | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/pacman/po/de.po b/src/pacman/po/de.po index f2279bc7..78bf77b6 100644 --- a/src/pacman/po/de.po +++ b/src/pacman/po/de.po @@ -276,7 +276,7 @@ msgstr "" #, c-format msgid "%s: install reason has been set to 'explicitly installed'\n" msgstr "" -"%s: Installations-Grund wurde auf \"Ausdrücklich installiert\" gesetzt?\n" +"%s: Installations-Grund wurde auf \"Ausdrücklich installiert\" gesetzt\n" #, c-format msgid "Explicitly installed" diff --git a/src/pacman/po/fi.po b/src/pacman/po/fi.po index 0b0c511a..d4da37c0 100644 --- a/src/pacman/po/fi.po +++ b/src/pacman/po/fi.po @@ -851,7 +851,7 @@ msgstr "Säilytettävät paketit:\n" #, c-format msgid " All locally installed packages\n" -msgstr " Kaikki paikalliset paketit\n" +msgstr " Kaikki asennetut paketit\n" #, c-format msgid " All current sync database packages\n" diff --git a/src/pacman/po/pacman.pot b/src/pacman/po/pacman.pot index 2917e00f..bb50f332 100644 --- a/src/pacman/po/pacman.pot +++ b/src/pacman/po/pacman.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:59-0500\n" +"POT-Creation-Date: 2011-08-08 16:32-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" |