diff options
| author | Roger Leigh <rleigh@debian.org> | 2010-09-05 18:30:18 +0100 |
|---|---|---|
| committer | Roger Leigh <rleigh@debian.org> | 2010-09-05 18:30:18 +0100 |
| commit | 4b14610134afb75e0d683eb50289e3d1159d651c (patch) | |
| tree | c14337520b0e451fac14ffc8df13f5b2e90b6e81 /po | |
| parent | afdea51b0b1899c611d1cffab6ba00e947055226 (diff) | |
| parent | 476b4fa21fc827b5709ce7df1455bf41c344315a (diff) | |
| download | schroot-4b14610134afb75e0d683eb50289e3d1159d651c.tar.gz | |
Merge branch 'schroot-1.4-merge2'
Conflicts:
debian/changelog
debian/control
debian/schroot.postrm
etc/setup.d/05file
man/schroot.conf.5.in
po/cs.po
po/da.po
po/de.po
po/en.po
po/eu.po
po/fr.po
po/it.po
po/pt.po
po/schroot.pot
po/sv.po
po/vi.po
po/zh_CN.po
sbuild/sbuild-chroot-config.cc
sbuild/sbuild-chroot.cc
sbuild/sbuild-session.cc
Diffstat (limited to 'po')
| -rw-r--r-- | po/da.po | 3 | ||||
| -rw-r--r-- | po/zh_CN.po | 5 |
2 files changed, 4 insertions, 4 deletions
@@ -1381,8 +1381,5 @@ msgstr "Kunne ikke stat fil" msgid "Failed to stat file descriptor" msgstr "Kunne ikke stat fildeskriptor" -#~ msgid "Priority" -#~ msgstr "Prioritet" - #~ msgid "--chroot may not be used with --list" #~ msgstr "--chroot kan ikke bruges med --list" diff --git a/po/zh_CN.po b/po/zh_CN.po index aa66d8e4..a81d6ceb 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: schroot VERSION\n" "Report-Msgid-Bugs-To: Roger Leigh <rleigh@debian.org>\n" -"POT-Creation-Date: 2010-09-02 21:40+0100\n" +"POT-Creation-Date: 2010-08-15 10:19+0100\n" "PO-Revision-Date: 2010-08-18 11:30+0800\n" "Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n" "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" @@ -890,6 +890,9 @@ msgstr "描述" msgid "Type" msgstr "类型" +msgid "Priority" +msgstr "优先权" + msgid "Message Verbosity" msgstr "详细信息" |