added 2 changesets to branch 'refs/remotes/mmu_man-github/sam460ex' old head: 70e5fc354d845b642f38840676ab1504ce523051 new head: cb77e62c176444f0d4c4f545e521098937218502 overview: https://github.com/mmuman/haiku/compare/70e5fc3...cb77e62 ---------------------------------------------------------------------------- 8d96ebe: Merge branch 'master' into sam460ex cb77e62: Merge branch 'master' into sam460ex [ François Revol <revol@xxxxxxx> ] ---------------------------------------------------------------------------- 176 files changed, 2110 insertions(+), 1552 deletions(-) .../add-ons/disk_systems/intel/de.catkeys | 4 +- .../add-ons/disk_systems/intel/hu.catkeys | 4 +- .../add-ons/disk_systems/intel/sv.catkeys | 4 +- .../add-ons/disk_systems/ntfs/de.catkeys | 2 + .../add-ons/disk_systems/ntfs/hu.catkeys | 2 + .../add-ons/disk_systems/ntfs/ja.catkeys | 2 + .../add-ons/disk_systems/ntfs/sv.catkeys | 2 + .../media/media-add-ons/multi_audio/de.catkeys | 17 + .../media/media-add-ons/multi_audio/fr.catkeys | 2 +- data/catalogs/apps/aboutsystem/ja.catkeys | 2 +- data/catalogs/apps/drivesetup/de.catkeys | 9 +- data/catalogs/apps/drivesetup/hu.catkeys | 9 +- data/catalogs/apps/drivesetup/ja.catkeys | 9 +- data/catalogs/apps/drivesetup/sv.catkeys | 9 +- data/catalogs/apps/expander/ja.catkeys | 2 +- data/catalogs/apps/firstbootprompt/be.catkeys | 3 +- data/catalogs/apps/firstbootprompt/de.catkeys | 4 +- data/catalogs/apps/firstbootprompt/el.catkeys | 3 +- data/catalogs/apps/firstbootprompt/fi.catkeys | 3 +- data/catalogs/apps/firstbootprompt/fr.catkeys | 9 +- data/catalogs/apps/firstbootprompt/hi.catkeys | 5 +- data/catalogs/apps/firstbootprompt/hu.catkeys | 7 +- data/catalogs/apps/firstbootprompt/ja.catkeys | 7 +- data/catalogs/apps/firstbootprompt/lt.catkeys | 3 +- data/catalogs/apps/firstbootprompt/nb.catkeys | 2 +- data/catalogs/apps/firstbootprompt/nl.catkeys | 3 +- data/catalogs/apps/firstbootprompt/pl.catkeys | 3 +- data/catalogs/apps/firstbootprompt/pt_BR.catkeys | 13 +- data/catalogs/apps/firstbootprompt/ro.catkeys | 3 +- data/catalogs/apps/firstbootprompt/ru.catkeys | 3 +- data/catalogs/apps/firstbootprompt/sk.catkeys | 3 +- data/catalogs/apps/firstbootprompt/sv.catkeys | 9 +- data/catalogs/apps/firstbootprompt/uk.catkeys | 3 +- .../apps/firstbootprompt/zh_Hans.catkeys | 3 +- data/catalogs/apps/fontdemo/de.catkeys | 3 +- data/catalogs/apps/fontdemo/sv.catkeys | 3 +- data/catalogs/apps/icon-o-matic/ja.catkeys | 8 +- data/catalogs/apps/installer/ja.catkeys | 2 +- data/catalogs/apps/launchbox/ja.catkeys | 2 +- data/catalogs/apps/magnify/be.catkeys | 10 +- data/catalogs/apps/magnify/de.catkeys | 10 +- data/catalogs/apps/magnify/el.catkeys | 9 +- data/catalogs/apps/magnify/fi.catkeys | 10 +- data/catalogs/apps/magnify/fr.catkeys | 10 +- data/catalogs/apps/magnify/hi.catkeys | 7 +- data/catalogs/apps/magnify/hu.catkeys | 10 +- data/catalogs/apps/magnify/ja.catkeys | 10 +- data/catalogs/apps/magnify/lt.catkeys | 10 +- data/catalogs/apps/magnify/nl.catkeys | 10 +- data/catalogs/apps/magnify/pl.catkeys | 10 +- data/catalogs/apps/magnify/pt_BR.catkeys | 10 +- data/catalogs/apps/magnify/ro.catkeys | 9 +- data/catalogs/apps/magnify/ru.catkeys | 10 +- data/catalogs/apps/magnify/sk.catkeys | 10 +- data/catalogs/apps/magnify/sv.catkeys | 10 +- data/catalogs/apps/magnify/uk.catkeys | 9 +- data/catalogs/apps/magnify/zh_Hans.catkeys | 10 +- data/catalogs/apps/mediaconverter/ja.catkeys | 6 +- data/catalogs/apps/people/ja.catkeys | 2 +- data/catalogs/apps/terminal/be.catkeys | 3 +- data/catalogs/apps/terminal/de.catkeys | 3 +- data/catalogs/apps/terminal/el.catkeys | 3 +- data/catalogs/apps/terminal/fi.catkeys | 3 +- data/catalogs/apps/terminal/fr.catkeys | 3 +- data/catalogs/apps/terminal/hu.catkeys | 3 +- data/catalogs/apps/terminal/ja.catkeys | 3 +- data/catalogs/apps/terminal/lt.catkeys | 3 +- data/catalogs/apps/terminal/nl.catkeys | 3 +- data/catalogs/apps/terminal/pl.catkeys | 3 +- data/catalogs/apps/terminal/pt_BR.catkeys | 3 +- data/catalogs/apps/terminal/ro.catkeys | 3 +- data/catalogs/apps/terminal/ru.catkeys | 3 +- data/catalogs/apps/terminal/sk.catkeys | 3 +- data/catalogs/apps/terminal/sv.catkeys | 3 +- data/catalogs/apps/terminal/uk.catkeys | 3 +- data/catalogs/apps/terminal/zh_Hans.catkeys | 3 +- data/catalogs/apps/webpositive/be.catkeys | 3 +- data/catalogs/apps/webpositive/de.catkeys | 3 +- data/catalogs/apps/webpositive/fi.catkeys | 3 +- data/catalogs/apps/webpositive/fr.catkeys | 3 +- data/catalogs/apps/webpositive/hu.catkeys | 3 +- data/catalogs/apps/webpositive/ja.catkeys | 11 +- data/catalogs/apps/webpositive/lt.catkeys | 3 +- data/catalogs/apps/webpositive/nl.catkeys | 3 +- data/catalogs/apps/webpositive/pl.catkeys | 3 +- data/catalogs/apps/webpositive/pt_BR.catkeys | 3 +- data/catalogs/apps/webpositive/ru.catkeys | 3 +- data/catalogs/apps/webpositive/sk.catkeys | 3 +- data/catalogs/apps/webpositive/sv.catkeys | 3 +- data/catalogs/apps/webpositive/zh_Hans.catkeys | 3 +- data/catalogs/kits/ja.catkeys | 2 +- data/catalogs/kits/tracker/be.catkeys | 5 +- data/catalogs/kits/tracker/de.catkeys | 6 +- data/catalogs/kits/tracker/el.catkeys | 3 +- data/catalogs/kits/tracker/fi.catkeys | 5 +- data/catalogs/kits/tracker/fr.catkeys | 5 +- data/catalogs/kits/tracker/hi.catkeys | 3 +- data/catalogs/kits/tracker/hu.catkeys | 6 +- data/catalogs/kits/tracker/ja.catkeys | 36 +- [ *** stats truncated: 77 lines dropped *** ] ############################################################################ Commit: 8d96ebeb590ed978b67dde0801c0c05bca6d4799 Author: François Revol <revol@xxxxxxx> Date: Tue Feb 12 18:48:05 2013 UTC Merge branch 'master' into sam460ex ---------------------------------------------------------------------------- ############################################################################ Commit: cb77e62c176444f0d4c4f545e521098937218502 Author: François Revol <revol@xxxxxxx> Date: Sat Feb 16 21:58:27 2013 UTC Merge branch 'master' into sam460ex ----------------------------------------------------------------------------