Merge lp:~mhall119/fogger/fixes-for-stephane into lp:~loneowais/fogger/arb-review

Proposed by Michael Hall on 2012-08-02
Status: Merged
Merged at revision: 3
Proposed branch: lp:~mhall119/fogger/fixes-for-stephane
Merge into: lp:~loneowais/fogger/arb-review
Diff against target: 115 lines (+13/-35)
3 files modified
debian/control (+1/-2)
debian/copyright (+0/-21)
po/fogger.pot (+12/-12)
To merge this branch: bzr merge lp:~mhall119/fogger/fixes-for-stephane
Reviewer Review Type Date Requested Status
Owais Lone 2012-08-02 Approve on 2012-08-02
Review via email: mp+117820@code.launchpad.net

Description of the change

Fixes the debian/control and debian/copyright files that stgraber wanted changed.

To post a comment you must log in.
Owais Lone (loneowais) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2012-07-21 15:21:06 +0000
3+++ debian/control 2012-08-02 00:10:23 +0000
4@@ -1,8 +1,7 @@
5 Source: fogger
6 Section: python
7 Priority: extra
8-Build-Depends: cdbs (>= 0.4.43),
9- debhelper (>= 8),
10+Build-Depends: debhelper (>= 8),
11 python (>= 2.6.6-3~),
12 python-distutils-extra (>= 2.10)
13 Maintainer: Owais Lone <hello@owaislone.org>
14
15=== modified file 'debian/copyright'
16--- debian/copyright 2012-07-27 18:34:04 +0000
17+++ debian/copyright 2012-08-02 00:10:23 +0000
18@@ -7,27 +7,6 @@
19 Copyright: 2012 Owais Lone hello@owaislone.org
20 License: GPL-3
21
22-License: GPL-3
23- This program is free software; you can redistribute it
24- and/or modify it under the terms of the GNU General Public
25- License version 3 as published by the Free Software Foundation.
26- .
27- This program is distributed in the hope that it will be
28- useful, but WITHOUT ANY WARRANTY; without even the implied
29- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
30- PURPOSE. See the GNU General Public License for more
31- details.
32- .
33- You should have received a copy of the GNU General Public
34- License along with this package; if not, write to the Free
35- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
36- Boston, MA 02110-1301 USA
37- .
38- On Debian systems, the full text of the GNU General Public
39- License version 3 can be found in the file
40- `/usr/share/common-licenses/GPL-3'.
41-
42-
43 Files: po/*
44 Copyright: 2012 Rosetta Contributors and Canonical Ltd 2012
45 License: GPL-3
46
47=== modified file 'po/fogger.pot'
48--- po/fogger.pot 2012-07-21 15:21:06 +0000
49+++ po/fogger.pot 2012-08-02 00:10:23 +0000
50@@ -1,14 +1,14 @@
51-# Fogger translations.
52-# Copyright: 2012 Rosetta Contributors and Canonical Ltd 2012
53-# This file is distributed under the same license as the fogger package.
54-# Owais Lone loneowais@gmail.com, 2012.
55+# SOME DESCRIPTIVE TITLE.
56+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
57+# This file is distributed under the same license as the PACKAGE package.
58+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
59 #
60 #, fuzzy
61 msgid ""
62 msgstr ""
63 "Project-Id-Version: PACKAGE VERSION\n"
64 "Report-Msgid-Bugs-To: \n"
65-"POT-Creation-Date: 2012-07-14 05:14+0530\n"
66+"POT-Creation-Date: 2012-08-01 19:57-0400\n"
67 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
68 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
69 "Language-Team: LANGUAGE <LL@li.org>\n"
70@@ -105,16 +105,16 @@
71 msgid "Contents"
72 msgstr ""
73
74-#: ../fogger/AppWindow.py:262
75+#: ../fogger/AppWindow.py:263
76 msgid "Geolocation permission requested"
77 msgstr ""
78
79-#: ../fogger/AppWindow.py:263
80+#: ../fogger/AppWindow.py:264
81 #, python-format
82 msgid "%s wants to know your current location. Do you want to share?"
83 msgstr ""
84
85-#: ../fogger/AppWindow.py:265
86+#: ../fogger/AppWindow.py:266
87 msgid "Share"
88 msgstr ""
89
90@@ -270,21 +270,21 @@
91 msgid "%s will be freed."
92 msgstr ""
93
94-#: ../fogger/FoggerWindow.py:132
95+#: ../fogger/FoggerWindow.py:134
96 msgid "There's an app for that!"
97 msgstr ""
98
99-#: ../fogger/FoggerWindow.py:133
100+#: ../fogger/FoggerWindow.py:135
101 msgid ""
102 "A fog app already exists by that name. Would you like to replace it with a "
103 "new one?"
104 msgstr ""
105
106-#: ../fogger/FoggerWindow.py:135
107+#: ../fogger/FoggerWindow.py:137
108 msgid "Replace"
109 msgstr ""
110
111-#: ../fogger/FoggerWindow.py:197
112+#: ../fogger/FoggerWindow.py:199
113 #, python-format
114 msgid ""
115 "The URL %s could not be reached.\n"

Subscribers

People subscribed via source and target branches

to all changes: