Skip to content
This repository has been archived by the owner on May 31, 2018. It is now read-only.

Update pacaur 5.0 branch #661

Merged
merged 17 commits into from
Mar 8, 2017
Merged

Update pacaur 5.0 branch #661

merged 17 commits into from
Mar 8, 2017

Conversation

ismaelgv
Copy link
Contributor

@ismaelgv ismaelgv commented Mar 8, 2017

I've cherry-picked all commits that do not include changes in pacaur file (translation files, README, ...).

I've made a diff from the diverging commit until current master HEAD (7b91ec9). From this diff, I've applied the changes to pacaur and libpacaur files.

Edit: Related to #443

rmarquis and others added 17 commits March 8, 2017 16:59
Signed-off-by: Pablo Lezaeta Reyes <prflr88@gmail.com>
Next step is probably adding the image of a shotgun. Or a picture
of Jack Nicholson from the "The Shining" movie, I can't decide.
Fix some issues commented in rmarquis#644.
* Update Spanish translation

Signed-off-by: Pablo Lezaeta Reyes <prflr88@gmail.com>

* Add the «» need ins spanish for not addapted loanword, if you are going to use the loanword script instead of guion at least add the «» ;)"

Signed-off-by: Pablo Roberto Francisco Lezaeta Reyes <prflr88@gmail.com>
This commit only consider changes made in parts that remain in the main script.
This commit consider changes made in parts migrated to libpacaur.
@ismaelgv ismaelgv changed the base branch from master to pacaur50 March 8, 2017 16:42
@rmarquis rmarquis merged commit b0f30fd into rmarquis:pacaur50 Mar 8, 2017
@rmarquis
Copy link
Owner

rmarquis commented Mar 8, 2017

Thx!

@ismaelgv ismaelgv deleted the pacaur50 branch March 8, 2017 21:58
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants