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
=== modified file 'debian/control'
--- debian/control 2012-07-21 15:21:06 +0000
+++ debian/control 2012-08-02 00:10:23 +0000
@@ -1,8 +1,7 @@
1Source: fogger1Source: fogger
2Section: python2Section: python
3Priority: extra3Priority: extra
4Build-Depends: cdbs (>= 0.4.43),4Build-Depends: debhelper (>= 8),
5 debhelper (>= 8),
6 python (>= 2.6.6-3~),5 python (>= 2.6.6-3~),
7 python-distutils-extra (>= 2.10)6 python-distutils-extra (>= 2.10)
8Maintainer: Owais Lone <hello@owaislone.org>7Maintainer: Owais Lone <hello@owaislone.org>
98
=== modified file 'debian/copyright'
--- debian/copyright 2012-07-27 18:34:04 +0000
+++ debian/copyright 2012-08-02 00:10:23 +0000
@@ -7,27 +7,6 @@
7Copyright: 2012 Owais Lone hello@owaislone.org7Copyright: 2012 Owais Lone hello@owaislone.org
8License: GPL-38License: GPL-3
99
10License: GPL-3
11 This program is free software; you can redistribute it
12 and/or modify it under the terms of the GNU General Public
13 License version 3 as published by the Free Software Foundation.
14 .
15 This program is distributed in the hope that it will be
16 useful, but WITHOUT ANY WARRANTY; without even the implied
17 warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
18 PURPOSE. See the GNU General Public License for more
19 details.
20 .
21 You should have received a copy of the GNU General Public
22 License along with this package; if not, write to the Free
23 Software Foundation, Inc., 51 Franklin St, Fifth Floor,
24 Boston, MA 02110-1301 USA
25 .
26 On Debian systems, the full text of the GNU General Public
27 License version 3 can be found in the file
28 `/usr/share/common-licenses/GPL-3'.
29
30
31Files: po/*10Files: po/*
32Copyright: 2012 Rosetta Contributors and Canonical Ltd 201211Copyright: 2012 Rosetta Contributors and Canonical Ltd 2012
33License: GPL-312License: GPL-3
3413
=== modified file 'po/fogger.pot'
--- po/fogger.pot 2012-07-21 15:21:06 +0000
+++ po/fogger.pot 2012-08-02 00:10:23 +0000
@@ -1,14 +1,14 @@
1# Fogger translations.1# SOME DESCRIPTIVE TITLE.
2# Copyright: 2012 Rosetta Contributors and Canonical Ltd 20122# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3# This file is distributed under the same license as the fogger package.3# This file is distributed under the same license as the PACKAGE package.
4# Owais Lone loneowais@gmail.com, 2012.4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5#5#
6#, fuzzy6#, fuzzy
7msgid ""7msgid ""
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: 2012-07-14 05:14+0530\n"11"POT-Creation-Date: 2012-08-01 19:57-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"
@@ -105,16 +105,16 @@
105msgid "Contents"105msgid "Contents"
106msgstr ""106msgstr ""
107107
108#: ../fogger/AppWindow.py:262108#: ../fogger/AppWindow.py:263
109msgid "Geolocation permission requested"109msgid "Geolocation permission requested"
110msgstr ""110msgstr ""
111111
112#: ../fogger/AppWindow.py:263112#: ../fogger/AppWindow.py:264
113#, python-format113#, python-format
114msgid "%s wants to know your current location. Do you want to share?"114msgid "%s wants to know your current location. Do you want to share?"
115msgstr ""115msgstr ""
116116
117#: ../fogger/AppWindow.py:265117#: ../fogger/AppWindow.py:266
118msgid "Share"118msgid "Share"
119msgstr ""119msgstr ""
120120
@@ -270,21 +270,21 @@
270msgid "%s will be freed."270msgid "%s will be freed."
271msgstr ""271msgstr ""
272272
273#: ../fogger/FoggerWindow.py:132273#: ../fogger/FoggerWindow.py:134
274msgid "There's an app for that!"274msgid "There's an app for that!"
275msgstr ""275msgstr ""
276276
277#: ../fogger/FoggerWindow.py:133277#: ../fogger/FoggerWindow.py:135
278msgid ""278msgid ""
279"A fog app already exists by that name. Would you like to replace it with a "279"A fog app already exists by that name. Would you like to replace it with a "
280"new one?"280"new one?"
281msgstr ""281msgstr ""
282282
283#: ../fogger/FoggerWindow.py:135283#: ../fogger/FoggerWindow.py:137
284msgid "Replace"284msgid "Replace"
285msgstr ""285msgstr ""
286286
287#: ../fogger/FoggerWindow.py:197287#: ../fogger/FoggerWindow.py:199
288#, python-format288#, python-format
289msgid ""289msgid ""
290"The URL %s could not be reached.\n"290"The URL %s could not be reached.\n"

Subscribers

People subscribed via source and target branches

to all changes: