PonyMirrors/ponysay
1
0
Fork 0
mirror of https://github.com/erkin/ponysay.git synced 2025-02-16 17:44:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

conflict resolve

Browse source
This commit is contained in:
Mattias Andrée 2012-10-30 19:19:37 +01:00
commit 862d123781
17 changed files with 38 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
extraponies/faust.pony
View file

@ -1,3 +1,6 @@
$$$
FREE: yes
$$$
$balloon3$ $balloon3$
$\$ $\$
$\$ $\$

3
extraponies/fyrefly.pony
View file

@ -1,3 +1,6 @@
$$$
FREE: yes
$$$
$balloon18$ $balloon18$
$\$ $\$
$\$ $\$

3
extraponies/surprise.pony
View file

@ -1,3 +1,6 @@
$$$
FREE: yes
$$$
$balloon35$ $balloon35$
$\$ $\$
$\$ $\$

3
extrattyponies/faust.pony
View file

@ -1,3 +1,6 @@
$$$
FREE: yes
$$$
$balloon3$]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF $balloon3$]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
$\$ $\$
$\$ $\$

3
extrattyponies/fyrefly.pony
View file

@ -1,3 +1,6 @@
$$$
FREE: yes
$$$
$balloon18$]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF $balloon18$]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
$\$ $\$
$\$ $\$

3
extrattyponies/surprise.pony
View file

@ -1,3 +1,6 @@
$$$
FREE: yes
$$$
$balloon35$]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF $balloon35$]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
$\$ $\$
$\$ $\$

2
manuals/manpage.es.0
View file

@ -96,7 +96,7 @@ MLP:FiM cono no pertenecientes, la primera lista seran los pertenecientes y la
subsiguente los no pertenecientes. subsiguente los no pertenecientes.
.TP .TP
.B \-o, \-\-pony\-only, \-\-ponyonly .B \-o, \-\-pony\-only, \-\-ponyonly
Solo muestra al poni, No asi con los demás elementos. Solo muestra al poni, No así con los demás elementos.
.TP .TP
.B \+c, \-\-colour [\fIansi-colour\fP] .B \+c, \-\-colour [\fIansi-colour\fP]
Colorea el globo, Incluyendo mensajes y enlaces. Para más información acerca del coloreo vea las páginas Colorea el globo, Incluyendo mensajes y enlaces. Para más información acerca del coloreo vea las páginas

9
manuals/ponysay.texinfo
View file

@ -1430,7 +1430,6 @@ before building and installing.
* Chakra:: Packages for Chakra. * Chakra:: Packages for Chakra.
* Debian GNU/Linux:: Packages for Debian GNU/Linux and Ubuntu. * Debian GNU/Linux:: Packages for Debian GNU/Linux and Ubuntu.
* Gentoo Linux:: Packages for Gentoo Linux. * Gentoo Linux:: Packages for Gentoo Linux.
* Parabola GNU/Linux:: Packages for Parabola GNU/Linux.
* Source Mage GNU/Linux:: Packages for Source Mage GNU/Linux. * Source Mage GNU/Linux:: Packages for Source Mage GNU/Linux.
@end menu @end menu
@ -1481,14 +1480,6 @@ Gentoo users can use the overlay @url{https://github.com/etu/aidstu-overlay}, wh
contains @command{ponysay} as @w{@code{games-misc/ponysay}} (developer maintained). contains @command{ponysay} as @w{@code{games-misc/ponysay}} (developer maintained).
@node Parabola GNU/Linux
@subsection Parabola GNU/Linux
@cindex parabola gnu/linux
@w{@code{community/ponysay}} from Arch Linux (@ref{Arch Linux}) is also available
for Parabola GNU/Linux.
@node Source Mage GNU/Linux @node Source Mage GNU/Linux
@subsection Source Mage GNU/Linux @subsection Source Mage GNU/Linux
@cindex source mage gnu/linux @cindex source mage gnu/linux

3
ponies/cow.pony
View file

@ -1,3 +1,6 @@
$$$
FREE: yes
$$$
$balloon3$ $balloon3$
$\$ $\$
$\$ $\$

3
ponies/owl.pony
View file

@ -1,3 +1,6 @@
$$$
FREE: yes
$$$
$balloon$ $balloon$
$\$ $\$
$\$ $\$

1
ponyquotes/chrysalis.1 Normal file
View file

@ -0,0 +1 @@
You do realize the reception has been canceled, don't you?

1
ponyquotes/lyra.0 Normal file
View file

@ -0,0 +1 @@
I love them!

4
ponyquotes/ponies
View file

@ -125,7 +125,7 @@ pinacolada
pinkamina pinkamina
pinkie+pinkiecannonfront+pinkiecannon+pinkiebounce+pinkiecannonhappy+pinkiegala+pinkiechicken+pinkiehugfluttershy+pinkiegummy+pinkietongue+pinkiesilly pinkie+pinkiecannonfront+pinkiecannon+pinkiebounce+pinkiecannonhappy+pinkiegala+pinkiechicken+pinkiehugfluttershy+pinkiegummy+pinkietongue+pinkiesilly
pinkie+pinkiepartycannon+pinkieprincess+pinkiehugsfluttershy+pinkiewhoops+oinkoinkoink+pinkiewhoopsout+pinkiewhoopseat+fillypinkie+fillypinkiecurly+pinkieoink pinkie+pinkiepartycannon+pinkieprincess+pinkiehugsfluttershy+pinkiewhoops+oinkoinkoink+pinkiewhoopsout+pinkiewhoopseat+fillypinkie+fillypinkiecurly+pinkieoink
pinkie+pinkiegummydisguise+pinkacopter+pinkiefly+pinkieparade+pinkieumbrellahat pinkie+pinkiegummydisguise+pinkacopter+pinkiefly+pinkieparade+pinkieumbrellahat+pinkieumbrelahatfear
pipsqueak pipsqueak
pokey+pokeypierce pokey+pokeypierce
ponet ponet
@ -185,7 +185,7 @@ trixie+trixiestage+trixiestand+lulamoon+trixielulamoon
truffleshuffle truffleshuffle
turf turf
turnip turnip
twilight+twilightcrazyfromball+twilightrage+twilightzero+fillytwilight+twilightthebearded+twilightspike twilight+twilightcrazyfromball+twilightrage+twilightzero+fillytwilight+twilightthebearded+twilighttime+twilightspike
twist twist
vinyl+djpon-3 vinyl+djpon-3
violet+royalribbon violet+royalribbon

BIN
ponysay.pdf
View file

Binary file not shown.

4
ponysay.py
View file

@ -2425,11 +2425,13 @@ class SpelloCorrecter(): # Naïvely and quickly proted and adapted from optimise
''' '''
Start the program from ponysay.__init__ if this is the executed file Start the program from ponysay.__init__ if this is the executed file
''' '''
if __name__ == '__main__': if __name__ == '__main__':
isthink = (len(__file__) >= len('think')) and (__file__.endswith('think'))
isthink = ((len(__file__) >= len('think.py')) and (__file__.endswith('think.py'))) or isthink
usage_saythink = '\033[34;1m(ponysay | ponythink)\033[21;39m' usage_saythink = '\033[34;1m(ponysay | ponythink)\033[21;39m'
usage_common = '[-c] [-W\033[4mCOLUMN\033[24m] [-b\033[4mSTYLE\033[24m]' usage_common = '[-c] [-W\033[4mCOLUMN\033[24m] [-b\033[4mSTYLE\033[24m]'
usage_listhelp = '(-l | -L | -B | +l | +L | -A | + A | -v | -h)' usage_listhelp = '(-l | -L | -B | +l | +L | -A | + A | -v | -h)'

3
ttyponies/cow.pony
View file

@ -1,3 +1,6 @@
$$$
FREE: yes
$$$
$balloon3$]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF $balloon3$]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
$\$ $\$
$\$ $\$

3
ttyponies/owl.pony
View file

@ -1,3 +1,6 @@
$$$
FREE: yes
$$$
$balloon$ $balloon$
]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF$\$ ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF$\$
$\$ $\$