Image Watermark - Version 1.1.1

Version Description

  • New: Added option to enable or disable manual watermarking in Media Library
  • Fix: Apply watermark option not visible in Media Library actions
  • Fix: Warning on full size images
Download this release

Release Info

Developer dfactory
Plugin Icon 128x128 Image Watermark
Version 1.1.1
Comparing to
See all releases

Code changes from version 1.1.0 to 1.1.1

css/{style.css → image-watermark.css} RENAMED
File without changes
image-watermark.php CHANGED
@@ -2,7 +2,7 @@
2
  /*
3
  Plugin Name: Image Watermark
4
  Description: Image Watermark allows you to automatically watermark images uploaded to the WordPress Media Library.
5
- Version: 1.1.0
6
  Author: dFactory
7
  Author URI: http://www.dfactory.eu/
8
  Plugin URI: http://www.dfactory.eu/plugins/image-watermark/
@@ -46,7 +46,8 @@ class ImageWatermark
46
  'df_watermark_image' => array(
47
  'url' => 0,
48
  'width' => 80,
49
- 'plugin_off' => 1,
 
50
  'position' => 'bottom_right',
51
  'watermark_size_type' => 2,
52
  'offset_width' => 0,
@@ -96,8 +97,11 @@ class ImageWatermark
96
  $opt = get_option('df_watermark_image');
97
  $wp_list_table = _get_list_table('WP_Media_List_Table');
98
 
99
- //only if image watermark is turned on
100
- if($wp_list_table->current_action() === 'applywatermark' && $opt['plugin_off'] === 0 && $opt['url'] !== 0)
 
 
 
101
  {
102
  //security check
103
  check_admin_referer('bulk-media');
@@ -109,11 +113,10 @@ class ImageWatermark
109
 
110
  foreach($_REQUEST['media'] as $media_id)
111
  {
112
- $upload_dir = wp_upload_dir();
113
  $data = wp_get_attachment_metadata($media_id, FALSE);
114
 
115
  //is this really an image?
116
- if(in_array(get_post_mime_type($media_id), $this->_allowed_mime_types) && is_array($data) && getimagesize($upload_dir['basedir'].DIRECTORY_SEPARATOR.$data['file']) !== FALSE)
117
  {
118
  $this->apply_watermark($data);
119
  $watermarked++;
@@ -138,10 +141,11 @@ class ImageWatermark
138
 
139
  if($pagenow === 'upload.php' && $post_type === 'attachment' && isset($_REQUEST['watermarked']))
140
  {
141
- if ($_REQUEST['watermarked'] == 0)
142
  {
143
  echo '<div class="error"><p>'.__('Watermark couldn\'t be applied to selected images or no images were selected.', 'image-watermark').'</p></div>';
144
- } elseif ($_REQUEST['watermarked'] > 0)
 
145
  {
146
  echo '<div class="updated"><p>'.sprintf(_n('Watermark was succesfully applied to 1 image.', 'Watermark was succesfully applied to %s images.', (int)$_REQUEST['watermarked'], 'image-watermark'), number_format_i18n((int)$_REQUEST['watermarked'])).'</p></div>';
147
  }
@@ -168,14 +172,13 @@ class ImageWatermark
168
  {
169
  $option_wi = get_option('df_watermark_image');
170
 
171
- //if plugin is activated and turned on and watermark image is set and uploaded file is an image
172
  if($option_wi['plugin_off'] === 0 && $option_wi['url'] !== 0 && isset($_REQUEST['post_id']) && in_array($file['type'], $this->_allowed_mime_types))
173
  {
174
  $option = get_option('df_watermark_cpt_on');
175
- $upload_dir = wp_upload_dir();
176
 
177
  //when apply watermark? everywhere or specific custom post types
178
- if(((isset($option[0], $_REQUEST['name']) && $option[0] === 'everywhere') || in_array(get_post_type($_REQUEST['post_id']), array_keys($option)) === TRUE) && getimagesize($upload_dir['path'].DIRECTORY_SEPARATOR.$_REQUEST['name']) !== FALSE)
179
  {
180
  add_filter('wp_generate_attachment_metadata', array(&$this, 'apply_watermark'));
181
  }
@@ -247,7 +250,10 @@ class ImageWatermark
247
  {
248
  $opt = get_option('df_watermark_image');
249
 
250
- if($opt['plugin_off'] === 0 && $opt['url'] !== 0)
 
 
 
251
  {
252
  wp_enqueue_script(
253
  'apply-watermark',
@@ -291,6 +297,7 @@ class ImageWatermark
291
  'title' => __('Select watermark', 'image-watermark'),
292
  'originalSize' => __('Original size', 'image-watermark'),
293
  'noSelectedImg' => __('Watermak has not been selected yet.', 'image-watermark'),
 
294
  'frame' => 'select',
295
  'button' => array('text' => __('Add watermark', 'image-watermark')),
296
  'multiple' => FALSE,
@@ -298,7 +305,7 @@ class ImageWatermark
298
  );
299
 
300
  wp_enqueue_style('thickbox');
301
- wp_enqueue_style('watermark-style', plugins_url('css/style.css', __FILE__));
302
  wp_enqueue_style('wp-like-ui-theme', plugins_url('css/wp-like-ui-theme.css', __FILE__));
303
  }
304
  }
@@ -437,6 +444,7 @@ class ImageWatermark
437
  break;
438
 
439
  case 'plugin_off':
 
440
  case 'offset_width':
441
  case 'offset_height':
442
  case 'absolute_width':
@@ -499,7 +507,10 @@ class ImageWatermark
499
  $watermark_image = get_option('df_watermark_image');
500
  $image_protection = get_option('df_image_protection');
501
 
502
- if($watermark_image['plugin_off'] === 0 && $watermark_image['url'] === 0)
 
 
 
503
  {
504
  echo '
505
  <div class="error">
@@ -516,10 +527,9 @@ class ImageWatermark
516
  <h3><?php echo __('General settings', 'image-watermark'); ?></h3>
517
  <table id="watermark-general-table" class="form-table">
518
  <tr valign="top">
519
- <th scope="row"><?php echo __('Enable watermark', 'image-watermark'); ?></th>
520
  <td class="wr_width">
521
  <fieldset class="wr_width">
522
- <legend class="screen-reader-text"><span><?php echo __('Width', 'image-watermark'); ?></span></legend>
523
  <div id="run-watermark">
524
  <label for="plugin_on"><?php echo __('on', 'image-watermark'); ?></label>
525
  <input type="radio" id="plugin_on" value="0" name="df_watermark_image[plugin_off]" <?php checked($watermark_image['plugin_off'], 0, TRUE); ?> />
@@ -530,13 +540,28 @@ class ImageWatermark
530
  </fieldset>
531
  </td>
532
  </tr>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
533
  </table>
534
  <table id="watermark-for-table" class="form-table">
535
  <tr valign="top">
536
  <th scope="row"><?php echo __('Enable watermark for', 'image-watermark'); ?></th>
537
  <td class="wr_width">
538
  <fieldset class="wr_width">
539
- <legend class="screen-reader-text"><span><?php echo __('Enable watermark for', 'image-watermark'); ?></span></legend>
540
  <?php $watermark_on = array_keys(get_option('df_watermark_on')); ?>
541
  <div id="thumbnail-select">
542
  <?php foreach($this->_image_sizes as $image_size) : ?>
@@ -545,7 +570,6 @@ class ImageWatermark
545
  <?php endforeach; ?>
546
  </div>
547
  <p class="howto"><?php echo __('Check image sizes on which watermark should appear.', 'image-watermark'); ?></p>
548
- <legend class="screen-reader-text"><span><?php echo __('Enable watermark for', 'image-watermark'); ?></span></legend>
549
  <?php $watermark_cpt_on = array_keys(get_option('df_watermark_cpt_on'));
550
  if(in_array('everywhere', $watermark_cpt_on) && count($watermark_cpt_on) === 1)
551
  { $first_checked = TRUE; $second_checked = FALSE; $watermark_cpt_on = array(); }
@@ -572,7 +596,6 @@ class ImageWatermark
572
  <th scope="row"><?php echo __('Watermark alignment','image-watermark'); ?></th>
573
  <td>
574
  <fieldset>
575
- <legend class="screen-reader-text"><span><?php __('Watermark alignment','image-watermark'); ?></span></legend>
576
  <table id="watermark_position" border="1">
577
  <?php $watermark_position = $watermark_image['position']; ?>
578
  <?php foreach($this->_watermark_positions['y'] as $y) : ?>
@@ -593,7 +616,6 @@ class ImageWatermark
593
  <th scope="row"><?php echo __('Watermark offset','image-watermark'); ?></th>
594
  <td>
595
  <fieldset>
596
- <legend class="screen-reader-text"><span><?php echo __('Watermark offset','image-watermark'); ?></span></legend>
597
  <?php echo __('x:','image-watermark'); ?> <input type="text" size="5" name="df_watermark_image[offset_width]" value="<?php echo $watermark_image['offset_width']; ?>"> <?php echo __('px','image-watermark'); ?>
598
  <br />
599
  <?php echo __('y:','image-watermark'); ?> <input type="text" size="5" name="df_watermark_image[offset_height]" value="<?php echo $watermark_image['offset_height']; ?>"> <?php echo __('px','image-watermark'); ?>
@@ -628,7 +650,6 @@ class ImageWatermark
628
  <th scope="row"><?php echo __('Watermark preview', 'image-watermark'); ?></th>
629
  <td class="wr_width">
630
  <fieldset class="wr_width">
631
- <legend class="screen-reader-text"><span><?php echo __('Watermark Preview', 'image-watermark'); ?></span></legend>
632
  <div id="previewImg_imageDiv">
633
  <?php if($imageSelected === TRUE) {
634
  $image = wp_get_attachment_image_src($watermark_image['url'], array(300, 300), FALSE);
@@ -659,7 +680,6 @@ class ImageWatermark
659
  <th scope="row"><?php echo __('Watermark size', 'image-watermark'); ?></th>
660
  <td class="wr_width">
661
  <fieldset class="wr_width">
662
- <legend class="screen-reader-text"><span><?php echo __('Width', 'image-watermark'); ?></span></legend>
663
  <div id="watermark-type">
664
  <label for="type1"><?php echo __('original', 'image-watermark'); ?></label>
665
  <input type="radio" id="type1" value="0" name="df_watermark_image[watermark_size_type]" <?php checked($watermark_image['watermark_size_type'], 0, TRUE); ?> />
@@ -676,7 +696,6 @@ class ImageWatermark
676
  <th scope="row"><?php echo __('Watermark custom size', 'image-watermark'); ?></th>
677
  <td class="wr_width">
678
  <fieldset class="wr_width">
679
- <legend class="screen-reader-text"><span><?php echo __('Width', 'image-watermark'); ?></span></legend>
680
  <?php echo __('x:', 'image-watermark'); ?> <input type="text" size="5" name="df_watermark_image[absolute_width]" value="<?php echo $watermark_image['absolute_width']; ?>"> <?php echo __('px', 'image-watermark'); ?>
681
  <br />
682
  <?php echo __('y:', 'image-watermark'); ?> <input type="text" size="5" name="df_watermark_image[absolute_height]" value="<?php echo $watermark_image['absolute_height']; ?>"> <?php echo __('px','image-watermark'); ?>
@@ -688,7 +707,6 @@ class ImageWatermark
688
  <th scope="row"><?php echo __('Scale of watermark in relation to image width', 'image-watermark'); ?></th>
689
  <td class="wr_width">
690
  <fieldset class="wr_width">
691
- <legend class="screen-reader-text"><span><?php echo __('Width', 'image-watermark'); ?></span></legend>
692
  <input type="text" size="5" name="df_watermark_image[width]" value="<?php echo $watermark_image['width']; ?>">%
693
  </fieldset>
694
  <p class="howto"><?php echo __('This value will be used if "scaled" method if selected above. <br />Enter a number ranging from 0 to 100. 100 makes width of watermark image equal to width of the image it is applied to.','image-watermark'); ?></p>
@@ -774,35 +792,40 @@ class ImageWatermark
774
  */
775
  public function apply_watermark($data)
776
  {
777
- //get settings for watermarking
778
  $upload_dir = wp_upload_dir();
779
- $watermark_on = get_option('df_watermark_on');
780
 
781
- //loop through active image sizes
782
- foreach($watermark_on as $image_size => $active_size)
783
  {
784
- if($active_size === 1)
 
 
 
 
785
  {
786
- switch($image_size)
787
  {
788
- case 'full':
789
- $filepath = $upload_dir['basedir'].DIRECTORY_SEPARATOR.$data['file'];
790
- break;
 
 
791
 
792
- default:
793
- if(!empty($data['sizes']) && array_key_exists($image_size, $data['sizes']))
794
- {
795
- $filepath = $upload_dir['basedir'].DIRECTORY_SEPARATOR.dirname($data['file']).DIRECTORY_SEPARATOR.$data['sizes'][$image_size]['file'];
796
- }
797
- else
798
- {
799
- //early getaway
800
- continue 2;
801
- }
802
- }
803
 
804
- //apply watermark
805
- $this->do_watermark($filepath);
 
806
  }
807
  }
808
 
2
  /*
3
  Plugin Name: Image Watermark
4
  Description: Image Watermark allows you to automatically watermark images uploaded to the WordPress Media Library.
5
+ Version: 1.1.1
6
  Author: dFactory
7
  Author URI: http://www.dfactory.eu/
8
  Plugin URI: http://www.dfactory.eu/plugins/image-watermark/
46
  'df_watermark_image' => array(
47
  'url' => 0,
48
  'width' => 80,
49
+ 'plugin_off' => 0,
50
+ 'manual_watermarking' => 0,
51
  'position' => 'bottom_right',
52
  'watermark_size_type' => 2,
53
  'offset_width' => 0,
97
  $opt = get_option('df_watermark_image');
98
  $wp_list_table = _get_list_table('WP_Media_List_Table');
99
 
100
+ //update-fix from 1.1.0 to later versions
101
+ $opt['manual_watermarking'] = (isset($opt['manual_watermarking']) ? $opt['manual_watermarking'] : $this->_options['df_watermark_image']['manual_watermarking']);
102
+
103
+ //only if manual watermarking is turned on and image watermark is set
104
+ if($wp_list_table->current_action() === 'applywatermark' && $opt['manual_watermarking'] === 1 && $opt['url'] !== 0)
105
  {
106
  //security check
107
  check_admin_referer('bulk-media');
113
 
114
  foreach($_REQUEST['media'] as $media_id)
115
  {
 
116
  $data = wp_get_attachment_metadata($media_id, FALSE);
117
 
118
  //is this really an image?
119
+ if(in_array(get_post_mime_type($media_id), $this->_allowed_mime_types) && is_array($data))
120
  {
121
  $this->apply_watermark($data);
122
  $watermarked++;
141
 
142
  if($pagenow === 'upload.php' && $post_type === 'attachment' && isset($_REQUEST['watermarked']))
143
  {
144
+ if($_REQUEST['watermarked'] === 0)
145
  {
146
  echo '<div class="error"><p>'.__('Watermark couldn\'t be applied to selected images or no images were selected.', 'image-watermark').'</p></div>';
147
+ }
148
+ elseif($_REQUEST['watermarked'] > 0)
149
  {
150
  echo '<div class="updated"><p>'.sprintf(_n('Watermark was succesfully applied to 1 image.', 'Watermark was succesfully applied to %s images.', (int)$_REQUEST['watermarked'], 'image-watermark'), number_format_i18n((int)$_REQUEST['watermarked'])).'</p></div>';
151
  }
172
  {
173
  $option_wi = get_option('df_watermark_image');
174
 
175
+ //if plugin is activated and turned on and watermark image is set
176
  if($option_wi['plugin_off'] === 0 && $option_wi['url'] !== 0 && isset($_REQUEST['post_id']) && in_array($file['type'], $this->_allowed_mime_types))
177
  {
178
  $option = get_option('df_watermark_cpt_on');
 
179
 
180
  //when apply watermark? everywhere or specific custom post types
181
+ if(((isset($option[0], $_REQUEST['name']) && $option[0] === 'everywhere') || in_array(get_post_type($_REQUEST['post_id']), array_keys($option)) === TRUE))
182
  {
183
  add_filter('wp_generate_attachment_metadata', array(&$this, 'apply_watermark'));
184
  }
250
  {
251
  $opt = get_option('df_watermark_image');
252
 
253
+ //update-fix from 1.1.0 to later versions
254
+ $opt['manual_watermarking'] = (isset($opt['manual_watermarking']) ? $opt['manual_watermarking'] : $this->_options['df_watermark_image']['manual_watermarking']);
255
+
256
+ if($opt['manual_watermarking'] === 1)
257
  {
258
  wp_enqueue_script(
259
  'apply-watermark',
297
  'title' => __('Select watermark', 'image-watermark'),
298
  'originalSize' => __('Original size', 'image-watermark'),
299
  'noSelectedImg' => __('Watermak has not been selected yet.', 'image-watermark'),
300
+ 'notAllowedImg' => __('This image is not supported as watermark. Use JPEG, PNG or GIF.', 'image-watermark'),
301
  'frame' => 'select',
302
  'button' => array('text' => __('Add watermark', 'image-watermark')),
303
  'multiple' => FALSE,
305
  );
306
 
307
  wp_enqueue_style('thickbox');
308
+ wp_enqueue_style('watermark-style', plugins_url('css/image-watermark.css', __FILE__));
309
  wp_enqueue_style('wp-like-ui-theme', plugins_url('css/wp-like-ui-theme.css', __FILE__));
310
  }
311
  }
444
  break;
445
 
446
  case 'plugin_off':
447
+ case 'manual_watermarking':
448
  case 'offset_width':
449
  case 'offset_height':
450
  case 'absolute_width':
507
  $watermark_image = get_option('df_watermark_image');
508
  $image_protection = get_option('df_image_protection');
509
 
510
+ //update-fix from 1.1.0 to later versions
511
+ $watermark_image['manual_watermarking'] = (isset($watermark_image['manual_watermarking']) ? $watermark_image['manual_watermarking'] : $this->_options['df_watermark_image']['manual_watermarking']);
512
+
513
+ if(($watermark_image['plugin_off'] === 0 || $watermark_image['manual_watermarking'] === 1) && $watermark_image['url'] === 0)
514
  {
515
  echo '
516
  <div class="error">
527
  <h3><?php echo __('General settings', 'image-watermark'); ?></h3>
528
  <table id="watermark-general-table" class="form-table">
529
  <tr valign="top">
530
+ <th scope="row"><?php echo __('Automatic watermarking', 'image-watermark'); ?></th>
531
  <td class="wr_width">
532
  <fieldset class="wr_width">
 
533
  <div id="run-watermark">
534
  <label for="plugin_on"><?php echo __('on', 'image-watermark'); ?></label>
535
  <input type="radio" id="plugin_on" value="0" name="df_watermark_image[plugin_off]" <?php checked($watermark_image['plugin_off'], 0, TRUE); ?> />
540
  </fieldset>
541
  </td>
542
  </tr>
543
+ </table>
544
+ <table id="watermark-manual-table" class="form-table">
545
+ <tr valign="top">
546
+ <th scope="row"><?php echo __('Manual watermarking', 'image-watermark'); ?></th>
547
+ <td class="wr_width">
548
+ <fieldset class="wr_width">
549
+ <div id="run-manual-watermark">
550
+ <label for="manual_watermarking_on"><?php echo __('on', 'image-watermark'); ?></label>
551
+ <input type="radio" id="manual_watermarking_on" value="1" name="df_watermark_image[manual_watermarking]" <?php checked($watermark_image['manual_watermarking'], 1, TRUE); ?> />
552
+ <label for="manual_watermarking_off"><?php echo __('off', 'image-watermark'); ?></label>
553
+ <input type="radio" id="manual_watermarking_off" value="0" name="df_watermark_image[manual_watermarking]" <?php checked($watermark_image['manual_watermarking'], 0, TRUE); ?> />
554
+ </div>
555
+ <p class="howto"><?php echo __('Enable or disable Apply Watermark option for images in Media Library.', 'image-watermark'); ?></p>
556
+ </fieldset>
557
+ </td>
558
+ </tr>
559
  </table>
560
  <table id="watermark-for-table" class="form-table">
561
  <tr valign="top">
562
  <th scope="row"><?php echo __('Enable watermark for', 'image-watermark'); ?></th>
563
  <td class="wr_width">
564
  <fieldset class="wr_width">
 
565
  <?php $watermark_on = array_keys(get_option('df_watermark_on')); ?>
566
  <div id="thumbnail-select">
567
  <?php foreach($this->_image_sizes as $image_size) : ?>
570
  <?php endforeach; ?>
571
  </div>
572
  <p class="howto"><?php echo __('Check image sizes on which watermark should appear.', 'image-watermark'); ?></p>
 
573
  <?php $watermark_cpt_on = array_keys(get_option('df_watermark_cpt_on'));
574
  if(in_array('everywhere', $watermark_cpt_on) && count($watermark_cpt_on) === 1)
575
  { $first_checked = TRUE; $second_checked = FALSE; $watermark_cpt_on = array(); }
596
  <th scope="row"><?php echo __('Watermark alignment','image-watermark'); ?></th>
597
  <td>
598
  <fieldset>
 
599
  <table id="watermark_position" border="1">
600
  <?php $watermark_position = $watermark_image['position']; ?>
601
  <?php foreach($this->_watermark_positions['y'] as $y) : ?>
616
  <th scope="row"><?php echo __('Watermark offset','image-watermark'); ?></th>
617
  <td>
618
  <fieldset>
 
619
  <?php echo __('x:','image-watermark'); ?> <input type="text" size="5" name="df_watermark_image[offset_width]" value="<?php echo $watermark_image['offset_width']; ?>"> <?php echo __('px','image-watermark'); ?>
620
  <br />
621
  <?php echo __('y:','image-watermark'); ?> <input type="text" size="5" name="df_watermark_image[offset_height]" value="<?php echo $watermark_image['offset_height']; ?>"> <?php echo __('px','image-watermark'); ?>
650
  <th scope="row"><?php echo __('Watermark preview', 'image-watermark'); ?></th>
651
  <td class="wr_width">
652
  <fieldset class="wr_width">
 
653
  <div id="previewImg_imageDiv">
654
  <?php if($imageSelected === TRUE) {
655
  $image = wp_get_attachment_image_src($watermark_image['url'], array(300, 300), FALSE);
680
  <th scope="row"><?php echo __('Watermark size', 'image-watermark'); ?></th>
681
  <td class="wr_width">
682
  <fieldset class="wr_width">
 
683
  <div id="watermark-type">
684
  <label for="type1"><?php echo __('original', 'image-watermark'); ?></label>
685
  <input type="radio" id="type1" value="0" name="df_watermark_image[watermark_size_type]" <?php checked($watermark_image['watermark_size_type'], 0, TRUE); ?> />
696
  <th scope="row"><?php echo __('Watermark custom size', 'image-watermark'); ?></th>
697
  <td class="wr_width">
698
  <fieldset class="wr_width">
 
699
  <?php echo __('x:', 'image-watermark'); ?> <input type="text" size="5" name="df_watermark_image[absolute_width]" value="<?php echo $watermark_image['absolute_width']; ?>"> <?php echo __('px', 'image-watermark'); ?>
700
  <br />
701
  <?php echo __('y:', 'image-watermark'); ?> <input type="text" size="5" name="df_watermark_image[absolute_height]" value="<?php echo $watermark_image['absolute_height']; ?>"> <?php echo __('px','image-watermark'); ?>
707
  <th scope="row"><?php echo __('Scale of watermark in relation to image width', 'image-watermark'); ?></th>
708
  <td class="wr_width">
709
  <fieldset class="wr_width">
 
710
  <input type="text" size="5" name="df_watermark_image[width]" value="<?php echo $watermark_image['width']; ?>">%
711
  </fieldset>
712
  <p class="howto"><?php echo __('This value will be used if "scaled" method if selected above. <br />Enter a number ranging from 0 to 100. 100 makes width of watermark image equal to width of the image it is applied to.','image-watermark'); ?></p>
792
  */
793
  public function apply_watermark($data)
794
  {
 
795
  $upload_dir = wp_upload_dir();
 
796
 
797
+ //is this really an iamge?
798
+ if(getimagesize($upload_dir['basedir'].DIRECTORY_SEPARATOR.$data['file']) !== FALSE)
799
  {
800
+ //get settings for watermarking
801
+ $watermark_on = get_option('df_watermark_on');
802
+
803
+ //loop through active image sizes
804
+ foreach($watermark_on as $image_size => $active_size)
805
  {
806
+ if($active_size === 1)
807
  {
808
+ switch($image_size)
809
+ {
810
+ case 'full':
811
+ $filepath = $upload_dir['basedir'].DIRECTORY_SEPARATOR.$data['file'];
812
+ break;
813
 
814
+ default:
815
+ if(!empty($data['sizes']) && array_key_exists($image_size, $data['sizes']))
816
+ {
817
+ $filepath = $upload_dir['basedir'].DIRECTORY_SEPARATOR.dirname($data['file']).DIRECTORY_SEPARATOR.$data['sizes'][$image_size]['file'];
818
+ }
819
+ else
820
+ {
821
+ //early getaway
822
+ continue 2;
823
+ }
824
+ }
825
 
826
+ //apply watermark
827
+ $this->do_watermark($filepath);
828
+ }
829
  }
830
  }
831
 
js/admin.js CHANGED
@@ -9,10 +9,10 @@
9
  );
10
 
11
  // Button
12
- $("#divButton, #linkButton, #submitButton, #inputButton").button();
13
 
14
  // Button Set
15
- $("#run-watermark, #thumbnail-select, #watermark-type, #cpt-select, #cpt-specific").buttonset();
16
 
17
  $('#df_option_everywhere, #df_option_cpt').change(function()
18
  {
9
  );
10
 
11
  // Button
12
+ $('#divButton, #linkButton, #submitButton, #inputButton').button();
13
 
14
  // Button Set
15
+ $('#run-watermark, #thumbnail-select, #watermark-type, #cpt-select, #cpt-specific, #run-manual-watermark').buttonset();
16
 
17
  $('#df_option_everywhere, #df_option_cpt').change(function()
18
  {
js/apply-watermark.js ADDED
@@ -0,0 +1,4 @@
 
 
 
 
1
+ jQuery(document).ready(function($) {
2
+ jQuery('<option>').val('applywatermark').text(watermark_args.apply_watermark).appendTo("select[name='action']");
3
+ jQuery('<option>').val('applywatermark').text(watermark_args.apply_watermark).appendTo("select[name='action2']");
4
+ });
js/upload-manager.js CHANGED
@@ -10,7 +10,7 @@ jQuery(document).ready(function($) {
10
  button: upload_manager_args.button,
11
  multiple: upload_manager_args.multiple,
12
  library: {
13
- type: ['image/gif', 'image/jpg', 'image/jpeg', 'image/png']
14
  }
15
  });
16
 
@@ -19,26 +19,37 @@ jQuery(document).ready(function($) {
19
  },
20
  select: function() {
21
  var attachment = this.frame.state().get('selection').first();
22
- $('#upload_image').val(attachment.attributes.id);
23
 
24
- if($('div#previewImg_imageDiv img#previewImg_image').attr('src') !== '')
25
  {
26
- $('div#previewImg_imageDiv img#previewImg_image').replaceWith('<img id="previewImg_image" src="'+attachment.attributes.url+'" alt="" width="300" />');
27
- }
28
- else
29
- {
30
- $('div#previewImg_imageDiv img#previewImg_image').attr('src', attachment.attributes.url);
31
- }
 
 
 
 
32
 
33
- $('#turn_off_image_button').removeAttr('disabled');
34
- $('div#previewImg_imageDiv img#previewImg_image').show();
35
 
36
- var img = new Image();
37
- img.src = attachment.attributes.url;
38
 
39
- img.onload = function()
 
 
 
 
 
40
  {
41
- $('p#previewImageInfo').html(upload_manager_args.originalSize+': <strong>'+this.width+'</strong>px / <strong>'+this.height+'</strong>px');
 
 
 
42
  }
43
  },
44
  init: function() {
10
  button: upload_manager_args.button,
11
  multiple: upload_manager_args.multiple,
12
  library: {
13
+ type: 'image'
14
  }
15
  });
16
 
19
  },
20
  select: function() {
21
  var attachment = this.frame.state().get('selection').first();
 
22
 
23
+ if(jQuery.inArray(attachment.attributes.mime, ['image/gif', 'image/jpg', 'image/jpeg', 'image/png']) !== -1)
24
  {
25
+ $('#upload_image').val(attachment.attributes.id);
26
+
27
+ if($('div#previewImg_imageDiv img#previewImg_image').attr('src') !== '')
28
+ {
29
+ $('div#previewImg_imageDiv img#previewImg_image').replaceWith('<img id="previewImg_image" src="'+attachment.attributes.url+'" alt="" width="300" />');
30
+ }
31
+ else
32
+ {
33
+ $('div#previewImg_imageDiv img#previewImg_image').attr('src', attachment.attributes.url);
34
+ }
35
 
36
+ $('#turn_off_image_button').removeAttr('disabled');
37
+ $('div#previewImg_imageDiv img#previewImg_image').show();
38
 
39
+ var img = new Image();
40
+ img.src = attachment.attributes.url;
41
 
42
+ img.onload = function()
43
+ {
44
+ $('p#previewImageInfo').html(upload_manager_args.originalSize+': '+this.width+' px / '+this.height+' px');
45
+ }
46
+ }
47
+ else
48
  {
49
+ $('#turn_off_image_button').attr('disabled', 'true');
50
+ $('#upload_image').val(0);
51
+ $('div#previewImg_imageDiv img#previewImg_image').attr('src', '').hide();
52
+ $('p#previewImageInfo').html('<strong>'+upload_manager_args.notAllowedImg+'</strong>');
53
  }
54
  },
55
  init: function() {
languages/image-watermark-pl_PL.mo CHANGED
Binary file
languages/image-watermark-pl_PL.po CHANGED
@@ -2,8 +2,8 @@ msgid ""
2
  msgstr ""
3
  "Project-Id-Version: WordPress Watermark\n"
4
  "Report-Msgid-Bugs-To: \n"
5
- "POT-Creation-Date: 2013-05-07 14:37+0100\n"
6
- "PO-Revision-Date: 2013-05-07 14:38+0100\n"
7
  "Last-Translator: Bartosz Arendt <info@digitalfactory.pl>\n"
8
  "Language-Team: Digital Factory <info@digitalfactory.pl>\n"
9
  "Language: pl_PL\n"
@@ -25,118 +25,125 @@ msgstr ""
25
  "Przykro nam, ale ta wtyczka wymaga PHP w wersji co najmniej 5.0 WordPressa w "
26
  "wersji 3.5 lub wyższej.."
27
 
28
- #: ../image-watermark.php:143
29
  msgid ""
30
  "Watermark couldn't be applied to selected images or no images were selected."
31
  msgstr ""
32
  "Znak wodny nie został został dodany do wybranych obrazków lub żaden obrazek "
33
  "nie został wybrany."
34
 
35
- #: ../image-watermark.php:146
36
  #, php-format
37
  msgid "Watermark was succesfully applied to 1 image."
38
  msgid_plural "Watermark was succesfully applied to %s images."
39
  msgstr[0] "Znak wodny został dodany do 1 obrazka."
40
  msgstr[1] "Znak wodny został dodany do %s obrazków."
41
 
42
- #: ../image-watermark.php:211
43
  msgid "Support"
44
  msgstr "Forum pomocy"
45
 
46
- #: ../image-watermark.php:233
47
  msgid "Settings"
48
  msgstr "Ustawienia"
49
 
50
- #: ../image-watermark.php:261
51
  msgid "Apply watermark"
52
  msgstr "Dodaj znak wodny"
53
 
54
- #: ../image-watermark.php:291
55
  msgid "Select watermark"
56
  msgstr "Wybierz znak wodny"
57
 
58
- #: ../image-watermark.php:292 ../image-watermark.php:651
59
  msgid "Original size"
60
  msgstr "Rozmiar oryginalny"
61
 
62
- #: ../image-watermark.php:293 ../image-watermark.php:645
63
  msgid "Watermak has not been selected yet."
64
  msgstr "Znak wodny nie został jeszcze wybrany."
65
 
66
- #: ../image-watermark.php:295
 
 
 
 
67
  msgid "Add watermark"
68
  msgstr "Dodaj znak wodny"
69
 
70
- #: ../image-watermark.php:337
71
  msgid "Image Watermark Options"
72
  msgstr "Ustawienia znaku wodnego"
73
 
74
- #: ../image-watermark.php:338
75
  msgid "Watermark"
76
  msgstr "Znak wodny"
77
 
78
- #: ../image-watermark.php:364
79
  msgid "Image Watermark will not work properly without GD PHP extension."
80
  msgstr ""
81
  "Znak wodny nie może funkcjonować bez zainstalowanego rozszerzenia GD PHP."
82
 
83
- #: ../image-watermark.php:495
84
  msgid "Settings saved."
85
  msgstr "Ustawienia zostały zapisane."
86
 
87
- #: ../image-watermark.php:506
88
  msgid "Watermarks will not be applied when <b>watermark image is not set</b>."
89
  msgstr ""
90
  "Znak wodny nie zostanie dodany ponieważ <b>nie wybrano obrazka dla znaku "
91
  "wodnego</b>."
92
 
93
- #: ../image-watermark.php:512
94
  msgid "Image Watermark Settings"
95
  msgstr "Ustawienia znaku wodnego"
96
 
97
- #: ../image-watermark.php:516
98
  msgid "General settings"
99
  msgstr "Ustawienia ogólne"
100
 
101
- #: ../image-watermark.php:519
102
- msgid "Enable watermark"
103
- msgstr "Włącz znak wodny"
104
 
105
- #: ../image-watermark.php:522 ../image-watermark.php:662
106
- #: ../image-watermark.php:679 ../image-watermark.php:691
107
- msgid "Width"
108
- msgstr "Szerokość"
109
-
110
- #: ../image-watermark.php:524
111
  msgid "on"
112
  msgstr "włączony"
113
 
114
- #: ../image-watermark.php:526
115
  msgid "off"
116
  msgstr "wyłączony"
117
 
118
- #: ../image-watermark.php:529
119
  msgid "Enable or disable watermark for uploaded images."
120
  msgstr "Włącz lub wyłącz dodawanie znaku wodnego do wgrywanych obrazków."
121
 
122
- #: ../image-watermark.php:536 ../image-watermark.php:539
123
- #: ../image-watermark.php:548
 
 
 
 
 
 
 
 
124
  msgid "Enable watermark for"
125
  msgstr "Dodawaj znak wodny do"
126
 
127
- #: ../image-watermark.php:547
128
  msgid "Check image sizes on which watermark should appear."
129
  msgstr "Zaznacz wielkości obrazków dla których ma być dodawany znak wodny."
130
 
131
- #: ../image-watermark.php:554
132
  msgid "everywhere"
133
  msgstr "wszędzie"
134
 
135
- #: ../image-watermark.php:555
136
  msgid "on selected post types only"
137
  msgstr "na wybranych typach wpisów"
138
 
139
- #: ../image-watermark.php:563
140
  msgid ""
141
  "Check custom post types on which watermark should be applied to uploaded "
142
  "images."
@@ -144,101 +151,97 @@ msgstr ""
144
  "Zaznacz własne typy wpisów w których znak wodny będzie dodawany do "
145
  "wgrywanych obrazków."
146
 
147
- #: ../image-watermark.php:569
148
  msgid "Watermark position"
149
  msgstr "Pozycja znaku wodnego"
150
 
151
- #: ../image-watermark.php:572 ../image-watermark.php:575
152
  msgid "Watermark alignment"
153
  msgstr "Wyrównanie znaku wodnego"
154
 
155
- #: ../image-watermark.php:588
156
  msgid "Choose the position of watermark image."
157
  msgstr "Wybierz pozycję znaku wodnego na obrazkach"
158
 
159
- #: ../image-watermark.php:593 ../image-watermark.php:596
160
  msgid "Watermark offset"
161
  msgstr "Korekcja pozycji"
162
 
163
- #: ../image-watermark.php:597 ../image-watermark.php:680
164
  msgid "x:"
165
  msgstr "x:"
166
 
167
- #: ../image-watermark.php:597 ../image-watermark.php:599
168
- #: ../image-watermark.php:680 ../image-watermark.php:682
169
  msgid "px"
170
  msgstr "pikseli"
171
 
172
- #: ../image-watermark.php:599 ../image-watermark.php:682
173
  msgid "y:"
174
  msgstr "y:"
175
 
176
- #: ../image-watermark.php:615 ../image-watermark.php:619
177
  msgid "Watermark image"
178
  msgstr "Obrazek znaku wodnego"
179
 
180
- #: ../image-watermark.php:616
181
  msgid ""
182
  "Configure your watermark image. Allowed file formats are: JPEG, PNG, GIF."
183
  msgstr ""
184
  "Skonfiguruj obrazek znaku wodnego. Dozwolone formaty plików to: JPEG, PNG, "
185
  "GIF."
186
 
187
- #: ../image-watermark.php:622
188
  msgid "Select image"
189
  msgstr "Wybierz obrazek"
190
 
191
- #: ../image-watermark.php:623
192
  msgid "Turn off image"
193
  msgstr "Wyłącz obrazek"
194
 
195
- #: ../image-watermark.php:624
196
  msgid "You have to save changes after the selection or removal of the image."
197
  msgstr "Po zapisaniu zmian lub wybraniu obrazka powienieneś zapisać zmiany."
198
 
199
- #: ../image-watermark.php:628
200
  msgid "Watermark preview"
201
  msgstr "Podgląd obrazka"
202
 
203
- #: ../image-watermark.php:631
204
- msgid "Watermark Preview"
205
- msgstr "Podgląd obrazka"
206
-
207
- #: ../image-watermark.php:659
208
  msgid "Watermark size"
209
  msgstr "Wielkość znaku wodnego"
210
 
211
- #: ../image-watermark.php:664
212
  msgid "original"
213
  msgstr "oryginalna"
214
 
215
- #: ../image-watermark.php:666
216
  msgid "custom"
217
  msgstr "własna"
218
 
219
- #: ../image-watermark.php:668
220
  msgid "scaled"
221
  msgstr "skalowana"
222
 
223
- #: ../image-watermark.php:671
224
  msgid "Select method of aplying watermark size."
225
  msgstr "Wybierz sposób określania wielkości znaku wodnego."
226
 
227
- #: ../image-watermark.php:676
228
  msgid "Watermark custom size"
229
  msgstr "Własna wielkość"
230
 
231
- #: ../image-watermark.php:684
232
  msgid "Those dimensions will be used if \"custom\" method is selected above."
233
  msgstr ""
234
  "Te wymiary zostaną zastosowane, jeśli wybrałeś \"własną\" wielkość znaku "
235
  "wodnego. "
236
 
237
- #: ../image-watermark.php:688
238
  msgid "Scale of watermark in relation to image width"
239
  msgstr "Wielkość znaku wodnego w stosunku do szerokości obrazków"
240
 
241
- #: ../image-watermark.php:694
242
  msgid ""
243
  "This value will be used if \"scaled\" method if selected above. <br />Enter "
244
  "a number ranging from 0 to 100. 100 makes width of watermark image equal to "
@@ -249,11 +252,11 @@ msgstr ""
249
  "że wielkość znaku wodnego będzie równa wielkości obrazka, do którego jest "
250
  "dodawany."
251
 
252
- #: ../image-watermark.php:698
253
  msgid "Watermark transparency / opacity"
254
  msgstr "Przezroczystość znaku wodnego"
255
 
256
- #: ../image-watermark.php:703
257
  msgid ""
258
  "Enter a number ranging from 0 to 100. 0 makes watermark image completely "
259
  "transparent, 100 shows it as is."
@@ -261,75 +264,81 @@ msgstr ""
261
  "Wpisz liczbę z zakresu od 0 do 100. Wpisanie 0 spowoduje, że znak wodny "
262
  "będzie całkowicie przezroczysty, 100 że widoczny taki jak jest."
263
 
264
- #: ../image-watermark.php:709
265
  msgid "Image protection"
266
  msgstr "Ochrona obrazków"
267
 
268
- #: ../image-watermark.php:712
269
  msgid "Disable right mouse click on images"
270
  msgstr "Wyłącz możliwość kliknięcia prawym przyciskiem myszy na obrazku"
271
 
272
- #: ../image-watermark.php:716
273
  msgid "Prevent drag and drop"
274
  msgstr "Wyłącz możliwość przeciągania i upuszczania obrazków"
275
 
276
- #: ../image-watermark.php:720
277
  msgid "Enable image protection for logged-in users also"
278
  msgstr "Włącz ochronę zdjęć także dla zalogowanych użytkowników"
279
 
280
- #: ../image-watermark.php:725
281
  msgid "Save Changes"
282
  msgstr "Zapisz zmiany"
283
 
284
- #: ../image-watermark.php:731
285
  msgid "Image Watermark"
286
  msgstr "Znak wodny"
287
 
288
- #: ../image-watermark.php:733
289
  msgid "Need support?"
290
  msgstr "Potrzebujesz pomocy?"
291
 
292
- #: ../image-watermark.php:734
293
  msgid ""
294
  "If you are having problems with this plugin, please talk about them in the"
295
  msgstr "Jeśli masz jakiekolwiek problemy z tą wtyczką, powiedz o tym na"
296
 
297
- #: ../image-watermark.php:734
298
  msgid "Support forum"
299
  msgstr "Forum pomocy"
300
 
301
- #: ../image-watermark.php:736
302
  msgid "Do you like this plugin?"
303
  msgstr "Lubisz tę wtyczkę?"
304
 
305
- #: ../image-watermark.php:737
306
  msgid "Rate it 5"
307
  msgstr "Oceń ją na 5"
308
 
309
- #: ../image-watermark.php:737
310
  msgid "on WordPress.org"
311
  msgstr "na WordPress.org"
312
 
313
- #: ../image-watermark.php:738
314
  msgid "Blog about it & link to the"
315
  msgstr "Napisz o niej i dodaj link do"
316
 
317
- #: ../image-watermark.php:738
318
  msgid "plugin page"
319
  msgstr "strony wtyczki"
320
 
321
- #: ../image-watermark.php:739
322
  msgid "Check out our other"
323
  msgstr "Sprawdź inne"
324
 
325
- #: ../image-watermark.php:739
326
  msgid "WordPress plugins"
327
  msgstr "wtyczki do WordPressa"
328
 
329
- #: ../image-watermark.php:743
330
  msgid "Created by"
331
  msgstr "Stworzone przez"
332
 
 
 
 
 
 
 
333
  #~ msgid "WordPress Watermark"
334
  #~ msgstr "Znak wodny"
335
 
2
  msgstr ""
3
  "Project-Id-Version: WordPress Watermark\n"
4
  "Report-Msgid-Bugs-To: \n"
5
+ "POT-Creation-Date: 2013-05-10 11:52+0100\n"
6
+ "PO-Revision-Date: 2013-05-10 11:53+0100\n"
7
  "Last-Translator: Bartosz Arendt <info@digitalfactory.pl>\n"
8
  "Language-Team: Digital Factory <info@digitalfactory.pl>\n"
9
  "Language: pl_PL\n"
25
  "Przykro nam, ale ta wtyczka wymaga PHP w wersji co najmniej 5.0 WordPressa w "
26
  "wersji 3.5 lub wyższej.."
27
 
28
+ #: ../image-watermark.php:146
29
  msgid ""
30
  "Watermark couldn't be applied to selected images or no images were selected."
31
  msgstr ""
32
  "Znak wodny nie został został dodany do wybranych obrazków lub żaden obrazek "
33
  "nie został wybrany."
34
 
35
+ #: ../image-watermark.php:150
36
  #, php-format
37
  msgid "Watermark was succesfully applied to 1 image."
38
  msgid_plural "Watermark was succesfully applied to %s images."
39
  msgstr[0] "Znak wodny został dodany do 1 obrazka."
40
  msgstr[1] "Znak wodny został dodany do %s obrazków."
41
 
42
+ #: ../image-watermark.php:214
43
  msgid "Support"
44
  msgstr "Forum pomocy"
45
 
46
+ #: ../image-watermark.php:236
47
  msgid "Settings"
48
  msgstr "Ustawienia"
49
 
50
+ #: ../image-watermark.php:267
51
  msgid "Apply watermark"
52
  msgstr "Dodaj znak wodny"
53
 
54
+ #: ../image-watermark.php:297
55
  msgid "Select watermark"
56
  msgstr "Wybierz znak wodny"
57
 
58
+ #: ../image-watermark.php:298 ../image-watermark.php:672
59
  msgid "Original size"
60
  msgstr "Rozmiar oryginalny"
61
 
62
+ #: ../image-watermark.php:299 ../image-watermark.php:666
63
  msgid "Watermak has not been selected yet."
64
  msgstr "Znak wodny nie został jeszcze wybrany."
65
 
66
+ #: ../image-watermark.php:300
67
+ msgid "This image is not supported as watermark. Use JPEG, PNG or GIF."
68
+ msgstr "Ten rodzaj obrazka nie może być znakiem wodnym. Użyj JPEG, PNG or GIF."
69
+
70
+ #: ../image-watermark.php:302
71
  msgid "Add watermark"
72
  msgstr "Dodaj znak wodny"
73
 
74
+ #: ../image-watermark.php:344
75
  msgid "Image Watermark Options"
76
  msgstr "Ustawienia znaku wodnego"
77
 
78
+ #: ../image-watermark.php:345
79
  msgid "Watermark"
80
  msgstr "Znak wodny"
81
 
82
+ #: ../image-watermark.php:371
83
  msgid "Image Watermark will not work properly without GD PHP extension."
84
  msgstr ""
85
  "Znak wodny nie może funkcjonować bez zainstalowanego rozszerzenia GD PHP."
86
 
87
+ #: ../image-watermark.php:503
88
  msgid "Settings saved."
89
  msgstr "Ustawienia zostały zapisane."
90
 
91
+ #: ../image-watermark.php:517
92
  msgid "Watermarks will not be applied when <b>watermark image is not set</b>."
93
  msgstr ""
94
  "Znak wodny nie zostanie dodany ponieważ <b>nie wybrano obrazka dla znaku "
95
  "wodnego</b>."
96
 
97
+ #: ../image-watermark.php:523
98
  msgid "Image Watermark Settings"
99
  msgstr "Ustawienia znaku wodnego"
100
 
101
+ #: ../image-watermark.php:527
102
  msgid "General settings"
103
  msgstr "Ustawienia ogólne"
104
 
105
+ #: ../image-watermark.php:530
106
+ msgid "Automatic watermarking"
107
+ msgstr "Automatyczne dodawanie znaku wodnego"
108
 
109
+ #: ../image-watermark.php:534 ../image-watermark.php:550
 
 
 
 
 
110
  msgid "on"
111
  msgstr "włączony"
112
 
113
+ #: ../image-watermark.php:536 ../image-watermark.php:552
114
  msgid "off"
115
  msgstr "wyłączony"
116
 
117
+ #: ../image-watermark.php:539
118
  msgid "Enable or disable watermark for uploaded images."
119
  msgstr "Włącz lub wyłącz dodawanie znaku wodnego do wgrywanych obrazków."
120
 
121
+ #: ../image-watermark.php:546
122
+ msgid "Manual watermarking"
123
+ msgstr "Ręczne dodawanie znaku wodnego"
124
+
125
+ #: ../image-watermark.php:555
126
+ msgid "Enable or disable Apply Watermark option for images in Media Library."
127
+ msgstr ""
128
+ "Włącz lub wyłącz dodawanie znaku wodnego do obrazków w Bibliotece mediów."
129
+
130
+ #: ../image-watermark.php:562
131
  msgid "Enable watermark for"
132
  msgstr "Dodawaj znak wodny do"
133
 
134
+ #: ../image-watermark.php:572
135
  msgid "Check image sizes on which watermark should appear."
136
  msgstr "Zaznacz wielkości obrazków dla których ma być dodawany znak wodny."
137
 
138
+ #: ../image-watermark.php:578
139
  msgid "everywhere"
140
  msgstr "wszędzie"
141
 
142
+ #: ../image-watermark.php:579
143
  msgid "on selected post types only"
144
  msgstr "na wybranych typach wpisów"
145
 
146
+ #: ../image-watermark.php:587
147
  msgid ""
148
  "Check custom post types on which watermark should be applied to uploaded "
149
  "images."
151
  "Zaznacz własne typy wpisów w których znak wodny będzie dodawany do "
152
  "wgrywanych obrazków."
153
 
154
+ #: ../image-watermark.php:593
155
  msgid "Watermark position"
156
  msgstr "Pozycja znaku wodnego"
157
 
158
+ #: ../image-watermark.php:596
159
  msgid "Watermark alignment"
160
  msgstr "Wyrównanie znaku wodnego"
161
 
162
+ #: ../image-watermark.php:611
163
  msgid "Choose the position of watermark image."
164
  msgstr "Wybierz pozycję znaku wodnego na obrazkach"
165
 
166
+ #: ../image-watermark.php:616
167
  msgid "Watermark offset"
168
  msgstr "Korekcja pozycji"
169
 
170
+ #: ../image-watermark.php:619 ../image-watermark.php:699
171
  msgid "x:"
172
  msgstr "x:"
173
 
174
+ #: ../image-watermark.php:619 ../image-watermark.php:621
175
+ #: ../image-watermark.php:699 ../image-watermark.php:701
176
  msgid "px"
177
  msgstr "pikseli"
178
 
179
+ #: ../image-watermark.php:621 ../image-watermark.php:701
180
  msgid "y:"
181
  msgstr "y:"
182
 
183
+ #: ../image-watermark.php:637 ../image-watermark.php:641
184
  msgid "Watermark image"
185
  msgstr "Obrazek znaku wodnego"
186
 
187
+ #: ../image-watermark.php:638
188
  msgid ""
189
  "Configure your watermark image. Allowed file formats are: JPEG, PNG, GIF."
190
  msgstr ""
191
  "Skonfiguruj obrazek znaku wodnego. Dozwolone formaty plików to: JPEG, PNG, "
192
  "GIF."
193
 
194
+ #: ../image-watermark.php:644
195
  msgid "Select image"
196
  msgstr "Wybierz obrazek"
197
 
198
+ #: ../image-watermark.php:645
199
  msgid "Turn off image"
200
  msgstr "Wyłącz obrazek"
201
 
202
+ #: ../image-watermark.php:646
203
  msgid "You have to save changes after the selection or removal of the image."
204
  msgstr "Po zapisaniu zmian lub wybraniu obrazka powienieneś zapisać zmiany."
205
 
206
+ #: ../image-watermark.php:650
207
  msgid "Watermark preview"
208
  msgstr "Podgląd obrazka"
209
 
210
+ #: ../image-watermark.php:680
 
 
 
 
211
  msgid "Watermark size"
212
  msgstr "Wielkość znaku wodnego"
213
 
214
+ #: ../image-watermark.php:684
215
  msgid "original"
216
  msgstr "oryginalna"
217
 
218
+ #: ../image-watermark.php:686
219
  msgid "custom"
220
  msgstr "własna"
221
 
222
+ #: ../image-watermark.php:688
223
  msgid "scaled"
224
  msgstr "skalowana"
225
 
226
+ #: ../image-watermark.php:691
227
  msgid "Select method of aplying watermark size."
228
  msgstr "Wybierz sposób określania wielkości znaku wodnego."
229
 
230
+ #: ../image-watermark.php:696
231
  msgid "Watermark custom size"
232
  msgstr "Własna wielkość"
233
 
234
+ #: ../image-watermark.php:703
235
  msgid "Those dimensions will be used if \"custom\" method is selected above."
236
  msgstr ""
237
  "Te wymiary zostaną zastosowane, jeśli wybrałeś \"własną\" wielkość znaku "
238
  "wodnego. "
239
 
240
+ #: ../image-watermark.php:707
241
  msgid "Scale of watermark in relation to image width"
242
  msgstr "Wielkość znaku wodnego w stosunku do szerokości obrazków"
243
 
244
+ #: ../image-watermark.php:712
245
  msgid ""
246
  "This value will be used if \"scaled\" method if selected above. <br />Enter "
247
  "a number ranging from 0 to 100. 100 makes width of watermark image equal to "
252
  "że wielkość znaku wodnego będzie równa wielkości obrazka, do którego jest "
253
  "dodawany."
254
 
255
+ #: ../image-watermark.php:716
256
  msgid "Watermark transparency / opacity"
257
  msgstr "Przezroczystość znaku wodnego"
258
 
259
+ #: ../image-watermark.php:721
260
  msgid ""
261
  "Enter a number ranging from 0 to 100. 0 makes watermark image completely "
262
  "transparent, 100 shows it as is."
264
  "Wpisz liczbę z zakresu od 0 do 100. Wpisanie 0 spowoduje, że znak wodny "
265
  "będzie całkowicie przezroczysty, 100 że widoczny taki jak jest."
266
 
267
+ #: ../image-watermark.php:727
268
  msgid "Image protection"
269
  msgstr "Ochrona obrazków"
270
 
271
+ #: ../image-watermark.php:730
272
  msgid "Disable right mouse click on images"
273
  msgstr "Wyłącz możliwość kliknięcia prawym przyciskiem myszy na obrazku"
274
 
275
+ #: ../image-watermark.php:734
276
  msgid "Prevent drag and drop"
277
  msgstr "Wyłącz możliwość przeciągania i upuszczania obrazków"
278
 
279
+ #: ../image-watermark.php:738
280
  msgid "Enable image protection for logged-in users also"
281
  msgstr "Włącz ochronę zdjęć także dla zalogowanych użytkowników"
282
 
283
+ #: ../image-watermark.php:743
284
  msgid "Save Changes"
285
  msgstr "Zapisz zmiany"
286
 
287
+ #: ../image-watermark.php:749
288
  msgid "Image Watermark"
289
  msgstr "Znak wodny"
290
 
291
+ #: ../image-watermark.php:751
292
  msgid "Need support?"
293
  msgstr "Potrzebujesz pomocy?"
294
 
295
+ #: ../image-watermark.php:752
296
  msgid ""
297
  "If you are having problems with this plugin, please talk about them in the"
298
  msgstr "Jeśli masz jakiekolwiek problemy z tą wtyczką, powiedz o tym na"
299
 
300
+ #: ../image-watermark.php:752
301
  msgid "Support forum"
302
  msgstr "Forum pomocy"
303
 
304
+ #: ../image-watermark.php:754
305
  msgid "Do you like this plugin?"
306
  msgstr "Lubisz tę wtyczkę?"
307
 
308
+ #: ../image-watermark.php:755
309
  msgid "Rate it 5"
310
  msgstr "Oceń ją na 5"
311
 
312
+ #: ../image-watermark.php:755
313
  msgid "on WordPress.org"
314
  msgstr "na WordPress.org"
315
 
316
+ #: ../image-watermark.php:756
317
  msgid "Blog about it & link to the"
318
  msgstr "Napisz o niej i dodaj link do"
319
 
320
+ #: ../image-watermark.php:756
321
  msgid "plugin page"
322
  msgstr "strony wtyczki"
323
 
324
+ #: ../image-watermark.php:757
325
  msgid "Check out our other"
326
  msgstr "Sprawdź inne"
327
 
328
+ #: ../image-watermark.php:757
329
  msgid "WordPress plugins"
330
  msgstr "wtyczki do WordPressa"
331
 
332
+ #: ../image-watermark.php:761
333
  msgid "Created by"
334
  msgstr "Stworzone przez"
335
 
336
+ #~ msgid "Width"
337
+ #~ msgstr "Szerokość"
338
+
339
+ #~ msgid "Watermark Preview"
340
+ #~ msgstr "Podgląd obrazka"
341
+
342
  #~ msgid "WordPress Watermark"
343
  #~ msgstr "Znak wodny"
344
 
languages/image-watermark.pot CHANGED
@@ -1,8 +1,8 @@
1
  msgid ""
2
  msgstr ""
3
  "Project-Id-Version: WordPress Watermark\n"
4
- "POT-Creation-Date: 2013-05-07 14:37+0100\n"
5
- "PO-Revision-Date: 2013-05-07 14:37+0100\n"
6
  "Last-Translator: Bartosz Arendt <info@digitalfactory.pl>\n"
7
  "Language-Team: dFactory <info@dfactory.pl>\n"
8
  "Language: English\n"
@@ -22,290 +22,292 @@ msgid ""
22
  "Sorry, Image Watermark plugin requires at least PHP 5.0 and WP 3.5 or higher."
23
  msgstr ""
24
 
25
- #: ../image-watermark.php:143
26
  msgid ""
27
  "Watermark couldn't be applied to selected images or no images were selected."
28
  msgstr ""
29
 
30
- #: ../image-watermark.php:146
31
  #, php-format
32
  msgid "Watermark was succesfully applied to 1 image."
33
  msgid_plural "Watermark was succesfully applied to %s images."
34
  msgstr[0] ""
35
  msgstr[1] ""
36
 
37
- #: ../image-watermark.php:211
38
  msgid "Support"
39
  msgstr ""
40
 
41
- #: ../image-watermark.php:233
42
  msgid "Settings"
43
  msgstr ""
44
 
45
- #: ../image-watermark.php:261
46
  msgid "Apply watermark"
47
  msgstr ""
48
 
49
- #: ../image-watermark.php:291
50
  msgid "Select watermark"
51
  msgstr ""
52
 
53
- #: ../image-watermark.php:292 ../image-watermark.php:651
54
  msgid "Original size"
55
  msgstr ""
56
 
57
- #: ../image-watermark.php:293 ../image-watermark.php:645
58
  msgid "Watermak has not been selected yet."
59
  msgstr ""
60
 
61
- #: ../image-watermark.php:295
 
 
 
 
62
  msgid "Add watermark"
63
  msgstr ""
64
 
65
- #: ../image-watermark.php:337
66
  msgid "Image Watermark Options"
67
  msgstr ""
68
 
69
- #: ../image-watermark.php:338
70
  msgid "Watermark"
71
  msgstr ""
72
 
73
- #: ../image-watermark.php:364
74
  msgid "Image Watermark will not work properly without GD PHP extension."
75
  msgstr ""
76
 
77
- #: ../image-watermark.php:495
78
  msgid "Settings saved."
79
  msgstr ""
80
 
81
- #: ../image-watermark.php:506
82
  msgid "Watermarks will not be applied when <b>watermark image is not set</b>."
83
  msgstr ""
84
 
85
- #: ../image-watermark.php:512
86
  msgid "Image Watermark Settings"
87
  msgstr ""
88
 
89
- #: ../image-watermark.php:516
90
  msgid "General settings"
91
  msgstr ""
92
 
93
- #: ../image-watermark.php:519
94
- msgid "Enable watermark"
95
  msgstr ""
96
 
97
- #: ../image-watermark.php:522 ../image-watermark.php:662
98
- #: ../image-watermark.php:679 ../image-watermark.php:691
99
- msgid "Width"
100
- msgstr ""
101
-
102
- #: ../image-watermark.php:524
103
  msgid "on"
104
  msgstr ""
105
 
106
- #: ../image-watermark.php:526
107
  msgid "off"
108
  msgstr ""
109
 
110
- #: ../image-watermark.php:529
111
  msgid "Enable or disable watermark for uploaded images."
112
  msgstr ""
113
 
114
- #: ../image-watermark.php:536 ../image-watermark.php:539
115
- #: ../image-watermark.php:548
 
 
 
 
 
 
 
116
  msgid "Enable watermark for"
117
  msgstr ""
118
 
119
- #: ../image-watermark.php:547
120
  msgid "Check image sizes on which watermark should appear."
121
  msgstr ""
122
 
123
- #: ../image-watermark.php:554
124
  msgid "everywhere"
125
  msgstr ""
126
 
127
- #: ../image-watermark.php:555
128
  msgid "on selected post types only"
129
  msgstr ""
130
 
131
- #: ../image-watermark.php:563
132
  msgid ""
133
  "Check custom post types on which watermark should be applied to uploaded "
134
  "images."
135
  msgstr ""
136
 
137
- #: ../image-watermark.php:569
138
  msgid "Watermark position"
139
  msgstr ""
140
 
141
- #: ../image-watermark.php:572 ../image-watermark.php:575
142
  msgid "Watermark alignment"
143
  msgstr ""
144
 
145
- #: ../image-watermark.php:588
146
  msgid "Choose the position of watermark image."
147
  msgstr ""
148
 
149
- #: ../image-watermark.php:593 ../image-watermark.php:596
150
  msgid "Watermark offset"
151
  msgstr ""
152
 
153
- #: ../image-watermark.php:597 ../image-watermark.php:680
154
  msgid "x:"
155
  msgstr ""
156
 
157
- #: ../image-watermark.php:597 ../image-watermark.php:599
158
- #: ../image-watermark.php:680 ../image-watermark.php:682
159
  msgid "px"
160
  msgstr ""
161
 
162
- #: ../image-watermark.php:599 ../image-watermark.php:682
163
  msgid "y:"
164
  msgstr ""
165
 
166
- #: ../image-watermark.php:615 ../image-watermark.php:619
167
  msgid "Watermark image"
168
  msgstr ""
169
 
170
- #: ../image-watermark.php:616
171
  msgid ""
172
  "Configure your watermark image. Allowed file formats are: JPEG, PNG, GIF."
173
  msgstr ""
174
 
175
- #: ../image-watermark.php:622
176
  msgid "Select image"
177
  msgstr ""
178
 
179
- #: ../image-watermark.php:623
180
  msgid "Turn off image"
181
  msgstr ""
182
 
183
- #: ../image-watermark.php:624
184
  msgid "You have to save changes after the selection or removal of the image."
185
  msgstr ""
186
 
187
- #: ../image-watermark.php:628
188
  msgid "Watermark preview"
189
  msgstr ""
190
 
191
- #: ../image-watermark.php:631
192
- msgid "Watermark Preview"
193
- msgstr ""
194
-
195
- #: ../image-watermark.php:659
196
  msgid "Watermark size"
197
  msgstr ""
198
 
199
- #: ../image-watermark.php:664
200
  msgid "original"
201
  msgstr ""
202
 
203
- #: ../image-watermark.php:666
204
  msgid "custom"
205
  msgstr ""
206
 
207
- #: ../image-watermark.php:668
208
  msgid "scaled"
209
  msgstr ""
210
 
211
- #: ../image-watermark.php:671
212
  msgid "Select method of aplying watermark size."
213
  msgstr ""
214
 
215
- #: ../image-watermark.php:676
216
  msgid "Watermark custom size"
217
  msgstr ""
218
 
219
- #: ../image-watermark.php:684
220
  msgid "Those dimensions will be used if \"custom\" method is selected above."
221
  msgstr ""
222
 
223
- #: ../image-watermark.php:688
224
  msgid "Scale of watermark in relation to image width"
225
  msgstr ""
226
 
227
- #: ../image-watermark.php:694
228
  msgid ""
229
  "This value will be used if \"scaled\" method if selected above. <br />Enter "
230
  "a number ranging from 0 to 100. 100 makes width of watermark image equal to "
231
  "width of the image it is applied to."
232
  msgstr ""
233
 
234
- #: ../image-watermark.php:698
235
  msgid "Watermark transparency / opacity"
236
  msgstr ""
237
 
238
- #: ../image-watermark.php:703
239
  msgid ""
240
  "Enter a number ranging from 0 to 100. 0 makes watermark image completely "
241
  "transparent, 100 shows it as is."
242
  msgstr ""
243
 
244
- #: ../image-watermark.php:709
245
  msgid "Image protection"
246
  msgstr ""
247
 
248
- #: ../image-watermark.php:712
249
  msgid "Disable right mouse click on images"
250
  msgstr ""
251
 
252
- #: ../image-watermark.php:716
253
  msgid "Prevent drag and drop"
254
  msgstr ""
255
 
256
- #: ../image-watermark.php:720
257
  msgid "Enable image protection for logged-in users also"
258
  msgstr ""
259
 
260
- #: ../image-watermark.php:725
261
  msgid "Save Changes"
262
  msgstr ""
263
 
264
- #: ../image-watermark.php:731
265
  msgid "Image Watermark"
266
  msgstr ""
267
 
268
- #: ../image-watermark.php:733
269
  msgid "Need support?"
270
  msgstr ""
271
 
272
- #: ../image-watermark.php:734
273
  msgid ""
274
  "If you are having problems with this plugin, please talk about them in the"
275
  msgstr ""
276
 
277
- #: ../image-watermark.php:734
278
  msgid "Support forum"
279
  msgstr ""
280
 
281
- #: ../image-watermark.php:736
282
  msgid "Do you like this plugin?"
283
  msgstr ""
284
 
285
- #: ../image-watermark.php:737
286
  msgid "Rate it 5"
287
  msgstr ""
288
 
289
- #: ../image-watermark.php:737
290
  msgid "on WordPress.org"
291
  msgstr ""
292
 
293
- #: ../image-watermark.php:738
294
  msgid "Blog about it & link to the"
295
  msgstr ""
296
 
297
- #: ../image-watermark.php:738
298
  msgid "plugin page"
299
  msgstr ""
300
 
301
- #: ../image-watermark.php:739
302
  msgid "Check out our other"
303
  msgstr ""
304
 
305
- #: ../image-watermark.php:739
306
  msgid "WordPress plugins"
307
  msgstr ""
308
 
309
- #: ../image-watermark.php:743
310
  msgid "Created by"
311
  msgstr ""
1
  msgid ""
2
  msgstr ""
3
  "Project-Id-Version: WordPress Watermark\n"
4
+ "POT-Creation-Date: 2013-05-10 11:52+0100\n"
5
+ "PO-Revision-Date: 2013-05-10 11:52+0100\n"
6
  "Last-Translator: Bartosz Arendt <info@digitalfactory.pl>\n"
7
  "Language-Team: dFactory <info@dfactory.pl>\n"
8
  "Language: English\n"
22
  "Sorry, Image Watermark plugin requires at least PHP 5.0 and WP 3.5 or higher."
23
  msgstr ""
24
 
25
+ #: ../image-watermark.php:146
26
  msgid ""
27
  "Watermark couldn't be applied to selected images or no images were selected."
28
  msgstr ""
29
 
30
+ #: ../image-watermark.php:150
31
  #, php-format
32
  msgid "Watermark was succesfully applied to 1 image."
33
  msgid_plural "Watermark was succesfully applied to %s images."
34
  msgstr[0] ""
35
  msgstr[1] ""
36
 
37
+ #: ../image-watermark.php:214
38
  msgid "Support"
39
  msgstr ""
40
 
41
+ #: ../image-watermark.php:236
42
  msgid "Settings"
43
  msgstr ""
44
 
45
+ #: ../image-watermark.php:267
46
  msgid "Apply watermark"
47
  msgstr ""
48
 
49
+ #: ../image-watermark.php:297
50
  msgid "Select watermark"
51
  msgstr ""
52
 
53
+ #: ../image-watermark.php:298 ../image-watermark.php:672
54
  msgid "Original size"
55
  msgstr ""
56
 
57
+ #: ../image-watermark.php:299 ../image-watermark.php:666
58
  msgid "Watermak has not been selected yet."
59
  msgstr ""
60
 
61
+ #: ../image-watermark.php:300
62
+ msgid "This image is not supported as watermark. Use JPEG, PNG or GIF."
63
+ msgstr ""
64
+
65
+ #: ../image-watermark.php:302
66
  msgid "Add watermark"
67
  msgstr ""
68
 
69
+ #: ../image-watermark.php:344
70
  msgid "Image Watermark Options"
71
  msgstr ""
72
 
73
+ #: ../image-watermark.php:345
74
  msgid "Watermark"
75
  msgstr ""
76
 
77
+ #: ../image-watermark.php:371
78
  msgid "Image Watermark will not work properly without GD PHP extension."
79
  msgstr ""
80
 
81
+ #: ../image-watermark.php:503
82
  msgid "Settings saved."
83
  msgstr ""
84
 
85
+ #: ../image-watermark.php:517
86
  msgid "Watermarks will not be applied when <b>watermark image is not set</b>."
87
  msgstr ""
88
 
89
+ #: ../image-watermark.php:523
90
  msgid "Image Watermark Settings"
91
  msgstr ""
92
 
93
+ #: ../image-watermark.php:527
94
  msgid "General settings"
95
  msgstr ""
96
 
97
+ #: ../image-watermark.php:530
98
+ msgid "Automatic watermarking"
99
  msgstr ""
100
 
101
+ #: ../image-watermark.php:534 ../image-watermark.php:550
 
 
 
 
 
102
  msgid "on"
103
  msgstr ""
104
 
105
+ #: ../image-watermark.php:536 ../image-watermark.php:552
106
  msgid "off"
107
  msgstr ""
108
 
109
+ #: ../image-watermark.php:539
110
  msgid "Enable or disable watermark for uploaded images."
111
  msgstr ""
112
 
113
+ #: ../image-watermark.php:546
114
+ msgid "Manual watermarking"
115
+ msgstr ""
116
+
117
+ #: ../image-watermark.php:555
118
+ msgid "Enable or disable Apply Watermark option for images in Media Library."
119
+ msgstr ""
120
+
121
+ #: ../image-watermark.php:562
122
  msgid "Enable watermark for"
123
  msgstr ""
124
 
125
+ #: ../image-watermark.php:572
126
  msgid "Check image sizes on which watermark should appear."
127
  msgstr ""
128
 
129
+ #: ../image-watermark.php:578
130
  msgid "everywhere"
131
  msgstr ""
132
 
133
+ #: ../image-watermark.php:579
134
  msgid "on selected post types only"
135
  msgstr ""
136
 
137
+ #: ../image-watermark.php:587
138
  msgid ""
139
  "Check custom post types on which watermark should be applied to uploaded "
140
  "images."
141
  msgstr ""
142
 
143
+ #: ../image-watermark.php:593
144
  msgid "Watermark position"
145
  msgstr ""
146
 
147
+ #: ../image-watermark.php:596
148
  msgid "Watermark alignment"
149
  msgstr ""
150
 
151
+ #: ../image-watermark.php:611
152
  msgid "Choose the position of watermark image."
153
  msgstr ""
154
 
155
+ #: ../image-watermark.php:616
156
  msgid "Watermark offset"
157
  msgstr ""
158
 
159
+ #: ../image-watermark.php:619 ../image-watermark.php:699
160
  msgid "x:"
161
  msgstr ""
162
 
163
+ #: ../image-watermark.php:619 ../image-watermark.php:621
164
+ #: ../image-watermark.php:699 ../image-watermark.php:701
165
  msgid "px"
166
  msgstr ""
167
 
168
+ #: ../image-watermark.php:621 ../image-watermark.php:701
169
  msgid "y:"
170
  msgstr ""
171
 
172
+ #: ../image-watermark.php:637 ../image-watermark.php:641
173
  msgid "Watermark image"
174
  msgstr ""
175
 
176
+ #: ../image-watermark.php:638
177
  msgid ""
178
  "Configure your watermark image. Allowed file formats are: JPEG, PNG, GIF."
179
  msgstr ""
180
 
181
+ #: ../image-watermark.php:644
182
  msgid "Select image"
183
  msgstr ""
184
 
185
+ #: ../image-watermark.php:645
186
  msgid "Turn off image"
187
  msgstr ""
188
 
189
+ #: ../image-watermark.php:646
190
  msgid "You have to save changes after the selection or removal of the image."
191
  msgstr ""
192
 
193
+ #: ../image-watermark.php:650
194
  msgid "Watermark preview"
195
  msgstr ""
196
 
197
+ #: ../image-watermark.php:680
 
 
 
 
198
  msgid "Watermark size"
199
  msgstr ""
200
 
201
+ #: ../image-watermark.php:684
202
  msgid "original"
203
  msgstr ""
204
 
205
+ #: ../image-watermark.php:686
206
  msgid "custom"
207
  msgstr ""
208
 
209
+ #: ../image-watermark.php:688
210
  msgid "scaled"
211
  msgstr ""
212
 
213
+ #: ../image-watermark.php:691
214
  msgid "Select method of aplying watermark size."
215
  msgstr ""
216
 
217
+ #: ../image-watermark.php:696
218
  msgid "Watermark custom size"
219
  msgstr ""
220
 
221
+ #: ../image-watermark.php:703
222
  msgid "Those dimensions will be used if \"custom\" method is selected above."
223
  msgstr ""
224
 
225
+ #: ../image-watermark.php:707
226
  msgid "Scale of watermark in relation to image width"
227
  msgstr ""
228
 
229
+ #: ../image-watermark.php:712
230
  msgid ""
231
  "This value will be used if \"scaled\" method if selected above. <br />Enter "
232
  "a number ranging from 0 to 100. 100 makes width of watermark image equal to "
233
  "width of the image it is applied to."
234
  msgstr ""
235
 
236
+ #: ../image-watermark.php:716
237
  msgid "Watermark transparency / opacity"
238
  msgstr ""
239
 
240
+ #: ../image-watermark.php:721
241
  msgid ""
242
  "Enter a number ranging from 0 to 100. 0 makes watermark image completely "
243
  "transparent, 100 shows it as is."
244
  msgstr ""
245
 
246
+ #: ../image-watermark.php:727
247
  msgid "Image protection"
248
  msgstr ""
249
 
250
+ #: ../image-watermark.php:730
251
  msgid "Disable right mouse click on images"
252
  msgstr ""
253
 
254
+ #: ../image-watermark.php:734
255
  msgid "Prevent drag and drop"
256
  msgstr ""
257
 
258
+ #: ../image-watermark.php:738
259
  msgid "Enable image protection for logged-in users also"
260
  msgstr ""
261
 
262
+ #: ../image-watermark.php:743
263
  msgid "Save Changes"
264
  msgstr ""
265
 
266
+ #: ../image-watermark.php:749
267
  msgid "Image Watermark"
268
  msgstr ""
269
 
270
+ #: ../image-watermark.php:751
271
  msgid "Need support?"
272
  msgstr ""
273
 
274
+ #: ../image-watermark.php:752
275
  msgid ""
276
  "If you are having problems with this plugin, please talk about them in the"
277
  msgstr ""
278
 
279
+ #: ../image-watermark.php:752
280
  msgid "Support forum"
281
  msgstr ""
282
 
283
+ #: ../image-watermark.php:754
284
  msgid "Do you like this plugin?"
285
  msgstr ""
286
 
287
+ #: ../image-watermark.php:755
288
  msgid "Rate it 5"
289
  msgstr ""
290
 
291
+ #: ../image-watermark.php:755
292
  msgid "on WordPress.org"
293
  msgstr ""
294
 
295
+ #: ../image-watermark.php:756
296
  msgid "Blog about it & link to the"
297
  msgstr ""
298
 
299
+ #: ../image-watermark.php:756
300
  msgid "plugin page"
301
  msgstr ""
302
 
303
+ #: ../image-watermark.php:757
304
  msgid "Check out our other"
305
  msgstr ""
306
 
307
+ #: ../image-watermark.php:757
308
  msgid "WordPress plugins"
309
  msgstr ""
310
 
311
+ #: ../image-watermark.php:761
312
  msgid "Created by"
313
  msgstr ""
readme.txt CHANGED
@@ -4,7 +4,7 @@ Donate link: http://www.dfactory.eu/
4
  Tags: image, images, picture, photo, watermark, watermarking, protection, image protection, image security, plugin
5
  Requires at least: 3.5
6
  Tested up to: 3.5.1
7
- Stable tag: 1.1.0
8
  License: MIT License
9
  License URI: http://opensource.org/licenses/MIT
10
 
@@ -12,13 +12,13 @@ Image Watermark allows you to automatically watermark images uploaded to the Wor
12
 
13
  == Description ==
14
 
15
- [Image Watermark](http://www.dfactory.eu/plugins/image-watermark/) allows you to automatically watermark images uploaded to the WordPress Media Library and bulk watermark previously imported images.
16
 
17
  For more information, check out plugin page at [dFactory](http://www.dfactory.eu/) or plugin [support forum](http://www.dfactory.eu/support/forum/image-watermark/).
18
 
19
  = Features include: =
20
 
21
- * Bulk watermark - Apply watermark in Media Library actions
22
  * Watermark images already uploaded to Media Library
23
  * Choose the position of watermark image
24
  * Upload custom watermark image
@@ -51,6 +51,11 @@ No questions yet.
51
 
52
  == Changelog ==
53
 
 
 
 
 
 
54
  = 1.1.0 =
55
  * New: Bulk watermark - Apply watermark in Media Library actions
56
  * New: Watermark images already uploaded to Media Library
@@ -79,4 +84,4 @@ Initial release
79
 
80
  == Upgrade Notice ==
81
 
82
- New: Watermark images already uploaded to Media Library
4
  Tags: image, images, picture, photo, watermark, watermarking, protection, image protection, image security, plugin
5
  Requires at least: 3.5
6
  Tested up to: 3.5.1
7
+ Stable tag: 1.1.1
8
  License: MIT License
9
  License URI: http://opensource.org/licenses/MIT
10
 
12
 
13
  == Description ==
14
 
15
+ [Image Watermark](http://www.dfactory.eu/plugins/image-watermark/) allows you to automatically watermark images uploaded to the WordPress Media Library and bulk watermark previously uploaded images.
16
 
17
  For more information, check out plugin page at [dFactory](http://www.dfactory.eu/) or plugin [support forum](http://www.dfactory.eu/support/forum/image-watermark/).
18
 
19
  = Features include: =
20
 
21
+ * Bulk watermark - Apply watermark option in Media Library actions
22
  * Watermark images already uploaded to Media Library
23
  * Choose the position of watermark image
24
  * Upload custom watermark image
51
 
52
  == Changelog ==
53
 
54
+ = 1.1.1 =
55
+ * New: Added option to enable or disable manual watermarking in Media Library
56
+ * Fix: Apply watermark option not visible in Media Library actions
57
+ * Fix: Warning on full size images
58
+
59
  = 1.1.0 =
60
  * New: Bulk watermark - Apply watermark in Media Library actions
61
  * New: Watermark images already uploaded to Media Library
84
 
85
  == Upgrade Notice ==
86
 
87
+ New: Added option to enable or disable manual watermarking in Media Library