[ros-diffs] [fireball] 25934: Merge 25912, sync desk.cpl to trunk.

Author: fireball
Date: Thu Mar  1 16:19:50 2007
New Revision: 25934

URL: http://svn.reactos.org/svn/reactos?rev=25934&view=rev
Log:
Merge 25912, sync desk.cpl to trunk.

Added:
    branches/ros-branch-0_3_1/reactos/dll/cpl/desk/advappdlg.c
    branches/ros-branch-0_3_1/reactos/dll/cpl/desk/appearance.h
    branches/ros-branch-0_3_1/reactos/dll/cpl/desk/id-ID.rc
    branches/ros-branch-0_3_1/reactos/dll/cpl/desk/ru-RU.rc
      - copied unchanged from r25912, trunk/reactos/dll/cpl/desk/ru-RU.rc
    branches/ros-branch-0_3_1/reactos/dll/cpl/intl/ru-RU.rc
      - copied unchanged from r25912, trunk/reactos/dll/cpl/intl/ru-RU.rc
    branches/ros-branch-0_3_1/reactos/dll/cpl/main/ru-RU.rc
      - copied unchanged from r25912, trunk/reactos/dll/cpl/main/ru-RU.rc
    branches/ros-branch-0_3_1/reactos/dll/cpl/ncpa/ru-RU.rc
      - copied unchanged from r25912, trunk/reactos/dll/cpl/ncpa/ru-RU.rc
    branches/ros-branch-0_3_1/reactos/dll/cpl/timedate/ru-RU.rc
      - copied unchanged from r25912, trunk/reactos/dll/cpl/timedate/ru-RU.rc
Removed:
    branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Ru.rc
    branches/ros-branch-0_3_1/reactos/dll/cpl/intl/ru.rc
    branches/ros-branch-0_3_1/reactos/dll/cpl/main/Ru.rc
    branches/ros-branch-0_3_1/reactos/dll/cpl/ncpa/ru.rc
    branches/ros-branch-0_3_1/reactos/dll/cpl/timedate/Ru.rc
Modified:
    branches/ros-branch-0_3_1/reactos/base/applications/calc/lang/ru-RU.rc
    branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/ru-RU.rc
    branches/ros-branch-0_3_1/reactos/base/applications/regedit/lang/ru-RU.rc
    branches/ros-branch-0_3_1/reactos/base/applications/servman/ru-RU.rc
    branches/ros-branch-0_3_1/reactos/base/applications/winefile/lang/ru-RU.rc
    branches/ros-branch-0_3_1/reactos/base/shell/explorer/explorer-ru.rc
    branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Fr.rc
    branches/ros-branch-0_3_1/reactos/dll/cpl/desk/It.rc
    branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Ja.rc
    branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Uk.rc
    branches/ros-branch-0_3_1/reactos/dll/cpl/desk/appearance.c
    branches/ros-branch-0_3_1/reactos/dll/cpl/desk/cz.rc
    branches/ros-branch-0_3_1/reactos/dll/cpl/desk/de.rc
    branches/ros-branch-0_3_1/reactos/dll/cpl/desk/desk.rbuild
    branches/ros-branch-0_3_1/reactos/dll/cpl/desk/desk.rc
    branches/ros-branch-0_3_1/reactos/dll/cpl/desk/en.rc
    branches/ros-branch-0_3_1/reactos/dll/cpl/desk/es.rc
    branches/ros-branch-0_3_1/reactos/dll/cpl/desk/gr.rc
    branches/ros-branch-0_3_1/reactos/dll/cpl/desk/hu.rc
    branches/ros-branch-0_3_1/reactos/dll/cpl/desk/nl.rc
    branches/ros-branch-0_3_1/reactos/dll/cpl/desk/pl.rc
    branches/ros-branch-0_3_1/reactos/dll/cpl/desk/preview.c
    branches/ros-branch-0_3_1/reactos/dll/cpl/desk/preview.h
    branches/ros-branch-0_3_1/reactos/dll/cpl/desk/resource.h
    branches/ros-branch-0_3_1/reactos/dll/cpl/desk/sv.rc
    branches/ros-branch-0_3_1/reactos/dll/cpl/intl/intl.rc
    branches/ros-branch-0_3_1/reactos/dll/cpl/main/rsrc.rc
    branches/ros-branch-0_3_1/reactos/dll/cpl/ncpa/ncpa.rc
    branches/ros-branch-0_3_1/reactos/dll/cpl/timedate/timedate.rc
    branches/ros-branch-0_3_1/reactos/dll/win32/setupapi/res/lang/Ru.rc

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: branches/ros-branch-0_3_1/reactos/base/applications/calc/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a…

Modified: branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a…

Modified: branches/ros-branch-0_3_1/reactos/base/applications/regedit/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a…

Modified: branches/ros-branch-0_3_1/reactos/base/applications/servman/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a…

Modified: branches/ros-branch-0_3_1/reactos/base/applications/winefile/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a…

Modified: branches/ros-branch-0_3_1/reactos/base/shell/explorer/explorer-ru.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/s…

Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Fr.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp…

Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/It.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp…

Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Ja.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp…

Removed: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Ru.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp…

Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Uk.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp…

Added: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/advappdlg.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp…

Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/appearance.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp…

Added: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/appearance.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp…

Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/cz.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp…

Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/de.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp…

Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/desk.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp…

Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/desk.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp…

Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/en.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp…

Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/es.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp…

Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/gr.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp…

Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/hu.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp…

Added: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/id-ID.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp…

Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/nl.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp…

Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/pl.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp…

Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/preview.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp…

Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/preview.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp…

Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/resource.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp…

Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/sv.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp…

Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/intl/intl.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp…

Removed: branches/ros-branch-0_3_1/reactos/dll/cpl/intl/ru.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp…

Removed: branches/ros-branch-0_3_1/reactos/dll/cpl/main/Ru.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp…

Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/main/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp…

Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/ncpa/ncpa.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp…

Removed: branches/ros-branch-0_3_1/reactos/dll/cpl/ncpa/ru.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp…

Removed: branches/ros-branch-0_3_1/reactos/dll/cpl/timedate/Ru.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp…

Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/timedate/timedate.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp…

Modified: branches/ros-branch-0_3_1/reactos/dll/win32/setupapi/res/lang/Ru.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/wi…