diff -Nru myrtille-0.6.1rc6/debian/changelog myrtille-0.6.1rc7/debian/changelog --- myrtille-0.6.1rc6/debian/changelog 2009-01-03 23:59:25.000000000 +0000 +++ myrtille-0.6.1rc7/debian/changelog 2009-01-04 22:51:02.000000000 +0000 @@ -1,3 +1,14 @@ +myrtille (0.6.1rc7) intrepid; urgency=low + * Bug #202958 fix available: Files exported by myrtille are unviewable with Gnome totem video player + * Bug #274973 first version : allow grabbing from v4l2 webcams - for test + makefile update + * Bug #274973 New project assistant updated with summary and simplification + of gui + * Bug #280674: GUI is frozen during video export + * Bug #313556: i18n update for myrtille 0.6.1. French traduction correction by lili + * correction on launchpad dput usage + * Singleton class added, correction on myrtille_drawaera.py after tests, retab of myrtille_export.py + * changelog set for intrepid + -- Nicolas Bertrand Sun, 04 Jan 2009 23:48:39 +0100 myrtille (0.6.1rc6) intrepid; urgency=low * Bug #202958 fix available: Files exported by myrtille are unviewable with Gnome totem video player * Bug #274973 first version : allow grabbing from v4l2 webcams - for test + makefile update diff -Nru /tmp/Cw9PZGt1Jj/myrtille-0.6.1rc6/images/myrtille.glade /tmp/xXrIe6pWIT/myrtille-0.6.1rc7/images/myrtille.glade --- myrtille-0.6.1rc6/images/myrtille.glade 2009-01-03 00:55:14.000000000 +0000 +++ myrtille-0.6.1rc7/images/myrtille.glade 2009-01-04 22:42:17.000000000 +0000 @@ -1,6 +1,6 @@ - +

@@ -925,7 +925,6 @@ True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True @@ -1149,7 +1148,6 @@ True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True @@ -1570,38 +1568,16 @@ - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False 2 - - - - - - - - GTK_ASSISTANT_PAGE_INTRO - - - - - 0 - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - + 69 True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -1611,7 +1587,7 @@ False False - 1 + 3 @@ -1655,7 +1631,7 @@ - 2 + 4 @@ -1723,19 +1699,17 @@ False False - 3 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 4 + 5 + + GTK_ASSISTANT_PAGE_INTRO + New project creation + + + + @@ -1945,6 +1919,9 @@ + + Hardware selection + @@ -1953,7 +1930,6 @@ 40 True - False @@ -1977,14 +1953,7 @@ True - - True - True - radiobutton - 0 - True - True - + @@ -1995,18 +1964,6 @@ - - True - True - 5 - 6 - GTK_WRAP_WORD - - - 1 - - - @@ -2016,17 +1973,46 @@ - Webcam Detection + Webcam detection - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Confirmation page + + + 15 + True + + + False + False + + + + + True + True + + + 1 + + + + + 15 + True + + + False + False + 2 + + GTK_ASSISTANT_PAGE_CONFIRM + Mytille project summary @@ -2359,8 +2345,8 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True - False GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER + False Select a folder diff -Nru /tmp/Cw9PZGt1Jj/myrtille-0.6.1rc6/myrtLib/myrtille_acquisition.py /tmp/xXrIe6pWIT/myrtille-0.6.1rc7/myrtLib/myrtille_acquisition.py --- myrtille-0.6.1rc6/myrtLib/myrtille_acquisition.py 2009-01-03 00:55:14.000000000 +0000 +++ myrtille-0.6.1rc7/myrtLib/myrtille_acquisition.py 2009-01-04 22:42:17.000000000 +0000 @@ -202,12 +202,8 @@ def __init__(self,displayWidget,IsOnionSkinActive = False,data=None): """ module init as parent + new param (data) """ - myrtille_acquisition.__init__( self, displayWidget, HardType = MCONST.WEBCAM ) - - print "Test purpose , %s "%self.__class__.__name__ - for k,v in data.iteritems() : print k,v # add webcam data info to gst obj self.GstObj.webcam_data = data diff -Nru /tmp/Cw9PZGt1Jj/myrtille-0.6.1rc6/myrtLib/myrtille_assistant_new_project.py /tmp/xXrIe6pWIT/myrtille-0.6.1rc7/myrtLib/myrtille_assistant_new_project.py --- myrtille-0.6.1rc6/myrtLib/myrtille_assistant_new_project.py 2009-01-03 00:55:14.000000000 +0000 +++ myrtille-0.6.1rc7/myrtLib/myrtille_assistant_new_project.py 2009-01-04 22:42:17.000000000 +0000 @@ -97,25 +97,22 @@ self.assistantTree.signal_autoconnect (dic) self.assistant.show_all() - print "Nombre de pages %s"%self.assistant.get_n_pages() + #debug purpose + #print "Nombre de pages %s"%self.assistant.get_n_pages() - # forward button active by default in Page 0 - Page0=self.assistantTree.get_widget("Page0") - self.assistant.set_page_complete(Page0,True) - - self.Page1=self.assistantTree.get_widget("Page1") + self.Page0=self.assistantTree.get_widget("Page0") # forward button active by default in Page 2 Page2=self.assistantTree.get_widget("Page2") self.assistant.set_page_complete(Page2,True) # aply button active by default in Page 4 - Page4=self.assistantTree.get_widget("Page4") - self.assistant.set_page_complete(Page4,True) + Page_summary=self.assistantTree.get_widget("Page_summary") + self.assistant.set_page_complete(Page_summary,True) # get webcam_page - self.page3 = self.assistantTree.get_widget("Page_webcam") - + self.page_webcam_detection = self.assistantTree.get_widget("Page_webcam") + self.assistant.set_forward_page_func(self.page_func) @@ -134,6 +131,7 @@ if value < 1 : value =1 (fpsDisplay,NbFrame) = MCONST.VIDEO_FPS_TABLE[int(value)] self.project_datas['FPI']= NbFrame + self.project_datas['fpsDisplay']= fpsDisplay self._GuiObj = MG.myrtille_global.dico['appgui'] @@ -153,12 +151,12 @@ def project_name_changed(self,widget): self.name_changed = True if (self.is_page1_complete()) : - self.assistant.set_page_complete(self.Page1,True) + self.assistant.set_page_complete(self.Page0,True) def project_dir_changed(self,widget): self.project_dir_changed = True if (self.is_page1_complete()) : - self.assistant.set_page_complete(self.Page1,True) + self.assistant.set_page_complete(self.Page0,True) def button_dir_clicked(self,widget) : @@ -169,7 +167,7 @@ (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN, gtk.RESPONSE_OK)) dir_dialog.set_default_response(gtk.RESPONSE_OK) - #dir_dialog.set_current_folder("/home/nico") + dir_dialog.set_current_folder(os.path.expandvars('$HOME')) response = dir_dialog.run() if response == gtk.RESPONSE_OK: @@ -193,27 +191,20 @@ self.assistant.destroy() def assitant_prepare(self,assistant,page) : - #print " assitant_prepare : current page %s "%assistant.get_current_page() - #print "assitant_prepare self %s page %s Widget %s "%(self,page,assistant) - #page.show_all() - if assistant.get_current_page() == 3 : self.assitant_prepare_page3(page) + """ action performed at the beginning of a new page : prepare page""" + # prepare webcam detection + if assistant.get_current_page() == 2 : self.assistant_prepare_webcam_detection(page) + # prepare summary page + if assistant.get_current_page() == 3 : self.assistant_prepare_summary_page(page) def on_webcam_radio_button_clicked(self,widget,webcam_index,webcam_obj): - print "radio button clicked %s" % type(widget) - Text = gtk.TextBuffer() - Text.set_text("un essai de texte \n %s"%webcam_obj.webcam_devices[webcam_index]["webcam_data"] ) - my_text_view = self.assistantTree.get_widget("textview1") - my_text_view.set_buffer(Text) - - # save gstreamer info - print " Webcam bin Data" + """ save info on selected webcam """ + # when a webcam is selected select webcam data self.project_datas['webcam_bin_data'] = webcam_obj.get_gst_best_input(webcam_index) - - def _on_page3_complete(self,webcam_obj) : - """ callback for page 3 complete """ - page3 = self.assistant.get_nth_page(3) - self.assistant.set_page_complete(page3,True) + def _on_webcam_detect_complete(self,webcam_obj) : + """ callback , executed when webcam detection is complete """ + self.assistant.set_page_complete(self.page_webcam_detection,True) label = self.assistantTree.get_widget("label11") if webcam_obj != None and webcam_obj.webcam_devices != None: vbox = self.assistantTree.get_widget("vbox_webcam_list") @@ -228,34 +219,83 @@ RadioButton.show() #connect event - RadioButton.connect("clicked",self.on_webcam_radio_button_clicked, webcam["webcam_data"]) RadioButton.connect("clicked",self.on_webcam_radio_button_clicked,webcam_index,webcam_obj ) # First set if webcam_index == 0 : # select by default. self.project_datas['webcam_bin_data'] = webcam_obj.get_gst_best_input(webcam_index) - - - label.set_text(_('Detected webcam')) else : label.set_text(_('No webcam detected')) label.show() - def assitant_prepare_page3(self,page) : - """ prepare page 3 : The webcam detection page """ + def assistant_prepare_webcam_detection(self,page) : + """ prepare page for the webcam detection page """ self.assistant.set_page_complete(page,False) progress_bar = self.assistantTree.get_widget("progressbar_webcam") # hide label status for webcam status label = self.assistantTree.get_widget("label11") label.hide() - t_webcam = Webcam_detection_thread(progress_bar,self._on_page3_complete) + # launch webcam detection thread + t_webcam = Webcam_detection_thread(progress_bar,self._on_webcam_detect_complete) t_webcam.start() + + def assistant_prepare_summary_page(self,page) : + """ prepare sumary page """ + textview_widget =self.assistantTree.get_widget("textview1_summary") + textbuffer = textview_widget.get_buffer() + string="" + text_list=list() + + # display project name + string = "%s : %s"%( _('Project Name'), self.project_datas['projectName']) + text_list.append(string) + + # display project path + string = "%s : %s \n"%( _('Project Path'), self.project_datas['projectDir']) + text_list.append(string) + + # display project FPI + string = "%s : %s "%( _('Number of frames per seconds'), self.project_datas['fpsDisplay']) + text_list.append(string) + + # display Hardware type + string = "%s : %s "%( _('Hardware type'), MCONST.HardTypeName[self.project_datas['HardType']] ) + text_list.append(string) + + # display info specific for webcam + if ( self.project_datas['HardType'] == MCONST.WEBCAM ) : + # webcam name + string = "\n%s : %s"%(_('Webcam name'),self.project_datas['webcam_bin_data']['name']) + text_list.append(string) + + #webcam device + string = "%s : %s"%(_('Webcam device'),self.project_datas['webcam_bin_data']['device']) + text_list.append(string) + + #webcam resolution + string = "%s : %sx%s"%( _('Webcam resolution used'), + self.project_datas['webcam_bin_data']['width'], + self.project_datas['webcam_bin_data']['height']) + text_list.append(string) + + #webcam device + string = "%s : %s"%(_('Webcam driver used'),self.project_datas['webcam_bin_data']['source_input']) + text_list.append(string) + + + # Final message + string = "\n %s "%(_('Have fun wityh myrtille !')) + text_list.append(string) + + string = "\n".join(text_list) + + textbuffer.set_text(string) - def verify_page1_ok(self): + def verify_project_path_data(self): """ Verify if datas in page 1 are OK and save valid datas """ - if ( self.assistant.get_page_complete(self.Page1)) : + if ( self.assistant.get_page_complete(self.Page0)) : state = True # Verify that a project name is entered ProjectNameEntry = self.assistantTree.get_widget('entry_project_name') @@ -286,38 +326,24 @@ state =False return state - def verify_page2_ok(self): - """ Verify if datas in page 2 are OK and save valid datas """ - state = True - # radoibutton yet updated via radiobutton_toggled callbacl - #just for security save the value of FPI if nothing is changed - #FPIWidget = self.assistantTree.get_widget('spinbutton_ips') - #self.project_datas['FPI']=FPIWidget.get_value_as_int() - return state - def verify_page_ok(self,num_page) : state = False if (num_page == 0) : - state = True - if (num_page == 1) : - state = self.verify_page1_ok() - if (num_page == 2) : - state = self.verify_page2_ok() - if (num_page == 3) : + # check data given as parameter + state = self.verify_project_path_data() + else : state = True return state def page_func(self,page_num) : """ call back to verify the validity of the pages """ - print "page_num in page_func = ",page_num - page_out = page_num if (self.verify_page_ok(page_num)) : - if (page_out == 2 ) and (self.project_datas['HardType'] != MCONST.WEBCAM) : - # if web cam selected go to page 3 - # else go to page 4 - page_out = 4 + if (page_out == 1 ) and (self.project_datas['HardType'] != MCONST.WEBCAM) : + # if web cam selected go to page 2 + # else go to page 3 + page_out = 3 else : page_out = page_out +1 @@ -345,6 +371,7 @@ # get the choosen number of frame per image value (fpsDisplay,NbFrame) = MCONST.VIDEO_FPS_TABLE[int(value)] self.project_datas['FPI']= NbFrame + self.project_datas['fpsDisplay']= fpsDisplay def scale_fps_format_value(self,widget,value) : """ Fps Scale value changed""" diff -Nru /tmp/Cw9PZGt1Jj/myrtille-0.6.1rc6/myrtLib/myrtille_file_in_out.py /tmp/xXrIe6pWIT/myrtille-0.6.1rc7/myrtLib/myrtille_file_in_out.py --- myrtille-0.6.1rc6/myrtLib/myrtille_file_in_out.py 2009-01-03 00:55:14.000000000 +0000 +++ myrtille-0.6.1rc7/myrtLib/myrtille_file_in_out.py 2009-01-04 22:42:17.000000000 +0000 @@ -248,7 +248,6 @@ hard_type_desc = ET.SubElement(elem, 'hard_type_desc') hard_type_desc.text=MCONST.HardTypeName[projectData['HardType']] # in case of webcam save specific data - print projectData if projectData['HardType'] == MCONST.WEBCAM and projectData['webcam_bin_data'] != None : hard_type_data = ET.SubElement(elem, 'hard_type_data') # create new elements with same tage name as dictionary @@ -488,7 +487,6 @@ # get hardtype elem=self.__doc_et.find("metas/hardtype") self.datas.hardtype = int(elem.attrib["id"]) - print "HardType Choosen : ",self.datas.hardtype #update fpi in project and Gui self.datas.fpi = self.__doc_et.findtext("metas/fpi") @@ -616,7 +614,6 @@ def f_get_fpi(self) : return int(self._fpi) def f_set_fpi(self,x) : - print "set_fpi : passe t on par la ? " self._fpi=int(x) fpi = property(f_get_fpi,f_set_fpi,None,"Frame per second rate") diff -Nru /tmp/Cw9PZGt1Jj/myrtille-0.6.1rc6/myrtLib/myrtille_gstreamer.py /tmp/xXrIe6pWIT/myrtille-0.6.1rc7/myrtLib/myrtille_gstreamer.py --- myrtille-0.6.1rc6/myrtLib/myrtille_gstreamer.py 2009-01-03 00:55:14.000000000 +0000 +++ myrtille-0.6.1rc7/myrtLib/myrtille_gstreamer.py 2009-01-04 22:42:17.000000000 +0000 @@ -206,7 +206,6 @@ |___________________________________________________________|____ """ - print " Test purpose : width: %s, height: %s, source: %s, device: %s"%(width,height,source_input,device) self.__gobject_init__() ImageBinElems=[] diff -Nru /tmp/Cw9PZGt1Jj/myrtille-0.6.1rc6/myrtLib/myrtWebCamDetect/myrtille_webcam_detection.py /tmp/xXrIe6pWIT/myrtille-0.6.1rc7/myrtLib/myrtWebCamDetect/myrtille_webcam_detection.py --- myrtille-0.6.1rc6/myrtLib/myrtWebCamDetect/myrtille_webcam_detection.py 2009-01-03 00:55:14.000000000 +0000 +++ myrtille-0.6.1rc7/myrtLib/myrtWebCamDetect/myrtille_webcam_detection.py 2009-01-04 22:42:17.000000000 +0000 @@ -63,7 +63,6 @@ The method returns a dict with the following keys : """ - print "get_gst_best_input" video_formats = self._webcam_devices[webcam_device_index]['webcam_data']['video_formats'] mimetypes = ('video/x-raw-yuv','video/x-raw-rgb','image/jpeg') (width,height)=(None,None) @@ -84,6 +83,7 @@ webcam_bin_data['height'] = height webcam_bin_data['source_input'] = self._webcam_devices[webcam_device_index]['webcam_data']['gstreamer_src'] webcam_bin_data['device'] = self._webcam_devices[webcam_device_index]['device'] + webcam_bin_data['name'] = self._webcam_devices[webcam_device_index]['name'] return webcam_bin_data @@ -268,8 +268,9 @@ result = sorted(res_list, key=itemgetter('width')) result.reverse() webcam_device["video_formats"][mimetype] = result - for mimetype,res_list in webcam_device["video_formats"].iteritems(): - print "----- %s : %s"%(mimetype,res_list) + # debug purpose + #for mimetype,res_list in webcam_device["video_formats"].iteritems(): + # print "----- %s : %s"%(mimetype,res_list) gst_get_supported_video_formats = staticmethod(__gst_get_supported_video_formats) diff -Nru /tmp/Cw9PZGt1Jj/myrtille-0.6.1rc6/po/en_EN.po /tmp/xXrIe6pWIT/myrtille-0.6.1rc7/po/en_EN.po --- myrtille-0.6.1rc6/po/en_EN.po 2009-01-03 22:48:28.000000000 +0000 +++ myrtille-0.6.1rc7/po/en_EN.po 2009-01-04 22:42:17.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: myrtille-i 18n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-03 21:47+0100\n" +"POT-Creation-Date: 2009-01-04 23:15+0100\n" "PO-Revision-Date: 2008-05-08 18:51+0200\n" "Last-Translator: nico \n" "Language-Team: English\n" @@ -64,14 +64,10 @@ msgstr "" #: ../images/myrtille.glade.h:13 -msgid "Confirmation page" -msgstr "" - -#: ../images/myrtille.glade.h:14 msgid "DV cam" msgstr "DV cam" -#: ../images/myrtille.glade.h:15 +#: ../images/myrtille.glade.h:14 #, fuzzy msgid "" "DV format (raw DV)\n" @@ -82,139 +78,139 @@ "Format DVD (mpeg2)\n" "Format divx/xvid (avi)" -#: ../images/myrtille.glade.h:18 +#: ../images/myrtille.glade.h:17 msgid "Export ..." msgstr "Export ..." -#: ../images/myrtille.glade.h:19 +#: ../images/myrtille.glade.h:18 #, fuzzy msgid "Export path:" msgstr "Export" -#: ../images/myrtille.glade.h:20 +#: ../images/myrtille.glade.h:19 msgid "Export video with sound." msgstr "" -#: ../images/myrtille.glade.h:21 +#: ../images/myrtille.glade.h:20 msgid "File export" msgstr "" -#: ../images/myrtille.glade.h:22 +#: ../images/myrtille.glade.h:21 msgid "File format :" msgstr "" -#: ../images/myrtille.glade.h:23 +#: ../images/myrtille.glade.h:22 msgid "Folder" msgstr "" -#: ../images/myrtille.glade.h:24 +#: ../images/myrtille.glade.h:23 msgid "Images import" msgstr "" -#: ../images/myrtille.glade.h:25 +#: ../images/myrtille.glade.h:24 #, fuzzy msgid "Images per second number" msgstr "Images par seconde" -#: ../images/myrtille.glade.h:26 +#: ../images/myrtille.glade.h:25 #, fuzzy msgid "Images per seconds" msgstr "Images par secondes" #. Caller une image sur le flux video -#: ../images/myrtille.glade.h:28 +#: ../images/myrtille.glade.h:27 msgid "Mix an image with video stream" msgstr "" -#: ../images/myrtille.glade.h:29 +#: ../images/myrtille.glade.h:28 msgid "Mixer" msgstr "Mixer" -#: ../images/myrtille.glade.h:30 +#: ../images/myrtille.glade.h:29 msgid "Mixer activation (onion skin)" msgstr "" -#: ../images/myrtille.glade.h:31 +#: ../images/myrtille.glade.h:30 msgid "Montage" msgstr "Montage" #. Descendre un/ou plusieurs images -#: ../images/myrtille.glade.h:33 +#: ../images/myrtille.glade.h:32 msgid "Move down one or several images" msgstr "" #. Déplacer des images capturées dans la zone de montage -#: ../images/myrtille.glade.h:35 +#: ../images/myrtille.glade.h:34 msgid "Move snapshot to montage area" msgstr "" #. Monter un/ou plusieurs images -#: ../images/myrtille.glade.h:37 +#: ../images/myrtille.glade.h:36 msgid "Move up one or several images" msgstr "" #. Non Disponible -#: ../images/myrtille.glade.h:39 +#: ../images/myrtille.glade.h:38 msgid "Not available" msgstr "" #. Non Disponible -#: ../images/myrtille.glade.h:41 +#: ../images/myrtille.glade.h:40 msgid "Not available." msgstr "" -#: ../images/myrtille.glade.h:42 +#: ../images/myrtille.glade.h:41 msgid "Open Recent" msgstr "" #. Jouer le film -#: ../images/myrtille.glade.h:44 +#: ../images/myrtille.glade.h:43 msgid "Play movie" msgstr "" -#: ../images/myrtille.glade.h:45 +#: ../images/myrtille.glade.h:44 msgid "Project name" msgstr "" -#: ../images/myrtille.glade.h:46 +#: ../images/myrtille.glade.h:45 msgid "Recent1" msgstr "" -#: ../images/myrtille.glade.h:47 +#: ../images/myrtille.glade.h:46 msgid "Recent2" msgstr "" -#: ../images/myrtille.glade.h:48 +#: ../images/myrtille.glade.h:47 msgid "Recent3" msgstr "" -#: ../images/myrtille.glade.h:49 +#: ../images/myrtille.glade.h:48 msgid "Select a folder" msgstr "" -#: ../images/myrtille.glade.h:50 +#: ../images/myrtille.glade.h:49 msgid "Select a myrtille project file" msgstr "Select a myrtille project file" -#: ../images/myrtille.glade.h:51 +#: ../images/myrtille.glade.h:50 #, fuzzy msgid "Select an image to import" msgstr "Choisir une image a importer" -#: ../images/myrtille.glade.h:52 +#: ../images/myrtille.glade.h:51 msgid "Select project name and destination folder.\n" msgstr "" -#: ../images/myrtille.glade.h:54 +#: ../images/myrtille.glade.h:53 msgid "Snapshot" msgstr "" -#: ../images/myrtille.glade.h:55 +#: ../images/myrtille.glade.h:54 msgid "" "This assistant will help you on configuration of a new myrtille project." msgstr "" -#: ../images/myrtille.glade.h:56 +#: ../images/myrtille.glade.h:55 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" @@ -251,84 +247,80 @@ "Suite 330, Boston, MA 02111-1307, USA." #. Jeter à la poubelle -#: ../images/myrtille.glade.h:73 +#: ../images/myrtille.glade.h:72 msgid "To trash" msgstr "" -#: ../images/myrtille.glade.h:74 +#: ../images/myrtille.glade.h:73 msgid "Transparency level" msgstr "" -#: ../images/myrtille.glade.h:75 +#: ../images/myrtille.glade.h:74 msgid "Web Cam" msgstr "Web Cam" -#: ../images/myrtille.glade.h:76 +#: ../images/myrtille.glade.h:75 #, fuzzy msgid "_File" msgstr "_Fichier" -#: ../images/myrtille.glade.h:77 +#: ../images/myrtille.glade.h:76 msgid "_Help" msgstr "" -#: ../images/myrtille.glade.h:78 +#: ../images/myrtille.glade.h:77 msgid "gtk-about" msgstr "gtk-about" -#: ../images/myrtille.glade.h:79 +#: ../images/myrtille.glade.h:78 msgid "gtk-apply" msgstr "gtk-apply" -#: ../images/myrtille.glade.h:80 +#: ../images/myrtille.glade.h:79 msgid "gtk-cancel" msgstr "gtk-cancel" -#: ../images/myrtille.glade.h:81 +#: ../images/myrtille.glade.h:80 msgid "gtk-close" msgstr "gtk-close" -#: ../images/myrtille.glade.h:82 +#: ../images/myrtille.glade.h:81 msgid "gtk-new" msgstr "gtk-new" -#: ../images/myrtille.glade.h:83 +#: ../images/myrtille.glade.h:82 msgid "gtk-ok" msgstr "gtk-ok" -#: ../images/myrtille.glade.h:84 +#: ../images/myrtille.glade.h:83 msgid "gtk-open" msgstr "gtk-open" -#: ../images/myrtille.glade.h:85 +#: ../images/myrtille.glade.h:84 msgid "gtk-quit" msgstr "gtk-quit" -#: ../images/myrtille.glade.h:86 +#: ../images/myrtille.glade.h:85 msgid "gtk-save" msgstr "gtk-save" -#: ../images/myrtille.glade.h:87 +#: ../images/myrtille.glade.h:86 msgid "gtk-save-as" msgstr "gtk-save-as" #. Capturer une image -#: ../images/myrtille.glade.h:89 +#: ../images/myrtille.glade.h:88 msgid "make a snapshot" msgstr "" -#: ../images/myrtille.glade.h:90 +#: ../images/myrtille.glade.h:89 msgid "myrtille on line" msgstr "myrtille on line" -#: ../images/myrtille.glade.h:91 +#: ../images/myrtille.glade.h:90 msgid "options" msgstr "" -#: ../images/myrtille.glade.h:92 -msgid "radiobutton" -msgstr "" - #: ../myrtLib/myrtille_class.py:246 msgid "image" msgstr "" @@ -341,6 +333,75 @@ msgid "Timestamp" msgstr "" +#. file exists +#: ../myrtLib/myrtille_export_window.py:162 +#, python-format +msgid "File %s exists. Replace file ?" +msgstr "" + +#: ../myrtLib/myrtille_assistant_new_project.py:63 +msgid "Please wait for webcam detection" +msgstr "" + +#: ../myrtLib/myrtille_assistant_new_project.py:67 +msgid "Webcam detection done" +msgstr "" + +#: ../myrtLib/myrtille_assistant_new_project.py:230 +msgid "Detected webcam" +msgstr "" + +#: ../myrtLib/myrtille_assistant_new_project.py:232 +msgid "No webcam detected" +msgstr "" + +#. display project name +#: ../myrtLib/myrtille_assistant_new_project.py:257 +msgid "Project Name" +msgstr "" + +#. display project path +#: ../myrtLib/myrtille_assistant_new_project.py:261 +msgid "Project Path" +msgstr "" + +#. display project FPI +#: ../myrtLib/myrtille_assistant_new_project.py:265 +#, fuzzy +msgid "Number of frames per seconds" +msgstr "Images par secondes" + +#. display Hardware type +#: ../myrtLib/myrtille_assistant_new_project.py:269 +msgid "Hardware type" +msgstr "" + +#. webcam name +#: ../myrtLib/myrtille_assistant_new_project.py:275 +#, fuzzy +msgid "Webcam name" +msgstr "Web Cam" + +#. webcam device +#: ../myrtLib/myrtille_assistant_new_project.py:279 +msgid "Webcam device" +msgstr "" + +#. webcam resolution +#: ../myrtLib/myrtille_assistant_new_project.py:283 +msgid "Webcam resolution used" +msgstr "" + +#. webcam device +#: ../myrtLib/myrtille_assistant_new_project.py:289 +msgid "Webcam driver used" +msgstr "" + +#. Final message +#: ../myrtLib/myrtille_assistant_new_project.py:294 +msgid "Have fun wityh myrtille !" +msgstr "" + #: ../myrtLib/myrtExport/myrtille_export.py:69 msgid "Pass 1/2" msgstr "" @@ -360,12 +421,6 @@ msgid "Export Canceled" msgstr "Export" -#. file exists -#: ../myrtLib/myrtille_export_window.py:162 -#, python-format -msgid "File %s exists. Replace file ?" -msgstr "" - #~ msgid "Export" #~ msgstr "Export" diff -Nru /tmp/Cw9PZGt1Jj/myrtille-0.6.1rc6/po/en_US.po /tmp/xXrIe6pWIT/myrtille-0.6.1rc7/po/en_US.po --- myrtille-0.6.1rc6/po/en_US.po 2009-01-03 22:48:28.000000000 +0000 +++ myrtille-0.6.1rc7/po/en_US.po 2009-01-04 22:42:17.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: myrtille-i 18n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-03 21:47+0100\n" +"POT-Creation-Date: 2009-01-04 23:15+0100\n" "PO-Revision-Date: 2008-06-22 10:32+0200\n" "Last-Translator: nico \n" "Language-Team: English\n" @@ -67,14 +67,10 @@ msgstr "Choose export format." #: ../images/myrtille.glade.h:13 -msgid "Confirmation page" -msgstr "Confirmation page" - -#: ../images/myrtille.glade.h:14 msgid "DV cam" msgstr "DV cam" -#: ../images/myrtille.glade.h:15 +#: ../images/myrtille.glade.h:14 msgid "" "DV format (raw DV)\n" "Format DVD (mpeg2)\n" @@ -84,137 +80,137 @@ "Format DVD (mpeg2)\n" "Format divx/xvid (avi)" -#: ../images/myrtille.glade.h:18 +#: ../images/myrtille.glade.h:17 msgid "Export ..." msgstr "Export ..." -#: ../images/myrtille.glade.h:19 +#: ../images/myrtille.glade.h:18 msgid "Export path:" msgstr "Export path:" -#: ../images/myrtille.glade.h:20 +#: ../images/myrtille.glade.h:19 msgid "Export video with sound." msgstr "Export video with sound." -#: ../images/myrtille.glade.h:21 +#: ../images/myrtille.glade.h:20 msgid "File export" msgstr "File export" -#: ../images/myrtille.glade.h:22 +#: ../images/myrtille.glade.h:21 msgid "File format :" msgstr "File format :" -#: ../images/myrtille.glade.h:23 +#: ../images/myrtille.glade.h:22 msgid "Folder" msgstr "Folder" -#: ../images/myrtille.glade.h:24 +#: ../images/myrtille.glade.h:23 msgid "Images import" msgstr "" -#: ../images/myrtille.glade.h:25 +#: ../images/myrtille.glade.h:24 #, fuzzy msgid "Images per second number" msgstr "Images per seconds" -#: ../images/myrtille.glade.h:26 +#: ../images/myrtille.glade.h:25 msgid "Images per seconds" msgstr "Images per seconds" #. Caller une image sur le flux video -#: ../images/myrtille.glade.h:28 +#: ../images/myrtille.glade.h:27 msgid "Mix an image with video stream" msgstr "" -#: ../images/myrtille.glade.h:29 +#: ../images/myrtille.glade.h:28 msgid "Mixer" msgstr "Mixer" -#: ../images/myrtille.glade.h:30 +#: ../images/myrtille.glade.h:29 msgid "Mixer activation (onion skin)" msgstr "" -#: ../images/myrtille.glade.h:31 +#: ../images/myrtille.glade.h:30 msgid "Montage" msgstr "Montage" #. Descendre un/ou plusieurs images -#: ../images/myrtille.glade.h:33 +#: ../images/myrtille.glade.h:32 msgid "Move down one or several images" msgstr "" #. Déplacer des images capturées dans la zone de montage -#: ../images/myrtille.glade.h:35 +#: ../images/myrtille.glade.h:34 msgid "Move snapshot to montage area" msgstr "" #. Monter un/ou plusieurs images -#: ../images/myrtille.glade.h:37 +#: ../images/myrtille.glade.h:36 msgid "Move up one or several images" msgstr "" #. Non Disponible -#: ../images/myrtille.glade.h:39 +#: ../images/myrtille.glade.h:38 msgid "Not available" msgstr "" #. Non Disponible -#: ../images/myrtille.glade.h:41 +#: ../images/myrtille.glade.h:40 msgid "Not available." msgstr "" -#: ../images/myrtille.glade.h:42 +#: ../images/myrtille.glade.h:41 msgid "Open Recent" msgstr "" #. Jouer le film -#: ../images/myrtille.glade.h:44 +#: ../images/myrtille.glade.h:43 msgid "Play movie" msgstr "" -#: ../images/myrtille.glade.h:45 +#: ../images/myrtille.glade.h:44 msgid "Project name" msgstr "Project name" -#: ../images/myrtille.glade.h:46 +#: ../images/myrtille.glade.h:45 msgid "Recent1" msgstr "" -#: ../images/myrtille.glade.h:47 +#: ../images/myrtille.glade.h:46 msgid "Recent2" msgstr "" -#: ../images/myrtille.glade.h:48 +#: ../images/myrtille.glade.h:47 msgid "Recent3" msgstr "" -#: ../images/myrtille.glade.h:49 +#: ../images/myrtille.glade.h:48 msgid "Select a folder" msgstr "Select a folder" -#: ../images/myrtille.glade.h:50 +#: ../images/myrtille.glade.h:49 msgid "Select a myrtille project file" msgstr "Select a myrtille project file" -#: ../images/myrtille.glade.h:51 +#: ../images/myrtille.glade.h:50 msgid "Select an image to import" msgstr "Select an image to import" -#: ../images/myrtille.glade.h:52 +#: ../images/myrtille.glade.h:51 msgid "Select project name and destination folder.\n" msgstr "Select project name and destination folder.\n" -#: ../images/myrtille.glade.h:54 +#: ../images/myrtille.glade.h:53 msgid "Snapshot" msgstr "Snapshot" -#: ../images/myrtille.glade.h:55 +#: ../images/myrtille.glade.h:54 msgid "" "This assistant will help you on configuration of a new myrtille project." msgstr "" "This assistant will help you on configuration of a new myrtille project." -#: ../images/myrtille.glade.h:56 +#: ../images/myrtille.glade.h:55 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" @@ -251,84 +247,80 @@ "Suite 330, Boston, MA 02111-1307, USA." #. Jeter à la poubelle -#: ../images/myrtille.glade.h:73 +#: ../images/myrtille.glade.h:72 msgid "To trash" msgstr "" -#: ../images/myrtille.glade.h:74 +#: ../images/myrtille.glade.h:73 msgid "Transparency level" msgstr "Transparency level" -#: ../images/myrtille.glade.h:75 +#: ../images/myrtille.glade.h:74 msgid "Web Cam" msgstr "Web Cam" -#: ../images/myrtille.glade.h:76 +#: ../images/myrtille.glade.h:75 msgid "_File" msgstr "_File" -#: ../images/myrtille.glade.h:77 +#: ../images/myrtille.glade.h:76 msgid "_Help" msgstr "_Help" -#: ../images/myrtille.glade.h:78 +#: ../images/myrtille.glade.h:77 msgid "gtk-about" msgstr "gtk-about" -#: ../images/myrtille.glade.h:79 +#: ../images/myrtille.glade.h:78 msgid "gtk-apply" msgstr "gtk-apply" -#: ../images/myrtille.glade.h:80 +#: ../images/myrtille.glade.h:79 msgid "gtk-cancel" msgstr "gtk-cancel" -#: ../images/myrtille.glade.h:81 +#: ../images/myrtille.glade.h:80 msgid "gtk-close" msgstr "gtk-close" -#: ../images/myrtille.glade.h:82 +#: ../images/myrtille.glade.h:81 msgid "gtk-new" msgstr "gtk-new" -#: ../images/myrtille.glade.h:83 +#: ../images/myrtille.glade.h:82 msgid "gtk-ok" msgstr "gtk-ok" -#: ../images/myrtille.glade.h:84 +#: ../images/myrtille.glade.h:83 msgid "gtk-open" msgstr "gtk-open" -#: ../images/myrtille.glade.h:85 +#: ../images/myrtille.glade.h:84 msgid "gtk-quit" msgstr "gtk-quit" -#: ../images/myrtille.glade.h:86 +#: ../images/myrtille.glade.h:85 msgid "gtk-save" msgstr "gtk-save" -#: ../images/myrtille.glade.h:87 +#: ../images/myrtille.glade.h:86 msgid "gtk-save-as" msgstr "gtk-save-as" #. Capturer une image -#: ../images/myrtille.glade.h:89 +#: ../images/myrtille.glade.h:88 #, fuzzy msgid "make a snapshot" msgstr "Snapshot" -#: ../images/myrtille.glade.h:90 +#: ../images/myrtille.glade.h:89 msgid "myrtille on line" msgstr "myrtille on line" -#: ../images/myrtille.glade.h:91 +#: ../images/myrtille.glade.h:90 msgid "options" msgstr "" -#: ../images/myrtille.glade.h:92 -msgid "radiobutton" -msgstr "" - #: ../myrtLib/myrtille_class.py:246 msgid "image" msgstr "" @@ -341,6 +333,77 @@ msgid "Timestamp" msgstr "" +#. file exists +#: ../myrtLib/myrtille_export_window.py:162 +#, python-format +msgid "File %s exists. Replace file ?" +msgstr "" + +#: ../myrtLib/myrtille_assistant_new_project.py:63 +msgid "Please wait for webcam detection" +msgstr "" + +#: ../myrtLib/myrtille_assistant_new_project.py:67 +msgid "Webcam detection done" +msgstr "" + +#: ../myrtLib/myrtille_assistant_new_project.py:230 +msgid "Detected webcam" +msgstr "" + +#: ../myrtLib/myrtille_assistant_new_project.py:232 +msgid "No webcam detected" +msgstr "" + +#. display project name +#: ../myrtLib/myrtille_assistant_new_project.py:257 +#, fuzzy +msgid "Project Name" +msgstr "Project name" + +#. display project path +#: ../myrtLib/myrtille_assistant_new_project.py:261 +#, fuzzy +msgid "Project Path" +msgstr "Project name" + +#. display project FPI +#: ../myrtLib/myrtille_assistant_new_project.py:265 +#, fuzzy +msgid "Number of frames per seconds" +msgstr "Images per seconds" + +#. display Hardware type +#: ../myrtLib/myrtille_assistant_new_project.py:269 +msgid "Hardware type" +msgstr "" + +#. webcam name +#: ../myrtLib/myrtille_assistant_new_project.py:275 +#, fuzzy +msgid "Webcam name" +msgstr "Web Cam" + +#. webcam device +#: ../myrtLib/myrtille_assistant_new_project.py:279 +msgid "Webcam device" +msgstr "" + +#. webcam resolution +#: ../myrtLib/myrtille_assistant_new_project.py:283 +msgid "Webcam resolution used" +msgstr "" + +#. webcam device +#: ../myrtLib/myrtille_assistant_new_project.py:289 +msgid "Webcam driver used" +msgstr "" + +#. Final message +#: ../myrtLib/myrtille_assistant_new_project.py:294 +msgid "Have fun wityh myrtille !" +msgstr "" + #: ../myrtLib/myrtExport/myrtille_export.py:69 msgid "Pass 1/2" msgstr "" @@ -360,11 +423,8 @@ msgid "Export Canceled" msgstr "Export" -#. file exists -#: ../myrtLib/myrtille_export_window.py:162 -#, python-format -msgid "File %s exists. Replace file ?" -msgstr "" +#~ msgid "Confirmation page" +#~ msgstr "Confirmation page" #, fuzzy #~ msgid "File exists" diff -Nru /tmp/Cw9PZGt1Jj/myrtille-0.6.1rc6/po/fr_FR.po /tmp/xXrIe6pWIT/myrtille-0.6.1rc7/po/fr_FR.po --- myrtille-0.6.1rc6/po/fr_FR.po 2009-01-03 22:48:28.000000000 +0000 +++ myrtille-0.6.1rc7/po/fr_FR.po 2009-01-04 22:42:17.000000000 +0000 @@ -3,19 +3,19 @@ # This file is distributed under the same license as the myrtille-i package. # nico , 2008. # nico , 2009. -# -# +# +# msgid "" msgstr "" "Project-Id-Version: myrtille export\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-03 21:47+0100\n" +"POT-Creation-Date: 2009-01-04 23:15+0100\n" "PO-Revision-Date: 2009-01-03 21:50+0100\n" "Last-Translator: Lili \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit" +"Content-Transfer-Encoding: 8bit\n" #: ../myrtille.py:456 msgid "Save project before exit ?" @@ -24,8 +24,8 @@ #: ../images/myrtille.glade.h:1 msgid "" "\n" -"Tool for video capture, for making animated cartoon from image per image " -"\n" +"Tool for video capture, for making animated cartoon from image per " +"image \n" msgstr "" "\n" "Outil de capture vidéo, pour la réalisation d'animation image par image \n" @@ -67,14 +67,10 @@ msgstr "Choisir un format d'export" #: ../images/myrtille.glade.h:13 -msgid "Confirmation page" -msgstr "Page de confirmation" - -#: ../images/myrtille.glade.h:14 msgid "DV cam" msgstr "caméra DV" -#: ../images/myrtille.glade.h:15 +#: ../images/myrtille.glade.h:14 msgid "" "DV format (raw DV)\n" "Format DVD (mpeg2)\n" @@ -84,137 +80,137 @@ "Format DVD (mpeg2)\n" "Format divx/xvid (avi)" -#: ../images/myrtille.glade.h:18 +#: ../images/myrtille.glade.h:17 msgid "Export ..." msgstr "Export ..." -#: ../images/myrtille.glade.h:19 +#: ../images/myrtille.glade.h:18 msgid "Export path:" msgstr "Chemin d'export :" -#: ../images/myrtille.glade.h:20 +#: ../images/myrtille.glade.h:19 msgid "Export video with sound." msgstr "Exporter la vidéo avec le son" -#: ../images/myrtille.glade.h:21 +#: ../images/myrtille.glade.h:20 msgid "File export" msgstr "Export du fichier" -#: ../images/myrtille.glade.h:22 +#: ../images/myrtille.glade.h:21 msgid "File format :" msgstr "Format du fichier :" -#: ../images/myrtille.glade.h:23 +#: ../images/myrtille.glade.h:22 msgid "Folder" msgstr "Répertoire" -#: ../images/myrtille.glade.h:24 +#: ../images/myrtille.glade.h:23 msgid "Images import" msgstr "" -#: ../images/myrtille.glade.h:25 +#: ../images/myrtille.glade.h:24 msgid "Images per second number" msgstr "Nombre d'images par seconde" -#: ../images/myrtille.glade.h:26 +#: ../images/myrtille.glade.h:25 msgid "Images per seconds" msgstr "Images par seconde" #. Caller une image sur le flux video -#: ../images/myrtille.glade.h:28 +#: ../images/myrtille.glade.h:27 msgid "Mix an image with video stream" msgstr "Caller une image sur le flux vidéo" -#: ../images/myrtille.glade.h:29 +#: ../images/myrtille.glade.h:28 msgid "Mixer" msgstr "Mixer" -#: ../images/myrtille.glade.h:30 +#: ../images/myrtille.glade.h:29 msgid "Mixer activation (onion skin)" msgstr "Activer le mixer (pelure d'oignon)" -#: ../images/myrtille.glade.h:31 +#: ../images/myrtille.glade.h:30 msgid "Montage" msgstr "Montage" #. Descendre un/ou plusieurs images -#: ../images/myrtille.glade.h:33 +#: ../images/myrtille.glade.h:32 msgid "Move down one or several images" msgstr "Descendre une ou plusieurs images" #. Déplacer des images capturées dans la zone de montage -#: ../images/myrtille.glade.h:35 +#: ../images/myrtille.glade.h:34 msgid "Move snapshot to montage area" msgstr "Déplacer les images capturées dans la zone de montage" #. Monter un/ou plusieurs images -#: ../images/myrtille.glade.h:37 +#: ../images/myrtille.glade.h:36 msgid "Move up one or several images" msgstr "Monter une ou plusieurs images" #. Non Disponible -#: ../images/myrtille.glade.h:39 +#: ../images/myrtille.glade.h:38 msgid "Not available" msgstr "Non disponible" #. Non Disponible -#: ../images/myrtille.glade.h:41 +#: ../images/myrtille.glade.h:40 msgid "Not available." msgstr "Non disponible." -#: ../images/myrtille.glade.h:42 +#: ../images/myrtille.glade.h:41 msgid "Open Recent" msgstr "Récemment ouvert(s)" #. Jouer le film -#: ../images/myrtille.glade.h:44 +#: ../images/myrtille.glade.h:43 msgid "Play movie" msgstr "Visualiser le film" -#: ../images/myrtille.glade.h:45 +#: ../images/myrtille.glade.h:44 msgid "Project name" msgstr "Nom du projet" -#: ../images/myrtille.glade.h:46 +#: ../images/myrtille.glade.h:45 msgid "Recent1" msgstr "" -#: ../images/myrtille.glade.h:47 +#: ../images/myrtille.glade.h:46 msgid "Recent2" msgstr "" -#: ../images/myrtille.glade.h:48 +#: ../images/myrtille.glade.h:47 msgid "Recent3" msgstr "" -#: ../images/myrtille.glade.h:49 +#: ../images/myrtille.glade.h:48 msgid "Select a folder" msgstr "Sélectionner un dossier" -#: ../images/myrtille.glade.h:50 +#: ../images/myrtille.glade.h:49 msgid "Select a myrtille project file" msgstr "Choisir un projet myrtille" -#: ../images/myrtille.glade.h:51 +#: ../images/myrtille.glade.h:50 msgid "Select an image to import" msgstr "Choisir une image à importer" -#: ../images/myrtille.glade.h:52 +#: ../images/myrtille.glade.h:51 msgid "Select project name and destination folder.\n" msgstr "Choisir un nom de projet et un répertoire d'installation.\n" -#: ../images/myrtille.glade.h:54 +#: ../images/myrtille.glade.h:53 msgid "Snapshot" msgstr "Capture" -#: ../images/myrtille.glade.h:55 +#: ../images/myrtille.glade.h:54 msgid "" "This assistant will help you on configuration of a new myrtille project." msgstr "" "Cet assistant va vous aider dans la configuration d'un nouveau projet " "myrtille." -#: ../images/myrtille.glade.h:56 +#: ../images/myrtille.glade.h:55 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" @@ -235,83 +231,79 @@ msgstr "" #. Jeter à la poubelle -#: ../images/myrtille.glade.h:73 +#: ../images/myrtille.glade.h:72 msgid "To trash" msgstr "Mettre à la poubelle" -#: ../images/myrtille.glade.h:74 +#: ../images/myrtille.glade.h:73 msgid "Transparency level" msgstr "Niveau de transparence" -#: ../images/myrtille.glade.h:75 +#: ../images/myrtille.glade.h:74 msgid "Web Cam" msgstr "Webcam" -#: ../images/myrtille.glade.h:76 +#: ../images/myrtille.glade.h:75 msgid "_File" msgstr "_Fichier" -#: ../images/myrtille.glade.h:77 +#: ../images/myrtille.glade.h:76 msgid "_Help" msgstr "Aide" -#: ../images/myrtille.glade.h:78 +#: ../images/myrtille.glade.h:77 msgid "gtk-about" msgstr "" -#: ../images/myrtille.glade.h:79 +#: ../images/myrtille.glade.h:78 msgid "gtk-apply" msgstr "" -#: ../images/myrtille.glade.h:80 +#: ../images/myrtille.glade.h:79 msgid "gtk-cancel" msgstr "" -#: ../images/myrtille.glade.h:81 +#: ../images/myrtille.glade.h:80 msgid "gtk-close" msgstr "" -#: ../images/myrtille.glade.h:82 +#: ../images/myrtille.glade.h:81 msgid "gtk-new" msgstr "" -#: ../images/myrtille.glade.h:83 +#: ../images/myrtille.glade.h:82 msgid "gtk-ok" msgstr "" -#: ../images/myrtille.glade.h:84 +#: ../images/myrtille.glade.h:83 msgid "gtk-open" msgstr "" -#: ../images/myrtille.glade.h:85 +#: ../images/myrtille.glade.h:84 msgid "gtk-quit" msgstr "" -#: ../images/myrtille.glade.h:86 +#: ../images/myrtille.glade.h:85 msgid "gtk-save" msgstr "" -#: ../images/myrtille.glade.h:87 +#: ../images/myrtille.glade.h:86 msgid "gtk-save-as" msgstr "" #. Capturer une image -#: ../images/myrtille.glade.h:89 +#: ../images/myrtille.glade.h:88 msgid "make a snapshot" msgstr "Capturer une image" -#: ../images/myrtille.glade.h:90 +#: ../images/myrtille.glade.h:89 msgid "myrtille on line" msgstr "Myrtille sur le web" -#: ../images/myrtille.glade.h:91 +#: ../images/myrtille.glade.h:90 msgid "options" msgstr "Options" -#: ../images/myrtille.glade.h:92 -msgid "radiobutton" -msgstr " " - #: ../myrtLib/myrtille_class.py:246 msgid "image" msgstr "Image" @@ -324,6 +316,77 @@ msgid "Timestamp" msgstr "Durée" +#. file exists +#: ../myrtLib/myrtille_export_window.py:162 +#, python-format +msgid "File %s exists. Replace file ?" +msgstr "Le Fichier %s existe. Le remplacer ?" + +#: ../myrtLib/myrtille_assistant_new_project.py:63 +msgid "Please wait for webcam detection" +msgstr "" + +#: ../myrtLib/myrtille_assistant_new_project.py:67 +msgid "Webcam detection done" +msgstr "" + +#: ../myrtLib/myrtille_assistant_new_project.py:230 +msgid "Detected webcam" +msgstr "" + +#: ../myrtLib/myrtille_assistant_new_project.py:232 +msgid "No webcam detected" +msgstr "" + +#. display project name +#: ../myrtLib/myrtille_assistant_new_project.py:257 +#, fuzzy +msgid "Project Name" +msgstr "Nom du projet" + +#. display project path +#: ../myrtLib/myrtille_assistant_new_project.py:261 +#, fuzzy +msgid "Project Path" +msgstr "Nom du projet" + +#. display project FPI +#: ../myrtLib/myrtille_assistant_new_project.py:265 +#, fuzzy +msgid "Number of frames per seconds" +msgstr "Images par seconde" + +#. display Hardware type +#: ../myrtLib/myrtille_assistant_new_project.py:269 +msgid "Hardware type" +msgstr "" + +#. webcam name +#: ../myrtLib/myrtille_assistant_new_project.py:275 +#, fuzzy +msgid "Webcam name" +msgstr "Webcam" + +#. webcam device +#: ../myrtLib/myrtille_assistant_new_project.py:279 +msgid "Webcam device" +msgstr "" + +#. webcam resolution +#: ../myrtLib/myrtille_assistant_new_project.py:283 +msgid "Webcam resolution used" +msgstr "" + +#. webcam device +#: ../myrtLib/myrtille_assistant_new_project.py:289 +msgid "Webcam driver used" +msgstr "" + +#. Final message +#: ../myrtLib/myrtille_assistant_new_project.py:294 +msgid "Have fun wityh myrtille !" +msgstr "" + #: ../myrtLib/myrtExport/myrtille_export.py:69 msgid "Pass 1/2" msgstr "Progression 1/2" @@ -341,11 +404,11 @@ msgid "Export Canceled" msgstr "Export annulé" -#. file exists -#: ../myrtLib/myrtille_export_window.py:162 -#, python-format -msgid "File %s exists. Replace file ?" -msgstr "Le Fichier %s existe. Le remplacer ?" +#~ msgid "Confirmation page" +#~ msgstr "Page de confirmation" + +#~ msgid "radiobutton" +#~ msgstr " " #~ msgid "coucou translation !!!!!!!!!!!!!!" #~ msgstr "FR coucou translation !!!!!!!!" diff -Nru /tmp/Cw9PZGt1Jj/myrtille-0.6.1rc6/po/myrtille.pot /tmp/xXrIe6pWIT/myrtille-0.6.1rc7/po/myrtille.pot --- myrtille-0.6.1rc6/po/myrtille.pot 2009-01-03 22:48:28.000000000 +0000 +++ myrtille-0.6.1rc7/po/myrtille.pot 2009-01-04 22:42:17.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-03 21:54+0100\n" +"POT-Creation-Date: 2009-01-04 23:15+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -64,149 +64,145 @@ msgstr "" #: ../images/myrtille.glade.h:13 -msgid "Confirmation page" -msgstr "" - -#: ../images/myrtille.glade.h:14 msgid "DV cam" msgstr "" -#: ../images/myrtille.glade.h:15 +#: ../images/myrtille.glade.h:14 msgid "" "DV format (raw DV)\n" "Format DVD (mpeg2)\n" "Format divx/xvid (avi)" msgstr "" -#: ../images/myrtille.glade.h:18 +#: ../images/myrtille.glade.h:17 msgid "Export ..." msgstr "" -#: ../images/myrtille.glade.h:19 +#: ../images/myrtille.glade.h:18 msgid "Export path:" msgstr "" -#: ../images/myrtille.glade.h:20 +#: ../images/myrtille.glade.h:19 msgid "Export video with sound." msgstr "" -#: ../images/myrtille.glade.h:21 +#: ../images/myrtille.glade.h:20 msgid "File export" msgstr "" -#: ../images/myrtille.glade.h:22 +#: ../images/myrtille.glade.h:21 msgid "File format :" msgstr "" -#: ../images/myrtille.glade.h:23 +#: ../images/myrtille.glade.h:22 msgid "Folder" msgstr "" -#: ../images/myrtille.glade.h:24 +#: ../images/myrtille.glade.h:23 msgid "Images import" msgstr "" -#: ../images/myrtille.glade.h:25 +#: ../images/myrtille.glade.h:24 msgid "Images per second number" msgstr "" -#: ../images/myrtille.glade.h:26 +#: ../images/myrtille.glade.h:25 msgid "Images per seconds" msgstr "" #. Caller une image sur le flux video -#: ../images/myrtille.glade.h:28 +#: ../images/myrtille.glade.h:27 msgid "Mix an image with video stream" msgstr "" -#: ../images/myrtille.glade.h:29 +#: ../images/myrtille.glade.h:28 msgid "Mixer" msgstr "" -#: ../images/myrtille.glade.h:30 +#: ../images/myrtille.glade.h:29 msgid "Mixer activation (onion skin)" msgstr "" -#: ../images/myrtille.glade.h:31 +#: ../images/myrtille.glade.h:30 msgid "Montage" msgstr "" #. Descendre un/ou plusieurs images -#: ../images/myrtille.glade.h:33 +#: ../images/myrtille.glade.h:32 msgid "Move down one or several images" msgstr "" #. Déplacer des images capturées dans la zone de montage -#: ../images/myrtille.glade.h:35 +#: ../images/myrtille.glade.h:34 msgid "Move snapshot to montage area" msgstr "" #. Monter un/ou plusieurs images -#: ../images/myrtille.glade.h:37 +#: ../images/myrtille.glade.h:36 msgid "Move up one or several images" msgstr "" #. Non Disponible -#: ../images/myrtille.glade.h:39 +#: ../images/myrtille.glade.h:38 msgid "Not available" msgstr "" #. Non Disponible -#: ../images/myrtille.glade.h:41 +#: ../images/myrtille.glade.h:40 msgid "Not available." msgstr "" -#: ../images/myrtille.glade.h:42 +#: ../images/myrtille.glade.h:41 msgid "Open Recent" msgstr "" #. Jouer le film -#: ../images/myrtille.glade.h:44 +#: ../images/myrtille.glade.h:43 msgid "Play movie" msgstr "" -#: ../images/myrtille.glade.h:45 +#: ../images/myrtille.glade.h:44 msgid "Project name" msgstr "" -#: ../images/myrtille.glade.h:46 +#: ../images/myrtille.glade.h:45 msgid "Recent1" msgstr "" -#: ../images/myrtille.glade.h:47 +#: ../images/myrtille.glade.h:46 msgid "Recent2" msgstr "" -#: ../images/myrtille.glade.h:48 +#: ../images/myrtille.glade.h:47 msgid "Recent3" msgstr "" -#: ../images/myrtille.glade.h:49 +#: ../images/myrtille.glade.h:48 msgid "Select a folder" msgstr "" -#: ../images/myrtille.glade.h:50 +#: ../images/myrtille.glade.h:49 msgid "Select a myrtille project file" msgstr "" -#: ../images/myrtille.glade.h:51 +#: ../images/myrtille.glade.h:50 msgid "Select an image to import" msgstr "" -#: ../images/myrtille.glade.h:52 +#: ../images/myrtille.glade.h:51 msgid "Select project name and destination folder.\n" msgstr "" -#: ../images/myrtille.glade.h:54 +#: ../images/myrtille.glade.h:53 msgid "Snapshot" msgstr "" -#: ../images/myrtille.glade.h:55 +#: ../images/myrtille.glade.h:54 msgid "" "This assistant will help you on configuration of a new myrtille project." msgstr "" -#: ../images/myrtille.glade.h:56 +#: ../images/myrtille.glade.h:55 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" @@ -227,83 +223,79 @@ msgstr "" #. Jeter à la poubelle -#: ../images/myrtille.glade.h:73 +#: ../images/myrtille.glade.h:72 msgid "To trash" msgstr "" -#: ../images/myrtille.glade.h:74 +#: ../images/myrtille.glade.h:73 msgid "Transparency level" msgstr "" -#: ../images/myrtille.glade.h:75 +#: ../images/myrtille.glade.h:74 msgid "Web Cam" msgstr "" -#: ../images/myrtille.glade.h:76 +#: ../images/myrtille.glade.h:75 msgid "_File" msgstr "" -#: ../images/myrtille.glade.h:77 +#: ../images/myrtille.glade.h:76 msgid "_Help" msgstr "" -#: ../images/myrtille.glade.h:78 +#: ../images/myrtille.glade.h:77 msgid "gtk-about" msgstr "" -#: ../images/myrtille.glade.h:79 +#: ../images/myrtille.glade.h:78 msgid "gtk-apply" msgstr "" -#: ../images/myrtille.glade.h:80 +#: ../images/myrtille.glade.h:79 msgid "gtk-cancel" msgstr "" -#: ../images/myrtille.glade.h:81 +#: ../images/myrtille.glade.h:80 msgid "gtk-close" msgstr "" -#: ../images/myrtille.glade.h:82 +#: ../images/myrtille.glade.h:81 msgid "gtk-new" msgstr "" -#: ../images/myrtille.glade.h:83 +#: ../images/myrtille.glade.h:82 msgid "gtk-ok" msgstr "" -#: ../images/myrtille.glade.h:84 +#: ../images/myrtille.glade.h:83 msgid "gtk-open" msgstr "" -#: ../images/myrtille.glade.h:85 +#: ../images/myrtille.glade.h:84 msgid "gtk-quit" msgstr "" -#: ../images/myrtille.glade.h:86 +#: ../images/myrtille.glade.h:85 msgid "gtk-save" msgstr "" -#: ../images/myrtille.glade.h:87 +#: ../images/myrtille.glade.h:86 msgid "gtk-save-as" msgstr "" #. Capturer une image -#: ../images/myrtille.glade.h:89 +#: ../images/myrtille.glade.h:88 msgid "make a snapshot" msgstr "" -#: ../images/myrtille.glade.h:90 +#: ../images/myrtille.glade.h:89 msgid "myrtille on line" msgstr "" -#: ../images/myrtille.glade.h:91 +#: ../images/myrtille.glade.h:90 msgid "options" msgstr "" -#: ../images/myrtille.glade.h:92 -msgid "radiobutton" -msgstr "" - #: ../myrtLib/myrtille_class.py:246 msgid "image" msgstr "" @@ -316,6 +308,73 @@ msgid "Timestamp" msgstr "" +#. file exists +#: ../myrtLib/myrtille_export_window.py:162 +#, python-format +msgid "File %s exists. Replace file ?" +msgstr "" + +#: ../myrtLib/myrtille_assistant_new_project.py:63 +msgid "Please wait for webcam detection" +msgstr "" + +#: ../myrtLib/myrtille_assistant_new_project.py:67 +msgid "Webcam detection done" +msgstr "" + +#: ../myrtLib/myrtille_assistant_new_project.py:230 +msgid "Detected webcam" +msgstr "" + +#: ../myrtLib/myrtille_assistant_new_project.py:232 +msgid "No webcam detected" +msgstr "" + +#. display project name +#: ../myrtLib/myrtille_assistant_new_project.py:257 +msgid "Project Name" +msgstr "" + +#. display project path +#: ../myrtLib/myrtille_assistant_new_project.py:261 +msgid "Project Path" +msgstr "" + +#. display project FPI +#: ../myrtLib/myrtille_assistant_new_project.py:265 +msgid "Number of frames per seconds" +msgstr "" + +#. display Hardware type +#: ../myrtLib/myrtille_assistant_new_project.py:269 +msgid "Hardware type" +msgstr "" + +#. webcam name +#: ../myrtLib/myrtille_assistant_new_project.py:275 +msgid "Webcam name" +msgstr "" + +#. webcam device +#: ../myrtLib/myrtille_assistant_new_project.py:279 +msgid "Webcam device" +msgstr "" + +#. webcam resolution +#: ../myrtLib/myrtille_assistant_new_project.py:283 +msgid "Webcam resolution used" +msgstr "" + +#. webcam device +#: ../myrtLib/myrtille_assistant_new_project.py:289 +msgid "Webcam driver used" +msgstr "" + +#. Final message +#: ../myrtLib/myrtille_assistant_new_project.py:294 +msgid "Have fun wityh myrtille !" +msgstr "" + #: ../myrtLib/myrtExport/myrtille_export.py:69 msgid "Pass 1/2" msgstr "" @@ -332,9 +391,3 @@ #: ../myrtLib/myrtExport/myrtille_export.py:183 msgid "Export Canceled" msgstr "" - -#. file exists -#: ../myrtLib/myrtille_export_window.py:162 -#, python-format -msgid "File %s exists. Replace file ?" -msgstr "" diff -Nru /tmp/Cw9PZGt1Jj/myrtille-0.6.1rc6/po/POTFILES.in /tmp/xXrIe6pWIT/myrtille-0.6.1rc7/po/POTFILES.in --- myrtille-0.6.1rc6/po/POTFILES.in 2009-01-03 00:55:14.000000000 +0000 +++ myrtille-0.6.1rc7/po/POTFILES.in 2009-01-04 22:42:17.000000000 +0000 @@ -2,7 +2,7 @@ myrtille.py images/myrtille.glade myrtLib/myrtille_class.py -myrtLib/myrtExport/myrtille_export.py myrtLib/myrtille_export_window.py - +myrtLib/myrtille_assistant_new_project.py +myrtLib/myrtExport/myrtille_export.py diff -Nru /tmp/Cw9PZGt1Jj/myrtille-0.6.1rc6/_version.py /tmp/xXrIe6pWIT/myrtille-0.6.1rc7/_version.py --- myrtille-0.6.1rc6/_version.py 2009-01-03 23:56:44.000000000 +0000 +++ myrtille-0.6.1rc7/_version.py 2009-01-04 22:45:46.000000000 +0000 @@ -5,11 +5,11 @@ """ version_info = {'branch_nick': u'myrtille-0.6.1', - 'build_date': '2009-01-04 00:56:44 +0100', + 'build_date': '2009-01-04 23:45:46 +0100', 'clean': None, - 'date': '2009-01-04 00:55:53 +0100', - 'revision_id': 'nico@inattendu.org-20090103235553-63lit0lgiikgfkcn', - 'revno': 80} + 'date': '2009-01-04 23:42:58 +0100', + 'revision_id': 'nico@inattendu.org-20090104224258-d8qkwnr6766whnn3', + 'revno': 82} revisions = {}