Merge lp://staging/~ubuntu-branches/ubuntu/natty/strongswan/natty-201011201113 into lp://staging/ubuntu/natty/strongswan
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~ubuntu-branches/ubuntu/natty/strongswan/natty-201011201113 |
| Merge into: | lp://staging/ubuntu/natty/strongswan |
| Diff against target: |
395 lines (+80/-37) (has conflicts) 11 files modified
debian/po/de.po (+9/-5) debian/po/fi.po (+7/-3) debian/po/fr.po (+7/-3) debian/po/gl.po (+7/-3) debian/po/nb.po (+7/-3) debian/po/nl.po (+7/-3) debian/po/pt.po (+7/-3) debian/po/pt_BR.po (+7/-3) debian/po/ru.po (+9/-5) debian/po/sv.po (+7/-3) debian/po/templates.pot (+6/-3) Text conflict in debian/po/de.po Text conflict in debian/po/fi.po Text conflict in debian/po/fr.po Text conflict in debian/po/gl.po Text conflict in debian/po/nb.po Text conflict in debian/po/nl.po Text conflict in debian/po/pt.po Text conflict in debian/po/pt_BR.po Text conflict in debian/po/ru.po Text conflict in debian/po/sv.po Text conflict in debian/po/templates.pot |
| To merge this branch: | bzr merge lp://staging/~ubuntu-branches/ubuntu/natty/strongswan/natty-201011201113 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/natty/strongswan now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/strongswan/natty-201011201113. A merge should be performed if necessary.
Unmerged revisions
- 14. By Bilal Akhtar
-
* Merge from Debian Unstable, remaining changes:
- Build depend on libnm-glib-dev instead of libnm-glib-vpn-dev to
match the network manager package naming in Ubuntu.
* Non-maintainer upload.
- Fix pending l10n issues. Debconf translations:
- Vietnamese (Clytie Siddall). Closes: #598925
- Japanese (Hideki Yamane). Closes: #599888
- Czech (Miroslav Kure). Closes: #600354
- Spanish (Francisco Javier Cuadrado). Closes: #600409
- Danish (Joe Hansen). Closes: #602449
- Basque (Iñaki Larrañaga Murgoitio). Closes: #603723
- Italian (Vincenzo Campanella). Closes: #603779
