diff options
| author | Martin Wimpress <[email protected]> | 2015-06-27 22:14:24 +0100 |
|---|---|---|
| committer | Martin Wimpress <[email protected]> | 2015-06-27 22:14:24 +0100 |
| commit | e64c0d6d99fe6aef817af0b18e53d9813cb2c11f (patch) | |
| tree | ea972a0ed2ab0677aa1578eef5809d8730af21e9 /help/mate-clock/zh_CN/zh_CN.po | |
| parent | 9978fdd46962be0acfcfddfb489b19f949f88bb4 (diff) | |
| parent | bcc8a11e05c9e1479e71d1696084e9e509fe2e92 (diff) | |
| download | mate-panel-e64c0d6d99fe6aef817af0b18e53d9813cb2c11f.tar.bz2 mate-panel-e64c0d6d99fe6aef817af0b18e53d9813cb2c11f.tar.xz | |
Merge pull request #315 from NiceandGently/master
help: clock and fish: fix merge conflicts during build
Diffstat (limited to 'help/mate-clock/zh_CN/zh_CN.po')
| -rw-r--r-- | help/mate-clock/zh_CN/zh_CN.po | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/help/mate-clock/zh_CN/zh_CN.po b/help/mate-clock/zh_CN/zh_CN.po index 7b16dc61..8c3ab67d 100644 --- a/help/mate-clock/zh_CN/zh_CN.po +++ b/help/mate-clock/zh_CN/zh_CN.po @@ -459,7 +459,7 @@ msgid "" "guimenuitem>." msgstr "" "要配置 <application>时钟</application>，在它上面点右键，然后选 <guimenuitem>" -"首选项</guimenuitem> 菜单，弹出一个对话框，包括三个标签：guimenuitem>常规</" +"首选项</guimenuitem> 菜单，弹出一个对话框，包括三个标签：<guimenuitem>常规</" "guimenuitem>、<guimenuitem>位置</guimenuitem> 和 <guimenuitem>天气</" "guimenuitem>。" |