notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into sdl2.0: tweaks in the clone tool and french and galician translations

Browse source
This commit is contained in:
Pere Pujal i Carabantes 2021-02-12 22:01:48 +01:00
commit 37e40952e4
44 changed files with 682 additions and 653 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/en/README.txt
View file

@ -874,7 +874,7 @@ Using the import script, "tuxpaint-import"
Example:
$ tuxpaint-import grandma.jpg
grandma.jpg -> /home/username/.tuxpaint/saved/20210205180425.png
grandma.jpg -> /home/username/.tuxpaint/saved/20210212093342.png
jpegtopnm: WRITING A PPM FILE
The first line ("tuxpaint-import grandma.jpg") is the command to run.
@ -916,7 +916,7 @@ Importing Pictures Manually
* mm = Minute (two digits, "00"-"59")
* ss = Seconds (two digits, "00"-"59")
Example: "20210205180425.png", for 5 February 2021 at 18:04:25.
Example: "20210212093342.png", for 12 February 2021 at 09:33:42.
Place this PNG file in your Tux Paint "saved" directory/folder. (See
above.)

4
docs/en/html/README.html
View file

@ -1303,7 +1303,7 @@
<blockquote>
<code>$ <strong>tuxpaint-import grandma.jpg</strong><br>
grandma.jpg -&gt;
/home/username/.tuxpaint/saved/20210205180425.png<br>
/home/username/.tuxpaint/saved/20210212093342.png<br>
jpegtopnm: WRITING A PPM FILE</code>
</blockquote>
@ -1351,7 +1351,7 @@
</ul>
<p>
Example: "<code>20210205180425</code>.png", for 5 February 2021 at 18:04:25. </p>
Example: "<code>20210212093342</code>.png", for 12 February 2021 at 09:33:42. </p>
<p>
Place this PNG file in your Tux Paint "<code>saved</code>" directory/folder. (See above.) </p>