mirror of
https://github.com/erkin/ponysay.git
synced 2024-11-22 12:27:59 +01:00
conflict resolve
This commit is contained in:
Mattias Andrée
commit
862d123781
17 changed files with 38 additions and 13 deletions
|
|
@ -1,3 +1,6 @@
|
|||
$$$
|
||||
FREE: yes
|
||||
$$$
|
||||
$balloon3$[0m
|
||||
$\$
|
||||
$\$
|
||||
|
|
|
|||
|
|
@ -1,3 +1,6 @@
|
|||
$$$
|
||||
FREE: yes
|
||||
$$$
|
||||
$balloon18$[0m
|
||||
$\$
|
||||
$\$
|
||||
|
|
|
|||
|
|
@ -1,3 +1,6 @@
|
|||
$$$
|
||||
FREE: yes
|
||||
$$$
|
||||
$balloon35$[0m
|
||||
$\$
|
||||
$\$
|
||||
|
|
|
|||
|
|
@ -1,3 +1,6 @@
|
|||
$$$
|
||||
FREE: yes
|
||||
$$$
|
||||
$balloon3$]P7aaaaaa[47m]PFffffff[1;37m]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF[0m
|
||||
$\$
|
||||
$\$
|
||||
|
|
|
|||
|
|
@ -1,3 +1,6 @@
|
|||
$$$
|
||||
FREE: yes
|
||||
$$$
|
||||
$balloon18$]P7aaaaaa[47m]PFffffff[1;37m]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF[0m
|
||||
$\$
|
||||
$\$
|
||||
|
|
|
|||
|
|
@ -1,3 +1,6 @@
|
|||
$$$
|
||||
FREE: yes
|
||||
$$$
|
||||
$balloon35$]P7aaaaaa[47m]PFffffff[1;37m]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF[0m
|
||||
$\$
|
||||
$\$
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ MLP:FiM cono no pertenecientes, la primera lista seran los pertenecientes y la
|
|||
subsiguente los no pertenecientes.
|
||||
.TP
|
||||
.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
|
||||
.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
|
||||
|
|
|
|||
|
|
@ -1430,7 +1430,6 @@ before building and installing.
|
|||
* Chakra:: Packages for Chakra.
|
||||
* Debian GNU/Linux:: Packages for Debian GNU/Linux and Ubuntu.
|
||||
* Gentoo Linux:: Packages for Gentoo Linux.
|
||||
* Parabola GNU/Linux:: Packages for Parabola GNU/Linux.
|
||||
* Source Mage GNU/Linux:: Packages for Source Mage GNU/Linux.
|
||||
@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).
|
||||
|
||||
|
||||
@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
|
||||
@subsection Source Mage GNU/Linux
|
||||
@cindex source mage gnu/linux
|
||||
|
|
|
|||
|
|
@ -1,3 +1,6 @@
|
|||
$$$
|
||||
FREE: yes
|
||||
$$$
|
||||
$balloon3$[0m
|
||||
$\$
|
||||
$\$
|
||||
|
|
|
|||
|
|
@ -1,3 +1,6 @@
|
|||
$$$
|
||||
FREE: yes
|
||||
$$$
|
||||
$balloon$
|
||||
[0m$\$
|
||||
$\$
|
||||
|
|
|
|||
1
ponyquotes/chrysalis.1
Normal file
1
ponyquotes/chrysalis.1
Normal file
|
|
@ -0,0 +1 @@
|
|||
You do realize the reception has been canceled, don't you?
|
||||
1
ponyquotes/lyra.0
Normal file
1
ponyquotes/lyra.0
Normal file
|
|
@ -0,0 +1 @@
|
|||
I love them!
|
||||
|
|
@ -125,7 +125,7 @@ pinacolada
|
|||
pinkamina
|
||||
pinkie+pinkiecannonfront+pinkiecannon+pinkiebounce+pinkiecannonhappy+pinkiegala+pinkiechicken+pinkiehugfluttershy+pinkiegummy+pinkietongue+pinkiesilly
|
||||
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
|
||||
pokey+pokeypierce
|
||||
ponet
|
||||
|
|
@ -185,7 +185,7 @@ trixie+trixiestage+trixiestand+lulamoon+trixielulamoon
|
|||
truffleshuffle
|
||||
turf
|
||||
turnip
|
||||
twilight+twilightcrazyfromball+twilightrage+twilightzero+fillytwilight+twilightthebearded+twilightspike
|
||||
twilight+twilightcrazyfromball+twilightrage+twilightzero+fillytwilight+twilightthebearded+twilighttime+twilightspike
|
||||
twist
|
||||
vinyl+djpon-3
|
||||
violet+royalribbon
|
||||
|
|
|
|||
BIN
ponysay.pdf
BIN
ponysay.pdf
Binary file not shown.
|
|
@ -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
|
||||
'''
|
||||
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_common = '[-c] [-W\033[4mCOLUMN\033[24m] [-b\033[4mSTYLE\033[24m]'
|
||||
usage_listhelp = '(-l | -L | -B | +l | +L | -A | + A | -v | -h)'
|
||||
|
|
|
|||
|
|
@ -1,3 +1,6 @@
|
|||
$$$
|
||||
FREE: yes
|
||||
$$$
|
||||
$balloon3$]P7aaaaaa[47m]PFffffff[1;37m]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF[0m
|
||||
$\$
|
||||
$\$
|
||||
|
|
|
|||
|
|
@ -1,3 +1,6 @@
|
|||
$$$
|
||||
FREE: yes
|
||||
$$$
|
||||
$balloon$
|
||||
]P7aaaaaa[47m]PFffffff[1;37m]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF[0m$\$
|
||||
$\$
|
||||
|
|
|
|||
Loading…
Reference in a new issue