diff options
| author | Dan McGee <dan@archlinux.org> | 2008-02-26 03:49:24 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-02-26 03:49:59 +0100 |
| commit | d75f693155c3d7e595a779f15beea516d321f228 (patch) | |
| tree | 831fe39a8f8193adb9682cd3d7ff1eff4f4eb938 /lib/libalpm/po | |
| parent | f159203f6fb217bb7bed5ffea8c2518325a9ec12 (diff) | |
| parent | 8efe0ecb250050e9061854476468298afb5944d2 (diff) | |
| download | pacman-d75f693155c3d7e595a779f15beea516d321f228.tar.gz pacman-d75f693155c3d7e595a779f15beea516d321f228.tar.xz | |
Merge branch 'maint'
Also bump the devel version on the master branch to 3.2.0devel.
Diffstat (limited to 'lib/libalpm/po')
| -rw-r--r-- | lib/libalpm/po/Makevars | 4 | ||||
| -rw-r--r-- | lib/libalpm/po/pl.po | 4 | ||||
| -rw-r--r-- | lib/libalpm/po/zh_CN.po | 18 |
3 files changed, 13 insertions, 13 deletions
diff --git a/lib/libalpm/po/Makevars b/lib/libalpm/po/Makevars index 1b1b8279..d7515220 100644 --- a/lib/libalpm/po/Makevars +++ b/lib/libalpm/po/Makevars @@ -9,8 +9,8 @@ top_builddir = ../../../ # These options get passed to xgettext. XGETTEXT_OPTIONS = \ - --keyword=_ --flag=_:1:pass-c-format \ - --keyword=N_ --flag=N_:1:pass-c-format + --keyword=_ --flag=_:1:c-format \ + --keyword=N_ --flag=N_:1:c-format # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding diff --git a/lib/libalpm/po/pl.po b/lib/libalpm/po/pl.po index da5e581b..27b8ce85 100644 --- a/lib/libalpm/po/pl.po +++ b/lib/libalpm/po/pl.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: Pacman package manager 3.0.1\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" "POT-Creation-Date: 2008-01-14 23:08-0600\n" -"PO-Revision-Date: 2007-04-12 04:23+0200\n" +"PO-Revision-Date: 2008-02-25 22:16+0100\n" "Last-Translator: Mateusz Herych <heniekk@gmail.com>\n" "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n" "MIME-Version: 1.0\n" @@ -154,7 +154,7 @@ msgstr "ścieżka bazy danych jest niezdefiniowana\n" #: lib/libalpm/deps.c:171 msgid "dependency cycle detected:\n" -msgstr "wykryto cykl zależności: %s\n" +msgstr "wykryto cykl zależności:\n" #: lib/libalpm/deps.c:173 #, c-format diff --git a/lib/libalpm/po/zh_CN.po b/lib/libalpm/po/zh_CN.po index aeb17d95..c33bb0fb 100644 --- a/lib/libalpm/po/zh_CN.po +++ b/lib/libalpm/po/zh_CN.po @@ -2,20 +2,20 @@ # Copyright (C) 2008 Judd Vinet <jvinet@zeroflux.org> # This file is distributed under the same license as the Pacman package manager package. # 甘露(Lu.Gan) <rhythm.gan@gmail.com>, 2008. -# -# -# +# +# +# msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.1.2\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" "POT-Creation-Date: 2008-01-14 23:08-0600\n" -"PO-Revision-Date: 2008-02-22 20:42+0800\n" +"PO-Revision-Date: 2008-02-25 20:25+0100\n" "Last-Translator: 甘露(Lu.Gan) <rhythm.gan@gmail.com>\n" "Language-Team: Chinese/Simplified <i18n-translation@lists.linux.net.cn>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit" +"Content-Transfer-Encoding: 8bit\n" #: lib/libalpm/add.c:86 #, c-format @@ -48,7 +48,8 @@ msgstr "你可以使用 -Rd 及 -U 来手动替代软件包\n" msgid "" "directory permissions differ on %s\n" "filesystem: %o package: %o\n" -msgstr "目录权限不一致%s\n" +msgstr "" +"目录权限不一致%s\n" "文件系统：%o 软件包：%o\n" #: lib/libalpm/add.c:404 @@ -493,8 +494,8 @@ msgstr "%s-%s：忽略软件包更新（由%s-%s替代）\n" #: lib/libalpm/sync.c:248 #, c-format -msgid "%s-%s: ignoring package upgrade (%s => %s)\n" -msgstr "%s-%s：忽略软件包更新（%s => %s）\n" +msgid "%s: ignoring package upgrade (%s => %s)\n" +msgstr "%s：忽略软件包更新（%s => %s）\n" #: lib/libalpm/sync.c:309 #, c-format @@ -652,4 +653,3 @@ msgstr "md5：%s无法打开\n" #, c-format msgid "md5: %s can't be read\n" msgstr "md5：%s无法读取\n" - |