added 2 changesets to branch 'refs/remotes/mmu_man-github/sam460ex' old head: 5d9c157d6e3292120b15df063f224681ba5b9f61 new head: 70e5fc354d845b642f38840676ab1504ce523051 overview: https://github.com/mmuman/haiku/compare/5d9c157...70e5fc3 ---------------------------------------------------------------------------- 88fe1cd: Merge branch 'master' into sam460ex 70e5fc3: Merge branch 'master' into sam460ex [ François Revol <revol@xxxxxxx> ] ---------------------------------------------------------------------------- 159 files changed, 2408 insertions(+), 1818 deletions(-) .../add-ons/media/media-add-ons/mixer/hu.catkeys | 2 +- .../media/media-add-ons/multi_audio/fr.catkeys | 27 + .../media/media-add-ons/multi_audio/hu.catkeys | 2 +- data/catalogs/apps/diskusage/fr.catkeys | 3 +- data/catalogs/apps/drivesetup/be.catkeys | 12 +- data/catalogs/apps/drivesetup/de.catkeys | 13 +- data/catalogs/apps/drivesetup/el.catkeys | 12 +- data/catalogs/apps/drivesetup/fi.catkeys | 12 +- data/catalogs/apps/drivesetup/fr.catkeys | 13 +- data/catalogs/apps/drivesetup/hu.catkeys | 14 +- data/catalogs/apps/drivesetup/ja.catkeys | 13 +- data/catalogs/apps/drivesetup/lt.catkeys | 12 +- data/catalogs/apps/drivesetup/nl.catkeys | 12 +- data/catalogs/apps/drivesetup/pl.catkeys | 12 +- data/catalogs/apps/drivesetup/pt_BR.catkeys | 12 +- data/catalogs/apps/drivesetup/ro.catkeys | 12 +- data/catalogs/apps/drivesetup/ru.catkeys | 12 +- data/catalogs/apps/drivesetup/sk.catkeys | 12 +- data/catalogs/apps/drivesetup/sv.catkeys | 13 +- data/catalogs/apps/drivesetup/uk.catkeys | 6 +- data/catalogs/apps/drivesetup/zh_Hans.catkeys | 12 +- data/catalogs/apps/firstbootprompt/fr.catkeys | 10 +- data/catalogs/apps/firstbootprompt/hu.catkeys | 2 +- data/catalogs/apps/mail/sv.catkeys | 41 +- data/catalogs/apps/mediaconverter/fr.catkeys | 6 +- data/catalogs/apps/stylededit/fr.catkeys | 9 +- data/catalogs/kits/bluetooth/hu.catkeys | 8 +- data/catalogs/kits/tracker/be.catkeys | 3 +- data/catalogs/kits/tracker/de.catkeys | 3 +- data/catalogs/kits/tracker/el.catkeys | 3 +- data/catalogs/kits/tracker/fi.catkeys | 3 +- data/catalogs/kits/tracker/fr.catkeys | 5 +- data/catalogs/kits/tracker/hi.catkeys | 3 +- data/catalogs/kits/tracker/hu.catkeys | 3 +- data/catalogs/kits/tracker/ja.catkeys | 3 +- data/catalogs/kits/tracker/lt.catkeys | 3 +- data/catalogs/kits/tracker/nl.catkeys | 3 +- data/catalogs/kits/tracker/pl.catkeys | 3 +- data/catalogs/kits/tracker/pt_BR.catkeys | 3 +- data/catalogs/kits/tracker/ro.catkeys | 3 +- data/catalogs/kits/tracker/ru.catkeys | 3 +- data/catalogs/kits/tracker/sk.catkeys | 3 +- data/catalogs/kits/tracker/sv.catkeys | 3 +- data/catalogs/kits/tracker/uk.catkeys | 3 +- data/catalogs/kits/tracker/zh_Hans.catkeys | 3 +- data/catalogs/preferences/bluetooth/hu.catkeys | 2 +- .../preferences/notifications/be.catkeys | 3 +- .../preferences/notifications/de.catkeys | 3 +- .../preferences/notifications/el.catkeys | 3 +- .../preferences/notifications/fi.catkeys | 3 +- .../preferences/notifications/fr.catkeys | 3 +- .../preferences/notifications/hi.catkeys | 3 +- .../preferences/notifications/hu.catkeys | 3 +- .../preferences/notifications/ja.catkeys | 3 +- .../preferences/notifications/lt.catkeys | 3 +- .../preferences/notifications/nl.catkeys | 3 +- .../preferences/notifications/pl.catkeys | 3 +- .../preferences/notifications/pt_BR.catkeys | 3 +- .../preferences/notifications/ro.catkeys | 3 +- .../preferences/notifications/ru.catkeys | 3 +- .../preferences/notifications/sk.catkeys | 3 +- .../preferences/notifications/sv.catkeys | 3 +- .../preferences/notifications/uk.catkeys | 3 +- .../preferences/notifications/zh_Hans.catkeys | 3 +- data/catalogs/preferences/shortcuts/fr.catkeys | 3 +- .../preferences/virtualmemory/fr.catkeys | 3 +- .../tests/servers/app/playground/fr.catkeys | 31 + docs/user/interface/Alert.dox | 4 +- docs/user/interface/Bitmap.dox | 4 +- docs/user/interface/Box.dox | 4 +- docs/user/interface/Button.dox | 4 +- docs/user/interface/CheckBox.dox | 4 +- docs/user/interface/ColorControl.dox | 4 +- docs/user/interface/Control.dox | 4 +- docs/user/interface/Dragger.dox | 4 +- docs/user/interface/Font.dox | 4 +- docs/user/interface/LayoutBuilder.Group.dox | 4 +- docs/user/interface/Screen.dox | 4 +- docs/user/locale/Locale.dox | 4 +- docs/user/storage/FindDirectory.dox | 4 +- docs/user/storage/Mime.dox | 4 +- docs/user/storage/MimeType.dox | 6 +- docs/user/storage/Node.dox | 4 +- docs/user/storage/NodeInfo.dox | 431 +++++++++++ docs/user/storage/NodeMonitor.dox | 406 +++++++++++ docs/user/storage/Path.dox | 503 +++++++++++++ headers/os/net/NetworkCookie.h | 93 ++- headers/os/net/NetworkCookieJar.h | 27 +- headers/os/storage/NodeInfo.h | 5 - headers/os/storage/NodeMonitor.h | 31 +- headers/os/storage/Path.h | 2 + src/apps/terminal/AppearPrefView.cpp | 42 +- src/kits/network/libnetapi/NetworkCookie.cpp | 711 +++++++++---------- src/kits/network/libnetapi/NetworkCookieJar.cpp | 317 +++++---- src/kits/storage/NodeInfo.cpp | 373 ++-------- src/kits/storage/NodeMonitor.cpp | 80 +-- src/kits/storage/Path.cpp | 273 ++----- src/kits/tracker/Commands.h | 2 +- src/kits/tracker/ContainerWindow.cpp | 16 +- [ *** stats truncated: 60 lines dropped *** ] ############################################################################ Commit: 88fe1cd3a5a95c980481b19354b6b1ac3b1ffd91 Author: François Revol <revol@xxxxxxx> Date: Sat Feb 9 15:25:21 2013 UTC Merge branch 'master' into sam460ex ---------------------------------------------------------------------------- ############################################################################ Commit: 70e5fc354d845b642f38840676ab1504ce523051 Author: François Revol <revol@xxxxxxx> Date: Sun Feb 10 20:55:20 2013 UTC Merge branch 'master' into sam460ex ----------------------------------------------------------------------------