Easy Watermark - Version 0.4

Version Description

introduced watermark image scaling option

Release Info

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

Code changes from version 0.3 to 0.4

Files changed (13) hide show

index.php +1 -1
js/interface.js +18 -0
languages/easy-watermark-fr_FR.mo +0 -0
languages/easy-watermark-fr_FR.po +389 -0
languages/easy-watermark-pl_PL.mo +0 -0
languages/easy-watermark-pl_PL.po +107 -43
languages/easy-watermark.pot +75 -36
lib/EasyWatermark.php +66 -7
lib/EasyWatermarkPlugin.php +15 -13
lib/EasyWatermarkSettings.php +3 -1
readme.txt +32 -4
views/settings-form-image.php +18 -4
views/settings-form-text.php +6 -6

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.3
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
6	Author: Wojtek Szałkiewicz
7	Author URI: http://szalkiewicz.pl/
8	License: GPLv2 or later

js/interface.js CHANGED Viewed

@@ -72,4 +72,22 @@
             		$('#easy-watermark-settings-form input').focusout(refreshImage)
             		$('#easy-watermark-settings-form select').change(refreshImage);
+            	}
             }(jQuery))


72	$('#easy-watermark-settings-form input').focusout(refreshImage)
73	$('#easy-watermark-settings-form select').change(refreshImage);
74	}
75	+
76	+ if($('input[name=option_page]').val() == 'easy-watermark-settings-image'){
77	+ var row = $('#ew-scale-row');
78	+ var select = $('#ew-scale-mode');
79	+ var value = select.val();
80	+ if(value == 'fit' \|\| value == 'fill'){
81	+ row.hide();
82	+ }
83	+ select.change(function(){
84	+ value = $(this).val();
85	+ if(value == 'fit_to_width' \|\| value == 'fit_to_height'){
86	+ row.fadeIn(200);
87	+ }
88	+ else {
89	+ row.hide();
90	+ }
91	+ });
92	+ }
93	}(jQuery))

languages/easy-watermark-fr_FR.mo ADDED Viewed

Binary file

languages/easy-watermark-fr_FR.po ADDED Viewed

	@@ -0,0 +1,389 @@


1	+ msgid ""
2	+ msgstr ""
3	+ "Project-Id-Version: Easy Watermark 0.4\n"
4	+ "Report-Msgid-Bugs-To: \n"
5	+ "POT-Creation-Date: 2013-04-29 00:25+0100\n"
6	+ "PO-Revision-Date: 2013-04-29 09:55+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"
10	+ "MIME-Version: 1.0\n"
11	+ "Content-Type: text/plain; charset=UTF-8\n"
12	+ "Content-Transfer-Encoding: 8bit\n"
13	+ "X-Generator: Poedit 1.5.4\n"
14	+
15	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:182
16	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:524
17	+ msgid "Watermark successfully added."
18	+ msgstr "Watermark ajouté avec succès."
19	+
20	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:189
21	+ msgid "Invalid mime type."
22	+ msgstr "Type MIME du fichier invalide."
23	+
24	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:192
25	+ msgid "No watermark image selected and no watermark text set."
26	+ msgstr "Aucune image ou texte Watermark n'est défini."
27	+
28	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:194
29	+ msgid "Go to settings page"
30	+ msgstr "Allez à la page des réglages"
31	+
32	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:198
33	+ msgid "An error has occurred."
34	+ msgstr "Une erreur est survenue"
35	+
36	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:204
37	+ msgid ""
38	+ "Easy Watermark is active, but requires GD library to work. Please enable "
39	+ "this extension."
40	+ msgstr ""
41	+ "Easy Watermark est activé, mais nécessite la présence de la librairie GD. "
42	+ "Veuillez activer cette extension."
43	+
44	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:204
45	+ msgid "Read more"
46	+ msgstr "Lire la suite"
47	+
48	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:224
49	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:225
50	+ msgid "Add Watermark"
51	+ msgstr "Ajouter Watermark"
52	+
53	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:240
54	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:256
55	+ msgid "Add watermark"
56	+ msgstr "Ajouter Watermark"
57	+
58	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:395
59	+ #, php-format
60	+ msgid "Not supported mime type of %s. Skipping..."
61	+ msgstr "Type MIME du fichier %s non supporté. Ignoré..."
62	+
63	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:400
64	+ #, php-format
65	+ msgid "Watermark successfully added to %s"
66	+ msgstr "Watermark ajouté avec succès à %s"
67	+
68	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:517
69	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:99
70	+ msgid "Easy Watermark"
71	+ msgstr ""
72	+
73	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:524
74	+ msgid "Go to Media Library"
75	+ msgstr "Aller à la Bibliothèque de médias"
76	+
77	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:534
78	+ msgid "Add watermark to all images"
79	+ msgstr "Ajouter Watermark à toutes les images"
80	+
81	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:534
82	+ msgid ""
83	+ "Be carefull with that option. If some images alredy has watermark, it will "
84	+ "be added though."
85	+ msgstr ""
86	+ "Attention avec cette option. Si des images on déjà un Watermark, il sera "
87	+ "ajouté malgré tout."
88	+
89	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:79
90	+ msgid "General"
91	+ msgstr "Général"
92	+
93	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:80
94	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:24
95	+ msgid "Image"
96	+ msgstr "Image"
97	+
98	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:81
99	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:25
100	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:3
101	+ msgid "Text"
102	+ msgstr "Texte"
103	+
104	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:270
105	+ msgid "Settings"
106	+ msgstr "Réglages"
107	+
108	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:284
109	+ msgid "Donate"
110	+ msgstr "Faites un don"
111	+
112	+ #: /media/szaleq/Data/easy-watermark/trunk/views/about.php:2
113	+ msgid "About"
114	+ msgstr "A propos"
115	+
116	+ #: /media/szaleq/Data/easy-watermark/trunk/views/about.php:4
117	+ msgid "Plugin Version"
118	+ msgstr "Version"
119	+
120	+ #: /media/szaleq/Data/easy-watermark/trunk/views/about.php:5
121	+ msgid "Plugin Author"
122	+ msgstr "Auteur"
123	+
124	+ #: /media/szaleq/Data/easy-watermark/trunk/views/about.php:6
125	+ msgid "GD library is enabled."
126	+ msgstr "La bibliothèque GD est active."
127	+
128	+ #: /media/szaleq/Data/easy-watermark/trunk/views/about.php:6
129	+ msgid "GD library is not available! Easy Watermark can't work without it."
130	+ msgstr ""
131	+ "La librairie GD n'est pas disponible. Sans elle, Easy Watermark ne peut pas "
132	+ "fonctionner."
133	+
134	+ #: /media/szaleq/Data/easy-watermark/trunk/views/about.php:8
135	+ msgid "Plugin page in WP repository"
136	+ msgstr "Page de l'extension sur le dépôt Wordpress"
137	+
138	+ #: /media/szaleq/Data/easy-watermark/trunk/views/about.php:10
139	+ msgid "FAQ"
140	+ msgstr ""
141	+
142	+ #: /media/szaleq/Data/easy-watermark/trunk/views/about.php:12
143	+ msgid "Support"
144	+ msgstr "Support"
145	+
146	+ #: /media/szaleq/Data/easy-watermark/trunk/views/about.php:13
147	+ msgid "Want to buy me a coffee?"
148	+ msgstr "Offrez-moi un café !"
149	+
150	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:3
151	+ msgid "Auto Watermark"
152	+ msgstr "Watermark automatique"
153	+
154	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:4
155	+ msgid "Add watermark when uploading images"
156	+ msgstr "Ajouter le Watermark à chaque transfert d'image"
157	+
158	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:6
159	+ msgid "Image Types"
160	+ msgstr "Types d'image"
161	+
162	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:10
163	+ msgid "Select image types which should be watermarked"
164	+ msgstr "Sélectionnez les types d'image à marquer"
165	+
166	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:12
167	+ msgid "Image Sizes"
168	+ msgstr "Tailles d'image"
169	+
170	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:18
171	+ msgid "Select image sizes which should be watermarked"
172	+ msgstr "Sélectionnez les tailles d'image à marquer"
173	+
174	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:21
175	+ msgid "Watermark Type"
176	+ msgstr "Type de Watermark"
177	+
178	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:26
179	+ msgid "Image + Text"
180	+ msgstr "Image + Texte"
181	+
182	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:28
183	+ msgid "Choose, whether to apply image, text, or both."
184	+ msgstr "Choisissez le type de Watermark à appliquer (Image, Texte ou les deux)"
185	+
186	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:3
187	+ #, fuzzy
188	+ msgid "Watermark Image"
189	+ msgstr "Image du Watermark "
190	+
191	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:8
192	+ msgid "Choose Watermark Image"
193	+ msgstr "Choisissez l'image Watermark"
194	+
195	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:8
196	+ msgid "Set as Watermark Image"
197	+ msgstr "Définir comme image Watermark"
198	+
199	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:8
200	+ msgid "Select/Upload Image"
201	+ msgstr "Choisir/Envoyer une image"
202	+
203	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:8
204	+ msgid ""
205	+ "Note: If you want to upload a new image, make sure that \"Auto watermark\" "
206	+ "option is unticked or text watermark is not set. Otherwise uploaded image "
207	+ "will be watermarked."
208	+ msgstr ""
209	+ "Note: Si vous souhaitez transférer une nouvelle image, assurez-vous que "
210	+ "l'option \"Watermark Automatique\" est désactivée ou qu'aucun texte "
211	+ "Watermark n'est défini. Dans le cas contraire, l'image transférée sera "
212	+ "marquée !"
213	+
214	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:17
215	+ msgid "Click on image to change it."
216	+ msgstr "Cliquez sur l'image pour la remplacer."
217	+
218	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:17
219	+ msgid "Remove image"
220	+ msgstr "Supprimer l'image"
221	+
222	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:18
223	+ msgid ""
224	+ "Note: If you want to upload a new image, make sure that \"Auto watermark\" "
225	+ "option is unticked, or remove current image and unset text watermark first. "
226	+ "Otherwise uploaded image will be watermarked."
227	+ msgstr ""
228	+ "Note: Si vous souhaitez transférer une nouvelle image, assurez-vous que "
229	+ "l'option \"Watermark Automatique\" est désactivée ou supprimez préalablement "
230	+ "l'image et le texte Watermark. Dans le cas contraire, l'image transférée "
231	+ "sera marquée !"
232	+
233	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:21
234	+ #, fuzzy
235	+ msgid "Image Alignment"
236	+ msgstr "Alignement de l'image"
237	+
238	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:34
239	+ msgid "Scaling Mode"
240	+ msgstr "Méthode de mise à l'échelle"
241	+
242	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:36
243	+ msgid "None"
244	+ msgstr "Aucune"
245	+
246	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:37
247	+ msgid "Fill"
248	+ msgstr "Remplir"
249	+
250	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:38
251	+ msgid "Fit"
252	+ msgstr "Ajuster"
253	+
254	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:39
255	+ msgid "Fit to Width"
256	+ msgstr "Ajuster en largeur"
257	+
258	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:40
259	+ msgid "Fit to Height"
260	+ msgstr "Ajuster en hauteur"
261	+
262	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:41
263	+ msgid "Select how to scale watermark image."
264	+ msgstr "Choisissez la manière dont le Watermark sera redimensionné."
265	+
266	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:46
267	+ msgid "Scale"
268	+ msgstr "Mise à l'échelle"
269	+
270	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:49
271	+ #, fuzzy
272	+ msgid "Image Offset"
273	+ msgstr "Décalage de l'image"
274	+
275	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:50
276	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:28
277	+ msgid "x"
278	+ msgstr ""
279	+
280	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:52
281	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:30
282	+ msgid "y"
283	+ msgstr ""
284	+
285	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:53
286	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:31
287	+ msgid ""
288	+ "Offset can be defined in pixels (just numeric value) or as percentage (e.g. "
289	+ "'33%')"
290	+ msgstr ""
291	+ "Le décalage peut être défini en pixels (valeur numérique) ou en pourcentage "
292	+ "(par exemple '33%')"
293	+
294	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:55
295	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:55
296	+ msgid "Opacity"
297	+ msgstr "Opacité"
298	+
299	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:55
300	+ msgid "Opacity does not affect the png images with alpha chanel."
301	+ msgstr "L'opacité n'a aucun effet sur les images PNG avec un canal alpha."
302	+
303	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:8
304	+ msgid "Preview"
305	+ msgstr "Aperçu"
306	+
307	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:14
308	+ #, fuzzy
309	+ msgid "Text Alignment"
310	+ msgstr "Alignement du texte"
311	+
312	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:27
313	+ #, fuzzy
314	+ msgid "Text Offset"
315	+ msgstr "Décalage du texte"
316	+
317	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:33
318	+ msgid "Font"
319	+ msgstr "Police"
320	+
321	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:44
322	+ #, fuzzy
323	+ msgid "Text Color"
324	+ msgstr "Couleur du texte"
325	+
326	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:47
327	+ #, fuzzy
328	+ msgid "Text Size"
329	+ msgstr "Taille du texte"
330	+
331	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:51
332	+ #, fuzzy
333	+ msgid "Text Angle"
334	+ msgstr "Angle du texte"
335	+
336	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-page.php:6
337	+ msgid "Easy Watermark Settings"
338	+ msgstr "Réglages Easy Watermark"
339	+
340	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-page.php:22
341	+ msgid "Save Changes"
342	+ msgstr ""
343	+
344	+ #~ msgid "Loading preview..."
345	+ #~ msgstr "Chargement de l'aperçu..."
346	+
347	+ #~ msgid "Go to Easy Watermark Tool"
348	+ #~ msgstr "Przejdź do Easy Watermark"
349	+
350	+ #~ msgid "Go back"
351	+ #~ msgstr "Wróć"
352	+
353	+ #~ msgid "or"
354	+ #~ msgstr "lub"
355	+
356	+ #~ msgid "Text position"
357	+ #~ msgstr "Pozycja tekstu"
358	+
359	+ #~ msgid "vertical"
360	+ #~ msgstr "pionowa"
361	+
362	+ #~ msgid "top"
363	+ #~ msgstr "góra"
364	+
365	+ #~ msgid "middle"
366	+ #~ msgstr "środek"
367	+
368	+ #~ msgid "bottom"
369	+ #~ msgstr "dół"
370	+
371	+ #~ msgid "horizontal"
372	+ #~ msgstr "pozioma"
373	+
374	+ #~ msgid "left"
375	+ #~ msgstr "do lewej"
376	+
377	+ #~ msgid "center"
378	+ #~ msgstr "wyśrodkowany"
379	+
380	+ #~ msgid "right"
381	+ #~ msgstr "do prawej"
382	+
383	+ #~ msgid ""
384	+ #~ "Note: if \"Auto watermark\" option is ticked, untick it before uploading "
385	+ #~ "new watermark image or remove current image first."
386	+ #~ msgstr ""
387	+ #~ "Uwaga: Jeśli opcja \"Automatyczne dodawanie\" jest zaznaczona, odznacz ją "
388	+ #~ "przed wgrywaniem nowego znaku wodnego lub usuń najpierw bieżący znak "
389	+ #~ "wodny."

languages/easy-watermark-pl_PL.mo CHANGED Viewed

Binary file

languages/easy-watermark-pl_PL.po CHANGED Viewed

	@@ -1,15 +1,16 @@
1	msgid ""
2	msgstr ""
3	- "Project-Id-Version: Easy Watermark 0.3\n"
4	"Report-Msgid-Bugs-To: \n"
5	- "POT-Creation-Date: 2013-04-18 00:02+0100\n"
6	- "PO-Revision-Date: 2013-04-18 00:06+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"
10	"MIME-Version: 1.0\n"
11	"Content-Type: text/plain; charset=UTF-8\n"
12	"Content-Transfer-Encoding: 8bit\n"

13
14	#: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:182
15	#: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:524
	@@ -33,8 +34,12 @@ msgid "An error has occurred."
33	msgstr "Wystąpił błąd."
34
35	#: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:204
36	- msgid "~~Easy Watermark is active, but requires GD library to work. Please enable this extension.~~"
37	- ~~msgstr~~ "Easy Watermark ~~jest~~ ~~aktywny~~, ~~ale~~ ~~wymaga~~ ~~biblioteki~~ GD do ~~działania~~. ~~Proszę,~~ ~~włącz~~ ~~to rozszerzenie.~~"




38
39	#: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:204
40	msgid "Read more"
	@@ -61,7 +66,7 @@ msgid "Watermark successfully added to %s"
61	msgstr "Znak wodny dodany do %s"
62
63	#: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:517
64	- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:97
65	msgid "Easy Watermark"
66	msgstr ""
67
	@@ -74,29 +79,33 @@ msgid "Add watermark to all images"
74	msgstr "Dodaj znak wodny do wszystkich obrazów"
75
76	#: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:534
77	- msgid "~~Be carefull with that option. If some images alredy has watermark, it will be added though.~~"
78	- ~~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.~~"




79
80	- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:77
81	msgid "General"
82	msgstr "Ogólne"
83
84	- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:78
85	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:24
86	msgid "Image"
87	msgstr "Obraz"
88
89	- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:79
90	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:25
91	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:3
92	msgid "Text"
93	msgstr "Tekst"
94
95	- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:~~268~~
96	msgid "Settings"
97	msgstr "Ustawienia"
98
99	- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:~~282~~
100	msgid "Donate"
101	msgstr "Przekaż dotację"
102
	@@ -118,7 +127,8 @@ msgstr "Biblioteka GD jest włączona."
118
119	#: /media/szaleq/Data/easy-watermark/trunk/views/about.php:6
120	msgid "GD library is not available! Easy Watermark can't work without it."
121	- msgstr "~~Biblioteka GD jest niedostępna! Easy Watermark nie może bez niej pracować.~~"

122
123	#: /media/szaleq/Data/easy-watermark/trunk/views/about.php:8
124	msgid "Plugin page in WP repository"
	@@ -170,10 +180,12 @@ msgstr "Obraz i tekst"
170
171	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:28
172	msgid "Choose, whether to apply image, text, or both."
173	- msgstr "~~Wybierz, czy jako znak wodny zastosować obraz, tekst, czy tekst z obrazem.~~"

174
175	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:3
176	- ~~msgid~~ ~~"Watermark image"~~

177	msgstr "Znak wodny"
178
179	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:8
	@@ -189,54 +201,98 @@ msgid "Select/Upload Image"
189	msgstr "Wybierz/wgraj obraz"
190
191	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:8
192	- msgid "~~Note: If you want to upload a new image, make sure that \~~"~~Auto watermark\" option is unticked or text watermark is not set. Otherwise uploaded image will be watermarked."~~
193	- ~~msgstr~~ "~~Uwaga~~: ~~Jeśli~~ ~~chcesz~~ ~~wgrać~~ ~~nowy~~ ~~obraz~~, ~~upewnij~~ ~~się,~~ że ~~opcja~~ \"~~Automatyczne~~ ~~dodawanie~~\" ~~jest odznaczona, lub tekstowy znak wodny nie jest ustawiony. W przeciwnym wypadku wgrywany obraz zostanie oznaczony znakiem wodnym.~~"






194
195	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:17
196	- msgid "Loading preview..."
197	- msgstr "Ładowanie podglądu..."
198	-
199	- #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:18
200	msgid "Click on image to change it."
201	msgstr "Kliknij na obraz by go zmienić."
202
203	- #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:18
204	msgid "Remove image"
205	msgstr "Usuń obraz"
206
207	- #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:19
208	- msgid "~~Note: If you want to upload a new image, make sure that \~~"~~Auto watermark\" option is unticked, or remove current image and unset text watermark first. Otherwise uploaded image will be watermarked."~~
209	- ~~msgstr~~ "~~Uwaga~~: ~~Jeśli~~ ~~chcesz~~ ~~wgrać~~ ~~nowy~~ ~~obraz~~, ~~upewnij~~ ~~się,~~ że ~~opcja~~ \"~~Automatyczne~~ ~~dodawanie~~\" ~~jest odznaczona, lub usuń bieżący obraz i zresetuj tekstowy znak wodny. W przeciwnym wypadku wgrywany obraz zostanie oznaczony znakiem wodnym.~~"






210
211	- #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:22
212	- msgid "Image ~~alignment~~"
213	- msgstr "Wyrównanie ~~obrazu~~"
214
215	- #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:35
216	- msgid "~~Image~~ ~~offset~~"
217	- msgstr "~~Offset obrazu~~"
218
219	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:36
































220	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:28
221	msgid "x"
222	msgstr ""
223
224	- #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:38
225	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:30
226	msgid "y"
227	msgstr ""
228
229	- #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:39
230	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:31
231	- msgid "~~Offset can be defined in pixels (just numeric value) or as percentage (e.g. '33%')~~"
232	- ~~msgstr~~ "Offset ~~może~~ ~~być~~ ~~ustawiony~~ w ~~pikselach~~ (po ~~porstu~~ ~~numer~~) ~~lub~~ ~~procentowo~~ (np. ~~'33%')~~"




233
234	- #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:41
235	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:55
236	msgid "Opacity"
237	msgstr "Nieprzezroczystość"
238
239	- #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:41
240	msgid "Opacity does not affect the png images with alpha chanel."
241	msgstr "Ta opcja nie dotyczy obrazów png posiadających kanał alfa."
242
	@@ -245,11 +301,13 @@ msgid "Preview"
245	msgstr "Podgląd"
246
247	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:14
248	- ~~msgid~~ ~~"Text alignment"~~

249	msgstr "Wyrównanie tekstu"
250
251	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:27
252	- ~~msgid~~ ~~"Text offset"~~

253	msgstr "Offset tekstu"
254
255	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:33
	@@ -257,15 +315,18 @@ msgid "Font"
257	msgstr "Czcionka"
258
259	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:44
260	- ~~msgid~~ ~~"Text color"~~

261	msgstr "Kolor tekstu"
262
263	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:47
264	- ~~msgid~~ ~~"Text size"~~

265	msgstr "Rozmiar tekstu"
266
267	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:51
268	- ~~msgid~~ ~~"Text angle"~~

269	msgstr "Kąt obrotu tekstu"
270
271	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-page.php:6
	@@ -276,6 +337,9 @@ msgstr "Ustawienia Easy Watermark"
276	msgid "Save Changes"
277	msgstr "Zapisz zmiany"
278



279	#~ msgid "Go to Easy Watermark Tool"
280	#~ msgstr "Przejdź do Easy Watermark"
281


1	msgid ""
2	msgstr ""
3	+ "Project-Id-Version: Easy Watermark 0.4\n"
4	"Report-Msgid-Bugs-To: \n"
5	+ "POT-Creation-Date: 2013-04-29 18:36+0100\n"
6	+ "PO-Revision-Date: 2013-04-29 18:36+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"
10	"MIME-Version: 1.0\n"
11	"Content-Type: text/plain; charset=UTF-8\n"
12	"Content-Transfer-Encoding: 8bit\n"
13	+ "X-Generator: Poedit 1.5.4\n"
14
15	#: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:182
16	#: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:524

34	msgstr "Wystąpił błąd."
35
36	#: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:204
37	+ msgid ""
38	+ "Easy Watermark is active, but requires GD library to work. Please enable "
39	+ "this extension."
40	+ msgstr ""
41	+ "Easy Watermark jest aktywny, ale wymaga biblioteki GD do działania. Proszę, "
42	+ "włącz to rozszerzenie."
43
44	#: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:204
45	msgid "Read more"

66	msgstr "Znak wodny dodany do %s"
67
68	#: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:517
69	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:99
70	msgid "Easy Watermark"
71	msgstr ""
72

79	msgstr "Dodaj znak wodny do wszystkich obrazów"
80
81	#: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:534
82	+ msgid ""
83	+ "Be carefull with that option. If some images alredy has watermark, it will "
84	+ "be added though."
85	+ msgstr ""
86	+ "Bądź ostrożny używając tej opcji. Jeśli któreś zdjęcia posiadają już znak "
87	+ "wodny, zostanie on dodany po raz drugi."
88
89	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:79
90	msgid "General"
91	msgstr "Ogólne"
92
93	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:80
94	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:24
95	msgid "Image"
96	msgstr "Obraz"
97
98	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:81
99	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:25
100	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:3
101	msgid "Text"
102	msgstr "Tekst"
103
104	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:270
105	msgid "Settings"
106	msgstr "Ustawienia"
107
108	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:284
109	msgid "Donate"
110	msgstr "Przekaż dotację"
111

127
128	#: /media/szaleq/Data/easy-watermark/trunk/views/about.php:6
129	msgid "GD library is not available! Easy Watermark can't work without it."
130	+ msgstr ""
131	+ "Biblioteka GD jest niedostępna! Easy Watermark nie może bez niej pracować."
132
133	#: /media/szaleq/Data/easy-watermark/trunk/views/about.php:8
134	msgid "Plugin page in WP repository"

180
181	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:28
182	msgid "Choose, whether to apply image, text, or both."
183	+ msgstr ""
184	+ "Wybierz, czy jako znak wodny zastosować obraz, tekst, czy tekst z obrazem."
185
186	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:3
187	+ #, fuzzy
188	+ msgid "Watermark Image"
189	msgstr "Znak wodny"
190
191	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:8

201	msgstr "Wybierz/wgraj obraz"
202
203	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:8
204	+ msgid ""
205	+ "Note: If you want to upload a new image, make sure that \"Auto watermark\" "
206	+ "option is unticked or text watermark is not set. Otherwise uploaded image "
207	+ "will be watermarked."
208	+ msgstr ""
209	+ "Uwaga: Jeśli chcesz wgrać nowy obraz, upewnij się, że opcja \"Automatyczne "
210	+ "dodawanie\" jest odznaczona, lub tekstowy znak wodny nie jest ustawiony. W "
211	+ "przeciwnym wypadku wgrywany obraz zostanie oznaczony znakiem wodnym."
212
213	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:17




214	msgid "Click on image to change it."
215	msgstr "Kliknij na obraz by go zmienić."
216
217	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:17
218	msgid "Remove image"
219	msgstr "Usuń obraz"
220
221	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:18
222	+ msgid ""
223	+ "Note: If you want to upload a new image, make sure that \"Auto watermark\" "
224	+ "option is unticked, or remove current image and unset text watermark first. "
225	+ "Otherwise uploaded image will be watermarked."
226	+ msgstr ""
227	+ "Uwaga: Jeśli chcesz wgrać nowy obraz, upewnij się, że opcja \"Automatyczne "
228	+ "dodawanie\" jest odznaczona, lub usuń bieżący obraz i zresetuj tekstowy znak "
229	+ "wodny. W przeciwnym wypadku wgrywany obraz zostanie oznaczony znakiem wodnym."
230
231	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:21
232	+ msgid "Image Alignment"
233	+ msgstr "Wyrównanie obrazka"
234
235	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:34
236	+ msgid "Scaling Mode"
237	+ msgstr "Skalowanie"
238
239	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:36
240	+ msgid "None"
241	+ msgstr "Brak"
242	+
243	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:37
244	+ msgid "Fill"
245	+ msgstr "Wypełnij"
246	+
247	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:38
248	+ msgid "Fit"
249	+ msgstr "Dopasuj"
250	+
251	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:39
252	+ msgid "Fit to Width"
253	+ msgstr "Dopasuj szerokość"
254	+
255	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:40
256	+ msgid "Fit to Height"
257	+ msgstr "Dopasuj wysokość"
258	+
259	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:41
260	+ msgid "Select how to scale watermark image."
261	+ msgstr "Wybierz sposób skalowania znaku wodnego."
262	+
263	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:46
264	+ msgid "Scale"
265	+ msgstr "Skala"
266	+
267	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:49
268	+ msgid "Image Offset"
269	+ msgstr "Offset obrazka"
270	+
271	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:50
272	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:28
273	msgid "x"
274	msgstr ""
275
276	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:52
277	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:30
278	msgid "y"
279	msgstr ""
280
281	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:53
282	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:31
283	+ msgid ""
284	+ "Offset can be defined in pixels (just numeric value) or as percentage (e.g. "
285	+ "'33%')"
286	+ msgstr ""
287	+ "Offset może być ustawiony w pikselach (po porstu numer) lub procentowo (np. "
288	+ "'33%')"
289
290	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:55
291	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:55
292	msgid "Opacity"
293	msgstr "Nieprzezroczystość"
294
295	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:55
296	msgid "Opacity does not affect the png images with alpha chanel."
297	msgstr "Ta opcja nie dotyczy obrazów png posiadających kanał alfa."
298

301	msgstr "Podgląd"
302
303	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:14
304	+ #, fuzzy
305	+ msgid "Text Alignment"
306	msgstr "Wyrównanie tekstu"
307
308	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:27
309	+ #, fuzzy
310	+ msgid "Text Offset"
311	msgstr "Offset tekstu"
312
313	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:33

315	msgstr "Czcionka"
316
317	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:44
318	+ #, fuzzy
319	+ msgid "Text Color"
320	msgstr "Kolor tekstu"
321
322	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:47
323	+ #, fuzzy
324	+ msgid "Text Size"
325	msgstr "Rozmiar tekstu"
326
327	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:51
328	+ #, fuzzy
329	+ msgid "Text Angle"
330	msgstr "Kąt obrotu tekstu"
331
332	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-page.php:6

337	msgid "Save Changes"
338	msgstr "Zapisz zmiany"
339
340	+ #~ msgid "Loading preview..."
341	+ #~ msgstr "Ładowanie podglądu..."
342	+
343	#~ msgid "Go to Easy Watermark Tool"
344	#~ msgstr "Przejdź do Easy Watermark"
345

languages/easy-watermark.pot CHANGED Viewed

	@@ -1,15 +1,15 @@
1	msgid ""
2	msgstr ""
3	- "Project-Id-Version: Easy Watermark 0.3\n"
4	"Report-Msgid-Bugs-To: \n"
5	- "POT-Creation-Date: 2013-04-18 00:01+0100\n"
6	- "PO-Revision-Date: 2013-04-18 00: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: \n"
10	"MIME-Version: 1.0\n"
11	"Content-Type: text/plain; charset=UTF-8\n"
12	"Content-Transfer-Encoding: 8bit\n"

13
14	#: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:182
15	#: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:524
	@@ -33,7 +33,9 @@ msgid "An error has occurred."
33	msgstr ""
34
35	#: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:204
36	- msgid "~~Easy Watermark is active, but requires GD library to work. Please enable this extension.~~"


37	msgstr ""
38
39	#: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:204
	@@ -61,7 +63,7 @@ msgid "Watermark successfully added to %s"
61	msgstr ""
62
63	#: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:517
64	- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:97
65	msgid "Easy Watermark"
66	msgstr ""
67
	@@ -74,29 +76,31 @@ msgid "Add watermark to all images"
74	msgstr ""
75
76	#: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:534
77	- msgid "~~Be carefull with that option. If some images alredy has watermark, it will be added though.~~"


78	msgstr ""
79
80	- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:77
81	msgid "General"
82	msgstr ""
83
84	- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:78
85	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:24
86	msgid "Image"
87	msgstr ""
88
89	- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:79
90	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:25
91	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:3
92	msgid "Text"
93	msgstr ""
94
95	- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:~~268~~
96	msgid "Settings"
97	msgstr ""
98
99	- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:~~282~~
100	msgid "Donate"
101	msgstr ""
102
	@@ -173,7 +177,7 @@ msgid "Choose, whether to apply image, text, or both."
173	msgstr ""
174
175	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:3
176	- msgid "Watermark ~~image~~"
177	msgstr ""
178
179	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:8
	@@ -189,54 +193,90 @@ msgid "Select/Upload Image"
189	msgstr ""
190
191	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:8
192	- msgid "~~Note: If you want to upload a new image, make sure that \~~"~~Auto watermark\" option is unticked or text watermark is not set. Otherwise uploaded image will be watermarked."~~



193	msgstr ""
194
195	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:17
196	- msgid "Loading preview..."
197	- msgstr ""
198	-
199	- #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:18
200	msgid "Click on image to change it."
201	msgstr ""
202
203	- #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:18
204	msgid "Remove image"
205	msgstr ""
206
207	- #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:19
208	- msgid "~~Note: If you want to upload a new image, make sure that \~~"~~Auto watermark\" option is unticked, or remove current image and unset text watermark first. Otherwise uploaded image will be watermarked."~~



209	msgstr ""
210
211	- #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:22
212	- msgid "Image ~~alignment~~"
213	msgstr ""
214
215	- #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:35
216	- msgid "~~Image~~ ~~offset~~"
217	msgstr ""
218
219	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:36
































220	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:28
221	msgid "x"
222	msgstr ""
223
224	- #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:38
225	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:30
226	msgid "y"
227	msgstr ""
228
229	- #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:39
230	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:31
231	- msgid "~~Offset can be defined in pixels (just numeric value) or as percentage (e.g. '33%')~~"


232	msgstr ""
233
234	- #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:41
235	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:55
236	msgid "Opacity"
237	msgstr ""
238
239	- #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:41
240	msgid "Opacity does not affect the png images with alpha chanel."
241	msgstr ""
242
	@@ -245,11 +285,11 @@ msgid "Preview"
245	msgstr ""
246
247	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:14
248	- msgid "Text ~~alignment~~"
249	msgstr ""
250
251	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:27
252	- msgid "Text ~~offset~~"
253	msgstr ""
254
255	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:33
	@@ -257,15 +297,15 @@ msgid "Font"
257	msgstr ""
258
259	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:44
260	- msgid "Text ~~color~~"
261	msgstr ""
262
263	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:47
264	- msgid "Text ~~size~~"
265	msgstr ""
266
267	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:51
268	- msgid "Text ~~angle~~"
269	msgstr ""
270
271	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-page.php:6
	@@ -275,4 +315,3 @@ msgstr ""
275	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-page.php:22
276	msgid "Save Changes"
277	msgstr ""
278	-


1	msgid ""
2	msgstr ""
3	+ "Project-Id-Version: Easy Watermark 0.4\n"
4	"Report-Msgid-Bugs-To: \n"
5	+ "POT-Creation-Date: 2013-04-29 18:16+0100\n"
6	+ "PO-Revision-Date: 2013-04-29 18:16+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"
10	"Content-Type: text/plain; charset=UTF-8\n"
11	"Content-Transfer-Encoding: 8bit\n"
12	+ "X-Generator: Poedit 1.5.4\n"
13
14	#: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:182
15	#: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:524

33	msgstr ""
34
35	#: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:204
36	+ msgid ""
37	+ "Easy Watermark is active, but requires GD library to work. Please enable "
38	+ "this extension."
39	msgstr ""
40
41	#: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:204

63	msgstr ""
64
65	#: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:517
66	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:99
67	msgid "Easy Watermark"
68	msgstr ""
69

76	msgstr ""
77
78	#: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:534
79	+ msgid ""
80	+ "Be carefull with that option. If some images alredy has watermark, it will "
81	+ "be added though."
82	msgstr ""
83
84	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:79
85	msgid "General"
86	msgstr ""
87
88	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:80
89	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:24
90	msgid "Image"
91	msgstr ""
92
93	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:81
94	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:25
95	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:3
96	msgid "Text"
97	msgstr ""
98
99	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:270
100	msgid "Settings"
101	msgstr ""
102
103	+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:284
104	msgid "Donate"
105	msgstr ""
106

177	msgstr ""
178
179	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:3
180	+ msgid "Watermark Image"
181	msgstr ""
182
183	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:8

193	msgstr ""
194
195	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:8
196	+ msgid ""
197	+ "Note: If you want to upload a new image, make sure that \"Auto watermark\" "
198	+ "option is unticked or text watermark is not set. Otherwise uploaded image "
199	+ "will be watermarked."
200	msgstr ""
201
202	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:17




203	msgid "Click on image to change it."
204	msgstr ""
205
206	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:17
207	msgid "Remove image"
208	msgstr ""
209
210	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:18
211	+ msgid ""
212	+ "Note: If you want to upload a new image, make sure that \"Auto watermark\" "
213	+ "option is unticked, or remove current image and unset text watermark first. "
214	+ "Otherwise uploaded image will be watermarked."
215	msgstr ""
216
217	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:21
218	+ msgid "Image Alignment"
219	msgstr ""
220
221	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:34
222	+ msgid "Scaling Mode"
223	msgstr ""
224
225	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:36
226	+ msgid "None"
227	+ msgstr ""
228	+
229	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:37
230	+ msgid "Fill"
231	+ msgstr ""
232	+
233	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:38
234	+ msgid "Fit"
235	+ msgstr ""
236	+
237	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:39
238	+ msgid "Fit to Width"
239	+ msgstr ""
240	+
241	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:40
242	+ msgid "Fit to Height"
243	+ msgstr ""
244	+
245	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:41
246	+ msgid "Select how to scale watermark image."
247	+ msgstr ""
248	+
249	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:46
250	+ msgid "Scale"
251	+ msgstr ""
252	+
253	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:49
254	+ msgid "Image Offset"
255	+ msgstr ""
256	+
257	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:50
258	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:28
259	msgid "x"
260	msgstr ""
261
262	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:52
263	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:30
264	msgid "y"
265	msgstr ""
266
267	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:53
268	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:31
269	+ msgid ""
270	+ "Offset can be defined in pixels (just numeric value) or as percentage (e.g. "
271	+ "'33%')"
272	msgstr ""
273
274	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:55
275	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:55
276	msgid "Opacity"
277	msgstr ""
278
279	+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:55
280	msgid "Opacity does not affect the png images with alpha chanel."
281	msgstr ""
282

285	msgstr ""
286
287	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:14
288	+ msgid "Text Alignment"
289	msgstr ""
290
291	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:27
292	+ msgid "Text Offset"
293	msgstr ""
294
295	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:33

297	msgstr ""
298
299	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:44
300	+ msgid "Text Color"
301	msgstr ""
302
303	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:47
304	+ msgid "Text Size"
305	msgstr ""
306
307	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:51
308	+ msgid "Text Angle"
309	msgstr ""
310
311	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-page.php:6

315	#: /media/szaleq/Data/easy-watermark/trunk/views/settings-page.php:22
316	msgid "Save Changes"
317	msgstr ""

lib/EasyWatermark.php CHANGED Viewed

@@ -1,7 +1,7 @@
             <?php
             /**
              * @package	Easy Watermark
-            -
             * @version	2.1
              * @license	GPL
              * @author	Wojtek Szałkiewicz
              * @author url 	http://szalkiewicz.pl
@@ -29,10 +29,7 @@
              * 		->setWatermarkPath('path/to/watermark.png')
              * 		->printOutput(); // returns image with proper header
+             *
-            -
             * You can also specify custom output format, and save it as file using saveOutput method.
-            -
             * TODO:
-            -
             * 	- watermark scaling
-            -
             * Any other ideas, pleas contact me.
              */
             class EasyWatermark
@@ -46,14 +43,16 @@ class EasyWatermark
             				'position_y' => 2,
             				'offset_x' => 0,
             				'offset_y' => 0,
-            -
            				'opacity' => 100
             			),
             			'text' => array(
             				'position_x' => 2,
             				'position_y' => 2,
             				'offset_x' => 0,
             				'offset_y' => 0,
-            -
            				'opacity' => 60,
             				'color' => '000000',
             				'font' => '',
             				'size' => 24,
@@ -365,6 +364,20 @@ class EasyWatermark
             				break;
+            		}
             		if(isset($settings['color'])){
             			if(strpos($settings['color'], '#') === 0){
             				$settings['color'] = substr($settings['color'], 1);
@@ -486,6 +499,52 @@ class EasyWatermark
             		// Get watermark dimensions
             		list($watermarkWidth, $watermarkHeight) = $this->getWatermarkSize();
             		// Compute watermark offset
             		$offsetX = $this->computeOffset($settings['position_x'], $settings['offset_x'],
             						$imageWidth, $watermarkWidth, $settings['offset_x_pc']);


1	<?php
2	/**
3	* @package Easy Watermark
4	+ * @version 3.0
5	* @license GPL
6	* @author Wojtek Szałkiewicz
7	* @author url http://szalkiewicz.pl

29	* ->setWatermarkPath('path/to/watermark.png')
30	* ->printOutput(); // returns image with proper header
31	*
32	+ * You can also specify output format, and save it as file using saveOutput method.



33	*/
34
35	class EasyWatermark

43	'position_y' => 2,
44	'offset_x' => 0,
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,
52	'position_y' => 2,
53	'offset_x' => 0,
54	'offset_y' => 0,
55	+ 'opacity' => 60, // percent
56	'color' => '000000',
57	'font' => '',
58	'size' => 24,

364	break;
365	}
366
367	+ switch($settings['position_y']){
368	+ case 'top':
369	+ $settings['position_y'] = 1;
370	+ break;
371	+ case 'middle':
372	+ case 'mdl':
373	+ $settings['position_y'] = 2;
374	+ break;
375	+ case 'bottom':
376	+ case 'btm':
377	+ $settings['position_y'] = 3;
378	+ break;
379	+ }
380	+
381	if(isset($settings['color'])){
382	if(strpos($settings['color'], '#') === 0){
383	$settings['color'] = substr($settings['color'], 1);

499	// Get watermark dimensions
500	list($watermarkWidth, $watermarkHeight) = $this->getWatermarkSize();
501
502	+ if($settings['scale_mode'] == 'fill' \|\| $settings['scale_mode'] == 'fit'){
503	+ $imgRatio = $imageWidth / $imageHeight;
504	+ $watermarkRatio = $watermarkWidth / $watermarkHeight;
505	+
506	+ if(($settings['scale_mode'] == 'fill' && $watermarkRatio < $imgRatio) \|\|
507	+ ($settings['scale_mode'] == 'fit' && $watermarkRatio > $imgRatio)){
508	+ $settings['scale_mode'] = 'fit_to_width';
509	+ $settings['scale'] = 100;
510	+ }
511	+ else {
512	+ $settings['scale_mode'] = 'fit_to_height';
513	+ $settings['scale'] = 100;
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;
526	+ }
527	+
528	+ if(isset($newWidth)){
529	+ $tmpImage = imagecreatetruecolor($newWidth, $newHeight);
530	+ if($this->watermarkImageType == 'png' && $this->isAlphaPng($this->watermarkPath)){
531	+ // preserve png transparency
532	+ imagecolortransparent($tmpImage, imagecolorallocatealpha($tmpImage, 0, 0, 0, 127));
533	+ imagealphablending($tmpImage, false);
534	+ imagesavealpha($tmpImage, true);
535	+ }
536	+
537	+ imagecopyresampled($tmpImage, $this->watermarkImage,
538	+ 0, 0, 0, 0,
539	+ $newWidth, $newHeight, $watermarkWidth, $watermarkHeight);
540	+
541	+ $this->watermarkImage = $tmpImage;
542	+ $watermarkWidth = $newWidth;
543	+ $watermarkHeight = $newHeight;
544	+
545	+ unset($tmpImage, $newWidth, $nweHeight);
546	+ }
547	+
548	// Compute watermark offset
549	$offsetX = $this->computeOffset($settings['position_x'], $settings['offset_x'],
550	$imageWidth, $watermarkWidth, $settings['offset_x_pc']);

lib/EasyWatermarkPlugin.php CHANGED Viewed

	@@ -22,7 +22,7 @@ class EasyWatermarkPlugin extends ewPluginCore
22	/**
23	* @var string plugin version
24	*/
25	- protected static $version = '0.3.0';
26
27	/**
28	* @var string plugin class name
	@@ -176,7 +176,7 @@ class EasyWatermarkPlugin extends ewPluginCore
176	* @return void
177	*/
178	public function admin_notices(){
179	- if(isset($_GET['watermarked']) && $_GET['watermarked'] == '1'):
180	?>
181	<div class="updated">
182	<p><?php _e('Watermark successfully added.', 'easy-watermark'); ?></p>
	@@ -516,27 +516,26 @@ class EasyWatermarkPlugin extends ewPluginCore
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'])){
521	- ~~if($output = $this->watermark_all()) :~~
522	- ?>
523	<div id="message" class="updated below-h2">
524	<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>
525	</div>
526	- <?
527	- echo $output;
528	- endif;
529	- }
530	- }
531	- else {
532	?>
533	<br/>
534	<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>
535	<?php
536	- }
537	?>
538	</div>
539	<?php


540	}
541
542	public function easy_watermark_style(){
	@@ -649,6 +648,9 @@ class EasyWatermarkPlugin extends ewPluginCore
649	$settings['text']['alignment'] = static::getAlignment($settings['text']['position_x'], $settings['text']['position_y']);
650	}
651



652	$settings['general'] = array_merge(EasyWatermarkSettings::getDefaults('general'), $settings['general']);
653
654	static::install($settings);


22	/**
23	* @var string plugin version
24	*/
25	+ protected static $version = '0.4.0';
26
27	/**
28	* @var string plugin class name

176	* @return void
177	*/
178	public function admin_notices(){
179	+ if(isset($_GET['watermarked']) && $_GET['watermarked'] == '1') :
180	?>
181	<div class="updated">
182	<p><?php _e('Watermark successfully added.', 'easy-watermark'); ?></p>

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(){

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);

lib/EasyWatermarkSettings.php CHANGED Viewed

	@@ -36,7 +36,9 @@ class EasyWatermarkSettings
36	'alignment' => 5,
37	'offset_x' => 100,
38	'offset_y' => 100,
39	- 'opacity' => 100


40	),
41	'text' => array(
42	'position_x' => 'center',


36	'alignment' => 5,
37	'offset_x' => 100,
38	'offset_y' => 100,
39	+ 'opacity' => 100,
40	+ 'scale_mode' => 'none',
41	+ 'scale' => 100
42	),
43	'text' => array(
44	'position_x' => 'center',

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.3
8	License: GPLv2 or later
9	License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
	@@ -12,7 +12,22 @@ Automatically adds watermark to images when they are uploaded to the WordPress M
12
13	== Description ==
14
15	- ~~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.















16
17	== Installation ==
18
	@@ -42,16 +57,29 @@ You can choose text font from the list of ten fonts included to this plugin. In
42	= Can I use my font for text watermark? =
43	There is no user-friendly way to do this, however if you know what you do, you can upload your truetype font file to the %plugin_dir%/fonts. Then edit %plugin_dir%/lib/EasyWatermarkSettings.php and add your font file name to $fonts array.
44










45	== Screenshots ==
46
47	1. General settings page
48	- 2. ~~Text~~ settings page
49	- 3. ~~Image~~ settings page
50	4. Easy Watermark Tool
51	5. 'Add Watermark' link in media library
52
53	== Changelog ==
54



55	= 0.3 =
56	* added support for all image sizes (thumbnail, medium, large), not only the fullsize image
57	* plugin now checks if the GD library is available, if not, it'll inform you about it instead of throw errors


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

12
13	== Description ==
14
15	+ Easy Watermark 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).
16	+
17	+ = Plugin features =
18	+ * image watermark can be a jpg, png or gif
19	+ * full support for transparency and alpha chanel in png and gif files
20	+ * jpg files, gif files and text can have opacity set (from 0 to 100%)
21	+ * text watermark is created using ttf fonts
22	+ * text color, size and rotation can be set
23	+ * all default image sizes can be watermarked (thumbnail, medium, large and fullsize)
24	+ * fully translatable
25	+
26	+ = Translations included =
27	+ * polish
28	+ * french (by Regis Brisard)
29	+
30	+ If you have made a translation and want to contribute with it to Easy Watermark, please e-mail me.
31
32	== Installation ==
33

57	= Can I use my font for text watermark? =
58	There is no user-friendly way to do this, however if you know what you do, you can upload your truetype font file to the %plugin_dir%/fonts. Then edit %plugin_dir%/lib/EasyWatermarkSettings.php and add your font file name to $fonts array.
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	+
70	== Screenshots ==
71
72	1. General settings page
73	+ 2. Image settings page
74	+ 3. Text settings page
75	4. Easy Watermark Tool
76	5. 'Add Watermark' link in media library
77
78	== Changelog ==
79
80	+ = 0.4 =
81	+ * introduced watermark image scaling option
82	+
83	= 0.3 =
84	* added support for all image sizes (thumbnail, medium, large), not only the fullsize image
85	* plugin now checks if the GD library is available, if not, it'll inform you about it instead of throw errors

views/settings-form-image.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1
2	<table class="form-table">
3	- <tr valign="top"><th scope="row"><label for="easy-watermark-url"><?php _e('Watermark ~~image~~', 'easy-watermark'); ?></label></th>
4	<td><input id="easy-watermark-url" class="regular-text" name="easy-watermark-settings-image[watermark_url]" type="hidden" value="<?php echo $watermark_url; ?>" /><input id="easy-watermark-id" name="easy-watermark-settings-image[watermark_id]" type="hidden" value="<?php echo $watermark_id; ?>" /><input id="easy-watermark-mime" name="easy-watermark-settings-image[watermark_mime]" type="hidden" value="<?php echo $watermark_mime; ?>" />
5	<?php
6	if(empty($watermark_url)) :
	@@ -14,12 +14,11 @@ if(empty($watermark_url)) :
14	<input id="easy-watermark-opacity" name="easy-watermark-settings-image[opacity]" type="hidden" value="<?php echo $opacity; ?>" />
15	<?php else : ?>
16	<img id="watermark-preview" style="max-height:200px;width:auto;cursor:pointer;" src="<?php echo $watermark_url; ?>" />
17	- <span style="display:none;" id="loading-preview"><?php _e('Loading preview...', 'easy-watermark'); ?></span>
18	<p class="description"><?php _e('Click on image to change it.', 'easy-watermark'); ?> <a href="#" class="remove-image"><?php _e('Remove image', 'easy-watermark'); ?></a><br />
19	<?php _e('Note: If you want to upload a new image, make sure that "Auto watermark" option is unticked, or remove current image and unset text watermark first. Otherwise uploaded image will be watermarked.', 'easy-watermark'); ?></p>
20	</td>
21	</tr>
22	- <tr valign="top" class="watermark-options"><th scope="row"><?php _e('Image ~~alignment~~', 'easy-watermark'); ?></th><td>
23	<div id="alignmentbox">
24	<label for="alignment-1" id="alignment-1-label"><input type="radio" name="easy-watermark-settings-image[alignment]" value="1" id="alignment-1" <?php checked('1', $alignment); ?> /></label>
25	<label for="alignment-2" id="alignment-2-label"><input type="radio" name="easy-watermark-settings-image[alignment]" value="2" id="alignment-2" <?php checked('2', $alignment); ?> /></label>
	@@ -32,7 +31,22 @@ if(empty($watermark_url)) :
32	<label for="alignment-9" id="alignment-9-label"><input type="radio" name="easy-watermark-settings-image[alignment]" value="9" id="alignment-9" <?php checked('9', $alignment); ?> /></label>
33	</div>
34	</td></tr>
35	- <tr ~~valign="top" class="watermark-options"~~><th scope="row"><?php _e('~~Image~~ ~~offset~~', 'easy-watermark'); ?></th><td>















36	<label for="easy-watermark-position-offset_x"><?php _e('x', 'easy-watermark'); ?>: </label>
37	<input size="3" type="text" id="easy-watermark-position-offset_x" name="easy-watermark-settings-image[offset_x]" value="<?php echo $offset_x; ?>" /><br />
38	<label for="easy-watermark-position-offset_y"><?php _e('y', 'easy-watermark'); ?>: </label>


1
2	<table class="form-table">
3	+ <tr valign="top"><th scope="row"><label for="easy-watermark-url"><?php _e('Watermark Image', 'easy-watermark'); ?></label></th>
4	<td><input id="easy-watermark-url" class="regular-text" name="easy-watermark-settings-image[watermark_url]" type="hidden" value="<?php echo $watermark_url; ?>" /><input id="easy-watermark-id" name="easy-watermark-settings-image[watermark_id]" type="hidden" value="<?php echo $watermark_id; ?>" /><input id="easy-watermark-mime" name="easy-watermark-settings-image[watermark_mime]" type="hidden" value="<?php echo $watermark_mime; ?>" />
5	<?php
6	if(empty($watermark_url)) :

14	<input id="easy-watermark-opacity" name="easy-watermark-settings-image[opacity]" type="hidden" value="<?php echo $opacity; ?>" />
15	<?php else : ?>
16	<img id="watermark-preview" style="max-height:200px;width:auto;cursor:pointer;" src="<?php echo $watermark_url; ?>" />

17	<p class="description"><?php _e('Click on image to change it.', 'easy-watermark'); ?> <a href="#" class="remove-image"><?php _e('Remove image', 'easy-watermark'); ?></a><br />
18	<?php _e('Note: If you want to upload a new image, make sure that "Auto watermark" option is unticked, or remove current image and unset text watermark first. Otherwise uploaded image will be watermarked.', 'easy-watermark'); ?></p>
19	</td>
20	</tr>
21	+ <tr valign="top" class="watermark-options"><th scope="row"><?php _e('Image Alignment', 'easy-watermark'); ?></th><td>
22	<div id="alignmentbox">
23	<label for="alignment-1" id="alignment-1-label"><input type="radio" name="easy-watermark-settings-image[alignment]" value="1" id="alignment-1" <?php checked('1', $alignment); ?> /></label>
24	<label for="alignment-2" id="alignment-2-label"><input type="radio" name="easy-watermark-settings-image[alignment]" value="2" id="alignment-2" <?php checked('2', $alignment); ?> /></label>

31	<label for="alignment-9" id="alignment-9-label"><input type="radio" name="easy-watermark-settings-image[alignment]" value="9" id="alignment-9" <?php checked('9', $alignment); ?> /></label>
32	</div>
33	</td></tr>
34	+ <tr><th scope="row"><?php _e('Scaling Mode', 'easy-watermark'); ?></th><td>
35	+ <select name="easy-watermark-settings-image[scale_mode]" id="ew-scale-mode">
36	+ <option value="none" <?php selected('none', $scale_mode); ?>><?php _e('None', 'easy-watermark') ?></option>
37	+ <option value="fill" <?php selected('fill', $scale_mode); ?>><?php _e('Fill', 'easy-watermark') ?></option>
38	+ <option value="fit" <?php selected('fit', $scale_mode); ?>><?php _e('Fit', 'easy-watermark') ?></option>
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>
47	+ <input type="text" size="3" id="ew-scale" name="easy-watermark-settings-image[scale]" value="<?php echo $scale; ?>" /> %
48	+ </td></tr>
49	+ <tr valign="top" class="watermark-options"><th scope="row"><?php _e('Image Offset', 'easy-watermark'); ?></th><td>
50	<label for="easy-watermark-position-offset_x"><?php _e('x', 'easy-watermark'); ?>: </label>
51	<input size="3" type="text" id="easy-watermark-position-offset_x" name="easy-watermark-settings-image[offset_x]" value="<?php echo $offset_x; ?>" /><br />
52	<label for="easy-watermark-position-offset_y"><?php _e('y', 'easy-watermark'); ?>: </label>

views/settings-form-text.php CHANGED Viewed

	@@ -11,7 +11,7 @@
11	</div>
12	</td></tr>
13	<?php endif; ?>
14	- <tr valign="top" class="watermark-options"><th scope="row"><?php _e('Text ~~alignment~~', 'easy-watermark'); ?></th><td>
15	<div id="alignmentbox">
16	<label for="alignment-1" id="alignment-1-label"><input type="radio" name="easy-watermark-settings-text[alignment]" value="1" id="alignment-1" <?php checked('1', $alignment); ?> /></label>
17	<label for="alignment-2" id="alignment-2-label"><input type="radio" name="easy-watermark-settings-text[alignment]" value="2" id="alignment-2" <?php checked('2', $alignment); ?> /></label>
	@@ -24,7 +24,7 @@
24	<label for="alignment-9" id="alignment-9-label"><input type="radio" name="easy-watermark-settings-text[alignment]" value="9" id="alignment-9" <?php checked('9', $alignment); ?> /></label>
25	</div>
26	</td></tr>
27	- <tr valign="top" class="watermark-options"><th scope="row"><?php _e('Text ~~offset~~', 'easy-watermark'); ?></th><td>
28	<label for="easy-watermark-position-offset_x"><?php _e('x', 'easy-watermark'); ?>: </label>
29	<input size="3" type="text" id="easy-watermark-offset_x" name="easy-watermark-settings-text[offset_x]" value="<?php echo $offset_x; ?>" /><br />
30	<label for="easy-watermark-position-offset_y"><?php _e('y', 'easy-watermark'); ?>: </label>
	@@ -40,15 +40,15 @@
40	}
41	?>
42	</select>
43	- </td>
44	- <tr><th scope="row"><?php _e('Text ~~color~~', 'easy-watermark'); ?></th><td>
45	<input type="hidden" maxlength="6" name="easy-watermark-settings-text[color]" id="ew-color" value="<?php echo $color; ?>" /><div id="colorselector"><div style="background-color:#<?php echo $color; ?>"></div></div>
46	</td>
47	- <tr><th scope="row"><?php _e('Text ~~size~~', 'easy-watermark'); ?></th><td>
48	<input type="text" size="3" name="easy-watermark-settings-text[size]" id="ew-size" value="<?php echo $size; ?>" /> pt
49	</td>
50	</tr>
51	- <tr><th scope="row"><?php _e('Text ~~angle~~', 'easy-watermark'); ?></th><td>
52	<input type="text" size="3" name="easy-watermark-settings-text[angle]" id="ew-angle" value="<?php echo $angle; ?>" /> °
53	</td>
54	</tr>


11	</div>
12	</td></tr>
13	<?php endif; ?>
14	+ <tr valign="top" class="watermark-options"><th scope="row"><?php _e('Text Alignment', 'easy-watermark'); ?></th><td>
15	<div id="alignmentbox">
16	<label for="alignment-1" id="alignment-1-label"><input type="radio" name="easy-watermark-settings-text[alignment]" value="1" id="alignment-1" <?php checked('1', $alignment); ?> /></label>
17	<label for="alignment-2" id="alignment-2-label"><input type="radio" name="easy-watermark-settings-text[alignment]" value="2" id="alignment-2" <?php checked('2', $alignment); ?> /></label>

24	<label for="alignment-9" id="alignment-9-label"><input type="radio" name="easy-watermark-settings-text[alignment]" value="9" id="alignment-9" <?php checked('9', $alignment); ?> /></label>
25	</div>
26	</td></tr>
27	+ <tr valign="top" class="watermark-options"><th scope="row"><?php _e('Text Offset', 'easy-watermark'); ?></th><td>
28	<label for="easy-watermark-position-offset_x"><?php _e('x', 'easy-watermark'); ?>: </label>
29	<input size="3" type="text" id="easy-watermark-offset_x" name="easy-watermark-settings-text[offset_x]" value="<?php echo $offset_x; ?>" /><br />
30	<label for="easy-watermark-position-offset_y"><?php _e('y', 'easy-watermark'); ?>: </label>

40	}
41	?>
42	</select>
43	+ </td></tr>
44	+ <tr><th scope="row"><?php _e('Text Color', 'easy-watermark'); ?></th><td>
45	<input type="hidden" maxlength="6" name="easy-watermark-settings-text[color]" id="ew-color" value="<?php echo $color; ?>" /><div id="colorselector"><div style="background-color:#<?php echo $color; ?>"></div></div>
46	</td>
47	+ <tr><th scope="row"><?php _e('Text Size', 'easy-watermark'); ?></th><td>
48	<input type="text" size="3" name="easy-watermark-settings-text[size]" id="ew-size" value="<?php echo $size; ?>" /> pt
49	</td>
50	</tr>
51	+ <tr><th scope="row"><?php _e('Text Angle', 'easy-watermark'); ?></th><td>
52	<input type="text" size="3" name="easy-watermark-settings-text[angle]" id="ew-angle" value="<?php echo $angle; ?>" /> °
53	</td>
54	</tr>