prey

Merge lp://staging/~eduardo-mucelli/prey/brazilian into lp://staging/prey

  1. brazilian
  2. Merge into trunk
Proposed by Eduardo Mucelli Rezende Oliveira
Status: Rejected
Rejected by: Данило Шеган
Proposed branch: lp://staging/~eduardo-mucelli/prey/brazilian
Merge into: lp://staging/prey
Diff against target: 28 lines (+24/-0)
1 file modified
lang/pt_BR (+24/-0)
To merge this branch: bzr merge lp://staging/~eduardo-mucelli/prey/brazilian
Reviewer Review Type Date Requested Status
VCS imports Pending
Review via email: mp+70514@code.staging.launchpad.net

Description of the change

Brazilian Portuguese language file

To post a comment you must log in.
Revision history for this message
Данило Шеган (danilo) wrote :

Hi Eduardo: you proposed a merge against an imported branch from upstream (git://github.com/tomas/prey). You probably want to talk to the upstream directly about submitting this improvement (at least until Launchpad is able to seamlessly talk git protocol).

Unmerged revisions

713. By Eduardo Mucelli Rezende Oliveira

Adding Brazilian Portuguese lang file

712. By Tomas Pollak

Don't use env at all, since it's still causing errors

711. By Tomas Pollak

Added missing line to config.default

710. By Tomas Pollak

Merge pull request #172 from abahgat/master

Improved email validation regex

709. By Tomas Pollak

Updated Windows CronSVC with logging check

708. By Tomas Pollak

Updated env.exe in platform/windows/bin

707. By Tomas Pollak

prey-trigger: Make sure PC is connected before running Prey at initialization

706. By Tomas Pollak

Added os.wait() in prey-triggers (Mac, Linux) so we don't get zombie processes

705. By Tomas Pollak

Fixed prey-trigger linux init script stop function

704. By Tomas Pollak

Finally a way to check if run from cron that works

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches