indicator-china-weather

Merge lp:~anthonywong/indicator-china-weather/ui-fixes into lp:indicator-china-weather

  1. ui-fixes
  2. Merge into trunk
Proposed by Anthony Wong
Status: Merged
Merged at revision: 104
Proposed branch: lp:~anthonywong/indicator-china-weather/ui-fixes
Merge into: lp:indicator-china-weather
Diff against target: 32 lines (+4/-4)
1 file modified
indicator-china-weather.py (+4/-4)
To merge this branch: bzr merge lp:~anthonywong/indicator-china-weather/ui-fixes
Reviewer Review Type Date Requested Status
kobe Pending
Review via email: mp+234780@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'indicator-china-weather.py'
2--- indicator-china-weather.py 2014-09-10 09:38:11 +0000
3+++ indicator-china-weather.py 2014-09-16 09:01:07 +0000
4@@ -207,7 +207,7 @@
5 menu_noplace.append(setup)
6 setup.show()
7
8- about = Gtk.MenuItem("关于...")
9+ about = Gtk.MenuItem("关于")
10 about.connect("activate", self.about)
11 about.show()
12 menu_noplace.append(about)
13@@ -350,7 +350,7 @@
14 self.menu.append(prefs_show)
15
16 ##About
17- about_show = Gtk.MenuItem("关于...")
18+ about_show = Gtk.MenuItem("关于")
19 about_show.connect("activate", self.about)
20 about_show.show()
21 self.menu.append(about_show)
22@@ -577,8 +577,8 @@
23 self.aboutdialog.set_license(ifile.read().replace('\x0c', ''))
24 ifile.close()
25
26- self.aboutdialog.set_copyright('Copyright (C) 2013-2014 UbuntuKylin Team kobe24_lixiang@126.com')
27- self.aboutdialog.set_comments('从Ubuntu Kylin天气服务端获取实时天气、六天或三天天气预报信息，数据均来自于中国气象局，添加人们日益关注的PM2.5指数，支持多城市切换和数据自动更新，分享每日生活指数和建议，为用户日常起居和旅行提供参考。')
28+ self.aboutdialog.set_copyright('Copyright © 2013-2014 Ubuntu Kylin Team, xiangli@ubuntukylin.com')
29+ self.aboutdialog.set_comments('从 Ubuntu Kylin 天气服务端获取实时天气、六天或三天天气预报信息，数据均来自于中国气象局，添加人们日益关注的 PM2.5 指数，支持多城市切换和数据自动更新，分享每日生活指数和建议，为用户日常起居和旅行提供参考。')
30
31 self.aboutdialog.set_website("https://launchpad.net/indicator-china-weather")
32 self.aboutdialog.set_website_label("优客天气主页")

Subscribers

People subscribed via source and target branches