Luciole

Merge lp:~nico-inattendu/luciole/nico-5 into lp:luciole/0.7

  1. nico-5
  2. Merge into main
Proposed by NicoInattendu
Status: Merged
Merged at revision: not available
Proposed branch: lp:~nico-inattendu/luciole/nico-5
Merge into: lp:luciole/0.7
Diff against target: None lines
To merge this branch: bzr merge lp:~nico-inattendu/luciole/nico-5
Reviewer Review Type Date Requested Status
NicoInattendu Pending
Review via email: mp+6882@code.launchpad.net
To post a comment you must log in.
Revision history for this message
NicoInattendu (nico-inattendu) wrote :

Fixed bugs :
 * Bug #381609: Invalid messages.pot file
 * Bug #381368: Missing copyright and GPL license

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lucioLib/gui/capture_list_store.py'
--- lucioLib/gui/capture_list_store.py 2009-03-29 21:48:15 +0000
+++ lucioLib/gui/capture_list_store.py 2009-05-29 11:19:35 +0000
@@ -2,6 +2,31 @@
2# -*- coding: utf-8 -*-2# -*- coding: utf-8 -*-
3# -*- Mode: Python -*-3# -*- Mode: Python -*-
4# vi:si:ai:et:sw=4:sts=4:ts=44# vi:si:ai:et:sw=4:sts=4:ts=4
5#
6#
7# Copyright Nicolas Bertrand (nico@inattendu.org), 2009
8#
9# This file is part of Luciole.
10#
11# Luciole is free software: you can redistribute it and/or modify
12# it under the terms of the GNU General Public License as published by
13# the Free Software Foundation, either version 3 of the License, or
14# (at your option) any later version.
15#
16# Luciole is distributed in the hope that it will be useful,
17# but WITHOUT ANY WARRANTY; without even the implied warranty of
18# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19# GNU General Public License for more details.
20#
21# You should have received a copy of the GNU General Public License
22# along with Luciole. If not, see <http://www.gnu.org/licenses/>.
23#
24#
25"""
26capture_list_store.py :
27 ListStore class for Treeviews capture and monatge.
28"""
29
5import pygtk30import pygtk
6pygtk.require('2.0')31pygtk.require('2.0')
7import gtk32import gtk
833
=== modified file 'lucioLib/luciole_image.py'
--- lucioLib/luciole_image.py 2009-05-06 17:33:04 +0000
+++ lucioLib/luciole_image.py 2009-05-29 11:19:35 +0000
@@ -2,6 +2,33 @@
2# -*- coding: utf-8 -*-2# -*- coding: utf-8 -*-
3# -*- Mode: Python -*-3# -*- Mode: Python -*-
4# vi:si:ai:et:sw=4:sts=4:ts=44# vi:si:ai:et:sw=4:sts=4:ts=4
5#
6#
7# Copyright Nicolas Bertrand (nico@inattendu.org), 2009
8#
9# This file is part of Luciole.
10#
11# Luciole is free software: you can redistribute it and/or modify
12# it under the terms of the GNU General Public License as published by
13# the Free Software Foundation, either version 3 of the License, or
14# (at your option) any later version.
15#
16# Luciole is distributed in the hope that it will be useful,
17# but WITHOUT ANY WARRANTY; without even the implied warranty of
18# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19# GNU General Public License for more details.
20#
21# You should have received a copy of the GNU General Public License
22# along with Luciole. If not, see <http://www.gnu.org/licenses/>.
23#
24#
25"""
26luciole_image.py :
27 Handle imges in luciole application.
28 - Manage image type and rush
29 - Resize image
30"""
31
5import Image as PIL32import Image as PIL
6import os.path33import os.path
7import gtk34import gtk
835
=== modified file 'po/createpot.py'
--- po/createpot.py 2009-03-08 18:06:41 +0000
+++ po/createpot.py 2009-05-29 11:19:35 +0000
@@ -1,5 +1,31 @@
1#!/usr/bin/env python1#!/usr/bin/env python
22# -*- coding: utf-8 -*-
3# -*- Mode: Python -*-
4# vi:si:ai:et:sw=4:sts=4:ts=4
5#
6#
7# Copyright Nicolas Bertrand (nico@inattendu.org), 2009
8#
9# This file is part of Luciole.
10#
11# Luciole is free software: you can redistribute it and/or modify
12# it under the terms of the GNU General Public License as published by
13# the Free Software Foundation, either version 3 of the License, or
14# (at your option) any later version.
15#
16# Luciole is distributed in the hope that it will be useful,
17# but WITHOUT ANY WARRANTY; without even the implied warranty of
18# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19# GNU General Public License for more details.
20#
21# You should have received a copy of the GNU General Public License
22# along with Luciole. If not, see <http://www.gnu.org/licenses/>.
23#
24#
25"""
26create_pot.py
27Used for management of pot file
28"""
3import os, sys, glob29import os, sys, glob
430
5command = None31command = None
632
=== removed file 'po/messages.pot'
--- po/messages.pot 2009-03-08 18:06:41 +0000
+++ po/messages.pot 1970-01-01 00:00:00 +0000
@@ -1,221 +0,0 @@
1# SOME DESCRIPTIVE TITLE.
2# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3# This file is distributed under the same license as the PACKAGE package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5#
6#, fuzzy
7msgid ""
8msgstr ""
9"Project-Id-Version: PACKAGE VERSION\n"
10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2008-06-22 11:18+0200\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"
15"MIME-Version: 1.0\n"
16"Content-Type: text/plain; charset=CHARSET\n"
17"Content-Transfer-Encoding: 8bit\n"
18
19#. print "langue %s %s"%(self.lang,dir(self.lang))
20#: ../myrtille.py:100
21msgid "Bonjour test!"
22msgstr ""
23
24#: ../images/myrtille.glade.h:1
25msgid ""
26"\n"
27"Tool for video capture, for making animated cartoon from image per "
28"image \n"
29msgstr ""
30
31#: ../images/myrtille.glade.h:4
32msgid " Digital camera"
33msgstr ""
34
35#: ../images/myrtille.glade.h:5
36msgid " Export file name (without extension) :"
37msgstr ""
38
39#: ../images/myrtille.glade.h:6
40msgid "..."
41msgstr ""
42
43#: ../images/myrtille.glade.h:7
44msgid "About Myrtille"
45msgstr ""
46
47#: ../images/myrtille.glade.h:8
48msgid "Choose an hardware"
49msgstr ""
50
51#: ../images/myrtille.glade.h:9
52msgid "Choose export format."
53msgstr ""
54
55#: ../images/myrtille.glade.h:10
56msgid "Confirmation page"
57msgstr ""
58
59#: ../images/myrtille.glade.h:11
60msgid "DV cam"
61msgstr ""
62
63#: ../images/myrtille.glade.h:12
64msgid ""
65"DV format (raw DV)\n"
66"Format DVD (mpeg2)\n"
67"Format divx/xvid (avi)"
68msgstr ""
69
70#: ../images/myrtille.glade.h:15
71msgid "Export"
72msgstr ""
73
74#: ../images/myrtille.glade.h:16
75msgid "Export ..."
76msgstr ""
77
78#: ../images/myrtille.glade.h:17
79msgid "Export path:"
80msgstr ""
81
82#: ../images/myrtille.glade.h:18
83msgid "Export video with sound."
84msgstr ""
85
86#: ../images/myrtille.glade.h:19
87msgid "File export"
88msgstr ""
89
90#: ../images/myrtille.glade.h:20
91msgid "File format :"
92msgstr ""
93
94#: ../images/myrtille.glade.h:21
95msgid "Folder"
96msgstr ""
97
98#: ../images/myrtille.glade.h:22
99msgid "Images per seconds"
100msgstr ""
101
102#: ../images/myrtille.glade.h:23
103msgid "Mixer"
104msgstr ""
105
106#: ../images/myrtille.glade.h:24
107msgid "Montage"
108msgstr ""
109
110#: ../images/myrtille.glade.h:25
111msgid "Project name"
112msgstr ""
113
114#: ../images/myrtille.glade.h:26
115msgid "Select a folder"
116msgstr ""
117
118#: ../images/myrtille.glade.h:27
119msgid "Select a myrtille project file"
120msgstr ""
121
122#: ../images/myrtille.glade.h:28
123msgid "Select an image to import"
124msgstr ""
125
126#: ../images/myrtille.glade.h:29
127msgid "Select project name and destination folder.\n"
128msgstr ""
129
130#: ../images/myrtille.glade.h:31
131msgid "Snapshot"
132msgstr ""
133
134#: ../images/myrtille.glade.h:32
135msgid ""
136"This assistant will help you on configuration of a new myrtille project."
137msgstr ""
138
139#: ../images/myrtille.glade.h:33
140msgid ""
141"This program is free software; you can redistribute it and/or\n"
142"modify it under the terms of the GNU General Public License\n"
143"as published by the Free Software Foundation; either \n"
144"version 2 of the License, or (at your option) any later version.\n"
145"\n"
146"This program is distributed in the hope that it will be useful,\n"
147"but WITHOUT ANY WARRANTY; without even the implied \n"
148"warranty of MERCHANTABILITY or FITNESS FOR A \n"
149"PARTICULAR PURPOSE. See the GNU General Public \n"
150"License for more details.\n"
151"\n"
152"You should have received a copy of the GNU General Public\n"
153"License along with this program; if not, write to the \n"
154"Free Software Foundation, \n"
155"Inc., 59 Temple Place - \n"
156"Suite 330, Boston, MA 02111-1307, USA."
157msgstr ""
158
159#: ../images/myrtille.glade.h:49
160msgid "Transparency level"
161msgstr ""
162
163#: ../images/myrtille.glade.h:50
164msgid "Web Cam"
165msgstr ""
166
167#: ../images/myrtille.glade.h:51
168msgid "_File"
169msgstr ""
170
171#: ../images/myrtille.glade.h:52
172msgid "_Help"
173msgstr ""
174
175#: ../images/myrtille.glade.h:53
176msgid "expander"
177msgstr ""
178
179#: ../images/myrtille.glade.h:54
180msgid "gtk-about"
181msgstr ""
182
183#: ../images/myrtille.glade.h:55
184msgid "gtk-apply"
185msgstr ""
186
187#: ../images/myrtille.glade.h:56
188msgid "gtk-cancel"
189msgstr ""
190
191#: ../images/myrtille.glade.h:57
192msgid "gtk-close"
193msgstr ""
194
195#: ../images/myrtille.glade.h:58
196msgid "gtk-new"
197msgstr ""
198
199#: ../images/myrtille.glade.h:59
200msgid "gtk-ok"
201msgstr ""
202
203#: ../images/myrtille.glade.h:60
204msgid "gtk-open"
205msgstr ""
206
207#: ../images/myrtille.glade.h:61
208msgid "gtk-quit"
209msgstr ""
210
211#: ../images/myrtille.glade.h:62
212msgid "gtk-save"
213msgstr ""
214
215#: ../images/myrtille.glade.h:63
216msgid "gtk-save-as"
217msgstr ""
218
219#: ../images/myrtille.glade.h:64
220msgid "myrtille on line"
221msgstr ""

Subscribers

People subscribed via source and target branches

to all changes: