Index: /extensions/gvideo/admin.php
===================================================================
--- /extensions/gvideo/admin.php	(revision 17307)
+++ /extensions/gvideo/admin.php	(revision 17307)
@@ -0,0 +1,31 @@
+<?php
+if (!defined('GVIDEO_PATH')) die('Hacking attempt!');
+
+global $template, $page, $conf;
+
+$conf['gvideo'] = unserialize($conf['gvideo']);
+load_language('plugin.lang', GVIDEO_PATH);
+
+// tabsheet
+include_once(PHPWG_ROOT_PATH.'admin/include/tabsheet.class.php');
+$page['tab'] = (isset($_GET['tab'])) ? $_GET['tab'] : $page['tab'] = 'add';
+  
+$tabsheet = new tabsheet();
+$tabsheet->add('add', l10n('Add a video'), GVIDEO_ADMIN . '-add');
+$tabsheet->add('config', l10n('Configuration'), GVIDEO_ADMIN . '-config');
+$tabsheet->select($page['tab']);
+$tabsheet->assign();
+
+// include page
+include(GVIDEO_PATH . 'admin/' . $page['tab'] . '.php');
+
+// template
+$template->assign(array(
+  'GVIDEO_PATH'=> GVIDEO_PATH,
+  'GVIDEO_ABS_PATH'=> dirname(__FILE__).'/',
+  'GVIDEO_ADMIN' => GVIDEO_ADMIN,
+  ));
+  
+$template->assign_var_from_handle('ADMIN_CONTENT', 'gvideo_content');
+
+?>
Index: /extensions/gvideo/admin/add.php
===================================================================
--- /extensions/gvideo/admin/add.php	(revision 17307)
+++ /extensions/gvideo/admin/add.php	(revision 17307)
@@ -0,0 +1,146 @@
+<?php
+if (!defined('GVIDEO_PATH')) die('Hacking attempt!');
+
+include_once(GVIDEO_PATH.'include/functions.inc.php');
+include_once(PHPWG_ROOT_PATH . 'admin/include/functions_upload.inc.php');
+
+if (isset($_POST['add_video']))
+{
+  // check inputs
+  if (empty($_POST['url']))
+  {
+    array_push($page['errors'], l10n('Please fill the video URL'));
+  }
+  if ($_POST['name_server'] == 'false' and empty($_POST['name']))
+  {
+    array_push($page['errors'], l10n('Please fill the video name'));
+  }
+  if ($_POST['thumbnail_server'] == 'false' and empty($_FILES['thumbnail_src']))
+  {
+    array_push($page['errors'], l10n('Please add a thumbnail'));
+  }
+  if ( !empty($_POST['url']) and ($video = parse_video_url($_POST['url'])) === false )
+  {
+    array_push($page['errors'], l10n('Unable to contact host server'));
+  }
+  
+  if (count($page['errors']) == 0)
+  {
+    // download thumbnail
+    $thumb_name = $video['type'].'-'.$video['id'].'-'.uniqid();
+    if ($_POST['thumbnail_server'] == 'true')
+    {
+      $thumb_name.= '.'.get_extension($video['thumbnail']);
+      $thumb_source = $conf['data_location'].$thumb_name;
+      if (download_remote_file($video['thumbnail'], $thumb_source) !== true)
+      {
+        $thumb_source = $conf['data_location'].get_filename_wo_extension($thumb_name).'.jpg';
+        copy(GVIDEO_PATH.'mimetypes/'.$video['type'].'.jpg', $thumb_source);
+      }
+    }
+    // upload thumbnail
+    else
+    {
+      if ($_FILES['thumbnail_src']['error'] > 0) 
+      {
+        array_push($page['errors'], l10n('Unknown upload error'));
+      }
+      else if ( !in_array($_FILES['thumbnail_src']['type'], array('image/jpeg','image/png','image/gif')) )
+      {
+        array_push($page['errors'], l10n('Incorrect file type,').' '.sprintf(l10n('Allowed file types: %s.'), 'jpg, png, gif'));
+      }
+      
+      $thumb_name.= '.'.get_extension($_FILES['thumbnail_src']['name']);
+      $thumb_source = $_FILES['thumbnail_src']['tmp_name'];
+    }
+    
+    if (count($page['errors']) == 0)
+    {
+      // add image and update infos
+      $image_id = add_uploaded_file($thumb_source, $thumb_name, array($_POST['category']));
+      
+      if ($_POST['name_server'] == 'true')        $_POST['name'] = $video['title'];
+      if ($_POST['description_server'] == 'true') $_POST['description'] = $video['description'];
+      if ($_POST['author_server'] == 'true')      $_POST['author'] = $video['author'];
+      
+      $updates = array(
+        'name' => pwg_db_real_escape_string($_POST['name']),
+        'comment' => pwg_db_real_escape_string(@$_POST['description']),
+        'author' => pwg_db_real_escape_string(@$_POST['author']),
+        );
+      
+      single_update(
+        IMAGES_TABLE,
+        $updates,
+        array('id' => $image_id),
+        true
+        );
+      
+      // register video
+      if ($_POST['size_common'] == 'true')
+      {
+        $_POST['width'] = $_POST['height'] = '';
+      }
+      if ($_POST['autoplay_common'] == 'true')
+      {
+        $_POST['autoplay'] = '';
+      }
+      
+      $insert = array(
+        'picture_id' => $image_id,
+        'type' => $video['type'],
+        'video_id' => $video['id'],
+        'width' => $_POST['width'],
+        'height' => $_POST['height'],
+        'autoplay' => $_POST['autoplay'],
+        );
+        
+      single_insert(
+        GVIDEO_TABLE,
+        $insert
+        );
+        
+      array_push($page['infos'], sprintf(
+        l10n('Video successfully added. <a href="%s">View</a>'), 
+        make_picture_url(array(
+          'image_id' => $image_id,
+          'category' => array(
+            'id' => $_POST['category'],
+            'name' => '',
+            'permalink' => '',
+            ),
+          ))
+        ));
+      unset($_POST);
+    }
+  }
+}
+
+// categories
+$query = '
+SELECT id,name,uppercats,global_rank
+  FROM '.CATEGORIES_TABLE.'
+;';
+display_select_cat_wrapper($query, array(), 'category_parent_options');
+
+// upload limit
+$upload_max_filesize = min(
+  get_ini_size('upload_max_filesize'),
+  get_ini_size('post_max_size')
+  );
+$upload_max_filesize_shorthand = 
+  ($upload_max_filesize == get_ini_size('upload_max_filesize')) ?
+  get_ini_size('upload_max_filesize', false) :
+  get_ini_size('post_max_filesize', false);
+  
+// template
+$template->assign(array(
+  'upload_max_filesize' => $upload_max_filesize,
+  'upload_max_filesize_shorthand' => $upload_max_filesize_shorthand,
+  'gvideo' => $conf['gvideo'],
+  'POST' => @$_POST,
+  ));
+
+$template->set_filename('gvideo_content', dirname(__FILE__) . '/template/add.tpl');
+
+?>
Index: tensions/gvideo/admin/add_page.php
===================================================================
--- /extensions/gvideo/admin/add_page.php	(revision 17306)
+++ 	(revision )
@@ -1,328 +1,0 @@
-<?php
-
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
-
-include_once(PHPWG_ROOT_PATH.'admin/include/functions_upload.inc.php');
-
-$video_types = array('google', 'youtube', 'dailymotion', 'wideo', 'vimeo', 'wat');
-
-function get_video_infos($url, $type)
-{
-  switch ($type)
-  {
-  case "google":
-    @preg_match('#\=([\-\+0-9]*)#', $url, $id);
-    if (empty($id[1])) return false;
-    $video['id'] = $id[1];
-    $video['ext'] = 'gvideo';
-    if ($_POST['thumbnail'] == 'thumb_from_server' and fetchRemote($url, $source))
-    {
-      @preg_match("#thumbnailUrl\\\\x3d(http://.*/ThumbnailServer.*)\\\\x26#", $source, $thumb_url);
-      $video['thumb_url'] = @urldecode($thumb_url[1]);
-      $video['thumb_url'] = @str_replace(array('\x3d', '\x26'), array('=', '&'), $video['thumb_url']);
-    }
-    return $video;
-
-  case "youtube":
-    @preg_match('#\=([\-_a-z0-9]*)#i', $url, $id);
-    if (empty($id[1])) return false;
-    $video['id'] = $id[1];
-    $video['ext'] = 'ytube';
-    if ($_POST['thumbnail'] == 'thumb_from_server')
-    {
-      $video['thumb_url'] = 'http://img.youtube.com/vi/' . $video['id'] . '/default.jpg';
-    }
-    return $video;
-
-  case "dailymotion":
-    @preg_match('#video/([_a-z0-9]*)#i', $url, $id);
-    if (empty($id[1])) return false;
-    $video['id'] = $id[1];
-    $video['ext'] = 'dm';
-    if ($_POST['thumbnail'] == 'thumb_from_server')
-    {
-      $video['thumb_url'] = 'http://www.dailymotion.com/thumbnail/160x120/video/' . $video['id'];
-    }
-    return $video;
-    
-  case "wideo":
-    @preg_match('#video/([_a-z0-9]*)#i', $url, $id);
-    if (empty($id[1])) return false;
-    $video['id'] = $id[1];
-    $video['ext'] = 'wideo';
-    if ($_POST['thumbnail'] == 'thumb_from_server' and fetchRemote($url, $source))
-    {
-      @preg_match('#link rel\="thumbnail" href\="(.*)"#', $source, $matches);
-      $video['thumb_url'] = @str_replace('74x54', '154x114', $matches[1]);
-    }
-    return $video;
-
-  case "vimeo":
-    @preg_match('#vimeo.com/([0-9]*)#i', $url, $id);
-    if (empty($id[1])) return false;
-    $video['id'] = $id[1];
-    $video['ext'] = 'vimeo';
-    if ($_POST['thumbnail'] == 'thumb_from_server' and fetchRemote($url, $source))
-    {
-      if (preg_match('#meta property="og:image" content="(http://.*?)"#', $source, $matches))
-      {
-        $video['thumb_url'] = str_replace('160.jpg', '200.jpg', $matches[1]);
-      }
-    }
-    return $video;
-
-  case "wat":
-    if (fetchRemote($url, $source))
-    {
-      @preg_match('#link rel="video_src" href="http://www.wat.tv/swf2/(.*?)"#i', $source, $id);
-      if (empty($id[1])) return false;
-      $video['id'] = $id[1];
-      $video['ext'] = 'wat';
-      if ($_POST['thumbnail'] == 'thumb_from_server')
-      {
-        @preg_match('#link rel="image_src" href="(.*?)"#', $source, $matches);
-        $video['thumb_url'] = @str_replace('120x90', '320x240', $matches[1]);
-      }
-      return $video;
-    }
-
-  default:
-    return false;
-  }
-}
-
-// Creation du nouveau fichier
-if (isset($_POST['submit_add']) and !is_adviser())
-{
-  if (empty($_POST['pywaie_add_name']) or empty($_POST['pywaie_add_url']) or ($_POST['parent'] == 0))
-  {
-    array_push($page['errors'], l10n('py_error2'), l10n('py_error3'));
-  }
-  else
-  {
-    $py_url = $_POST['pywaie_add_url'];
-    if (!substr_count($py_url, "http://")) $py_url = "http://" . $py_url;
-
-    // Extraction de l'id et du type
-    foreach ($video_types as $type)
-    {
-      if (substr_count($py_url, $type))
-      {
-        $video = get_video_infos($py_url, $type);
-        break;
-      }
-    }
-
-    if (!isset($video) or !$video)
-    {
-      array_unshift($page['errors'], l10n('py_error5'));
-    }
-    else
-    {
-      // current date
-      list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW();'));
-
-      $file_name = str2url($_POST['pywaie_add_name']).'.'.$video['ext'];
-
-      // prepare database registration
-      $insert = array(
-        'name' => $_POST['pywaie_add_name'],
-        'file' => $file_name,
-        'date_available' => $dbnow,
-        );
-      
-      $optional_fields = array('author', 'comment');
-      foreach ($optional_fields as $field)
-      {
-        if (isset($_POST[$field]) and !empty($_POST[$field]))
-        {
-          $insert[$field] = $_POST[$field];
-        }
-      }
-      
-      check_input_parameter('parent', $_POST, false, PATTERN_ID);
-      $category_id = $_POST['parent'];
-      
-      $query = '
-SELECT
-    c.id,
-    c.name,
-    c.permalink,
-    c.dir,
-    c.site_id,
-    s.galleries_url
-  FROM '.CATEGORIES_TABLE.' AS c
-    LEFT JOIN '.SITES_TABLE.' AS s ON s.id = c.site_id
-  WHERE c.id = '.$category_id.'
-;';
-      $result = pwg_query($query);
-      $category = pwg_db_fetch_assoc($result);
-
-      // is the category virtual or is the category on a remote site?
-      $use_galleries_directory = true;
-      if (empty($category['dir']))
-      {
-        $use_galleries_directory = false;
-      }
-      if (!empty($category['galleries_url']) and url_is_remote($category['galleries_url']))
-      {
-        $use_galleries_directory = false;
-      }
-      
-      if (!$use_galleries_directory)
-      {
-        list($year, $month, $day) = preg_split('/[^\d]/', $dbnow, 4);
-  
-        // upload directory hierarchy
-        $upload_dir = sprintf(
-          PHPWG_ROOT_PATH.$conf['upload_dir'].'/%s/%s/%s',
-          $year,
-          $month,
-          $day
-          );
-        prepare_directory($upload_dir);
-
-        $file_path = $upload_dir.'/'.$file_name;
-        $thumb_path = file_path_for_type($file_path, 'thumb');
-        $thumb_dir = dirname($thumb_path);
-        prepare_directory($thumb_dir);
-      }
-      // or physical and local
-      else
-      {
-        $catpath = get_fulldirs(array($category_id));
-        $file_path = $catpath[$category_id].'/'.$file_name;
-
-        $insert['storage_category_id'] = $category_id;
-      }
-
-      $insert['path'] = $file_path;
-      
-      if (file_exists($file_path))
-      {
-        array_push($page['errors'], sprintf(l10n('py_error6'), $file_path));
-      }
-      else
-      {
-        // Write fake file with video settings inside
-        //
-        // TODO: store these information in a specific database table instead
-        $file_content = stripslashes($video['id']);
-        $file_content.= '/'.$_POST['pywaie_add_h'];
-        $file_content.= '/'.$_POST['pywaie_add_w'];
-        $file_content.= '/'.$_POST['pywaie_add_start'];
-
-        $bytes_written = file_put_contents($file_path, $file_content);        
-        if (false === $bytes_written)
-        {
-          array_push(
-            $page['errors'],
-            
-            sprintf(
-              l10n('py_error7'),
-              $file_path
-              ),
-            
-            sprintf(
-              l10n('py_error8'),
-              dirname($file_path)
-              )
-            );
-
-        }
-        else
-        {
-          // thumbnail
-          $thumb_extension = null;
-          if ($_POST['thumbnail'] == 'thumb_from_server' or $_POST['thumbnail'] == 'thumb_from_user')
-          {
-            include_once ('thumbnails.php');
-            $insert['tn_ext'] = $thumb_extension;
-          }
-
-          // database registration
-          mass_inserts(
-            IMAGES_TABLE,
-            array_keys($insert),
-            array($insert)
-            );
-          
-          $image_id = pwg_db_insert_id(IMAGES_TABLE);
-          associate_images_to_categories(array($image_id), array($category_id));
-          invalidate_user_cache();
-
-          // success information to display
-          array_unshift($page['infos'], l10n('py_info3'));
-          
-          array_push(
-            $page['infos'],
-            sprintf(
-              l10n('py_show_file'),
-              make_picture_url(
-                array(
-                  'image_id' => $image_id,
-                  'section' => 'categories',
-                  'category' => $category,
-                  )
-                )
-              )
-            );
-        }
-      }
-    }
-  }
-}
-
-
-// display list of all categories
-$query = '
-SELECT
-    id,
-    name,
-    uppercats,
-    global_rank
-  FROM '.CATEGORIES_TABLE.'
-;';
-
-if (isset($_POST['parent']))
-{
-  $selected = array($_POST['parent']);
-}
-else
-{
-  $selected = array();
-}
-
-display_select_cat_wrapper($query, $selected , 'category_option_parent', false);
-
-
-// Parametrage du template
-if (isset($_POST['submit_add']))
-{
-  $template->assign(array(
-    'PYWAIE_ADD_NAME' => $_POST['pywaie_add_name'],
-    'PYWAIE_ADD_URL' => $_POST['pywaie_add_url'],
-		$_POST['thumbnail'] . '_CHECKED' => 'checked="checked"',
-    'ADD_BAND' => isset($_POST['add_band']) ? 'checked="checked"' : '',
-    'THUMB_RESIZE' => isset($_POST['thumb_resize']) ? 'checked="checked"' : '',
-    'PYWAIE_ADD_START' => $_POST['pywaie_add_start'],
-    'PYWAIE_ADD_W' => $_POST['pywaie_add_w'],
-    'PYWAIE_ADD_H' => $_POST['pywaie_add_h'],
-    'AUTHOR' => $_POST['author'],
-    'COMMENT' => $_POST['comment']));
-}
-else
-{
-  $template->assign(array('no_thumb_CHECKED' => 'checked="checked"'));
-}
-
-$template->assign(array(
-  'INFOBULLES_JS' => GVIDEO_PATH . 'admin/infobulles.js',
-  'ICON_INFOBULLE' => GVIDEO_PATH . 'admin/infobulle.png',
-  'DEFAULT_THUMB_W' => $conf['upload_form_thumb_maxwidth'],
-  'DEFAULT_THUMB_H' => $conf['upload_form_thumb_maxheight']));
-
-$template->set_filenames(array('plugin_admin_content' => dirname(__FILE__) . '/add_page.tpl'));
-$template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');
-
-?>
Index: tensions/gvideo/admin/add_page.tpl
===================================================================
--- /extensions/gvideo/admin/add_page.tpl	(revision 17306)
+++ 	(revision )
@@ -1,134 +1,0 @@
-{include file='include/autosize.inc.tpl'}
-{combine_script id='jquery.cluetip' load='async' require='jquery' path='themes/default/js/plugins/jquery.cluetip.js'}
-
-{footer_script require='jquery.cluetip'}
-jQuery().ready(function(){ldelim}
-	jQuery('.cluetip').cluetip({ldelim}
-		width: 400,
-		splitTitle: '|'
-	});
-});
-{/footer_script}
-
-<div class="titrePage">
-<h2>{'py_title'|@translate}</h2>
-</div>
-
-<form name="add_page" method="post" action="{$pywaie_F_ACTION}" class="properties"  ENCTYPE="multipart/form-data">
-<fieldset>
-	<legend>{'py_addvideo'|@translate}</legend>
-	<table>
-		<tr>
-			<td></td>
-			<td>{'Name'|@translate} *</td>
-			<td>&nbsp;
-			<input type="text" size="55" maxlength="50" value="{$PYWAIE_ADD_NAME}" name="pywaie_add_name"/></td>
-		</tr>
-		<tr>
-			<td><img class="cluetip" src="{$ICON_INFOBULLE}" alt="" title="{'py_url'|@translate}|{'pybulle_reference'|@translate}"></td>
-			<td>{'py_url'|@translate} *</td>
-			<td>&nbsp;
-			<input type="text" size="55" value="{$PYWAIE_ADD_URL}" name="pywaie_add_url" /></td>
-		</tr>
-		<tr>
-			<td><img class="cluetip" src="{$ICON_INFOBULLE}" alt="" title="{'py_parent'|@translate}|{'pybulle_categorie'|@translate}"></td>
-			<td>{'py_parent'|@translate} *</td>
-			<td>&nbsp;
-      {html_options name="parent" options=$category_option_parent selected=$category_option_parent_selected}
-      </td>
-		</tr>
-
-		<tr>
-			<td colspan="3"><br><hr></td>
-		</tr>
-
-		<tr>
-			<td><img class="cluetip" src="{$ICON_INFOBULLE}" alt="" title="{'py_thumb'|@translate}|{'pybulle_miniature'|@translate}"></td>
-			<td>{'py_thumb'|@translate}</td>
-  	</tr>
-
-  	<tr>
-	  		<td></td>
-			<td colspan="2">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<input type="radio" name="thumbnail" value="no_thumb" {$no_thumb_CHECKED}><i>&nbsp;&nbsp;{'py_no_thumb'|@translate}</i></td>
-		</tr>
-		<tr>
-			<td></td>
-			<td colspan="2">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<input type="radio" name="thumbnail" value="thumb_from_server" {$thumb_from_server_CHECKED}>&nbsp;&nbsp;<i>{'py_thumb_from_server'|@translate}</i></td>
-		</tr>
-		<tr>
-			<td></td>
-			<td colspan="2">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<input type="radio" name="thumbnail" id="thumb_from_user" value="thumb_from_user" {$thumb_from_user_CHECKED}>&nbsp;&nbsp;<i>{'py_thumb_from_user'|@translate}&nbsp;&nbsp;</i>
-			<input name="picture" type="file" value="" size="20" onmousedown="document.getElementById('thumb_from_user').checked = true;"/></td>
-		</tr>
-		<tr>
-			<td><br></td>
-			<td colspan="2"><br>
-				<table style="text-align:left;">
-					<tr>
-						<td colspan="3"><input type="checkbox" name="add_band" value="on" id="add_band" {$ADD_BAND}>&nbsp;&nbsp;{'py_add_band'|@translate}</td>
-					</tr>
-					<tr>
-						<td><input type="checkbox" name="thumb_resize" value="on" id="thumb_resize" {$THUMB_RESIZE}>&nbsp;&nbsp;{'py_thumb_resize'|@translate} : &nbsp;</td>
-						<td><input type="text" size="3" maxlength="3" value="{$DEFAULT_THUMB_W}" name="thumb_width" onmousedown="document.getElementById('thumb_resize').checked = true;"/>&nbsp;</td>
-						<td><i>{'maximum width'|@translate}</i></td>
-					</tr>
-					<tr>
-						<td></td>
-						<td><input type="text" size="3" maxlength="3" value="{$DEFAULT_THUMB_H}" name="thumb_hight" onmousedown="document.getElementById('thumb_resize').checked = true;"/>&nbsp;</td>
-						<td><i>{'maximum height'|@translate}</i></td>
-					</tr>
-				</table>
-			</td>
-		</tr>
-	  	<tr>
-			<td colspan="3"><br><hr></td>
-		</tr>
-
-		<tr>
-			<td></td>
-			<td>{'py_width'|@translate}</td>
-			<td>&nbsp;
-			<input type="text" size="3" maxlength="3" value="{$PYWAIE_ADD_W}" name="pywaie_add_w" /></td>
-		</tr>
-		<tr>
-			<td></td>
-			<td>{'py_height'|@translate}</td>
-			<td>&nbsp;
-			<input type="text" size="3" maxlength="3" value="{$PYWAIE_ADD_H}" name="pywaie_add_h" /></td>
-		</tr>
-		<tr>
-			<td><img class="cluetip" src="{$ICON_INFOBULLE}" alt="" title="{'py_start'|@translate}|{'pybulle_start'|@translate}"></td>
-			<td>{'py_start'|@translate}</td>
-			<td>&nbsp;
-			<input type="text" size="3" maxlength="4" value="{$PYWAIE_ADD_START}" name="pywaie_add_start" /></td>
-		</tr>
-
-		<tr>
-			<td colspan="3"><br><hr></td>
-		</tr>
-		<tr>
-			<td></td>
-		      <td>{'Author'|@translate}</td>
-        		<td>&nbsp;
-			<input type="text" size="30" name="author" value="{$AUTHOR}" /></td>
-      	</tr>
-
-		<tr>
-        		<td></td>
-			<td>{'Description'|@translate}</td>
-        		<td>&nbsp;
-			<textarea rows="4" cols="42" name="comment">{$COMMENT}</textarea></td>
-      	</tr>
-
-
-	</table>
-	<br />
-	<div style="text-align:center;">
-		<input class="submit" type="submit" value="{'Submit'|@translate}" name="submit_add" /></div>
-<div style="text-align:right;">* {'py_*'|@translate}</div>
-	</fieldset>
-</form>
-<br />
Index: /extensions/gvideo/admin/config.php
===================================================================
--- /extensions/gvideo/admin/config.php	(revision 17306)
+++ /extensions/gvideo/admin/config.php	(revision 17307)
@@ -1,116 +1,41 @@
 <?php
+if (!defined('GVIDEO_PATH')) die('Hacking attempt!');
 
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
-
-// Chargement des parametres
-$params = unserialize($conf['PY_GVideo']);
-
-// Mise a jour de la base de donnee
-if (isset($_POST['submit']))
+if (isset($_POST['save_config']))
 {
-  $params  = array(
-    'gvideo' => array(
-      $_POST['pywaie_gvideo_h'],
-      $_POST['pywaie_gvideo_w'],
-      $_POST['pywaie_gvideo_autoplay'],
-      $_POST['pywaie_gvideo_hl']),
-    'ytube' => array(
-      $_POST['pywaie_ytube_h'],
-      $_POST['pywaie_ytube_w'],
-      $_POST['pywaie_ytube_autoplay']),
-    'dm' => array(
-      $_POST['pywaie_dm_h'],
-      $_POST['pywaie_dm_w'],
-      $_POST['pywaie_dm_autoplay']),
-    'wideo' => array(
-      $_POST['pywaie_wideo_h'],
-      $_POST['pywaie_wideo_w'],
-      $_POST['pywaie_wideo_autoplay']),
+  $conf['gvideo'] = array(
+    'autoplay' => $_POST['autoplay'],
+    'width' => $_POST['width'],
+    'height' => $_POST['height'],
     'vimeo' => array(
-      $_POST['pywaie_vimeo_h'],
-      $_POST['pywaie_vimeo_w'],
-      $_POST['pywaie_vimeo_autoplay']),
-    'wat' => array(
-      $_POST['pywaie_wat_h'],
-      $_POST['pywaie_wat_w'],
-      $_POST['pywaie_wat_autoplay'])
+      'title' => (int)isset($_POST['vimeo']['title']),
+      'portrait' => (int)isset($_POST['vimeo']['portrait']),
+      'byline' => (int)isset($_POST['vimeo']['byline']),
+      'color' => $_POST['vimeo']['color'],
+      ),
+    'dailymotion' => array(
+      'logo' => (int)isset($_POST['dailymotion']['logo']),
+      'title' => (int)isset($_POST['dailymotion']['title']),
+      'color' => $_POST['dailymotion']['color'],
+      ),
+    'youtube' => array(),
+    'wat' => array(),
+    'wideo' => array(),
+    'videobb' => array(),
     );
-  
-  $query = '
-UPDATE ' . CONFIG_TABLE . '
-  SET value="' . addslashes(serialize($params)) . '"
-  WHERE param="PY_GVideo"
-  LIMIT 1';
-  pwg_query($query);
-  
-  array_push($page['infos'], l10n('py_info4'));
+      
+  conf_update_param('gvideo', serialize($conf['gvideo']));
+  array_push($page['infos'], l10n('Information data registered in database'));
 }
 
+
 $template->assign(array(
-  'PYWAIE_GVIDEO_H' => $params['gvideo'][0],
-  'PYWAIE_GVIDEO_W' => $params['gvideo'][1],
-  'PYWAIE_GVIDEO_HL' => $params['gvideo'][3],
-  'PYWAIE_YTUBE_H' => $params['ytube'][0],
-  'PYWAIE_YTUBE_W' => $params['ytube'][1],
-  'PYWAIE_DM_H' => $params['dm'][0],
-  'PYWAIE_DM_W' => $params['dm'][1],
-  'PYWAIE_WIDEO_H' => $params['wideo'][0],
-  'PYWAIE_WIDEO_W' => $params['wideo'][1],
-  'PYWAIE_VIMEO_H' => $params['vimeo'][0],
-  'PYWAIE_VIMEO_W' => $params['vimeo'][1],
-  'PYWAIE_WAT_H' => $params['wat'][0],
-  'PYWAIE_WAT_W' => $params['wat'][1]));
+  'gvideo' => $conf['gvideo'],
+  'vimeo_colors' => array('00adef', 'ff9933', 'c9ff23', 'ff0179', 'ffffff'),
+  'dailymotion_colors' => array('F7FFFD', 'E02C72', '92ADE0', 'E8D9AC', 'C2E165', '052880', 'FF0000', '834596'),
+  ));
 
-if ($params['gvideo'][2] == 'true')
-{
-  $template->assign(array('PYWAIE_GVIDEO_AUTOPLAY_TRUE' => 'checked="checked"'));
-}
-else
-{
-  $template->assign(array('PYWAIE_GVIDEO_AUTOPLAY_FALSE' => 'checked="checked"'));
-}
-if ($params['ytube'][2] == '1')
-{
-  $template->assign(array('PYWAIE_YTUBE_AUTOPLAY_TRUE' => 'checked="checked"'));
-}
-else
-{
-  $template->assign(array('PYWAIE_YTUBE_AUTOPLAY_FALSE' => 'checked="checked"'));
-}
-if ($params['dm'][2] == '1')
-{
-  $template->assign(array('PYWAIE_DM_AUTOPLAY_TRUE' => 'checked="checked"'));
-}
-else
-{
-  $template->assign(array('PYWAIE_DM_AUTOPLAY_FALSE' => 'checked="checked"'));
-}
-if ($params['wideo'][2] == 'true')
-{
-  $template->assign(array('PYWAIE_WIDEO_AUTOPLAY_TRUE' => 'checked="checked"'));
-}
-else
-{
-  $template->assign(array('PYWAIE_WIDEO_AUTOPLAY_FALSE' => 'checked="checked"'));
-}
-if ($params['vimeo'][2] == '1')
-{
-  $template->assign(array('PYWAIE_VIMEO_AUTOPLAY_TRUE' => 'checked="checked"'));
-}
-else
-{
-  $template->assign(array('PYWAIE_VIMEO_AUTOPLAY_FALSE' => 'checked="checked"'));
-}
-if ($params['wat'][2] == 'true')
-{
-  $template->assign(array('PYWAIE_WAT_AUTOPLAY_TRUE' => 'checked="checked"'));
-}
-else
-{
-  $template->assign(array('PYWAIE_WAT_AUTOPLAY_FALSE' => 'checked="checked"'));
-}
 
-$template->set_filenames(array('plugin_admin_content' => dirname(__FILE__) . '/config.tpl'));
-$template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');
+$template->set_filename('gvideo_content', dirname(__FILE__) . '/template/config.tpl');
 
 ?>
Index: tensions/gvideo/admin/config.tpl
===================================================================
--- /extensions/gvideo/admin/config.tpl	(revision 17306)
+++ 	(revision )
@@ -1,165 +1,0 @@
-<div class="titrePage">
-<h2>{'py_title'|@translate}</h2>
-</div>
-
-<form action="{$pywaie_F_ACTION}" method="post" name="cat_options" id="cat_options">
-	<table width="100%">
-		<tr>
-			<td width="50%"><fieldset>
-			<legend>Google Video</legend>
-			<table>
-				<tr>
-					<td>{'py_width'|@translate}</td>
-					<td>&nbsp;
-					<input type="text" size="3" maxlength="3" value="{$PYWAIE_GVIDEO_W}" name="pywaie_gvideo_w" /></td>
-				</tr>
-				<tr>
-					<td>{'py_height'|@translate}</td>
-					<td>&nbsp;
-					<input type="text" size="3" maxlength="3" value="{$PYWAIE_GVIDEO_H}" name="pywaie_gvideo_h" /></td>
-				</tr>
-				<tr>
-					<td>{'language'|@translate}</td>
-					<td>&nbsp;
-					<input type="text" size="3" maxlength="2" value="{$PYWAIE_GVIDEO_HL}" name="pywaie_gvideo_hl" /></td>
-				</tr>
-				<tr>
-					<td>{'py_autostart'|@translate}</td>
-					<td>&nbsp;
-					<input type="radio" value="true" name="pywaie_gvideo_autoplay" {$PYWAIE_GVIDEO_AUTOPLAY_TRUE} /> 
-					On
-					<input type="radio" value="" name="pywaie_gvideo_autoplay" {$PYWAIE_GVIDEO_AUTOPLAY_FALSE} /> 
-					Off </td>
-				</tr>
-			</table>
-  	</fieldset> </td>
-    
-			<td><fieldset>
-			<legend>YouTube</legend>
-			<table>
-				<tr>
-					<td>{'py_width'|@translate}</td>
-					<td>&nbsp;
-					<input type="text" size="3" maxlength="3" value="{$PYWAIE_YTUBE_W}" name="pywaie_ytube_w" /></td>
-				</tr>
-				<tr>
-					<td>{'py_height'|@translate}</td>
-					<td>&nbsp;
-					<input type="text" size="3" maxlength="3" value="{$PYWAIE_YTUBE_H}" name="pywaie_ytube_h" /></td>
-				</tr>
-				<tr>
-					<td>{'py_autostart'|@translate}</td>
-					<td>&nbsp;
-					<input type="radio" value="1" name="pywaie_ytube_autoplay" {$PYWAIE_YTUBE_AUTOPLAY_TRUE} /> 
-					On
-					<input type="radio" value="0" name="pywaie_ytube_autoplay" {$PYWAIE_YTUBE_AUTOPLAY_FALSE} /> 
-					Off </td>
-				</tr>
-			</table>
-			</fieldset> </td>
-		</tr>
-    
-		<tr>
-			<td><fieldset>
-			<legend>Dailymotion</legend>
-			<table>
-				<tr>
-					<td>{'py_width'|@translate}</td>
-					<td>&nbsp;
-					<input type="text" size="3" maxlength="3" value="{$PYWAIE_DM_W}" name="pywaie_dm_w" /></td>
-				</tr>
-				<tr>
-					<td>{'py_height'|@translate}</td>
-					<td>&nbsp;
-					<input type="text" size="3" maxlength="3" value="{$PYWAIE_DM_H}" name="pywaie_dm_h" /></td>
-				</tr>
-				<tr>
-					<td>{'py_autostart'|@translate}</td>
-					<td>&nbsp;
-					<input type="radio" value="1" name="pywaie_dm_autoplay" {$PYWAIE_DM_AUTOPLAY_TRUE} /> 
-					On
-					<input type="radio" value="0" name="pywaie_dm_autoplay" {$PYWAIE_DM_AUTOPLAY_FALSE} /> 
-					Off </td>
-				</tr>
-			</table>
-			</fieldset> </td>
-      
-      <td><fieldset>
-			<legend>Wideo</legend>
-			<table>
-				<tr>
-					<td>{'py_width'|@translate}</td>
-					<td>&nbsp;
-					<input type="text" size="3" maxlength="3" value="{$PYWAIE_WIDEO_W}" name="pywaie_wideo_w" /></td>
-				</tr>
-				<tr>
-					<td>{'py_height'|@translate}</td>
-					<td>&nbsp;
-					<input type="text" size="3" maxlength="3" value="{$PYWAIE_WIDEO_H}" name="pywaie_wideo_h" /></td>
-				</tr>
-				<tr>
-					<td>{'py_autostart'|@translate}</td>
-					<td>&nbsp;
-					<input type="radio" value="true" name="pywaie_wideo_autoplay" {$PYWAIE_WIDEO_AUTOPLAY_TRUE} /> 
-					On
-					<input type="radio" value="false" name="pywaie_wideo_autoplay" {$PYWAIE_WIDEO_AUTOPLAY_FALSE} /> 
-					Off </td>
-				</tr>
-			</table>
-			</fieldset> </td>
-		</tr>
-
-		<tr>
-			<td><fieldset>
-			<legend>Vimeo</legend>
-			<table>
-				<tr>
-					<td>{'py_width'|@translate}</td>
-					<td>&nbsp;
-					<input type="text" size="3" maxlength="3" value="{$PYWAIE_VIMEO_W}" name="pywaie_vimeo_w" /></td>
-				</tr>
-				<tr>
-					<td>{'py_height'|@translate}</td>
-					<td>&nbsp;
-					<input type="text" size="3" maxlength="3" value="{$PYWAIE_VIMEO_H}" name="pywaie_vimeo_h" /></td>
-				</tr>
-				<tr>
-					<td>{'py_autostart'|@translate}</td>
-					<td>&nbsp;
-					<input type="radio" value="1" name="pywaie_vimeo_autoplay" {$PYWAIE_VIMEO_AUTOPLAY_TRUE} /> 
-					On
-					<input type="radio" value="0" name="pywaie_vimeo_autoplay" {$PYWAIE_VIMEO_AUTOPLAY_FALSE} /> 
-					Off </td>
-				</tr>
-			</table>
-			</fieldset> </td>    
-	
-			<td><fieldset>
-			<legend>Wat</legend>
-			<table>
-				<tr>
-					<td>{'py_width'|@translate}</td>
-					<td>&nbsp;
-					<input type="text" size="3" maxlength="3" value="{$PYWAIE_WAT_W}" name="pywaie_wat_w" /></td>
-				</tr>
-				<tr>
-					<td>{'py_height'|@translate}</td>
-					<td>&nbsp;
-					<input type="text" size="3" maxlength="3" value="{$PYWAIE_WAT_H}" name="pywaie_wat_h" /></td>
-				</tr>
-				<tr>
-					<td>{'py_autostart'|@translate}</td>
-					<td>&nbsp;
-					<input type="radio" value="true" name="pywaie_wat_autoplay" {$PYWAIE_WAT_AUTOPLAY_TRUE} /> 
-					On
-					<input type="radio" value="false" name="pywaie_wat_autoplay" {$PYWAIE_WAT_AUTOPLAY_FALSE} /> 
-					Off </td>
-				</tr>
-			</table>
-			</fieldset> </td>  
-  
-  </table>
-	<div align="center">
-		<input class="submit" type="submit" value="{'Submit'|@translate}" name="submit" /></div>
-</form>
-<br>
Index: /extensions/gvideo/admin/index.php
===================================================================
--- /extensions/gvideo/admin/index.php	(revision 17306)
+++ /extensions/gvideo/admin/index.php	(revision 17307)
@@ -1,12 +1,9 @@
 <?php
 // +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery                           |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id: index.php 1912 2007-03-16 06:30:07Z rub $
-// | last update   : $Date: 2007-03-16 07:30:07 +0100 (ven, 16 mar 2007) $
-// | last modifier : $Author: rub $
-// | revision      : $Revision: 1912 $
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: tensions/gvideo/admin/pywaie_admin.php
===================================================================
--- /extensions/gvideo/admin/pywaie_admin.php	(revision 17306)
+++ 	(revision )
@@ -1,29 +1,0 @@
-<?php
-
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
-include_once(PHPWG_ROOT_PATH.'admin/include/tabsheet.class.php');
-load_language('plugin.lang', GVIDEO_PATH);
-
-global $template;
-
-// Gestion des onglets
-if (!isset($_GET['tab']))
-    $page['tab'] = 'add_page';
-else
-    $page['tab'] = $_GET['tab'];
-    
-$my_base_url = get_admin_plugin_menu_link(__FILE__);
-    
-$tabsheet = new tabsheet();
-$tabsheet->add('add_page',
-               l10n('py_addvideo'),
-               $my_base_url.'&amp;tab=add_page');
-$tabsheet->add('config',
-               l10n('py_conf'),
-               $my_base_url.'&amp;tab=config');
-$tabsheet->select($page['tab']);
-$tabsheet->assign();
-
-include_once ($page['tab'] . '.php');
-
-?>
Index: /extensions/gvideo/admin/template/add.tpl
===================================================================
--- /extensions/gvideo/admin/template/add.tpl	(revision 17307)
+++ /extensions/gvideo/admin/template/add.tpl	(revision 17307)
@@ -0,0 +1,137 @@
+{combine_css path=$GVIDEO_PATH|@cat:"admin/template/style.css"}
+
+{footer_script}{literal}
+jQuery("input[data-toggle]").change(function() {
+  $('#'+ $(this).data('toggle')).toggle();
+});
+{/literal}{/footer_script}
+
+<div class="titrePage">
+	<h2>Embedded Videos</h2>
+</div>
+
+<form method="post" action="" class="properties">
+<fieldset>
+  <legend>{'Properties'|@translate}</legend>
+  
+  <ul>
+    <li>
+      <label>
+        <span class="property">{'Album'|@translate}</span>
+        <select name="category" size="1">
+          {html_options options=$category_parent_options selected=$POST.category}
+        </select>
+      </label>
+    </li>
+    <li>
+      <label>
+        <span class="property">{'Video URL'|@translate}</span>
+        <input type="text" name="url" value="{$POST.url}" size="70">
+      </label>
+    </li>
+    <li>
+      <span class="property">{'Name'|@translate}</span>
+      <label><input type="radio" name="name_server" value="true" {if $POST.name_server != 'false'}checked="checked"{/if} data-toggle="name"> {'From the video'|@translate}</label>
+      <label><input type="radio" name="name_server" value="false" {if $POST.name_server == 'false'}checked="checked"{/if} data-toggle="name"> {'Change'|@translate}</label>
+    </li>
+    <li {if $POST.name_server != 'false'}style="display:none;"{/if} id="name">
+      <span class="property">&nbsp;</span>
+      <input type="text" name="name" value="{$POST.name}" size="70">
+    </li>
+    <li>
+        <span class="property">{'Author'|@translate}</span>
+        <label><input type="radio" name="author_server" value="true" {if $POST.author_server != 'false'}checked="checked"{/if} data-toggle="author"> {'From the video'|@translate}</label>
+        <label><input type="radio" name="author_server" value="false" {if $POST.author_server == 'false'}checked="checked"{/if} data-toggle="author"> {'Change'|@translate}</label>
+    </li>
+    <li {if $POST.author_server != 'false'}style="display:none;"{/if} id="author">
+      <span class="property">&nbsp;</span>
+      <input type="text" name="author" value="{$POST.author}" size="20">
+    </li>
+    <li>
+      <span class="property">{'Description'|@translate}</span>
+      <label><input type="radio" name="description_server" value="true" {if $POST.description_server != 'false'}checked="checked"{/if} data-toggle="description"> {'From the video'|@translate}</label>
+      <label><input type="radio" name="description_server" value="false" {if $POST.description_server == 'false'}checked="checked"{/if} data-toggle="description"> {'Change'|@translate}</label>
+    </li>
+    <li {if $POST.description_server != 'false'}style="display:none;"{/if} id="description">
+      <span class="property">&nbsp;</span>
+      <textarea name="description" rows="5" cols="50">{$POST.description}</textarea>
+    </li>
+    <li>
+      <label>
+        <span class="property">{'Thumbnail'|@translate}</span>
+        <label><input type="radio" name="thumbnail_server" value="true" checked="checked" data-toggle="thumbnail_src"> {'From the video'|@translate}</label>
+        <label><input type="radio" name="thumbnail_server" value="false" data-toggle="thumbnail_src"> {'Change'|@translate}</label>
+      </label>
+    </li>
+    <li id="thumbnail_src" style="display:none;">
+      <span class="property">&nbsp;</span>
+      <input type="file" name="thumbnail_src"><br>
+      <span class="property">&nbsp;</span>
+      {'Maximum file size: %sB.'|@translate|@sprintf:$upload_max_filesize_shorthand} {'Allowed file types: %s.'|@translate|@sprintf:'jpg, png, gif'}
+      <input type="hidden" name="MAX_FILE_SIZE" value="{$upload_max_filesize}">
+    </li>
+  </ul>  
+</fieldset>
+
+<fieldset>
+  <legend>{'Configuration'|@translate}</legend>
+  
+  <ul>
+    <li>
+      <span class="property">{'Video size'|@translate}</span>
+      <label><input type="radio" name="size_common" value="true" {if $POST.size_common != 'false'}checked="checked"{/if} data-toggle="size"> {'Use common setting'|@translate}</label>
+      <label><input type="radio" name="size_common" value="false" {if $POST.size_common == 'false'}checked="checked"{/if} data-toggle="size"> {'Change'|@translate}</label>
+    </li>
+    <li {if $POST.size_common != 'false'}style="display:none;"{/if} id="size">
+      <span class="property">&nbsp;</span>
+      <input type="text" name="width" value="{$POST.width}" size="4"> &times;
+      <input type="text" name="height" value="{$POST.height}" size="4"> px
+    </li>
+    <li>
+      <span class="property">{'Autoplay'|@translate}</span>
+      <label><input type="radio" name="autoplay_common" value="true" {if $POST.autoplay_common != 'false'}checked="checked"{/if} data-toggle="autoplay"> {'Use common setting'|@translate}</label>
+      <label><input type="radio" name="autoplay_common" value="false" {if $POST.autoplay_common == 'false'}checked="checked"{/if} data-toggle="autoplay"> {'Change'|@translate}</label>
+    </li>
+    <li {if $POST.autoplay_common != 'false'}style="display:none;"{/if} id="autoplay">
+      <span class="property">&nbsp;</span>
+      <label><input type="radio" name="autoplay" value="0" {if $POST.autoplay == '0'}checked="checked"{/if}> {'No'|@translate}</label>
+      <label><input type="radio" name="autoplay" value="1" {if $POST.autoplay == '1'}checked="checked"{/if}> {'Yes'|@translate}</label>
+    </li>
+  </ul>  
+</fieldset>
+
+
+<p style="text-align:left;"><input type="submit" name="add_video" value="{'Add'|@translate}"></p>
+
+<fieldset>
+  <legend>{'Supported services'|@translate}</legend>
+  
+  <ul>
+    <li>
+      <img class="icon" src="{$GVIDEO_PATH}admin/template/icons/youtube.png">
+      <a href="http://www.youtube.com" target="_blank">YouTube</a>
+    </li>
+    <li>
+      <img class="icon" src="{$GVIDEO_PATH}admin/template/icons/vimeo.png">
+      <a href="http://www.vimeo.com" target="_blank">Vimeo</a>
+    </li>
+    <li>
+      <img class="icon" src="{$GVIDEO_PATH}admin/template/icons/dailymotion.png">
+      <a href="http://www.dailymotion.com" target="_blank">Dailymotion</a>
+    </li>
+    <li>
+      <img class="icon" src="{$GVIDEO_PATH}admin/template/icons/wat.png">
+      <a href="http://www.wat.tv" target="_blank">Wat</a>
+    </li>
+    <li>
+      <img class="icon" src="{$GVIDEO_PATH}admin/template/icons/wideo.png">
+      <a href="http://www.wideo.fr" target="_blank">Wideo</a>
+    </li>
+    <li>
+      <img class="icon" src="{$GVIDEO_PATH}admin/template/icons/videobb.png">
+      <a href="http://www.videobb.com" target="_blank">videobb</a>
+    </li>
+  </ul>
+</fieldset>
+
+</form>
Index: /extensions/gvideo/admin/template/config.tpl
===================================================================
--- /extensions/gvideo/admin/template/config.tpl	(revision 17307)
+++ /extensions/gvideo/admin/template/config.tpl	(revision 17307)
@@ -0,0 +1,81 @@
+{combine_css path=$GVIDEO_PATH|@cat:"admin/template/style.css"}
+
+{footer_script}{literal}
+jQuery('label.color input').change(function() {
+  $('label.color').removeClass('active');
+  $('label.color input:checked').parent('label').addClass('active');
+});
+{/literal}{/footer_script}
+
+<div class="titrePage">
+	<h2>Embedded Videos</h2>
+</div>
+
+<form method="post" action="" class="properties">
+<fieldset>
+  <legend>{'Common configuration'|@translate}</legend>
+  
+  <ul>
+    <li>
+      <label>
+        <span class="property">{'Video size'|@translate}</span>
+        <input type="text" name="width" value="{$gvideo.width}" size="4"> &times;
+        <input type="text" name="height" value="{$gvideo.height}" size="4"> px
+      </label>
+    </li>
+    <li>
+      <label>
+        <span class="property">{'Autoplay'|@translate}</span>
+        <label><input type="radio" name="autoplay" value="0" {if not $gvideo.autoplay}checked="checked"{/if}> {'No'|@translate}</label>
+        <label><input type="radio" name="autoplay" value="1" {if $gvideo.autoplay}checked="checked"{/if}> {'Yes'|@translate}</label>
+      </label>
+    </li>
+  </ul>
+</fieldset>
+
+<div class="left"><fieldset>
+  <legend><img class="icon" src="{$GVIDEO_PATH}admin/template/icons/vimeo.png"> {'Vimeo'|@translate}</legend>
+  
+  <ul>
+    <li>
+      <span class="property">{'Color'|@translate}</span>
+    {foreach from=$vimeo_colors item=color}
+      <label class="color {$themeconf.name} {if $gvideo.vimeo.color == $color}active{/if}" style="background:#{$color};"><input type="radio" name="vimeo[color]" value="{$color}" {if $gvideo.vimeo.color == $color}checked="checked"{/if}></label>
+    {/foreach}
+    </li>
+    <li>
+      <label>
+        <span class="property">{'Display'|@translate}</span>
+        <label><input type="checkbox" name="vimeo[title]" value="1" {if $gvideo.vimeo.title}checked="checked"{/if}> {'Title'|@translate}</label>
+        <label><input type="checkbox" name="vimeo[portrait]" value="1" {if $gvideo.vimeo.portrait}checked="checked"{/if}> {'Author portrait'|@translate}</label>
+        <label><input type="checkbox" name="vimeo[byline]" value="1" {if $gvideo.vimeo.byline}checked="checked"{/if}> {'Author name'|@translate}</label>
+      </label>
+    </li>
+  </ul>
+</fieldset></div>
+
+<div class="right"><fieldset>
+  <legend><img class="icon" src="{$GVIDEO_PATH}admin/template/icons/dailymotion.png"> {'Dailymotion'|@translate}</legend>
+  
+  <ul>
+    <li>
+      <span class="property">{'Color'|@translate}</span>
+    {foreach from=$dailymotion_colors item=color}
+      <label class="color {$themeconf.name} {if $gvideo.dailymotion.color == $color}active{/if}" style="background:#{$color};"><input type="radio" name="dailymotion[color]" value="{$color}" {if $gvideo.dailymotion.color == $color}checked="checked"{/if}></label>
+    {/foreach}
+    </li>
+    <li>
+      <label>
+        <span class="property">{'Display'|@translate}</span>
+        <label><input type="checkbox" name="dailymotion[logo]" value="1" {if $gvideo.dailymotion.logo}checked="checked"{/if}> {'Logo'|@translate}</label>
+        <label><input type="checkbox" name="dailymotion[title]" value="1" {if $gvideo.dailymotion.title}checked="checked"{/if}> {'Title'|@translate}</label>
+      </label>
+    </li>
+  </ul>
+</fieldset></div>
+
+<div style="clear:right;"></div>
+
+<p style="text-align:left;"><input type="submit" name="save_config" value="{'Save Settings'|@translate}"></p>
+
+</form>
Index: /extensions/gvideo/admin/template/icons/index.php
===================================================================
--- /extensions/gvideo/admin/template/icons/index.php	(revision 17307)
+++ /extensions/gvideo/admin/template/icons/index.php	(revision 17307)
@@ -0,0 +1,30 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program 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                                          |
+// |                                                                       |
+// | This program 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 this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+// Recursive call
+$url = '../';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
Index: /extensions/gvideo/admin/template/index.php
===================================================================
--- /extensions/gvideo/admin/template/index.php	(revision 17307)
+++ /extensions/gvideo/admin/template/index.php	(revision 17307)
@@ -0,0 +1,30 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program 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                                          |
+// |                                                                       |
+// | This program 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 this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+// Recursive call
+$url = '../';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
Index: /extensions/gvideo/admin/template/style.css
===================================================================
--- /extensions/gvideo/admin/template/style.css	(revision 17307)
+++ /extensions/gvideo/admin/template/style.css	(revision 17307)
@@ -0,0 +1,43 @@
+div.left {
+  float:left;
+  width:50%;
+}
+div.right {
+  float:right;
+  width:50%;
+}
+
+FORM.properties SPAN.property {
+  width:150px;
+}
+
+img.icon {
+  vertical-align:middle;
+}
+
+label.color {
+  display:inline-block;
+  width:12px;
+  height:12px;
+  margin:3px;
+  vertical-align:middle;
+}
+  label.color:hover {
+    width:16px;
+    height:16px;
+    margin:1px;
+  }
+    
+  label.color.active {
+    border:1px solid #000;
+    border-radius:3px;
+    width:16px;
+    height:16px;
+    margin:0;
+  }
+    label.color.active.roma {
+      border-color:#fff;
+    }
+  label.color input {
+    visibility:hidden;
+  }
Index: tensions/gvideo/admin/thumbnails.php
===================================================================
--- /extensions/gvideo/admin/thumbnails.php	(revision 17306)
+++ 	(revision )
@@ -1,187 +1,0 @@
-<?php
-
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
-
-function get_image_with_band($srcImage)
-{
-    $srcWidth = imagesx($srcImage);
-    $srcHeight = imagesy($srcImage);
-    $const = intval($srcWidth * 0.04);
-
-    $imgBand = imagecreatetruecolor($srcWidth + 6 * $const, $srcHeight);
-    
-    $white = imagecolorallocate($imgBand, 255, 255, 255);
-    $y_start = intval($srcHeight / 2);
-    $aug = intval($y_start / 4) + 1;
-    $i = 0;
-
-    while ($y_start + $i * $aug < $srcHeight - $const)
-    {
-      imagefilledrectangle($imgBand, $const, $y_start + $i * $aug - ($const / 2), 2 * $const - 1, $y_start + $i * $aug + ($const / 2) - 1, $white);
-      imagefilledrectangle($imgBand, $const, $y_start - $i * $aug - ($const / 2), 2 * $const - 1, $y_start - $i * $aug + ($const / 2) - 1, $white);
-
-      imagefilledrectangle($imgBand, $srcWidth + (4 * $const), $y_start + $i * $aug - ($const / 2), $srcWidth + (5 * $const) - 1, $y_start + $i * $aug + ($const / 2) - 1, $white);
-      imagefilledrectangle($imgBand, $srcWidth + (4 * $const), $y_start - $i * $aug - ($const / 2), $srcWidth + (5 * $const) - 1, $y_start - $i * $aug + ($const / 2) - 1, $white);
-
-      ++$i;
-    }
-
-    imagecopy($imgBand, $srcImage, 3 * $const, 0, 0, 0, $srcWidth, $srcHeight);
-    return $imgBand;
-}
-
-function Py_RatioResizeImg($url, $path, $newWidth, $newHeight)
-{
-    global $conf, $lang, $page;
-
-    if (!function_exists('gd_info'))
-    {
-      return false;
-    }
-
-    $tempfile = $url;
-    if (url_is_remote($url))
-    {
-      $tempfile = tempnam($path, 'jpg');
-      fetchRemote($url, $tempfile_content);
-      file_put_contents($tempfile, $tempfile_content);
-    }
-
-    list($width, $height, $type) = getimagesize($tempfile);
-    if (IMAGETYPE_PNG == $type)
-    {
-      $srcImage = imagecreatefrompng($tempfile);
-    }
-    else
-    {
-      $srcImage = imagecreatefromjpeg($tempfile);
-    }
-    
-    unlink($tempfile);
-
-    if (isset($_POST['add_band']))
-    {
-      $srcImage = get_image_with_band($srcImage);
-    }
-
-    $srcWidth = imagesx($srcImage);
-    $srcHeight = imagesy($srcImage);
-
-    if (isset($_POST['thumb_resize']))
-    {
-      $ratioWidth = $srcWidth / $newWidth;
-      $ratioHeight = $srcHeight / $newHeight;
-      if ($ratioWidth < $ratioHeight)
-      {
-        $destWidth = $srcWidth / $ratioHeight;
-        $destHigh = $newHeight;
-      }
-      else
-      {
-        $destWidth = $newWidth;
-        $destHigh = $srcHeight / $ratioWidth;
-      }
-    }
-    else
-    {
-      $destWidth = $srcWidth;
-      $destHigh = $srcHeight;
-    }
-
-    $destImage = imagecreatetruecolor($destWidth, $destHigh);
-    
-    imagecopyresampled(
-      $destImage,
-      $srcImage,
-      0,
-      0,
-      0,
-      0,
-      $destWidth,
-      $destHigh,
-      $srcWidth,
-      $srcHeight
-      );
-
-    if (IMAGETYPE_PNG == $type)
-    {
-      imagepng($destImage, $path);
-    }
-    else
-    {
-      imagejpeg($destImage, $path, 95);
-    }
-    
-    imagedestroy($srcImage);
-    imagedestroy($destImage);
-    return true;
-}
-
-// Récupération de la miniature depuis le serveur
-if ($_POST['thumbnail'] == 'thumb_from_server')
-{
-  $video['thumb_url'] = str_replace('&amp;', '&', $video['thumb_url']);
-  if (($thumb_dir = mkget_thumbnail_dir(dirname($file_path), $error)) == false)
-  {
-    array_push($page['errors'], l10n('py_error9'));
-  }
-  else
-  {
-    $thumb_path = file_path_for_type($file_path, 'thumb');
-    if (file_exists($thumb_path))
-    {
-      array_push($page['errors'], sprintf(l10n('py_error11'), $path), l10n('py_error9'));
-    }
-    else
-    {
-      if (Py_RatioResizeImg($video['thumb_url'], $thumb_path, $_POST['thumb_width'], $_POST['thumb_hight']))
-      {
-        array_push($page['infos'], l10n('py_info2'));
-        $thumb_extension = 'jpg';
-      }
-      else
-      {
-        array_push($page['errors'], l10n('py_error9'));
-      }
-    }
-  }
-}
-
-// Upload de la miniature par l'utilisateur
-if ($_POST['thumbnail'] == 'thumb_from_user')
-{
-  if (empty($_FILES['picture']['size']))
-  {
-    array_push($page['infos'], l10n('py_error12'));
-  }
-  else
-  {
-    $ext = get_extension($_FILES['picture']['name']);
-    if (($thumb_dir = mkget_thumbnail_dir(dirname($file_path), $error)) == false)
-    {
-      array_push($page['errors'], l10n('py_error9'));
-    }
-    else
-    {
-      $thumb_path = get_filename_wo_extension(file_path_for_type($file_path, 'thumb')).'.'.$ext;
-      if (file_exists($thumb_path))
-      {
-        array_push($page['errors'], sprintf(l10n('py_error11'), $thumb_path), l10n('py_error9'));
-      }
-      else
-      {
-        if (Py_RatioResizeImg($_FILES['picture']['tmp_name'], $thumb_path, $_POST['thumb_width'], $_POST['thumb_hight']))
-        {
-          $thumb_extension = $ext;
-          array_push($page['infos'], l10n('py_info2'));
-        }
-        else
-        {
-          array_push($page['errors'], l10n('py_error9'));
-        }
-      }
-    }
-  }
-}
-
-?>
Index: tensions/gvideo/gvideo.php
===================================================================
--- /extensions/gvideo/gvideo.php	(revision 17306)
+++ 	(revision )
@@ -1,39 +1,0 @@
-<?php
-
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
-
-$params = unserialize($conf['PY_GVideo']);
-
-$idvideo = file_get_contents($picture['current']['path']);
-$sp = explode("/", $idvideo);
-
-$template->assign(array(
-  'ID_GVIDEO' => $sp[0],
-  'AUTO_GVIDEO' => $params[$extension][2],
-  'HEIGHT_IMG' => !empty($sp[1]) ? $sp[1] : $params[$extension][0],
-  'WIDTH_IMG' => !empty($sp[2]) ? $sp[2] : $params[$extension][1],
-  ));
-
-if ($extension == 'gvideo')
-{
-  $template->assign(array(
-    'LANG_GVIDEO' => $params[$extension][3],
-    'START_GVIDEO' => !empty($sp[3]) ? "initialTime=" . $sp[3] : ''));
-}
-
-// bouton de telechargement
-unset($template->smarty->_tpl_vars['current']['U_DOWNLOAD']);
-$pi = pathinfo($picture['current']['path']);
-$location = get_filename_wo_extension($pi['dirname'] . '/pwg_high/' . $pi['basename']);
-foreach(array('.asf', '.wmv', '.divx', '.xvid', '.avi', '.AVI', '.qt', '.mov', '.mpg', '.mpeg', '.mp4', '.flv', '.zip', '.rar') as $high_ext)
-{
-  if (file_exists($location . $high_ext))
-  {
-    $template->smarty->_tpl_vars['current']['U_DOWNLOAD'] = $location . $high_ext;
-  }
-}
-
-$template->set_filenames(array('py_content' => dirname(__FILE__) . '/template/pywaie_' . $extension . '.tpl'));
-$content = $template->parse('py_content', true);
-
-?>
Index: /extensions/gvideo/include/functions.inc.php
===================================================================
--- /extensions/gvideo/include/functions.inc.php	(revision 17307)
+++ /extensions/gvideo/include/functions.inc.php	(revision 17307)
@@ -0,0 +1,291 @@
+<?php
+if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
+
+function parse_video_url($source_url)
+{
+  $source_url = 'http://'.preg_replace('#^http(s?)://#', null, $source_url);
+  
+  $url = parse_url($source_url);
+  $url['host'] = str_replace('www.', null, $url['host']);
+  $url['host'] = explode('.', $url['host']);
+  
+  $video = array();
+  switch ($url['host'][0])
+  {
+    /* youtube */
+    case 'youtube':
+    {
+      $video['type'] = 'youtube';
+
+      parse_str($url['query'], $url['query']);
+      if (empty($url['query']['v'])) return false;
+      
+      $video['id'] = $url['query']['v'];
+    }
+    
+    case 'youtu': // youtu.be (short-url service)
+    {
+      if (empty($video))
+      {
+        $video['type'] = 'youtube';
+        
+        $url['path'] = explode('/', $url['path']);
+        $video['id'] = $url['path'][1];
+      }
+      
+      $api_url = 'http://gdata.youtube.com/feeds/api/videos/'.$video['id'].'?v=2&alt=json';
+      $json = download_remote_file($api_url, true);
+      if ($json === false or $json == 'file_error') return false;
+      
+      $json = json_decode($json, true);
+      $video = array_merge($video, array(
+        'title' => $json['entry']['title']['$t'],
+        'description' => $json['entry']['media$group']['media$description']['$t'],
+        'thumbnail' => $json['entry']['media$group']['media$thumbnail'][2]['url'],
+        'author' => $json['entry']['author'][0]['name']['$t'],
+        ));
+      break;
+    }
+      
+    /* vimeo */
+    case 'vimeo':
+    {
+      $video['type'] = 'vimeo';
+      
+      $url['path'] = explode('/', $url['path']);
+      $video['id'] = $url['path'][1];
+      
+      $api_url = 'http://vimeo.com/api/v2/video/'.$video['id'].'.json';
+      $json = download_remote_file($api_url, true);
+      if ($json === false or $json == 'file_error') return false;
+      
+      $json = json_decode($json, true);
+      $video = array_merge($video, array(
+        'title' => $json[0]['title'],
+        'description' => $json[0]['description'],
+        'thumbnail' => $json[0]['thumbnail_large'],
+        'author' => $json[0]['user_name'],
+        ));
+      break;
+    }
+      
+    /* dailymotion */
+    case 'dailymotion':
+    {
+      $video['type'] = 'dailymotion';
+      
+      $url['path'] = explode('/', $url['path']);
+      if ($url['path'][1] != 'video') return false;
+      $video['id'] = $url['path'][2];
+      
+      $api_url = 'https://api.dailymotion.com/video/'.$video['id'].'?fields=description,id,thumbnail_large_url,title,owner.username'; // DM doesn't accept non secure connection
+      $json = download_remote_file($api_url, true);
+      if ($json === false or $json == 'file_error') return false;
+      
+      $json = json_decode($json, true);
+      $json['thumbnail_large_url'] = preg_replace('#\?([0-9]+)$#', null, $json['thumbnail_large_url']);
+      
+      $video = array_merge($video, array(
+        'id' => $json['id'],
+        'title' => $json['title'],
+        'description' => $json['description'],
+        'thumbnail' => $json['thumbnail_large_url'],
+        'author' => $json['owner.username'],
+        ));
+      break;
+    }
+      
+    /* wat */
+    case 'wat':
+    {
+      $video['type'] = 'wat';
+      
+      $html = download_remote_file($source_url, true);
+      if ($html === false or $html == 'file_error') return false;
+      
+      preg_match('#<meta property="og:video" content="http://www.wat.tv/swf2/([^"/>]+)" />#', $html, $matches);
+      if (empty($matches[1])) return false;
+      $video['id'] = $matches[1];
+      
+      preg_match('#<meta name="name" content="([^">]*)" />#', $html, $matches);
+      $video['title'] = $matches[1];
+      
+      preg_match('#<p class="description"([^>]*)>(.*?)</p>#s', $html, $matches);
+      $video['description'] = $matches[2];
+      
+      preg_match('#<meta property="og:image" content="([^">]+)" />#', $html, $matches);
+      $video['thumbnail'] = $matches[1];
+      
+      $video['author'] = null;
+      break;
+    }
+      
+    /* wideo */
+    case 'wideo':
+    {
+      $video['type'] = 'wideo';
+      
+      $url['path'] = explode('/', $url['path']);
+      $video['id'] = rtrim($url['path'][2], '.html');
+      
+      $html = download_remote_file($source_url, true);
+      if ($html === false or $html == 'file_error') return false;
+            
+      preg_match('#<meta property="og:title" content="([^">]*)" />#', $html, $matches);
+      $video['title'] = $matches[1];
+      
+      preg_match('#<meta property="og:description" content="([^">]*)" />#', $html, $matches);
+      $video['description'] = $matches[1];
+      
+      preg_match('#<meta property="og:image" content="([^">]+)" />#', $html, $matches);
+      $video['thumbnail'] = $matches[1];
+      
+      preg_match('#<li id="li_author">Auteur :  <a href="\#"([^>]*)><span>(.*?)</span></a>#', $html, $matches);
+      $video['author'] = $matches[2];
+      break;
+    }
+      
+    /* videobb */
+    case 'videobb':
+    {
+      $video['type'] = 'videobb';
+      
+      if (!empty($url['query']))
+      {
+        parse_str($url['query'], $url['query']);
+        if (empty($url['query']['v'])) return false;
+        $video['id'] = $url['query']['v'];
+      }
+      else
+      {
+        $url['path'] = explode('/', $url['path']);
+        if ($url['path'][1] != 'video') return false;
+        $video['id'] = $url['path'][2];
+      }
+      
+      $html = download_remote_file($source_url, true);
+      if ($html === false or $html == 'file_error') return false;
+            
+      preg_match('#<meta content="videobb - ([^">]*)"  name="title" property="" />#', $html, $matches);
+      $video['title'] = $matches[1];
+      
+      $video['description'] = null;
+      
+      preg_match('#<link rel="image_src" href="([^">]+)" type="image/jpeg" />#', $html, $matches);
+      $video['thumbnail'] = $matches[1];
+      
+      $video['author'] = null;
+      break;
+    }
+      
+    default:
+      return false;   
+  }
+  
+  return $video;
+}
+
+/**
+ * download a remote file
+ *  - needs cURL or allow_url_fopen
+ *  - take care of SSL urls
+ *
+ * @param: string source url
+ * @param: mixed destination file (if true, file content is returned)
+ */
+if (!function_exists('download_remote_file'))
+{
+  function download_remote_file($src, $dest)
+  {
+    if (empty($src))
+    {
+      return false;
+    }
+    
+    $return = ($dest === true) ? true : false;
+    
+    /* curl */
+    if (function_exists('curl_init'))
+    {
+      if (!$return)
+      {
+        $newf = fopen($dest, "wb");
+      }
+      $ch = curl_init();
+      
+      curl_setopt($ch, CURLOPT_URL, $src);
+      curl_setopt($ch, CURLOPT_HEADER, 0);
+      curl_setopt($ch, CURLOPT_HTTPHEADER, array("Accept-language: en"));
+      curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)');
+      curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+      curl_setopt($ch, CURLOPT_MAXREDIRS, 1);
+      if (strpos($src, 'https://') !== false)
+      {
+        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
+      }
+      if (!$return)
+      {
+        curl_setopt($ch, CURLOPT_FILE, $newf);
+      }
+      else
+      {
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+      }
+      
+      if (($out = curl_exec($ch)) === false)
+      {
+        return 'file_error';
+      }
+      
+      curl_close($ch);
+      
+      if (!$return)
+      {
+        fclose($newf);
+        return true;
+      }
+      else
+      {
+        return $out;
+      }
+    }
+    /* file get content */
+    else if (ini_get('allow_url_fopen'))
+    {
+      if (strpos($src, 'https://') !== false and !extension_loaded('openssl'))
+      {
+        return false;
+      }
+      
+      $opts = array(
+        'http' => array(
+          'method' => "GET",
+          'user_agent' => 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)',
+          'header' => "Accept-language: en",
+        )
+      );
+
+      $context = stream_context_create($opts);
+      
+      if (($file = file_get_contents($src, false, $context)) === false)
+      {
+        return 'file_error';
+      }
+      
+      if (!$return)
+      {
+        file_put_contents($dest, $file);
+        return true;
+      }
+      else
+      {
+        return $file;
+      }
+    }
+    
+    return false;
+  }
+}
+
+?>
Index: /extensions/gvideo/include/gvideo.inc.php
===================================================================
--- /extensions/gvideo/include/gvideo.inc.php	(revision 17307)
+++ /extensions/gvideo/include/gvideo.inc.php	(revision 17307)
@@ -0,0 +1,93 @@
+<?php
+if (!defined('GVIDEO_PATH')) die('Hacking attempt!');
+
+/**
+ * replace content on picture page
+ */
+function gvideo_element_content($content, $element_info)
+{
+  global $page, $picture, $template, $conf;
+  
+  $query = '
+SELECT *
+  FROM '.GVIDEO_TABLE.'
+  WHERE picture_id = '.$element_info['id'].'
+;';
+  $result = pwg_query($query);
+  
+  if (!pwg_db_num_rows($result))
+  {
+    return $content;
+  }
+  
+  remove_event_handler('render_element_content', 'default_picture_content', EVENT_HANDLER_PRIORITY_NEUTRAL);
+  
+  $conf['gvideo'] = unserialize($conf['gvideo']);
+  
+  $video = pwg_db_fetch_assoc($result);  
+  if (empty($video['width']))
+  {
+    $video['width'] = $conf['gvideo']['width'];
+    $video['height'] = $conf['gvideo']['height'];
+  }
+  if (empty($video['autoplay']))
+  {
+    $video['autoplay'] = $conf['gvideo']['autoplay'];
+  }
+  
+  $video['config'] = $conf['gvideo'];
+  if ($video['type'] == 'dailymotion')
+  {
+    $colors = array(
+      'F7FFFD' => 'foreground=%23F7FFFD&amp;highlight=%23FFC300&amp;background=%23171D1B',
+      'E02C72' => 'foreground=%23E02C72&amp;highlight=%23BF4B78&amp;background=%23260F18',
+      '92ADE0' => 'foreground=%2392ADE0&amp;highlight=%23A2ACBF&amp;background=%23202226',
+      'E8D9AC' => 'foreground=%23E8D9AC&amp;highlight=%23FFF6D9&amp;background=%23493D27',
+      'C2E165' => 'foreground=%23C2E165&amp;highlight=%23809443&amp;background=%23232912',
+      '052880' => 'foreground=%23FF0099&amp;highlight=%23C9A1FF&amp;background=%23052880',
+      'FF0000' => 'foreground=%23FF0000&amp;highlight=%23FFFFFF&amp;background=%23000000',
+      '834596' => 'foreground=%23834596&amp;highlight=%23CFCFCF&amp;background=%23000000',
+      );
+    $video['config']['dailymotion']['color'] = $colors[ $video['config']['dailymotion']['color'] ];
+  }
+  $template->assign('GVIDEO', $video);
+
+  $template->set_filename('gvideo_content', dirname(__FILE__).'/../template/video_'.$video['type'].'.tpl');
+  return $template->parse('gvideo_content', true);
+}
+
+/**
+ * clean table at element deletion
+ */
+function gvideo_delete_elements($ids)
+{
+  $query = '
+DELETE FROM '.GVIDEO_TABLE.'
+  WHERE picture_id IN ('.implode(',', $ids).')
+;';
+  pwg_query($query);
+}
+
+/**
+ * add message on edition page
+ */
+function gvideo_photo_edit()
+{
+  global $page;
+  
+  if ($page['page'] != 'photo') return;
+  
+  $query = '
+SELECT *
+  FROM '.GVIDEO_TABLE.'
+  WHERE picture_id = '.$_GET['image_id'].'
+;';
+  $result = pwg_query($query);
+  
+  if (pwg_db_num_rows($result))
+  {
+    array_push($page['warnings'], l10n('This element is a video added with "Embedded Video"'));
+  }
+}
+
+?>
Index: /extensions/gvideo/include/index.php
===================================================================
--- /extensions/gvideo/include/index.php	(revision 17307)
+++ /extensions/gvideo/include/index.php	(revision 17307)
@@ -0,0 +1,30 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program 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                                          |
+// |                                                                       |
+// | This program 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 this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+// Recursive call
+$url = '../';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
Index: /extensions/gvideo/index.php
===================================================================
--- /extensions/gvideo/index.php	(revision 17306)
+++ /extensions/gvideo/index.php	(revision 17307)
@@ -1,12 +1,9 @@
 <?php
 // +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery                           |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id: index.php 1912 2007-03-16 06:30:07Z rub $
-// | last update   : $Date: 2007-03-16 07:30:07 +0100 (ven, 16 mar 2007) $
-// | last modifier : $Author: rub $
-// | revision      : $Revision: 1912 $
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: /extensions/gvideo/language/ar_SA/description.txt
===================================================================
--- /extensions/gvideo/language/ar_SA/description.txt	(revision 17306)
+++ /extensions/gvideo/language/ar_SA/description.txt	(revision 17307)
@@ -1,1 +1,1 @@
-اضافة مقاطع فيديو من : Google Video, Dailymotion, Youtube, Wideo, Vimeo or Wat
+اضافة مقاطع فيديو من : Dailymotion, Youtube, Wideo, Vimeo, videobb or Wat
Index: /extensions/gvideo/language/ar_SA/index.php
===================================================================
--- /extensions/gvideo/language/ar_SA/index.php	(revision 17306)
+++ /extensions/gvideo/language/ar_SA/index.php	(revision 17307)
@@ -1,12 +1,9 @@
 <?php
 // +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery                           |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id$
-// | last update   : $Date$
-// | last modifier : $Author$
-// | revision      : $Revision$
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: tensions/gvideo/language/ar_SA/plugin.lang.php
===================================================================
--- /extensions/gvideo/language/ar_SA/plugin.lang.php	(revision 17306)
+++ 	(revision )
@@ -1,45 +1,0 @@
-<?php
-
-$lang['py_title'] = 'PYWaie GVideo';
-$lang['py_conf'] = 'الاعدادات';
-$lang['py_addvideo'] = 'اضافة فيديو';
-$lang['py_filename'] = 'اسم الملف';
-$lang['py_url'] = 'رابط للفيديو';
-$lang['py_parent'] = 'التصنيف الرئيسي';
-$lang['py_thumb'] = 'صورة مصغرة';
-$lang['py_no_thumb'] = 'لايوجد صورة مصغرة';
-$lang['py_thumb_from_server'] = 'رفع صورة مصغرة من سيرفر';
-$lang['py_thumb_from_user'] = 'ارفع صورة مصغرة خاصتك:';
-$lang['py_add_band'] = 'اضف طوق يحيط بجوانب الصورة المصغرة';
-$lang['py_thumb_resize'] = 'تحجيم الصورة المصغرة';
-$lang['py_width'] = 'العرض';
-$lang['py_height'] = 'الارتفاع';
-$lang['py_start'] = 'بداية الفيديو';
-$lang['py_*'] = 'حقل اجباري';
-$lang['py_autostart'] = 'بداية تلقائية';
-$lang['py_quality'] = 'الجودة';
-$lang['py_playermode'] = 'وضع المشغل';
-
-// Infobulles
-$lang['pybulle_reference'] = "الصق هنا رابط الفيديو.<br>You can use GoogleVideo, YouTube, DailyMotion, Wideo, Vimeo or Wat. امثلة:<br><br>- http://video.google.fr/videoplay?docid=4600755234172037942<br>- http://www.youtube.com/watch?v=eUvApC0bwUk<br>- http://www.dailymotion.com/video/x29fys_doorway<br>- http://www.wideo.fr/video/iLyROoaftYvl.html<br>- http://www.vimeo.com/1747316<br>- http://www.wat.tv/video/abcd.html";
-$lang['pybulle_start'] = "اختيار نقطة البداية (في ثانية) من الفيديو <br> يكون هذا الخيار فقط من جوجل فيديو";
-$lang['pybulle_categorie'] = "التصنيف حيث يتم فيه ان شاء الملف : فقط التصنيفات الحقيقية ستظهر. اذا كنت تريد ان ربط الفيديو الى تصنيف وهمي يمكن فعل ذلك لاحقا";
-$lang['pybulle_miniature'] = "يمكن استرجاع الصورة المصغرة من السيرفر. افتراضيا الصور المصغرة بالحجم التالي في,  320x240 on Google Video, 320x240 on Dailymotion, 130x97 on Youtube, 154x114 on Wideo and 200x150 on Vimeo.<br><br> أو بامكانك ان ترفع صورة مصغرة لاحقا.<br><br> في كلتا الحالتين يمكنك تغيير الحجم";
-
-// Messages d'infos ou d'erreurs
-$lang['py_error1'] = 'لايوجد موقع! لايمكن انشاء الملف';
-$lang['py_error2'] = 'من المستحيل الحفظ لم تدخل بالصيغة الصحيحة';
-$lang['py_error3'] = 'يجب ادخال المناطق الاجبارية';
-$lang['py_error5'] = 'رابط خاطئ!';
-$lang['py_error6'] = 'الملف"%s" بالفعل موجود.';
-$lang['py_error7'] = 'لا امكانية لكتابة الملف"%s"';
-$lang['py_error8'] = 'من فضلك افحص المجلد %s اذا كان يملك حقوق(chmod).';
-$lang['py_error9'] = 'خطأ في الرفع او التحجيم';
-$lang['py_error11'] = 'صورة مصغرة بنفس الاسم متواجدة(%s)';
-$lang['py_error12'] = 'منطقة الصورة المصغرة لم تدخل : الصورة المصغرة لم ترفع.';
-$lang['py_info2'] = 'تم رفع الصورة المصغرة بنجاح';
-$lang['py_info3'] = 'الفيديو';
-$lang['py_info4'] = 'الاعدادات حفظت';
-$lang['py_show_file'] = '<a href="%s" class="externalLink">اظهر الفيديو</a>.';
-
-?>
Index: /extensions/gvideo/language/ca_ES/description.txt
===================================================================
--- /extensions/gvideo/language/ca_ES/description.txt	(revision 17306)
+++ /extensions/gvideo/language/ca_ES/description.txt	(revision 17307)
@@ -1,1 +1,1 @@
-Permet afegir vídeos de GoogleVideo, Dailymotion, Youtube, Wideo, Vimeo o Wat.
+Permet afegir vídeos de Dailymotion, Youtube, Wideo, Vimeo, videobb o Wat.
Index: /extensions/gvideo/language/ca_ES/index.php
===================================================================
--- /extensions/gvideo/language/ca_ES/index.php	(revision 17307)
+++ /extensions/gvideo/language/ca_ES/index.php	(revision 17307)
@@ -0,0 +1,30 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program 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                                          |
+// |                                                                       |
+// | This program 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 this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+// Recursive call
+$url = '../';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
Index: tensions/gvideo/language/ca_ES/plugin.lang.php
===================================================================
--- /extensions/gvideo/language/ca_ES/plugin.lang.php	(revision 17306)
+++ 	(revision )
@@ -1,60 +1,0 @@
-<?php
-// +-----------------------------------------------------------------------+
-// | Piwigo - a PHP based photo gallery                                    |
-// +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
-// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
-// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
-// +-----------------------------------------------------------------------+
-// | This program 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                                          |
-// |                                                                       |
-// | This program 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 this program; if not, write to the Free Software           |
-// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
-// | USA.                                                                  |
-// +-----------------------------------------------------------------------+
-$lang['py_*'] = 'Camp obligatori';
-$lang['py_add_band'] = 'Afegir bandes en els costats de la imatge';
-$lang['py_addvideo'] = 'Afegir un vídeo';
-$lang['py_autostart'] = 'Autoiniciar';
-$lang['py_conf'] = 'Configuració';
-$lang['py_error5'] = 'URL errònia.';
-$lang['py_filename'] = 'Nom de l\'arxiu';
-$lang['py_height'] = 'Altura';
-$lang['py_no_thumb'] = 'sense miniatures';
-$lang['py_parent'] = 'Categoria Principal';
-$lang['py_playermode'] = 'Mode Reproductor';
-$lang['py_quality'] = 'Qualitat';
-$lang['py_start'] = 'Inici del vídeo';
-$lang['py_thumb_from_server'] = 'Carregar miniatura al servidor';
-$lang['py_thumb_from_user'] = 'Carregar miniatura';
-$lang['py_thumb_resize'] = 'Canviar la mida de la imatge';
-$lang['py_thumb'] = 'Miniatura';
-$lang['py_title'] = 'PYWaie GVideo';
-$lang['py_url'] = 'URL del vídeo';
-$lang['py_width'] = 'Amplada';
-$lang['py_error11'] = 'Ja existeix una imatge amb el mateix nom (%s)';
-$lang['py_error12'] = 'No s\'ha pogut pujar la miniatura el seu camp no s\'ha emplenat correctament.';
-$lang['py_error2'] = 'No s\'ha pogut desar perquè no ha emplenat el formulari correctament.';
-$lang['py_error3'] = 'Ha d\'omplir el camp obligatori (*)';
-$lang['py_info2'] = 'La miniatura s\'ha pujat correctament';
-$lang['py_info3'] = 'El vídeo s\'ha afegit correctament';
-$lang['py_info4'] = 'Configuració guardada.';
-$lang['py_error9'] = 'Error al pujar o redimensionar una miniatura.';
-$lang['py_error1'] = 'No hi ha cap lloc web local. No es pot crear cap arxiu de vídeo.';
-$lang['py_error6'] = 'L\'arxiu "%s" ja existeix.';
-$lang['py_error7'] = 'No es pot escriure a l\'arxiu "%s"';
-$lang['py_error8'] = 'Si us plau, comprovi que el directori %s disposa de permisos (chmod).';
-$lang['py_show_file'] = '<a href="%s" class="externalLink">Veure vídeo</a>.';
-$lang['pybulle_categorie'] = 'Àlbum en el qual es crea l\'arxiu. Només s\'enumeren els àlbums físics. En cas de voler vincular aquest arxiu a un àlbum virtual, caldria fer-ho després.';
-$lang['pybulle_miniature'] = 'Per una banda, pot obtenir i recuperar les miniatura de nou al servidor. Per defecte, les mides de les miniatures són de 320x240 a GoogleVideo, 320x240 a Dailymotion, 130x97 a Youtube, 154x114 a Wideo i 200x150 a Vimeo.<br><br>Per altra banda, també pot pujar les seves pròpies miniatures.<br><br>En ambdós casos, en podeu canviar les mides.';
-$lang['pybulle_reference'] = 'Enganxi aquí la URL d\'enllaç a la pàgina on hi hagi el vídeo.<br>Es poden afegir vídeos de GoogleVideo, YouTube, DailyMotion, Wideo, Vimeo o Wat. Exemples:<br><br>- http://video.google.fr/videoplay?docid=4600755234172037942<br>- http://www.youtube.com/watch?v=eUvApC0bwUk<br>- http://www.dailymotion.com/video/x29fys_doorway<br>- http://www.wideo.fr/video/iLyROoaftYvl.html<br>- http://www.vimeo.com/1747316<br>- http://www.wat.tv/video/abcd.html';
-$lang['pybulle_start'] = 'Defineix el punt d\'inici (en segons) del vídeo.<br>Aquesta opció està només disponible per a GoogleVideo.';
-?>
Index: /extensions/gvideo/language/cs_CZ/description.txt
===================================================================
--- /extensions/gvideo/language/cs_CZ/description.txt	(revision 17306)
+++ /extensions/gvideo/language/cs_CZ/description.txt	(revision 17307)
@@ -1,1 +1,1 @@
-Umožňuje vložení video souborů z Youtube, Google Video, Dailymotion, Wideo, Vimeo nebo Wat.
+Umožňuje vložení video souborů z Youtube, Dailymotion, Wideo, Vimeo, videobb nebo Wat.
Index: /extensions/gvideo/language/cs_CZ/index.php
===================================================================
--- /extensions/gvideo/language/cs_CZ/index.php	(revision 17306)
+++ /extensions/gvideo/language/cs_CZ/index.php	(revision 17307)
@@ -1,12 +1,9 @@
 <?php
 // +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery                           |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id$
-// | last update   : $Date$
-// | last modifier : $Author$
-// | revision      : $Revision$
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: tensions/gvideo/language/cs_CZ/plugin.lang.php
===================================================================
--- /extensions/gvideo/language/cs_CZ/plugin.lang.php	(revision 17306)
+++ 	(revision )
@@ -1,46 +1,0 @@
-<?php
-
-$lang['py_title'] = 'PYWaie GVideo';
-$lang['py_conf'] = 'Konfigurace';
-$lang['py_addvideo'] = 'Vložit video';
-$lang['py_filename'] = 'Název souboru';
-$lang['py_url'] = 'URL adresa videa';
-$lang['py_parent'] = 'Hlavní kategorie';
-$lang['py_thumb'] = 'Náhled';
-$lang['py_no_thumb'] = 'Bez náhledu';
-$lang['py_thumb_from_server'] = 'Upload náhledu ze serveru';
-$lang['py_thumb_from_user'] = 'Upload vlastního náhledu:';
-$lang['py_add_band'] = 'Vložit pásy po stranách náhledu';
-$lang['py_thumb_resize'] = 'Změna velikosti náhledu';
-$lang['py_width'] = 'Šířka';
-$lang['py_height'] = 'Výška';
-$lang['py_start'] = 'Začátek videa';
-$lang['py_*'] = 'Povinné položky';
-$lang['py_autostart'] = 'Autostart';
-$lang['py_quality'] = 'Kvalita';
-$lang['py_playermode'] = 'Mód přehrávače';
-
-
-// Infobulles
-$lang['pybulle_reference'] = "Sem vložte odkaz na stránku videa.<br>Můžete použít GoogleVideo, YouTube, DailyMotion, Wideo, Vimeo nebo Wat. Příklady:<br><br>- http://video.google.fr/videoplay?docid=4600755234172037942<br>- http://www.youtube.com/watch?v=eUvApC0bwUk<br>- http://www.dailymotion.com/video/x29fys_doorway<br>- http://www.wideo.fr/video/iLyROoaftYvl.html<br>- http://www.vimeo.com/1747316<br>- http://www.wat.tv/video/abcd.html";
-$lang['pybulle_start'] = "Zvolte čas začátku videa v sekundách.<br>Lze použít POUZE na GoogleVideo.";
-$lang['pybulle_categorie'] = "Kategorie kde bude soubor vytvořen: pouze reálné kategorie jsou v seznamu. Pokud chcete odkazovat do virtuální kategorie, odkazujte až po vytvoření.";
-$lang['pybulle_miniature'] = "Můžete získat náhled zpět na server. Defaultně, rozměry náhledů jsou 320x240 Google Video, Dailymotion, 130x97 Youtube, 154x114 Wideo a 200x150px Vimeo.<br><br> Nebo nahrajte vlastní náhled.<br><br> V obou případech můžete změnit rozměry náhledu.";
-
-// Informační zprávy nebo chyby
-$lang['py_error1'] = 'Žádná místní stránka! Není možné vytvořit video soubor.';
-$lang['py_error2'] = 'Nelze ukládat. Nevyplnili jste správně formulář';
-$lang['py_error3'] = 'Vyplňte povinné položky označené *';
-$lang['py_error5'] = 'špatná URL!';
-$lang['py_error6'] = 'soubor "%s" už existuje.';
-$lang['py_error7'] = 'Není možné zapsat soubor "%s"';
-$lang['py_error8'] = 'zkontrolujte jestli složka %s má správně(chmod).';
-$lang['py_error9'] = 'Chyba při nahrávání nebo změně rozměrů náhledu.';
-$lang['py_error11'] = 'Náhled se stejnám názvem již exituje (%s)';
-$lang['py_error12'] = 'pole náhledu nebylo vyplněno : náhled nebyl uploadován.';
-$lang['py_info2'] = 'náhled byl uploadován';
-$lang['py_info3'] = 'Video bylo přidáno';
-$lang['py_info4'] = 'Konfigurace uložena.';
-$lang['py_show_file'] = '<a href="%s" class="externalLink">Zobraz video</a>.';
-
-?>
Index: /extensions/gvideo/language/de_DE/description.txt
===================================================================
--- /extensions/gvideo/language/de_DE/description.txt	(revision 17306)
+++ /extensions/gvideo/language/de_DE/description.txt	(revision 17307)
@@ -1,1 +1,1 @@
-Gibt die Möglichkeit Videos von Google Video, Dailymotion, Youtube, Wideo, Vimeo oder Wat hinzuzufügen.
+Gibt die Möglichkeit Videos von Dailymotion, Youtube, Wideo, Vimeo, videobb oder Wat hinzuzufügen.
Index: /extensions/gvideo/language/de_DE/index.php
===================================================================
--- /extensions/gvideo/language/de_DE/index.php	(revision 17306)
+++ /extensions/gvideo/language/de_DE/index.php	(revision 17307)
@@ -1,12 +1,9 @@
 <?php
 // +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery                           |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id$
-// | last update   : $Date$
-// | last modifier : $Author$
-// | revision      : $Revision$
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: tensions/gvideo/language/de_DE/plugin.lang.php
===================================================================
--- /extensions/gvideo/language/de_DE/plugin.lang.php	(revision 17306)
+++ 	(revision )
@@ -1,48 +1,0 @@
-<?php
-
-$lang['py_title'] = 'PYWaie GVideo';
-$lang['py_conf'] = 'Konfiguration';
-$lang['py_addvideo'] = 'Eine Videodatei hinzufügen';
-$lang['py_filename'] = 'Dateiname';
-$lang['py_url'] = 'URL des Videos';
-$lang['py_parent'] = 'Hauptkategorie';
-$lang['py_thumb'] = 'Miniaturbild';
-$lang['py_no_thumb'] = 'Kein Miniaturbild';
-$lang['py_thumb_from_server'] = 'Füge das Miniaturbild zum Server hinzu';
-$lang['py_thumb_from_user'] = 'Eigenes Miniaturbild hinzufügen:';
-$lang['py_add_band'] = 'Fügt Linien an den Seiten des Miniaturbildes hinzu';
-$lang['py_thumb_resize'] = 'Skaliert das Miniaturbild';
-$lang['py_width'] = 'Breite';
-$lang['py_height'] = 'Höhe';
-$lang['py_start'] = 'Start des Videos';
-$lang['py_*'] = 'Obligatorische Felder';
-$lang['py_autostart'] = 'Autostart';
-$lang['py_quality'] = 'Qualität';
-$lang['py_playermode'] = 'Modus des Players';
-
-
-// Infobulles
-
-$lang['pybulle_reference'] = "Hier den Link der Seite einfügen, in der das Video sich befindet.<br>Sie können Videos von GoogleVideo, YouTube, DailyMotion, Wideo, Vimeo oder Wat benutzen. Beispiele:<br><br>- http://video.google.fr/videoplay?docid=4600755234172037942<br>- http://www.youtube.com/watch?v=eUvApC0bwUk<br>- http://www.dailymotion.com/video/x29fys_doorway<br>- http://www.wideo.fr/video/iLyROoaftYvl.html<br>- http://www.vimeo.com/1747316<br>- http://www.wat.tv/video/abcd.html";
-$lang['pybulle_start'] = "Bestimmt den Anfang (in Sekunden) des Videos.<br>Diese Option kann nur mit GoogleVideo benutzt werden.";
-$lang['pybulle_categorie'] = "Kategorie, in welche die Datei erstellt wird: Es werden nur reale Kategorien aufgelistet. Falls man diese Datei in einer Virtuellen Kategorie haben möchte, kann man dies erst in einem späteren Verlauf konfigurieren.";
-$lang['pybulle_miniature'] = "Sie können bei Bedarf das Miniaturbild wieder auf dem  Server setzen. Als Standardeinstellung gelten die Grössen der Miniaturbilder 320x240 für Google Video, 320x240 für Dailymotion, 130x97 für Youtube, 154x114 für Wideo und 200x150 für Vimeo.<br><br> Sie haben auch die Möglichkeit Ihre eigene Miniaturbilder hochzuladen.<br><br> In beiden Fällen, können Sie die Grössen der Miniaturbilder bearbeiten.";
-
-
-// Messages d'infos ou d'erreurs
-$lang['py_error1'] = 'Keine lokale Seite! Es ist unmöglich eine Videodatei herzustellen.';
-$lang['py_error2'] = 'Die Informationen konnten nicht gespeichert werden. Sie haben das Formular nicht richtig ausgefüllt.';
-$lang['py_error3'] = 'Sie müssen die Obligatorischen Felder ausfüllen *';
-$lang['py_error5'] = 'Falsche URL!';
-$lang['py_error6'] = 'Datei "%s" existiert bereits.';
-$lang['py_error7'] = 'Die Datei konnte nicht erstellt werden "%s"';
-$lang['py_error8'] = 'Bitte überprüfen sie ob der Ordner %s die benötigten Rechte besitzt(chmod).';
-$lang['py_error9'] = 'Das Miniaturbild konnte nicht hinzugefügt oder die Grösse verändert werden .';
-$lang['py_error11'] = 'Es existiert bereits ein Miniaturbild mit dem gleichen Namen (%s)';
-$lang['py_error12'] = 'Das Feld des Miniaturbildes wurde nicht ausgefüllt : Das Miniaturbild wurde nicht hochgeladen.';
-$lang['py_info2'] = 'Das Miniaturbild wurde erfolgreich hochgeladen';
-$lang['py_info3'] = 'Die Datei wurde erfolgreich gespeichert';
-$lang['py_info4'] = 'Einstellungen gespeichert.';
-$lang['py_show_file'] = '<a href="%s" class="externalLink">Videos anzeigen</a>.';
-
-?>
Index: /extensions/gvideo/language/el_GR/description.txt
===================================================================
--- /extensions/gvideo/language/el_GR/description.txt	(revision 17306)
+++ /extensions/gvideo/language/el_GR/description.txt	(revision 17307)
@@ -1,1 +1,1 @@
-&Pi;&rho;&omicron;&sigma;&theta;έ&tau;&epsilon;&iota; &mu;&epsilon;&rho;&iota;&kappa;ά &beta;ί&nu;&tau;&epsilon;&omicron; &alpha;&pi;ό &tau;&omicron; Google Video, Dailymotion, YouTube, Wideo, Vimeo ή Wat.
+&Pi;&rho;&omicron;&sigma;&theta;έ&tau;&epsilon;&iota; &mu;&epsilon;&rho;&iota;&kappa;ά &beta;ί&nu;&tau;&epsilon;&omicron; &alpha;&pi;ό &tau;&omicron; Dailymotion, YouTube, Wideo, Vimeo, videobb ή Wat.
Index: /extensions/gvideo/language/el_GR/index.php
===================================================================
--- /extensions/gvideo/language/el_GR/index.php	(revision 17307)
+++ /extensions/gvideo/language/el_GR/index.php	(revision 17307)
@@ -0,0 +1,30 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program 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                                          |
+// |                                                                       |
+// | This program 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 this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+// Recursive call
+$url = '../';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
Index: tensions/gvideo/language/el_GR/plugin.lang.php
===================================================================
--- /extensions/gvideo/language/el_GR/plugin.lang.php	(revision 17306)
+++ 	(revision )
@@ -1,60 +1,0 @@
-<?php
-// +-----------------------------------------------------------------------+
-// | Piwigo - a PHP based photo gallery                                    |
-// +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
-// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
-// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
-// +-----------------------------------------------------------------------+
-// | This program 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                                          |
-// |                                                                       |
-// | This program 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 this program; if not, write to the Free Software           |
-// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
-// | USA.                                                                  |
-// +-----------------------------------------------------------------------+
-$lang['py_*'] = 'Υποχρεωτικό πεδίο';
-$lang['py_add_band'] = 'Προσθήκη ζωνών στις πλευρές της μικρογραφίας';
-$lang['py_addvideo'] = 'Προσθέστε ένα βίντεο';
-$lang['py_autostart'] = 'Αυτόματη Έναρξη';
-$lang['py_conf'] = 'Διαμόρφωση';
-$lang['py_error11'] = 'Μια μικρογραφία με το ίδιο όνομα υπάρχει ήδη (%s)';
-$lang['py_error12'] = 'το πεδίο μικρογραφίες δεν έχει συμπληρωθεί: Η μικρογραφία δεν μεταφορτώθηκε.';
-$lang['py_error1'] = 'Δεν υπάρχει τοπική ιστοσελίδα! Αδύνατο να δημιουργήσετε ένα αρχείο βίντεο.';
-$lang['py_error2'] = 'Αδύνατο να αποθηκεύσετε. Δεν συμπληρώσετε σωστά τη φόρμα';
-$lang['py_error3'] = 'Θα πρέπει να συμπληρώσετε το υποχρεωτικό πεδίο *';
-$lang['py_error5'] = 'λάθος διεύθυνση URL!';
-$lang['py_error6'] = 'το αρχείο "%s" υπάρχει ήδη.';
-$lang['py_error7'] = 'Αδύνατο να εγγράψετε το αρχείο "%s"';
-$lang['py_error8'] = 'παρακαλούμε να ελέγξετε αν ο φάκελλος %s έχει δικαιώματα(chmod).';
-$lang['py_error9'] = 'Σφάλμα, όταν η μικρογραφία μεταφορτώθηκε ή η άλλαξε μεγέθος.';
-$lang['py_filename'] = 'Όνομα Αρχείου';
-$lang['py_height'] = 'Ύψος';
-$lang['py_info2'] = 'Η μικρογραφία φορτώθηκε με επιτυχία';
-$lang['py_info3'] = 'Το Βίντεο προστέθηκε με επιτυχία';
-$lang['py_info4'] = 'Η Διαμόρφωση αποθηκεύτηκε.';
-$lang['py_no_thumb'] = 'Όχι Μικρογραφία';
-$lang['py_parent'] = 'Κύρια Κατηγορία';
-$lang['py_playermode'] = 'Τρόπος αναπαραγωγής';
-$lang['py_quality'] = 'Ποιότητα';
-$lang['py_show_file'] = '<a href="%s" class="externalLink">Εμφάνιση βίντεο</a>.';
-$lang['py_start'] = 'Έναρξη του βίντεο';
-$lang['py_thumb_from_server'] = 'Ανεβάστε μικρογραφία από διακομιστή';
-$lang['py_thumb_from_user'] = 'Ανεβάστε τη δική σας μικρογραφία:';
-$lang['py_thumb_resize'] = 'Αλλάξτε το μέγεθος της μικρογραφίας';
-$lang['py_thumb'] = 'Μικρογραφία';
-$lang['py_title'] = 'PYWaie GVideo';
-$lang['py_url'] = 'URL του βίντεο';
-$lang['py_width'] = 'Πλάτος';
-$lang['pybulle_categorie'] = 'Κατηγορία όπου το αρχείο θα δημιουργηθεί: αναγράφονται μόνο πραγματικές κατηγορίες. Αν θέλετε να συνδέσετε αυτό το αρχείο σε μια εικονική κατηγορία, θα πρέπει να το συνδεθούν μετά.';
-$lang['pybulle_miniature'] = 'Μπορείτε να ξανα-ανεβάσετε τη μικρογραφία στο διακομιστή. Από προεπιλογή, το μέγεθος της μικρογραφίας είναι 320x240 για Google Video, 320x240 για Dailymotion, 130x97 για Youtube, 154x114 για Wideo και 200x150 για Vimeo.<br><br> Ή μπορείτε να ανεβάσετε τις δικές σας μικρογραφίες.<br><br> Και στις δύο περιπτώσεις, μπορείτε να αλλάξετε διάστασεις της μικρογραφίας.';
-$lang['pybulle_reference'] = 'Επικολλήστε εδώ ένα σύνδεσμο του βίντεο.<br>μπορείται να χρησιμοποιήσετε GoogleVideo, YouTube, DailyMotion, Wideo, Vimeo ή Wat. Παραδείγματα:<br><br>- http://video.google.fr/videoplay?docid=4600755234172037942<br>- http://www.youtube.com/watch?v=eUvApC0bwUk<br>- http://www.dailymotion.com/video/x29fys_doorway<br>- http://www.wideo.fr/video/iLyROoaftYvl.html<br>- http://www.vimeo.com/1747316<br>- http://www.wat.tv/video/abcd.html';
-$lang['pybulle_start'] = 'Επιλέξτε την αφετηρία (σε δευτερόλεπτα) του βίντεο.<br>Αυτή η επιλογή μπορεί να χρησιμοποιηθεί μόνο με GoogleVideo.';
-?>
Index: /extensions/gvideo/language/en_UK/description.txt
===================================================================
--- /extensions/gvideo/language/en_UK/description.txt	(revision 17306)
+++ /extensions/gvideo/language/en_UK/description.txt	(revision 17307)
@@ -1,1 +1,1 @@
-Adds some videos from Google Video, Dailymotion, Youtube, Wideo, Vimeo or Wat.
+Add videos from Dailymotion, Youtube, Vimeo, Wideo, videobb and Wat.
Index: /extensions/gvideo/language/en_UK/index.php
===================================================================
--- /extensions/gvideo/language/en_UK/index.php	(revision 17306)
+++ /extensions/gvideo/language/en_UK/index.php	(revision 17307)
@@ -1,12 +1,9 @@
 <?php
 // +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery                           |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id: index.php 1912 2007-03-16 06:30:07Z rub $
-// | last update   : $Date: 2007-03-16 07:30:07 +0100 (ven, 16 mar 2007) $
-// | last modifier : $Author: rub $
-// | revision      : $Revision: 1912 $
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: /extensions/gvideo/language/en_UK/plugin.lang.php
===================================================================
--- /extensions/gvideo/language/en_UK/plugin.lang.php	(revision 17306)
+++ /extensions/gvideo/language/en_UK/plugin.lang.php	(revision 17307)
@@ -1,46 +1,23 @@
 <?php
 
-$lang['py_title'] = 'PYWaie GVideo';
-$lang['py_conf'] = 'Configuration';
-$lang['py_addvideo'] = 'Add a video';
-$lang['py_filename'] = 'Filename';
-$lang['py_url'] = 'URL of the video';
-$lang['py_parent'] = 'Main Category';
-$lang['py_thumb'] = 'Thumbnail';
-$lang['py_no_thumb'] = 'No thumbnail';
-$lang['py_thumb_from_server'] = 'Upload thumbnail from server';
-$lang['py_thumb_from_user'] = 'Upload your own thumbnail:';
-$lang['py_add_band'] = 'Add bands on the sides of the thumbnail';
-$lang['py_thumb_resize'] = 'Resize the thumbnail';
-$lang['py_width'] = 'Width';
-$lang['py_height'] = 'Height';
-$lang['py_start'] = 'Start of the video';
-$lang['py_*'] = 'Obligatory field';
-$lang['py_autostart'] = 'Autostart';
-$lang['py_quality'] = 'Quality';
-$lang['py_playermode'] = 'Player Mode';
-
-
-// Infobulles
-$lang['pybulle_reference'] = "Paste here a linkpage of the video.<br>You can use GoogleVideo, YouTube, DailyMotion, Wideo, Vimeo or Wat. Examples:<br><br>- http://video.google.fr/videoplay?docid=4600755234172037942<br>- http://www.youtube.com/watch?v=eUvApC0bwUk<br>- http://www.dailymotion.com/video/x29fys_doorway<br>- http://www.wideo.fr/video/iLyROoaftYvl.html<br>- http://www.vimeo.com/1747316<br>- http://www.wat.tv/video/abcd.html";
-$lang['pybulle_start'] = "Choose the starting point (in seconds) of the video.<br>This option can be use only with GoogleVideo.";
-$lang['pybulle_categorie'] = "Category where the file will be created: only real categories are listed. If you wanft to link this file to a virtual category, you have to link after.";
-$lang['pybulle_miniature'] = "You can get thumbnail back on the server. By default, thumbnails size are 320x240 on Google Video, 320x240 on Dailymotion, 130x97 on Youtube, 154x114 on Wideo and 200x150 on Vimeo.<br><br> Or you can upload your own thumbnail.<br><br> In both case, you can change dimension of thumbnail.";
-
-//Info messages or error
-$lang['py_error1'] = 'No local site! Impossible to create a video file.';
-$lang['py_error2'] = 'Impossible to save. You do not fill correctly formulary.';
-$lang['py_error3'] = 'You must fill obligatory field *';
-$lang['py_error5'] = 'wrong URL!';
-$lang['py_error6'] = 'file "%s" is already exist.';
-$lang['py_error7'] = 'Impossible to write file "%s"';
-$lang['py_error8'] = 'please check if the directory %s have rights(chmod).';
-$lang['py_error9'] = 'Error when the thumbnail is uploaded or resized.';
-$lang['py_error11'] = 'A thumbnail with the same name already exists (%s)';
-$lang['py_error12'] = 'field thumbnail no filled : thumbnail not uploaded.';
-$lang['py_info2'] = 'thumbnail successfully uploaded';
-$lang['py_info3'] = 'Video successfully added';
-$lang['py_info4'] = 'Configuration saved.';
-$lang['py_show_file'] = '<a href="%s" class="externalLink">Show video</a>.';
+$lang['Add a video'] = 'Add a video';
+$lang['Video URL'] = 'Video URL';
+$lang['From the video'] = 'From the video';
+$lang['Change'] = 'Change';
+$lang['Video size'] = 'Video size';
+$lang['Use common setting'] = 'Use common setting';
+$lang['Autoplay'] = 'Autoplay';
+$lang['Supported services'] = 'Supported services';
+$lang['Common configuration'] = 'Common configuration';
+$lang['Color'] = 'Color';
+$lang['Author portrait'] = 'Author portrait';
+$lang['Author name'] = 'Author name';
+$lang['Logo'] = 'Logo';
+$lang['Please fill the video URL'] = 'Please fill the video URL';
+$lang['Please fill the video name'] = 'Please fill the video name';
+$lang['Please add a thumbnail'] = 'Please add a thumbnail';
+$lang['Unable to contact host server'] = 'Unable to contact host server';
+$lang['Video successfully added. <a href="%s">View</a>'] = 'Video successfully added. <a href="%s">View</a>';
+$lang['This element is a video added with "Embedded Video"'] = 'This element is a video added with "Embedded Video"';
 
 ?>
Index: /extensions/gvideo/language/es_ES/description.txt
===================================================================
--- /extensions/gvideo/language/es_ES/description.txt	(revision 17306)
+++ /extensions/gvideo/language/es_ES/description.txt	(revision 17307)
@@ -1,1 +1,1 @@
-Añadir videos de Google Video, Dailymotion, Youtube, Wideo, Vimeo o Wat.
+Añadir videos de Dailymotion, Youtube, Wideo, Vimeo, videobb o Wat.
Index: /extensions/gvideo/language/es_ES/index.php
===================================================================
--- /extensions/gvideo/language/es_ES/index.php	(revision 17306)
+++ /extensions/gvideo/language/es_ES/index.php	(revision 17307)
@@ -1,12 +1,9 @@
 <?php
 // +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery                           |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id$
-// | last update   : $Date$
-// | last modifier : $Author$
-// | revision      : $Revision$
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: tensions/gvideo/language/es_ES/plugin.lang.php
===================================================================
--- /extensions/gvideo/language/es_ES/plugin.lang.php	(revision 17306)
+++ 	(revision )
@@ -1,47 +1,0 @@
-<?php
-
-$lang['py_title'] = 'PYWaie GVideo';
-$lang['py_conf'] = 'Configuración';
-$lang['py_addvideo'] = 'Añadir video';
-$lang['py_filename'] = 'Nombre del fichero';
-$lang['py_url'] = 'URL de la video';
-$lang['py_parent'] = 'Categoria pariente ';
-$lang['py_thumb'] = 'Miniatura';
-$lang['py_no_thumb'] = 'Sin miniatura';
-$lang['py_thumb_from_server'] = 'Cargar la miniatura corespondiente en el servidor';
-$lang['py_thumb_from_user'] = 'Cargar su propria miniatura';
-$lang['py_add_band'] = 'Añadir trias en los lados de la miniatura';
-$lang['py_thumb_resize'] = 'Cambiar el tamaño de la miniatura';
-$lang['py_width'] = 'Ancho';
-$lang['py_height'] = 'Altura';
-$lang['py_start'] = 'Arranque de la video';
-$lang['py_*'] = 'Campos obligatorios';
-$lang['py_autostart'] = 'Auto arranquet';
-$lang['py_quality'] = 'Calidad';
-$lang['py_playermode'] = 'Modo Player';
-
-
-// Infobulles
-$lang['pybulle_reference'] = 'Pegar aquí el enlace a la página donde se encuentra el vídeo.<br>Usted puede utilizar vídeos de Google, YouTube, DailyMotion, Wideo, Vimeo o Wat. Ejemplos:<br><br>- http://video.google.fr/videoplay?docid=4600755234172037942<br>- http://www.youtube.com/watch?v=eUvApC0bwUk<br>- http://www.dailymotion.com/video/x29fys_doorway<br>- http://www.wideo.fr/video/iLyROoaftYvl.html<br>- http://www.vimeo.com/1747316<br>- http://www.wat.tv/video/abcd.html';
-$lang['pybulle_start'] = "Define el punto de arranque (en segundos) de la vídeo.<br>Esta opción sólo está activa con Google Vidéo.";
-$lang['pybulle_categorie'] = "Categoria donde estara escrito el fichero: sólo las categorías reales figuran en esta lista. Si desea que el archivo figura en una categoría virtual, tendra que asociarlo despues.";
-$lang['pybulle_miniature'] = "Usted puede eligir de recuperar la miniatura corespondiente a la video sur le serveur.Por defecto el tamaño de las miniaturas es de 320x240 en Google Vidéo, 320x240 en Dailymotion, 130x97 en Youtube, 154x114 en Wideo y 200x150 en Vimeo.<br><br>También puede optar por subir su propia miniatura.<br><br>En todos los casos, usted puede cambiar el tamaño.";
-
-// Messages d'infos ou d'erreurs
-$lang['py_error1'] = 'Ningún sitio web local! No se puede crear un archivo de vídeo.';
-$lang['py_error2'] = 'No se puede proceder al registro. No no ha llenado correctamente el formulario.';
-$lang['py_error3'] = 'Debe completar los campos obligatorios marcados *';
-$lang['py_error5'] = 'URL invalida!';
-$lang['py_error6'] = 'El fichero "%s" ya existe.';
-$lang['py_error7'] = 'Imposible de escribir el fichero "%s"';
-$lang['py_error8'] = 'Por favor, compruebe que el archivo% s tiene los permisos necesarios (chmod).';
-$lang['py_error9'] = 'No se puede  cargar o cambiar el tamaño de la miniatura.';
-$lang['py_error11'] = 'Una miniatura ya existe con ese nombre (%s)';
-$lang['py_error12'] = 'No se ha especificado un nombre para la miniatura : miniatura no cargada.';
-$lang['py_info2'] = 'Miniatura subida con éxito.';
-$lang['py_info3'] = 'Vídeo añadido';
-$lang['py_info4'] = 'Configuración guardada.';
-$lang['py_show_file'] = '<a href="%s" class="externalLink">Ver la video</a>.';
-
-
-?>
Index: /extensions/gvideo/language/fr_FR/description.txt
===================================================================
--- /extensions/gvideo/language/fr_FR/description.txt	(revision 17306)
+++ /extensions/gvideo/language/fr_FR/description.txt	(revision 17307)
@@ -1,1 +1,1 @@
-Ajoutez des vidéos de Google Video, Dailymotion, Youtube, Wideo, Vimeo ou Wat.
+Ajoute des vidéos depuis Dailymotion, Youtube, Vimeo, Wideo, videobb et Wat
Index: /extensions/gvideo/language/fr_FR/index.php
===================================================================
--- /extensions/gvideo/language/fr_FR/index.php	(revision 17306)
+++ /extensions/gvideo/language/fr_FR/index.php	(revision 17307)
@@ -1,12 +1,9 @@
 <?php
 // +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery                           |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id: index.php 1912 2007-03-16 06:30:07Z rub $
-// | last update   : $Date: 2007-03-16 07:30:07 +0100 (ven, 16 mar 2007) $
-// | last modifier : $Author: rub $
-// | revision      : $Revision: 1912 $
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: /extensions/gvideo/language/fr_FR/plugin.lang.php
===================================================================
--- /extensions/gvideo/language/fr_FR/plugin.lang.php	(revision 17306)
+++ /extensions/gvideo/language/fr_FR/plugin.lang.php	(revision 17307)
@@ -1,47 +1,23 @@
 <?php
 
-$lang['py_title'] = 'PYWaie GVideo';
-$lang['py_conf'] = 'Configuration';
-$lang['py_addvideo'] = 'Ajouter une vidéo';
-$lang['py_filename'] = 'Nom du fichier';
-$lang['py_url'] = 'URL de la vidéo';
-$lang['py_parent'] = 'Catégorie parente ';
-$lang['py_thumb'] = 'Miniature';
-$lang['py_no_thumb'] = 'Pas de miniature';
-$lang['py_thumb_from_server'] = 'Uploader la miniature correspondante sur le serveur';
-$lang['py_thumb_from_user'] = 'Uploader votre propre miniature';
-$lang['py_add_band'] = 'Ajouter des bandes sur les cotés de la miniature';
-$lang['py_thumb_resize'] = 'Redimensionner la miniature';
-$lang['py_width'] = 'Largeur';
-$lang['py_height'] = 'Hauteur';
-$lang['py_start'] = 'Départ de la vidéo';
-$lang['py_*'] = 'Champs obligatoires';
-$lang['py_autostart'] = 'Autostart';
-$lang['py_quality'] = 'Qualité';
-$lang['py_playermode'] = 'Player Mode';
-
-
-// Infobulles
-$lang['pybulle_reference'] = "Collez ici le lien de la page où se trouve la vidéo.<br>Vous pouvez utiliser des vidéos de Google, YouTube, DailyMotion, Wideo, Vimeo et Wat. Exemples:<br><br>- http://video.google.fr/videoplay?docid=4600755234172037942<br>- http://www.youtube.com/watch?v=eUvApC0bwUk<br>- http://www.dailymotion.com/video/x29fys_doorway<br>- http://www.wideo.fr/video/iLyROoaftYvl.html<br>- http://www.vimeo.com/1747316<br>- http://www.wat.tv/video/abcd.html";
-$lang['pybulle_start'] = "Définie le point de départ (en secondes) de la vidéo.<br>Cette option n'est active qu'avec Google Vidéo.";
-$lang['pybulle_categorie'] = "Catégorie où sera écrit le fichier: seules les catégories réelles sont listées ici. Si vous souhaitez avoir le fichier dans une catégorie virtuelle, il faudra l'associer après.";
-$lang['pybulle_miniature'] = "Vous pouvez choisir de récupérer la miniature correspondante a la vidéo sur le serveur. Par défaut, la taille des miniatures est de 320x240 sur Google Vidéo, 320x240 sur Dailymotion, 130x97 sur Youtube, 154x114 sur Wideo et 200x150 pour Vimeo.<br><br>Vous pouvez également choisir d'uploader votre propre miniature.<br><br>Dans tous les cas, vous pouvez éventuellement la redimensionner.";
-
-// Messages d'infos ou d'erreurs
-$lang['py_error1'] = 'Pas de site locaux! Impossible de créer un fichier vidéo.';
-$lang['py_error2'] = 'Impossible de procéder à l\'enregistrement. Vous n\'avez pas correctement rempli le formulaire.';
-$lang['py_error3'] = 'Vous devez renseigner les champ obligatoires marqués *';
-$lang['py_error5'] = 'URL invalide!';
-$lang['py_error6'] = 'Le fichier "%s" existe déjà.';
-$lang['py_error7'] = 'Impossible d\'écrire le fichier "%s"';
-$lang['py_error8'] = 'Veuillez vérifier que le dossier %s possède les permissions nécessaires (chmod).';
-$lang['py_error9'] = 'Impossible d\'uploader ou de redimmensionner la miniature.';
-$lang['py_error11'] = 'Une miniature existe déjà sous ce nom (%s)';
-$lang['py_error12'] = 'Champ miniature non renseigné : miniature non uploadée.';
-$lang['py_info2'] = 'Miniature uploadée avec succès.';
-$lang['py_info3'] = 'Vidéo ajoutée';
-$lang['py_info4'] = 'Configuration sauvegardée.';
-$lang['py_show_file'] = '<a href="%s" class="externalLink">Voir la vidéo</a>.';
-
+$lang['Add a video'] = 'Ajouter une vidéo';
+$lang['Video URL'] = 'URL de la vidéo';
+$lang['From the video'] = 'Conserver';
+$lang['Change'] = 'Changer';
+$lang['Video size'] = 'Taille de la vidéo';
+$lang['Use common setting'] = 'Utiliser les paramètres généraux';
+$lang['Autoplay'] = 'Démarrage auto.';
+$lang['Supported services'] = 'Services supportés';
+$lang['Common configuration'] = 'Configuration générale';
+$lang['Color'] = 'Couleur';
+$lang['Author portrait'] = 'Avatar de l\'auteur';
+$lang['Author name'] = 'Nom de l\'auteur';
+$lang['Logo'] = 'Logo';
+$lang['Please fill the video URL'] = 'Veuillez renseigner l\'URL de la vidéo';
+$lang['Please fill the video name'] = 'Veuillez renseigner le nom de la vidéo';
+$lang['Please add a thumbnail'] = 'Veuillez choisir une miniature';
+$lang['Unable to contact host server'] = 'Impossible de contacter le serveur';
+$lang['Video successfully added. <a href="%s">View</a>'] = 'Vidéo ajoutée. <a href="%s">Voir</a>';
+$lang['This element is a video added with "Embedded Video"'] = 'Cet élément est une vidéo ajoutée avec "Embedded Video"';
 
 ?>
Index: /extensions/gvideo/language/hu_HU/description.txt
===================================================================
--- /extensions/gvideo/language/hu_HU/description.txt	(revision 17306)
+++ /extensions/gvideo/language/hu_HU/description.txt	(revision 17307)
@@ -1,1 +1,1 @@
-Videok hozzáadása: Google Video, Dailymotion, Youtube, Wideo, Vimeo vagy Wat.
+Videok hozzáadása: Dailymotion, Youtube, Wideo, Vimeo, videobb vagy Wat.
Index: /extensions/gvideo/language/hu_HU/index.php
===================================================================
--- /extensions/gvideo/language/hu_HU/index.php	(revision 17306)
+++ /extensions/gvideo/language/hu_HU/index.php	(revision 17307)
@@ -1,12 +1,9 @@
 <?php
 // +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery                           |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id: index.php 1912 2007-03-16 06:30:07Z rub $
-// | last update   : $Date: 2007-03-16 07:30:07 +0100 (ven, 16 mar 2007) $
-// | last modifier : $Author: rub $
-// | revision      : $Revision: 1912 $
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: tensions/gvideo/language/hu_HU/plugin.lang.php
===================================================================
--- /extensions/gvideo/language/hu_HU/plugin.lang.php	(revision 17306)
+++ 	(revision )
@@ -1,46 +1,0 @@
-<?php
-
-$lang['py_title'] = 'PYWaie GVideo';
-$lang['py_conf'] = 'Beállítások';
-$lang['py_addvideo'] = 'Video hozzáadása';
-$lang['py_filename'] = 'Fájl neve';
-$lang['py_url'] = 'Video elérési út';
-$lang['py_parent'] = 'Fő kategória';
-$lang['py_thumb'] = 'Bélyegkép';
-$lang['py_no_thumb'] = 'Nincs bélyegkép';
-$lang['py_thumb_from_server'] = 'Bélyegkép feltöltése szerverről';
-$lang['py_thumb_from_user'] = 'Saját bélyegkép feltöltése:';
-$lang['py_add_band'] = 'Sávok hozzáadása a bélyegkép oldalhoz';
-$lang['py_thumb_resize'] = 'Bélyegkép átméretezése';
-$lang['py_width'] = 'Szélesség';
-$lang['py_height'] = 'Magasság';
-$lang['py_start'] = 'Lejátszás indítása';
-$lang['py_*'] = 'Kötelező kitölteni';
-$lang['py_autostart'] = 'Automatikus indítás';
-$lang['py_quality'] = 'Minőség';
-$lang['py_playermode'] = 'Lejátszó mód';
-
-
-// Infobulles
-$lang['pybulle_reference'] = "Video elérési útjának meghatározása.<br>Helyek: GoogleVideo, YouTube, DailyMotion, Wideo, Vimeo vagy Wat. Példák:<br><br>- http://video.google.fr/videoplay?docid=4600755234172037942<br>- http://www.youtube.com/watch?v=eUvApC0bwUk<br>- http://www.dailymotion.com/video/x29fys_doorway<br>- http://www.wideo.fr/video/iLyROoaftYvl.html<br>- http://www.vimeo.com/1747316<br>- http://www.wat.tv/video/abcd.html";
-$lang['pybulle_start'] = "Video indításának kezdőpontja (másodpercben).<br>Nem használható GoogleVideo esetén.";
-$lang['pybulle_categorie'] = "A kategória ahol a fájl létrejön: csak a fizikai kategóriák jelennek meg. Egy virtuális kategóriába történő megjelenítéshez, hozzá kell rendelni a kategóriához.";
-$lang['pybulle_miniature'] = "A bélyegképek megjeleníthetők a szerverről. Alapértelmezett bélyegkép méretek: 320x240 a Google Video-n, 320x240 a Dailymotion-on, 130x97 a Youtube-on, 154x114 a Wideo-n és 200x150 a Vimeo-n.<br><br> Vagy feltölthető saját bélyegkép.<br><br> Mindkét esetben változtatható a bélyegkép mérete.";
-
-// Messages d'infos ou d'erreurs
-$lang['py_error1'] = 'A hely nem található! A video fájl létrehozása nem lehetséges.';
-$lang['py_error2'] = 'A mentés sikertelen. Az űrlap kitöltése nem megfelelő.';
-$lang['py_error3'] = 'A "*"-al jelölt mezők kitöltése kötelező';
-$lang['py_error5'] = 'hibás URL!';
-$lang['py_error6'] = 'A(z) "%s" fájl már létezik.';
-$lang['py_error7'] = 'A(z) "%s fájl írása nem lehetséges"';
-$lang['py_error8'] = 'kérem ellenőrizze a(z) %s könyvtárnál a jogokat (chmod).';
-$lang['py_error9'] = 'Hiba a bélyegkép féltöltésénél vagy átméretezésénél.';
-$lang['py_error11'] = 'Ilyen nevű bélyegkép már létezik (%s)';
-$lang['py_error12'] = 'bélyegkép mező nincs kitöltve : bélyegkép nincs feltöltve.';
-$lang['py_info2'] = 'bélyegkép sikeresen feltöltve';
-$lang['py_info3'] = 'fájl feltöltése és szinkronizálása sikeres';
-$lang['py_info4'] = 'A beállítások mentése sikeres.';
-$lang['py_show_file'] = '<a href="%s" class="externalLink">Fájl megjelenítése</a>.';
-
-?>
Index: /extensions/gvideo/language/index.php
===================================================================
--- /extensions/gvideo/language/index.php	(revision 17306)
+++ /extensions/gvideo/language/index.php	(revision 17307)
@@ -1,12 +1,9 @@
 <?php
 // +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery                           |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id: index.php 1912 2007-03-16 06:30:07Z rub $
-// | last update   : $Date: 2007-03-16 07:30:07 +0100 (ven, 16 mar 2007) $
-// | last modifier : $Author: rub $
-// | revision      : $Revision: 1912 $
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: /extensions/gvideo/language/it_IT/description.txt
===================================================================
--- /extensions/gvideo/language/it_IT/description.txt	(revision 17306)
+++ /extensions/gvideo/language/it_IT/description.txt	(revision 17307)
@@ -1,1 +1,1 @@
-Aggingete delle video di Google Video, Dailymotion, Youtube, Wideo, Vimeo o Wat sulla vostra galleria
+Aggingete delle video di Dailymotion, Youtube, Wideo, Vimeo, videobb o Wat sulla vostra galleria
Index: /extensions/gvideo/language/it_IT/index.php
===================================================================
--- /extensions/gvideo/language/it_IT/index.php	(revision 17306)
+++ /extensions/gvideo/language/it_IT/index.php	(revision 17307)
@@ -3,5 +3,5 @@
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2011 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
Index: tensions/gvideo/language/it_IT/plugin.lang.php
===================================================================
--- /extensions/gvideo/language/it_IT/plugin.lang.php	(revision 17306)
+++ 	(revision )
@@ -1,47 +1,0 @@
-<?php
-
-$lang['py_title'] = 'PYWaie GVideo';
-$lang['py_conf'] = 'Configurazione';
-$lang['py_addvideo'] = 'Aggiungere una video';
-$lang['py_filename'] = 'Nome del file';
-$lang['py_url'] = 'URL della video';
-$lang['py_parent'] = 'Categoria parente';
-$lang['py_thumb'] = 'Miniatura';
-$lang['py_no_thumb'] = 'Nessuna Miniatura';
-$lang['py_thumb_from_server'] = 'Aggiungere la miniatura corrispondente sul server';
-$lang['py_thumb_from_user'] = 'Aggiungere la vostra miniatura ';
-$lang['py_add_band'] = 'Aggiungere  delle righe sui lati della miniatura';
-$lang['py_thumb_resize'] = 'Ridimensionare la miniatura';
-$lang['py_width'] = 'Larghezza';
-$lang['py_height'] = 'Altezza';
-$lang['py_start'] = 'Partenza della video';
-$lang['py_*'] = 'Campi obbligatori';
-$lang['py_autostart'] = 'Autostart';
-$lang['py_quality'] = 'Qualità';
-$lang['py_playermode'] = 'Player Mode';
-
-
-// Infobulles
-$lang['pybulle_reference'] = 'Inserire qui il link della pagina dove si trova la video.<br> Potete usare delle video di Google, YouTube, DailyMotion, Wideo, Vimeo e Wat. Esempi: <br><br>- http://video.google.fr/videoplay?docid=4600755234172037942<br>- http://www.youtube.com/watch?v=eUvApC0bwUk<br>- http://www.dailymotion.com/video/x29fys_doorway<br>- http://www.wideo.fr/video/iLyROoaftYvl.html<br>- http://www.vimeo.com/1747316<br>- http://www.wat.tv/video/abcd.html';
-$lang['pybulle_start'] = 'Definisce il punto di partenza (in secondi) della video. Questa opzione è attiva solo con Google Video.';
-$lang['pybulle_categorie'] = 'Categoria dove sarà scritto il file : solo le categorie reali vengono listate. Se si desidera avere il file in una categoria virtuale, occorrerà associarla in un secondo momento.';
-$lang['pybulle_miniature'] = 'Potete scegliere di recuperare la miniatura corrispondente alla video sul server. Di default, le dimensioni delle miniature sono 320x240 su Google Video, 320x240 su Dailymotion, 130x97 su Youtube, 154x114 su Wideo e 200x150 su Vimeo. <br><br>Potete anche scegliere di inviare la vostra miniatura. <br><br>In tutti i casi, potete eventualmente ridimensionarla';
-
-// Messages d'infos ou d'erreurs
-$lang['py_error1'] = 'Nessun\' sito locale! Impossibile creare un file video.';
-$lang['py_error2'] = 'Non è stato possibile procedere alla registrazione. Non avete riempito correttamente la scheda.';
-$lang['py_error3'] = 'Dovete completare tutti i campi obbligatori seniati con un\'asterisco';
-$lang['py_error5'] = 'Indirizzo non valido!';
-$lang['py_error6'] = 'Il file "%s" esiste già!';
-$lang['py_error7'] = 'Non è stato possibile registrare il file "%s"';
-$lang['py_error8'] = 'Verificare che la cartella %s possiede i permessi necessari (chmod).';
-$lang['py_error9'] = 'Non è stato possibile aggiungere o ridimensionare la miniatura.';
-$lang['py_error11'] = 'Una miniatura esiste già con questo nome (%s)';
-$lang['py_error12'] = 'Campo miniatura non completato: miniatura non aggiunta.';
-$lang['py_info2'] = 'Miniatura aggiunto con successo';
-$lang['py_info3'] = 'File registrato e sincronizzato con successo';
-$lang['py_info4'] = 'Configurazione salvata.';
-$lang['py_show_file'] = '<a href="%s" class="externalLink">Visualizzare il file</a>.';
-
-
-?>
Index: /extensions/gvideo/language/lv_LV/description.txt
===================================================================
--- /extensions/gvideo/language/lv_LV/description.txt	(revision 17306)
+++ /extensions/gvideo/language/lv_LV/description.txt	(revision 17307)
@@ -1,1 +1,1 @@
-Pievieno video no Google Video, Dailymotion, Youtube, Wideo, Vimeo or Wat.
+Pievieno video no Dailymotion, Youtube, Wideo, Vimeo, videobb or Wat.
Index: /extensions/gvideo/language/lv_LV/index.php
===================================================================
--- /extensions/gvideo/language/lv_LV/index.php	(revision 17306)
+++ /extensions/gvideo/language/lv_LV/index.php	(revision 17307)
@@ -1,12 +1,9 @@
 <?php
 // +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery                           |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id$
-// | last update   : $Date$
-// | last modifier : $Author$
-// | revision      : $Revision$
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: tensions/gvideo/language/lv_LV/plugin.lang.php
===================================================================
--- /extensions/gvideo/language/lv_LV/plugin.lang.php	(revision 17306)
+++ 	(revision )
@@ -1,46 +1,0 @@
-<?php
-
-$lang['py_title'] = 'PYWaie GVideo';
-$lang['py_conf'] = 'Konfiguracija';
-$lang['py_addvideo'] = 'Pievienot vide';
-$lang['py_filename'] = 'Faila nosaukums';
-$lang['py_url'] = 'video URL';
-$lang['py_parent'] = 'Galvena kategorija';
-$lang['py_thumb'] = 'Sikbilde';
-$lang['py_no_thumb'] = 'Neminiaturizet';
-$lang['py_thumb_from_server'] = 'Augupladet sikbildi no servera';
-$lang['py_thumb_from_user'] = 'Augupladet savu sikbildi:';
-$lang['py_add_band'] = 'Pievienot joslas sikbildes malas';
-$lang['py_thumb_resize'] = 'Mainit sikbildes izmerus';
-$lang['py_width'] = 'Platums';
-$lang['py_height'] = 'Augstums';
-$lang['py_start'] = 'Video sakums';
-$lang['py_*'] = 'Obligatie lauki';
-$lang['py_autostart'] = 'Autostarts';
-$lang['py_quality'] = 'Kvalitate';
-$lang['py_playermode'] = 'Atskanoanas reims';
-
-
-// Infobulles
-$lang['pybulle_reference'] = "Ielimet saiti uz video eit.<br>Varat izmantot GoogleVideo, YouTube, DailyMotion, Wideo, Vimeo or Wat. Piemeri:<br><br>- http://video.google.fr/videoplay?docid=4600755234172037942<br>- http://www.youtube.com/watch?v=eUvApC0bwUk<br>- http://www.dailymotion.com/video/x29fys_doorway<br>- http://www.wideo.fr/video/iLyROoaftYvl.html<br>- http://www.vimeo.com/1747316<br>- http://www.wat.tv/video/abcd.html";
-$lang['pybulle_start'] = "Izveleties video sakumpunktu (sekundes).<br> i iespeja izmantojama tikai ar GoogleVideo.";
-$lang['pybulle_categorie'] = "Kategorija, kura fails tiks izveidots: raditas tikais realas kategorijas. Ja velaties saistit o failu ar virtualu kategoriju, jums janorada saite pec tam.";
-$lang['pybulle_miniature'] = "Jus varat atgut sikbildi uz servera. Pec noklusejuma, sikbildes izmers ir 320x240 - Google Video, 320x240 - Dailymotion, 130x97 -Youtube, 154x114 - Wideo and 200x150 - Vimeo.<br><br> Vai varat augupladet savu sikbildi.<br><br> Abos gadijumos iespejams mainit sikbildes izmerus.";
-
-// Messages d'infos ou d'erreurs
-$lang['py_error1'] = 'Nav lokala lapa! Neiespejams izveidot video failu.';
-$lang['py_error2'] = 'Nav iespejams saglabat. Nekorekti aizpildits formulars.';
-$lang['py_error3'] = 'Jaaizpilda visi obligatie lauki *';
-$lang['py_error5'] = 'nekorekts URL!';
-$lang['py_error6'] = 'fails "%s" jau eksiste.';
-$lang['py_error7'] = 'Nav iespejam rakstit faila "%s"';
-$lang['py_error8'] = 'ludzu parbaudiet vai mapei %s ir tiesibas (chmod).';
-$lang['py_error9'] = 'Kluda augupladejot vai mainot sikbildes izmerus.';
-$lang['py_error11'] = 'Sikbilde ar tadu nosaukumu jau eksiste (%s)';
-$lang['py_error12'] = 'lauka sikbilde nav aizpildita : sikbilde nav augupieladeta.';
-$lang['py_info2'] = 'sikbilde sekmigi augupieladeta';
-$lang['py_info3'] = 'Video sekmigi pievienots';
-$lang['py_info4'] = 'Konfiguracija saglabata.';
-$lang['py_show_file'] = '<a href="%s" class="externalLink">Radit video</a>.';
-
-?>
Index: /extensions/gvideo/language/nb_NO/description.txt
===================================================================
--- /extensions/gvideo/language/nb_NO/description.txt	(revision 17306)
+++ /extensions/gvideo/language/nb_NO/description.txt	(revision 17307)
@@ -1,1 +1,1 @@
-Legger til videoer fra google Video, Dailymotion, Youtube, Wideo, Vimeo eller Wat.
+Legger til videoer fra Dailymotion, Youtube, Wideo, Vimeo, videobb eller Wat.
Index: /extensions/gvideo/language/nb_NO/index.php
===================================================================
--- /extensions/gvideo/language/nb_NO/index.php	(revision 17306)
+++ /extensions/gvideo/language/nb_NO/index.php	(revision 17307)
@@ -1,12 +1,9 @@
 <?php
 // +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery                           |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id: index.php 1912 2007-03-16 06:30:07Z rub $
-// | last update   : $Date: 2007-03-16 07:30:07 +0100 (ven, 16 mar 2007) $
-// | last modifier : $Author: rub $
-// | revision      : $Revision: 1912 $
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: tensions/gvideo/language/nb_NO/plugin.lang.php
===================================================================
--- /extensions/gvideo/language/nb_NO/plugin.lang.php	(revision 17306)
+++ 	(revision )
@@ -1,46 +1,0 @@
-<?php
-
-$lang['py_title'] = 'PYWaie GVideo';
-$lang['py_conf'] = 'Konfigurasjon';
-$lang['py_addvideo'] = 'Legg til en video';
-$lang['py_filename'] = 'Fil navn';
-$lang['py_url'] = 'URL til videoen';
-$lang['py_parent'] = 'Hoved kategori';
-$lang['py_thumb'] = 'Miniatyr bilde';
-$lang['py_no_thumb'] = 'Ingen miniatyrbilder ';
-$lang['py_thumb_from_server'] = 'Last opp miniatyrbilder fra server';
-$lang['py_thumb_from_user'] = 'Last opp dine egne miniatyr bilder:';
-$lang['py_add_band'] = 'Legg til band på siden av miniatyrbildene';
-$lang['py_thumb_resize'] = 'Endre størrelse på miniatyr bildene';
-$lang['py_width'] = 'Bredde';
-$lang['py_height'] = 'Høyde';
-$lang['py_start'] = 'Starten av videoen';
-$lang['py_*'] = 'Obligatorisk felt';
-$lang['py_autostart'] = 'Start automatisk';
-$lang['py_quality'] = 'Kvalitet';
-$lang['py_playermode'] = 'Spiller modus';
-
-
-// Info veileder
-$lang['pybulle_reference'] = "Lim inn en link til videoen her.<br>Du kan bruke GoogleVideo, YouTube, DailyMotion, Wideo, Vimeo eller Wat. Eksempler:<br><br>- http://video.google.fr/videoplay?docid= … lt;br>- http://www.youtube.com/watch? v=eUvApC0bwUk<br>- http://www.dailymotion.com/video/x29fys … lt;br>- http://www.wideo.fr/video/iLyROoaftYvl.html<br>- http://www.vimeo.com/1747316<br>- http://www.wat.tv/video/abcd.html";
-$lang['pybulle_start'] = "Velg start punktet (i sekunder) på videoen.<br>Dette alternativet kan bare brukes med GoogleVideo.";
-$lang['pybulle_categorie'] = "Album du vil filen skal lages i: kun ekte album er listet. Om du ønsker å linke denne filen til et virtuelt album, må du linke det i ettertid.";
-$lang['pybulle_miniature'] = "Du kan få miniatyr bilder tilbake på serveren. SOm standard, miniatyr bildenes størrelse er 320x240 på Google Video, 320x240 på Dailymotion, 130x97 på Youtube, 154x114 på Wideo og 200x150 på Vimeo.<br><br> Eller du kan laste opp dine egne miniatyr bilder.<br><br> I alle tilfeller, du kan endre dimensjonene på dine miniatyr bilder.";
-
-// Messages d'infos ou d'erreurs
-$lang['py_error1'] = 'Ingen lokal side! Umulig å lage video filer.';
-$lang['py_error2'] = 'Umulig å lagre. Du har ikke fylt ut skjema korrekt.';
-$lang['py_error3'] = 'Du må fylle inn obligatoriske felt *';
-$lang['py_error5'] = 'Feil URL!';
-$lang['py_error6'] = 'filen "%e" eksisterer allerede.';
-$lang['py_error7'] = 'Umulig å skrive filer';
-$lang['py_error8'] = 'vennligst sjekk om mappen %e har rettigheter(chmod).';
-$lang['py_error9'] = 'En feil oppstod når miniatyr bildet ble lastet opp eller endret størrelse.';
-$lang['py_error11'] = 'Et miniatyr bilde med samme navn eksisterer allerede';
-$lang['py_error12'] = 'Miniatyr bilde felt er tomt : miniatyr ble ikke lastet opp.';
-$lang['py_info2'] = 'Miniatur bilde lastet opp';
-$lang['py_info3'] = 'Video ble lagt til';
-$lang['py_info4'] = 'Konfigurasjon lagret.';
-$lang['py_show_file'] = '<a href="%s" class="externalLink">Vis video</a>.';
-
-?>
Index: /extensions/gvideo/language/nl_NL/description.txt
===================================================================
--- /extensions/gvideo/language/nl_NL/description.txt	(revision 17306)
+++ /extensions/gvideo/language/nl_NL/description.txt	(revision 17307)
@@ -1,1 +1,1 @@
-Voegt enkele videos van Google Video, Dailymotion, Youtube, Wideo, Vimeo of Wat toe.
+Voegt enkele videos van Dailymotion, Youtube, Wideo, Vimeo, videobb of Wat toe.
Index: /extensions/gvideo/language/nl_NL/index.php
===================================================================
--- /extensions/gvideo/language/nl_NL/index.php	(revision 17306)
+++ /extensions/gvideo/language/nl_NL/index.php	(revision 17307)
@@ -1,12 +1,9 @@
 <?php
 // +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery                           |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id$
-// | last update   : $Date$
-// | last modifier : $Author$
-// | revision      : $Revision$
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: tensions/gvideo/language/nl_NL/plugin.lang.php
===================================================================
--- /extensions/gvideo/language/nl_NL/plugin.lang.php	(revision 17306)
+++ 	(revision )
@@ -1,45 +1,0 @@
-<?php
-
-$lang['py_title'] = 'PYWaie GVideo';
-$lang['py_conf'] = 'Configuratie';
-$lang['py_addvideo'] = 'Voeg video toe';
-$lang['py_filename'] = 'Bestandsnaam';
-$lang['py_url'] = 'URL van de video';
-$lang['py_parent'] = 'Hoofd Categorie';
-$lang['py_thumb'] = 'Thumbnail';
-$lang['py_no_thumb'] = 'Geen thumbnail';
-$lang['py_thumb_from_server'] = 'Upload thumbnail van server';
-$lang['py_thumb_from_user'] = 'Upload uw eigen thumbnail:';
-$lang['py_add_band'] = 'Voeg randen toe op de zijden van de thumbnail';
-$lang['py_thumb_resize'] = 'Schaal de thumbnail';
-$lang['py_width'] = 'Breedte';
-$lang['py_height'] = 'Hoogte';
-$lang['py_start'] = 'Begin van de video';
-$lang['py_*'] = 'Verplicht invoerveld';
-$lang['py_autostart'] = 'Autostart';
-$lang['py_quality'] = 'Kwaliteit';
-$lang['py_playermode'] = 'Afspeelmodus';
-
-// Infobulles
-$lang['pybulle_reference'] = "Plaats hier een link naar de video.<br>Je kunt gebruik maken van GoogleVideo, YouTube, DailyMotion, Wideo, Vimeo of Wat. Voorbeelden:<br><br>- http://video.google.fr/videoplay?docid=4600755234172037942<br>- http://www.youtube.com/watch?v=eUvApC0bwUk<br>- http://www.dailymotion.com/video/x29fys_doorway<br>- http://www.wideo.fr/video/iLyROoaftYvl.html<br>- http://www.vimeo.com/1747316<br>- http://www.wat.tv/video/abcd.html";
-$lang['pybulle_start'] = "Kies het startpunt (in seconden) van de video.<br>Deze optie werkt alleen met GoogleVideo.";
-$lang['pybulle_categorie'] = 'Categorie waar het bestand wordt aangemaakt: alleen echte categorie"en worden getoond. Als u dit bestand wilt linken aan een virtuele categorie zult u dat later moeten doen.';
-$lang['pybulle_miniature'] = "U kunt de thumbnail van de server krijgen. Per standaard zijn de thumbnails 320x240 op Google Video, 320x240 op Dailymotion, 130x97 op Youtube, 154x114 op Wideo en 200x150 op Vimeo.<br><br> U kunt ook uw eigen thumbnail uploaden.<br><br> In beide gevallen kunt u de grootte van de thumbnail aanpassen.";
-
-// Messages d'infos ou d'erreurs
-$lang['py_error1'] = 'Geen lokale site! Niet mogelijk om een video bestand aan te maken.';
-$lang['py_error2'] = 'Opslaan niet mogelijk. Het formulier is niet juist ingevuld.';
-$lang['py_error3'] = 'U moet verplichte verlden invullen *';
-$lang['py_error5'] = 'verkeerde URL!';
-$lang['py_error6'] = 'bestand "%s" bestaat al.';
-$lang['py_error7'] = 'Niet mogelijk om betand "%s" te schrijven';
-$lang['py_error8'] = 'controleer of de map %s rechten heeft(chmod).';
-$lang['py_error9'] = 'Fout tijdens het uploaden of schalen van de thumbnail.';
-$lang['py_error11'] = 'Er bestaat al een thumbnail met dezelfde naam (%s)';
-$lang['py_error12'] = 'Thumbnail niet ingevuld : thumbnail niet geupload.';
-$lang['py_info2'] = 'Thumbnail succesvol geupload';
-$lang['py_info3'] = 'Video succesvol toegevoegd';
-$lang['py_info4'] = 'Configuratie opgeslagen.';
-$lang['py_show_file'] = '<a href="%s" class="externalLink">Toon video</a>.';
-
-?>
Index: /extensions/gvideo/language/pl_PL/description.txt
===================================================================
--- /extensions/gvideo/language/pl_PL/description.txt	(revision 17306)
+++ /extensions/gvideo/language/pl_PL/description.txt	(revision 17307)
@@ -1,1 +1,1 @@
-Dodaje wsparcie dla Google Video, Dailymotion, Youtube, Wideo, Vimeo lub Wat.
+Dodaje wsparcie dla Dailymotion, Youtube, Wideo, Vimeo, videobb lub Wat.
Index: /extensions/gvideo/language/pl_PL/index.php
===================================================================
--- /extensions/gvideo/language/pl_PL/index.php	(revision 17306)
+++ /extensions/gvideo/language/pl_PL/index.php	(revision 17307)
@@ -1,12 +1,9 @@
 <?php
 // +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery                           |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id: index.php 1912 2007-03-16 06:30:07Z rub $
-// | last update   : $Date: 2007-03-16 07:30:07 +0100 (ven, 16 mar 2007) $
-// | last modifier : $Author: rub $
-// | revision      : $Revision: 1912 $
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: tensions/gvideo/language/pl_PL/plugin.lang.php
===================================================================
--- /extensions/gvideo/language/pl_PL/plugin.lang.php	(revision 17306)
+++ 	(revision )
@@ -1,46 +1,0 @@
-<?php
-
-$lang['py_title'] = 'PYWaie GVideo';
-$lang['py_conf'] = 'Konfiguracja';
-$lang['py_addvideo'] = 'Dodaj film';
-$lang['py_filename'] = 'Nazwa pliku';
-$lang['py_url'] = 'Adres URL filmu';
-$lang['py_parent'] = 'G³ówna kategoria';
-$lang['py_thumb'] = 'Miniatura';
-$lang['py_no_thumb'] = 'Brak miniatury';
-$lang['py_thumb_from_server'] = 'Wgraj miniaturê z serwera';
-$lang['py_thumb_from_user'] = 'Wgraj w³asn¹ miniaturê:';
-$lang['py_add_band'] = 'Dodaj paski po obu stronach miniatury';
-$lang['py_thumb_resize'] = 'Zmieñ rozmiar miniatury';
-$lang['py_width'] = 'Szerokoœæ';
-$lang['py_height'] = 'Wysokoœæ';
-$lang['py_start'] = 'Pocz¹tek filmu';
-$lang['py_*'] = 'Pole obowi¹zkowe';
-$lang['py_autostart'] = 'Autostart';
-$lang['py_quality'] = 'Jakoœæ';
-$lang['py_playermode'] = 'Tryb odtwarzacza';
-
-
-// Infobulles
-$lang['pybulle_reference'] = "Wklej tutaj adres strony z filmem.<br>Mo¿esz u¿yæ GoogleVideo, YouTube, DailyMotion, Wideo, Vimeo lub Wat. Przyk³ady:<br><br>- http://video.google.fr/videoplay?docid=4600755234172037942<br>- http://www.youtube.com/watch?v=eUvApC0bwUk<br>- http://www.dailymotion.com/video/x29fys_doorway<br>- http://www.wideo.fr/video/iLyROoaftYvl.html<br>- http://www.vimeo.com/1747316<br>- http://www.wat.tv/video/abcd.html";
-$lang['pybulle_start'] = "Wybierz punkt startu filmu (w sekundach).<br>Ta opcja mo¿e byæ wykorzstana tylko z GoogleVideo.";
-$lang['pybulle_categorie'] = "Kategoria, wktórej plik zostanie stworzony: wyœwietlane s¹ tylko prawdziwe kategorie. Je¿eli chcesz dodaæ link tego pliku do kategorii wirtualnej, mo¿esz to zrobiæ póŸniej.";
-$lang['pybulle_miniature'] = "Mo¿esz trzymaæ plik miniatury na serwerze. Domuœlnie rozmiary miniatur s¹ nastêpuj¹ce: 320x240 dla Google Video, 320x240 dla Dailymotion, 130x97 dla Youtube, 154x114 dla Wideo aoraz 200x150 dla Vimeo.<br><br> Mo¿esz tak¿e wgraæ w³asn¹ miniaturê.<br><br> W obu przypadkach, mo¿esz zmieniæ rozmiary miinatury.";
-
-// Messages d'infos ou d'erreurs
-$lang['py_error1'] = 'Brak strony lokalnej! Nie mo¿na stworzyæ pliku z filmem.';
-$lang['py_error2'] = 'B³¹d zapisu. Nie uzupe³niono poprawnie pól formularza.';
-$lang['py_error3'] = 'Musisz uzupe³niæ wszystkie obowi¹zkowe pola oznacozne *';
-$lang['py_error5'] = 'B³êdny adres URL!';
-$lang['py_error6'] = 'plik "%s" ju¿ istnieje.';
-$lang['py_error7'] = 'B³¹d zapisu pliku "%s"';
-$lang['py_error8'] = 'SprawdŸ proszê czy katalog %s ma odpowiednie uprawnienia(chmod).';
-$lang['py_error9'] = 'B³¹d podczas wgrywania miniatury i zmiany jej rozmiaru.';
-$lang['py_error11'] = 'Miniatura o tej samej nazwie ju¿ istnieje (%s)';
-$lang['py_error12'] = 'pole miniatury nie wype³nione : miniatura nie zosta³a wgrana.';
-$lang['py_info2'] = 'miniatura zosta³a wgrana pomyœlnie';
-$lang['py_info3'] = 'Film dodany pomyœlnie';
-$lang['py_info4'] = 'Konfiguracja zapisana.';
-$lang['py_show_file'] = '<a href="%s" class="externalLink">SPoka¿ film</a>.';
-
-?>
Index: /extensions/gvideo/language/pt_PT/description.txt
===================================================================
--- /extensions/gvideo/language/pt_PT/description.txt	(revision 17306)
+++ /extensions/gvideo/language/pt_PT/description.txt	(revision 17307)
@@ -1,1 +1,1 @@
-Adiciona vídeos de Google Video, Dailymotion, Youtube, Wideo, Vimeo or Wat.
+Adiciona vídeos de Dailymotion, Youtube, Wideo, Vimeo, videobb or Wat.
Index: /extensions/gvideo/language/pt_PT/index.php
===================================================================
--- /extensions/gvideo/language/pt_PT/index.php	(revision 17306)
+++ /extensions/gvideo/language/pt_PT/index.php	(revision 17307)
@@ -1,12 +1,9 @@
 <?php
 // +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery                           |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id$
-// | last update   : $Date$
-// | last modifier : $Author$
-// | revision      : $Revision$
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: tensions/gvideo/language/pt_PT/plugin.lang.php
===================================================================
--- /extensions/gvideo/language/pt_PT/plugin.lang.php	(revision 17306)
+++ 	(revision )
@@ -1,46 +1,0 @@
-<?php
-
-$lang['py_title'] = 'PYWaie GVideo';
-$lang['py_conf'] = 'Configuração';
-$lang['py_addvideo'] = 'Adicionar um vídeo';
-$lang['py_filename'] = 'Nome do ficheiro';
-$lang['py_url'] = 'URL do vídeo';
-$lang['py_parent'] = 'Álbum Principal';
-$lang['py_thumb'] = 'Miniatura';
-$lang['py_no_thumb'] = 'Sem miniatura';
-$lang['py_thumb_from_server'] = 'Escolher miniatura do servidor';
-$lang['py_thumb_from_user'] = 'Enviar a sua miniatura:';
-$lang['py_add_band'] = 'Adicionar barras nas laterais da miniatura';
-$lang['py_thumb_resize'] = 'Redimensionar a miniatura';
-$lang['py_width'] = 'Largura';
-$lang['py_height'] = 'Altura';
-$lang['py_start'] = 'Início do vídeo';
-$lang['py_*'] = 'Campo obrigatório';
-$lang['py_autostart'] = 'Início automático';
-$lang['py_quality'] = 'Qualidade';
-$lang['py_playermode'] = 'Modo do Leitor';
-
-
-// Infobulles
-$lang['pybulle_reference'] = "Cole aqui a ligação do vídeo.<br>Pode usar GoogleVideo, YouTube, DailyMotion, Wideo, Vimeo or Wat. Exemplos:<br><br>- http://video.google.fr/videoplay?docid=4600755234172037942<br>- http://www.youtube.com/watch?v=eUvApC0bwUk<br>- http://www.dailymotion.com/video/x29fys_doorway<br>- http://www.wideo.fr/video/iLyROoaftYvl.html<br>- http://www.vimeo.com/1747316<br>- http://www.wat.tv/video/abcd.html";
-$lang['pybulle_start'] = "Escolha o pinto de início (em segundos) do vídeo.<br>Esta opção apenas pode ser usada com GoogleVideo.";
-$lang['pybulle_categorie'] = "Álbum onde o ficheiro será criado: apenas álbums físicos estão listados. Se desejar associar este ficheiro a um álbum virtual terá que o fazer posteriormente.";
-$lang['pybulle_miniature'] = "Pode escolher uma miniatura alojada no servidor. Po defeito as miniaturas têem um tamanho de 320x240 no Google Video, 320x240 no Dailymotion, 130x97 no Youtube, 154x114 no Wideo e 200x150 no Vimeo.<br><br> Alternativamente pode fazer upload de uma miniatura.<br><br> Em qualquer dos casos poderá mudar as dimensões da miniatura.";
-
-//Info messages or error
-$lang['py_error1'] = 'Sítio local não existente! Impossível criar ficheiro de vídeo.';
-$lang['py_error2'] = 'Impossível salvar. Não preencheu o formulário correctamente.';
-$lang['py_error3'] = 'Deverá preencher os campos obrigatórios *';
-$lang['py_error5'] = 'URL errado!';
-$lang['py_error6'] = 'O ficheiro "%s" já existe.';
-$lang['py_error7'] = 'Impossível escrever ficheiro "%s"';
-$lang['py_error8'] = 'Por favor verifique se a pasta %s tem permissões de escrita (chmod 777).';
-$lang['py_error9'] = 'Erro ao enviar ou redimensionar miniatura.';
-$lang['py_error11'] = 'Já existe uma miniatura com o mesmo nome (%s)';
-$lang['py_error12'] = 'Campo "Miniatura" não preenchido : miniatura não enviada.';
-$lang['py_info2'] = 'Miniatura enviada com sucesso';
-$lang['py_info3'] = 'Vídeo adicionado com successo';
-$lang['py_info4'] = 'Configuração guardada.';
-$lang['py_show_file'] = '<a href="%s" class="externalLink">Ver vídeo</a>.';
-
-?>
Index: /extensions/gvideo/language/ru_RU/description.txt
===================================================================
--- /extensions/gvideo/language/ru_RU/description.txt	(revision 17306)
+++ /extensions/gvideo/language/ru_RU/description.txt	(revision 17307)
@@ -1,1 +1,1 @@
-Вставка видео-роликов Google Video, Dailymotion, Youtube, Wideo, Vimeo или Wat.
+Вставка видео-роликов Dailymotion, Youtube, Wideo, Vimeo, videobb или Wat.
Index: /extensions/gvideo/language/ru_RU/index.php
===================================================================
--- /extensions/gvideo/language/ru_RU/index.php	(revision 17306)
+++ /extensions/gvideo/language/ru_RU/index.php	(revision 17307)
@@ -1,12 +1,9 @@
 <?php
 // +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery                           |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id$
-// | last update   : $Date$
-// | last modifier : $Author$
-// | revision      : $Revision$
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: tensions/gvideo/language/ru_RU/plugin.lang.php
===================================================================
--- /extensions/gvideo/language/ru_RU/plugin.lang.php	(revision 17306)
+++ 	(revision )
@@ -1,46 +1,0 @@
-<?php
-
-$lang['py_title'] = 'PYWaie GVideo';
-$lang['py_conf'] = 'Настройки';
-$lang['py_addvideo'] = 'Добавить видео-ролик';
-$lang['py_filename'] = 'Имя файла';
-$lang['py_url'] = 'URL видео-ролика';
-$lang['py_parent'] = 'Основная категория';
-$lang['py_thumb'] = 'Миниатюра';
-$lang['py_no_thumb'] = 'Миниатюра отсутствует';
-$lang['py_thumb_from_server'] = 'Загрузить миниатюру с сервера';
-$lang['py_thumb_from_user'] = 'Загрузить пользовательскую миниатюру:';
-$lang['py_add_band'] = 'Добавить полосы по краям миниатюры';
-$lang['py_thumb_resize'] = 'Изменить размер миниатюры';
-$lang['py_width'] = 'Ширина';
-$lang['py_height'] = 'Высота';
-$lang['py_start'] = 'Начало воспроизведения видео-ролика';
-$lang['py_*'] = 'Обязательное поле';
-$lang['py_autostart'] = 'Автовоспроизведение';
-$lang['py_quality'] = 'Качество';
-$lang['py_playermode'] = 'Режим воспроизведения';
-
-
-// Подсказки
-$lang['pybulle_reference'] = "Ссылка на страницу с видео.<br>Доступные видео-сервисы: GoogleVideo, YouTube, DailyMotion, Wideo, Vimeo или Wat. Примеры:<br><br>- http://video.google.fr/videoplay?docid=4600755234172037942<br>- http://www.youtube.com/watch?v=eUvApC0bwUk<br>- http://www.dailymotion.com/video/x29fys_doorway<br>- http://www.wideo.fr/video/iLyROoaftYvl.html<br>- http://www.vimeo.com/1747316<br>- http://www.wat.tv/video/abcd.html";
-$lang['pybulle_start'] = "Укажите точку начала воспроизведения видео-ролика (в секундах).<br>Эта опция доступна только для роликов с сайта GoogleVideo.";
-$lang['pybulle_categorie'] = 'Категория, в которой будет создан файл: перечислены только "категории-каталоги". Если вы хотите связать файл с виртуальной категорией, это можно будет сделать после добавления видео-ролика.';
-$lang['pybulle_miniature'] = "Вы можете получить миниатюру с видео-сервиса. По умолчанию размеры миниатюр следующие: 320x240 для Google Video, 320x240 для Dailymotion, 130x97 для Youtube, 154x114 для Wideo и 200x150 для Vimeo.<br><br> Также вы можете загрузить свою собственную миниатюру.<br><br>В любом случае, вы можете изменить размеры миниатюры.";
-
-// Информационные сообщения и ошибки
-$lang['py_error1'] = 'Нет локальной директории! Невозможно создать видео-файл.';
-$lang['py_error2'] = 'Ошибка при сохранении. Неверно заполнена форма.';
-$lang['py_error3'] = 'Заполните обязательные поля *.';
-$lang['py_error5'] = 'Неверный адрес URL!';
-$lang['py_error6'] = 'Файл "%s" уже существует.';
-$lang['py_error7'] = 'Невозможно записать файл "%s"';
-$lang['py_error8'] = 'Пожалуйста, проверьте права доступа к директории %s (chmod).';
-$lang['py_error9'] = 'Ошибка при загрузке/изменении размера миниатюры.';
-$lang['py_error11'] = 'Миниатюра с таким именем уже существует (%s)';
-$lang['py_error12'] = 'Поле "Миниатюра" не заполнено: миниатюра не загружена.';
-$lang['py_info2'] = 'Миниатюра успешно загружена.';
-$lang['py_info3'] = 'Видео-ролик успешно добавлен.';
-$lang['py_info4'] = 'Настройки сохнанены.';
-$lang['py_show_file'] = '<a href="%s" class="externalLink">Просмотреть видео-ролик</a>.';
-
-?>
Index: /extensions/gvideo/language/sh_RS/description.txt
===================================================================
--- /extensions/gvideo/language/sh_RS/description.txt	(revision 17306)
+++ /extensions/gvideo/language/sh_RS/description.txt	(revision 17307)
@@ -1,1 +1,1 @@
-Dodaje video sa sajtova: Google Video, Dailymotion, Youtube, Wideo, Vimeo ili Wat.
+Dodaje video sa sajtova: Dailymotion, Youtube, Wideo, Vimeo, videobb ili Wat.
Index: /extensions/gvideo/language/sh_RS/index.php
===================================================================
--- /extensions/gvideo/language/sh_RS/index.php	(revision 17307)
+++ /extensions/gvideo/language/sh_RS/index.php	(revision 17307)
@@ -0,0 +1,30 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program 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                                          |
+// |                                                                       |
+// | This program 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 this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+// Recursive call
+$url = '../';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
Index: tensions/gvideo/language/sh_RS/plugin.lang.php
===================================================================
--- /extensions/gvideo/language/sh_RS/plugin.lang.php	(revision 17306)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?php
-// +-----------------------------------------------------------------------+
-// | Piwigo - a PHP based photo gallery                                    |
-// +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
-// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
-// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
-// +-----------------------------------------------------------------------+
-// | This program 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                                          |
-// |                                                                       |
-// | This program 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 this program; if not, write to the Free Software           |
-// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
-// | USA.                                                                  |
-// +-----------------------------------------------------------------------+
-$lang['pybulle_categorie'] = 'Kategorija gde će fajl biti kreiran: samo prave kategorije su prikazane. Ako želite da vežete ovaj fajl za virtuelnu kategoriju, možete to da uradite posle.';
-$lang['pybulle_miniature'] = 'Možete preuzeti sličicu sa servera. Podrazumevano, veličine sličica su 320x240 na GoogleVideo, 320x240 na Dailymotion, 130x97 na Youtube, 154x114 na Wideo i 200x150 na Vimeo.<br><br> Ili možete poslati vašu sličicu.<br><br> U oba slučaja možete da menjate veličinu sličice.';
-$lang['pybulle_reference'] = '
-Zalepi vezu videa.<br>Možete korisiti GoogleVideo, YouTube, DailyMotion, Wideo, Vimeo ili Wat. Primer:<br><br>- http://video.google.fr/videoplay?docid=4600755234172037942<br>- http://www.youtube.com/watch?v=eUvApC0bwUk<br>- http://www.dailymotion.com/video/x29fys_doorway<br>- http://www.wideo.fr/video/iLyROoaftYvl.html<br>- http://www.vimeo.com/1747316<br>- http://www.wat.tv/video/abcd.html';
-$lang['pybulle_start'] = 'Odaberi početnu tačku videa (u sekundama).<br>Ova opcija se može koristiti samo sa GoogleVideo-m.';
-$lang['py_*'] = 'Obavezno polje';
-$lang['py_addvideo'] = 'Dodaj video';
-$lang['py_add_band'] = 'Dodaj traku sa strane sličice';
-$lang['py_autostart'] = 'Autostart';
-$lang['py_conf'] = 'Podešavanje';
-$lang['py_error11'] = 'Sličica sa istim imenom već postoji (%s)';
-$lang['py_error12'] = 'polje za sličicu nije popunjeno: sličica nije poslata.';
-$lang['py_error1'] = 'Nema lokalnog sajta. Nije moguće kreirati video fajl.';
-$lang['py_error2'] = 'Nije moguće sačuvati. Niste pravilno popunili formular.';
-$lang['py_error3'] = 'Morate popuniti obavezna polje označena sa *';
-$lang['py_error5'] = 'pogrešan URL!';
-$lang['py_error6'] = 'fajl "%s" već postoji.';
-$lang['py_error7'] = 'Nije moguće snimiti fajl "%s"';
-$lang['py_error8'] = 'molim proverite da li direktorijum %s ima odgovarajuća prava upisa (chmod)';
-$lang['py_error9'] = 'Greška prilikom slanja sličice ili menjanja veličine';
-$lang['py_filename'] = 'Ime fajla';
-$lang['py_height'] = 'Visina';
-$lang['py_info2'] = 'sličica uspešno poslata';
-$lang['py_info3'] = 'Video uspešno dodat';
-$lang['py_info4'] = 'Podešavanje sačuvano.';
-$lang['py_no_thumb'] = 'Bez sličice';
-$lang['py_parent'] = 'Glavna kategorija';
-$lang['py_playermode'] = 'Plejer mod';
-$lang['py_quality'] = 'Kvalitet';
-$lang['py_show_file'] = '<a href="%s" class="externalLink">Prikaži video</a>.';
-$lang['py_start'] = 'Početak videa';
-$lang['py_thumb'] = 'Sličica';
-$lang['py_thumb_from_server'] = 'Pošalji sličicu sa servera';
-$lang['py_thumb_from_user'] = 'Pošalji svoju sličicu:';
-$lang['py_thumb_resize'] = 'Promeni veličinu sličice';
-$lang['py_title'] = 'PYWaie GVideo';
-$lang['py_url'] = 'URL videa';
-$lang['py_width'] = 'Širina';
-?>
Index: /extensions/gvideo/language/sk_SK/description.txt
===================================================================
--- /extensions/gvideo/language/sk_SK/description.txt	(revision 17306)
+++ /extensions/gvideo/language/sk_SK/description.txt	(revision 17307)
@@ -1,1 +1,1 @@
-Umožňuje vloženie video súborov z Youtube, Google Video, Dailymotion, Wideo, Vimeo alebo Wat.
+Umožňuje vloženie video súborov z Youtube, Dailymotion, Wideo, Vimeo, videobb alebo Wat.
Index: /extensions/gvideo/language/sk_SK/index.php
===================================================================
--- /extensions/gvideo/language/sk_SK/index.php	(revision 17306)
+++ /extensions/gvideo/language/sk_SK/index.php	(revision 17307)
@@ -1,12 +1,9 @@
 <?php
 // +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery                           |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id: index.php 7428 2010-10-27 11:03:22Z ddtddt $
-// | last update   : $Date: 2010-10-27 13:03:22 +0200 (st, 27 X 2010) $
-// | last modifier : $Author: ddtddt $
-// | revision      : $Revision: 7428 $
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: tensions/gvideo/language/sk_SK/plugin.lang.php
===================================================================
--- /extensions/gvideo/language/sk_SK/plugin.lang.php	(revision 17306)
+++ 	(revision )
@@ -1,46 +1,0 @@
-<?php
-
-$lang['py_title'] = 'PYWaie GVideo';
-$lang['py_conf'] = 'Konfigurácia';
-$lang['py_addvideo'] = 'Vložiť video';
-$lang['py_filename'] = 'Názov súboru';
-$lang['py_url'] = 'URL adresa videa';
-$lang['py_parent'] = 'Hlavná kategória';
-$lang['py_thumb'] = 'Náhľad';
-$lang['py_no_thumb'] = 'Bez náhľadu';
-$lang['py_thumb_from_server'] = 'Nahratie náhľadu zo servra';
-$lang['py_thumb_from_user'] = 'Nahratie vlastného náhľadu:';
-$lang['py_add_band'] = 'Vložiť pásy po stranách náhľadu';
-$lang['py_thumb_resize'] = 'Zmena veľkosti náhľadu';
-$lang['py_width'] = 'Šírka';
-$lang['py_height'] = 'Výška';
-$lang['py_start'] = 'Začiatok videa';
-$lang['py_*'] = 'Povinné položky';
-$lang['py_autostart'] = 'Autoštart';
-$lang['py_quality'] = 'Kvalita';
-$lang['py_playermode'] = 'Mód prehrávača';
-
-
-// Infobulles
-$lang['pybulle_reference'] = "Sem vložte odkaz na stránku videa.<br>Môžete použiť GoogleVideo, YouTube, DailyMotion, Wideo, Vimeo nebo Wat. Príklady:<br><br>- http://video.google.fr/videoplay?docid=4600755234172037942<br>- http://www.youtube.com/watch?v=eUvApC0bwUk<br>- http://www.dailymotion.com/video/x29fys_doorway<br>- http://www.wideo.fr/video/iLyROoaftYvl.html<br>- http://www.vimeo.com/1747316<br>- http://www.wat.tv/video/abcd.html";
-$lang['pybulle_start'] = "Zvoľte čas začiatku videa v sekundách.<br>Možné použiť LEN na GoogleVideo.";
-$lang['pybulle_categorie'] = "Kategória kde bude súbor vytvorený: len reálne kategórie sú v zozname. Pokiaľ chcete odkazovať do virtuálnej kategórie, odkazujte až po jej vytvorení.";
-$lang['pybulle_miniature'] = "Môžete získať náhľad späť na server. Prednastavené rozmery náhľadov sú 320x240 Google Video, Dailymotion, 130x97 Youtube, 154x114 Wideo a 200x150px Vimeo.<br><br> Alebo nahrajte vlastný náhľad.<br><br> V oboch prípadoch môžete zmeniť rozmery náhľadu.";
-
-// Informačné správy alebo chyby
-$lang['py_error1'] = 'Žiadna miestna stránka! Nie je možné vytvoriť video súbor.';
-$lang['py_error2'] = 'Nie je možné ukladať. Nevyplnili ste správne formulár';
-$lang['py_error3'] = 'Vyplňte povinné položky označené *';
-$lang['py_error5'] = 'zlá URL!';
-$lang['py_error6'] = 'súbor "%s" už existuje.';
-$lang['py_error7'] = 'Nie je možné zapísať súbor "%s"';
-$lang['py_error8'] = 'skontrolujte, či zložka %s má správne(chmod).';
-$lang['py_error9'] = 'Chyba pri nahrávaní alebo zmene rozmerov náhľadu.';
-$lang['py_error11'] = 'Náhľad s rovnakým názvom už existuje (%s)';
-$lang['py_error12'] = 'pole náhľadu nebolo vyplnené: náhľad nebol nahratý.';
-$lang['py_info2'] = 'náhľad bol nahratý';
-$lang['py_info3'] = 'Video bolo pridané';
-$lang['py_info4'] = 'Konfigurácia uložená.';
-$lang['py_show_file'] = '<a href="%s" class="externalLink">Zobraz video</a>.';
-
-?>
Index: /extensions/gvideo/language/sv_SE/description.txt
===================================================================
--- /extensions/gvideo/language/sv_SE/description.txt	(revision 17306)
+++ /extensions/gvideo/language/sv_SE/description.txt	(revision 17307)
@@ -1,1 +1,1 @@
-Lägg till videor från Google Video, Dailymotion, Youtube, Wideo, Vimeo or Wat.
+Lägg till videor från Dailymotion, Youtube, Wideo, Vimeo, videobb or Wat.
Index: /extensions/gvideo/language/sv_SE/index.php
===================================================================
--- /extensions/gvideo/language/sv_SE/index.php	(revision 17306)
+++ /extensions/gvideo/language/sv_SE/index.php	(revision 17307)
@@ -1,12 +1,9 @@
 <?php
 // +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery                           |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id: index.php 1912 2007-03-16 06:30:07Z rub $
-// | last update   : $Date: 2007-03-16 07:30:07 +0100 (ven, 16 mar 2007) $
-// | last modifier : $Author: rub $
-// | revision      : $Revision: 1912 $
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: tensions/gvideo/language/sv_SE/plugin.lang.php
===================================================================
--- /extensions/gvideo/language/sv_SE/plugin.lang.php	(revision 17306)
+++ 	(revision )
@@ -1,47 +1,0 @@
-<?php
-
-$lang['py_title'] = 'PYWaie GVideo';
-$lang['py_conf'] = 'Konfiguration';
-$lang['py_addvideo'] = 'Lägg till video';
-$lang['py_filename'] = 'Filenamn';
-$lang['py_url'] = ' Videons URL';
-$lang['py_parent'] = 'Huvudkategori';
-$lang['py_thumb'] = 'Thumbnail';
-$lang['py_no_thumb'] = 'Ingen thumbnail';
-$lang['py_thumb_from_server'] = 'Ladda upp thumbnail från server';
-$lang['py_thumb_from_user'] = 'Ladda upp din egen thumbnail:';
-$lang['py_add_band'] = 'Lägg till band på sidan om din thumbnail';
-$lang['py_thumb_resize'] = 'Ändra storlek på thumbnail';
-$lang['py_width'] = 'Bredd';
-$lang['py_height'] = 'Höjd';
-$lang['py_start'] = 'Videostart';
-$lang['py_*'] = 'Obligatoriskt fält';
-$lang['py_autostart'] = 'Autostart';
-$lang['py_quality'] = 'Kvalitet';
-$lang['py_playermode'] = 'Spelarläge';
-
-
-// Infobulles
-$lang['pybulle_reference'] = "Här klistrar du in en länk till videon.<br>Du kan använda GoogleVideo, YouTube, DailyMotion, Wideo, Vimeo or Wat. Exampelvis:<br><br>- http://video.google.fr/videoplay?docid=4600755234172037942<br>- http://www.youtube.com/watch?v=eUvApC0bwUk<br>- http://www.dailymotion.com/video/x29fys_doorway<br>- http://www.wideo.fr/video/iLyROoaftYvl.html<br>- http://www.vimeo.com/1747316<br>- http://www.wat.tv/video/abcd.html";
-$lang['pybulle_start'] = "Välj videons startpunkt(i sekunder.<br>Detta val kan endast användas med GoogleVideo.";
-$lang['pybulle_categorie'] = "I vilken kategori vill du skapa videon: endast verkliga kategorier  listas. Om du vill länka filen till en virtuell kategori, så måste du länka efteråt.";
-$lang['pybulle_miniature'] = "Du kan skicka en thumbnail tillbaka till servern. Standardstorlek på thumbnails är 320x240 på Google Video, 320x240 på Dailymotion, 130x97 på Youtube, 154x114 på Wideo and 200x150 på Vimeo.<br><br> Eller så kan du ladda upp din egen thumbnail.<br><br> I båda fallen kan du ändra dimensionen på din thumbnail.";
-
-//Informationsmeddelanden eller fel
-$lang['py_error1'] = 'Ingen lokal site! Kan inte skapa videofilen.';
-$lang['py_error2'] = 'Kan inte spara. Formuläret är felaktigt ifyllt.';
-$lang['py_error3'] = 'Du måste fylla i obligatoriskt fält *';
-$lang['py_error5'] = 'Fel URL!';
-$lang['py_error6'] = 'filen "%s" finns redan.';
-$lang['py_error7'] = 'Kan inte skriva till filen "%s"';
-$lang['py_error8'] = 'Var vänlig kolla om ditt directory %s har rätttigheter(chmod).';
-$lang['py_error9'] = 'Fel när din thumbnail laddas upp eller storleksändras.';
-$lang['py_error11'] = 'En thumbnail med samma namn finns redan (%s)';
-$lang['py_error12'] = 'fältet thumbnail är inte ifyllt : din thumbnail kunde inte laddas upp.';
-$lang['py_info2'] = 'uppladdningen av din thumbnail lyckades';
-$lang['py_info3'] = 'Din videon är upplagd';
-$lang['py_info4'] = 'Konfiguration sparades.';
-$lang['py_show_file'] = '<a href="%s" class="externalLink">Visa video</a>.'; 
-
-
-?>
Index: /extensions/gvideo/language/tr_TR/description.txt
===================================================================
--- /extensions/gvideo/language/tr_TR/description.txt	(revision 17306)
+++ /extensions/gvideo/language/tr_TR/description.txt	(revision 17307)
@@ -1,1 +1,1 @@
-Google Video, Dailymotion, Youtube, Wideo, Vimeo or Wat videoları eklemek.
+Dailymotion, Youtube, Wideo, Vimeo, videobb or Wat videoları eklemek.
Index: /extensions/gvideo/language/tr_TR/index.php
===================================================================
--- /extensions/gvideo/language/tr_TR/index.php	(revision 17306)
+++ /extensions/gvideo/language/tr_TR/index.php	(revision 17307)
@@ -1,12 +1,9 @@
 <?php
 // +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery                           |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id$
-// | last update   : $Date$
-// | last modifier : $Author$
-// | revision      : $Revision$
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: tensions/gvideo/language/tr_TR/plugin.lang.php
===================================================================
--- /extensions/gvideo/language/tr_TR/plugin.lang.php	(revision 17306)
+++ 	(revision )
@@ -1,46 +1,0 @@
-<?php
-
-$lang['py_title'] = 'PYWaie GVideo';
-$lang['py_conf'] = 'Yapılandırma';
-$lang['py_addvideo'] = 'video ekle';
-$lang['py_filename'] = 'dosya adı';
-$lang['py_url'] = 'video urlsi';
-$lang['py_parent'] = 'Ana kategori';
-$lang['py_thumb'] = 'Thumbnail';
-$lang['py_no_thumb'] = 'Thumnaili geç';
-$lang['py_thumb_from_server'] = 'Thumbnaili sunucudan al';
-$lang['py_thumb_from_user'] = 'kendi thumbnailini yükle:';
-$lang['py_add_band'] = 'thumbnail yanlarına bantları ekle';
-$lang['py_thumb_resize'] = 'thumbnaili yeniden boyutlandır';
-$lang['py_width'] = 'Genişlik';
-$lang['py_height'] = 'Yükseklik';
-$lang['py_start'] = 'video başlangıcı';
-$lang['py_*'] = 'Zorunlu alan';
-$lang['py_autostart'] = 'otomatik başla';
-$lang['py_quality'] = 'Kalite';
-$lang['py_playermode'] = 'Oynatıcı durumu';
-
-
-// Infobulles
-$lang['pybulle_reference'] = "Video linkini buraya yapıştırın.<br>GoogleVideo, YouTube, DailyMotion, Wideo, Vimeo yada Wat videoları kullanabilirsiniz. Örnekler:<br><br>- http://video.google.fr/videoplay?docid=4600755234172037942<br>- http://www.youtube.com/watch?v=eUvApC0bwUk<br>- http://www.dailymotion.com/video/x29fys_doorway<br>- http://www.wideo.fr/video/iLyROoaftYvl.html<br>- http://www.vimeo.com/1747316<br>- http://www.wat.tv/video/abcd.html";
-$lang['pybulle_start'] = "Video başlama saniyesini seçin..<br>Bu özellik sadece GoogleVideo içindir.";
-$lang['pybulle_categorie'] = "Bu dosyanın ekleneceği kategori: sadece gerçek kategoriler listelendi. Eğer bu dosyayı sanal bir kategoriye bağlayacaksanız daha sonra yapın.";
-$lang['pybulle_miniature'] = "Serverdan thumbnail yükleyebilirsiniz.Normal thumbnail boyutları 320x240 Google Video, 320x240 Dailymotion, 130x97 Youtube, 154x114 Wideo ve 200x150 Vimeo.<br><br> Yada kendi thumbnailinizi yüklersiniz.<br><br> Her iki durumda da thumbnail boyutunu değişebilirsiniz.";
-
-// Messages d'infos ou d'erreurs
-$lang['py_error1'] = 'Video dosyası eklenemedi.';
-$lang['py_error2'] = 'Kayıt edilemedi, gerekli yerler doldurulmadı.';
-$lang['py_error3'] = '* işaretli yerler doldurulmalıdır.';
-$lang['py_error5'] = 'yanlış URL!';
-$lang['py_error6'] = 'dosya "%s" zaten var.';
-$lang['py_error7'] = 'dosya "%s" yazılamaz';
-$lang['py_error8'] = '%s dosyasının doğru chmodları olup olmadığını kontrol ediniz.';
-$lang['py_error9'] = 'Thumbnail yüklenirken veya yeniden boyutlanırken hata.';
-$lang['py_error11'] = 'aynı isimde bir thumbnail var (%s)';
-$lang['py_error12'] = 'thumbnail alanları doldurulmadı: thumbnail yüklenmedi.';
-$lang['py_info2'] = 'thumbnail yüklendi';
-$lang['py_info3'] = 'Video yüklendi';
-$lang['py_info4'] = 'Ayarlar kayıt edildi.';
-$lang['py_show_file'] = '<a href="%s" class="externalLink">Video\'yu göster</a>.';
-
-?>
Index: /extensions/gvideo/language/uk_UA/description.txt
===================================================================
--- /extensions/gvideo/language/uk_UA/description.txt	(revision 17306)
+++ /extensions/gvideo/language/uk_UA/description.txt	(revision 17307)
@@ -1,1 +1,1 @@
-Додає деякі відео з Google Video, Dailymotion, Youtube, Wideo, Vimeo або Wat.
+Додає деякі відео з Dailymotion, Youtube, Wideo, Vimeo, videobb або Wat.
Index: /extensions/gvideo/language/uk_UA/index.php
===================================================================
--- /extensions/gvideo/language/uk_UA/index.php	(revision 17307)
+++ /extensions/gvideo/language/uk_UA/index.php	(revision 17307)
@@ -0,0 +1,30 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program 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                                          |
+// |                                                                       |
+// | This program 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 this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+// Recursive call
+$url = '../';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
Index: tensions/gvideo/language/uk_UA/plugin.lang.php
===================================================================
--- /extensions/gvideo/language/uk_UA/plugin.lang.php	(revision 17306)
+++ 	(revision )
@@ -1,60 +1,0 @@
-<?php
-// +-----------------------------------------------------------------------+
-// | Piwigo - a PHP based photo gallery                                    |
-// +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
-// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
-// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
-// +-----------------------------------------------------------------------+
-// | This program 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                                          |
-// |                                                                       |
-// | This program 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 this program; if not, write to the Free Software           |
-// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
-// | USA.                                                                  |
-// +-----------------------------------------------------------------------+
-$lang['py_*'] = 'Обов\'язкове поле';
-$lang['py_addvideo'] = 'Додати відео';
-$lang['py_add_band'] = 'Додати смуги з боків зі слайдами';
-$lang['py_autostart'] = 'Автозапуск';
-$lang['py_conf'] = 'Конфігурація';
-$lang['py_error1'] = 'Не локальний сайт! Неможливо створити файл відео.';
-$lang['py_error2'] = 'Неможливо зберегти. Ви не правильно заповнити формуляр.';
-$lang['py_error3'] = 'Ви повинні заповнити обов\'язкове поле *';
-$lang['py_error5'] = 'неправильний URL!';
-$lang['py_error9'] = 'Помилка під час завантажені або зміну розмірів мініатюри.';
-$lang['py_filename'] = 'Ім\'я файлу';
-$lang['py_height'] = 'Висота';
-$lang['py_info2'] = 'мініатюра успішно завантажена';
-$lang['py_info3'] = 'Відео успішно додало';
-$lang['py_info4'] = 'Налаштування збережені.';
-$lang['py_no_thumb'] = 'Немає мініатюри';
-$lang['py_parent'] = 'Основна Категорія';
-$lang['py_playermode'] = 'Player Mode';
-$lang['py_quality'] = 'Якість';
-$lang['py_show_file'] = '<a href="%s" class="externalLink">Показати відео</a>.';
-$lang['py_start'] = 'Початок відео';
-$lang['py_thumb'] = 'Мініатюра';
-$lang['py_thumb_from_server'] = 'Завантажити мініатюру з сервера';
-$lang['py_thumb_from_user'] = 'Додати власну мініатюру:';
-$lang['py_thumb_resize'] = 'Зміна розміру мініатюри';
-$lang['py_title'] = 'PYWaie GVideo';
-$lang['py_url'] = 'URL з відео';
-$lang['py_width'] = 'Ширина';
-$lang['pybulle_start'] = 'Виберіть початкову точку(в секундах) відео.<br>Ця опція може бути використовувати тільки з GoogleVideo.';
-$lang['py_error11'] = 'Мініатюра з таким ім\'ям вже існує (%s)';
-$lang['py_error12'] = 'поле міріатюри не заповнено: мініатюра не завантажена.';
-$lang['py_error6'] = 'Файл "%s" вже існує.';
-$lang['py_error7'] = 'Неможливо записати файл "%s"';
-$lang['py_error8'] = 'будь ласка, перевірте, чи має каталог %s права(chmod)';
-$lang['pybulle_categorie'] = 'Категорія, де буде створено файл: перераховані лише реальні категорії. Якщо ви хочете зв\'язати файл з віртуальною категорією, ви повинні зв\'язати пізніше.';
-$lang['pybulle_miniature'] = 'Ви можете отримати мініатюру назад на сервер. За замовчуванням, мініатюри розміру 320x240 на Google Video, 320x240 на Dailymotion, 130x97 на Youtube, 154x114 на Wideo і 200x150 на Vimeo.<br><br> Або ви можете завантажити свою власну мініатюру.<br><br> В обох випадках Ви можете змінити розмір мініатюр.';
-$lang['pybulle_reference'] = 'Скопіюйте сюди посилання на відео.<br>Ви можете використовувати GoogleVideo, YouTube, DailyMotion, Wideo, Vimeo або Wat. приклади:<br><br>- http://video.google.fr/videoplay?docid=4600755234172037942<br>- http://www.youtube.com/watch?v=eUvApC0bwUk<br>- http://www.dailymotion.com/video/x29fys_doorway<br>- http://www.wideo.fr/video/iLyROoaftYvl.html<br>- http://www.vimeo.com/1747316<br>- http://www.wat.tv/video/abcd.html';
-?>
Index: /extensions/gvideo/language/vi_VN/description.txt
===================================================================
--- /extensions/gvideo/language/vi_VN/description.txt	(revision 17306)
+++ /extensions/gvideo/language/vi_VN/description.txt	(revision 17307)
@@ -1,1 +1,1 @@
-Thêm phim từ Google, Dailymotion, Youtube, Wideo, Vimeo hoặc Wat.
+Thêm phim từ Dailymotion, Youtube, Wideo, Vimeo, videobb hoặc Wat.
Index: /extensions/gvideo/language/vi_VN/index.php
===================================================================
--- /extensions/gvideo/language/vi_VN/index.php	(revision 17306)
+++ /extensions/gvideo/language/vi_VN/index.php	(revision 17307)
@@ -1,12 +1,9 @@
 <?php
 // +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery                           |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id: index.php 1912 2007-03-16 06:30:07Z rub $
-// | last update   : $Date: 2007-03-16 07:30:07 +0100 (ven, 16 mar 2007) $
-// | last modifier : $Author: rub $
-// | revision      : $Revision: 1912 $
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: tensions/gvideo/language/vi_VN/plugin.lang.php
===================================================================
--- /extensions/gvideo/language/vi_VN/plugin.lang.php	(revision 17306)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?php
-
-$lang['py_title'] = 'PYWaie GVideo';
-$lang['py_conf'] = 'Cấu hình';
-$lang['py_addvideo'] = 'Thêm phim';
-$lang['py_filename'] = 'Tập tin';
-$lang['py_url'] = 'Địa chỉ của phim';
-$lang['py_parent'] = 'Nhóm chính';
-$lang['py_thumb'] = 'Hình mô tả phim';
-$lang['py_no_thumb'] = 'Không có hình mô tả phim';
-$lang['py_thumb_from_server'] = 'Tải hình mô tả từ dịch vụ cung cấp phim';
-$lang['py_thumb_from_user'] = 'Tải hình mô tả từ máy của bạn:';
-$lang['py_add_band'] = 'Thêm băng chữ bên cạnh hình mô tả';
-$lang['py_thumb_resize'] = 'Điều chỉnh cỡ của hình mô tả';
-$lang['py_width'] = 'Chiều rộng';
-$lang['py_height'] = 'Chiều cao';
-$lang['py_start'] = 'Bắt đầu của phim';
-$lang['py_*'] = 'Thông tin bắt buộc phải có';
-$lang['py_autostart'] = 'Tự động mở phim';
-$lang['py_quality'] = 'Chất lượng';
-$lang['py_playermode'] = 'Chế độ xem';
-$lang['pybulle_reference'] = "Dán vào đây địa chỉ dẫn tới phim.<br>Các địa chỉ hợp lệ được lấy từ GoogleVideo, YouTube, DailyMotion, Wideo, Vimeo hoặc Wat. Ví dụ:<br><br>- > http://video.google.fr/videoplay?docid=4600755234172037942<br>- > http://www.youtube.com/watch?v=eUvApC0bwUk<br>- > http://www.dailymotion.com/video/x29fys_doorway<br>- > http://www.wideo.fr/video/iLyROoaftYvl.html<br>- > http://www.vimeo.com/1747316<br>-> http://www.wat.tv/video/abcd.html";
-$lang['pybulle_start'] = "Chọn thời điểm bắt đầu (tính bằng giây) của  phim.<br>Tùy chọn này chỉ có tác dụng với phim lấy từ GoogleVideo.";
-$lang['pybulle_categorie'] = "Nhóm chủ đạo của tập tin. Ở đây chỉ liệt kê ở đây các nhóm chính; các nhóm ảo sẽ được điều chỉnh sau.";
-$lang['pybulle_miniature'] = "Bạn có thể lấy các hình mô tả phim từ dịch vụ cung cấp phim. Mặc định thì hình mô tả có kích thước 320x240 từ Google, 320x240 từ Dailymotion, 130x97 từ Youtube, 154x114 từ Wideo và 200x150 từ Vimeo.<br><br>Bạn cũng có thể tải lên hình mô tả từ máy tính của bạn.<br><br>Dù thế nào thì bạn cũng có thể thay đổi cỡ của hình mô tả phim.";
-$lang['py_error1'] = 'Không thể tạo tập tin chứa phim vì không có trang web trên máy phục vụ.';
-$lang['py_error2'] = 'Không thể lưu vì bạn chưa điền đầy đủ các thông tin hợp lệ.';
-$lang['py_error3'] = 'Bạn phải cho biết thông tin ở những nơi đánh dấu sao *';
-$lang['py_error5'] = 'sai địa chỉ dẫn tới phim!';
-$lang['py_error6'] = 'tập tin "%s" đã có rồi.';
-$lang['py_error7'] = 'Không thể lưu vào tập tin "%s"';
-$lang['py_error8'] = 'hãy kiểm tra xem thư mục %s có được đặt quyền hợp lý (bằng chmod) hay chưa.';
-$lang['py_error9'] = 'Lỗi xảy ra khi tải / đổi cỡ của hình mô tả phim';
-$lang['py_error11'] = 'Đã có hình mô tả với cùng tên (%s)';
-$lang['py_error12'] = 'Chưa đầy đủ thông tin về hình mô tả.';
-$lang['py_info2'] = 'đã tải thành công hình mô tả lên máy phục vụ';
-$lang['py_info3'] = 'đã thêm thành công phim';
-$lang['py_info4'] = 'Đã lưu xong cấu hình.';
-$lang['py_show_file'] = '<a href="%s" class="externalLink">Xem phim</a>.';
-
-?>
Index: /extensions/gvideo/language/zh_CN/description.txt
===================================================================
--- /extensions/gvideo/language/zh_CN/description.txt	(revision 17306)
+++ /extensions/gvideo/language/zh_CN/description.txt	(revision 17307)
@@ -1,1 +1,1 @@
-从Google Video, Dailymotion, Youtube, Wideo, Vimeo或Wat添加视频
+从Dailymotion, Youtube, Wideo, Vimeo, videobb或Wat添加视频
Index: /extensions/gvideo/language/zh_CN/index.php
===================================================================
--- /extensions/gvideo/language/zh_CN/index.php	(revision 17306)
+++ /extensions/gvideo/language/zh_CN/index.php	(revision 17307)
@@ -1,12 +1,9 @@
 <?php
 // +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery                           |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id$
-// | last update   : $Date$
-// | last modifier : $Author$
-// | revision      : $Revision$
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: tensions/gvideo/language/zh_CN/plugin.lang.php
===================================================================
--- /extensions/gvideo/language/zh_CN/plugin.lang.php	(revision 17306)
+++ 	(revision )
@@ -1,42 +1,0 @@
-<?php
-
-$lang['py_title'] = 'PYWaie GVideo';
-$lang['py_conf'] = '设置';
-$lang['py_addvideo'] = '添加一段视频';
-$lang['py_filename'] = '文件名';
-$lang['py_url'] = '视频地址';
-$lang['py_parent'] = '主类别';
-$lang['py_thumb'] = '预览图';
-$lang['py_no_thumb'] = '无预览图';
-$lang['py_thumb_from_server'] = '从服务器上传预览图';
-$lang['py_thumb_from_user'] = '上传你自己的预览图';
-$lang['py_add_band'] = '在预览图旁边添加标志';
-$lang['py_thumb_resize'] = '调整预览图大小';
-$lang['py_width'] = '宽度';
-$lang['py_height'] = '高度';
-$lang['py_start'] = '视频开始处';
-$lang['py_*'] = '必填项';
-$lang['py_autostart'] = '自动开始';
-$lang['py_quality'] = '质量';
-$lang['py_playermode'] = '播放器模式';
-
-
-$lang['pybulle_categorie'] = '生成文件的目录: 只列出真实目录. 如果想要链接文件到虚拟目录, 你可以之后进行链接.';
-$lang['pybulle_miniature'] = '你可以从服务器上获取缩略图. 默认缩略图大小Google Video是320x240, Dailymotion是320x240, Youtube是130x97, Wideo是154x114,Vimeo是200x150.<br><br> 你也可以上传自己的缩略图.<br><br> 在这两种情况下，你都可以更改缩略图的尺寸。';
-$lang['pybulle_reference'] = '这里粘贴视频链接.<br>支持GoogleVideo, YouTube, DailyMotion, Wideo, Vimeo or Wat. 例如:<br><br>- http://video.google.fr/videoplay?docid=4600755234172037942<br>- http://www.youtube.com/watch?v=eUvApC0bwUk<br>- http://www.dailymotion.com/video/x29fys_doorway<br>- http://www.wideo.fr/video/iLyROoaftYvl.html<br>- http://www.vimeo.com/1747316<br>- http://www.wat.tv/video/abcd.html';
-$lang['pybulle_start'] = '选择视频的开始位置(秒).<br>这个选项只对GoogleVideo生效';
-$lang['py_error11'] = '已存在同名缩略图文件((%s)';
-$lang['py_error12'] = '没有指定缩略图：缩略图未被上传。';
-$lang['py_error1'] = '没有本地网站! 无法创建视频文件.';
-$lang['py_error2'] = '无法保存. 填写的格式不正确.';
-$lang['py_error3'] = '必须填写必填字段*';
-$lang['py_error5'] = 'URL错误!';
-$lang['py_error6'] = '文件"%s"已经存在.';
-$lang['py_error7'] = '无法写入文件"%s"';
-$lang['py_error8'] = '请检查目录%s是否有足够权限(chmod)';
-$lang['py_error9'] = '更新或缩放缩略图时出错.';
-$lang['py_info2'] = '缩略图上传成功';
-$lang['py_info3'] = '视频加载成功';
-$lang['py_info4'] = '配置已保存';
-$lang['py_show_file'] = '<a href="%s" class="externalLink">显示视频</a>.';
-?>
Index: /extensions/gvideo/main.inc.php
===================================================================
--- /extensions/gvideo/main.inc.php	(revision 17306)
+++ /extensions/gvideo/main.inc.php	(revision 17307)
@@ -1,78 +1,39 @@
-<?php
+<?php 
 /*
-Plugin Name: PY GVideo
+Plugin Name: Embedded Videos
 Version: auto
-Description: Adds some videos from Google Video, Dailymotion, Youtube, Wideo, Vimeo or Wat.
+Description: Add videos from Dailymotion, Youtube, Vimeo, Wideo, videobb and Wat.
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=136
-Author: PYwaie & P@t
+Author: Mistic & P@t
+Author URI: http://www.strangeplanet.fr
 */
 
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
-define('GVIDEO_DIR' , basename(dirname(__FILE__)));
-define('GVIDEO_PATH' , PHPWG_PLUGINS_PATH . GVIDEO_DIR . '/');
 
-global $conf, $py_addext;
-$py_addext = array("gvideo", "dm", "ytube", "wideo", "vimeo", "wat");
-$conf['file_ext'] = array_merge($conf['file_ext'], $py_addext);
+global $prefixeTable;
 
-function gvideoadd($content)
+define('GVIDEO_PATH', PHPWG_PLUGINS_PATH . basename(dirname(__FILE__)) . '/');
+define('GVIDEO_ADMIN', get_root_url() . 'admin.php?page=plugin-' . basename(dirname(__FILE__)));
+define('GVIDEO_TABLE', $prefixeTable.'image_video');
+
+include(GVIDEO_PATH . 'include/gvideo.inc.php');
+
+add_event_handler('render_element_content', 'gvideo_element_content', EVENT_HANDLER_PRIORITY_NEUTRAL-10, 2);
+
+if (defined('IN_ADMIN'))
 {
-  global $page, $picture, $template, $py_addext, $conf;
+  add_event_handler('delete_elements', 'gvideo_delete_elements');
+  add_event_handler('loc_begin_admin_page', 'gvideo_photo_edit');
+  add_event_handler('get_admin_plugin_menu_links', 'gvideo_admin_menu');
 
-  if (!isset($picture['current']['file']))
-	{
-		return $content;
-	}
-  $extension = strtolower(get_extension($picture['current']['file']));
-  if (!in_array($extension, $py_addext) or $page['slideshow'])
-	{
-    return $content;
-	}
-	include_once( GVIDEO_PATH . '/gvideo.php');
-  return $content;
+  function gvideo_admin_menu($menu) 
+  {
+    array_push($menu, array(
+      'NAME' => 'Embedded Videos',
+      'URL' => GVIDEO_ADMIN,
+    ));
+    return $menu;
+  }
 }
 
-
-add_event_handler('get_thumbnail_location', 'py_mimetype', 60, 2);
-function py_mimetype($location, $element_info)
-{
-  if ( empty( $element_info['tn_ext'] ) )
-  {
-    global $py_addext;
-    $extension = strtolower(get_extension($element_info['path']));
-    if (in_array($extension, $py_addext))
-    {
-      $location= 'plugins/' . GVIDEO_DIR . '/mimetypes/' . $extension . '.png';
-    }
-  }
-  return $location;
-}
-
-add_event_handler('get_mimetype_location', 'py_mimetype_location', 60, 2);
-function py_mimetype_location($location, $ext)
-{
-  global $py_addext;
-  if (in_array($ext, $py_addext))
-  {
-    $location= 'plugins/' . GVIDEO_DIR . '/mimetypes/' . $ext . '.png';
-  }
-  return $location;
-}
-
-if (script_basename() == 'admin')
-{
-	add_event_handler('get_admin_plugin_menu_links', 'gvideo_admin_menu');
-	
-	function gvideo_admin_menu($menu)
-	{
-		array_push($menu, array(
-			'NAME' => 'PY GVideo',
-			'URL' => get_admin_plugin_menu_link( GVIDEO_PATH . '/admin/pywaie_admin.php')));
-		return $menu;
-	}
-}
-
-add_event_handler('render_element_content', 'gvideoadd');
-add_event_handler('get_thumbnail_location', 'py_mimetype', 60, 2);
-
 ?>
Index: /extensions/gvideo/maintain.inc.php
===================================================================
--- /extensions/gvideo/maintain.inc.php	(revision 17306)
+++ /extensions/gvideo/maintain.inc.php	(revision 17307)
@@ -1,50 +1,228 @@
 <?php
-
-function plugin_install()
+if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
+
+global $prefixeTable;
+
+define('gvideo_path', PHPWG_PLUGINS_PATH . basename(dirname(__FILE__)));
+define('gvideo_table', $prefixeTable.'image_video');
+
+define(
+  'gvideo_default_config', 
+  serialize(array(
+    'autoplay' => 0,
+    'width' => 640,
+    'height' => 360,
+    'vimeo' => array(
+      'title' => 1,
+      'portrait' => 1,
+      'byline' => 1,
+      'color' => '00adef',
+      ),
+    'dailymotion' => array(
+      'logo' => 1,
+      'title' => 1,
+      'color' => 'F7FFFD',
+      ),
+    'youtube' => array(),
+    'wat' => array(),
+    'wideo' => array(),
+    'videobb' => array(),
+    ))
+  );
+
+
+function plugin_install() 
 {
-  $params = array(
-    'gvideo' => array('480','640','true','en'),
-    'ytube' => array('480','640','1'),
-    'dm' =>  array('480','640','1'),
-    'wideo' => array('480', '640', 'true'),
-    'vimeo' => array('480', '640', '1'),
-    'wat' => array('480', '640', 'true'),
-    );
-
-	$q = 'REPLACE INTO ' . CONFIG_TABLE . ' (param,value,comment)
-VALUES ("PY_GVideo","' . addslashes(serialize($params)) . '" , "PY Gvideo plugin parameters");';
-  pwg_query($q);
-}
-
-// La table de config se met à jour automatiquemlent lors de l'activation
+  global $conf;
+  
+  conf_update_param('gvideo', gvideo_default_config);
+  
+  $query = '
+CREATE TABLE IF NOT EXISTS `'.gvideo_table.'` (
+  `picture_id` mediumint(8) NOT NULL,
+  `type` varchar(64) NOT NULL,
+  `video_id` varchar(64) NOT NULL,
+  `width` smallint(9) DEFAULT NULL,
+  `height` smallint(9) DEFAULT NULL,
+  `autoplay` tinyint(1) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8
+;';
+  pwg_query($query);
+  
+  if (isset($conf['PY_GVideo']))
+  {
+    pwg_query('DELETE FROM `'. CONFIG_TABLE .'` WHERE param = "PY_GVideo" LIMIT 1;');
+    unset($conf['PY_GVideo']);
+  
+    gvideo_update_24();
+  }
+}
+
 function plugin_activate()
 {
   global $conf;
-
-  // Suppression des anciens paramètres (version < 1.7.o)
-  if (isset($conf['pywaie_gvideo']))
-  {
-    pwg_query('DELETE FROM ' . CONFIG_TABLE . ' WHERE param LIKE "pywaie_%";');
-  }
-  
-  // Vérification des nouveaux paramètres
-  if (!isset($conf['PY_GVideo'])
-    or ($params = unserialize($conf['PY_GVideo']) and !isset($params['wat'])))
+    
+  if (isset($conf['PY_GVideo']))
   {
     plugin_install();
   }
-}
-
-function plugin_uninstall()
+  else if (!isset($conf['gvideo']))
+  {
+    conf_update_param('gvideo', gvideo_default_config);
+  }
+}
+
+function plugin_uninstall() 
+{  
+  pwg_query('DELETE FROM `'. CONFIG_TABLE .'` WHERE param = "gvideo" LIMIT 1;');
+  pwg_query('DROP TABLE `'.gvideo_table.'`;');
+}
+
+
+/**
+ * update from 2.3 to 2.4
+ */
+function gvideo_update_24()
 {
   global $conf;
   
-  // Suppression des anciens paramètres (version < 1.7.o)
-  if (isset($conf['pywaie_gvideo']))
-  {
-    pwg_query('DELETE FROM ' . CONFIG_TABLE . ' WHERE param LIKE "pywaie_%";');
-  }
-
-  pwg_query('DELETE FROM ' . CONFIG_TABLE . ' WHERE param = "PY_GVideo";');
+  // search existing videos
+  $query = '
+SELECT *
+  FROM '.IMAGES_TABLE.'
+  WHERE
+    file LIKE "%.gvideo"
+    OR file LIKE "%.dm"
+    OR file LIKE "%.ytube"
+    OR file LIKE "%.wideo"
+    OR file LIKE "%.vimeo"
+    OR file LIKE "%.wat"
+;';
+  $result = pwg_query($query);
+  
+  if (!pwg_db_num_rows($result))
+  {
+    return;
+  }
+  
+  set_time_limit(600);
+  include_once(gvideo_path . '/include/functions.inc.php');
+  include_once(PHPWG_ROOT_PATH . 'admin/include/functions_upload.inc.php');
+  
+  $videos_inserts = array();
+  $images_updates = array();
+  $images_delete = array();
+  
+  while ($img = pwg_db_fetch_assoc($result))
+  {
+    $file_content = file_get_contents($img['path']);
+    list($file['id'], $file['height'], $file['width'], ) = explode('/', $file_content);
+    $file['type'] = get_extension($img['path']);
+    
+    switch ($file['type'])
+    {
+      case 'vimeo':
+        $url = 'http://vimeo.com/'.$file['id'];
+        break;
+      case 'dm':
+        $url = 'http://dailymotion.com/video/'.$file['id'];
+        break;
+      case 'ytube':
+        $url = 'http://youtu.be/'.$file['id'];
+        break;
+      case 'wideo':
+        $url = 'http://wideo.fr/video/'.$file['id'].'.html';
+        break;
+        
+      case 'wat': // can't get original page from id !
+        $thumb = str_replace($img['file'], null, $img['path']).'thumbnail/TN-'.get_filename_wo_extension($img['file']).'.*';
+        $thumb = glob($thumb);
+        if (!empty($thumb))
+        {
+          $thumb_name = 'wat-'.$file['id'].'-'.uniqid().'.'.get_extension($thumb[0]);
+          $thumb_source = $conf['data_location'].$thumb_name;
+          copy($thumb[0], $thumb_source);
+        }
+        
+        $video = array(
+          'type' => 'wat',
+          'id' => $file['id'],
+          'title' => null,
+          'description' => null,
+          'thumbnail' => null,
+          );
+        break;
+        
+      case 'gvideo': // closed
+      default:
+        array_push($images_delete, $img['id']);
+        continue;
+    }
+    
+    // get video infos
+    if (!isset($video))
+    {
+      if ( ($video = parse_video_url($url)) === false )
+      {
+        array_push($images_delete, $img['id']);
+        continue;
+      }
+    }
+    
+    // download thumbnail
+    if (!isset($thumb_source))
+    {
+      $thumb_name = $video['type'].'-'.$video['id'].'-'.uniqid().'.'.get_extension($video['thumbnail']);
+      $thumb_source = $conf['data_location'].$thumb_name;
+      if (download_remote_file($video['thumbnail'], $thumb_source) !== true)
+      {
+        $thumb_source = $conf['data_location'].get_filename_wo_extension($thumb_name).'.jpg';
+        copy(gvideo_path.'mimetypes/'.$video['type'].'.jpg', $thumb_source);
+      }
+    }
+    
+    // update element
+    $image_id = add_uploaded_file($thumb_source, $thumb_name, null, null, $img['id']);
+    
+    // update path and rename the file
+    $img['new_path'] = str_replace($img['file'], null, $img['path']).$thumb_name;
+    rename($img['path'], $img['new_path']);
+    array_push($images_updates, array(
+      'id' => $img['id'],
+      'path' => str_replace('././', './', $img['new_path']),
+      ));
+    
+    if (empty($file['width'])) $file['width'] = '';
+    if (empty($file['height'])) $file['height'] = '';
+    
+    // register video    
+    array_push($videos_inserts, array(
+      'picture_id' => $image_id,
+      'type' => $video['type'],
+      'video_id' => $video['id'],
+      'width' => $file['width'],
+      'height' => $file['height'],
+      'autoplay' => '',
+      ));
+      
+    unset($thumb_source, $thumb_name, $file, $video, $url);
+  }
+  
+  // delete obsolete elements
+  delete_elements($images_delete);
+  
+  // registers videos
+  mass_inserts(
+    gvideo_table,
+    array('picture_id', 'type', 'video_id', 'width', 'height', 'autoplay'),
+    $videos_inserts
+    );
+    
+  // update images
+  mass_updates(
+    IMAGES_TABLE,
+    array('primary'=>array('id'), 'update'=>array('path')),
+    $images_updates
+    );
 }
 
Index: /extensions/gvideo/mimetypes/index.php
===================================================================
--- /extensions/gvideo/mimetypes/index.php	(revision 17306)
+++ /extensions/gvideo/mimetypes/index.php	(revision 17307)
@@ -1,12 +1,9 @@
 <?php
 // +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery                           |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id: index.php 1912 2007-03-16 06:30:07Z rub $
-// | last update   : $Date: 2007-03-16 07:30:07 +0100 (ven, 16 mar 2007) $
-// | last modifier : $Author: rub $
-// | revision      : $Revision: 1912 $
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: /extensions/gvideo/template/index.php
===================================================================
--- /extensions/gvideo/template/index.php	(revision 17306)
+++ /extensions/gvideo/template/index.php	(revision 17307)
@@ -1,12 +1,9 @@
 <?php
 // +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery                           |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id: index.php 1912 2007-03-16 06:30:07Z rub $
-// | last update   : $Date: 2007-03-16 07:30:07 +0100 (ven, 16 mar 2007) $
-// | last modifier : $Author: rub $
-// | revision      : $Revision: 1912 $
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: tensions/gvideo/template/pywaie_dm.tpl
===================================================================
--- /extensions/gvideo/template/pywaie_dm.tpl	(revision 17306)
+++ 	(revision )
@@ -1,7 +1,0 @@
-{* pywaie_dm.tpl *}
-<br />
-<object width="{$WIDTH_IMG}" height="{$HEIGHT_IMG}">
-<param name="movie" value="http://www.dailymotion.com/swf/{$ID_GVIDEO}&autoPlay={$AUTO_GVIDEO}"></param>
-<param name="allowfullscreen" value="true"></param>
-<embed src="http://www.dailymotion.com/swf/{$ID_GVIDEO}&autoPlay={$AUTO_GVIDEO}" type="application/x-shockwave-flash" width="{$WIDTH_IMG}" height="{$HEIGHT_IMG}" allowfullscreen="true"></embed>
-</object>
Index: tensions/gvideo/template/pywaie_gvideo.tpl
===================================================================
--- /extensions/gvideo/template/pywaie_gvideo.tpl	(revision 17306)
+++ 	(revision )
@@ -1,3 +1,0 @@
-{* pywaie_gvideo.tpl *}
-<br />
-<embed id="VideoPlayback" style="width:{$WIDTH_IMG}px;height:{$HEIGHT_IMG}px" allowFullScreen="true" src="http://video.google.com/googleplayer.swf?docid={$ID_GVIDEO}&hl={$LANG_GVIDEO}&autoplay={$AUTO_GVIDEO}&fs=true" type="application/x-shockwave-flash" flashvars="{$START_GVIDEO}"> </embed>
Index: tensions/gvideo/template/pywaie_vimeo.tpl
===================================================================
--- /extensions/gvideo/template/pywaie_vimeo.tpl	(revision 17306)
+++ 	(revision )
@@ -1,2 +1,0 @@
-{* pywaie_vimeo.tpl *}
-<iframe src="http://player.vimeo.com/video/{$ID_GVIDEO}?title=0&amp;byline=0&amp;portrait=0&amp;autoplay={$AUTO_GVIDEO}" width="{$WIDTH_IMG}" height="{$HEIGHT_IMG}" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>
Index: tensions/gvideo/template/pywaie_wat.tpl
===================================================================
--- /extensions/gvideo/template/pywaie_wat.tpl	(revision 17306)
+++ 	(revision )
@@ -1,2 +1,0 @@
-{* pywaie_wat.tpl *}
-<embed style="width:{$WIDTH_IMG}px; height:{$HEIGHT_IMG}px;" src="http://www.wat.tv/swf2/{$ID_GVIDEO}" type="application/x-shockwave-flash" allowFullScreen="true" allowScriptAccess="always" flashvars="autoStart={$AUTO_GVIDEO}"></embed>
Index: tensions/gvideo/template/pywaie_wideo.tpl
===================================================================
--- /extensions/gvideo/template/pywaie_wideo.tpl	(revision 17306)
+++ 	(revision )
@@ -1,11 +1,0 @@
-{* pywaie_wideo.tpl *}
-<br />
-<div style="height: {$HEIGHT_IMG+10}px;"> {* necessary for lightbox plugin *}
-<object width="{$WIDTH_IMG}" height="{$HEIGHT_IMG}" type="application/x-shockwave-flash" data="http://www.kewego.com/swf/p3/epix.swf?language_code=fr&amp;playerKey=0df9b773a15b&amp;skinKey=7109c4112f57&amp;sig={$ID_GVIDEO}&amp;autostart={$AUTO_GVIDEO}&amp;advertise=1">
-<param name="movie" value="http://www.kewego.com/swf/p3/epix.swf?language_code=fr&amp;playerKey=0df9b773a15b&amp;skinKey=7109c4112f57&amp;sig={$ID_GVIDEO}&amp;autostart={$AUTO_GVIDEO}&amp;advertise=1" />
-<param name="allowFullScreen" value="true" />
-<param name="quality" value="high" />
-<param name="autostart" value="{$AUTO_GVIDEO}" />
-<param name="wmode" value="Window" />
-</object>
-</div>
Index: tensions/gvideo/template/pywaie_ytube.tpl
===================================================================
--- /extensions/gvideo/template/pywaie_ytube.tpl	(revision 17306)
+++ 	(revision )
@@ -1,7 +1,0 @@
-{* pywaie_ytube.tpl *}
-<br />
-<object width="{$WIDTH_IMG}" height="{$HEIGHT_IMG}">
-<param name="movie" value="http://www.youtube.com/v/{$ID_GVIDEO}&autoplay={$AUTO_GVIDEO}&fs=1&rel=0"></param>
-<param name="allowFullScreen" value="true"></param>
-<embed src="http://www.youtube.com/v/{$ID_GVIDEO}&autoplay={$AUTO_GVIDEO}&fs=1&rel=0" type="application/x-shockwave-flash" allowfullscreen="true" width="{$WIDTH_IMG}" height="{$HEIGHT_IMG}"></embed>
-</object>
Index: /extensions/gvideo/template/video_dailymotion.tpl
===================================================================
--- /extensions/gvideo/template/video_dailymotion.tpl	(revision 17307)
+++ /extensions/gvideo/template/video_dailymotion.tpl	(revision 17307)
@@ -0,0 +1,2 @@
+<iframe src="http://www.dailymotion.com/embed/video/{$GVIDEO.video_id}?autoplay={$GVIDEO.autoplay}&amp;info={$GVIDEO.config.dailymotion.title}&amp;logo={$GVIDEO.config.dailymotion.logo}&amp;{$GVIDEO.config.dailymotion.color}" 
+  width="{$GVIDEO.width}" height="{$GVIDEO.height}" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>
Index: /extensions/gvideo/template/video_videobb.tpl
===================================================================
--- /extensions/gvideo/template/video_videobb.tpl	(revision 17307)
+++ /extensions/gvideo/template/video_videobb.tpl	(revision 17307)
@@ -0,0 +1,6 @@
+<object id="player" width="{$GVIDEO.width}" height="{$GVIDEO.height}" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000">
+  <param name="movie" value="http://www.videobb.com/e/{$GVIDEO.video_id}"></param>
+  <param name="allowFullScreen" value="true"></param>
+  <param name="allowscriptaccess" value="always"></param>
+  <embed src="http://www.videobb.com/e/{$GVIDEO.video_id}" type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true" width="{$GVIDEO.width}" height="{$GVIDEO.height}"></embed>
+</object>
Index: /extensions/gvideo/template/video_vimeo.tpl
===================================================================
--- /extensions/gvideo/template/video_vimeo.tpl	(revision 17307)
+++ /extensions/gvideo/template/video_vimeo.tpl	(revision 17307)
@@ -0,0 +1,2 @@
+<iframe src="http://player.vimeo.com/video/{$GVIDEO.video_id}?autoplay={$GVIDEO.autoplay}&amp;title={$GVIDEO.config.vimeo.title}&amp;portrait={$GVIDEO.config.vimeo.portrait}&amp;byline={$GVIDEO.config.vimeo.byline}&amp;color={$GVIDEO.config.vimeo.color}" 
+  width="{$GVIDEO.width}" height="{$GVIDEO.height}" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>
Index: /extensions/gvideo/template/video_wat.tpl
===================================================================
--- /extensions/gvideo/template/video_wat.tpl	(revision 17307)
+++ /extensions/gvideo/template/video_wat.tpl	(revision 17307)
@@ -0,0 +1,1 @@
+<iframe src="http://www.wat.tv/embedframe/{$GVIDEO.video_id}?autoStart={$GVIDEO.autoplay}" width="{$GVIDEO.width}" height="{$GVIDEO.height}" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowfullscreen></iframe>
Index: /extensions/gvideo/template/video_wideo.tpl
===================================================================
--- /extensions/gvideo/template/video_wideo.tpl	(revision 17307)
+++ /extensions/gvideo/template/video_wideo.tpl	(revision 17307)
@@ -0,0 +1,12 @@
+<object width="{$GVIDEO.width}" height="{$GVIDEO.height}" type="application/x-shockwave-flash" data="http://sa.kewego.com/swf/kp.swf" name="kplayer_{$GVIDEO.video_id}" id="kplayer_{$GVIDEO.video_id}">
+  <param name="bgcolor" value="0x000000"/>
+	<param name="allowfullscreen" value="true"/>
+	<param name="allowscriptaccess" value="always"/>
+	<param name="flashVars" value="playerKey=0df9b773a15b&configKey=&suffix=&sig={$GVIDEO.video_id}&autostart={$GVIDEO.autoplay}"/>
+  <param name="movie" value="http://sa.kewego.com/swf/kp.swf"/>
+  <param name="wmode" value="opaque"/>
+  <param name="SeamlessTabbing" value="false"/>
+  <video poster="http://api.kewego.com/video/getHTML5Thumbnail/?playerKey=0df9b773a15b&sig={$GVIDEO.video_id}" height="{$GVIDEO.width}" width="{$GVIDEO.height}" preload="none" controls="controls"></video>
+  <script src="http://sa.kewego.com/embed/assets/kplayer-standalone.js"></script>
+  <script defer="defer">kitd.html5loader("flash_kplayer_{$GVIDEO.video_id}");</script>
+</object>
Index: /extensions/gvideo/template/video_youtube.tpl
===================================================================
--- /extensions/gvideo/template/video_youtube.tpl	(revision 17307)
+++ /extensions/gvideo/template/video_youtube.tpl	(revision 17307)
@@ -0,0 +1,1 @@
+<iframe src="http://www.youtube.com/embed/{$GVIDEO.video_id}?autoplay={$GVIDEO.autoplay}" width="{$GVIDEO.width}" height="{$GVIDEO.height}" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowfullscreen></iframe>
