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

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
=== modified file 'indicator-china-weather.py'
--- indicator-china-weather.py 2014-09-10 09:38:11 +0000
+++ indicator-china-weather.py 2014-09-16 09:01:07 +0000
@@ -207,7 +207,7 @@
207 menu_noplace.append(setup)207 menu_noplace.append(setup)
208 setup.show()208 setup.show()
209209
210 about = Gtk.MenuItem("关于...")210 about = Gtk.MenuItem("关于")
211 about.connect("activate", self.about)211 about.connect("activate", self.about)
212 about.show()212 about.show()
213 menu_noplace.append(about)213 menu_noplace.append(about)
@@ -350,7 +350,7 @@
350 self.menu.append(prefs_show)350 self.menu.append(prefs_show)
351351
352 ##About352 ##About
353 about_show = Gtk.MenuItem("关于...")353 about_show = Gtk.MenuItem("关于")
354 about_show.connect("activate", self.about)354 about_show.connect("activate", self.about)
355 about_show.show()355 about_show.show()
356 self.menu.append(about_show)356 self.menu.append(about_show)
@@ -577,8 +577,8 @@
577 self.aboutdialog.set_license(ifile.read().replace('\x0c', ''))577 self.aboutdialog.set_license(ifile.read().replace('\x0c', ''))
578 ifile.close()578 ifile.close()
579579
580 self.aboutdialog.set_copyright('Copyright (C) 2013-2014 UbuntuKylin Team kobe24_lixiang@126.com')580 self.aboutdialog.set_copyright('Copyright © 2013-2014 Ubuntu Kylin Team, xiangli@ubuntukylin.com')
581 self.aboutdialog.set_comments('从Ubuntu Kylin天气服务端获取实时天气、六天或三天天气预报信息,数据均来自于中国气象局,添加人们日益关注的PM2.5指数,支持多城市切换和数据自动更新,分享每日生活指数和建议,为用户日常起居和旅行提供参考。')581 self.aboutdialog.set_comments('从 Ubuntu Kylin 天气服务端获取实时天气、六天或三天天气预报信息,数据均来自于中国气象局,添加人们日益关注的 PM2.5 指数,支持多城市切换和数据自动更新,分享每日生活指数和建议,为用户日常起居和旅行提供参考。')
582582
583 self.aboutdialog.set_website("https://launchpad.net/indicator-china-weather")583 self.aboutdialog.set_website("https://launchpad.net/indicator-china-weather")
584 self.aboutdialog.set_website_label("优客天气主页")584 self.aboutdialog.set_website_label("优客天气主页")

Subscribers

People subscribed via source and target branches