FeedReader

Merge lp:~sgpthomas/feedreader/feedreader into lp:feedreader/trunk

  1. feedreader
  2. Merge into master
Proposed by Sam Thomas
Status: Merged
Merge reported by: JeanLuc
Merged at revision: not available
Proposed branch: lp:~sgpthomas/feedreader/feedreader
Merge into: lp:feedreader/trunk
Diff against target: 185 lines (+22/-22)
5 files modified
src/Widgets/ArticleView.vala (+1/-1)
src/Widgets/ReaderHeaderbar.vala (+2/-2)
src/Widgets/SettingsDialog.vala (+16/-16)
src/Widgets/SharePopover.vala (+2/-2)
src/Widgets/UpdateButton.vala (+1/-1)
To merge this branch: bzr merge lp:~sgpthomas/feedreader/feedreader
Reviewer Review Type Date Requested Status
JeanLuc Approve
Review via email: mp+269563@code.launchpad.net

Description of the change

Some fixes to the capitalization throughout the application.

To post a comment you must log in.
Revision history for this message
JeanLuc (eviltwin1) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Widgets/ArticleView.vala'
2--- src/Widgets/ArticleView.vala 2015-08-27 22:37:31 +0000
3+++ src/Widgets/ArticleView.vala 2015-08-29 01:51:00 +0000
4@@ -176,7 +176,7 @@
5 ThreadFunc<void*> run = () => {
6 Article = dataBase.read_article(articleID);
7 if(Article.getAuthor() == "")
8- Article.setAuthor(_("not available"));
9+ Article.setAuthor(_("Not available"));
10
11 Idle.add((owned) callback);
12 return null;
13
14=== modified file 'src/Widgets/ReaderHeaderbar.vala'
15--- src/Widgets/ReaderHeaderbar.vala 2015-08-27 22:37:31 +0000
16+++ src/Widgets/ReaderHeaderbar.vala 2015-08-29 01:51:00 +0000
17@@ -48,7 +48,7 @@
18 m_tag_button.add(tag_icon);
19 m_tag_button.set_relief(Gtk.ReliefStyle.NONE);
20 m_tag_button.set_focus_on_click(false);
21- m_tag_button.set_tooltip_text(_("tag article"));
22+ m_tag_button.set_tooltip_text(_("Tag Article"));
23 m_tag_button.sensitive = false;
24 m_tag_button.clicked.connect(() => {
25 m_pop = new TagPopover(m_tag_button);
26@@ -58,7 +58,7 @@
27 m_share_button.add(share_icon);
28 m_share_button.set_relief(Gtk.ReliefStyle.NONE);
29 m_share_button.set_focus_on_click(false);
30- m_share_button.set_tooltip_text(_("share article"));
31+ m_share_button.set_tooltip_text(_("Share Article"));
32 m_share_button.sensitive = false;
33 m_share_button.clicked.connect(() => {
34 var pop = new SharePopover(m_share_button);
35
36=== modified file 'src/Widgets/SettingsDialog.vala'
37--- src/Widgets/SettingsDialog.vala 2015-08-26 13:30:10 +0000
38+++ src/Widgets/SettingsDialog.vala 2015-08-29 01:51:00 +0000
39@@ -75,11 +75,11 @@
40 m_uiBox.pack_start(feed_settings, false, true, 0);
41
42 var only_feeds_box = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0);
43- var only_feeds = new Gtk.Label("only show Feeds");
44+ var only_feeds = new Gtk.Label(_("Only show feeds"));
45 only_feeds.set_alignment(0, 0.5f);
46 only_feeds.margin_start = 15;
47 var only_feeds_switch = new Gtk.Switch();
48- only_feeds_switch.active = settings_general.get_boolean(_("only-feeds"));
49+ only_feeds_switch.active = settings_general.get_boolean("only-feeds");
50 only_feeds_switch.notify["active"].connect(() => {
51 settings_state.set_strv("expanded-categories", Utils.getDefaultExpandedCategories());
52 settings_state.set_string("feedlist-selected-row", "feed -4");
53@@ -91,7 +91,7 @@
54 m_uiBox.pack_start(only_feeds_box, false, true, 0);
55
56 var only_unread_box = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0);
57- var only_unread = new Gtk.Label(_("only show unread"));
58+ var only_unread = new Gtk.Label(_("Only show unread"));
59 only_unread.set_alignment(0, 0.5f);
60 only_unread.margin_start = 15;
61 var only_unread_switch = new Gtk.Switch();
62@@ -108,24 +108,24 @@
63
64 private void setup_articlelist_settings()
65 {
66- var article_settings = new Gtk.Label(_("ArticleList:"));
67+ var article_settings = new Gtk.Label(_("Article List:"));
68 article_settings.margin_top = 15;
69 article_settings.set_alignment(0, 0.5f);
70 article_settings.get_style_context().add_class("h4");
71 m_uiBox.pack_start(article_settings, false, true, 0);
72
73 var article_sort_box = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0);
74- var article_sort = new Gtk.Label(_("sort articles by"));
75+ var article_sort = new Gtk.Label(_("Sort articles by"));
76 article_sort.set_alignment(0, 0.5f);
77 article_sort.margin_start = 15;
78
79 var sort_liststore = new Gtk.ListStore(1, typeof (string));
80 Gtk.TreeIter sort_by_date;
81 sort_liststore.append(out sort_by_date);
82- sort_liststore.set(sort_by_date, 0, _("date"));
83+ sort_liststore.set(sort_by_date, 0, _("Date"));
84 Gtk.TreeIter sort_by_inserted;
85 sort_liststore.append(out sort_by_inserted);
86- sort_liststore.set(sort_by_inserted, 0, _("received"));
87+ sort_liststore.set(sort_by_inserted, 0, _("Received"));
88
89 var sort_by_box = new Gtk.ComboBox.with_model(sort_liststore);
90 var sort_renderer = new Gtk.CellRendererText();
91@@ -148,7 +148,7 @@
92 m_uiBox.pack_start(article_sort_box, false, true, 0);
93
94 var newest_first_box = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0);
95- var newest_first = new Gtk.Label(_("newest first"));
96+ var newest_first = new Gtk.Label(_("Newest first"));
97 newest_first.set_alignment(0, 0.5f);
98 newest_first.margin_start = 15;
99 var newest_first_switch = new Gtk.Switch();
100@@ -165,7 +165,7 @@
101
102 private void setup_articleview_settings()
103 {
104- var articleview_settings = new Gtk.Label(_("ArticleView:"));
105+ var articleview_settings = new Gtk.Label(_("Article View:"));
106 articleview_settings.margin_top = 15;
107 articleview_settings.set_alignment(0, 0.5f);
108 articleview_settings.get_style_context().add_class("h4");
109@@ -179,16 +179,16 @@
110 var theme_liststore = new Gtk.ListStore(1, typeof (string));
111 Gtk.TreeIter default;
112 theme_liststore.append(out default);
113- theme_liststore.set(default, 0, _("default"));
114+ theme_liststore.set(default, 0, _("Default"));
115 Gtk.TreeIter spring;
116 theme_liststore.append(out spring);
117- theme_liststore.set(spring, 0, _("spring"));
118+ theme_liststore.set(spring, 0, _("Spring"));
119 Gtk.TreeIter midnight;
120 theme_liststore.append(out midnight);
121- theme_liststore.set(midnight, 0, _("midnight"));
122+ theme_liststore.set(midnight, 0, _("Midnight"));
123 Gtk.TreeIter parchment;
124 theme_liststore.append(out parchment);
125- theme_liststore.set(parchment, 0, _("parchment"));
126+ theme_liststore.set(parchment, 0, _("Parchment"));
127
128 var theme_box = new Gtk.ComboBox.with_model(theme_liststore);
129 var theme_renderer = new Gtk.CellRendererText();
130@@ -232,7 +232,7 @@
131 m_internalsBox.pack_start(sync_settings, false, true, 0);
132
133 var sync_count_box = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0);
134- var sync_count = new Gtk.Label(_("number of articles"));
135+ var sync_count = new Gtk.Label(_("Number of articles"));
136 sync_count.set_alignment(0, 0.5f);
137 sync_count.margin_start = 15;
138 var sync_count_button = new Gtk.SpinButton.with_range(10, 1000, 10);
139@@ -245,7 +245,7 @@
140 m_internalsBox.pack_start(sync_count_box, false, true, 0);
141
142 var sync_time_box = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0);
143- var sync_time = new Gtk.Label(_("every (seconds)"));
144+ var sync_time = new Gtk.Label(_("Every (seconds)"));
145 sync_time.set_alignment(0, 0.5f);
146 sync_time.margin_start = 15;
147 var sync_time_button = new Gtk.SpinButton.with_range(60, 1080, 10);
148@@ -268,7 +268,7 @@
149 m_internalsBox.pack_start(db_settings, false, true, 0);
150
151 var drop_articles_box = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0);
152- var drop_articles = new Gtk.Label(_("drop articles after"));
153+ var drop_articles = new Gtk.Label(_("Drop articles after"));
154 drop_articles.set_alignment(0, 0.5f);
155 drop_articles.margin_start = 15;
156
157
158=== modified file 'src/Widgets/SharePopover.vala'
159--- src/Widgets/SharePopover.vala 2015-07-24 02:51:45 +0000
160+++ src/Widgets/SharePopover.vala 2015-08-29 01:51:00 +0000
161@@ -18,9 +18,9 @@
162 var emptyBox = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 3);
163 emptyBox.margin = 30;
164
165- var label1 = new Gtk.Label(_("please"));
166+ var label1 = new Gtk.Label(_("Please"));
167 label1.get_style_context().add_class("h4");
168- var label2 = new Gtk.Label(_("to a service to share this article"));
169+ var label2 = new Gtk.Label(_("to a service to share this article."));
170 label2.get_style_context().add_class("h4");
171
172 emptyBox.pack_start(label1);
173
174=== modified file 'src/Widgets/UpdateButton.vala'
175--- src/Widgets/UpdateButton.vala 2015-07-15 18:51:01 +0000
176+++ src/Widgets/UpdateButton.vala 2015-08-29 01:51:00 +0000
177@@ -17,7 +17,7 @@
178 m_stack.add_named(m_icon, "icon");
179 this.add(m_stack);
180 this.set_focus_on_click(false);
181- this.set_tooltip_text(_("update Feeds"));
182+ this.set_tooltip_text(_("Update Feeds"));
183 this.show_all();
184
185 if(settings_state.get_boolean("currently-updating"))

Subscribers

People subscribed via source and target branches

to all changes: