Easy Watermark - Version 0.4.1

Version Description

added an option to scale watermark only for smaller images
added confirmation button for 'Add watermark to all images' action
some changes in the code to make the plugin more compatible

Release Info

Developer	szaleq
Plugin	Easy Watermark
Version	0.4.1
Comparing to
See all releases

Code changes from version 0.4 to 0.4.1

Files changed (13) hide show

index.php +1 -1
languages/easy-watermark-fr_FR.mo +0 -0
languages/easy-watermark-fr_FR.po +129 -108
languages/easy-watermark-pl_PL.mo +0 -0
languages/easy-watermark-pl_PL.po +127 -105
languages/easy-watermark.pot +120 -96
lib/EWPlugin.php +20 -14
lib/EasyWatermark.php +4 -3
lib/EasyWatermarkPlugin.php +24 -56
lib/EasyWatermarkSettings.php +8 -0
readme.txt +12 -6
views/easy-watermark-page.php +27 -0
views/settings-form-image.php +2 -2

index.php CHANGED Viewed

	@@ -2,7 +2,7 @@
2	/*
3	Plugin Name: Easy Watermark
4	Description: This plugin can automatically add image and text watermark to pictures as they are uploaded to wordpress media library. You can also watermark existing images manually (all at once or an every single image). Watermark image can be a png, gif (alpha channel supported in both cases) or jpg. It's also possibile to set watermark opacity (doesn't apply to png with alpha channel). For text watermark you can select font, set color, size, angel and opacity.
5	- Version: 0.4
6	Author: Wojtek Szałkiewicz
7	Author URI: http://szalkiewicz.pl/
8	License: GPLv2 or later


2	/*
3	Plugin Name: Easy Watermark
4	Description: This plugin can automatically add image and text watermark to pictures as they are uploaded to wordpress media library. You can also watermark existing images manually (all at once or an every single image). Watermark image can be a png, gif (alpha channel supported in both cases) or jpg. It's also possibile to set watermark opacity (doesn't apply to png with alpha channel). For text watermark you can select font, set color, size, angel and opacity.
5	+ Version: 0.4.1
6	Author: Wojtek Szałkiewicz
7	Author URI: http://szalkiewicz.pl/
8	License: GPLv2 or later

languages/easy-watermark-fr_FR.mo CHANGED Viewed

Binary file

languages/easy-watermark-fr_FR.po CHANGED Viewed

@@ -1,9 +1,9 @@
             msgid ""
             msgstr ""
-            -
            "Project-Id-Version: Easy Watermark 0.4\n"
             "Report-Msgid-Bugs-To: \n"
-            -
            "POT-Creation-Date: 2013-04-29 00:25+0100\n"
-            -
            "PO-Revision-Date: 2013-04-29 09:55+0100\n"
             "Last-Translator: Regis B <rbrisard@gmail.com>\n"
             "Language-Team: Wojtek Szałkiewicz <wojtek@szalkiewicz.pl>\n"
             "Language: French\n"
@@ -12,103 +12,6 @@ msgstr ""
             "Content-Transfer-Encoding: 8bit\n"
             "X-Generator: Poedit 1.5.4\n"
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:182
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:524
-            -
            msgid "Watermark successfully added."
-            -
            msgstr "Watermark ajouté avec succès."
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:189
-            -
            msgid "Invalid mime type."
-            -
            msgstr "Type MIME du fichier invalide."
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:192
-            -
            msgid "No watermark image selected and no watermark text set."
-            -
            msgstr "Aucune image ou texte Watermark n'est défini."
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:194
-            -
            msgid "Go to settings page"
-            -
            msgstr "Allez à la page des réglages"
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:198
-            -
            msgid "An error has occurred."
-            -
            msgstr "Une erreur est survenue"
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:204
-            -
            msgid ""
-            -
            "Easy Watermark is active, but requires GD library to work. Please enable "
-            -
            "this extension."
-            -
            msgstr ""
-            -
            "Easy Watermark est activé, mais nécessite la présence de la librairie GD. "
-            -
            "Veuillez activer cette extension."
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:204
-            -
            msgid "Read more"
-            -
            msgstr "Lire la suite"
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:224
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:225
-            -
            msgid "Add Watermark"
-            -
            msgstr "Ajouter Watermark"
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:240
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:256
-            -
            msgid "Add watermark"
-            -
            msgstr "Ajouter Watermark"
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:395
-            -
            #, php-format
-            -
            msgid "Not supported mime type of %s. Skipping..."
-            -
            msgstr "Type MIME du fichier %s non supporté. Ignoré..."
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:400
-            -
            #, php-format
-            -
            msgid "Watermark successfully added to %s"
-            -
            msgstr "Watermark ajouté avec succès à %s"
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:517
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:99
-            -
            msgid "Easy Watermark"
-            -
            msgstr ""
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:524
-            -
            msgid "Go to Media Library"
-            -
            msgstr "Aller à la Bibliothèque de médias"
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:534
-            -
            msgid "Add watermark to all images"
-            -
            msgstr "Ajouter Watermark à toutes les images"
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:534
-            -
            msgid ""
-            -
            "Be carefull with that option. If some images alredy has watermark, it will "
-            -
            "be added though."
-            -
            msgstr ""
-            -
            "Attention avec cette option. Si des images on déjà un Watermark, il sera "
-            -
            "ajouté malgré tout."
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:79
-            -
            msgid "General"
-            -
            msgstr "Général"
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:80
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:24
-            -
            msgid "Image"
-            -
            msgstr "Image"
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:81
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:25
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:3
-            -
            msgid "Text"
-            -
            msgstr "Texte"
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:270
-            -
            msgid "Settings"
-            -
            msgstr "Réglages"
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:284
-            -
            msgid "Donate"
-            -
            msgstr "Faites un don"
-            -
             #: /media/szaleq/Data/easy-watermark/trunk/views/about.php:2
             msgid "About"
             msgstr "A propos"
@@ -147,6 +50,49 @@ msgstr "Support"
             msgid "Want to buy me a coffee?"
             msgstr "Offrez-moi un café !"
             #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:3
             msgid "Auto Watermark"
             msgstr "Watermark automatique"
@@ -175,6 +121,17 @@ msgstr "Sélectionnez les tailles d'image à marquer"
             msgid "Watermark Type"
             msgstr "Type de Watermark"
             #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:26
             msgid "Image + Text"
             msgstr "Image + Texte"
@@ -184,7 +141,6 @@ msgid "Choose, whether to apply image, text, or both."
             msgstr "Choisissez le type de Watermark à appliquer (Image, Texte ou les deux)"
             #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:3
-            -
            #, fuzzy
             msgid "Watermark Image"
             msgstr "Image du Watermark "
@@ -231,7 +187,6 @@ msgstr ""
             "sera marquée !"
             #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:21
-            -
            #, fuzzy
             msgid "Image Alignment"
             msgstr "Alignement de l'image"
@@ -263,12 +218,23 @@ msgstr "Ajuster en hauteur"
             msgid "Select how to scale watermark image."
             msgstr "Choisissez la manière dont le Watermark sera redimensionné."
             #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:46
             msgid "Scale"
             msgstr "Mise à l'échelle"
             #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:49
-            -
            #, fuzzy
             msgid "Image Offset"
             msgstr "Décalage de l'image"
@@ -305,12 +271,10 @@ msgid "Preview"
             msgstr "Aperçu"
             #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:14
-            -
            #, fuzzy
             msgid "Text Alignment"
             msgstr "Alignement du texte"
             #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:27
-            -
            #, fuzzy
             msgid "Text Offset"
             msgstr "Décalage du texte"
@@ -319,17 +283,14 @@ msgid "Font"
             msgstr "Police"
             #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:44
-            -
            #, fuzzy
             msgid "Text Color"
             msgstr "Couleur du texte"
             #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:47
-            -
            #, fuzzy
             msgid "Text Size"
             msgstr "Taille du texte"
             #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:51
-            -
            #, fuzzy
             msgid "Text Angle"
             msgstr "Angle du texte"
@@ -341,6 +302,66 @@ msgstr "Réglages Easy Watermark"
             msgid "Save Changes"
             msgstr ""
             #~ msgid "Loading preview..."
             #~ msgstr "Chargement de l'aperçu..."


1	msgid ""
2	msgstr ""
3	+ "Project-Id-Version: Easy Watermark 0.4.1\n"
4	"Report-Msgid-Bugs-To: \n"
5	+ "POT-Creation-Date: 2013-05-04 11:02+0100\n"
6	+ "PO-Revision-Date: 2013-05-04 11:03+0100\n"
7	"Last-Translator: Regis B <rbrisard@gmail.com>\n"
8	"Language-Team: Wojtek Szałkiewicz <wojtek@szalkiewicz.pl>\n"
9	"Language: French\n"

12	"Content-Transfer-Encoding: 8bit\n"
13	"X-Generator: Poedit 1.5.4\n"
14

































































































15	#: /media/szaleq/Data/easy-watermark/trunk/views/about.php:2
16	msgid "About"
17	msgstr "A propos"

50	msgid "Want to buy me a coffee?"
51	msgstr "Offrez-moi un café !"
52
53	+ #: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:4
54	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:100
55	+ msgid "Easy Watermark"
56	+ msgstr ""
57	+
58	+ #: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:10
59	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:177
60	+ msgid "Watermark successfully added."
61	+ msgstr "Watermark ajouté avec succès."
62	+
63	+ #: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:10
64	+ msgid "Go to Media Library"
65	+ msgstr "Aller à la Bibliothèque de médias"
66	+
67	+ #: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:16
68	+ msgid ""
69	+ "You are about to watermark all images in the library. This action can not be "
70	+ "undone. Are you sure you want to do this?"
71	+ msgstr ""
72	+ "Vous êtes sur le point d'ajouter un Watermark à toutes les images de la "
73	+ "bibliothèque. Cette action est irréversible. Etes-vous sûr de vouloir faire "
74	+ "cela ?"
75	+
76	+ #: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:18
77	+ msgid "Proceed"
78	+ msgstr "Continuer"
79	+
80	+ #: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:18
81	+ msgid "Cancel"
82	+ msgstr "Annuler"
83	+
84	+ #: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:23
85	+ msgid "Add watermark to all images"
86	+ msgstr "Ajouter Watermark à toutes les images"
87	+
88	+ #: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:23
89	+ msgid ""
90	+ "Be carefull with that option. If some images alredy has watermark, it will "
91	+ "be added though."
92	+ msgstr ""
93	+ "Attention avec cette option. Si des images on déjà un Watermark, il sera "
94	+ "ajouté malgré tout."
95	+
96	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:3
97	msgid "Auto Watermark"
98	msgstr "Watermark automatique"

121	msgid "Watermark Type"
122	msgstr "Type de Watermark"
123
124	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:24
125	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:81
126	+ msgid "Image"
127	+ msgstr "Image"
128	+
129	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:25
130	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:3
131	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:82
132	+ msgid "Text"
133	+ msgstr "Texte"
134	+
135	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:26
136	msgid "Image + Text"
137	msgstr "Image + Texte"

141	msgstr "Choisissez le type de Watermark à appliquer (Image, Texte ou les deux)"
142
143	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:3

144	msgid "Watermark Image"
145	msgstr "Image du Watermark "
146

187	"sera marquée !"
188
189	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:21

190	msgid "Image Alignment"
191	msgstr "Alignement de l'image"
192

218	msgid "Select how to scale watermark image."
219	msgstr "Choisissez la manière dont le Watermark sera redimensionné."
220
221	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:42
222	+ msgid "Scale to Smaller"
223	+ msgstr "Réduire uniquement"
224	+
225	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:43
226	+ msgid ""
227	+ "If this is checked, watermark will be scaled only for images smaller than "
228	+ "watermark image."
229	+ msgstr ""
230	+ "Si coché, le Watermark sera mis à l'échelle uniquement si l'image est plus "
231	+ "petite que le Watermark."
232	+
233	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:46
234	msgid "Scale"
235	msgstr "Mise à l'échelle"
236
237	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:49

238	msgid "Image Offset"
239	msgstr "Décalage de l'image"
240

271	msgstr "Aperçu"
272
273	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:14

274	msgid "Text Alignment"
275	msgstr "Alignement du texte"
276
277	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:27

278	msgid "Text Offset"
279	msgstr "Décalage du texte"
280

283	msgstr "Police"
284
285	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:44

286	msgid "Text Color"
287	msgstr "Couleur du texte"
288
289	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:47

290	msgid "Text Size"
291	msgstr "Taille du texte"
292
293	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:51

294	msgid "Text Angle"
295	msgstr "Angle du texte"
296

302	msgid "Save Changes"
303	msgstr ""
304
305	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:184
306	+ msgid "Invalid mime type."
307	+ msgstr "Type MIME du fichier invalide."
308	+
309	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:187
310	+ msgid "No watermark image selected and no watermark text set."
311	+ msgstr "Aucune image ou texte Watermark n'est défini."
312	+
313	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:189
314	+ msgid "Go to settings page"
315	+ msgstr "Allez à la page des réglages"
316	+
317	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:193
318	+ msgid "An error has occurred."
319	+ msgstr "Une erreur est survenue"
320	+
321	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:199
322	+ msgid ""
323	+ "Easy Watermark is active, but requires GD library to work. Please enable "
324	+ "this extension."
325	+ msgstr ""
326	+ "Easy Watermark est activé, mais nécessite la présence de la librairie GD. "
327	+ "Veuillez activer cette extension."
328	+
329	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:199
330	+ msgid "Read more"
331	+ msgstr "Lire la suite"
332	+
333	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:219
334	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:220
335	+ msgid "Add Watermark"
336	+ msgstr "Ajouter Watermark"
337	+
338	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:235
339	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:251
340	+ msgid "Add watermark"
341	+ msgstr "Ajouter Watermark"
342	+
343	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:390
344	+ #, php-format
345	+ msgid "Not supported mime type of %s. Skipping..."
346	+ msgstr "Type MIME du fichier %s non supporté. Ignoré..."
347	+
348	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:395
349	+ #, php-format
350	+ msgid "Watermark successfully added to %s"
351	+ msgstr "Watermark ajouté avec succès à %s"
352	+
353	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:80
354	+ msgid "General"
355	+ msgstr "Général"
356	+
357	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:278
358	+ msgid "Settings"
359	+ msgstr "Réglages"
360	+
361	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:292
362	+ msgid "Donate"
363	+ msgstr "Faites un don"
364	+
365	#~ msgid "Loading preview..."
366	#~ msgstr "Chargement de l'aperçu..."
367

languages/easy-watermark-pl_PL.mo CHANGED Viewed

Binary file

languages/easy-watermark-pl_PL.po CHANGED Viewed

@@ -2,8 +2,8 @@ msgid ""
             msgstr ""
             "Project-Id-Version: Easy Watermark 0.4\n"
             "Report-Msgid-Bugs-To: \n"
-            -
            "POT-Creation-Date: 2013-04-29 18:36+0100\n"
-            -
            "PO-Revision-Date: 2013-04-29 18:36+0100\n"
             "Last-Translator: Wojtek Szałkiewicz <wojtek@szalkiewicz.pl>\n"
             "Language-Team: Wojtek Szałkiewicz <wojtek@szalkiewicz.pl>\n"
             "Language: Polish\n"
@@ -12,103 +12,6 @@ msgstr ""
             "Content-Transfer-Encoding: 8bit\n"
             "X-Generator: Poedit 1.5.4\n"
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:182
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:524
-            -
            msgid "Watermark successfully added."
-            -
            msgstr "Znak wodny został dodany."
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:189
-            -
            msgid "Invalid mime type."
-            -
            msgstr "Błędny typ mime."
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:192
-            -
            msgid "No watermark image selected and no watermark text set."
-            -
            msgstr "Nie ustawiono obrazu ani tekstu znaku wodnego."
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:194
-            -
            msgid "Go to settings page"
-            -
            msgstr "Przejdź do ustawień"
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:198
-            -
            msgid "An error has occurred."
-            -
            msgstr "Wystąpił błąd."
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:204
-            -
            msgid ""
-            -
            "Easy Watermark is active, but requires GD library to work. Please enable "
-            -
            "this extension."
-            -
            msgstr ""
-            -
            "Easy Watermark jest aktywny, ale wymaga biblioteki GD do działania. Proszę, "
-            -
            "włącz to rozszerzenie."
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:204
-            -
            msgid "Read more"
-            -
            msgstr "Czytaj więcej"
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:224
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:225
-            -
            msgid "Add Watermark"
-            -
            msgstr "Dodaj znak wodny"
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:240
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:256
-            -
            msgid "Add watermark"
-            -
            msgstr "Dodaj znak wodny"
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:395
-            -
            #, php-format
-            -
            msgid "Not supported mime type of %s. Skipping..."
-            -
            msgstr "Nieobsługiwany typ pliku %s. Omijanie..."
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:400
-            -
            #, php-format
-            -
            msgid "Watermark successfully added to %s"
-            -
            msgstr "Znak wodny dodany do %s"
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:517
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:99
-            -
            msgid "Easy Watermark"
-            -
            msgstr ""
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:524
-            -
            msgid "Go to Media Library"
-            -
            msgstr "Idź do biblioteki mediów"
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:534
-            -
            msgid "Add watermark to all images"
-            -
            msgstr "Dodaj znak wodny do wszystkich obrazów"
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:534
-            -
            msgid ""
-            -
            "Be carefull with that option. If some images alredy has watermark, it will "
-            -
            "be added though."
-            -
            msgstr ""
-            -
            "Bądź ostrożny używając tej opcji. Jeśli któreś zdjęcia posiadają już znak "
-            -
            "wodny, zostanie on dodany po raz drugi."
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:79
-            -
            msgid "General"
-            -
            msgstr "Ogólne"
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:80
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:24
-            -
            msgid "Image"
-            -
            msgstr "Obraz"
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:81
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:25
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:3
-            -
            msgid "Text"
-            -
            msgstr "Tekst"
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:270
-            -
            msgid "Settings"
-            -
            msgstr "Ustawienia"
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:284
-            -
            msgid "Donate"
-            -
            msgstr "Przekaż dotację"
-            -
             #: /media/szaleq/Data/easy-watermark/trunk/views/about.php:2
             msgid "About"
             msgstr "O wtyczce"
@@ -146,6 +49,48 @@ msgstr "Wsparcie"
             msgid "Want to buy me a coffee?"
             msgstr "Chciałbyś postawić mi kawę?"
             #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:3
             msgid "Auto Watermark"
             msgstr "Automatyczne dodawanie"
@@ -174,6 +119,17 @@ msgstr "Zaznacz rozmiary obrazów, które mają być oznaczane znakiem wodnym"
             msgid "Watermark Type"
             msgstr "Typ znaku wodnego"
             #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:26
             msgid "Image + Text"
             msgstr "Obraz i tekst"
@@ -184,7 +140,6 @@ msgstr ""
             "Wybierz, czy jako znak wodny zastosować obraz, tekst, czy tekst z obrazem."
             #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:3
-            -
            #, fuzzy
             msgid "Watermark Image"
             msgstr "Znak wodny"
@@ -260,6 +215,18 @@ msgstr "Dopasuj wysokość"
             msgid "Select how to scale watermark image."
             msgstr "Wybierz sposób skalowania znaku wodnego."
             #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:46
             msgid "Scale"
             msgstr "Skala"
@@ -301,12 +268,10 @@ msgid "Preview"
             msgstr "Podgląd"
             #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:14
-            -
            #, fuzzy
             msgid "Text Alignment"
             msgstr "Wyrównanie tekstu"
             #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:27
-            -
            #, fuzzy
             msgid "Text Offset"
             msgstr "Offset tekstu"
@@ -315,17 +280,14 @@ msgid "Font"
             msgstr "Czcionka"
             #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:44
-            -
            #, fuzzy
             msgid "Text Color"
             msgstr "Kolor tekstu"
             #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:47
-            -
            #, fuzzy
             msgid "Text Size"
             msgstr "Rozmiar tekstu"
             #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:51
-            -
            #, fuzzy
             msgid "Text Angle"
             msgstr "Kąt obrotu tekstu"
@@ -337,6 +299,66 @@ msgstr "Ustawienia Easy Watermark"
             msgid "Save Changes"
             msgstr "Zapisz zmiany"
             #~ msgid "Loading preview..."
             #~ msgstr "Ładowanie podglądu..."


2	msgstr ""
3	"Project-Id-Version: Easy Watermark 0.4\n"
4	"Report-Msgid-Bugs-To: \n"
5	+ "POT-Creation-Date: 2013-05-04 11:00+0100\n"
6	+ "PO-Revision-Date: 2013-05-04 11:01+0100\n"
7	"Last-Translator: Wojtek Szałkiewicz <wojtek@szalkiewicz.pl>\n"
8	"Language-Team: Wojtek Szałkiewicz <wojtek@szalkiewicz.pl>\n"
9	"Language: Polish\n"

12	"Content-Transfer-Encoding: 8bit\n"
13	"X-Generator: Poedit 1.5.4\n"
14

































































































15	#: /media/szaleq/Data/easy-watermark/trunk/views/about.php:2
16	msgid "About"
17	msgstr "O wtyczce"

49	msgid "Want to buy me a coffee?"
50	msgstr "Chciałbyś postawić mi kawę?"
51
52	+ #: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:4
53	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:100
54	+ msgid "Easy Watermark"
55	+ msgstr ""
56	+
57	+ #: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:10
58	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:177
59	+ msgid "Watermark successfully added."
60	+ msgstr "Znak wodny został dodany."
61	+
62	+ #: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:10
63	+ msgid "Go to Media Library"
64	+ msgstr "Idź do biblioteki mediów"
65	+
66	+ #: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:16
67	+ msgid ""
68	+ "You are about to watermark all images in the library. This action can not be "
69	+ "undone. Are you sure you want to do this?"
70	+ msgstr ""
71	+ "Masz zamiar dodać znak wodny do wszystkich obrazków w bibliotece. Tej akcji "
72	+ "nie można cofnąć. Jesteś pewien, że chcesz to zrobić?"
73	+
74	+ #: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:18
75	+ msgid "Proceed"
76	+ msgstr "Kontynuuj"
77	+
78	+ #: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:18
79	+ msgid "Cancel"
80	+ msgstr "Anuluj"
81	+
82	+ #: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:23
83	+ msgid "Add watermark to all images"
84	+ msgstr "Dodaj znak wodny do wszystkich obrazów"
85	+
86	+ #: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:23
87	+ msgid ""
88	+ "Be carefull with that option. If some images alredy has watermark, it will "
89	+ "be added though."
90	+ msgstr ""
91	+ "Bądź ostrożny używając tej opcji. Jeśli któreś zdjęcia posiadają już znak "
92	+ "wodny, zostanie on dodany po raz drugi."
93	+
94	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:3
95	msgid "Auto Watermark"
96	msgstr "Automatyczne dodawanie"

119	msgid "Watermark Type"
120	msgstr "Typ znaku wodnego"
121
122	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:24
123	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:81
124	+ msgid "Image"
125	+ msgstr "Obraz"
126	+
127	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:25
128	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:3
129	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:82
130	+ msgid "Text"
131	+ msgstr "Tekst"
132	+
133	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:26
134	msgid "Image + Text"
135	msgstr "Obraz i tekst"

140	"Wybierz, czy jako znak wodny zastosować obraz, tekst, czy tekst z obrazem."
141
142	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:3

143	msgid "Watermark Image"
144	msgstr "Znak wodny"
145

215	msgid "Select how to scale watermark image."
216	msgstr "Wybierz sposób skalowania znaku wodnego."
217
218	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:42
219	+ msgid "Scale to Smaller"
220	+ msgstr "Skaluj do mniejszego obrazu"
221	+
222	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:43
223	+ msgid ""
224	+ "If this is checked, watermark will be scaled only for images smaller than "
225	+ "watermark image."
226	+ msgstr ""
227	+ "Jeśli ta opcja jest zaznaczona, znak wodny będzie skalowany jedynie dla "
228	+ "obrazków mniejszych, niż obrazek znaku wodnego."
229	+
230	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:46
231	msgid "Scale"
232	msgstr "Skala"

268	msgstr "Podgląd"
269
270	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:14

271	msgid "Text Alignment"
272	msgstr "Wyrównanie tekstu"
273
274	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:27

275	msgid "Text Offset"
276	msgstr "Offset tekstu"
277

280	msgstr "Czcionka"
281
282	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:44

283	msgid "Text Color"
284	msgstr "Kolor tekstu"
285
286	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:47

287	msgid "Text Size"
288	msgstr "Rozmiar tekstu"
289
290	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:51

291	msgid "Text Angle"
292	msgstr "Kąt obrotu tekstu"
293

299	msgid "Save Changes"
300	msgstr "Zapisz zmiany"
301
302	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:184
303	+ msgid "Invalid mime type."
304	+ msgstr "Błędny typ mime."
305	+
306	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:187
307	+ msgid "No watermark image selected and no watermark text set."
308	+ msgstr "Nie ustawiono obrazu ani tekstu znaku wodnego."
309	+
310	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:189
311	+ msgid "Go to settings page"
312	+ msgstr "Przejdź do ustawień"
313	+
314	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:193
315	+ msgid "An error has occurred."
316	+ msgstr "Wystąpił błąd."
317	+
318	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:199
319	+ msgid ""
320	+ "Easy Watermark is active, but requires GD library to work. Please enable "
321	+ "this extension."
322	+ msgstr ""
323	+ "Easy Watermark jest aktywny, ale wymaga biblioteki GD do działania. Proszę, "
324	+ "włącz to rozszerzenie."
325	+
326	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:199
327	+ msgid "Read more"
328	+ msgstr "Czytaj więcej"
329	+
330	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:219
331	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:220
332	+ msgid "Add Watermark"
333	+ msgstr "Dodaj znak wodny"
334	+
335	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:235
336	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:251
337	+ msgid "Add watermark"
338	+ msgstr "Dodaj znak wodny"
339	+
340	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:390
341	+ #, php-format
342	+ msgid "Not supported mime type of %s. Skipping..."
343	+ msgstr "Nieobsługiwany typ pliku %s. Omijanie..."
344	+
345	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:395
346	+ #, php-format
347	+ msgid "Watermark successfully added to %s"
348	+ msgstr "Znak wodny dodany do %s"
349	+
350	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:80
351	+ msgid "General"
352	+ msgstr "Ogólne"
353	+
354	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:278
355	+ msgid "Settings"
356	+ msgstr "Ustawienia"
357	+
358	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:292
359	+ msgid "Donate"
360	+ msgstr "Przekaż dotację"
361	+
362	#~ msgid "Loading preview..."
363	#~ msgstr "Ładowanie podglądu..."
364

languages/easy-watermark.pot CHANGED Viewed

@@ -1,9 +1,9 @@
             msgid ""
             msgstr ""
-            -
            "Project-Id-Version: Easy Watermark 0.4\n"
             "Report-Msgid-Bugs-To: \n"
-            -
            "POT-Creation-Date: 2013-04-29 18:16+0100\n"
-            -
            "PO-Revision-Date: 2013-04-29 18:16+0100\n"
             "Last-Translator: Wojtek Szałkiewicz <wojtek@szalkiewicz.pl>\n"
             "Language-Team: Wojtek Szałkiewicz <wojtek@szalkiewicz.pl>\n"
             "MIME-Version: 1.0\n"
@@ -11,99 +11,6 @@ msgstr ""
             "Content-Transfer-Encoding: 8bit\n"
             "X-Generator: Poedit 1.5.4\n"
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:182
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:524
-            -
            msgid "Watermark successfully added."
-            -
            msgstr ""
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:189
-            -
            msgid "Invalid mime type."
-            -
            msgstr ""
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:192
-            -
            msgid "No watermark image selected and no watermark text set."
-            -
            msgstr ""
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:194
-            -
            msgid "Go to settings page"
-            -
            msgstr ""
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:198
-            -
            msgid "An error has occurred."
-            -
            msgstr ""
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:204
-            -
            msgid ""
-            -
            "Easy Watermark is active, but requires GD library to work. Please enable "
-            -
            "this extension."
-            -
            msgstr ""
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:204
-            -
            msgid "Read more"
-            -
            msgstr ""
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:224
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:225
-            -
            msgid "Add Watermark"
-            -
            msgstr ""
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:240
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:256
-            -
            msgid "Add watermark"
-            -
            msgstr ""
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:395
-            -
            #, php-format
-            -
            msgid "Not supported mime type of %s. Skipping..."
-            -
            msgstr ""
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:400
-            -
            #, php-format
-            -
            msgid "Watermark successfully added to %s"
-            -
            msgstr ""
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:517
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:99
-            -
            msgid "Easy Watermark"
-            -
            msgstr ""
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:524
-            -
            msgid "Go to Media Library"
-            -
            msgstr ""
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:534
-            -
            msgid "Add watermark to all images"
-            -
            msgstr ""
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:534
-            -
            msgid ""
-            -
            "Be carefull with that option. If some images alredy has watermark, it will "
-            -
            "be added though."
-            -
            msgstr ""
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:79
-            -
            msgid "General"
-            -
            msgstr ""
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:80
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:24
-            -
            msgid "Image"
-            -
            msgstr ""
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:81
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:25
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:3
-            -
            msgid "Text"
-            -
            msgstr ""
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:270
-            -
            msgid "Settings"
-            -
            msgstr ""
-            -
-            -
            #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:284
-            -
            msgid "Donate"
-            -
            msgstr ""
-            -
             #: /media/szaleq/Data/easy-watermark/trunk/views/about.php:2
             msgid "About"
             msgstr ""
@@ -140,6 +47,44 @@ msgstr ""
             msgid "Want to buy me a coffee?"
             msgstr ""
             #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:3
             msgid "Auto Watermark"
             msgstr ""
@@ -168,6 +113,17 @@ msgstr ""
             msgid "Watermark Type"
             msgstr ""
             #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:26
             msgid "Image + Text"
             msgstr ""
@@ -246,6 +202,16 @@ msgstr ""
             msgid "Select how to scale watermark image."
             msgstr ""
             #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:46
             msgid "Scale"
             msgstr ""
@@ -315,3 +281,61 @@ msgstr ""
             #: /media/szaleq/Data/easy-watermark/trunk/views/settings-page.php:22
             msgid "Save Changes"
             msgstr ""


1	msgid ""
2	msgstr ""
3	+ "Project-Id-Version: Easy Watermark 0.4.1\n"
4	"Report-Msgid-Bugs-To: \n"
5	+ "POT-Creation-Date: 2013-05-04 10:59+0100\n"
6	+ "PO-Revision-Date: 2013-05-04 10:59+0100\n"
7	"Last-Translator: Wojtek Szałkiewicz <wojtek@szalkiewicz.pl>\n"
8	"Language-Team: Wojtek Szałkiewicz <wojtek@szalkiewicz.pl>\n"
9	"MIME-Version: 1.0\n"

11	"Content-Transfer-Encoding: 8bit\n"
12	"X-Generator: Poedit 1.5.4\n"
13





























































































14	#: /media/szaleq/Data/easy-watermark/trunk/views/about.php:2
15	msgid "About"
16	msgstr ""

47	msgid "Want to buy me a coffee?"
48	msgstr ""
49
50	+ #: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:4
51	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:100
52	+ msgid "Easy Watermark"
53	+ msgstr ""
54	+
55	+ #: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:10
56	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:177
57	+ msgid "Watermark successfully added."
58	+ msgstr ""
59	+
60	+ #: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:10
61	+ msgid "Go to Media Library"
62	+ msgstr ""
63	+
64	+ #: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:16
65	+ msgid ""
66	+ "You are about to watermark all images in the library. This action can not be "
67	+ "undone. Are you sure you want to do this?"
68	+ msgstr ""
69	+
70	+ #: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:18
71	+ msgid "Proceed"
72	+ msgstr ""
73	+
74	+ #: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:18
75	+ msgid "Cancel"
76	+ msgstr ""
77	+
78	+ #: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:23
79	+ msgid "Add watermark to all images"
80	+ msgstr ""
81	+
82	+ #: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:23
83	+ msgid ""
84	+ "Be carefull with that option. If some images alredy has watermark, it will "
85	+ "be added though."
86	+ msgstr ""
87	+
88	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:3
89	msgid "Auto Watermark"
90	msgstr ""

113	msgid "Watermark Type"
114	msgstr ""
115
116	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:24
117	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:81
118	+ msgid "Image"
119	+ msgstr ""
120	+
121	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:25
122	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:3
123	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:82
124	+ msgid "Text"
125	+ msgstr ""
126	+
127	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:26
128	msgid "Image + Text"
129	msgstr ""

202	msgid "Select how to scale watermark image."
203	msgstr ""
204
205	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:42
206	+ msgid "Scale to Smaller"
207	+ msgstr ""
208	+
209	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:43
210	+ msgid ""
211	+ "If this is checked, watermark will be scaled only for images smaller than "
212	+ "watermark image."
213	+ msgstr ""
214	+
215	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:46
216	msgid "Scale"
217	msgstr ""

281	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-page.php:22
282	msgid "Save Changes"
283	msgstr ""
284	+
285	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:184
286	+ msgid "Invalid mime type."
287	+ msgstr ""
288	+
289	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:187
290	+ msgid "No watermark image selected and no watermark text set."
291	+ msgstr ""
292	+
293	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:189
294	+ msgid "Go to settings page"
295	+ msgstr ""
296	+
297	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:193
298	+ msgid "An error has occurred."
299	+ msgstr ""
300	+
301	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:199
302	+ msgid ""
303	+ "Easy Watermark is active, but requires GD library to work. Please enable "
304	+ "this extension."
305	+ msgstr ""
306	+
307	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:199
308	+ msgid "Read more"
309	+ msgstr ""
310	+
311	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:219
312	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:220
313	+ msgid "Add Watermark"
314	+ msgstr ""
315	+
316	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:235
317	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:251
318	+ msgid "Add watermark"
319	+ msgstr ""
320	+
321	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:390
322	+ #, php-format
323	+ msgid "Not supported mime type of %s. Skipping..."
324	+ msgstr ""
325	+
326	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:395
327	+ #, php-format
328	+ msgid "Watermark successfully added to %s"
329	+ msgstr ""
330	+
331	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:80
332	+ msgid "General"
333	+ msgstr ""
334	+
335	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:278
336	+ msgid "Settings"
337	+ msgstr ""
338	+
339	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:292
340	+ msgid "Donate"
341	+ msgstr ""

lib/EWPlugin.php CHANGED Viewed

	@@ -26,9 +26,9 @@ class EWPluginCore extends EWPlugable
26	protected static $version;
27
28	/**
29	- * @var string plugin class name
30	*/
31	- protected static $className;
32
33	/**
34	* @var string main plugin file
	@@ -43,21 +43,23 @@ class EWPluginCore extends EWPlugable
43	* @return object
44	*/
45	public static function init(){


46	// Register install and uninstall methods
47	- register_activation_hook(dirname(__FILE__) . DIRECTORY_SEPARATOR . ~~static~~::$mainFile, array(~~static~~::$className, 'install'));
48	- register_uninstall_hook(dirname(__FILE__) . DIRECTORY_SEPARATOR . ~~static~~::$mainFile, array(~~static~~::$className, 'uninstall'));
49
50	- $version = get_option(~~static~~::$pluginSlug . '-version');
51	- if($version & version_compare($version, ~~static~~::$version, '<')){
52	// Version from database is lower than current, upgrade...
53	- ~~static~~::upgrade($version);
54	}
55
56	// Load plugin textdomain
57	- load_plugin_textdomain(~~static~~::$pluginSlug, false, '/'~~.static~~::$pluginSlug.'/languages');
58
59	// Create object of plugin class (inheritign this one)
60	- return new ~~static~~();
61	}
62
63	/**
	@@ -66,7 +68,8 @@ class EWPluginCore extends EWPlugable
66	* @return string
67	*/
68	public static function getName(){
69	- ~~return~~ ~~static::$pluginName~~;

70	}
71
72	/**
	@@ -75,7 +78,8 @@ class EWPluginCore extends EWPlugable
75	* @return string
76	*/
77	public static function getSlug(){
78	- ~~return~~ ~~static::$pluginSlug~~;

79	}
80
81
	@@ -85,7 +89,8 @@ class EWPluginCore extends EWPlugable
85	* @return string
86	*/
87	public static function getVersion(){
88	- ~~return~~ ~~static::$version~~;

89	}
90
91	/**
	@@ -112,8 +117,9 @@ class EWPluginCore extends EWPlugable
112	protected static function upgrade($version){}
113
114	public function __call($name, $args){
115	- ~~if(method_exists('static::'.$name)){~~
116	- ~~return static::$~~name();

117	}
118
119	return false;


26	protected static $version;
27
28	/**
29	+ * @var string plugin class name
30	*/
31	+ protected static $className = 'EasyWatermarkPlugin';
32
33	/**
34	* @var string main plugin file

43	* @return object
44	*/
45	public static function init(){
46	+ global $ewClass;
47	+ $ewClass = self::$className;
48	// Register install and uninstall methods
49	+ register_activation_hook(dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . $ewClass::$mainFile, array($ewClass::$className, 'install'));
50	+ register_uninstall_hook(dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . $ewClass::$mainFile, array($ewClass::$className, 'uninstall'));
51
52	+ $version = get_option($ewClass::$pluginSlug . '-version');
53	+ if(!empty($version) & version_compare($version, $ewClass::$version, '<')){
54	// Version from database is lower than current, upgrade...
55	+ $ewClass::upgrade($version);
56	}
57
58	// Load plugin textdomain
59	+ load_plugin_textdomain($ewClass::$pluginSlug, false, '/'.$ewClass::$pluginSlug.'/languages');
60
61	// Create object of plugin class (inheritign this one)
62	+ return new $ewClass();
63	}
64
65	/**

68	* @return string
69	*/
70	public static function getName(){
71	+ global $ewClass;
72	+ return $ewClass::$pluginName;
73	}
74
75	/**

78	* @return string
79	*/
80	public static function getSlug(){
81	+ global $ewClass;
82	+ return $ewClass::$pluginSlug;
83	}
84
85

89	* @return string
90	*/
91	public static function getVersion(){
92	+ global $ewClass;
93	+ return $ewClass::$version;
94	}
95
96	/**

117	protected static function upgrade($version){}
118
119	public function __call($name, $args){
120	+ global $ewClass;
121	+ if(method_exists($ewClass.'::'.$name)){
122	+ return $ewClass::$name();
123	}
124
125	return false;

lib/EasyWatermark.php CHANGED Viewed

	@@ -45,7 +45,8 @@ class EasyWatermark
45	'offset_y' => 0,
46	'opacity' => 100, // percent
47	'scale_mode' => 'none', // none, fill, fit, fit_to_width, fit_to_height
48	- 'scale' => 100 // percent, used with fit_to_width and fit_to_height

49	),
50	'text' => array(
51	'position_x' => 2,
	@@ -514,12 +515,12 @@ class EasyWatermark
514	}
515	}
516
517	- if($settings['scale_mode'] == 'fit_to_width'){
518	$scale = $imageWidth / $watermarkWidth;
519	$newWidth = $imageWidth * $settings['scale'] / 100;
520	$newHeight = $watermarkHeight * $scale * $settings['scale'] / 100;
521	}
522	- elseif($settings['scale_mode'] == 'fit_to_height'){
523	$scale = $imageHeight / $watermarkHeight;
524	$newHeight = $imageHeight * $settings['scale'] / 100;
525	$newWidth = $watermarkWidth * $scale * $settings['scale'] / 100;


45	'offset_y' => 0,
46	'opacity' => 100, // percent
47	'scale_mode' => 'none', // none, fill, fit, fit_to_width, fit_to_height
48	+ 'scale' => 100, // percent, used with fit_to_width and fit_to_height
49	+ 'scale_to_smaller' => false
50	),
51	'text' => array(
52	'position_x' => 2,

515	}
516	}
517
518	+ if($settings['scale_mode'] == 'fit_to_width' && (!$settings['scale_to_smaller'] \|\| $imageWidth < $watermarkWidth)){
519	$scale = $imageWidth / $watermarkWidth;
520	$newWidth = $imageWidth * $settings['scale'] / 100;
521	$newHeight = $watermarkHeight * $scale * $settings['scale'] / 100;
522	}
523	+ elseif($settings['scale_mode'] == 'fit_to_height' && (!$settings['scale_to_smaller'] \|\| $imageHeight < $watermarkHeight)){
524	$scale = $imageHeight / $watermarkHeight;
525	$newHeight = $imageHeight * $settings['scale'] / 100;
526	$newWidth = $watermarkWidth * $scale * $settings['scale'] / 100;

lib/EasyWatermarkPlugin.php CHANGED Viewed

	@@ -22,12 +22,7 @@ class EasyWatermarkPlugin extends ewPluginCore
22	/**
23	* @var string plugin version
24	*/
25	- protected static $version = '0.4.0';
26	-
27	- /**
28	- * @var string plugin class name
29	- */
30	- protected static $className = 'EasyWatermarkPlugin';
31
32	private static $GDEnabled;
33
	@@ -511,31 +506,7 @@ class EasyWatermarkPlugin extends ewPluginCore
511	* @return void
512	*/
513	public function easy_watermark(){
514	- ?>
515	- <div class="wrap easy-watermark">
516	- <div id="icon-easy-watermark" class="icon32"><br /></div>
517	- <h2><?php _e('Easy Watermark', 'easy-watermark'); ?></h2>
518	- <?php
519	- if(isset($_GET['_wpnonce']) && wp_verify_nonce($_GET['_wpnonce'])) :
520	- if(isset($_GET['watermark_all']) && ($output = $this->watermark_all())) :
521	- ?>
522	- <div id="message" class="updated below-h2">
523	- <p><?php _e('Watermark successfully added.', 'easy-watermark'); ?> <a href="<?php echo admin_url('upload.php') ?>"><?php _e('Go to Media Library', 'easy-watermark'); ?></a></p>
524	- </div>
525	- <?
526	- echo $output;
527	- endif;
528	- else :
529	- ?>
530	- <br/>
531	- <a class="button-primary" href="<?php echo wp_nonce_url(admin_url('/upload.php?page=easy-watermark&watermark_all=1')); ?>"><?php _e('Add watermark to all images', 'easy-watermark'); ?></a><p class="description"><?php _e('Be carefull with that option. If some images alredy has watermark, it will be added though.', 'easy-watermark'); ?></p>
532	- <?php
533	- endif;
534	- ?>
535	- </div>
536	- <?php
537	-
538	- return;
539	}
540
541	public function easy_watermark_style(){
	@@ -557,9 +528,9 @@ class EasyWatermarkPlugin extends ewPluginCore
557	if(empty($settings)) $settings = EasyWatermarkSettings::getDefaults();
558
559	foreach($settings as $sectionName => $section){
560	- update_option(~~static~~::$pluginSlug.'-settings-'.$sectionName, $section);
561	}
562	- update_option(~~static~~::$pluginSlug.'-version', ~~static~~::$version);
563	}
564
565	/**
	@@ -571,9 +542,9 @@ class EasyWatermarkPlugin extends ewPluginCore
571	$settings = EasyWatermarkSettings::getDefaults();
572
573	foreach($settings as $sectionName => $section){
574	- delete_option(~~static~~::$pluginSlug.'-settings-'.$sectionName);
575	}
576	- delete_option(~~static~~::$pluginSlug.'-version');
577	}
578
579	/**
	@@ -584,17 +555,15 @@ class EasyWatermarkPlugin extends ewPluginCore
584	* @return void
585	*/
586	protected static function upgrade($version){
587	- ~~if(~~$~~version~~ == ~~'0.2.2'~~){
588	- ~~$settings['general'] = get_option(static::$pluginSlug.'-settings-general');~~
589	- }
590	- ~~elseif(~~$~~version ==~~ '~~0.2~~' \|\| ~~$version == '0~~.~~2.1~~'){
591	- $settings['~~general~~'] = get_option(~~static~~::$pluginSlug.'-settings-~~general~~');
592	- $settings['~~image~~'] = get_option(~~static~~::$pluginSlug.'-settings-~~image~~');
593	- $settings['text'] = get_option(static::$pluginSlug.'-settings-text');
594	}
595	else {
596	- $oldSettings = get_option(~~static~~::$pluginSlug.'-settings');
597	- $defaults = EasyWatermarkSettings::getDefaults();
598
599	$imgTypes = array();
600	foreach($oldSettings['image_types'] as $type){
	@@ -636,24 +605,23 @@ class EasyWatermarkPlugin extends ewPluginCore
636	}
637
638	$settings = array(
639	- 'general' => ~~array_merge(~~$~~defaults['~~general'], ~~$general),~~
640	- 'image' => ~~array_merge(~~$~~defaults['~~image'], ~~$image),~~
641	- 'text' => ~~$defaults['text']~~
642	);
643	- delete_option(~~static~~::$pluginSlug.'-settings');
644	}
645
646	- if($version != '0.2.2'){
647	- $settings['image']['alignment'] = ~~static~~::getAlignment($settings['image']['position_x'], $settings['image']['position_y']);
648	- $settings['text']['alignment'] = ~~static~~::getAlignment($settings['text']['position_x'], $settings['text']['position_y']);
649	}
650
651	- $settings['~~image~~']['~~scale_mode~~'] = '~~none~~';
652	- $settings['image']['~~scale~~'] ~~= 100~~;
653	-
654	- $settings['general'] = array_merge(EasyWatermarkSettings::getDefaults('general'), $settings['general']);
655
656	- ~~static~~::install($settings);
657	}
658
659	/**


22	/**
23	* @var string plugin version
24	*/
25	+ protected static $version = '0.4.1';





26
27	private static $GDEnabled;
28

506	* @return void
507	*/
508	public function easy_watermark(){
509	+ include EWVIEWS . EWDS . 'easy-watermark-page.php';
























510	}
511
512	public function easy_watermark_style(){

528	if(empty($settings)) $settings = EasyWatermarkSettings::getDefaults();
529
530	foreach($settings as $sectionName => $section){
531	+ update_option(self::$pluginSlug.'-settings-'.$sectionName, $section);
532	}
533	+ update_option(self::$pluginSlug.'-version', self::$version);
534	}
535
536	/**

542	$settings = EasyWatermarkSettings::getDefaults();
543
544	foreach($settings as $sectionName => $section){
545	+ delete_option(self::$pluginSlug.'-settings-'.$sectionName);
546	}
547	+ delete_option(self::$pluginSlug.'-version');
548	}
549
550	/**

555	* @return void
556	*/
557	protected static function upgrade($version){
558	+ $defaults = EasyWatermarkSettings::getDefaults();
559	+
560	+ if(version_compare($version, '0.1.1', '>')){
561	+ $settings['general'] = get_option(self::$pluginSlug.'-settings-general');
562	+ $settings['image'] = get_option(self::$pluginSlug.'-settings-image');
563	+ $settings['text'] = get_option(self::$pluginSlug.'-settings-text');

564	}
565	else {
566	+ $oldSettings = get_option(self::$pluginSlug.'-settings');

567
568	$imgTypes = array();
569	foreach($oldSettings['image_types'] as $type){

605	}
606
607	$settings = array(
608	+ 'general' => $general,
609	+ 'image' => $image,
610	+ 'text' => array()
611	);
612	+ delete_option(self::$pluginSlug.'-settings');
613	}
614
615	+ if(version_compare($version, '0.2.2', '<')){
616	+ $settings['image']['alignment'] = self::getAlignment($settings['image']['position_x'], $settings['image']['position_y']);
617	+ $settings['text']['alignment'] = self::getAlignment($settings['text']['position_x'], $settings['text']['position_y']);
618	}
619
620	+ $settings['general'] = array_merge($defaults['general'], $settings['general']);
621	+ $settings['image'] = array_merge($defaults['image'], $settings['image']);
622	+ $settings['text'] = array_merge($defaults['text'], $settings['text']);

623
624	+ self::install($settings);
625	}
626
627	/**

lib/EasyWatermarkSettings.php CHANGED Viewed

	@@ -38,6 +38,7 @@ class EasyWatermarkSettings
38	'offset_y' => 100,
39	'opacity' => 100,
40	'scale_mode' => 'none',

41	'scale' => 100
42	),
43	'text' => array(
	@@ -188,6 +189,13 @@ class EasyWatermarkSettings
188	break;
189	}
190







191	return $input;
192	}
193


38	'offset_y' => 100,
39	'opacity' => 100,
40	'scale_mode' => 'none',
41	+ 'scale_to_smaller' => 'false',
42	'scale' => 100
43	),
44	'text' => array(

189	break;
190	}
191
192	+ if(isset($input['scale_to_smaller'])){
193	+ $input['scale_to_smaller'] = true;
194	+ }
195	+ else {
196	+ $input['scale_to_smaller'] = false;
197	+ }
198	+
199	return $input;
200	}
201

readme.txt CHANGED Viewed

	@@ -4,7 +4,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=wojte
4	Tags: watermark, image, picture, photo, media, gallery, signature, transparent, upload, admin
5	Requires at least: 3.3
6	Tested up to: 3.5.1
7	- Stable tag: 0.4
8	License: GPLv2 or later
9	License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
	@@ -59,11 +59,12 @@ There is no user-friendly way to do this, however if you know what you do, you c
59
60	= How the scaling of the watermark image works? =
61	On the watermark image settings page you can se 'Scaling Mode' selection which has 5 options:
62	- 'None' - watermark scaling is off
63	- 'Fill' - watermark will fill the entire image
64	- 'Fit' - watermark width or height will be adjusted to image width or height in such a way that it will be all visible
65	- 'Fit to Width' - watermark width will always be adjusted to image width
66	- 'Fit to Height' - watermark height will always be adjusted to image height

67	Watermark ratio is always preserved, so it can go beyond the image when the 'Scaling Mode' is set to 'Fill'.
68	With 'Fit to Width' or 'Fit to Height' options watermark dimensions can be set as a percentage in relation to the image dimensions.
69
	@@ -77,6 +78,11 @@ With 'Fit to Width' or 'Fit to Height' options watermark dimensions can be set a
77
78	== Changelog ==
79





80	= 0.4 =
81	* introduced watermark image scaling option
82


4	Tags: watermark, image, picture, photo, media, gallery, signature, transparent, upload, admin
5	Requires at least: 3.3
6	Tested up to: 3.5.1
7	+ Stable tag: 0.4.1
8	License: GPLv2 or later
9	License URI: http://www.gnu.org/licenses/gpl-2.0.html
10

59
60	= How the scaling of the watermark image works? =
61	On the watermark image settings page you can se 'Scaling Mode' selection which has 5 options:
62	+ * 'None' - watermark scaling is off
63	+ * 'Fill' - watermark will fill the entire image
64	+ * 'Fit' - watermark width or height will be adjusted to image width or height in such a way that it will be all visible
65	+ * 'Fit to Width' - watermark width will always be adjusted to image width
66	+ * 'Fit to Height' - watermark height will always be adjusted to image height
67	+ If 'Scale to Smaller' checkbox is checked, any scaling will be done only for images smaller than watermark image.
68	Watermark ratio is always preserved, so it can go beyond the image when the 'Scaling Mode' is set to 'Fill'.
69	With 'Fit to Width' or 'Fit to Height' options watermark dimensions can be set as a percentage in relation to the image dimensions.
70

78
79	== Changelog ==
80
81	+ = 0.4.1 =
82	+ * added an option to scale watermark only for smaller images
83	+ * added confirmation button for 'Add watermark to all images' action
84	+ * some changes in the code to make the plugin more compatible
85	+
86	= 0.4 =
87	* introduced watermark image scaling option
88

views/easy-watermark-page.php ADDED Viewed

	@@ -0,0 +1,27 @@


1	+
2	+ <div class="wrap easy-watermark">
3	+ <div id="icon-easy-watermark" class="icon32"><br /></div>
4	+ <h2><?php _e('Easy Watermark', 'easy-watermark'); ?></h2>
5	+ <?php
6	+ if(isset($_GET['_wpnonce'])) :
7	+ if(wp_verify_nonce($_GET['_wpnonce'], 'watermark_all_confirmed') && isset($_GET['watermark_all']) && ($output = $this->watermark_all())) :
8	+ ?>
9	+ <div id="message" class="updated below-h2">
10	+ <p><?php _e('Watermark successfully added.', 'easy-watermark'); ?> <a href="<?php echo admin_url('upload.php') ?>"><?php _e('Go to Media Library', 'easy-watermark'); ?></a></p>
11	+ </div>
12	+ <?
13	+ echo $output;
14	+ else: ?>
15	+ <div id="message" class="updated below-h2">
16	+ <p><?php _e('You are about to watermark all images in the library. This action can not be undone. Are you sure you want to do this?', 'easy-watermark'); ?></p>
17	+ </div>
18	+ <a class="button-primary" href="<?php echo wp_nonce_url(admin_url('/upload.php?page=easy-watermark&watermark_all=1'), 'watermark_all_confirmed'); ?>"><?php _e('Proceed', 'easy-watermark'); ?></a> <a class="button-secondary" href="<?php echo admin_url('/upload.php?page=easy-watermark'); ?>"><?php _e('Cancel', 'easy-watermark'); ?></a>
19	+ <?php endif;
20	+ else :
21	+ ?>
22	+ <br/>
23	+ <a class="button-primary" href="<?php echo wp_nonce_url(admin_url('/upload.php?page=easy-watermark&watermark_all=1'), 'watermark_all'); ?>"><?php _e('Add watermark to all images', 'easy-watermark'); ?></a><p class="description"><?php _e('Be carefull with that option. If some images alredy has watermark, it will be added though.', 'easy-watermark'); ?></p>
24	+ <?php
25	+ endif;
26	+ ?>
27	+ </div>

views/settings-form-image.php CHANGED Viewed

	@@ -39,8 +39,8 @@ if(empty($watermark_url)) :
39	<option value="fit_to_width" <?php selected('fit_to_width', $scale_mode); ?>><?php _e('Fit to Width', 'easy-watermark') ?></option>
40	<option value="fit_to_height" <?php selected('fit_to_height', $scale_mode); ?>><?php _e('Fit to Height', 'easy-watermark') ?></option>
41	</select><p class="description"><?php _e('Select how to scale watermark image.', 'easy-watermark'); ?></p>
42	- <~~div~~ ~~class~~="scale">
43	- ~~</div~~>
44	</td></tr>
45	<tr id="ew-scale-row"><th scope="row">
46	<label for="ew-scale"><?php _e('Scale', 'easy-watermark'); ?></label></th><td>


39	<option value="fit_to_width" <?php selected('fit_to_width', $scale_mode); ?>><?php _e('Fit to Width', 'easy-watermark') ?></option>
40	<option value="fit_to_height" <?php selected('fit_to_height', $scale_mode); ?>><?php _e('Fit to Height', 'easy-watermark') ?></option>
41	</select><p class="description"><?php _e('Select how to scale watermark image.', 'easy-watermark'); ?></p>
42	+ <label for="ew-scale-to-smaller"><input type="checkbox" size="3" id="ew-scale-to-smaller" name="easy-watermark-settings-image[scale_to_smaller]" <?php checked($scale_to_smaller); ?> /> <?php _e('Scale to Smaller', 'easy-watermark'); ?></label>
43	+ <p class="description"><?php _e('If this is checked, watermark will be scaled only for images smaller than watermark image.', 'easy-watermark'); ?></p>
44	</td></tr>
45	<tr id="ew-scale-row"><th scope="row">
46	<label for="ew-scale"><?php _e('Scale', 'easy-watermark'); ?></label></th><td>