Merge lp://staging/~ubuntuone-pqm-team/canonical-identity-provider/translations into lp://staging/canonical-identity-provider/release

Proposed by Wojciech
Status: Rejected
Rejected by: Ricardo Kirkner
Proposed branch: lp://staging/~ubuntuone-pqm-team/canonical-identity-provider/translations
Merge into: lp://staging/canonical-identity-provider/release
Diff against target: 102308 lines (+101843/-0) (has conflicts)
88 files modified
po/api/ar.po (+108/-0)
po/api/az.po (+113/-0)
po/api/bg.po (+111/-0)
po/api/bn.po (+105/-0)
po/api/ca.po (+105/-0)
po/api/cs.po (+107/-0)
po/api/de.po (+120/-0)
po/api/el.po (+105/-0)
po/api/en_GB.po (+111/-0)
po/api/eo.po (+105/-0)
po/api/es.po (+115/-0)
po/api/et.po (+113/-0)
po/api/fa.po (+105/-0)
po/api/fr.po (+106/-0)
po/api/gl.po (+105/-0)
po/api/hu.po (+105/-0)
po/api/ia.po (+105/-0)
po/api/id.po (+105/-0)
po/api/it.po (+105/-0)
po/api/ja.po (+105/-0)
po/api/ms.po (+115/-0)
po/api/nb.po (+105/-0)
po/api/nl.po (+105/-0)
po/api/pl.po (+106/-0)
po/api/pt_BR.po (+106/-0)
po/api/ro.po (+105/-0)
po/api/ru.po (+106/-0)
po/api/sk.po (+105/-0)
po/api/sl.po (+105/-0)
po/api/sr.po (+105/-0)
po/api/ta.po (+105/-0)
po/api/tet.po (+105/-0)
po/api/th.po (+105/-0)
po/api/tr.po (+105/-0)
po/api/ug.po (+105/-0)
po/api/zh_CN.po (+106/-0)
po/api/zh_TW.po (+105/-0)
po/identityprovider/ar.po (+984/-0)
po/identityprovider/az.po (+978/-0)
po/identityprovider/bg.po (+1016/-0)
po/identityprovider/cs.po (+1033/-0)
po/identityprovider/de.po (+1178/-0)
po/identityprovider/el.po (+978/-0)
po/identityprovider/en_GB.po (+978/-0)
po/identityprovider/es.po (+1000/-0)
po/identityprovider/et.po (+1016/-0)
po/identityprovider/fr.po (+979/-0)
po/identityprovider/ia.po (+978/-0)
po/identityprovider/it.po (+978/-0)
po/identityprovider/ja.po (+978/-0)
po/identityprovider/ku.po (+978/-0)
po/identityprovider/ms.po (+986/-0)
po/identityprovider/nl.po (+1042/-0)
po/identityprovider/pl.po (+980/-0)
po/identityprovider/pt_BR.po (+982/-0)
po/identityprovider/ro.po (+979/-0)
po/identityprovider/ru.po (+980/-0)
po/identityprovider/sr.po (+979/-0)
po/identityprovider/tr.po (+978/-0)
po/identityprovider/zh_CN.po (+987/-0)
po/identityprovider/zh_TW.po (+979/-0)
po/webui/ar.po (+2709/-0)
po/webui/az.po (+2700/-0)
po/webui/bg.po (+2750/-0)
po/webui/cs.po (+2853/-0)
po/webui/de.po (+2781/-0)
po/webui/en_GB.po (+2710/-0)
po/webui/es.po (+2791/-0)
po/webui/et.po (+2914/-0)
po/webui/fa.po (+2700/-0)
po/webui/fr.po (+2701/-0)
po/webui/hu.po (+2700/-0)
po/webui/ia.po (+2700/-0)
po/webui/it.po (+2700/-0)
po/webui/ja.po (+2700/-0)
po/webui/nb.po (+2700/-0)
po/webui/nl.po (+2942/-0)
po/webui/pl.po (+2701/-0)
po/webui/pt_BR.po (+2701/-0)
po/webui/ro.po (+2700/-0)
po/webui/ru.po (+2701/-0)
po/webui/sk.po (+2700/-0)
po/webui/sr.po (+2700/-0)
po/webui/th.po (+2700/-0)
po/webui/tr.po (+2704/-0)
po/webui/uk.po (+2700/-0)
po/webui/zh_CN.po (+2794/-0)
po/webui/zh_TW.po (+2809/-0)
Conflict adding file po.  Moved existing file to po.moved.
To merge this branch: bzr merge lp://staging/~ubuntuone-pqm-team/canonical-identity-provider/translations
Reviewer Review Type Date Requested Status
Ricardo Kirkner (community) Disapprove
Wojciech Pending
Review via email: mp+279702@code.staging.launchpad.net
To post a comment you must log in.
453. By Launchpad Translations on behalf of canonical-isd-hackers

Launchpad automatic translations update.

454. By Launchpad Translations on behalf of canonical-isd-hackers

Launchpad automatic translations update.

455. By Launchpad Translations on behalf of canonical-isd-hackers

Launchpad automatic translations update.

456. By Launchpad Translations on behalf of canonical-isd-hackers

Launchpad automatic translations update.

457. By Launchpad Translations on behalf of canonical-isd-hackers

Launchpad automatic translations update.

458. By Launchpad Translations on behalf of canonical-isd-hackers

Launchpad automatic translations update.

459. By Launchpad Translations on behalf of canonical-isd-hackers

Launchpad automatic translations update.

460. By Launchpad Translations on behalf of canonical-isd-hackers

Launchpad automatic translations update.

461. By Launchpad Translations on behalf of canonical-isd-hackers

Launchpad automatic translations update.

462. By Launchpad Translations on behalf of canonical-isd-hackers

Launchpad automatic translations update.

463. By Launchpad Translations on behalf of canonical-isd-hackers

Launchpad automatic translations update.

464. By Launchpad Translations on behalf of canonical-isd-hackers

Launchpad automatic translations update.

465. By Launchpad Translations on behalf of canonical-isd-hackers

Launchpad automatic translations update.

466. By Launchpad Translations on behalf of canonical-isd-hackers

Launchpad automatic translations update.

467. By Launchpad Translations on behalf of canonical-isd-hackers

Launchpad automatic translations update.

468. By Launchpad Translations on behalf of canonical-isd-hackers

Launchpad automatic translations update.

469. By Launchpad Translations on behalf of canonical-isd-hackers

Launchpad automatic translations update.

470. By Launchpad Translations on behalf of canonical-isd-hackers

Launchpad automatic translations update.

471. By Launchpad Translations on behalf of canonical-isd-hackers

Launchpad automatic translations update.

Revision history for this message
Ricardo Kirkner (ricardokirkner) wrote :

There's no need to merge the translations branch back into trunk. Translations are properly integrated at deploy time.

review: Disapprove

Unmerged revisions

796. By Launchpad Translations on behalf of ubuntuone-pqm-team

Launchpad automatic translations update.

795. By Launchpad Translations on behalf of ubuntuone-pqm-team

Launchpad automatic translations update.

794. By Launchpad Translations on behalf of ubuntuone-pqm-team

Launchpad automatic translations update.

793. By Launchpad Translations on behalf of ubuntuone-pqm-team

Launchpad automatic translations update.

792. By Launchpad Translations on behalf of ubuntuone-pqm-team

Launchpad automatic translations update.

791. By Launchpad Translations on behalf of ubuntuone-pqm-team

Launchpad automatic translations update.

790. By Launchpad Translations on behalf of ubuntuone-pqm-team

Launchpad automatic translations update.

789. By Launchpad Translations on behalf of ubuntuone-pqm-team

Launchpad automatic translations update.

788. By Launchpad Translations on behalf of ubuntuone-pqm-team

Launchpad automatic translations update.

787. By Launchpad Translations on behalf of ubuntuone-pqm-team

Launchpad automatic translations update.

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.