Skip to content

Commit c0df115

Browse files
committed
update mirror.pot; use msgmerge to merge new pot and old zh_CN.po
1 parent 58096c5 commit c0df115

File tree

2 files changed

+99
-11
lines changed

2 files changed

+99
-11
lines changed

mirror/i18n/mirror.pot

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: Mirror 0.7.8\n"
1010
"Report-Msgid-Bugs-To: http://mirror.bjtu.edu.cn\n"
11-
"POT-Creation-Date: 2018-10-14 11:58+0800\n"
11+
"POT-Creation-Date: 2018-10-16 17:57+0800\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -86,6 +86,27 @@ msgid ""
8686
"start again."
8787
msgstr ""
8888

89+
#: mirror/main.py:145
90+
#, python-format
91+
msgid ""
92+
"There was an error writing logs to log dir: %s, you can change it manually "
93+
"(chown or chmod ) and start again."
94+
msgstr ""
95+
96+
#: mirror/main.py:152
97+
#, python-format
98+
msgid ""
99+
"Default task log dir does not exists: %s, you can create it manually and "
100+
"start again."
101+
msgstr ""
102+
103+
#: mirror/main.py:157
104+
#, python-format
105+
msgid ""
106+
"There was an error writing logs to log dir: %s, you can change it manually "
107+
"(chown or chmod) and start again."
108+
msgstr ""
109+
89110
#: mirror/console.py:49
90111
msgid "Open /tmp/mirrord failed, can't read task infomation"
91112
msgstr ""

mirror/i18n/zh_CN.po

Lines changed: 77 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ msgid ""
66
msgstr ""
77
"Project-Id-Version: Mirror 0.6.0\n"
88
"Report-Msgid-Bugs-To: http://mirror.bjtu.edu.cn\n"
9-
"POT-Creation-Date: 2013-06-21 11:15+0800\n"
9+
"POT-Creation-Date: 2018-10-16 17:57+0800\n"
1010
"PO-Revision-Date: 2013-06-23 14:17+8\n"
1111
"Last-Translator: ideal <[email protected]>\n"
1212
"Language-Team: zh_CN <[email protected]>\n"
@@ -15,23 +15,23 @@ msgstr ""
1515
"Content-Type: text/plain; charset=UTF-8\n"
1616
"Content-Transfer-Encoding: 8bit\n"
1717

18-
#: mirror/main.py:52
18+
#: mirror/main.py:47
1919
msgid "Show program's version number and exit"
2020
msgstr "显示程序版本并退出"
2121

22-
#: mirror/main.py:54
22+
#: mirror/main.py:49
2323
msgid "Do not daemonize (default is daemonize)"
2424
msgstr "不以守护进程方式运行 (若不设置则以守护进程方式运行)"
2525

26-
#: mirror/main.py:57
26+
#: mirror/main.py:53
2727
msgid "Set the config location directory"
2828
msgstr "设置配置文件所在目录"
2929

30-
#: mirror/main.py:58
30+
#: mirror/main.py:56
3131
msgid "Use pidfile to store process id"
3232
msgstr "将mirrord的进程id存储到指定的pidfile文件中"
3333

34-
#: mirror/main.py:60
34+
#: mirror/main.py:59
3535
msgid "User to switch to. Need to start as root"
3636
msgstr "切换为指定的用户运行,需要以root用户启动"
3737

@@ -43,18 +43,85 @@ msgstr "切换为指定的组运行,需要以root用户启动"
4343
msgid "Set the logfile location"
4444
msgstr "设置日志文件路径"
4545

46-
#: mirror/main.py:66
46+
#: mirror/main.py:68
4747
msgid "Set the log level: none, info, warning, error, critical, debug"
4848
msgstr "设置日志级别,可选项:none, info, warning, error, critical, debug"
4949

50-
#: mirror/main.py:68
50+
#: mirror/main.py:72
5151
msgid "Sets the log level to 'none', this is the same as `-L none`"
5252
msgstr "设置日志级别为none, 作用和`-L none`一致"
5353

54-
#: mirror/main.py:70
54+
#: mirror/main.py:75
5555
msgid "Rotate logfiles."
5656
msgstr "循环日志文件"
5757

58-
#: mirror/main.py:72
58+
#: mirror/main.py:78
5959
msgid "Profiles the daemon"
6060
msgstr "对mirrord进行profile"
61+
62+
#: mirror/main.py:81
63+
msgid "List current tasks in scheduler's queue"
64+
msgstr ""
65+
66+
#: mirror/main.py:84
67+
msgid "Send signal to mirrord: stop, reload"
68+
msgstr ""
69+
70+
#: mirror/main.py:114
71+
#, python-format
72+
msgid "Config dir does not exist: %s, please create and write your mirror.ini"
73+
msgstr ""
74+
75+
#: mirror/main.py:121
76+
#, python-format
77+
msgid "Config file does not exist: %s, please write one"
78+
msgstr ""
79+
80+
#: mirror/main.py:140
81+
#, python-format
82+
msgid ""
83+
"There was an error creating log dir: %s, you can create it manually and "
84+
"start again."
85+
msgstr ""
86+
87+
#: mirror/main.py:145
88+
#, python-format
89+
msgid ""
90+
"There was an error writing logs to log dir: %s, you can change it manually "
91+
"(chown or chmod ) and start again."
92+
msgstr ""
93+
94+
#: mirror/main.py:152
95+
#, python-format
96+
msgid ""
97+
"Default task log dir does not exists: %s, you can create it manually and "
98+
"start again."
99+
msgstr ""
100+
101+
#: mirror/main.py:157
102+
#, python-format
103+
msgid ""
104+
"There was an error writing logs to log dir: %s, you can change it manually "
105+
"(chown or chmod) and start again."
106+
msgstr ""
107+
108+
#: mirror/console.py:49
109+
msgid "Open /tmp/mirrord failed, can't read task infomation"
110+
msgstr ""
111+
112+
#: mirror/console.py:57
113+
msgid "Wrong file /tmp/mirrord, any other wrote it?"
114+
msgstr ""
115+
116+
#: mirror/console.py:83
117+
msgid "Invalid value for -s, available: "
118+
msgstr ""
119+
120+
#: mirror/console.py:90
121+
msgid "Can not read mirrord's pid, please make sure that mirrord is running"
122+
msgstr ""
123+
124+
#: mirror/console.py:96
125+
#, python-format
126+
msgid "Kill mirrord (%d) failed: %s"
127+
msgstr ""

0 commit comments

Comments
 (0)