Merge lp://staging/~bencrisford/edubuntu-docs/bencrisford into lp://staging/edubuntu-docs
Proposed by
Ben Crisford
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~bencrisford/edubuntu-docs/bencrisford |
| Merge into: | lp://staging/edubuntu-docs |
| Diff against target: |
37728 lines (+36571/-0) (has conflicts) 188 files modified
.bzr-builddeb/default.conf (+2/-0) Makefile (+71/-0) build/folder.info (+5/-0) common/C/biblio.xml (+356/-0) common/C/ccbysa.xml (+328/-0) common/C/contributors.xml (+70/-0) common/C/conventions.xml (+107/-0) common/C/copyright.xml (+5/-0) common/C/disclaimer.xml (+21/-0) common/C/educopy.xml (+5/-0) common/C/fdl.xml (+454/-0) common/C/feedback.xml (+14/-0) common/C/glossary.xml (+12/-0) common/C/gpl.xml (+371/-0) common/C/inlinemediaobject-ubuntu-icon-header.xml (+6/-0) common/C/inlinemediaobject-ubuntu-icon.xml (+6/-0) common/C/legalnotice.xml (+19/-0) common/C/licenses.xml (+8/-0) common/C/mediaobject-relative-ubuntu-icon.xml (+6/-0) common/C/mediaobject-ubuntu-icon.xml (+6/-0) common/C/preface.xml (+144/-0) common/C/publisher.xml (+4/-0) common/authors/edubuntu-documentation-project.xml (+3/-0) common/authors/ubuntu-documentation-project.xml (+3/-0) common/en/biblio.xml (+356/-0) common/en/ccbysa.xml (+328/-0) common/en/conventions.xml (+108/-0) common/en/copyright.xml (+5/-0) common/en/disclaimer.xml (+22/-0) common/en/fdl.xml (+363/-0) common/en/feedback.xml (+14/-0) common/en/glossary.xml (+12/-0) common/en/gpl.xml (+346/-0) common/en/inlinemediaobject-ubuntu-icon-header.xml (+6/-0) common/en/inlinemediaobject-ubuntu-icon.xml (+6/-0) common/en/legalnotice.xml (+19/-0) common/en/mediaobject-relative-ubuntu-icon.xml (+6/-0) common/en/mediaobject-ubuntu-icon.xml (+6/-0) common/en/publisher.xml (+4/-0) debian/.svnignore (+6/-0) debian/changelog (+134/-0) debian/compat (+1/-0) debian/control (+18/-0) debian/copyright (+281/-0) debian/edubuntu-about.desktop (+130/-0) debian/edubuntu-about.desktop.in (+10/-0) debian/install (+5/-0) debian/rules (+42/-0) edubuntu/Makefile (+73/-0) edubuntu/SchoolAdvocacy/C/school-advocacy-C.omf (+18/-0) edubuntu/SchoolAdvocacy/C/school-advocacy.xml (+550/-0) edubuntu/SchoolAdvocacy/po/SchoolAdvocacy.pot (+452/-0) edubuntu/about-edubuntu/C/about-edubuntu-C.omf (+20/-0) edubuntu/about-edubuntu/C/about-edubuntu.xml (+335/-0) edubuntu/about-edubuntu/bg/about-edubuntu-bg.omf (+19/-0) edubuntu/about-edubuntu/bg/about-edubuntu.xml (+618/-0) edubuntu/about-edubuntu/br/about-edubuntu-br.omf (+19/-0) edubuntu/about-edubuntu/br/about-edubuntu.xml (+621/-0) edubuntu/about-edubuntu/ceb/about-edubuntu-ceb.omf (+19/-0) edubuntu/about-edubuntu/ceb/about-edubuntu.xml (+607/-0) edubuntu/about-edubuntu/cs/about-edubuntu-cs.omf (+19/-0) edubuntu/about-edubuntu/cs/about-edubuntu.xml (+494/-0) edubuntu/about-edubuntu/el/about-edubuntu-el.omf (+19/-0) edubuntu/about-edubuntu/el/about-edubuntu.xml (+455/-0) edubuntu/about-edubuntu/en_AU/about-edubuntu-en_AU.omf (+19/-0) edubuntu/about-edubuntu/en_AU/about-edubuntu.xml (+574/-0) edubuntu/about-edubuntu/en_CA/about-edubuntu-en_CA.omf (+19/-0) edubuntu/about-edubuntu/en_CA/about-edubuntu.xml (+455/-0) edubuntu/about-edubuntu/en_GB/about-edubuntu-en_GB.omf (+19/-0) edubuntu/about-edubuntu/en_GB/about-edubuntu.xml (+455/-0) edubuntu/about-edubuntu/es/about-edubuntu-es.omf (+19/-0) edubuntu/about-edubuntu/es/about-edubuntu.xml (+455/-0) edubuntu/about-edubuntu/eu/about-edubuntu-eu.omf (+19/-0) edubuntu/about-edubuntu/eu/about-edubuntu.xml (+469/-0) edubuntu/about-edubuntu/fi/about-edubuntu-fi.omf (+19/-0) edubuntu/about-edubuntu/fi/about-edubuntu.xml (+447/-0) edubuntu/about-edubuntu/fr/about-edubuntu-fr.omf (+19/-0) edubuntu/about-edubuntu/fr/about-edubuntu.xml (+455/-0) edubuntu/about-edubuntu/gl/about-edubuntu-gl.omf (+19/-0) edubuntu/about-edubuntu/gl/about-edubuntu.xml (+455/-0) edubuntu/about-edubuntu/he/about-edubuntu-he.omf (+19/-0) edubuntu/about-edubuntu/he/about-edubuntu.xml (+455/-0) edubuntu/about-edubuntu/hu/about-edubuntu-hu.omf (+19/-0) edubuntu/about-edubuntu/hu/about-edubuntu.xml (+575/-0) edubuntu/about-edubuntu/id/about-edubuntu-id.omf (+19/-0) edubuntu/about-edubuntu/id/about-edubuntu.xml (+455/-0) edubuntu/about-edubuntu/is/about-edubuntu-is.omf (+19/-0) edubuntu/about-edubuntu/is/about-edubuntu.xml (+555/-0) edubuntu/about-edubuntu/it/about-edubuntu-it.omf (+19/-0) edubuntu/about-edubuntu/it/about-edubuntu.xml (+431/-0) edubuntu/about-edubuntu/ja/about-edubuntu-ja.omf (+19/-0) edubuntu/about-edubuntu/ja/about-edubuntu.xml (+457/-0) edubuntu/about-edubuntu/jv/about-edubuntu-jv.omf (+19/-0) edubuntu/about-edubuntu/jv/about-edubuntu.xml (+621/-0) edubuntu/about-edubuntu/ko/about-edubuntu-ko.omf (+19/-0) edubuntu/about-edubuntu/ko/about-edubuntu.xml (+533/-0) edubuntu/about-edubuntu/ms/about-edubuntu-ms.omf (+19/-0) edubuntu/about-edubuntu/ms/about-edubuntu.xml (+553/-0) edubuntu/about-edubuntu/nl/about-edubuntu-nl.omf (+19/-0) edubuntu/about-edubuntu/nl/about-edubuntu.xml (+463/-0) edubuntu/about-edubuntu/oc/about-edubuntu-oc.omf (+19/-0) edubuntu/about-edubuntu/oc/about-edubuntu.xml (+574/-0) edubuntu/about-edubuntu/pl/about-edubuntu-pl.omf (+19/-0) edubuntu/about-edubuntu/pl/about-edubuntu.xml (+532/-0) edubuntu/about-edubuntu/po/about-edubuntu.pot (+266/-0) edubuntu/about-edubuntu/pt/about-edubuntu-pt.omf (+19/-0) edubuntu/about-edubuntu/pt/about-edubuntu.xml (+494/-0) edubuntu/about-edubuntu/pt_BR/about-edubuntu-pt_BR.omf (+19/-0) edubuntu/about-edubuntu/pt_BR/about-edubuntu.xml (+455/-0) edubuntu/about-edubuntu/ro/about-edubuntu-ro.omf (+19/-0) edubuntu/about-edubuntu/ro/about-edubuntu.xml (+487/-0) edubuntu/about-edubuntu/ru/about-edubuntu-ru.omf (+19/-0) edubuntu/about-edubuntu/ru/about-edubuntu.xml (+431/-0) edubuntu/about-edubuntu/sk/about-edubuntu-sk.omf (+19/-0) edubuntu/about-edubuntu/sk/about-edubuntu.xml (+552/-0) edubuntu/about-edubuntu/sl/about-edubuntu-sl.omf (+19/-0) edubuntu/about-edubuntu/sl/about-edubuntu.xml (+613/-0) edubuntu/about-edubuntu/sq/about-edubuntu-sq.omf (+19/-0) edubuntu/about-edubuntu/sq/about-edubuntu.xml (+621/-0) edubuntu/about-edubuntu/sv/about-edubuntu-sv.omf (+19/-0) edubuntu/about-edubuntu/sv/about-edubuntu.xml (+455/-0) edubuntu/about-edubuntu/tl/about-edubuntu-tl.omf (+19/-0) edubuntu/about-edubuntu/tl/about-edubuntu.xml (+595/-0) edubuntu/about-edubuntu/tr/about-edubuntu-tr.omf (+19/-0) edubuntu/about-edubuntu/tr/about-edubuntu.xml (+559/-0) edubuntu/about-edubuntu/zh_CN/about-edubuntu-zh_CN.omf (+19/-0) edubuntu/about-edubuntu/zh_CN/about-edubuntu.xml (+455/-0) edubuntu/about-edubuntu/zh_TW/about-edubuntu-zh_TW.omf (+19/-0) edubuntu/about-edubuntu/zh_TW/about-edubuntu.xml (+612/-0) edubuntu/browser-startpage/edubuntu.css (+147/-0) edubuntu/browser-startpage/index.html (+40/-0) edubuntu/default.css (+347/-0) edubuntu/fix_date (+7/-0) edubuntu/get_desktop_trans (+27/-0) edubuntu/get_pot.sh (+35/-0) edubuntu/handbook/C/bookinfo.xml (+112/-0) edubuntu/handbook/C/contribute.xml (+116/-0) edubuntu/handbook/C/handbook-C.omf (+18/-0) edubuntu/handbook/C/handbook.xml (+27/-0) edubuntu/handbook/C/introduction.xml (+471/-0) edubuntu/handbook/C/server.xml (+2639/-0) edubuntu/handbook/C/using.xml (+787/-0) edubuntu/handbook/C/workstation.xml (+614/-0) edubuntu/handbook/po/handbook.pot (+3545/-0) edubuntu/libs/edubuntu-banner.xsl (+24/-0) edubuntu/libs/edubuntu-book.css (+94/-0) edubuntu/libs/edubuntu-chunk.xsl (+79/-0) edubuntu/libs/edubuntu-menus-C.ent (+2/-0) edubuntu/libs/edubuntu.ent (+7/-0) edubuntu/libs/handbook-banner.xsl (+24/-0) edubuntu/libs/handbook-chunk.xsl (+79/-0) edubuntu/translate.sh (+85/-0) edubuntu/translated.sh (+20/-0) libs/cdo-C.ent (+18/-0) libs/fo-cust.xsl (+122/-0) libs/global.ent (+296/-0) libs/imagelist.xsl (+16/-0) libs/index-html-chunk-cust.xsl (+82/-0) libs/index.css (+135/-0) libs/pdf/README (+11/-0) libs/pdf/fonts/DejaVuSerif-Bold.xml (+1/-0) libs/pdf/fonts/DejaVuSerif-BoldOblique.xml (+1/-0) libs/pdf/fonts/DejaVuSerif-Oblique.xml (+1/-0) libs/pdf/fonts/DejaVuSerif.xml (+1/-0) libs/pdf/fonts/FreeMono-ttf.xml (+1/-0) libs/pdf/fonts/FreeMonoBold-ttf.xml (+1/-0) libs/pdf/fonts/FreeMonoBoldOblique-ttf.xml (+1/-0) libs/pdf/fonts/FreeMonoOblique-ttf.xml (+1/-0) libs/pdf/fonts/FreeSerif-Bold.xml (+1/-0) libs/pdf/fonts/FreeSerif-BoldItalic.xml (+1/-0) libs/pdf/fonts/FreeSerif-Italic.xml (+1/-0) libs/pdf/fonts/FreeSerif.xml (+1/-0) libs/pdf/fonts/OpenSymbol.xml (+1/-0) libs/pdf/fonts/UnBatang.xml (+1/-0) libs/pdf/fonts/UnBatangBold.xml (+1/-0) libs/pdf/fonts/UnDotum.xml (+1/-0) libs/pdf/fonts/UnDotumBold.xml (+1/-0) libs/pdf/fonts/baekmuk-dotum.xml (+1/-0) libs/pdf/fonts/kochi-gothic.xml (+1/-0) libs/pdf/fonts/uming.xml (+1/-0) libs/pdf/fop.xconf (+209/-0) libs/pdf/ubuntu-pdf-lulu.xsl (+33/-0) libs/pdf/ubuntu-pdf.xsl (+230/-0) libs/pdf/userconfig.xml (+110/-0) libs/writeOwnerStatus.xsl (+99/-0) libs/xinclude.mod (+20/-0) validate.sh (+27/-0) yelptest (+33/-0) Conflict adding file Makefile. Moved existing file to Makefile.moved. Conflict adding file build. Moved existing file to build.moved. Conflict adding file common. Moved existing file to common.moved. Conflict adding file debian. Moved existing file to debian.moved. Conflict adding file edubuntu. Moved existing file to edubuntu.moved. Conflict adding file libs. Moved existing file to libs.moved. Conflict adding file validate.sh. Moved existing file to validate.sh.moved. Conflict adding file yelptest. Moved existing file to yelptest.moved. |
| To merge this branch: | bzr merge lp://staging/~bencrisford/edubuntu-docs/bencrisford |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Documentation Committers | Pending | ||
|
Review via email:
|
|||
Description of the change
* Fixed outdated/incorrect information in school-advocacy.xml
To post a comment you must log in.
Unmerged revisions
- 16. By Ben Crisford <ben@Aurelia-edu>
-
Updated/corrected incorrect information in SchoolAdvocacy. (Closes LP: #210771)
- 15. By LaserJock
-
* Don't install edubuntu .ent files, move inline (Closes LP: #353288)
* Refresh .pots
* Resynced libs/global.ent
* Refreshed translations - 14. By LaserJock
-
Updated translations. Should be last upload for Hardy.
- 13. By LaserJock
-
* Brown-paper-bag release (Closes LP: #207398):
- regenerate .pot so that we get the right month/year for Hardy release
Thanks to Giorgio Catanzaro for pointing it out. - 12. By LaserJock
-
* First Hardy upload (Closes LP: #197138)
* Not shipping Edubuntu Handbook for Hardy
* Only install image files for About Edubuntu
* Added in translations for About Edubuntu and .desktop
* Refreshed .pots
* Bump standards version to 3.7.3 - 11. By LaserJock
-
* Update svn snapshot (typo fixes)
* Added in translations:
- debian/rules: modify installation rule to install translations
- removed translations that are less than 10% translated
* Updated addon cd screenshots
* Refreshed .pots - 10. By LaserJock
-
* Updated svn snapshot r4387
- Much work on Handbook (Scott Balneaves and Matt Oquist)
- Updated About Edubuntu (Jordan Mantha) - 9. By LaserJock
-
* Adopt versioning from ubuntu-docs
* Fix spelling mistakes in Handbook:
- closes LP: #110807
- closes LP: #111271
- closes LP: #111298
* Rebuild updates release version (closes LP: #123884)
* Updated translations in edubuntu-about.desktop - 8. By LaserJock
-
* Updated svn snapshot
- install images
- updated Handbook
- removed Build-Depends-Indep as they are unneeded
- updated translation templates - 7. By LaserJock
-
* Updated svn snapshot
- Added About Edubuntu menu item
- Removed Release Notes
- Added translation template
- More Handbook content
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
