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

[NicoInattendu]

[NicoInattendu (nico-inattendu)]

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

=== 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 @@
 # -*- coding: utf-8 -*-
 # -*- Mode: Python -*-
 # vi:si:ai:et:sw=4:sts=4:ts=4
+#
+#
+# Copyright Nicolas Bertrand ([e-mail]), 2009
+#
+# This file is part of Luciole.
+#
+#    Luciole is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Luciole is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with Luciole.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+"""
+capture_list_store.py :
+    ListStore class for Treeviews capture and monatge.
+"""
+
 import pygtk
 pygtk.require('2.0')
 import gtk

=== 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 @@
 # -*- coding: utf-8 -*-
 # -*- Mode: Python -*-
 # vi:si:ai:et:sw=4:sts=4:ts=4
+#
+#
+# Copyright Nicolas Bertrand ([e-mail]), 2009
+#
+# This file is part of Luciole.
+#
+#    Luciole is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Luciole is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with Luciole.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+"""
+luciole_image.py :
+    Handle imges in luciole application.
+        - Manage image type and rush
+        - Resize image 
+"""
+
 import Image as PIL
 import os.path
 import gtk

=== 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 @@
 #!/usr/bin/env python
-
+# -*- coding: utf-8 -*-
+# -*- Mode: Python -*-
+# vi:si:ai:et:sw=4:sts=4:ts=4
+#
+#
+# Copyright Nicolas Bertrand ([e-mail]), 2009
+#
+# This file is part of Luciole.
+#
+#    Luciole is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Luciole is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with Luciole.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+"""
+create_pot.py
+Used for management of pot file
+"""
 import os, sys, glob
 
 command = None

=== 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 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-22 11:18+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <[e-mail]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. print "langue %s %s"%(self.lang,dir(self.lang))
-#: ../myrtille.py:100
-msgid "Bonjour test!"
-msgstr ""
-
-#: ../images/myrtille.glade.h:1
-msgid ""
-"\n"
-"Tool for video capture, for making animated cartoon from image per "
-"image    \n"
-msgstr ""
-
-#: ../images/myrtille.glade.h:4
-msgid " Digital camera"
-msgstr ""
-
-#: ../images/myrtille.glade.h:5
-msgid " Export file name (without extension)  :"
-msgstr ""
-
-#: ../images/myrtille.glade.h:6
-msgid "..."
-msgstr ""
-
-#: ../images/myrtille.glade.h:7
-msgid "About Myrtille"
-msgstr ""
-
-#: ../images/myrtille.glade.h:8
-msgid "Choose an hardware"
-msgstr ""
-
-#: ../images/myrtille.glade.h:9
-msgid "Choose export format."
-msgstr ""
-
-#: ../images/myrtille.glade.h:10
-msgid "Confirmation page"
-msgstr ""
-
-#: ../images/myrtille.glade.h:11
-msgid "DV cam"
-msgstr ""
-
-#: ../images/myrtille.glade.h:12
-msgid ""
-"DV format (raw DV)\n"
-"Format DVD (mpeg2)\n"
-"Format divx/xvid (avi)"
-msgstr ""
-
-#: ../images/myrtille.glade.h:15
-msgid "Export"
-msgstr ""
-
-#: ../images/myrtille.glade.h:16
-msgid "Export ..."
-msgstr ""
-
-#: ../images/myrtille.glade.h:17
-msgid "Export path:"
-msgstr ""
-
-#: ../images/myrtille.glade.h:18
-msgid "Export video with sound."
-msgstr ""
-
-#: ../images/myrtille.glade.h:19
-msgid "File export"
-msgstr ""
-
-#: ../images/myrtille.glade.h:20
-msgid "File format :"
-msgstr ""
-
-#: ../images/myrtille.glade.h:21
-msgid "Folder"
-msgstr ""
-
-#: ../images/myrtille.glade.h:22
-msgid "Images per seconds"
-msgstr ""
-
-#: ../images/myrtille.glade.h:23
-msgid "Mixer"
-msgstr ""
-
-#: ../images/myrtille.glade.h:24
-msgid "Montage"
-msgstr ""
-
-#: ../images/myrtille.glade.h:25
-msgid "Project name"
-msgstr ""
-
-#: ../images/myrtille.glade.h:26
-msgid "Select a folder"
-msgstr ""
-
-#: ../images/myrtille.glade.h:27
-msgid "Select a myrtille project file"
-msgstr ""
-
-#: ../images/myrtille.glade.h:28
-msgid "Select an image to import"
-msgstr ""
-
-#: ../images/myrtille.glade.h:29
-msgid "Select project name and destination folder.\n"
-msgstr ""
-
-#: ../images/myrtille.glade.h:31
-msgid "Snapshot"
-msgstr ""
-
-#: ../images/myrtille.glade.h:32
-msgid ""
-"This assistant will help you on configuration of a new myrtille project."
-msgstr ""
-
-#: ../images/myrtille.glade.h:33
-msgid ""
-"This program is free software; you can redistribute it and/or\n"
-"modify it under the terms of the GNU General Public License\n"
-"as published by the Free Software Foundation; either \n"
-"version 2 of the License, or (at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied \n"
-"warranty of MERCHANTABILITY or FITNESS FOR A \n"
-"PARTICULAR PURPOSE.  See the GNU General Public \n"
-"License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public\n"
-"License along with this program; if not, write to the \n"
-"Free Software Foundation, \n"
-"Inc., 59 Temple Place - \n"
-"Suite 330, Boston, MA 02111-1307, USA."
-msgstr ""
-
-#: ../images/myrtille.glade.h:49
-msgid "Transparency level"
-msgstr ""
-
-#: ../images/myrtille.glade.h:50
-msgid "Web Cam"
-msgstr ""
-
-#: ../images/myrtille.glade.h:51
-msgid "_File"
-msgstr ""
-
-#: ../images/myrtille.glade.h:52
-msgid "_Help"
-msgstr ""
-
-#: ../images/myrtille.glade.h:53
-msgid "expander"
-msgstr ""
-
-#: ../images/myrtille.glade.h:54
-msgid "gtk-about"
-msgstr ""
-
-#: ../images/myrtille.glade.h:55
-msgid "gtk-apply"
-msgstr ""
-
-#: ../images/myrtille.glade.h:56
-msgid "gtk-cancel"
-msgstr ""
-
-#: ../images/myrtille.glade.h:57
-msgid "gtk-close"
-msgstr ""
-
-#: ../images/myrtille.glade.h:58
-msgid "gtk-new"
-msgstr ""
-
-#: ../images/myrtille.glade.h:59
-msgid "gtk-ok"
-msgstr ""
-
-#: ../images/myrtille.glade.h:60
-msgid "gtk-open"
-msgstr ""
-
-#: ../images/myrtille.glade.h:61
-msgid "gtk-quit"
-msgstr ""
-
-#: ../images/myrtille.glade.h:62
-msgid "gtk-save"
-msgstr ""
-
-#: ../images/myrtille.glade.h:63
-msgid "gtk-save-as"
-msgstr ""
-
-#: ../images/myrtille.glade.h:64
-msgid "myrtille on line"
-msgstr ""