uReadIt

Merge lp:~aaronhoneycutt/ureadit/ureadit-personal into lp:ureadit/4.0

  1. ureadit-personal
  2. Merge into 4.0
Proposed by Michael Hall
Status: Needs review
Proposed branch: lp:~aaronhoneycutt/ureadit/ureadit-personal
Merge into: lp:ureadit/4.0
Diff against target: 268 lines (+69/-79)
2 files modified
Main.qml (+4/-1)
po/template.pot (+65/-78)
To merge this branch: bzr merge lp:~aaronhoneycutt/ureadit/ureadit-personal
Reviewer Review Type Date Requested Status
Michael Hall Pending
Review via email: mp+293566@code.launchpad.net

Description of the change

fix FrontPage content from going under PageHeader

To post a comment you must log in.

Unmerged revisions

51. By Aaron Honeycutt

fix FrontPage content from going under PageHeader

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Main.qml'
--- Main.qml 2016-01-14 18:46:10 +0000
+++ Main.qml 2016-05-02 20:39:24 +0000
@@ -83,7 +83,10 @@
8383
84 PageStack {84 PageStack {
85 id: mainStack85 id: mainStack
86 anchors.fill: parent86 anchors {
87 fill: parent
88 topMargin: units.gu(10)
89 }
8790
88 Keys.onPressed: { if (mainStack.depth > 1 && event.key == Qt.Key_Escape) pop(); }91 Keys.onPressed: { if (mainStack.depth > 1 && event.key == Qt.Key_Escape) pop(); }
89 onCurrentPageChanged: {92 onCurrentPageChanged: {
9093
=== modified file 'po/template.pot'
--- po/template.pot 2016-01-14 18:46:10 +0000
+++ po/template.pot 2016-05-02 20:39:24 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: PACKAGE VERSION\n"9"Project-Id-Version: PACKAGE VERSION\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2016-01-13 23:13-0500\n"11"POT-Creation-Date: 2016-04-27 23:00-0400\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,175 +17,162 @@
17"Content-Type: text/plain; charset=CHARSET\n"17"Content-Type: text/plain; charset=CHARSET\n"
18"Content-Transfer-Encoding: 8bit\n"18"Content-Transfer-Encoding: 8bit\n"
1919
20#: .ubuntu-sdk-deploy/ui/InternalBrowserPage.qml:7020#: ui/SettingsPage.qml:8 ui/Frontpage.qml:229
21#: .ubuntu-sdk-deploy/ui/ArticlePage.qml:89 ui/InternalBrowserPage.qml:70
22#: ui/ArticlePage.qml:89
23msgid "Open link in browser"
24msgstr ""
25
26#: .ubuntu-sdk-deploy/ui/InternalBrowserPage.qml:75
27#: .ubuntu-sdk-deploy/ui/ArticlePage.qml:94 ui/InternalBrowserPage.qml:75
28#: ui/ArticlePage.qml:94
29msgid "Open image in browser"
30msgstr ""
31
32#: .ubuntu-sdk-deploy/ui/InternalBrowserPage.qml:80
33#: .ubuntu-sdk-deploy/ui/ArticlePage.qml:104 ui/InternalBrowserPage.qml:80
34#: ui/ArticlePage.qml:104
35msgid "Share image"
36msgstr ""
37
38#: .ubuntu-sdk-deploy/ui/SettingsPage.qml:8
39#: .ubuntu-sdk-deploy/ui/Frontpage.qml:229 ui/SettingsPage.qml:8
40#: ui/Frontpage.qml:229
41msgid "Settings"21msgid "Settings"
42msgstr ""22msgstr ""
4323
44#: .ubuntu-sdk-deploy/ui/SettingsPage.qml:19 ui/SettingsPage.qml:1924#: ui/SettingsPage.qml:19
45msgid "Startup"25msgid "Startup"
46msgstr ""26msgstr ""
4727
48#: .ubuntu-sdk-deploy/ui/SettingsPage.qml:22 ui/SettingsPage.qml:2228#: ui/SettingsPage.qml:22
49msgid "Login automatically at startup"29msgid "Login automatically at startup"
50msgstr ""30msgstr ""
5131
52#: .ubuntu-sdk-deploy/ui/SettingsPage.qml:33 ui/SettingsPage.qml:3332#: ui/SettingsPage.qml:33
53msgid "Internal Browser"33msgid "Internal Browser"
54msgstr ""34msgstr ""
5535
56#: .ubuntu-sdk-deploy/ui/SettingsPage.qml:37 ui/SettingsPage.qml:3736#: ui/SettingsPage.qml:37
57msgid "Open links internally"37msgid "Open links internally"
58msgstr ""38msgstr ""
5939
60#: .ubuntu-sdk-deploy/ui/SettingsPage.qml:48 ui/SettingsPage.qml:4840#: ui/SettingsPage.qml:48
61msgid "Image Previews"41msgid "Image Previews"
62msgstr ""42msgstr ""
6343
64#: .ubuntu-sdk-deploy/ui/SettingsPage.qml:56 ui/SettingsPage.qml:5644#: ui/SettingsPage.qml:56
65msgid "Don't show images"45msgid "Don't show images"
66msgstr ""46msgstr ""
6747
68#: .ubuntu-sdk-deploy/ui/SettingsPage.qml:56 ui/SettingsPage.qml:5648#: ui/SettingsPage.qml:56
69msgid "Show large previews"49msgid "Show large previews"
70msgstr ""50msgstr ""
7151
72#: .ubuntu-sdk-deploy/ui/SettingsPage.qml:56 ui/SettingsPage.qml:5652#: ui/SettingsPage.qml:56
73msgid "Show thumbnail previews"53msgid "Show thumbnail previews"
74msgstr ""54msgstr ""
7555
76#: .ubuntu-sdk-deploy/ui/SettingsPage.qml:64 ui/SettingsPage.qml:6456#: ui/SettingsPage.qml:64
77msgid "Theme"57msgid "Theme"
78msgstr ""58msgstr ""
7959
80#: .ubuntu-sdk-deploy/ui/ArticlePage.qml:99 ui/ArticlePage.qml:9960#: ui/AboutPage.qml:8 ui/Frontpage.qml:237
61msgid "About"
62msgstr ""
63
64#: ui/AboutPage.qml:30
65msgid "Name"
66msgstr ""
67
68#: ui/AboutPage.qml:34
69msgid "Author"
70msgstr ""
71
72#: ui/AboutPage.qml:38
73msgid "Version"
74msgstr ""
75
76#: ui/AboutPage.qml:42
77msgid "Released"
78msgstr ""
79
80#: ui/ArticlePage.qml:89 ui/InternalBrowserPage.qml:70
81msgid "Open link in browser"
82msgstr ""
83
84#: ui/ArticlePage.qml:94 ui/InternalBrowserPage.qml:75
85msgid "Open image in browser"
86msgstr ""
87
88#: ui/ArticlePage.qml:99
81msgid "Share image link"89msgid "Share image link"
82msgstr ""90msgstr ""
8391
84#: .ubuntu-sdk-deploy/ui/Frontpage.qml:2092#: ui/ArticlePage.qml:104 ui/InternalBrowserPage.qml:80
85#: .ubuntu-sdk-deploy/ui/Frontpage.qml:28593msgid "Share image"
86#: .ubuntu-sdk-deploy/ui/Frontpage.qml:503 ui/Frontpage.qml:2094msgstr ""
87#: ui/Frontpage.qml:285 ui/Frontpage.qml:50395
96#: ui/Frontpage.qml:20 ui/Frontpage.qml:285 ui/Frontpage.qml:503
88msgid "Frontpage"97msgid "Frontpage"
89msgstr ""98msgstr ""
9099
91#: .ubuntu-sdk-deploy/ui/Frontpage.qml:85 ui/Frontpage.qml:85100#: ui/Frontpage.qml:85
92msgid "Hot"101msgid "Hot"
93msgstr ""102msgstr ""
94103
95#: .ubuntu-sdk-deploy/ui/Frontpage.qml:85 ui/Frontpage.qml:85104#: ui/Frontpage.qml:85
96msgid "New"105msgid "New"
97msgstr ""106msgstr ""
98107
99#: .ubuntu-sdk-deploy/ui/Frontpage.qml:85 ui/Frontpage.qml:85108#: ui/Frontpage.qml:85
100msgid "Top"109msgid "Top"
101msgstr ""110msgstr ""
102111
103#: .ubuntu-sdk-deploy/ui/Frontpage.qml:85 ui/Frontpage.qml:85112#: ui/Frontpage.qml:85
104msgid "Controversial"113msgid "Controversial"
105msgstr ""114msgstr ""
106115
107#: .ubuntu-sdk-deploy/ui/Frontpage.qml:85 ui/Frontpage.qml:85116#: ui/Frontpage.qml:85
108msgid "Rising"117msgid "Rising"
109msgstr ""118msgstr ""
110119
111#: .ubuntu-sdk-deploy/ui/Frontpage.qml:95 ui/Frontpage.qml:95120#: ui/Frontpage.qml:95
112msgid "Subscriptions"121msgid "Subscriptions"
113msgstr ""122msgstr ""
114123
115#: .ubuntu-sdk-deploy/ui/Frontpage.qml:95 ui/Frontpage.qml:95124#: ui/Frontpage.qml:95
116msgid "Defaults"125msgid "Defaults"
117msgstr ""126msgstr ""
118127
119#: .ubuntu-sdk-deploy/ui/Frontpage.qml:95 ui/Frontpage.qml:95128#: ui/Frontpage.qml:95
120msgid "Search"129msgid "Search"
121msgstr ""130msgstr ""
122131
123#: .ubuntu-sdk-deploy/ui/Frontpage.qml:95 ui/Frontpage.qml:95132#: ui/Frontpage.qml:95
124msgid "Multis"133msgid "Multis"
125msgstr ""134msgstr ""
126135
127#: .ubuntu-sdk-deploy/ui/Frontpage.qml:175 ui/Frontpage.qml:175136#: ui/Frontpage.qml:175
128msgid "Subreddit"137msgid "Subreddit"
129msgstr ""138msgstr ""
130139
131#: .ubuntu-sdk-deploy/ui/Frontpage.qml:184 ui/Frontpage.qml:184140#: ui/Frontpage.qml:184
132msgid "Login"141msgid "Login"
133msgstr ""142msgstr ""
134143
135#: .ubuntu-sdk-deploy/ui/Frontpage.qml:193 ui/Frontpage.qml:193144#: ui/Frontpage.qml:193
136msgid "New Unread"145msgid "New Unread"
137msgstr ""146msgstr ""
138147
139#: .ubuntu-sdk-deploy/ui/Frontpage.qml:202 ui/Frontpage.qml:202148#: ui/Frontpage.qml:202
140msgid "View as Gallery"149msgid "View as Gallery"
141msgstr ""150msgstr ""
142151
143#: .ubuntu-sdk-deploy/ui/Frontpage.qml:211 ui/Frontpage.qml:211152#: ui/Frontpage.qml:211
144msgid "Inbox"153msgid "Inbox"
145msgstr ""154msgstr ""
146155
147#: .ubuntu-sdk-deploy/ui/Frontpage.qml:220 ui/Frontpage.qml:220156#: ui/Frontpage.qml:220
148msgid "Users"157msgid "Users"
149msgstr ""158msgstr ""
150159
151#: .ubuntu-sdk-deploy/ui/Frontpage.qml:237160#: ui/Frontpage.qml:245
152#: .ubuntu-sdk-deploy/ui/AboutPage.qml:8 ui/Frontpage.qml:237
153#: ui/AboutPage.qml:8
154msgid "About"
155msgstr ""
156
157#: .ubuntu-sdk-deploy/ui/Frontpage.qml:245 ui/Frontpage.qml:245
158msgid "Logout"161msgid "Logout"
159msgstr ""162msgstr ""
160163
161#: .ubuntu-sdk-deploy/ui/Frontpage.qml:264 ui/Frontpage.qml:264164#: ui/Frontpage.qml:264
162msgid "Back"165msgid "Back"
163msgstr ""166msgstr ""
164167
165#: .ubuntu-sdk-deploy/ui/Frontpage.qml:274 ui/Frontpage.qml:274168#: ui/Frontpage.qml:274
166msgid "Confirm"169msgid "Confirm"
167msgstr ""170msgstr ""
168171
169#: .ubuntu-sdk-deploy/ui/Frontpage.qml:505 ui/Frontpage.qml:505172#: ui/Frontpage.qml:505
170msgid "All"173msgid "All"
171msgstr ""174msgstr ""
172175
173#: .ubuntu-sdk-deploy/ui/AboutPage.qml:30 ui/AboutPage.qml:30176#: Main.qml:138
174msgid "Name"
175msgstr ""
176
177#: .ubuntu-sdk-deploy/ui/AboutPage.qml:34 ui/AboutPage.qml:34
178msgid "Author"
179msgstr ""
180
181#: .ubuntu-sdk-deploy/ui/AboutPage.qml:38 ui/AboutPage.qml:38
182msgid "Version"
183msgstr ""
184
185#: .ubuntu-sdk-deploy/ui/AboutPage.qml:42 ui/AboutPage.qml:42
186msgid "Released"
187msgstr ""
188
189#: .ubuntu-sdk-deploy/Main.qml:135 Main.qml:135
190msgid "Link to a Reddit thread"177msgid "Link to a Reddit thread"
191msgstr ""178msgstr ""

Subscribers

People subscribed via source and target branches

to all changes: